feat: check all devices are enabled, if not try to enable

csaxs_bec/bec_ipython_client/plugins/LamNI/gui_tools.py

@@ -0,0 +1,188 @@
+import builtins
+
+from bec_widgets.cli.client import BECDockArea
+
+# from csaxs_bec.bec_ipython_client.plugins.cSAXS import epics_get, epics_put, fshopen, fshclose
+
+if builtins.__dict__.get("bec") is not None:
+    bec = builtins.__dict__.get("bec")
+    dev = builtins.__dict__.get("dev")
+    scans = builtins.__dict__.get("scans")
+
+def umv(*args):
+    return scans.umv(*args, relative=False)
+
+
+class LamniGuiToolsError(Exception):
+    pass
+
+
+class LamniGuiTools:
+
+    def __init__(self):
+        self.text_box = None
+        self.progressbar = None
+
+    def set_client(self, client):
+        self.client = client
+        self.gui = self.client.gui
+
+    def lamnigui_show_gui(self):
+        if "lamni" in self.gui.windows:
+            self.gui.lamni.show()
+        else:
+            self.gui.new("lamni")
+
+    def lamnigui_stop_gui(self):
+        self.gui.lamni.hide()
+
+    def lamnigui_raise(self):
+        self.gui.lamni.raise_window()
+
+    def lamnigui_show_xeyealign(self):
+        self.lamnigui_show_gui()
+        if self._lamnigui_check_attribute_not_exists("xeyegui"):
+            self.lamnigui_remove_all_docks()
+            self.xeyegui = self.gui.lamni.new("xeyegui").new("XRayEye")
+            # start live
+            if not dev.cam_xeye.live_mode:
+                dev.cam_xeye.live_mode = True
+
+
+    def _lamnigui_check_attribute_not_exists(self, attribute_name):
+        if hasattr(self.gui,"lamni"):
+            if hasattr(self.gui.lamni,attribute_name):
+                return False
+        return True
+
+    def lamnigui_remove_all_docks(self):
+        self.gui.lamni.delete_all() 
+        self.progressbar = None
+        self.text_box = None
+
+    def lamnigui_idle(self):
+        self.lamnigui_show_gui()
+        if self._lamnigui_check_attribute_not_exists("idle_text_box"):
+            self.lamnigui_remove_all_docks()
+            idle_text_box = self.gui.lamni.new("idle_textbox").new("TextBox")
+        text = (
+            "<pre>"
+            + "██████╗ ███████╗ ██████╗     ██╗      █████╗ ███╗   ███╗███╗   ██╗██╗\n"
+            + "██╔══██╗██╔════╝██╔════╝     ██║     ██╔══██╗████╗ ████║████╗  ██║██║\n"
+            + "██████╔╝█████╗  ██║          ██║     ███████║██╔████╔██║██╔██╗ ██║██║\n"
+            + "██╔══██╗██╔══╝  ██║          ██║     ██╔══██║██║╚██╔╝██║██║╚██╗██║██║\n"
+            + "██████╔╝███████╗╚██████╗     ███████╗██║  ██║██║ ╚═╝ ██║██║ ╚████║██║\n"
+            + "╚═════╝ ╚══════╝ ╚═════╝     ╚══════╝╚═╝  ╚═╝╚═╝     ╚═╝╚═╝  ╚═══╝╚═╝\n"
+            + "</pre>"
+        )
+        idle_text_box.set_html_text(text)
+
+    def lamnigui_docs(self, filename: str | None = None):
+        import csaxs_bec
+        from pathlib import Path
+
+        print("The general lamni documentation is at \nhttps://sls-csaxs.readthedocs.io/en/latest/user/ptychography/lamni.html#user-ptychography-lamni")
+
+        csaxs_bec_basepath = Path(csaxs_bec.__file__).parent
+        docs_folder = (
+            csaxs_bec_basepath /
+            "bec_ipython_client" / "plugins" / "lamni" / "docs"
+        )
+
+        if not docs_folder.is_dir():
+            raise NotADirectoryError(f"Docs folder not found: {docs_folder}")
+
+        pdfs = sorted(docs_folder.glob("*.pdf"))
+        if not pdfs:
+            raise FileNotFoundError(f"No PDF files found in {docs_folder}")
+
+        # --- Resolve PDF ------------------------------------------------------
+        if filename is not None:
+            pdf_file = docs_folder / filename
+            if not pdf_file.exists():
+                raise FileNotFoundError(f"Requested file not found: {filename}")
+        else:
+            print("\nAvailable lamni documentation PDFs:\n")
+            for i, pdf in enumerate(pdfs, start=1):
+                print(f"  {i:2d}) {pdf.name}")
+            print()
+
+            while True:
+                try:
+                    choice = int(input(f"Select a file (1–{len(pdfs)}): "))
+                    if 1 <= choice <= len(pdfs):
+                        pdf_file = pdfs[choice - 1]
+                        break
+                    print(f"Enter a number between 1 and {len(pdfs)}.")
+                except ValueError:
+                    print("Invalid input. Please enter a number.")
+
+        # --- GUI handling (active existence check) ----------------------------
+        self.lamnigui_show_gui()
+
+        if self._lamnigui_check_attribute_not_exists("PdfViewerWidget"):
+            self.lamnigui_remove_all_docks()
+            self.pdf_viewer = self.gui.lamni.new(widget="PdfViewerWidget")
+
+        # --- Load PDF ---------------------------------------------------------
+        self.pdf_viewer.PdfViewerWidget.load_pdf(str(pdf_file.resolve()))
+        print(f"\nLoaded: {pdf_file.name}\n")
+
+
+    def _lamnicam_check_device_exists(self, device):
+        try:
+            device
+        except:
+            return False
+        else:
+            return True
+
+    def lamnigui_show_progress(self):
+        self.lamnigui_show_gui()
+        if self._lamnigui_check_attribute_not_exists("progressbar"):
+            self.lamnigui_remove_all_docks()
+            # Add a new dock with a RingProgressBar widget
+            self.progressbar = self.gui.lamni.new("progressbar").new("RingProgressBar")
+            # Customize the size of the progress ring
+            self.progressbar.set_line_widths(20)
+            # Disable automatic updates and manually set the self.progressbar value
+            self.progressbar.enable_auto_updates(False)
+            # Set precision for the self.progressbar display
+            self.progressbar.set_precision(1)  # Display self.progressbar with one decimal places
+            # Setting multiple rigns with different values
+            self.progressbar.set_number_of_bars(3)
+            self.progressbar.rings[0].set_update("manual")
+            self.progressbar.rings[1].set_update("manual")
+            self.progressbar.rings[2].set_update("scan")
+            # Set the values of the rings to 50, 75, and 25 from outer to inner ring
+            # self.progressbar.set_value([50, 75])
+            # Add a new dock with a TextBox widget
+            self.text_box = self.gui.lamni.new(name="progress_text").new("TextBox")
+
+        self._lamnigui_update_progress()
+
+    def _lamnigui_update_progress(self):
+        if self.progressbar is not None:
+            progress = self.progress["projection"] / self.progress["total_projections"] * 100
+            subtomo_progress = (
+                self.progress["subtomo_projection"]
+                / self.progress["subtomo_total_projections"]
+                * 100
+            )
+            self.progressbar.set_value([progress, subtomo_progress, 0])
+            if self.text_box is not None:
+                text = f"Progress report:\n Tomo type: ....................... {self.progress['tomo_type']}\n Projection: ...................... {self.progress['projection']:.0f}\n Total projections expected ....... {self.progress['total_projections']}\n Angle: ........................... {self.progress['angle']}\n Current subtomo: ................. {self.progress['subtomo']}\n Current projection within subtomo: {self.progress['subtomo_projection']}\n Total projections per subtomo: ... {self.progress['subtomo_total_projections']}"
+                self.text_box.set_plain_text(text)
+
+
+if __name__ == "__main__":
+    from bec_lib.client import BECClient
+    from bec_widgets.cli.client_utils import BECGuiClient
+
+    client = BECClient()
+    client.start()
+    client.gui = BECGuiClient()
+
+    lamni_gui = LamniGuiTools(client)
+    lamni_gui.lamnigui_show_gui()
+    lamni_gui.lamnigui_show_progress()

csaxs_bec/bec_ipython_client/plugins/LamNI/lamni.py

@@ -2,7 +2,6 @@ import builtins
 import datetime
 import os
 import subprocess
-import threading
 import time
 from pathlib import Path
 
@@ -12,7 +11,13 @@ from bec_lib.alarm_handler import AlarmBase
 from bec_lib.pdf_writer import PDFWriter
 from typeguard import typechecked
 
-from csaxs_bec.bec_ipython_client.plugins.omny.omny_general_tools import OMNYTools
+from csaxs_bec.bec_ipython_client.plugins.omny.omny_general_tools import (
+    BeamlineChecker,
+    OMNYTools,
+    PtychoReconstructor,
+    TomoIDManager,
+)
+from csaxs_bec.bec_ipython_client.plugins.LamNI.gui_tools import LamniGuiTools
 
 from .alignment import XrayEyeAlign
 from .lamni_optics_mixin import LaMNIInitStages, LamNIOpticsMixin
@@ -26,26 +31,26 @@ if builtins.__dict__.get("bec") is not None:
     umvr = builtins.__dict__.get("umvr")
 
 
-class LamNI(LamNIOpticsMixin):
+class LamNI(LamNIOpticsMixin, LamniGuiTools):
     def __init__(self, client):
         super().__init__()
         self.client = client
         self.device_manager = client.device_manager
         self.align = XrayEyeAlign(client, self)
         self.init = LaMNIInitStages(client)
-        self.check_shutter = True
-        self.check_light_available = True
-        self.check_fofb = True
-        self._check_msgs = []
+
+        # Extracted collaborators
+        self.bl_chk = BeamlineChecker(client)
+        self.reconstructor = PtychoReconstructor(self.ptycho_reconstruct_foldername)
+        self.tomo_id_manager = TomoIDManager()
+        self.OMNYTools = OMNYTools(self.client)
+
         self.tomo_id = -1
         self.special_angles = []
         self.special_angle_repeats = 20
         self.special_angle_tolerance = 20
         self._current_special_angles = []
-        self._beam_is_okay = True
-        self._stop_beam_check_event = None
-        self.beam_check_thread = None
-        self.OMNYTools = OMNYTools(self.client)
+
         # Progress tracking
         self.progress = {}
         self.progress["tomo_type"] = "Equally spaced sub-tomograms"
@@ -57,104 +62,19 @@ class LamNI(LamNIOpticsMixin):
         self.progress["angle"] = 0
 
     # ------------------------------------------------------------------
-    # Beamline checks
+    # Beamline checks — delegated to BeamlineChecker
     # ------------------------------------------------------------------
 
-    def get_beamline_checks_enabled(self):
-        print(
-            f"Shutter: {self.check_shutter}\nFOFB: {self.check_fofb}\nLight available:"
-            f" {self.check_light_available}"
-        )
-
     @property
     def beamline_checks_enabled(self):
-        return {
-            "shutter": self.check_shutter,
-            "fofb": self.check_fofb,
-            "light available": self.check_light_available,
-        }
+        return self.bl_chk.checks_enabled
 
     @beamline_checks_enabled.setter
     def beamline_checks_enabled(self, val: bool):
-        self.check_shutter = val
-        self.check_light_available = val
-        self.check_fofb = val
-        self.get_beamline_checks_enabled()
+        self.bl_chk.checks_enabled = val
 
-    def _run_beamline_checks(self):
-        msgs = []
-        dev = builtins.__dict__.get("dev")
-        try:
-            if self.check_shutter:
-                shutter_val = dev.x12sa_es1_shutter_status.read(cached=True)
-                if shutter_val["value"].lower() != "open":
-                    self._beam_is_okay = False
-                    msgs.append("Check beam failed: Shutter is closed.")
-            if self.check_light_available:
-                machine_status = dev.sls_machine_status.read(cached=True)
-                if machine_status["value"] not in ["Light Available", "Light-Available"]:
-                    self._beam_is_okay = False
-                    msgs.append("Check beam failed: Light not available.")
-            if self.check_fofb:
-                fast_orbit_feedback = dev.sls_fast_orbit_feedback.read(cached=True)
-                if fast_orbit_feedback["value"] != "running":
-                    self._beam_is_okay = False
-                    msgs.append("Check beam failed: Fast orbit feedback is not running.")
-        except Exception:
-            logger.warning("Failed to check beam.")
-        return msgs
-
-    def _check_beam(self):
-        while not self._stop_beam_check_event.is_set():
-            self._check_msgs = self._run_beamline_checks()
-            if not self._beam_is_okay:
-                self._stop_beam_check_event.set()
-            time.sleep(1)
-
-    def _start_beam_check(self):
-        self._beam_is_okay = True
-        self._stop_beam_check_event = threading.Event()
-        self.beam_check_thread = threading.Thread(target=self._check_beam, daemon=True)
-        self.beam_check_thread.start()
-
-    def _was_beam_okay(self):
-        self._stop_beam_check_event.set()
-        self.beam_check_thread.join()
-        return self._beam_is_okay
-
-    def _print_beamline_checks(self):
-        for msg in self._check_msgs:
-            logger.warning(msg)
-
-    def _wait_for_beamline_checks(self):
-        self._print_beamline_checks()
-        try:
-            msg = bec.logbook.LogbookMessage()
-            msg.add_text(
-                "<p><mark class='pen-red'><strong>Beamline checks failed at"
-                f" {str(datetime.datetime.now())}: {''.join(self._check_msgs)}</strong></mark></p>"
-            ).add_tag(["BEC", "beam_check"])
-            self.client.logbook.send_logbook_message(msg)
-        except Exception:
-            logger.warning("Failed to send update to SciLog.")
-
-        while True:
-            self._beam_is_okay = True
-            self._check_msgs = self._run_beamline_checks()
-            if self._beam_is_okay:
-                break
-            self._print_beamline_checks()
-            time.sleep(1)
-
-        try:
-            msg = bec.logbook.LogbookMessage()
-            msg.add_text(
-                "<p><mark class='pen-red'><strong>Operation resumed at"
-                f" {str(datetime.datetime.now())}.</strong></mark></p>"
-            ).add_tag(["BEC", "beam_check"])
-            self.client.logbook.send_logbook_message(msg)
-        except Exception:
-            logger.warning("Failed to send update to SciLog.")
+    def get_beamline_checks_enabled(self):
+        self.bl_chk.print_status()
 
     # ------------------------------------------------------------------
     # Special angles
@@ -212,7 +132,6 @@ class LamNI(LamNIOpticsMixin):
     def feedback_status(self):
         self.device_manager.devices.rtx.controller.show_feedback_status()
 
-
     def show_interferometer_positions(self):
         self.device_manager.devices.rtx.controller.show_feedback_status()
 
@@ -222,6 +141,12 @@ class LamNI(LamNIOpticsMixin):
     def show_analog_signals(self):
         return self.device_manager.devices.rtx.controller.show_analog_signals()
 
+    def lights_off(self):
+        self.device_manager.devices.lsamx.controller.lights_off()
+
+    def lights_on(self):
+        self.device_manager.devices.lsamx.controller.lights_on()
+
     # ------------------------------------------------------------------
     # Global parameters (backed by BEC global vars)
     # ------------------------------------------------------------------
@@ -371,6 +296,7 @@ class LamNI(LamNIOpticsMixin):
     @ptycho_reconstruct_foldername.setter
     def ptycho_reconstruct_foldername(self, val: str):
         self.client.set_global_var("ptycho_reconstruct_foldername", val)
+        self.reconstructor.folder_name = val  # keep reconstructor in sync
 
     @property
     def tomo_angle_stepsize(self):
@@ -491,23 +417,22 @@ class LamNI(LamNIOpticsMixin):
             )
 
     # ------------------------------------------------------------------
-    # Sample database
+    # Sample database — delegated to TomoIDManager in omny general tools
     # ------------------------------------------------------------------
 
     def add_sample_database(
         self, samplename, date, eaccount, scan_number, setup, sample_additional_info, user
     ):
         """Add a sample to the OMNY sample database and retrieve the tomo id."""
