removed linear progress bar

csaxs_bec/bec_ipython_client/plugins/LamNI/LamNI_webpage_generator.py

@@ -0,0 +1,89 @@
+"""
+LamNI/webpage_generator.py
+===========================
+LamNI-specific webpage generator subclass.
+
+Integration (inside the LamNI __init__ / startup):
+---------------------------------------------------
+    from csaxs_bec.bec_ipython_client.plugins.LamNI.webpage_generator import (
+        LamniWebpageGenerator,
+    )
+    self._webpage_gen = LamniWebpageGenerator(
+        bec_client=client,
+        output_dir="~/data/raw/webpage/",
+    )
+    self._webpage_gen.start()
+
+Or use the factory (auto-selects by session name "lamni"):
+----------------------------------------------------------
+    from csaxs_bec.bec_ipython_client.plugins.flomni.webpage_generator import (
+        make_webpage_generator,
+    )
+    self._webpage_gen = make_webpage_generator(bec, output_dir="~/data/raw/webpage/")
+    self._webpage_gen.start()
+
+Interactive helpers:
+--------------------
+    lamni._webpage_gen.status()
+    lamni._webpage_gen.verbosity = 2
+    lamni._webpage_gen.stop()
+    lamni._webpage_gen.start()
+"""
+
+from pathlib import Path
+
+from csaxs_bec.bec_ipython_client.plugins.flomni.webpage_generator import (
+    WebpageGeneratorBase,
+    _safe_get,
+    _safe_float,
+    _gvar,
+)
+
+
+class LamniWebpageGenerator(WebpageGeneratorBase):
+    """
+    LamNI-specific webpage generator.
+    Logo: LamNI.png from the same directory as this file.
+
+    Override _collect_setup_data() to add LamNI-specific temperatures,
+    sample name, and measurement settings.
+    """
+
+    # TODO: fill in LamNI-specific device paths
+    # label -> dotpath under device_manager.devices
+    _TEMP_MAP = {
+        # "Sample":  "lamni_temphum.temperature_sample",
+        # "OSA":     "lamni_temphum.temperature_osa",
+    }
+
+    def _logo_path(self):
+        return Path(__file__).parent / "LamNI.png"
+
+    def _collect_setup_data(self) -> dict:
+        # ── LamNI-specific data goes here ─────────────────────────────
+        # Uncomment and adapt when device names are known:
+        #
+        # dm = self._bec.device_manager
+        # sample_name = _safe_get(dm, "lamni_samples.sample_names.sample0") or "N/A"
+        # temperatures = {
+        #     label: _safe_float(_safe_get(dm, path))
+        #     for label, path in self._TEMP_MAP.items()
+        # }
+        # settings = {
+        #     "Sample name":   sample_name,
+        #     "FOV x / y":     ...,
+        #     "Exposure time": _gvar(self._bec, "tomo_countingtime", ".3f", " s"),
+        #     "Angle step":    _gvar(self._bec, "tomo_angle_stepsize", ".2f", "\u00b0"),
+        # }
+        # return {
+        #     "type":         "lamni",
+        #     "sample_name":  sample_name,
+        #     "temperatures": temperatures,
+        #     "settings":     settings,
+        # }
+
+        # Placeholder — returns minimal info until implemented
+        return {
+            "type": "lamni",
+            # LamNI-specific data here
+        }

csaxs_bec/bec_ipython_client/plugins/flomni/flomni.py

@@ -21,6 +21,14 @@ from csaxs_bec.bec_ipython_client.plugins.omny.omny_general_tools import (
     TomoIDManager,
 )
 
+# from csaxs_bec.bec_ipython_client.plugins.flomni.webpage_generator import (
+#        FlomniWebpageGenerator,
+#       VERBOSITY_SILENT,   # 0 — no output
+#       VERBOSITY_NORMAL,   # 1 — startup / stop messages only  (default)
+#       VERBOSITY_VERBOSE,  # 2 — one-line summary per cycle
+#       VERBOSITY_DEBUG,    # 3 — full JSON payload per cycle
+#    )
+
 logger = bec_logger.logger
 
 if builtins.__dict__.get("bec") is not None:
