Commit 8593660c authored by vertighel's avatar vertighel
Browse files

pointing model

parent 27feb834

noctua/devices/astelco.py

+6 −2
Original line number Diff line number Diff line
@@ -271,12 +271,16 @@ class Telescope(OpenTSI): 
        self.tracking = False



    def load_pointing_model(self, port=0, orientation=0):

        """Load the pointing model measurement file from ini and recalculate coefficients."""

        """

        Load the pointing model measurement file from ini and recalculate coefficients.

        Port: Nasmyth 1

        Orientation: Normal pointing

        """



        filename = getattr(self, '_pointing_model', 'oarpaf2024')

        self.put("TELESCOPE.MEASUREMENT.MODEL.FILE.NAME", f'"{filename}"')

        self.put("TELESCOPE.MEASUREMENT.MODEL.FILE.LOAD", 1)

        self.put(f"TELESCOPE.CONFIG.PORT[{port}].MODEL[{orientation}].CALCULATE", 1)

        # self.put(f"TELESCOPE.CONFIG.PORT[{port}].MODEL[{orientation}].CALCULATE", 1)



    @property

    def is_moving(self):

noctua/web/pages/macros/sections/control_panel.html

+17 −16
Original line number Diff line number Diff line
@@ -155,44 +155,45 @@ 
    <div class="card-body">

        <h6 class="card-title text-info d-flex justify-content-between">

            Mirror Stage

            <span class="badge bg-dark border border-secondary text-info" data-status="stage-named">None</span>

        </h6>



        <!-- Position Display -->

        <div class="d-flex justify-content-between align-items-center mb-3 bg-black p-2 rounded">

            <small class="text-muted">Position:</small>

            <span class="fw-bold text-success"><var data-status="stage-position">0.000</var> mm</span>

            <span class="badge" data-status="stage-status">Uninit</span>

        </div>

        <!-- <\!-- Position Display -\-> -->

        <!-- <div class="d-flex justify-content-between align-items-center mb-3 bg-black p-2 rounded"> -->

        <!--     <small class="text-muted">Position:</small> -->

        <!--     <span class="fw-bold text-success"><var data-status="stage-position">0.000</var> mm</span> -->

        <!--     <span class="badge" data-status="stage-status">Uninit</span> -->

        <!-- </div> -->



        <!-- Named Position Buttons (Step 1) -->

        <div class="btn-group btn-group-sm w-100 mb-3">

            <button class="btn btn-outline-info btn-universal" 

            <button class="btn btn-outline-secondary btn-universal" 

                    data-method="PUT" data-url="/stage/named" data-value='"imaging"'>Imaging</button>

            <button class="btn btn-outline-info btn-universal" 

            <button class="btn btn-outline-secondary btn-universal" 

                    data-method="PUT" data-url="/stage/named" data-value='"spectro"'>Spectro</button>

            <button class="btn btn-outline-info btn-universal" 

            <button class="btn btn-outline-secondary btn-universal" 

                    data-method="PUT" data-url="/stage/named" data-value='"echelle"'>Échelle</button>

        </div>



        <!-- Absolute Movement -->

        <label class="form-label">Abs</label>

        <div class="input-group input-group-sm mb-2">

            <span class="input-group-text bg-dark border-secondary text-muted">Abs</span>

            <input type="number" class="form-control bg-black text-info border-secondary" id="stage-abs-val" placeholder="mm">

            <input type="number" class="form-control bg-black text-info border-secondary" id="stage-abs-val">

            <span class="input-group-text bg-dark border-secondary text-muted">mm</span>

            <button class="btn btn-outline-primary btn-universal" id="btn-stage-move-abs"

                    data-method="PUT" data-url="/stage/position" data-inputs="stage-abs-val">Go</button>

        </div>



        <!-- Relative Movement -->

        <label class="form-label">Rel</label>

        <div class="input-group input-group-sm mb-3">

            <span class="input-group-text bg-dark border-secondary text-muted">Rel</span>

            <input type="number" class="form-control bg-black text-info border-secondary" id="stage-rel-val" value="1.0" step="0.1">

            <input type="number" class="form-control bg-black border-secondary" id="stage-rel-val" value="1.0" step="0.1">

            <span class="input-group-text bg-dark border-secondary text-muted">mm</span>

            <button class="btn btn-outline-light" id="btn-stage-rel-minus" title="Move relative minus">-</button>

            <button class="btn btn-outline-light" id="btn-stage-rel-plus" title="Move relative plus">+</button>

        </div>



        <div class="d-flex gap-2">

            <button class="btn btn-warning btn-sm flex-fill btn-universal"

        <div class="input-group input-group-sm mb-3">

            <button class="btn btn-outline-primary btn-sm flex-fill btn-universal"

                    data-method="POST" data-url="/stage/status">Init</button>

            <button class="btn btn-outline-danger btn-sm flex-fill btn-universal"

                    data-method="DELETE" data-url="/stage/movement">Abort</button>