-        subprocess.run(
-            "wget --user=omny --password=samples -q -O /tmp/currsamplesnr.txt"
-            f" 'https://omny.web.psi.ch/samples/newmeasurement.php?sample={samplename}"
-            f"&date={date}&eaccount={eaccount}&scannr={scan_number}&setup={setup}"
-            f"&additional={sample_additional_info}&user={user}'",
-            shell=True,
+        return self.tomo_id_manager.register(
+            sample_name=samplename,
+            date=date,
+            eaccount=eaccount,
+            scan_number=scan_number,
+            setup=setup,
+            additional_info=sample_additional_info,
+            user=user,
         )
-        with open("/tmp/currsamplesnr.txt") as tomo_number_file:
-            tomo_number = int(tomo_number_file.read())
-        return tomo_number
 
     # ------------------------------------------------------------------
     # Scan projection
@@ -524,7 +449,6 @@ class LamNI(LamNIOpticsMixin):
 
         for stitch_x in range(-self.lamni_stitch_x, self.lamni_stitch_x + 1):
             for stitch_y in range(-self.lamni_stitch_y, self.lamni_stitch_y + 1):
-                # pylint: disable=undefined-variable
                 self._current_scan_list.append(bec.queue.next_scan_number)
                 log_message = (
                     f"{str(datetime.datetime.now())}: LamNI scan projection at angle {angle},"
@@ -562,18 +486,11 @@ class LamNI(LamNIOpticsMixin):
     def tomo_reconstruct(self, base_path="~/Data10/specES1"):
         """Write the tomo reconstruct file for the reconstruction queue."""
         bec = builtins.__dict__.get("bec")
-        base_path = os.path.expanduser(base_path)
-        ptycho_queue_path = Path(os.path.join(base_path, self.ptycho_reconstruct_foldername))
-        ptycho_queue_path.mkdir(parents=True, exist_ok=True)
-
-        last_scan_number = bec.queue.next_scan_number - 1
-        ptycho_queue_file = os.path.abspath(
-            os.path.join(ptycho_queue_path, f"scan_{last_scan_number:05d}.dat")
+        self.reconstructor.write(
+            scan_list=self._current_scan_list,
+            next_scan_number=bec.queue.next_scan_number,
+            base_path=base_path,
         )
-        with open(ptycho_queue_file, "w") as queue_file:
-            scans = " ".join([str(scan) for scan in self._current_scan_list])
-            queue_file.write(f"p.scan_number {scans}\n")
-            queue_file.write("p.check_nextscan_started 1\n")
 
     def _at_each_angle(self, angle: float) -> None:
         self.tomo_scan_projection(angle)
@@ -635,7 +552,7 @@ class LamNI(LamNIOpticsMixin):
             print(f"Starting LamNI scan for angle {angle} in subtomo {subtomo_number}")
             self._print_progress()
             while not successful:
-                self._start_beam_check()
+                self.bl_chk.start()
                 if not self.special_angles:
                     self._current_special_angles = []
                 if self._current_special_angles:
@@ -662,10 +579,10 @@ class LamNI(LamNIOpticsMixin):
                 for scan_nr in range(start_scan_number, end_scan_number):
                     self._write_tomo_scan_number(scan_nr, angle, subtomo_number)
 
-                if self._was_beam_okay() and not error_caught:
+                if self.bl_chk.stop() and not error_caught:
                     successful = True
                 else:
-                    self._wait_for_beamline_checks()
+                    self.bl_chk.wait_until_recovered()
 
     def _golden(self, ii, howmany_sorted, maxangle=360, reverse=False):
         """Return the ii-th golden ratio angle within sorted bunches and its subtomo number."""
@@ -1009,5 +926,4 @@ class LamNI(LamNIOpticsMixin):
         msg.add_file(logo_path).add_text("".join(content).replace("\n", "</p><p>")).add_tag(
             ["BEC", "tomo_parameters", f"dataset_id_{dataset_id}", "LamNI", self.sample_name]
         )
-        self.client.logbook.send_logbook_message(msg)
-
+        self.client.logbook.send_logbook_message(msg)

csaxs_bec/bec_ipython_client/plugins/LamNI/lamni_optics_mixin.py

@@ -51,7 +51,7 @@ class LaMNIInitStages:
             self.drive_axis_to_limit(dev.lsamrot, "forward")
             dev.lsamrot.enabled = False
             print("Now hard reboot the controller and run the initialization routine again.")
-            print("The controller will be disabled in bec. To enable dev.lsamrot.enabled=True")
+            print("Remark: The controller will be disabled in bec. It will be enabled by running the init route, \nbut in case needed, to enable manually set dev.lsamrot.enabled=True")
             return
 
         if self.OMNYTools.yesno(

csaxs_bec/bec_ipython_client/plugins/cSAXS/smaract.py

@@ -37,6 +37,92 @@ class cSAXSInitSmaractStages:
     # ------------------------------
     # Internal helpers (runtime-based)
     # ------------------------------
+
+    def _ensure_all_session_devices_enabled(self, selection: set | None = None, try_enable: bool = True):
+        """
+        Ensure all session devices (or a selection) that define 'bl_smar_stage' are enabled.
+
+        Parameters
+        ----------
+        selection : set | None
+            If provided, only devices in this set are considered.
+        try_enable : bool
+            If True, attempt to set device.enabled = True for devices that expose 'enabled' and are False.
+            If False, only report status without changing it.
+
+        Returns
+        -------
+        dict
+            {
+                "enabled_now": [device_names enabled by this call],
+                "already_enabled": [device_names already enabled or without 'enabled' attr],
+                "failed": [device_names that could not be enabled],
+                "inaccessible": [device_names not accessible]
+            }
+        """
+        enabled_now = []
+        already_enabled = []
+        failed = []
+        inaccessible = []
+
+        # Build axis map to restrict to SmarAct-based devices (same logic as other helpers)
+        axis_map = self._build_session_axis_map(selection=selection)
+
+        for dev_name in sorted(axis_map.keys()):
+            try:
+                d = self._get_device_object(dev_name)
+                if d is None:
+                    inaccessible.append(dev_name)
+                    logger.warning(f"[cSAXS] Device {dev_name} not accessible.")
+                    continue
+
+                # If device has no 'enabled' attribute, treat as already enabled/usable
+                if not hasattr(d, "enabled"):
+                    already_enabled.append(dev_name)
+                    continue
+
+                # If already enabled
+                try:
+                    if getattr(d, "enabled"):
+                        already_enabled.append(dev_name)
+                        continue
+                except Exception:
+                    # If reading enabled fails, treat as inaccessible for safety
+                    failed.append(dev_name)
+                    logger.warning(f"[cSAXS] Could not read 'enabled' for {dev_name}.")
+                    continue
+
+                # Device exists and is disabled
+                if try_enable:
+                    try:
+                        logger.info(f"[cSAXS] Enabling device {dev_name} (was disabled).")
+                        setattr(d, "enabled", True)
+                        # small delay to let device initialize if needed
+                        time.sleep(0.05)
+                        if getattr(d, "enabled"):
+                            enabled_now.append(dev_name)
+                            logger.info(f"[cSAXS] Device {dev_name} enabled.")
+                        else:
+                            failed.append(dev_name)
+                            logger.warning(f"[cSAXS] Device {dev_name} still disabled after enabling attempt.")
+                    except Exception as exc:
+                        failed.append(dev_name)
+                        logger.error(f"[cSAXS] Failed to enable {dev_name}: {exc}")
+                else:
+                    # Not trying to enable, just report
+                    failed.append(dev_name)
+            except Exception as exc:
+                failed.append(dev_name)
+                logger.error(f"[cSAXS] _ensure_all_session_devices_enabled error for {dev_name}: {exc}")
+
+        return {
+            "enabled_now": enabled_now,
+            "already_enabled": already_enabled,
+            "failed": failed,
+            "inaccessible": inaccessible,
+        }
+
+
     def _yesno(self, question: str, default: str = "y") -> bool:
         """
         Use OMNYTools.yesno if available; otherwise default to 'yes' (or fallback to input()).
@@ -107,6 +193,7 @@ class cSAXSInitSmaractStages:
     # ------------------------------
     # Public API
     # ------------------------------
+
     def smaract_reference_stages(self, force: bool = False, devices_to_reference=None):
         """
         Reference SmarAct stages using runtime discovery.
@@ -167,6 +254,19 @@ class cSAXSInitSmaractStages:
             devices_to_reference = [devices_to_reference]
         selection = set(devices_to_reference) if devices_to_reference else None
 
+        # First: ensure all relevant devices are enabled before attempting referencing
+        enable_report = self._ensure_all_session_devices_enabled(selection=selection, try_enable=True)
+        if enable_report["failed"]:
+            logger.warning(
+                "[cSAXS] Some devices could not be enabled before referencing: "
+                + ", ".join(sorted(enable_report["failed"]))
+            )
+        if enable_report["inaccessible"]:
+            logger.warning(
+                "[cSAXS] Some devices were inaccessible before referencing: "
+                + ", ".join(sorted(enable_report["inaccessible"]))
+            )
+
         # Build axis map for selected devices (or all devices present)
         axis_map = self._build_session_axis_map(selection=selection)
         if selection:
@@ -174,7 +274,6 @@ class cSAXSInitSmaractStages:
             if unknown:
                 print(f"Unknown devices requested or missing 'bl_smar_stage' (ignored): {unknown}")
 
-
         newly_referenced = []
         already_referenced = []
         failed = []
@@ -191,6 +290,17 @@ class cSAXSInitSmaractStages:
                 failed.append(dev_name)
                 continue
 
+            # If device exposes 'enabled' and is False, skip (we already tried enabling above)
+            try:
+                if hasattr(d, "enabled") and not getattr(d, "enabled"):
+                    print(f"{dev_name}: device disabled, skipping.")
+                    failed.append(dev_name)
+                    continue
+            except Exception:
+                print(f"{dev_name}: could not read enabled state, skipping.")
+                failed.append(dev_name)
+                continue
+
             try:
                 is_ref = d.controller.axis_is_referenced(ch)
 
@@ -246,7 +356,17 @@ class cSAXSInitSmaractStages:
     def smaract_check_all_referenced(self):
         """
         Check reference state for all SmarAct devices that define 'bl_smar_stage'.
+        This now enables all relevant devices first (attempt), then performs the checks.
         """
+        # Attempt to enable all relevant devices first (do not force enabling if you prefer)
+        enable_report = self._ensure_all_session_devices_enabled(selection=None, try_enable=True)
+        if enable_report["enabled_now"]:
+            print("Now enabled devices which were disabled before: " + ", ".join(sorted(enable_report["enabled_now"])))
+        if enable_report["failed"]:
+            print("Could not enable: " + ", ".join(sorted(enable_report["failed"])))
+        if enable_report["inaccessible"]:
+            print("Inaccessible: " + ", ".join(sorted(enable_report["inaccessible"])))
+
         axis_map = self._build_session_axis_map(selection=None)
         for dev_name in sorted(axis_map.keys()):
             ch = axis_map[dev_name]
@@ -254,6 +374,16 @@ class cSAXSInitSmaractStages:
             if d is None:
                 print(f"{dev_name}: device not accessible or unsupported.")
                 continue
+
+            # Skip devices that expose 'enabled' and are False
+            try:
+                if hasattr(d, "enabled") and not getattr(d, "enabled"):
+                    print(f"{dev_name} (axis {ch}) is disabled; skipping reference check.")
+                    continue
+            except Exception:
+                print(f"{dev_name} (axis {ch}) enabled-state unknown; skipping.")
+                continue
+
             try:
                 if d.controller.axis_is_referenced(ch):
                     print(f"{dev_name} (axis {ch}) is referenced.")
@@ -262,6 +392,7 @@ class cSAXSInitSmaractStages:
             except Exception as e:
                 print(f"Error checking {dev_name} (axis {ch}): {e}")
 
+
     def smaract_components_to_initial_position(self, devices_to_move=None):
         """
         Move selected (or all) SmarAct-based components to their configured init_position.

csaxs_bec/bec_ipython_client/plugins/flomni/gui_tools.py

@@ -107,11 +107,12 @@ class flomniGuiTools:
             idle_text_box = self.gui.flomni.new("idle_textbox").new("TextBox")
         text = (
             "<pre>"
-            + " ,---.,--. ,-----. ,--.   ,--.,--.  ,--.,--. \n"
-            + "/  .-'|  |'  .-.  '|   `.'   ||  ,'.|  ||  | \n"
-            + "|  `-,|  ||  | |  ||  |'.'|  ||  |' '  ||  | \n"
-            + "|  .-'|  |'  '-'  '|  |   |  ||  | `   ||  | \n"
-            + "`--'  `--' `-----' `--'   `--'`--'  `--'`--' \n"
+            + "██████╗ ███████╗ ██████╗     ███████╗██╗      ██████╗ ███╗   ███╗███╗   ██╗██╗\n"
+            + "██╔══██╗██╔════╝██╔════╝     ██╔════╝██║     ██╔═══██╗████╗ ████║████╗  ██║██║\n"
+            + "██████╔╝█████╗  ██║          █████╗  ██║     ██║   ██║██╔████╔██║██╔██╗ ██║██║\n"
+            + "██╔══██╗██╔══╝  ██║          ██╔══╝  ██║     ██║   ██║██║╚██╔╝██║██║╚██╗██║██║\n"
+            + "██████╔╝███████╗╚██████╗     ██║     ███████╗╚██████╔╝██║ ╚═╝ ██║██║ ╚████║██║\n"
+            + "╚═════╝ ╚══════╝ ╚═════╝     ╚═╝     ╚══════╝ ╚═════╝ ╚═╝     ╚═╝╚═╝  ╚═══╝╚═╝\n"
             + "</pre>"
         )
         idle_text_box.set_html_text(text)

csaxs_bec/bec_ipython_client/plugins/omny/gui_tools.py

@@ -83,16 +83,12 @@ class OMNYGuiTools:
                 pass
         text = (
             "<pre>"
-            + "    ,o888888o.           ,8.       ,8.          b.             8 `8.`8888.      ,8' \n"
-            + " . 8888     `88.        ,888.     ,888.         888o.          8  `8.`8888.    ,8'  \n"
-            + ",8 8888       `8b      .`8888.   .`8888.        Y88888o.       8   `8.`8888.  ,8'   \n"
-            + "88 8888        `8b    ,8.`8888. ,8.`8888.       .`Y888888o.    8    `8.`8888.,8'    \n"
-            + "88 8888         88   ,8'8.`8888,8^8.`8888.      8o. `Y888888o. 8     `8.`88888'     \n"
-            + "88 8888         88  ,8' `8.`8888' `8.`8888.     8`Y8o. `Y88888o8      `8. 8888      \n"
-            + "88 8888        ,8P ,8'   `8.`88'   `8.`8888.    8   `Y8o. `Y8888       `8 8888      \n"
-            + "`8 8888       ,8P ,8'     `8.`'     `8.`8888.   8      `Y8o. `Y8        8 8888      \n"
-            + " ` 8888     ,88' ,8'       `8        `8.`8888.  8         `Y8o.`        8 8888      \n"
-            + "    `8888888P'  ,8'         `         `8.`8888. 8            `Yo        8 8888      \n"
+            + "██████╗ ███████╗ ██████╗      ██████╗ ███╗   ███╗███╗   ██╗██╗   ██╗\n"
+            + "██╔══██╗██╔════╝██╔════╝     ██╔═══██╗████╗ ████║████╗  ██║╚██╗ ██╔╝\n"
+            + "██████╔╝█████╗  ██║          ██║   ██║██╔████╔██║██╔██╗ ██║ ╚████╔╝ \n"
+            + "██╔══██╗██╔══╝  ██║          ██║   ██║██║╚██╔╝██║██║╚██╗██║  ╚██╔╝  \n"
+            + "██████╔╝███████╗╚██████╗     ╚██████╔╝██║ ╚═╝ ██║██║ ╚████║   ██║   \n"
+            + "╚═════╝ ╚══════╝ ╚═════╝      ╚═════╝ ╚═╝     ╚═╝╚═╝  ╚═══╝   ╚═╝   \n"
             + "</pre>"
         )
         self.idle_text_box.set_html_text(text)

csaxs_bec/bec_ipython_client/plugins/omny/omny_general_tools.py

@@ -1,23 +1,29 @@
-import time
-import numpy as np
-import sys
-import termios
-import tty
+import builtins
+import datetime
 import fcntl
 import os
-import builtins
+import subprocess
+import sys
+import termios
+import threading
+import time
+import tty
+from pathlib import Path
 
+import numpy as np
+from bec_lib import bec_logger
 from rich import box
 from rich.console import Console
 from rich.table import Table
 
-# from csaxs_bec.bec_ipython_client.plugins.cSAXS import epics_get, epics_put, fshopen, fshclose
+logger = bec_logger.logger
 
 if builtins.__dict__.get("bec") is not None:
     bec = builtins.__dict__.get("bec")
     dev = builtins.__dict__.get("dev")
     scans = builtins.__dict__.get("scans")
 
+
 def umv(*args):
     return scans.umv(*args, relative=False)
 
@@ -110,24 +116,20 @@ class OMNYTools:
                         next1, next2 = sys.stdin.read(2)
                         if next1 == "[":
                             if next2 == "A":
-                                # print("up")
                                 if dev2 != "none":
                                     umvr(dev2, step2)
                                     if special_command != "none":
                                         special_command()
                             elif next2 == "B":
-                                # print(" down")
                                 if dev2 != "none":
                                     umvr(dev2, -step2)
                                     if special_command != "none":
                                         special_command()
                             elif next2 == "C":
-                                # print("right")
                                 umvr(dev1, step1)
                                 if special_command != "none":
                                     special_command()
                             elif next2 == "D":
-                                # print("left")
                                 umvr(dev1, -step1)
                                 if special_command != "none":
                                     special_command()
@@ -143,13 +145,324 @@ class OMNYTools:
                             step2 = step2 / 2
                         print(f"\rHalf step size. New step size: {step1}, {step2}\r")
                 except IOError:
-                    # No input available, keep looping
                     pass
 
-                # Sleep for a short period to avoid high CPU usage
                 time.sleep(0.02)
 
         finally:
             # Restore the terminal to its original state
             termios.tcsetattr(fd, termios.TCSADRAIN, old_term)
             fcntl.fcntl(fd, fcntl.F_SETFL, old_flags)
+
+import socket
+
+class BeamlineChecker:
+    """Monitors beamline health during scans.
+
+    Runs checks in a background thread and blocks scan progress
+    until beam conditions are restored if they fail.
+
+    Usage:
+        checker = BeamlineChecker(client)
+        checker._bl_chk_start()
+        # ... run scan ...
+        beam_was_ok = checker._bl_chk_stop()
+        if not beam_was_ok:
+            checker._bl_chk_wait_until_recovered()
+    """
+
+    def __init__(self, client):
+        self.client = client
+        self.check_shutter = True
+        self.check_light_available = True
+        self.check_fofb = True
+        self._beam_is_okay = True
+        self._stop_event = None
+        self._thread = None
+        self._local_network_warned = False
+        self._check_msgs = []
+
+    # ------------------------------------------------------------------
+    # Public control interface
+    # ------------------------------------------------------------------
+
+    def bl_chk_status(self):
+        """Print and return the current enabled/disabled state of all checks."""
+        if self._is_local_network():
+            print("Beamline checks cannot be performed on this network (129.129.98.x) — skipping.")
+            return {}
+        status = {
+            "shutter": self.check_shutter,
+            "fofb": self.check_fofb,
+            "light available": self.check_light_available,
+        }
+        print(
+            f"Shutter: {self.check_shutter}\n"
+            f"FOFB: {self.check_fofb}\n"
+            f"Light available: {self.check_light_available}"
+        )
+        return status
+
+    def bl_chk_enable_all(self):
+        """Enable all beamline checks."""
+        self.check_shutter = True
+        self.check_light_available = True
+        self.check_fofb = True
+        self.bl_chk_status()
+
+    def bl_chk_disable_all(self):
+        """Disable all beamline checks."""
+        self.check_shutter = False
+        self.check_light_available = False
+        self.check_fofb = False
+        self.bl_chk_status()
+
+    def bl_chk_enable_shutter(self):
+        """Enable the shutter check."""
+        self.check_shutter = True
+        self.bl_chk_status()
+
+    def bl_chk_disable_shutter(self):
+        """Disable the shutter check."""
+        self.check_shutter = False
+        self.bl_chk_status()
+
+    def bl_chk_enable_fofb(self):
+        """Enable the fast orbit feedback check."""
+        self.check_fofb = True
+        self.bl_chk_status()
+
+    def bl_chk_disable_fofb(self):
+        """Disable the fast orbit feedback check."""
+        self.check_fofb = False
+        self.bl_chk_status()
+
+    def bl_chk_enable_light(self):
+        """Enable the light available check."""
+        self.check_light_available = True
+        self.bl_chk_status()
+
+    def bl_chk_disable_light(self):
+        """Disable the light available check."""
+        self.check_light_available = False
+        self.bl_chk_status()
+
+    def _bl_chk_start(self):
+        """Start the background beam check thread."""
+        self._beam_is_okay = True
+        self._stop_event = threading.Event()
+        self._thread = threading.Thread(target=self._poll, daemon=True)
+        self._thread.start()
+
+    def _bl_chk_stop(self) -> bool:
+        """Stop the background thread and return whether beam was okay throughout."""
+        self._stop_event.set()
+        self._thread.join()
+        return self._beam_is_okay
+
+    def _bl_chk_wait_until_recovered(self):
+        """Block until all beamline checks pass again, logging to SciLog."""
+        self._log_failure_to_scilog()
+        while True:
+            self._beam_is_okay = True
+            self._check_msgs = self._run_checks()
+            if self._beam_is_okay:
+                break
+            self._print_msgs()
+            time.sleep(1)
+        self._log_recovery_to_scilog()
+
+    # ------------------------------------------------------------------
+    # Internal
+    # ------------------------------------------------------------------
+
+    def _is_local_network(self) -> bool:
+        """Return True if running on the 129.129.98.x subnet."""
+        try:
+            hostname = socket.gethostname()
+            ip = socket.gethostbyname(hostname)
+            return ip.startswith("129.129.98.")
+        except Exception:
+            return False
+
+    def _run_checks(self) -> list:
+        if self._is_local_network():
+            if not self._local_network_warned:
+                print("Beamline checks cannot be performed on this network (129.129.98.x) — skipping.")
+                self._local_network_warned = True
+            return []
+        msgs = []
+        dev = builtins.__dict__.get("dev")
+        try:
+            if self.check_shutter:
+                val = dev.x12sa_es1_shutter_status.read(cached=True)
+                if val["value"].lower() != "open":
+                    self._beam_is_okay = False
+                    msgs.append("Check beam failed: Shutter is closed.")
+            if self.check_light_available:
+                val = dev.sls_machine_status.read(cached=True)
+                if val["value"] not in ["Light Available", "Light-Available"]:
+                    self._beam_is_okay = False
+                    msgs.append("Check beam failed: Light not available.")
+            if self.check_fofb:
+                val = dev.sls_fast_orbit_feedback.read(cached=True)
+                if val["value"] != "running":
+                    self._beam_is_okay = False
+                    msgs.append("Check beam failed: Fast orbit feedback is not running.")
+        except Exception:
+            logger.warning("Failed to check beam.")
+        return msgs
+
+    def _poll(self):
+        while not self._stop_event.is_set():
+            self._check_msgs = self._run_checks()
+            if not self._beam_is_okay:
+                self._stop_event.set()
+            time.sleep(1)
+
+    def _print_msgs(self):
+        for msg in self._check_msgs:
+            logger.warning(msg)
+
+    def _log_failure_to_scilog(self):
+        self._print_msgs()
+        try:
+            bec = builtins.__dict__.get("bec")
+            msg = bec.logbook.LogbookMessage()
+            msg.add_text(
+                "<p><mark class='pen-red'><strong>Beamline checks failed at"
+                f" {str(datetime.datetime.now())}: {''.join(self._check_msgs)}</strong></mark></p>"
+            ).add_tag(["BEC", "beam_check"])
+            self.client.logbook.send_logbook_message(msg)
+        except Exception:
+            logger.warning("Failed to send beam failure update to SciLog.")
+
+    def _log_recovery_to_scilog(self):
+        try:
+            bec = builtins.__dict__.get("bec")
+            msg = bec.logbook.LogbookMessage()
+            msg.add_text(
+                "<p><mark class='pen-red'><strong>Operation resumed at"
+                f" {str(datetime.datetime.now())}.</strong></mark></p>"
+            ).add_tag(["BEC", "beam_check"])
+            self.client.logbook.send_logbook_message(msg)
+        except Exception:
+            logger.warning("Failed to send beam recovery update to SciLog.")
+
+class PtychoReconstructor:
+    """Writes ptychography reconstruction queue files after each scan projection.
+
+    An external reconstruction engine monitors the queue folder and picks
+    up .dat files as they are written.
+
+    Usage:
+        reconstructor = PtychoReconstructor(folder_name="reconstruction_queue")
+        reconstructor.write(
+            scan_list=[1023, 1024],
+            next_scan_number=1025,
+            base_path="~/data/raw",
+        )
+    """
+
+    def __init__(self, folder_name: str = "reconstruction_queue"):
+        self.folder_name = folder_name
+
+    def _accounts_match(self) -> bool:
+        """Check if bec.active_account matches the current system user (p vs e prefix)."""
+        try:
+            bec = builtins.__dict__.get("bec")
+            active = bec.active_account  # e.g. "p23092"
+            system_user = os.getenv("USER") or os.getlogin()  # e.g. "e23092"
+            print(f"Active server account {active}, BEC client account {system_user}.")
+            return active[1:] == system_user[1:]
+        except Exception:
+            logger.warning("Failed to compare active account to system user.")
+            return False
+
+    def write(self, scan_list: list, next_scan_number: int, base_path: str = "~/data/raw/analysis/"):
+        """Write a reconstruction queue file for the given scan list.
+
+        Args:
+            scan_list (list): Scan numbers belonging to this projection
+                              (may contain multiple entries when stitching).
+            next_scan_number (int): The current next scan number, used to
+                                    name the queue file.
+            base_path (str): Root path under which the queue folder lives.
+        """
+        base_path = os.path.expanduser(base_path)
+        queue_path = Path(os.path.join(base_path, self.folder_name))
+        queue_path.mkdir(parents=True, exist_ok=True)
+
+        last_scan_number = next_scan_number - 1
+        queue_file = os.path.abspath(
+            os.path.join(queue_path, f"scan_{last_scan_number:05d}.dat")
+        )
+        with open(queue_file, "w") as f:
+            scans = " ".join(str(s) for s in scan_list)
+            f.write(f"p.scan_number {scans}\n")
+            f.write("p.check_nextscan_started 1\n")
+
+
+class TomoIDManager:
+    """Registers a tomography measurement in the OMNY sample database
+    and returns its assigned tomo ID.
+
+    Usage:
+        id_manager = TomoIDManager()
+        tomo_id = id_manager.register(
+            sample_name="my_sample",
+            date="2024-03-08",
+            eaccount="e12345",
+            scan_number=1001,
+            setup="lamni",
+            additional_info="test info",
+            user="BEC",
+        )
+    """
+
+    OMNY_URL = "https://omny.web.psi.ch/samples/newmeasurement.php"
+    OMNY_USER = "omny"
+    OMNY_PASSWORD = "samples"
+    TMP_FILE = "/tmp/currsamplesnr.txt"
+
+    def register(
+        self,
+        sample_name: str,
+        date: str,
+        eaccount: str,
+        scan_number: int,
+        setup: str,
+        additional_info: str,
+        user: str,
+    ) -> int:
+        """Register a new measurement and return the assigned tomo ID.
+
+        Args:
+            sample_name (str): Name of the sample.
+            date (str): Date string (e.g. "2024-03-08").
+            eaccount (str): E-account identifier.
+            scan_number (int): First scan number of the measurement.
+            setup (str): Setup name (e.g. "lamni").
+            additional_info (str): Any additional sample information.
+            user (str): User name.
+
+        Returns:
+            int: The tomo ID assigned by the OMNY database.
+        """
+        url = (
+            f"{self.OMNY_URL}"
+            f"?sample={sample_name}"
+            f"&date={date}"
+            f"&eaccount={eaccount}"
+            f"&scannr={scan_number}"
+            f"&setup={setup}"
+            f"&additional={additional_info}"
+            f"&user={user}"
+        )
+        subprocess.run(
+            f"wget --user={self.OMNY_USER} --password={self.OMNY_PASSWORD}"
+            f" -q -O {self.TMP_FILE} '{url}'",
+            shell=True,
+        )
+        with open(self.TMP_FILE) as f:
+            return int(f.read())

csaxs_bec/bec_ipython_client/startup/post_startup.py

@@ -111,3 +111,34 @@ bec._beamline_mixin._bl_info_register(OperatorInfo)
 # SETUP PROMPTS
 bec._ip.prompts.session_name = _session_name
 bec._ip.prompts.status = 1
+
+# ACCOUNT MISMATCH CHECK
+import os
+
+def _check_account_mismatch():
+    try:
+        active = bec.active_account  # e.g. "p23092"
+        system_user = os.getenv("USER") or os.getlogin()  # e.g. "e23092"
+        if active[1:] != system_user[1:]:
+            print(f"""
+\033[91m\033[1m
+    ██╗    ██╗ █████╗ ██████╗ ███╗   ██╗██╗███╗   ██╗ ██████╗ 
+    ██║    ██║██╔══██╗██╔══██╗████╗  ██║██║████╗  ██║██╔════╝ 
+    ██║ █╗ ██║███████║██████╔╝██╔██╗ ██║██║██╔██╗ ██║██║  ███╗
+    ██║███╗██║██╔══██║██╔══██╗██║╚██╗██║██║██║╚██╗██║██║   ██║
+    ╚███╔███╔╝██║  ██║██║  ██║██║ ╚████║██║██║ ╚████║╚██████╔╝
+    ╚══╝╚══╝ ╚═╝  ╚═╝╚═╝  ╚═╝╚═╝  ╚═══╝╚═╝╚═╝  ╚═══╝ ╚═════╝ 
+
+    ACCOUNT MISMATCH DETECTED!
+    BEC active account : {active}
+    System user        : {system_user}
+
+    Data read and written by the BEC client does not match the data account!
+    Please verify you are logged in with the correct account.
+\033[0m""")
+    except Exception:
+        logger.warning("Failed to verify account match.")
+
+
+if _args.session.lower() == "lamni" or _args.session.lower() == "flomni" or _args.session.lower() == "omny":
+    _check_account_mismatch()

csaxs_bec/bec_widgets/widgets/client.py

@@ -13,10 +13,69 @@ logger = bec_logger.logger
 
 
 _Widgets = {
+    "OmnyAlignment": "OmnyAlignment",
     "XRayEye": "XRayEye",
 }
 
 
+class OmnyAlignment(RPCBase):
+    @property
+    @rpc_call
+    def enable_live_view(self):
+        """
+        None
+        """
+
+    @enable_live_view.setter
+    @rpc_call
+    def enable_live_view(self):
+        """
+        None
+        """
+
+    @property
+    @rpc_call
+    def user_message(self):
+        """
+        None
+        """
+
+    @user_message.setter
+    @rpc_call
+    def user_message(self):
+        """
+        None
+        """
+
+    @property
+    @rpc_call
+    def sample_name(self):
+        """
+        None
+        """
+
+    @sample_name.setter
+    @rpc_call
+    def sample_name(self):
+        """
+        None
+        """
+
+    @property
+    @rpc_call
+    def enable_move_buttons(self):
+        """
+        None
+        """
+
+    @enable_move_buttons.setter
+    @rpc_call
+    def enable_move_buttons(self):
+        """
+        None
+        """
+
+
 class XRayEye(RPCBase):
     @rpc_call
     def active_roi(self) -> "BaseROI | None":
@@ -24,6 +83,20 @@ class XRayEye(RPCBase):
         Return the currently active ROI, or None if no ROI is active.
         """
 
+    @property
+    @rpc_call
+    def enable_live_view(self):
+        """
+        Get or set the live view enabled state.
+        """
+
+    @enable_live_view.setter
+    @rpc_call
+    def enable_live_view(self):
+        """
+        Get or set the live view enabled state.
+        """
+
     @property
     @rpc_call
     def user_message(self):

csaxs_bec/bec_widgets/widgets/omny_alignment/omny_alignment.py

@@ -0,0 +1,140 @@
+
+
+from typing import TypedDict
+from bec_widgets.utils.error_popups import SafeSlot
+import os
+from bec_widgets.utils.bec_widget import BECWidget
+from bec_widgets.utils.ui_loader import UILoader
+from qtpy.QtWidgets import QWidget, QPushButton, QLineEdit, QLabel, QVBoxLayout
+from bec_qthemes import material_icon
+from bec_lib.logger import bec_logger
+
+logger = bec_logger.logger 
+
+
+# class OmnyAlignmentUIComponents(TypedDict):
+#     moveRightButton: QPushButton
+#     moveLeftButton: QPushButton
+#     moveUpButton: QPushButton
+#     moveDownButton: QPushButton
+#     image: Image
+
+
+class OmnyAlignment(BECWidget, QWidget):
+    USER_ACCESS = ["enable_live_view", "enable_live_view.setter", "user_message", "user_message.setter","sample_name", "sample_name.setter", "enable_move_buttons", "enable_move_buttons.setter"]
+    PLUGIN = True
+    ui_file = "./omny_alignment.ui"
+
+    def __init__(self, parent=None, **kwargs):
+        super().__init__(parent=parent, **kwargs)
+        
+        self._load_ui()
+
+    def _load_ui(self):
+        current_path = os.path.dirname(__file__)
+        self.ui = UILoader(self).loader(os.path.join(current_path, self.ui_file))
+        layout = QVBoxLayout()
+        layout.addWidget(self.ui)
+        self.setLayout(layout)
+
+        icon_options = {"size": (16, 16), "convert_to_pixmap": False}
+        self.ui.moveRightButton.setText("")
+        self.ui.moveRightButton.setIcon(
+            material_icon(icon_name="keyboard_arrow_right", **icon_options)
+        )
+
+        self.ui.moveLeftButton.setText("")
+        self.ui.moveLeftButton.setIcon(
+            material_icon(icon_name="keyboard_arrow_left", **icon_options)
+        )
+
+        self.ui.moveUpButton.setText("")
+        self.ui.moveUpButton.setIcon(
+            material_icon(icon_name="keyboard_arrow_up", **icon_options)
+        )
+
+        self.ui.moveDownButton.setText("")
+        self.ui.moveDownButton.setIcon(
+            material_icon(icon_name="keyboard_arrow_down", **icon_options)
+        )
+
+        self.ui.confirmButton.setText("OK")
+
+
+        self.ui.liveViewSwitch.enabled.connect(self.on_live_view_enabled)
+
+        # self.ui.moveUpButton.clicked.connect(self.on_move_up)
+
+
+    @property
+    def enable_live_view(self):
+        return self.ui.liveViewSwitch.checked
+    
+    @enable_live_view.setter
+    def enable_live_view(self, enable:bool):
+        self.ui.liveViewSwitch.checked = enable
+
+
+    @property
+    def user_message(self):
+        return self.ui.messageLineEdit.text()
+    
+    @user_message.setter
+    def user_message(self, message:str):
+        self.ui.messageLineEdit.setText(message)
+
+    @property
+    def sample_name(self):
+        return self.ui.sampleLineEdit.text()
+    
+    @sample_name.setter
+    def sample_name(self, message:str):
+        self.ui.sampleLineEdit.setText(message)
+
+
+    @SafeSlot(bool)
+    def on_live_view_enabled(self, enabled:bool):
+        from bec_widgets.widgets.plots.image.image import Image
+        logger.info(f"Live view is enabled: {enabled}")
+        image: Image = self.ui.image
+        if enabled:
+            image.image("cam_xeye")
+            return
+        
+        image.disconnect_monitor("cam_xeye")
+
+
+    @property
+    def enable_move_buttons(self):
+        move_up:QPushButton = self.ui.moveUpButton
+        move_down:QPushButton = self.ui.moveDownButton
+        move_left:QPushButton = self.ui.moveLeftButton
+        move_right:QPushButton = self.ui.moveRightButton
+        return move_up.isEnabled() and move_down.isEnabled() and move_left.isEnabled() and move_right.isEnabled()
+    
+    @enable_move_buttons.setter
+    def enable_move_buttons(self, enabled:bool):
+        move_up:QPushButton = self.ui.moveUpButton
+        move_down:QPushButton = self.ui.moveDownButton
+        move_left:QPushButton = self.ui.moveLeftButton
+        move_right:QPushButton = self.ui.moveRightButton
+
+        move_up.setEnabled(enabled)
+        move_down.setEnabled(enabled)
+        move_left.setEnabled(enabled)
+        move_right.setEnabled(enabled)
+
+        
+
+
+
+
+if __name__ == "__main__":
+    from qtpy.QtWidgets import QApplication
+    import sys
+
+    app = QApplication(sys.argv)
+    widget = OmnyAlignment()
+
+    widget.show()
+    sys.exit(app.exec_())

csaxs_bec/bec_widgets/widgets/omny_alignment/omny_alignment.pyproject

@@ -0,0 +1 @@
+{'files': ['omny_alignment.py']}

csaxs_bec/bec_widgets/widgets/omny_alignment/omny_alignment.ui

@@ -0,0 +1,125 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>Form</class>
+ <widget class="QWidget" name="Form">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>988</width>
+    <height>821</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Form</string>
+  </property>
+  <layout class="QGridLayout" name="gridLayout_3">
+   <item row="2" column="2">
+    <layout class="QGridLayout" name="gridLayout">
+     <item row="1" column="2">
+      <widget class="QPushButton" name="moveRightButton">
+       <property name="text">
+        <string>PushButton</string>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="0">
+      <widget class="QPushButton" name="moveLeftButton">
+       <property name="text">
+        <string>PushButton</string>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="1">
+      <widget class="QPushButton" name="moveUpButton">
+       <property name="text">
+        <string>Up</string>
+       </property>
+      </widget>
+     </item>
+     <item row="2" column="1">
+      <widget class="QPushButton" name="moveDownButton">
+       <property name="text">
+        <string>PushButton</string>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="1">
+      <widget class="QPushButton" name="confirmButton">
+       <property name="text">
+        <string>PushButton</string>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item row="2" column="0">
+    <layout class="QGridLayout" name="gridLayout_2">
+     <item row="0" column="1">
+      <widget class="QLineEdit" name="sampleLineEdit"/>
+     </item>
+     <item row="1" column="1">
+      <widget class="QLineEdit" name="messageLineEdit"/>
+     </item>
+     <item row="0" column="0">
+      <widget class="QLabel" name="label">
+       <property name="text">
+        <string>Sample</string>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="0">
+      <widget class="QLabel" name="label_2">
+       <property name="text">
+        <string>Message</string>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item row="1" column="0" colspan="3">
+    <widget class="Image" name="image">
+     <property name="enable_toolbar" stdset="0">
+      <bool>false</bool>
+     </property>
+     <property name="inner_axes" stdset="0">
+      <bool>false</bool>
+     </property>
+     <property name="monitor" stdset="0">
+      <string>cam_xeye</string>
+     </property>
+     <property name="rotation" stdset="0">
+      <number>3</number>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="3">
+    <widget class="ToggleSwitch" name="liveViewSwitch"/>
+   </item>
+   <item row="0" column="2">
+    <widget class="QLabel" name="label_3">
+     <property name="text">
+      <string>Live View</string>
+     </property>
+     <property name="alignment">
+      <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <customwidgets>
+  <customwidget>
+   <class>Image</class>
+   <extends>QWidget</extends>
+   <header>image</header>
+  </customwidget>
+  <customwidget>
+   <class>ToggleSwitch</class>
+   <extends>QWidget</extends>
+   <header>toggle_switch</header>
+  </customwidget>
+ </customwidgets>
+ <resources/>
+ <connections/>
+</ui>

csaxs_bec/bec_widgets/widgets/omny_alignment/omny_alignment_plugin.py

@@ -0,0 +1,54 @@
+# Copyright (C) 2022 The Qt Company Ltd.
+# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
+
+from qtpy.QtDesigner import QDesignerCustomWidgetInterface
+
+from bec_widgets.utils.bec_designer import designer_material_icon
+from csaxs_bec.bec_widgets.widgets.omny_alignment.omny_alignment import OmnyAlignment
+
+DOM_XML = """
+<ui language='c++'>
+    <widget class='OmnyAlignment' name='omny_alignment'>
+    </widget>
+</ui>
+"""
+
+
+class OmnyAlignmentPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
+    def __init__(self):
+        super().__init__()
+        self._form_editor = None
+
+    def createWidget(self, parent):
+        t = OmnyAlignment(parent)
+        return t
+
+    def domXml(self):
+        return DOM_XML
+
+    def group(self):
+        return ""
+
+    def icon(self):
+        return designer_material_icon(OmnyAlignment.ICON_NAME)
+
+    def includeFile(self):
+        return "omny_alignment"
+
+    def initialize(self, form_editor):
+        self._form_editor = form_editor
+
+    def isContainer(self):
+        return False
+
+    def isInitialized(self):
+        return self._form_editor is not None
+
+    def name(self):
+        return "OmnyAlignment"
+
+    def toolTip(self):
+        return "OmnyAlignment"
+
+    def whatsThis(self):
+        return self.toolTip()

csaxs_bec/bec_widgets/widgets/omny_alignment/register_omny_alignment.py

@@ -0,0 +1,15 @@
+def main():  # pragma: no cover
+    from qtpy import PYSIDE6
+
+    if not PYSIDE6:
+        print("PYSIDE6 is not available in the environment. Cannot patch designer.")
+        return
+    from PySide6.QtDesigner import QPyDesignerCustomWidgetCollection
+
+    from csaxs_bec.bec_widgets.widgets.omny_alignment.omny_alignment_plugin import OmnyAlignmentPlugin
+
+    QPyDesignerCustomWidgetCollection.addCustomWidget(OmnyAlignmentPlugin())
+
+
+if __name__ == "__main__":  # pragma: no cover
+    main()

csaxs_bec/bec_widgets/widgets/xray_eye/x_ray_eye.py

@@ -33,48 +33,46 @@ class XRayEye2DControl(BECWidget, QWidget):
         self.get_bec_shortcuts()
         self._step_size = step_size
         self.root_layout = QGridLayout(self)
-        self.setStyleSheet(
-            """
+        self.setStyleSheet("""
         QToolButton {
         border: 1px solid;
         border-radius: 4px;
         }
-        """
-        )
+        """)
         # Up
         self.move_up_button = QToolButton(parent=self)
-        self.move_up_button.setIcon(material_icon("keyboard_double_arrow_up"))
+        self.move_up_button.setIcon(material_icon('keyboard_double_arrow_up'))
         self.root_layout.addWidget(self.move_up_button, 0, 2)
         # Up tweak button
         self.move_up_tweak_button = QToolButton(parent=self)
-        self.move_up_tweak_button.setIcon(material_icon("keyboard_arrow_up"))
+        self.move_up_tweak_button.setIcon(material_icon('keyboard_arrow_up'))
         self.root_layout.addWidget(self.move_up_tweak_button, 1, 2)
 
         # Left
         self.move_left_button = QToolButton(parent=self)
-        self.move_left_button.setIcon(material_icon("keyboard_double_arrow_left"))
+        self.move_left_button.setIcon(material_icon('keyboard_double_arrow_left'))
         self.root_layout.addWidget(self.move_left_button, 2, 0)
         # Left tweak button
         self.move_left_tweak_button = QToolButton(parent=self)
-        self.move_left_tweak_button.setIcon(material_icon("keyboard_arrow_left"))
+        self.move_left_tweak_button.setIcon(material_icon('keyboard_arrow_left'))
         self.root_layout.addWidget(self.move_left_tweak_button, 2, 1)
 
         # Right
         self.move_right_button = QToolButton(parent=self)
-        self.move_right_button.setIcon(material_icon("keyboard_double_arrow_right"))
+        self.move_right_button.setIcon(material_icon('keyboard_double_arrow_right'))
         self.root_layout.addWidget(self.move_right_button, 2, 4)
         # Right tweak button
         self.move_right_tweak_button = QToolButton(parent=self)
-        self.move_right_tweak_button.setIcon(material_icon("keyboard_arrow_right"))
+        self.move_right_tweak_button.setIcon(material_icon('keyboard_arrow_right'))
         self.root_layout.addWidget(self.move_right_tweak_button, 2, 3)
 
         # Down
         self.move_down_button = QToolButton(parent=self)
-        self.move_down_button.setIcon(material_icon("keyboard_double_arrow_down"))
+        self.move_down_button.setIcon(material_icon('keyboard_double_arrow_down'))
         self.root_layout.addWidget(self.move_down_button, 4, 2)
         # Down tweak button
         self.move_down_tweak_button = QToolButton(parent=self)
-        self.move_down_tweak_button.setIcon(material_icon("keyboard_arrow_down"))
+        self.move_down_tweak_button.setIcon(material_icon('keyboard_arrow_down'))
         self.root_layout.addWidget(self.move_down_tweak_button, 3, 2)
 
         # Connections
@@ -126,15 +124,8 @@ class XRayEye2DControl(BECWidget, QWidget):
 
 
 class XRayEye(BECWidget, QWidget):
-    USER_ACCESS = [
-        "active_roi",
-        "user_message",
-        "user_message.setter",
-        "sample_name",
-        "sample_name.setter",
-        "enable_move_buttons",
-        "enable_move_buttons.setter",
-    ]
+    USER_ACCESS = ["active_roi", "enable_live_view", "enable_live_view.setter", "user_message", "user_message.setter",
+                   "sample_name", "sample_name.setter", "enable_move_buttons", "enable_move_buttons.setter"]
     PLUGIN = True
 
     def __init__(self, parent=None, **kwargs):
@@ -145,9 +136,7 @@ class XRayEye(BECWidget, QWidget):
         self._make_connections()
 
         # Connection to redis endpoints
-        self.bec_dispatcher.connect_slot(
-            self.device_updates, MessageEndpoints.device_readback("omny_xray_gui")
-        )
+        self.bec_dispatcher.connect_slot(self.device_updates, MessageEndpoints.device_readback("omny_xray_gui"))
         self.connect_motors()
         self.resize(800, 600)
         QTimer.singleShot(0, self._init_gui_trigger)
@@ -156,9 +145,7 @@ class XRayEye(BECWidget, QWidget):
         self.core_layout = QHBoxLayout(self)
 
         self.image = Image(parent=self)
-        self.image.enable_toolbar = (
-            False  # Disable default toolbar to not allow to user set anything
-        )
+        self.image.enable_toolbar = False  # Disable default toolbar to not allow to user set anything
         self.image.inner_axes = False  # Disable inner axes to maximize image area
         self.image.plot_item.vb.invertY(True)  # #TODO Invert y axis to match logic of LabView GUI
 
@@ -169,9 +156,8 @@ class XRayEye(BECWidget, QWidget):
         self.control_panel_layout.setSpacing(10)
 
         # ROI toolbar + Live toggle (header row)
-        self.roi_manager = ROIPropertyTree(
-            parent=self, image_widget=self.image, compact=True, compact_orientation="horizontal"
-        )
+        self.roi_manager = ROIPropertyTree(parent=self, image_widget=self.image, compact=True,
+                                           compact_orientation="horizontal")
         header_row = QHBoxLayout()
         header_row.setContentsMargins(0, 0, 0, 0)
         header_row.setSpacing(8)
@@ -244,9 +230,7 @@ class XRayEye(BECWidget, QWidget):
 
         # Make connections
         self.live_preview_toggle.enabled.connect(self.on_live_view_enabled)
-        self.step_size.valueChanged.connect(
-            lambda x: self.motor_control_2d.setProperty("step_size", x)
-        )
+        self.step_size.valueChanged.connect(lambda x: self.motor_control_2d.setProperty("step_size", x))
         self.submit_button.clicked.connect(self.submit)
 
     def _create_separator(self):
@@ -264,14 +248,12 @@ class XRayEye(BECWidget, QWidget):
     ################################################################################
 
     def connect_motors(self):
-        """Checks one of the possible motors for flomni, omny and lamni setup."""
-        possible_motors = ["osamroy", "lsamrot", "fsamroy"]
+        """ Checks one of the possible motors for flomni, omny and lamni setup."""
+        possible_motors = ['osamroy', 'lsamrot', 'fsamroy']
 
         for motor in possible_motors:
             if motor in self.dev:
-                self.bec_dispatcher.connect_slot(
-                    self.on_tomo_angle_readback, MessageEndpoints.device_readback(motor)
-                )
+                self.bec_dispatcher.connect_slot(self.on_tomo_angle_readback, MessageEndpoints.device_readback(motor))
                 logger.info(f"Succesfully connected to {motor}")
 
     ################################################################################
@@ -359,7 +341,7 @@ class XRayEye(BECWidget, QWidget):
 
     @SafeSlot(bool, bool)
     def on_tomo_angle_readback(self, data: dict, meta: dict):
-        # TODO implement if needed
+        #TODO implement if needed
         print(f"data: {data}")
         print(f"meta: {meta}")
 
@@ -373,25 +355,25 @@ class XRayEye(BECWidget, QWidget):
             meta(dict): metadata from device
         """
 
-        signals = data.get("signals")
-        enable_live_preview = signals.get("omny_xray_gui_update_frame_acq").get("value")
-        enable_x_motor = signals.get("omny_xray_gui_enable_mv_x").get("value")
-        enable_y_motor = signals.get("omny_xray_gui_enable_mv_y").get("value")
+        signals = data.get('signals')
+        enable_live_preview = signals.get("omny_xray_gui_update_frame_acq").get('value')
+        enable_x_motor = signals.get("omny_xray_gui_enable_mv_x").get('value')
+        enable_y_motor = signals.get("omny_xray_gui_enable_mv_y").get('value')
         self.on_live_view_enabled(bool(enable_live_preview))
         self.on_motors_enable(bool(enable_x_motor), bool(enable_y_motor))
 
         # Signals from epics gui device
         # send message
-        user_message = signals.get("omny_xray_gui_send_message").get("value")
+        user_message = signals.get("omny_xray_gui_send_message").get('value')
         self.user_message = user_message
         # sample name
-        sample_message = signals.get("omny_xray_gui_sample_name").get("value")
+        sample_message = signals.get("omny_xray_gui_sample_name").get('value')
         self.sample_name = sample_message
         # enable frame acquisition
-        update_frame_acq = signals.get("omny_xray_gui_update_frame_acq").get("value")
+        update_frame_acq = signals.get("omny_xray_gui_update_frame_acq").get('value')
         self.on_live_view_enabled(bool(update_frame_acq))
         # enable submit button
-        enable_submit_button = signals.get("omny_xray_gui_submit").get("value")
+        enable_submit_button = signals.get("omny_xray_gui_submit").get('value')
         self.enable_submit_button(enable_submit_button)
 
     @SafeSlot()
@@ -401,40 +383,35 @@ class XRayEye(BECWidget, QWidget):
             logger.warning("No active ROI")
             return
         roi_coordinates = self.roi_manager.single_active_roi.get_coordinates()
-        roi_center_x = roi_coordinates["center_x"]
-        roi_center_y = roi_coordinates["center_y"]
+        roi_center_x = roi_coordinates['center_x']
+        roi_center_y = roi_coordinates['center_y']
         # Case of rectangular ROI
         if isinstance(self.roi_manager.single_active_roi, RectangularROI):
-            roi_width = roi_coordinates["width"]
-            roi_height = roi_coordinates["height"]
+            roi_width = roi_coordinates['width']
+            roi_height = roi_coordinates['height']
         elif isinstance(self.roi_manager.single_active_roi, CircularROI):
-            roi_width = roi_coordinates["diameter"]
-            roi_height = roi_coordinates["radius"]
+            roi_width = roi_coordinates['diameter']
+            roi_height = roi_coordinates['radius']
         else:
             logger.warning("Unsupported ROI type for submit action.")
             return
 
-        print(
-            f"current roi: x:{roi_center_x}, y:{roi_center_y}, w:{roi_width},h:{roi_height}"
-        )  # TODO remove when will be not needed for debugging
+        print(f"current roi: x:{roi_center_x}, y:{roi_center_y}, w:{roi_width},h:{roi_height}") #TODO remove when will be not needed for debugging
         # submit roi coordinates
-        step = int(self.dev.omny_xray_gui.step.read().get("omny_xray_gui_step").get("value"))
+        step = int(self.dev.omny_xray_gui.step.read().get("omny_xray_gui_step").get('value'))
 
         xval_x = getattr(self.dev.omny_xray_gui.xval_x, f"xval_x_{step}").set(roi_center_x)
         xval_y = getattr(self.dev.omny_xray_gui.yval_y, f"yval_y_{step}").set(roi_center_y)
         width_x = getattr(self.dev.omny_xray_gui.width_x, f"width_x_{step}").set(roi_width)
         width_y = getattr(self.dev.omny_xray_gui.width_y, f"width_y_{step}").set(roi_height)
         self.dev.omny_xray_gui.submit.set(1)
-
+    
     def cleanup(self):
         """Cleanup connections on widget close -> disconnect slots and stop live mode of camera."""
-        self.bec_dispatcher.disconnect_slot(
-            self.device_updates, MessageEndpoints.device_readback("omny_xray_gui")
-        )
-        getattr(self.dev, CAMERA[0]).live_mode = False
+        self.bec_dispatcher.disconnect_slot(self.device_updates, MessageEndpoints.device_readback("omny_xray_gui"))
+        getattr(self.dev,CAMERA[0]).live_mode = False
         super().cleanup()
 
-
 if __name__ == "__main__":
     import sys
 

csaxs_bec/device_configs/ptycho_lamni.yaml

@@ -271,4 +271,20 @@ rty:
   enabled: true
   readOnly: False
 
-
+############################################################
+######################### Cameras ##########################
+############################################################
+cam_xeye:
+  description: Camera LamNI Xray eye ID15
+  deviceClass: csaxs_bec.devices.ids_cameras.ids_camera.IDSCamera
+  deviceConfig:
+    camera_id: 15
+    bits_per_pixel: 24
+    num_rotation_90: 3
+    transpose: false
+    force_monochrome: true
+    m_n_colormode: 1
+  enabled: true
+  onFailure: buffer
+  readOnly: false
+  readoutPriority: async

csaxs_bec/devices/epics/mcs_card/mcs_card_csaxs.py

@@ -392,7 +392,6 @@ class MCSCardCSAXS(PSIDeviceBase, MCSCard):
         self._current_data_index = 0
 
         # NOTE Make sure that the signal that omits mca callbacks is cleared
-        # DO NOT REMOVE!!
         self._omit_mca_callbacks.clear()
 
         # For a fly scan we need to start the mcs card ourselves
@@ -444,6 +443,7 @@ class MCSCardCSAXS(PSIDeviceBase, MCSCard):
         while not self._scan_done_thread_kill_event.is_set():
             while self._start_monitor_async_data_emission.wait():
                 try:
+                    logger.debug(f"Monitoring async data emission for {self.name}...")
                     if (
                         hasattr(self.scan_info.msg, "num_points")
                         and self.scan_info.msg.num_points is not None
@@ -453,6 +453,7 @@ class MCSCardCSAXS(PSIDeviceBase, MCSCard):
                                 for callback in self._scan_done_callbacks:
                                     callback(exception=None)
                         else:
+                            logger.info(f"Current data index is {self._current_data_index}")
                             if self._current_data_index >= 1:
                                 for callback in self._scan_done_callbacks:
                                     callback(exception=None)
@@ -548,9 +549,8 @@ class MCSCardCSAXS(PSIDeviceBase, MCSCard):
 
     def on_stop(self) -> None:
         """Hook called when the device is stopped. In addition, any status that is registered through cancel_on_stop will be cancelled here."""
-        with suppress_mca_callbacks(self):
-            self.stop_all.put(1)
-            self.erase_all.put(1)
+        self.stop_all.put(1)
+        self.erase_all.put(1)
 
     def mcs_recovery(self, timeout: int = 1) -> None:
         """

csaxs_bec/devices/omny/galil/lgalil_ophyd.py

@@ -15,7 +15,6 @@ from csaxs_bec.devices.omny.galil.galil_ophyd import (
     GalilAxesReferenced,
     GalilController,
     GalilMotorIsMoving,
-    GalilMotorResolution,
     GalilSetpointSignal,
     GalilSignalRO,
     retry_once,
@@ -24,6 +23,19 @@ from csaxs_bec.devices.omny.galil.galil_ophyd import (
 logger = bec_logger.logger
 
 
+class GalilMotorResolution(GalilSignalRO):
+    @retry_once
+    @threadlocked
+    def _socket_get(self):
+        if self.parent.axis_Id_numeric < 6:
+            return float(
+                self.controller.socket_put_and_receive(f"MG encpermm[{self.parent.axis_Id_numeric}]")
+            )
+        else:
+            return float(
+                self.controller.socket_put_and_receive(f"MG stppermm[{self.parent.axis_Id_numeric}]")
+            )
+
 class LamniGalilController(GalilController):
 
 
@@ -154,11 +166,18 @@ class LamniGalilReadbackSignal(GalilSignalRO):
         Returns:
             float: Readback value after adjusting for sign and motor resolution.
         """
-        current_pos = float(self.controller.socket_put_and_receive(f"TD{self.parent.axis_Id}"))
-        current_pos *= self.parent.sign
-        step_mm = self.parent.motor_resolution.get()
-        return current_pos / step_mm
-
+        if self.parent.axis_Id_numeric < 6:
+            current_pos = float(self.controller.socket_put_and_receive(f"TP{self.parent.axis_Id}"))
+            current_pos *= self.parent.sign
+            encoder_resolution = self.parent.motor_resolution.get()
+            logger.info(f"Read galil encoder position of axis {self.parent.axis_Id_numeric} to be TP {current_pos} with resolution {encoder_resolution}")
+            return current_pos / encoder_resolution
+        else:
+            current_pos = float(self.controller.socket_put_and_receive(f"TD{self.parent.axis_Id}"))
+            current_pos *= self.parent.sign
+            step_mm = self.parent.motor_resolution.get()
+            return current_pos / step_mm
+        
     def read(self):
         self._metadata["timestamp"] = time.time()
         val = super().read()

csaxs_bec/scans/LamNIFermatScan.py

@@ -169,6 +169,9 @@ class LamNIMixin:
 
         self.device_manager.devices.lsamx.read_only = True
         self.device_manager.devices.lsamy.read_only = True
+        
+        #update angle readback before start of the scan
+        yield from self.stubs.send_rpc_and_wait("lsamrot", "readback.get")
 
         yield from self.stubs.send_rpc_and_wait("rtx", "controller.feedback_enable_without_reset")
 

docs/user/ptychography/flomni.md

@@ -108,12 +108,17 @@ The nano-positioning is controlled by a feedback loop running on a real-time lin
 
 Once the loop has started, it is possible to start bec with the flOMNI configuration file.
 
+Starting bec with session will load the scripts
+`bec --session flomni`
+
+The flOMNI scripts can be loaded manually by  
+`from csaxs_bec.bec_ipython_client.plugins.flomni import Flomni`  
+`flomni =  Flomni(bec)`
+
 Loading the flOMNI configuration (this command will load the OMNY configuration only - isolated from the beamline)  
 `bec.config.update_session_with_file("/bec/csaxs_bec/csaxs_bec/device_configs/flomni_config.yaml")`
 
-Loading the flOMNI scripts  
-`from csaxs_bec.bec_ipython_client.plugins.flomni import Flomni`  
-`flomni =  Flomni(bec)`
+
 
 If the realtime system is restarted, bec will lose communication. To restart:  
 `flomni.rt_off()` … then wait a few seconds  
@@ -138,10 +143,14 @@ This script will first verify that the stages are not in an initialized state, a
 The positions of the optics stages are stored as stage parameters and are thus linked to the configuration file.  
 Example: The OSAx “in” position can be reviewed by `dev.fosax.user_parameter`  
 Update the value by (example "fosax", "in") by `dev.fosax.update_user_parameter({"in":value})`
+Important note: if these values are changed, they are not automatically stored to the config file and will only be available in the current session.
 
 `flomni.ffzp_info()` shows info about the available FZPs at the current energy of the beamline. Optional parameter is the photon _energy_ in keV.  
 Example: `flomni.ffzp_info(6.2)`
 
+Documents about availabe optics can be accessed by
+`flomni.flomnigui_docs`
+
 The [laser feedback](user.ptychography.flomni.laser_feedback) will be disabled and fine alignment lost if foptx/y are moved!
 
 Following functions exist to move the optics in and out, with self-explaining naming.

docs/user/ptychography/lamni.md

@@ -102,13 +102,16 @@ The nano-positioning is controlled by a feedback loop running on a real-time lin
 
 Once the loop has started, it is possible to start bec with the LamNI configuration file.
 
-Loading the LamNI configuration (this command will load the LamNI configuration only - isolated from the beamline)  
-`bec.config.update_session_with_file("/bec/csaxs_bec/csaxs_bec/device_configs/lamni_config.yaml")`
+Loading the LamNI scripts is done by starting bec as
+`bec --session lamni`
 
-Loading the LamNI scripts  
+The scripts can alternatively manually be loaded by  
 `from csaxs_bec.bec_ipython_client.plugins.LamNI import LamNI`
 `lamni = LamNI(bec)`
 
+Loading the LamNI configuration (this command will load the LamNI configuration only - isolated from the beamline)  
+`bec.config.update_session_with_file("/bec/csaxs_bec/csaxs_bec/device_configs/lamni_config.yaml")`
+
 If the realtime system is restarted, BEC will lose communication. To restart:  
 `lamni.rt_off()` … then wait a 10 seconds  
 `lamni.rt_on()`
@@ -152,6 +155,12 @@ The underlying scan function can be called as
 
 Use `scans.lamni_fermat_scan?`for detailed information. A prerequisite for scanning is a running feedback system.
 
+### GUI tools
+
+During operation the BEC GUI will show the relevant cameras or progress information. To manually switch view TAB completion on 'lamni.lamnigui_' will show all options to control the GUI. Most useful
+'lamni.lamnigui_show_progress()' will show the measurement progress GUI
+'lamnigui_show_xeyealign()' will show the XrayEye alignment GUI
+
 ### X-ray optics alignment
 
 The positions of the optics stages are stored as stage parameters and are thus linked to the configuration file.  

tests/tests_devices/test_mcs_card.py

@@ -217,16 +217,6 @@ def test_mcs_card_csaxs_complete_and_stop(mock_mcs_csaxs: MCSCardCSAXS):
     assert not mcs._start_monitor_async_data_emission.is_set()
 
 
-def test_mcs_on_stop(mock_mcs_csaxs: MCSCardCSAXS):
-    """Test that on stop sets the omit_mca_callbacks flag. Also test that on stage clears the omit_mca_callbacks flag."""
-    mcs = mock_mcs_csaxs
-    assert mcs._omit_mca_callbacks.is_set() is False
-    mcs.stop()
-    assert mcs._omit_mca_callbacks.is_set() is True
-    mcs.stage()
-    assert mcs._omit_mca_callbacks.is_set() is False
-
-
 def test_mcs_recovery(mock_mcs_csaxs: MCSCardCSAXS):
     mcs = mock_mcs_csaxs
     # Simulate ongoing acquisition