@@ -1303,6 +1311,17 @@ class Flomni(
         self.corr_angle_y_2 = []
         self._progress_proxy = _ProgressProxy(self.client)
         self._progress_proxy.reset()
+        from csaxs_bec.bec_ipython_client.plugins.flomni.flomni_webpage_generator import (
+            FlomniWebpageGenerator,
+        )
+        self._webpage_gen = FlomniWebpageGenerator(
+            bec_client=client,
+            output_dir="~/data/raw/webpage/",
+            #upload_url="http://s1090968537.online.de/upload.php",   # optional
+            upload_url="https://v1p0zyg2w9n2k9c1.myfritz.net/upload.php",
+        )
+        self._webpage_gen.start()
+
         self.OMNYTools = OMNYTools(self.client)
         self.reconstructor = PtychoReconstructor(self.ptycho_reconstruct_foldername)
         self.tomo_id_manager = TomoIDManager()
@@ -2249,8 +2268,8 @@ class Flomni(
             + ' 888    888  "Y88888P"  888       888 888    Y888 8888888 \n'
         )
         padding = 20
-        fovxy = f"{self.fovx:.2f}/{self.fovy:.2f}"
-        stitching = f"{self.stitch_x:.2f}/{self.stitch_y:.2f}"
+        fovxy = f"{self.fovx:.1f}/{self.fovy:.1f}"
+        stitching = f"{self.stitch_x:.0f}/{self.stitch_y:.0f}"
         dataset_id = str(self.client.queue.next_dataset_number)
         account = bec.active_account
         content = [
@@ -2267,7 +2286,7 @@ class Flomni(
             f"{'Exposure time:':<{padding}}{self.tomo_countingtime:>{padding}.2f}\n",
             f"{'Fermat spiral step size:':<{padding}}{self.tomo_shellstep:>{padding}.2f}\n",
             f"{'FOV:':<{padding}}{fovxy:>{padding}}\n",
-            f"{'Stitching:':<{padding}}{stitching:>{padding}.0f}\n",
+            f"{'Stitching:':<{padding}}{stitching:>{padding}}\n",
             f"{'Number of individual sub-tomograms:':<{padding}}{8:>{padding}}\n",
             f"{'Angular step within sub-tomogram:':<{padding}}{self.tomo_angle_stepsize:>{padding}.2f}\n",
         ]

csaxs_bec/bec_ipython_client/plugins/omny/omny_webpage_generator.py

@@ -0,0 +1,96 @@
+"""
+omny/webpage_generator.py
+==========================
+OMNY-specific webpage generator subclass.
+
+Integration (inside the OMNY __init__ / startup):
+--------------------------------------------------
+    from csaxs_bec.bec_ipython_client.plugins.omny.webpage_generator import (
+        OmnyWebpageGenerator,
+    )
+    self._webpage_gen = OmnyWebpageGenerator(
+        bec_client=client,
+        output_dir="~/data/raw/webpage/",
+    )
+    self._webpage_gen.start()
+
+Or use the factory (auto-selects by session name "omny"):
+---------------------------------------------------------
+    from csaxs_bec.bec_ipython_client.plugins.flomni.webpage_generator import (
+        make_webpage_generator,
+    )
+    self._webpage_gen = make_webpage_generator(bec, output_dir="~/data/raw/webpage/")
+    self._webpage_gen.start()
+
+Interactive helpers:
+--------------------
+    omny._webpage_gen.status()
+    omny._webpage_gen.verbosity = 2
+    omny._webpage_gen.stop()
+    omny._webpage_gen.start()
+"""
+
+from pathlib import Path
+
+from csaxs_bec.bec_ipython_client.plugins.flomni.webpage_generator import (
+    WebpageGeneratorBase,
+    _safe_get,
+    _safe_float,
+    _gvar,
+)
+
+
+class OmnyWebpageGenerator(WebpageGeneratorBase):
+    """
+    OMNY-specific webpage generator.
+    Logo: OMNY.png from the same directory as this file.
+
+    Override _collect_setup_data() to add OMNY-specific temperatures,
+    sample name, and measurement settings.
+
+    The old OMNY spec webpage showed:
+        - Cryo temperatures (XOMNY-TEMP-CRYO-A/B)
+        - Per-channel temperatures (XOMNY-TEMP1..48)
+        - Dewar pressure / LN2 flow
+        - Interferometer strengths (OINTERF)
+    Map these to BEC device paths below once available.
+    """
+
+    # TODO: fill in OMNY-specific device paths
+    # label -> dotpath under device_manager.devices
+    _TEMP_MAP = {
+        # "Sample (cryo A)": "omny_temp.cryo_a",
+        # "Cryo head (B)":   "omny_temp.cryo_b",
+    }
+
+    def _logo_path(self):
+        return Path(__file__).parent / "OMNY.png"
+
+    def _collect_setup_data(self) -> dict:
+        # ── OMNY-specific data goes here ──────────────────────────────
+        # Uncomment and adapt when device names are known:
+        #
+        # dm = self._bec.device_manager
+        # sample_name = _safe_get(dm, "omny_samples.sample_names.sample0") or "N/A"
+        # temperatures = {
+        #     label: _safe_float(_safe_get(dm, path))
+        #     for label, path in self._TEMP_MAP.items()
+        # }
+        # settings = {
+        #     "Sample name":   sample_name,
+        #     "FOV x / y":     ...,
+        #     "Exposure time": _gvar(self._bec, "tomo_countingtime", ".3f", " s"),
+        #     "Angle step":    _gvar(self._bec, "tomo_angle_stepsize", ".2f", "\u00b0"),
+        # }
+        # return {
+        #     "type":         "omny",
+        #     "sample_name":  sample_name,
+        #     "temperatures": temperatures,
+        #     "settings":     settings,
+        # }
+
+        # Placeholder — returns minimal info until implemented
+        return {
+            "type": "omny",
+            # OMNY-specific data here
+        }

csaxs_bec/device_configs/bl_endstation.yaml

@@ -72,7 +72,7 @@ xbpm3x:
     # precision: 3
     # tolerance: 0.005
   enabled: true
-  onFailure: buffer
+  onFailure: retry
   readOnly: false
   readoutPriority: baseline
   connectionTimeout: 20
@@ -95,7 +95,7 @@ xbpm3y:
     # precision: 3
     # tolerance: 0.005
   enabled: true
-  onFailure: buffer
+  onFailure: retry
   readOnly: false
   readoutPriority: baseline
   connectionTimeout: 20
@@ -118,7 +118,7 @@ sl3trxi:
     # precision: 3
     # tolerance: 0.005
   enabled: true
-  onFailure: buffer
+  onFailure: retry
   readOnly: false
   readoutPriority: baseline
   connectionTimeout: 20
@@ -141,7 +141,7 @@ sl3trxo:
     # precision: 3
     # tolerance: 0.005
   enabled: true
-  onFailure: buffer
+  onFailure: retry
   readOnly: false
   readoutPriority: baseline
   connectionTimeout: 20
@@ -164,7 +164,7 @@ sl3trxb:
     # precision: 3
     # tolerance: 0.005
   enabled: true
-  onFailure: buffer
+  onFailure: retry
   readOnly: false
   readoutPriority: baseline
   connectionTimeout: 20
@@ -187,7 +187,7 @@ sl3trxt:
     # precision: 3
     # tolerance: 0.005
   enabled: true
-  onFailure: buffer
+  onFailure: retry
   readOnly: false
   readoutPriority: baseline
   connectionTimeout: 20
@@ -210,7 +210,7 @@ fast_shutter_n1_x:
     # precision: 3
     # tolerance: 0.005
   enabled: true
-  onFailure: buffer
+  onFailure: retry
   readOnly: false
   readoutPriority: baseline
   connectionTimeout: 20
@@ -234,7 +234,7 @@ fast_shutter_o1_x:
     # precision: 3
     # tolerance: 0.005
   enabled: true
-  onFailure: buffer
+  onFailure: retry
   readOnly: false
   readoutPriority: baseline
   connectionTimeout: 20
@@ -257,7 +257,7 @@ fast_shutter_o2_x:
     # precision: 3
     # tolerance: 0.005
   enabled: true
-  onFailure: buffer
+  onFailure: retry
   readOnly: false
   readoutPriority: baseline
   connectionTimeout: 20
@@ -280,7 +280,7 @@ filter_array_1_x:
     # precision: 3
     # tolerance: 0.005
   enabled: true
-  onFailure: buffer
+  onFailure: retry
   readOnly: false
   readoutPriority: baseline
   connectionTimeout: 20
@@ -303,7 +303,7 @@ filter_array_2_x:
     # precision: 3
     # tolerance: 0.005
   enabled: true
-  onFailure: buffer
+  onFailure: retry
   readOnly: false
   readoutPriority: baseline
   connectionTimeout: 20
@@ -326,7 +326,7 @@ filter_array_3_x:
     # precision: 3
     # tolerance: 0.005
   enabled: true
-  onFailure: buffer
+  onFailure: retry
   readOnly: false
   readoutPriority: baseline
   connectionTimeout: 20
@@ -349,7 +349,7 @@ filter_array_4_x:
     # precision: 3
     # tolerance: 0.005
   enabled: true
-  onFailure: buffer
+  onFailure: retry
   readOnly: false
   readoutPriority: baseline
   connectionTimeout: 20
@@ -372,7 +372,7 @@ sl4trxi:
     # precision: 3
     # tolerance: 0.005
   enabled: true
-  onFailure: buffer
+  onFailure: retry
   readOnly: false
   readoutPriority: baseline
   connectionTimeout: 20
@@ -395,7 +395,7 @@ sl4trxo:
     # precision: 3
     # tolerance: 0.005
   enabled: true
-  onFailure: buffer
+  onFailure: retry
   readOnly: false
   readoutPriority: baseline
   connectionTimeout: 20
@@ -418,7 +418,7 @@ sl4trxb:
     # precision: 3
     # tolerance: 0.005
   enabled: true
-  onFailure: buffer
+  onFailure: retry
   readOnly: false
   readoutPriority: baseline
   connectionTimeout: 20
@@ -441,7 +441,7 @@ sl4trxt:
     # precision: 3
     # tolerance: 0.005
   enabled: true
-  onFailure: buffer
+  onFailure: retry
   readOnly: false
   readoutPriority: baseline
   connectionTimeout: 20
@@ -466,7 +466,7 @@ sl5trxi:
     # precision: 3
     # tolerance: 0.005
   enabled: true
-  onFailure: buffer
+  onFailure: retry
   readOnly: false
   readoutPriority: baseline
   connectionTimeout: 20
@@ -489,7 +489,7 @@ sl5trxo:
     # precision: 3
     # tolerance: 0.005
   enabled: true
-  onFailure: buffer
+  onFailure: retry
   readOnly: false
   readoutPriority: baseline
   connectionTimeout: 20
@@ -512,7 +512,7 @@ sl5trxb:
     # precision: 3
     # tolerance: 0.005
   enabled: true
-  onFailure: buffer
+  onFailure: retry
   readOnly: false
   readoutPriority: baseline
   connectionTimeout: 20
@@ -535,7 +535,7 @@ sl5trxt:
     # precision: 3
     # tolerance: 0.005
   enabled: true
-  onFailure: buffer
+  onFailure: retry
   readOnly: false
   readoutPriority: baseline
   connectionTimeout: 20
@@ -558,7 +558,7 @@ xbimtrx:
     # precision: 3
     # tolerance: 0.005
   enabled: true
-  onFailure: buffer
+  onFailure: retry
   readOnly: false
   readoutPriority: baseline
   connectionTimeout: 20
@@ -581,7 +581,7 @@ xbimtry:
     # precision: 3
     # tolerance: 0.005
   enabled: true
-  onFailure: buffer
+  onFailure: retry
   readOnly: false
   readoutPriority: baseline
   connectionTimeout: 20
@@ -589,3 +589,237 @@ xbimtry:
     init_position: 0
     # bl_smar_stage to use csaxs reference method. assign number according to axis channel
     bl_smar_stage: 1
+
+
+
+################### XBOX related ###################
+# we assue the epics settings for resolution, velocity etc. are correct
+# we do not overwrite from here
+
+aptrx:
+  description: Aperture pinhole X
+  deviceClass: ophyd_devices.devices.psi_motor.EpicsUserMotorVME
+  deviceConfig:
+    prefix: X12SA-ES1-PIN1:TRX1
+  deviceTags:
+    - cSAXS_ES
+  onFailure: retry
+  enabled: true
+  readoutPriority: baseline
+  softwareTrigger: false
+
+aptry:
+  description: Aperture pinhole Y
+  deviceClass: ophyd_devices.devices.psi_motor.EpicsUserMotorVME
+  deviceConfig:
+    prefix: X12SA-ES1-PIN1:TRY1
+  deviceTags:
+    - cSAXS_ES
+  onFailure: retry
+  enabled: true
+  readoutPriority: baseline
+  softwareTrigger: false
+
+ebtrx:
+  description: Exposure box aperture X
+  deviceClass: ophyd_devices.devices.psi_motor.EpicsUserMotorVME
+  deviceConfig:
+    prefix: X12SA-ES1-EB:TRX1
+  deviceTags:
+    - cSAXS_ES
+  onFailure: retry
+  enabled: true
+  readoutPriority: baseline
+  softwareTrigger: false
+
+ebtry:
+  description: Exposure box aperture Y
+  deviceClass: ophyd_devices.devices.psi_motor.EpicsUserMotorVME
+  deviceConfig:
+    prefix: X12SA-ES1-EB:TRY1
+  deviceTags:
+    - cSAXS_ES
+  onFailure: retry
+  enabled: true
+  readoutPriority: baseline
+  softwareTrigger: false
+
+ebtrz:
+  description: Exposure box aperture Z
+  deviceClass: ophyd_devices.devices.psi_motor.EpicsUserMotorVME
+  deviceConfig:
+    prefix: X12SA-ES1-EB:TRZ1
+  deviceTags:
+    - cSAXS_ES
+  onFailure: retry
+  enabled: true
+  readoutPriority: baseline
+  softwareTrigger: false
+
+ebsupport:
+  description: Exposure box granite support Y
+  deviceClass: ophyd_devices.devices.psi_motor.EpicsUserMotorVME
+  deviceConfig:
+    prefix: X12SA-EH1-EB:TRY1
+  deviceTags:
+    - cSAXS_ES
+  onFailure: retry
+  enabled: true
+  readoutPriority: baseline
+  softwareTrigger: false
+
+fttrx1:
+  description: FTS1 translation X
+  deviceClass: ophyd_devices.devices.psi_motor.EpicsUserMotorVME
+  deviceConfig:
+    prefix: X12SA-ES1-FTS1:TRX1
+  deviceTags:
+    - cSAXS_ES
+  onFailure: retry
+  enabled: true
+  readoutPriority: baseline
+  softwareTrigger: false
+
+fttry1:
+  description: FTS1 translation Y
+  deviceClass: ophyd_devices.devices.psi_motor.EpicsUserMotorVME
+  deviceConfig:
+    prefix: X12SA-ES1-FTS1:TRY1
+  deviceTags:
+    - cSAXS_ES
+  onFailure: retry
+  enabled: true
+  readoutPriority: baseline
+  softwareTrigger: false
+
+fttrx2:
+  description: FTS2 translation X
+  deviceClass: ophyd_devices.devices.psi_motor.EpicsUserMotorVME
+  deviceConfig:
+    prefix: X12SA-ES1-FTS2:TRX1
+  deviceTags:
+    - cSAXS_ES
+  onFailure: retry
+  enabled: true
+  readoutPriority: baseline
+  softwareTrigger: false
+
+fttry2:
+  description: FTS2 translation Y
+  deviceClass: ophyd_devices.devices.psi_motor.EpicsUserMotorVME
+  deviceConfig:
+    prefix: X12SA-ES1-FTS2:TRY1
+  deviceTags:
+    - cSAXS_ES
+  onFailure: retry
+  enabled: true
+  readoutPriority: baseline
+  softwareTrigger: false
+
+fttrz:
+  description: FTS1 translation Z
+  deviceClass: ophyd_devices.devices.psi_motor.EpicsUserMotorVME
+  deviceConfig:
+    prefix: X12SA-ES1-FTS1:TRZ1
+  deviceTags:
+    - cSAXS_ES
+  onFailure: retry
+  enabled: true
+  readoutPriority: baseline
+  softwareTrigger: false
+
+bs1x:
+  description: Beamstop 1 X
+  deviceClass: ophyd_devices.devices.psi_motor.EpicsUserMotorVME
+  deviceConfig:
+    prefix: X12SA-ES1-BS1:TRX1
+  deviceTags:
+    - cSAXS_ES
+  onFailure: retry
+  enabled: true
+  readoutPriority: baseline
+  softwareTrigger: false
+
+bs1y:
+  description: Beamstop 1 Y
+  deviceClass: ophyd_devices.devices.psi_motor.EpicsUserMotorVME
+  deviceConfig:
+    prefix: X12SA-ES1-BS1:TRY1
+  deviceTags:
+    - cSAXS_ES
+  onFailure: retry
+  enabled: true
+  readoutPriority: baseline
+  softwareTrigger: false
+
+bs2x:
+  description: Beamstop 2 X
+  deviceClass: ophyd_devices.devices.psi_motor.EpicsUserMotorVME
+  deviceConfig:
+    prefix: X12SA-ES1-BS2:TRX1
+  deviceTags:
+    - cSAXS_ES
+  onFailure: retry
+  enabled: true
+  readoutPriority: baseline
+  softwareTrigger: false
+
+bs2y:
+  description: Beamstop 2 Y
+  deviceClass: ophyd_devices.devices.psi_motor.EpicsUserMotorVME
+  deviceConfig:
+    prefix: X12SA-ES1-BS2:TRY1
+  deviceTags:
+    - cSAXS_ES
+  onFailure: retry
+  enabled: true
+  readoutPriority: baseline
+  softwareTrigger: false
+
+dttrx:
+  description: Detector table X
+  deviceClass: ophyd_devices.devices.psi_motor.EpicsUserMotorVME
+  deviceConfig:
+    prefix: X12SA-ES1-DETT:TRX1
+  deviceTags:
+    - cSAXS_ES
+  onFailure: retry
+  enabled: true
+  readoutPriority: baseline
+  softwareTrigger: false
+
+dttry:
+  description: Detector table Y
+  deviceClass: ophyd_devices.devices.psi_motor.EpicsUserMotorVME
+  deviceConfig:
+    prefix: X12SA-ES1-DETT:TRY1
+  deviceTags:
+    - cSAXS_ES
+  onFailure: retry
+  enabled: true
+  readoutPriority: baseline
+  softwareTrigger: false
+
+dttrz:
+  description: Detector table Z
+  deviceClass: ophyd_devices.devices.psi_motor.EpicsUserMotorVME
+  deviceConfig:
+    prefix: X12SA-ES1-DETT:TRZ1
+  deviceTags:
+    - cSAXS_ES
+  onFailure: retry
+  enabled: true
+  readoutPriority: baseline
+  softwareTrigger: false
+
+dettrx:
+  description: Detector 1 X
+  deviceClass: ophyd_devices.devices.psi_motor.EpicsUserMotorVME
+  deviceConfig:
+    prefix: X12SA-ES1-DET1:TRX1
+  deviceTags:
+    - cSAXS_ES
+  onFailure: retry
+  enabled: true
+  readoutPriority: baseline
+  softwareTrigger: false

csaxs_bec/device_configs/bl_optics_hutch.yaml

@@ -68,91 +68,106 @@ ccmx:
   - cSAXS
   - optics
 
+# ccm_energy:
+#   readoutPriority: baseline
+#   deviceClass: ophyd_devices.devices.simple_positioner.PSIPositionerBase
+#     prefix: "X12SA-OP-CCM1:"
+#     override_suffixes:
+#       user_readback: "ENERGY-GET"
+#       user_setpoint: "ENERGY-SET"
+#       velocity: "ROTY:VELO"
+#   deviceTags:
+#   - user motors
+#   enabled: true
+#   readOnly: false
+
 
 
 ##########################################################################
 ######################## SMARACT STAGES ##################################
 ##########################################################################
 
-xbpm2x:
-  description: X-ray beam position monitor 1 in OPbox
-  deviceClass: csaxs_bec.devices.smaract.smaract_ophyd.SmaractMotor
-  deviceConfig:
-    axis_Id: A
-    host: x12sa-eb-smaract-mcs-03.psi.ch
-    limits:
-    - -200
-    - 200
-    port: 5000
-    sign: 1
-  enabled: true
-  onFailure: buffer
-  readOnly: false
-  readoutPriority: baseline
-  connectionTimeout: 20
-  userParameter:
-    # bl_smar_stage to use csaxs reference method. assign number according to axis channel
-    bl_smar_stage: 0
+# xbpm2x:
+#   description: X-ray beam position monitor 1 in OPbox
+#   deviceClass: csaxs_bec.devices.smaract.smaract_ophyd.SmaractMotor
+#   deviceConfig:
+#     axis_Id: A
+#     host: x12sa-eb-smaract-mcs-03.psi.ch
+#     limits:
+#     - -200
+#     - 200
+#     port: 5000
+#     sign: 1
+#   enabled: true
+#   onFailure: buffer
+#   readOnly: false
+#   readoutPriority: baseline
+#   connectionTimeout: 20
+#   userParameter:
+#     # bl_smar_stage to use csaxs reference method. assign number according to axis channel
+#     bl_smar_stage: 0
 
-xbpm2y:
-  description: X-ray beam position monitor 1 in OPbox
-  deviceClass: csaxs_bec.devices.smaract.smaract_ophyd.SmaractMotor
-  deviceConfig:
-    axis_Id: B
-    host: x12sa-eb-smaract-mcs-03.psi.ch
-    limits:
-    - -200
-    - 200
-    port: 5000
-    sign: 1
-  enabled: true
-  onFailure: buffer
-  readOnly: false
-  readoutPriority: baseline
-  connectionTimeout: 20
-  userParameter:
-    # bl_smar_stage to use csaxs reference method. assign number according to axis channel
-    bl_smar_stage: 1
+# xbpm2y:
+#   description: X-ray beam position monitor 1 in OPbox
+#   deviceClass: csaxs_bec.devices.smaract.smaract_ophyd.SmaractMotor
+#   deviceConfig:
+#     axis_Id: B
+#     host: x12sa-eb-smaract-mcs-03.psi.ch
+#     limits:
+#     - -200
+#     - 200
+#     port: 5000
+#     sign: 1
+#   enabled: true
+#   onFailure: buffer
+#   readOnly: false
+#   readoutPriority: baseline
+#   connectionTimeout: 20
+#   userParameter:
+#     # bl_smar_stage to use csaxs reference method. assign number according to axis channel
+#     bl_smar_stage: 1
+
+# cu_foilx:
+#   description: Cu foil in OPbox
+#   deviceClass: csaxs_bec.devices.smaract.smaract_ophyd.SmaractMotor
+#   deviceConfig:
+#     axis_Id: C
+#     host: x12sa-eb-smaract-mcs-03.psi.ch
+#     limits:
+#     - -200
+#     - 200
+#     port: 5000
+#     sign: 1
+#   enabled: true
+#   onFailure: buffer
+#   readOnly: false
+#   readoutPriority: baseline
+#   connectionTimeout: 20
+#   userParameter:
+#     # bl_smar_stage to use csaxs reference method. assign number according to axis channel
+#     bl_smar_stage: 2
+
+# scinx:
+#   description: scintillator in OPbox
+#   deviceClass: csaxs_bec.devices.smaract.smaract_ophyd.SmaractMotor
+#   deviceConfig:
+#     axis_Id: D
+#     host: x12sa-eb-smaract-mcs-03.psi.ch
+#     limits:
+#     - -200
+#     - 200
+#     port: 5000
+#     sign: 1
+#   enabled: true
+#   onFailure: buffer
+#   readOnly: false
+#   readoutPriority: baseline
+#   connectionTimeout: 20
+#   userParameter:
+#     # bl_smar_stage to use csaxs reference method. assign number according to axis channel
+#     bl_smar_stage: 3
 
-cu_foilx:
-  description: Cu foil in OPbox
-  deviceClass: csaxs_bec.devices.smaract.smaract_ophyd.SmaractMotor
-  deviceConfig:
-    axis_Id: C
-    host: x12sa-eb-smaract-mcs-03.psi.ch
-    limits:
-    - -200
-    - 200
-    port: 5000
-    sign: 1
-  enabled: true
-  onFailure: buffer
-  readOnly: false
-  readoutPriority: baseline
-  connectionTimeout: 20
-  userParameter:
-    # bl_smar_stage to use csaxs reference method. assign number according to axis channel
-    bl_smar_stage: 2
 
-scinx:
-  description: scintillator in OPbox
-  deviceClass: csaxs_bec.devices.smaract.smaract_ophyd.SmaractMotor
-  deviceConfig:
-    axis_Id: D
-    host: x12sa-eb-smaract-mcs-03.psi.ch
-    limits:
-    - -200
-    - 200
-    port: 5000
-    sign: 1
-  enabled: true
-  onFailure: buffer
-  readOnly: false
-  readoutPriority: baseline
-  connectionTimeout: 20
-  userParameter:
-    # bl_smar_stage to use csaxs reference method. assign number according to axis channel
-    bl_smar_stage: 3
 
 
 # dmm1_trx_readback_example: # This is the same template as for i.e. bpm4i 

csaxs_bec/device_configs/main.yaml

@@ -10,8 +10,8 @@
 endstation:
   - !include ./bl_endstation.yaml
 
-detectors:
-  - !include ./bl_detectors.yaml
+# detectors:
+#   - !include ./bl_detectors.yaml
 
 #sastt:
 #  - !include ./sastt.yaml

csaxs_bec/device_configs/ptycho_flomni.yaml

@@ -395,7 +395,7 @@ rtz:
   readoutPriority: on_request
   connectionTimeout: 20
 
-rt_flyer:
+rt_positions:
   deviceClass: csaxs_bec.devices.omny.rt.rt_flomni_ophyd.RtFlomniFlyer
   deviceConfig:
     host: mpc2844.psi.ch
@@ -522,6 +522,18 @@ omny_panda:
       FMC_IN.VAL2.Min: cap_voltage_fzp_x_min
       FMC_IN.VAL2.Max: cap_voltage_fzp_x_max
       FMC_IN.VAL2.Mean: cap_voltage_fzp_x_mean
+      INENC1.VAL.Max: interf_st_fzp_y_max
+      INENC1.VAL.Mean: interf_st_fzp_y_mean
+      INENC1.VAL.Min: interf_st_fzp_y_min
+      INENC2.VAL.Max: interf_st_fzp_x_max
+      INENC2.VAL.Mean: interf_st_fzp_x_mean
+      INENC2.VAL.Min: interf_st_fzp_x_min
+      INENC3.VAL.Max: interf_st_rotz_max
+      INENC3.VAL.Mean: interf_st_rotz_mean
+      INENC3.VAL.Min: interf_st_rotz_min
+      INENC4.VAL.Max: interf_st_rotx_max
+      INENC4.VAL.Mean: interf_st_rotx_mean
+      INENC4.VAL.Min: interf_st_rotx_min
   deviceTags:
     - detector
   enabled: true

csaxs_bec/scans/flomni_fermat_scan.py

@@ -105,11 +105,11 @@ class FlomniFermatScan(AsyncFlyScanBase):
 
     def scan_report_instructions(self):
         """Scan report instructions for the progress bar"""
-        yield from self.stubs.scan_report_instruction({"device_progress": ["rt_flyer"]})
+        yield from self.stubs.scan_report_instruction({"device_progress": ["rt_positions"]})
 
     @property
     def monitor_sync(self) -> str:
-        return "rt_flyer"
+        return "rt_positions"
 
     def initialize(self):
         self.scan_motors = []
@@ -294,10 +294,10 @@ class FlomniFermatScan(AsyncFlyScanBase):
 
     def scan_core(self):
         # send off the flyer
-        yield from self.stubs.kickoff(device="rt_flyer")
+        yield from self.stubs.kickoff(device="rt_positions")
 
         # start the readout loop of the flyer
-        status = yield from self.stubs.complete(device="rt_flyer", wait=False)
+        status = yield from self.stubs.complete(device="rt_positions", wait=False)
 
         # read the monitors until the flyer is done
         while not status.done: