test at beamline

refactor(eps): deactivate black for eps.py to keep signal component formatted in single line.
fix(eps): Fix tests and eps integration
2026-02-16 12:33:15 +01:00 · 2026-02-16 12:33:15 +01:00 · 2026-02-16 12:33:15 +01:00 · 2026-02-16 12:33:15 +01:00 · 2026-02-16 12:33:15 +01:00 · 2026-02-16 12:33:15 +01:00
38 changed files with 1724 additions and 734 deletions
--- a/csaxs_bec/bec_ipython_client/plugins/flomni/flomni.py
+++ b/csaxs_bec/bec_ipython_client/plugins/flomni/flomni.py
@@ -1004,20 +1004,6 @@ class FlomniAlignmentMixin:
        with open(os.path.join(dir_path, "ptychotomoalign_Cy3.txt"), "r") as file:
            tomo_alignment_fit[1][4] = file.readline()

-        tomo_alignment_fit[0][0] = gui.flomni.xeyegui.XRayEye.Waveform.fit_x_SineModel.dap_params['amplitude']
-        tomo_alignment_fit[0][1] = gui.flomni.xeyegui.XRayEye.Waveform.fit_x_SineModel.dap_params['frequency']
-        tomo_alignment_fit[0][2] = gui.flomni.xeyegui.XRayEye.Waveform.fit_x_SineModel.dap_params['shift']
-        tomo_alignment_fit[1][0] = gui.flomni.xeyegui.XRayEye.Waveform_0.fit_y_SineModel.dap_params['amplitude']
-        tomo_alignment_fit[1][1] = gui.flomni.xeyegui.XRayEye.Waveform_0.fit_y_SineModel.dap_params['frequency']
-        tomo_alignment_fit[1][2] = gui.flomni.xeyegui.XRayEye.Waveform_0.fit_y_SineModel.dap_params['shift']
-        print("applying vertical default values from mirror calibration, not from fit!")
-        tomo_alignment_fit[1][0] = 0
-        tomo_alignment_fit[1][1] = 0
-        tomo_alignment_fit[1][2] = 0
-        tomo_alignment_fit[1][3] = 0
-        tomo_alignment_fit[1][4] = 0
-
-
        print("New alignment parameters loaded:")
        print(
            f"X Amplitude {tomo_alignment_fit[0][0]}, "
--- a/csaxs_bec/bec_ipython_client/plugins/flomni/gui_tools.py
+++ b/csaxs_bec/bec_ipython_client/plugins/flomni/gui_tools.py
@@ -1,6 +1,6 @@
 import builtins

-from bec_widgets.cli.client import AdvancedDockArea
+from bec_widgets.cli.client import BECDockArea

 # from csaxs_bec.bec_ipython_client.plugins.cSAXS import epics_get, epics_put, fshopen, fshclose

@@ -26,11 +26,10 @@ class flomniGuiTools:
        self.gui = self.client.gui

    def flomnigui_show_gui(self):
-        self.gui.new("flomni")
-        # if "flomni" in self.gui.windows:
-        #     self.gui.flomni.show()
-        # else:
-        #     self.gui.new("flomni")
+        if "flomni" in self.gui.windows:
+            self.gui.flomni.show()
+        else:
+            self.gui.new("flomni")

    def flomnigui_stop_gui(self):
        self.gui.flomni.hide()
@@ -38,23 +37,24 @@ class flomniGuiTools:
    def flomnigui_raise(self):
        self.gui.flomni.raise_window()

+    # def flomnigui_show_xeyealign(self):
+    #     self.flomnigui_show_gui()
+    #     if self.xeyegui is None:
+    #         self.flomnigui_remove_all_docks()
+    #         self.xeyegui = self.gui.flomni.new("xeyegui").new("XRayEye")
+    #         # start live
+    #         if not dev.cam_xeye.live_mode:
+    #             dev.cam_xeye.live_mode = True
+
    def flomnigui_show_xeyealign(self):
        self.flomnigui_show_gui()
        if self._flomnigui_check_attribute_not_exists("xeyegui"):
            self.flomnigui_remove_all_docks()
-            self.xeyegui = self.gui.flomni.new("XRayEye",object_name='xrayeye')
-        # start live
-        if not dev.cam_xeye.live_mode_enabled.get():
-            # dev.cam_xeye.live_mode = True
-            dev.cam_xeye.live_mode_enabled.put(True)
-        self.xeyegui.switch_tab('alignment')
+            self.xeyegui = self.gui.flomni.new("xeyegui").new("XRayEye")
+            # start live
+            if not dev.cam_xeye.live_mode:
+                dev.cam_xeye.live_mode = True

-    def flomnigui_show_xeyealign_fittab(self):
-        self.flomnigui_show_gui()
-        if self._flomnigui_check_attribute_not_exists("xeyegui"):
-            self.flomnigui_remove_all_docks()
-            self.xeyegui = self.gui.flomni.new("XRayEye")
-        self.xeyegui.switch_tab('fit')

    def _flomnigui_check_attribute_not_exists(self, attribute_name):
        if hasattr(self.gui,"flomni"):
@@ -67,7 +67,7 @@ class flomniGuiTools:
        self.flomnigui_show_gui()
        if self._flomnigui_check_attribute_not_exists("camera_gripper") or self._flomnigui_check_attribute_not_exists("camera_overview"):
            self.flomnigui_remove_all_docks()
-            camera_gripper_image = self.gui.flomni.new("Image")
+            camera_gripper_image = self.gui.flomni.new("camera_gripper").new("Image")
            if self._flomnicam_check_device_exists(dev.cam_flomni_gripper):
                camera_gripper_image.image(("cam_flomni_gripper", "preview"))
                camera_gripper_image.lock_aspect_ratio = True
@@ -78,7 +78,7 @@ class flomniGuiTools:
                dev.cam_flomni_gripper.start_live_mode()
            else:
                print("Cannot open camera_gripper. Device does not exist.")
-            camera_overview_image = self.gui.flomni.new("Image")
+            camera_overview_image = self.gui.flomni.new("camera_overview").new("Image")
            if self._flomnicam_check_device_exists(dev.cam_flomni_overview):
                camera_overview_image.image(("cam_flomni_overview", "preview"))
                camera_overview_image.lock_aspect_ratio = True
@@ -102,7 +102,7 @@ class flomniGuiTools:
        self.flomnigui_show_gui()
        if self._flomnigui_check_attribute_not_exists("idle_text_box"):
            self.flomnigui_remove_all_docks()
-            idle_text_box = self.gui.flomni.new("TextBox")
+            idle_text_box = self.gui.flomni.new("idle_textbox").new("TextBox")
        text = (
            "<pre>"
            + " ,---.,--. ,-----. ,--.   ,--.,--.  ,--.,--. \n"
@@ -162,7 +162,7 @@ class flomniGuiTools:
            self.pdf_viewer = self.gui.flomni.new(widget="PdfViewerWidget")

        # --- Load PDF ---------------------------------------------------------
-        self.PdfViewerWidget.load_pdf(str(pdf_file.resolve()))
+        self.pdf_viewer.PdfViewerWidget.load_pdf(str(pdf_file.resolve()))
        print(f"\nLoaded: {pdf_file.name}\n")


@@ -179,7 +179,7 @@ class flomniGuiTools:
        if self._flomnigui_check_attribute_not_exists("progressbar"):
            self.flomnigui_remove_all_docks()
            # Add a new dock with a RingProgressBar widget
-            self.progressbar = self.gui.flomni.new("RingProgressBar")
+            self.progressbar = self.gui.flomni.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
@@ -194,7 +194,7 @@ class flomniGuiTools:
            # 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.flomni.new("TextBox")
+            self.text_box = self.gui.flomni.new(name="progress_text").new("TextBox")

        self._flomnigui_update_progress()

--- a/csaxs_bec/bec_ipython_client/plugins/flomni/x_ray_eye_align.py
+++ b/csaxs_bec/bec_ipython_client/plugins/flomni/x_ray_eye_align.py
@@ -5,11 +5,9 @@ import os
 import time
 from typing import TYPE_CHECKING

-import numpy as np
-
 from bec_lib import bec_logger

-# from csaxs_bec.bec_ipython_client.plugins.cSAXS import epics_get, epics_put, fshopen, fshclose
+from csaxs_bec.bec_ipython_client.plugins.cSAXS import epics_get, epics_put, fshopen, fshclose

 logger = bec_logger.logger
 # import builtins to avoid linter errors
@@ -24,7 +22,7 @@ if TYPE_CHECKING:

 class XrayEyeAlign:
    # pixel calibration, multiply to get mm
-    test_wo_movements = True
+    labview=False
    PIXEL_CALIBRATION = 0.1 / 113  # .2 with binning

    def __init__(self, client, flomni: Flomni) -> None:
@@ -36,194 +34,209 @@ class XrayEyeAlign:
        self.flomni.reset_correction()
        self.flomni.reset_tomo_alignment_fit()

-    @property
-    def gui(self):
-        return self.flomni.xeyegui
-
    def _reset_init_values(self):
        self.shift_xy = [0, 0]
        self._xray_fov_xy = [0, 0]

-    def update_frame(self, keep_shutter_open=False):
+    def save_frame(self):
+        epics_put("XOMNYI-XEYE-SAVFRAME:0", 1)

-        # self.flomni.flomnigui_show_xeyealign()
-        if not dev.cam_xeye.live_mode_enabled.get():
-            dev.cam_xeye.live_mode_enabled.put(True)
+    def update_frame(self,keep_shutter_open=False):
+        if self.labview:
+            epics_put("XOMNYI-XEYE-ACQDONE:0", 0)
+            
+        if not self.labview:
+            self.flomni.flomnigui_show_xeyealign()
+            if not dev.cam_xeye.live_mode:
+                dev.cam_xeye.live_mode = True

-        self.gui.on_live_view_enabled(True)
+        epics_put("XOMNYI-XEYE-ACQ:0", 1)
+        if self.labview:
+            # wait for start live
+            while epics_get("XOMNYI-XEYE-ACQDONE:0") == 0:
+                time.sleep(0.5)
+                print("waiting for live view to start...")

-        dev.omnyfsh.fshopen()
+        fshopen()
+
+        if self.labview:
+            epics_put("XOMNYI-XEYE-ACQDONE:0", 0)
+
+            while epics_get("XOMNYI-XEYE-ACQDONE:0") == 0:
+                print("waiting for new frame...")
+                time.sleep(0.5)

        time.sleep(0.5)
        # stop live view
        if not keep_shutter_open:
-            self.gui.on_live_view_enabled(False)
+            epics_put("XOMNYI-XEYE-ACQ:0", 0)
            time.sleep(0.1)
-            dev.omnyfsh.fshclose()
-            print("Received new frame.")
+            fshclose()
+            print("got new frame")
        else:
            print("Staying in live view, shutter is and remains open!")

    def tomo_rotate(self, val: float):
-        if not self.test_wo_movements:
-            umv(self.device_manager.devices.fsamroy, val)
+        # pylint: disable=undefined-variable
+        umv(self.device_manager.devices.fsamroy, val)

    def get_tomo_angle(self):
        return self.device_manager.devices.fsamroy.readback.get()

    def update_fov(self, k: int):
-        self._xray_fov_xy[0] = max(
-            getattr(dev.omny_xray_gui, f"width_x_{k}").get(), self._xray_fov_xy[0]
-        )
-        self._xray_fov_xy[1] = max(
-            getattr(dev.omny_xray_gui, f"width_y_{k}").get(), self._xray_fov_xy[1]
-        )
+        self._xray_fov_xy[0] = max(epics_get(f"XOMNYI-XEYE-XWIDTH_X:{k}"), self._xray_fov_xy[0])
+        self._xray_fov_xy[1] = max(0, self._xray_fov_xy[0])

-    def movement_buttons_enabled(self, enablex: bool, enabley: bool):
-        self.gui.on_motors_enable(enablex, enabley)
+    @property
+    def movement_buttons_enabled(self):
+        return [epics_get("XOMNYI-XEYE-ENAMVX:0"), epics_get("XOMNYI-XEYE-ENAMVY:0")]
+
+    @movement_buttons_enabled.setter
+    def movement_buttons_enabled(self, enabled: bool):
+        enabled = int(enabled)
+        epics_put("XOMNYI-XEYE-ENAMVX:0", enabled)
+        epics_put("XOMNYI-XEYE-ENAMVY:0", enabled)

    def send_message(self, msg: str):
-        print(f"In alginment GUI: {msg}")
-        self.gui.user_message = msg
+        epics_put("XOMNYI-XEYE-MESSAGE:0.DESC", msg)

-    def align(self, keep_shutter_open=False):
-        self.flomni.flomnigui_show_xeyealign()
+    def align(self,keep_shutter_open=False):
        if not keep_shutter_open:
-            print(
-                "This routine can be called with paramter keep_shutter_open=True to keep the shutter always open"
-            )
+            print("This routine can be called with paramter keep_shutter_open=True to keep the shutter always open")
        self.send_message("Getting things ready. Please wait...")

-        self.gui.enable_submit_button(False)
-
-        # Initialize xray align device
-        # clear potential pending movement requests
-        dev.omny_xray_gui.mvx.set(0)
-        dev.omny_xray_gui.mvy.set(0)
-        # reset submit channel
-        dev.omny_xray_gui.submit.set(0)
-
-        self.movement_buttons_enabled(False, False)
+        #potential unresolved movement requests to zero
+        epics_put("XOMNYI-XEYE-MVX:0", 0)
+        epics_put("XOMNYI-XEYE-MVY:0", 0)

        # reset shift xy and fov params
        self._reset_init_values()

        self.flomni.lights_off()

-        # self.flomni.flomnigui_show_xeyealign()
-        # self.flomni.flomnigui_raise()
+        self.flomni.flomnigui_show_xeyealign()
+        self.flomni.flomnigui_raise()

-        if not self.test_wo_movements:
-            self.tomo_rotate(0)
+        self.tomo_rotate(0)
+        epics_put("XOMNYI-XEYE-ANGLE:0", 0)

-            self.flomni.feye_in()
+        self.flomni.feye_in()

        self.flomni.laser_tracker_on()

        self.flomni.feedback_enable_with_reset()

        # disable movement buttons
-        self.movement_buttons_enabled(False, False)
+        self.movement_buttons_enabled = False

        sample_name = self.flomni.sample_get_name(0)
-        self.gui.sample_name = sample_name
+        epics_put("XOMNYI-XEYE-SAMPLENAME:0.DESC", sample_name)

        # this makes sure we are in a defined state
        self.flomni.feedback_disable()

-        if not self.test_wo_movements:
-            self.flomni.fosa_out()
+        epics_put("XOMNYI-XEYE-PIXELSIZE:0", self.PIXEL_CALIBRATION)

-            fsamx_in = self.flomni._get_user_param_safe("fsamx", "in")
-            umv(dev.fsamx, fsamx_in - 0.25)
+        self.flomni.fosa_out()

-            self.flomni.ffzp_in()
+        fsamx_in = self.flomni._get_user_param_safe("fsamx", "in")
+        umv(dev.fsamx, fsamx_in - 0.25)

+        self.flomni.ffzp_in()
        self.update_frame(keep_shutter_open)

-        self.gui.enable_submit_button(True)
-        dev.omny_xray_gui.step.set(0).wait()
+        # enable submit buttons
+        self.movement_buttons_enabled = False
+        epics_put("XOMNYI-XEYE-SUBMIT:0", 0)
+        epics_put("XOMNYI-XEYE-STEP:0", 0)
        self.send_message("Submit center value of FZP.")

        k = 0
        while True:
-            if dev.omny_xray_gui.submit.get() == 1:
-
-                self.alignment_values[k] = (
-                    getattr(dev.omny_xray_gui, f"xval_x_{k}").get() / 2 * self.PIXEL_CALIBRATION
-                )  # in mm
+            if epics_get("XOMNYI-XEYE-SUBMIT:0") == 1:
+                val_x = epics_get(f"XOMNYI-XEYE-XVAL_X:{k}") / 2 * self.PIXEL_CALIBRATION  # in mm
+                self.alignment_values[k] = val_x
                print(f"Clicked position {k}: x {self.alignment_values[k]}")
                rtx_position = dev.rtx.readback.get() / 1000
                print(f"Current rtx position {rtx_position}")
                self.alignment_values[k] -= rtx_position
                print(f"Corrected position {k}: x {self.alignment_values[k]}")
-                # reset submit channel
-                dev.omny_xray_gui.submit.set(0)
+
                if k == 0:  # received center value of FZP
                    self.send_message("please wait ...")
-                    self.movement_buttons_enabled(False, False)
-                    self.gui.enable_submit_button(False)
+                    self.movement_buttons_enabled = False
+                    epics_put("XOMNYI-XEYE-SUBMIT:0", -1)  # disable submit button

                    self.flomni.feedback_disable()
-                    if not self.test_wo_movements:
-                        fsamx_in = self.flomni._get_user_param_safe("fsamx", "in")
-                        umv(dev.fsamx, fsamx_in)
+                    fsamx_in = self.flomni._get_user_param_safe("fsamx", "in")
+                    umv(dev.fsamx, fsamx_in)

-                        self.flomni.foptics_out()
+                    self.flomni.foptics_out()

-                        time.sleep(0.5)
+                    self.flomni.feedback_disable()
+                    umv(dev.fsamx, fsamx_in - 0.25)

+                    if self.labview:
+                        self.update_frame(keep_shutter_open)
+                        epics_put("XOMNYI-XEYE-RECBG:0", 1)
+                        while epics_get("XOMNYI-XEYE-RECBG:0") == 1:
+                            time.sleep(0.5)
+                            print("waiting for background frame...")
+
+                    umv(dev.fsamx, fsamx_in)
+                    time.sleep(0.5)
                    self.flomni.feedback_enable_with_reset()

                    self.update_frame(keep_shutter_open)
-                    self.send_message("Step 1/5: Adjust sample height and submit center")
-                    self.gui.enable_submit_button(True)
-                    self.movement_buttons_enabled(True, True)
+                    self.send_message("Adjust sample height and submit center")
+                    epics_put("XOMNYI-XEYE-SUBMIT:0", 0)
+                    self.movement_buttons_enabled = True

                elif 1 <= k < 5:  # received sample center value at samroy 0 ... 315
                    self.send_message("please wait ...")
-                    self.gui.enable_submit_button(False)
-                    self.movement_buttons_enabled(False, False)
+                    epics_put("XOMNYI-XEYE-SUBMIT:0", -1)
+                    self.movement_buttons_enabled = False

                    umv(dev.rtx, 0)
                    self.tomo_rotate(k * 45)
-                    dev.omny_xray_gui.angle.set(self.get_tomo_angle())
+                    epics_put("XOMNYI-XEYE-ANGLE:0", self.get_tomo_angle())
                    self.update_frame(keep_shutter_open)
-                    self.send_message(f"Step {k+1}/5: Submit sample center")
-                    self.gui.enable_submit_button(True)
-                    self.movement_buttons_enabled(True, False)
+                    self.send_message("Submit sample center")
+                    epics_put("XOMNYI-XEYE-SUBMIT:0", 0)
+                    epics_put("XOMNYI-XEYE-ENAMVX:0", 1)
                    self.update_fov(k)

                elif k == 5:  # received sample center value at samroy 270 and done
                    self.send_message("done...")
-                    self.gui.enable_submit_button(False)
-                    self.movement_buttons_enabled(False, False)
+                    epics_put("XOMNYI-XEYE-SUBMIT:0", -1)  # disable submit button
+                    self.movement_buttons_enabled = False
                    self.update_fov(k)
                    break

                k += 1
-                dev.omny_xray_gui.step.set(k)
+                epics_put("XOMNYI-XEYE-STEP:0", k)

-            _xrayeyalignmvx = dev.omny_xray_gui.mvx.get()
+            _xrayeyalignmvx = epics_get("XOMNYI-XEYE-MVX:0")
            if _xrayeyalignmvx != 0:
                umvr(dev.rtx, _xrayeyalignmvx)
                print(f"Current rtx position {dev.rtx.readback.get() / 1000}")
+                epics_put("XOMNYI-XEYE-MVX:0", 0)
+                if k > 0:
+                    epics_put(f"XOMNYI-XEYE-STAGEPOSX:{k}", dev.rtx.readback.get() / 1000)
                time.sleep(3)
-                dev.omny_xray_gui.mvx.set(0)
                self.update_frame(keep_shutter_open)

            if k < 2:
                # allow movements, store movements to calculate center
-                _xrayeyalignmvy = dev.omny_xray_gui.mvy.get()
+                _xrayeyalignmvy = epics_get("XOMNYI-XEYE-MVY:0")
                if _xrayeyalignmvy != 0:
                    self.flomni.feedback_disable()
-                    if not self.test_wo_movements:
-                        umvr(dev.fsamy, _xrayeyalignmvy / 1000)
+                    umvr(dev.fsamy, _xrayeyalignmvy / 1000)
                    time.sleep(2)
-                    dev.omny_xray_gui.mvy.set(0)
+                    epics_put("XOMNYI-XEYE-MVY:0", 0)
                    self.flomni.feedback_enable_with_reset()
                    self.update_frame(keep_shutter_open)
-            time.sleep(0.1)
+            time.sleep(0.2)

        self.write_output()
        fovx = self._xray_fov_xy[0] * self.PIXEL_CALIBRATION * 1000 / 2
@@ -233,17 +246,22 @@ class XrayEyeAlign:

        umv(dev.rtx, 0)

-        if keep_shutter_open:
-            if self.flomni.OMNYTools.yesno("Close the shutter now?", "y"):
-                dev.omnyfsh.fshclose()
-                self.gui.on_live_view_enabled(False)
-                print("setting 'XOMNYI-XEYE-ACQ:0'")
+        # free camera        
+        if self.labview:
+            epics_put("XOMNYI-XEYE-ACQ:0", 2)
+        if keep_shutter_open and not self.labview:
+            if self.flomni.OMNYTools.yesno("Close the shutter now?","y"):
+                fshclose()
+                epics_put("XOMNYI-XEYE-ACQ:0", 0)
+        if not self.labview:
+            self.flomni.flomnigui_idle()
+  

        print(
            f"The largest field of view from the xrayeyealign was \nfovx = {fovx:.0f} microns, fovy"
            f" = {fovy:.0f} microns"
        )
-        print("Check the fit in the GUI...")
+        print("Use the matlab routine to FIT the current alignment...")

        print("Then LOAD ALIGNMENT PARAMETERS by running flomni.read_alignment_offset()\n")

@@ -251,33 +269,9 @@ class XrayEyeAlign:
        file = os.path.expanduser("~/Data10/specES1/internal/xrayeye_alignmentvalues")
        if not os.path.exists(file):
            os.makedirs(os.path.dirname(file), exist_ok=True)
-
        with open(file, "w") as alignment_values_file:
            alignment_values_file.write("angle\thorizontal\n")
-
-            # Initialize an empty list to store fovx values
-            fovx_list = []
-            fovx_offsets = np.zeros(5)  # holds offsets for k = 1..5
-
            for k in range(1, 6):
                fovx_offset = self.alignment_values[0] - self.alignment_values[k]
-                fovx_offsets[k - 1] = fovx_offset  # store in array
-
-                fovx_x = (k - 1) * 45
-                fovx_list.append([fovx_x, fovx_offset * 1000])  # Append the data to the list
-
                print(f"Writing to file new alignment: number {k}, value x {fovx_offset}")
-                alignment_values_file.write(f"{fovx_x}\t{fovx_offset * 1000}\n")
-
-            # Now build final numpy array:
-            data = np.array(
-                [
-                    [0, 45, 90, 135, 180],  # angles
-                    fovx_offsets * 1000,  # fovx_offset values
-                    [0, 0, 0, 0, 0],
-                ]
-            )
-        self.gui.submit_fit_array(data)
-        print(f"fit submited with {data}")
-        print("todo mirko: submitted data is 1000 fold in amplitude")
-        # self.flomni.flomnigui_show_xeyealign_fittab()
+                alignment_values_file.write(f"{(k-1)*45}\t{fovx_offset*1000}\n")
--- a/csaxs_bec/bec_ipython_client/plugins/omny/gui_tools.py
+++ b/csaxs_bec/bec_ipython_client/plugins/omny/gui_tools.py
@@ -1,6 +1,6 @@
 import builtins

-from bec_widgets.cli.client import AdvancedDockArea
+from bec_widgets.cli.client import BECDockArea

 # from csaxs_bec.bec_ipython_client.plugins.cSAXS import epics_get, epics_put, fshopen, fshclose

--- a/csaxs_bec/bec_widgets/widgets/client.py
+++ b/csaxs_bec/bec_widgets/widgets/client.py
@@ -83,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):
@@ -97,30 +111,6 @@ class XRayEye(RPCBase):
        None
        """

-    @rpc_call
-    def on_live_view_enabled(self, enabled: "bool"):
-        """
-        None
-        """
-
-    @rpc_call
-    def on_motors_enable(self, x_enable: "bool", y_enable: "bool"):
-        """
-        Enable/Disable motor controls
-
-        Args:
-            x_enable(bool): enable x motor controls
-            y_enable(bool): enable y motor controls
-        """
-
-    @rpc_call
-    def enable_submit_button(self, enable: "int"):
-        """
-        Enable/disable submit button.
-        Args:
-            enable(int): -1 disable else enable
-        """
-
    @property
    @rpc_call
    def sample_name(self):
@@ -149,18 +139,6 @@ class XRayEye(RPCBase):
        None
        """

-    @rpc_call
-    def switch_tab(self, tab: "str"):
-        """
-        None
-        """
-
-    @rpc_call
-    def submit_fit_array(self, fit_array):
-        """
-        None
-        """
-

 class XRayEye2DControl(RPCBase):
    @rpc_call
--- a/csaxs_bec/bec_widgets/widgets/omny_alignment/init.py
+++ b/csaxs_bec/bec_widgets/widgets/omny_alignment/init.py
--- a/csaxs_bec/bec_widgets/widgets/omny_alignment/omny_alignment.py
+++ b/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_())
--- a/csaxs_bec/bec_widgets/widgets/omny_alignment/omny_alignment.pyproject
+++ b/csaxs_bec/bec_widgets/widgets/omny_alignment/omny_alignment.pyproject
@@ -0,0 +1 @@
+{'files': ['omny_alignment.py']}
--- a/csaxs_bec/bec_widgets/widgets/omny_alignment/omny_alignment.ui
+++ b/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>
--- a/csaxs_bec/bec_widgets/widgets/omny_alignment/omny_alignment_plugin.py
+++ b/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()
--- a/csaxs_bec/bec_widgets/widgets/omny_alignment/register_omny_alignment.py
+++ b/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()
--- a/csaxs_bec/bec_widgets/widgets/xray_eye/x_ray_eye.py
+++ b/csaxs_bec/bec_widgets/widgets/xray_eye/x_ray_eye.py
@@ -5,7 +5,6 @@ from bec_lib.endpoints import MessageEndpoints
 from bec_qthemes import material_icon
 from bec_widgets import BECWidget, SafeProperty, SafeSlot
 from bec_widgets.widgets.plots.image.image import Image
-from bec_widgets.widgets.plots.waveform.waveform import Waveform
 from bec_widgets.widgets.plots.image.setting_widgets.image_roi_tree import ROIPropertyTree
 from bec_widgets.widgets.plots.roi.image_roi import BaseROI, CircularROI, RectangularROI
 from bec_widgets.widgets.utility.toggle.toggle import ToggleSwitch
@@ -22,10 +21,7 @@ from qtpy.QtWidgets import (
    QToolButton,
    QVBoxLayout,
    QWidget,
-    QTextEdit,
-    QTabWidget
 )
-import time

 logger = bec_logger.logger
 CAMERA = ("cam_xeye", "image")
@@ -128,8 +124,8 @@ class XRayEye2DControl(BECWidget, QWidget):


 class XRayEye(BECWidget, QWidget):
-    USER_ACCESS = ["active_roi", "user_message", "user_message.setter","on_live_view_enabled","on_motors_enable","enable_submit_button",
-                   "sample_name", "sample_name.setter", "enable_move_buttons", "enable_move_buttons.setter","switch_tab","submit_fit_array"]
+    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):
@@ -140,31 +136,21 @@ class XRayEye(BECWidget, QWidget):
        self._make_connections()

        # Connection to redis endpoints
-        self.bec_dispatcher.connect_slot(self.getting_shutter_status, MessageEndpoints.device_readback("omnyfsh"))
-        self.bec_dispatcher.connect_slot(self.getting_camera_status, MessageEndpoints.device_read_configuration(CAMERA[0]))
-
+        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)

    def _init_ui(self):
-        self.root_layout = QVBoxLayout(self)
-        self.tab_widget = QTabWidget(parent=self)
-        self.root_layout.addWidget(self.tab_widget)
+        self.core_layout = QHBoxLayout(self)

-        self.alignment_tab = QWidget(parent=self)
-        self.core_layout = QHBoxLayout(self.alignment_tab)
-
-        self.image = Image(parent=self.alignment_tab)
-        self.image.color_map = "CET-L2"
+        self.image = Image(parent=self)
        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.enable_full_colorbar = True
-        self.image.invert_y = True # Invert y axis to match image coordinates
-
+        self.image.plot_item.vb.invertY(True)  # #TODO Invert y axis to match logic of LabView GUI

        # Control panel on the right: vertical layout inside a fixed-width widget
-        self.control_panel = QWidget(parent=self.alignment_tab)
+        self.control_panel = QWidget(parent=self)
        self.control_panel_layout = QVBoxLayout(self.control_panel)
        self.control_panel_layout.setContentsMargins(0, 0, 0, 0)
        self.control_panel_layout.setSpacing(10)
@@ -180,35 +166,16 @@ class XRayEye(BECWidget, QWidget):
        self.live_preview_label = QLabel("Live Preview", parent=self)
        self.live_preview_toggle = ToggleSwitch(parent=self)
        self.live_preview_toggle.checked = False
-        header_row.addWidget(self.live_preview_label, 0, Qt.AlignmentFlag.AlignVCenter)
-        header_row.addWidget(self.live_preview_toggle, 0, Qt.AlignmentFlag.AlignVCenter)
+        header_row.addWidget(self.live_preview_label, 0, Qt.AlignVCenter)
+        header_row.addWidget(self.live_preview_toggle, 0, Qt.AlignVCenter)
        self.control_panel_layout.addLayout(header_row)

-        switch_row = QHBoxLayout()
-        switch_row.setContentsMargins(0, 0, 0, 0)
-        switch_row.setSpacing(8)
-        switch_row.addStretch()
-        self.camera_running_label = QLabel("Camera running", parent=self)
-        self.camera_running_toggle = ToggleSwitch(parent=self)
-        # self.camera_running_toggle.checked = False
-        self.camera_running_toggle.enabled.connect(self.camera_running_enabled)
-        self.shutter_label = QLabel("Shutter open", parent=self)
-        self.shutter_toggle = ToggleSwitch(parent=self)
-        # self.shutter_toggle.checked = False
-        self.shutter_toggle.enabled.connect(self.opening_shutter)
-        switch_row.addWidget(self.shutter_label, 0, Qt.AlignmentFlag.AlignVCenter)
-        switch_row.addWidget(self.shutter_toggle, 0, Qt.AlignmentFlag.AlignVCenter)
-        switch_row.addWidget(self.camera_running_label, 0, Qt.AlignmentFlag.AlignVCenter)
-        switch_row.addWidget(self.camera_running_toggle, 0, Qt.AlignmentFlag.AlignVCenter)
-        self.control_panel_layout.addLayout(switch_row)
-
-
        # separator
        self.control_panel_layout.addWidget(self._create_separator())

        # 2D Positioner (fixed size)
        self.motor_control_2d = XRayEye2DControl(parent=self)
-        self.control_panel_layout.addWidget(self.motor_control_2d, 0, Qt.AlignmentFlag.AlignTop | Qt.AlignmentFlag.AlignCenter)
+        self.control_panel_layout.addWidget(self.motor_control_2d, 0, Qt.AlignTop | Qt.AlignCenter)

        # separator
        self.control_panel_layout.addWidget(self._create_separator())
@@ -223,8 +190,9 @@ class XRayEye(BECWidget, QWidget):
        # Submit button
        self.submit_button = QPushButton("Submit", parent=self)
        # Add to layout form
-        step_size_form.addWidget(QLabel("Step Size", parent=self), 0, 0)
+        step_size_form.addWidget(QLabel("Horizontal", parent=self), 0, 0)
        step_size_form.addWidget(self.step_size, 0, 1)
+        step_size_form.addWidget(QLabel("Vertical", parent=self), 1, 0)
        step_size_form.addWidget(self.submit_button, 2, 0, 1, 2)

        # Add form to control panel
@@ -239,8 +207,7 @@ class XRayEye(BECWidget, QWidget):
        self.sample_name_line_edit.setReadOnly(True)
        form.addWidget(QLabel("Sample", parent=self), 0, 0)
        form.addWidget(self.sample_name_line_edit, 0, 1)
-        self.message_line_edit = QTextEdit(parent=self)
-        self.message_line_edit.setFixedHeight(60)
+        self.message_line_edit = QLineEdit(parent=self)
        self.message_line_edit.setReadOnly(True)
        form.addWidget(QLabel("Message", parent=self), 1, 0)
        form.addWidget(self.message_line_edit, 1, 1)
@@ -250,39 +217,12 @@ class XRayEye(BECWidget, QWidget):
        self.control_panel.adjustSize()
        p_hint = self.control_panel.sizeHint()
        self.control_panel.setFixedWidth(p_hint.width())
-        self.control_panel.setSizePolicy(QSizePolicy.Policy.Fixed, QSizePolicy.Policy.Expanding)
+        self.control_panel.setSizePolicy(QSizePolicy.Fixed, QSizePolicy.Expanding)

        # Core Layout: image (expanding) | control panel (fixed)
        self.core_layout.addWidget(self.image)
        self.core_layout.addWidget(self.control_panel)

-        self.tab_widget.addTab(self.alignment_tab, "Alignment")
-
-        self.fit_tab = QWidget(parent=self)
-        self.fit_layout = QVBoxLayout(self.fit_tab)
-        self.waveform_x = Waveform(parent=self.fit_tab)
-        self.waveform_y = Waveform(parent=self.fit_tab)
-
-
-        self.waveform_x.plot(x=[0],y=[1], label="fit-x",dap="SineModel",dap_parameters={"frequency":{"value":0.0174533,"vary":False,"min":0.01,"max":0.02}},dap_oversample=5)
-        self.waveform_y.plot(x=[0],y=[2], label="fit-y",dap="SineModel")#,dap_oversample=5)
-        self.fit_x = self.waveform_x.curves[0]
-        self.fit_y = self.waveform_y.curves[0]
-
-        self.waveform_x.dap_params_update.connect(self.on_dap_params)
-        self.waveform_y.dap_params_update.connect(self.on_dap_params)
-
-
-        for wave in (self.waveform_x,self.waveform_y):
-            wave.x_label = "Angle (deg)"
-            wave.x_grid = True
-            wave.y_grid = True
-            wave.enable_toolbar = True
-
-        self.fit_layout.addWidget(self.waveform_x)
-        self.fit_layout.addWidget(self.waveform_y)
-        self.tab_widget.addTab(self.fit_tab, "Fit")
-
    def _make_connections(self):
        # Fetch initial state
        self.on_live_view_enabled(True)
@@ -295,14 +235,13 @@ class XRayEye(BECWidget, QWidget):

    def _create_separator(self):
        sep = QFrame(parent=self)
-        sep.setFrameShape(QFrame.Shape.HLine)
-        sep.setFrameShadow(QFrame.Shadow.Sunken)
+        sep.setFrameShape(QFrame.HLine)
+        sep.setFrameShadow(QFrame.Sunken)
        sep.setLineWidth(1)
        return sep

    def _init_gui_trigger(self):
        self.dev.omny_xray_gui.read()
-        self.dev.omnyfsh.read()

    ################################################################################
    # Device Connection logic
@@ -315,7 +254,7 @@ class XRayEye(BECWidget, QWidget):
        for motor in possible_motors:
            if motor in self.dev:
                self.bec_dispatcher.connect_slot(self.on_tomo_angle_readback, MessageEndpoints.device_readback(motor))
-                logger.info(f"Successfully connected to {motor}")
+                logger.info(f"Succesfully connected to {motor}")

    ################################################################################
    # Properties ported from the original OmnyAlignment, can be adjusted as needed
@@ -351,14 +290,6 @@ class XRayEye(BECWidget, QWidget):
    ################################################################################
    # Slots ported from the original OmnyAlignment, can be adjusted as needed
    ################################################################################
-   
-    @SafeSlot(str)
-    def switch_tab(self,tab:str):
-        if tab == "fit":
-            self.tab_widget.setCurrentIndex(1)
-        else:
-            self.tab_widget.setCurrentIndex(0)
-

    @SafeSlot()
    def get_roi_coordinates(self) -> dict | None:
@@ -376,50 +307,14 @@ class XRayEye(BECWidget, QWidget):
        self.live_preview_toggle.blockSignals(True)
        if enabled:
            self.live_preview_toggle.checked = enabled
-            self.image.image(device_name=CAMERA[0],device_entry=CAMERA[1])
+            self.image.image(CAMERA)
            self.live_preview_toggle.blockSignals(False)
            return

-        self.image.disconnect_monitor(CAMERA[0],CAMERA[1])
+        self.image.disconnect_monitor(CAMERA)
        self.live_preview_toggle.checked = enabled
        self.live_preview_toggle.blockSignals(False)

-    @SafeSlot(bool)
-    def camera_running_enabled(self, enabled: bool):
-        logger.info(f"Camera running: {enabled}")
-        self.camera_running_toggle.blockSignals(True)
-        self.dev.get(CAMERA[0]).live_mode_enabled.put(enabled)
-        self.camera_running_toggle.checked = enabled
-        self.camera_running_toggle.blockSignals(False)
-
-    @SafeSlot(dict,dict)
-    def getting_camera_status(self,data,meta):
-        print(f"msg:{data}")
-        live_mode_enabled = data.get("signals").get(f"{CAMERA[0]}_live_mode_enabled").get("value")
-        self.camera_running_toggle.blockSignals(True)
-        self.camera_running_toggle.checked = live_mode_enabled
-        self.camera_running_toggle.blockSignals(False)
-
-    @SafeSlot(bool)
-    def opening_shutter(self, enabled: bool):
-        logger.info(f"Shutter changed from GUI to: {enabled}")
-        self.shutter_toggle.blockSignals(True)
-        if enabled:
-            self.dev.omnyfsh.fshopen()
-        else:
-            self.dev.omnyfsh.fshclose()
-        # self.shutter_toggle.checked = enabled
-        self.shutter_toggle.blockSignals(False)
-
-
-    @SafeSlot(dict,dict)
-    def getting_shutter_status(self,data,meta):
-        shutter_open = bool(data.get("signals").get("omnyfsh_shutter").get("value"))
-        self.shutter_toggle.blockSignals(True)
-        self.shutter_toggle.checked = shutter_open
-        self.shutter_toggle.blockSignals(False)
-
-
    @SafeSlot(bool, bool)
    def on_motors_enable(self, x_enable: bool, y_enable: bool):
        """
@@ -432,60 +327,58 @@ class XRayEye(BECWidget, QWidget):
        self.motor_control_2d.enable_controls_hor(x_enable)
        self.motor_control_2d.enable_controls_ver(y_enable)

-    @SafeSlot(bool)
-    def enable_submit_button(self, enable: bool):
+    @SafeSlot(int)
+    def enable_submit_button(self, enable: int):
        """
        Enable/disable submit button.
        Args:
            enable(int): -1 disable else enable
        """
-        if enable:
-            self.submit_button.setEnabled(True)
-        else:
+        if enable == -1:
            self.submit_button.setEnabled(False)
-  
-    @SafeSlot(dict,dict)
-    def on_dap_params(self,data,meta):
-        print('#######################################')
-        print('getting dap parameters')
-        print(f"data: {data}")
-        print(f"meta: {meta}")
-        self.waveform_x.auto_range(True)
-        self.waveform_y.auto_range(True)
-        # self.bec_dispatcher.disconnect_slot(self.device_updates, MessageEndpoints.device_readback("omny_xray_gui"))
-        curve_id = meta.get("curve_id")
-
-
-
-        if curve_id == "fit-x-SineModel":
-            self.dev.omny_xray_gui.fit_params_x.set(data).wait()
-            print(f"setting x data to {data}")
        else:
-            self.dev.omny_xray_gui.fit_params_y.set(data).wait()
-            print(f"setting y data to {data}")
-        # self.bec_dispatcher.connect_slot(self.device_updates, MessageEndpoints.device_readback("omny_xray_gui"))
+            self.submit_button.setEnabled(True)

    @SafeSlot(bool, bool)
    def on_tomo_angle_readback(self, data: dict, meta: dict):
        #TODO implement if needed
        print(f"data: {data}")
        print(f"meta: {meta}")
-   
-    @SafeSlot()
-    def submit_fit_array(self,fit_array):
-        self.tab_widget.setCurrentIndex(1)
-        # self.fix_x.title = " got fit array"
-        print(f"got fit array {fit_array}")
-        self.waveform_x.curves[0].set_data(x=fit_array[0],y=fit_array[1])
-        # self.fit_x.set_data(x=fit_array[0],y=fit_array[1])
-        # self.fit_y.set_data(x=fit_array[0],y=fit_array[2])

+    @SafeSlot(dict, dict)
+    def device_updates(self, data: dict, meta: dict):
+        """
+        Slot to handle device updates from omny_xray_gui device.
+
+        Args:
+            data(dict):  data from device
+            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')
+        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')
+        self.user_message = user_message
+        # sample name
+        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')
+        self.on_live_view_enabled(bool(update_frame_acq))
+        # enable submit button
+        enable_submit_button = signals.get("omny_xray_gui_submit").get('value')
+        self.enable_submit_button(enable_submit_button)

    @SafeSlot()
    def submit(self):
        """Execute submit action by submit button."""
-        print('submit pushed')
-        self.submit_button.blockSignals(True)
        if self.roi_manager.single_active_roi is None:
            logger.warning("No active ROI")
            return
@@ -507,14 +400,12 @@ class XRayEye(BECWidget, QWidget):
        # submit roi coordinates
        step = int(self.dev.omny_xray_gui.step.read().get("omny_xray_gui_step").get('value'))

-        xval_x = getattr(self.dev.omny_xray_gui, f"xval_x_{step}").set(roi_center_x)
-        xval_y = getattr(self.dev.omny_xray_gui, f"yval_y_{step}").set(roi_center_y)
-        width_x = getattr(self.dev.omny_xray_gui, f"width_x_{step}").set(roi_width)
-        width_y = getattr(self.dev.omny_xray_gui, f"width_y_{step}").set(roi_height)
+        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)
-        print('submit done')
-        self.submit_button.blockSignals(False)
-
+    
    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"))
@@ -525,12 +416,9 @@ if __name__ == "__main__":
    import sys

    from qtpy.QtWidgets import QApplication
-    from bec_widgets.utils import BECDispatcher
-    from bec_widgets.utils.colors import apply_theme

    app = QApplication(sys.argv)
-    apply_theme("light")
-    dispatcher = BECDispatcher(gui_id='xray')
+
    win = XRayEye()

    win.resize(1000, 800)
--- a/csaxs_bec/device_configs/bl_endstation.yaml
+++ b/csaxs_bec/device_configs/bl_endstation.yaml
@@ -37,6 +37,21 @@ mcs:
  readoutPriority: monitored
  softwareTrigger: false

+
+
+##########################################################################
+########################### FAST SHUTTER #################################
+##########################################################################
+
+fsh:
+  description: Fast shutter manual control and readback
+  deviceClass: csaxs_bec.devices.epics.fast_shutter.cSAXSFastEpicsShutter
+  deviceConfig:
+    prefix: 'X12SA-ES1-TTL:'
+  onFailure: raise
+  enabled: true
+  readoutPriority: monitored
+
 ##########################################################################
 ######################## SMARACT STAGES ##################################
 ##########################################################################
@@ -60,6 +75,7 @@ xbpm3x:
  onFailure: buffer
  readOnly: false
  readoutPriority: baseline
+  connectionTimeout: 20
  userParameter:
    init_position: -22.5
    # bl_smar_stage to use csaxs reference method. assign number according to axis channel
@@ -82,6 +98,7 @@ xbpm3y:
  onFailure: buffer
  readOnly: false
  readoutPriority: baseline
+  connectionTimeout: 20
  userParameter:
    init_position: -2
    # bl_smar_stage to use csaxs reference method. assign number according to axis channel
@@ -104,6 +121,7 @@ sl3trxi:
  onFailure: buffer
  readOnly: false
  readoutPriority: baseline
+  connectionTimeout: 20
  userParameter:
    init_position: -5.5
    # bl_smar_stage to use csaxs reference method. assign number according to axis channel
@@ -126,6 +144,7 @@ sl3trxo:
  onFailure: buffer
  readOnly: false
  readoutPriority: baseline
+  connectionTimeout: 20
  userParameter:
    init_position: 6
    # bl_smar_stage to use csaxs reference method. assign number according to axis channel
@@ -148,6 +167,7 @@ sl3trxb:
  onFailure: buffer
  readOnly: false
  readoutPriority: baseline
+  connectionTimeout: 20
  userParameter:
    init_position: -5.8
    # bl_smar_stage to use csaxs reference method. assign number according to axis channel
@@ -170,6 +190,7 @@ sl3trxt:
  onFailure: buffer
  readOnly: false
  readoutPriority: baseline
+  connectionTimeout: 20
  userParameter:
    init_position: 5.5
    # bl_smar_stage to use csaxs reference method. assign number according to axis channel
@@ -192,6 +213,7 @@ fast_shutter_n1_x:
  onFailure: buffer
  readOnly: false
  readoutPriority: baseline
+  connectionTimeout: 20
  userParameter:
    init_position: -7
    in: 0
@@ -215,6 +237,7 @@ fast_shutter_o1_x:
  onFailure: buffer
  readOnly: false
  readoutPriority: baseline
+  connectionTimeout: 20
  userParameter:
    init_position: -15.8
    # bl_smar_stage to use csaxs reference method. assign number according to axis channel
@@ -237,6 +260,7 @@ fast_shutter_o2_x:
  onFailure: buffer
  readOnly: false
  readoutPriority: baseline
+  connectionTimeout: 20
  userParameter:
    init_position: -15.5
    # bl_smar_stage to use csaxs reference method. assign number according to axis channel
@@ -259,6 +283,7 @@ filter_array_1_x:
  onFailure: buffer
  readOnly: false
  readoutPriority: baseline
+  connectionTimeout: 20
  userParameter:
    init_position: 25
    # bl_smar_stage to use csaxs reference method. assign number according to axis channel
@@ -281,6 +306,7 @@ filter_array_2_x:
  onFailure: buffer
  readOnly: false
  readoutPriority: baseline
+  connectionTimeout: 20
  userParameter:
    init_position: 25.5
    # bl_smar_stage to use csaxs reference method. assign number according to axis channel
@@ -303,6 +329,7 @@ filter_array_3_x:
  onFailure: buffer
  readOnly: false
  readoutPriority: baseline
+  connectionTimeout: 20
  userParameter:
    init_position: 25.8
    # bl_smar_stage to use csaxs reference method. assign number according to axis channel
@@ -325,6 +352,7 @@ filter_array_4_x:
  onFailure: buffer
  readOnly: false
  readoutPriority: baseline
+  connectionTimeout: 20
  userParameter:
    init_position: 25
    # bl_smar_stage to use csaxs reference method. assign number according to axis channel
@@ -347,6 +375,7 @@ sl4trxi:
  onFailure: buffer
  readOnly: false
  readoutPriority: baseline
+  connectionTimeout: 20
  userParameter:
    init_position: -5.5
    # bl_smar_stage to use csaxs reference method. assign number according to axis channel
@@ -369,6 +398,7 @@ sl4trxo:
  onFailure: buffer
  readOnly: false
  readoutPriority: baseline
+  connectionTimeout: 20
  userParameter:
    init_position: 6
    # bl_smar_stage to use csaxs reference method. assign number according to axis channel
@@ -391,6 +421,7 @@ sl4trxb:
  onFailure: buffer
  readOnly: false
  readoutPriority: baseline
+  connectionTimeout: 20
  userParameter:
    init_position: -5.8
    # bl_smar_stage to use csaxs reference method. assign number according to axis channel
@@ -413,6 +444,7 @@ sl4trxt:
  onFailure: buffer
  readOnly: false
  readoutPriority: baseline
+  connectionTimeout: 20
  userParameter:
    init_position: 5.5
    # bl_smar_stage to use csaxs reference method. assign number according to axis channel
@@ -425,7 +457,7 @@ sl5trxi:
  deviceClass: csaxs_bec.devices.smaract.smaract_ophyd.SmaractMotor
  deviceConfig:
    axis_Id: C
-    host: x12sa-eb-smaract-mcs-02.psi.ch
+    host: x12sa-eb-smaract-mcs-05.psi.ch
    limits:
    - -200
    - 200
@@ -437,6 +469,7 @@ sl5trxi:
  onFailure: buffer
  readOnly: false
  readoutPriority: baseline
+  connectionTimeout: 20
  userParameter:
    init_position: -6
    # bl_smar_stage to use csaxs reference method. assign number according to axis channel
@@ -447,7 +480,7 @@ sl5trxo:
  deviceClass: csaxs_bec.devices.smaract.smaract_ophyd.SmaractMotor
  deviceConfig:
    axis_Id: D
-    host: x12sa-eb-smaract-mcs-02.psi.ch
+    host: x12sa-eb-smaract-mcs-05.psi.ch
    limits:
    - -200
    - 200
@@ -459,6 +492,7 @@ sl5trxo:
  onFailure: buffer
  readOnly: false
  readoutPriority: baseline
+  connectionTimeout: 20
  userParameter:
    init_position: 5.5
    # bl_smar_stage to use csaxs reference method. assign number according to axis channel
@@ -469,7 +503,7 @@ sl5trxb:
  deviceClass: csaxs_bec.devices.smaract.smaract_ophyd.SmaractMotor
  deviceConfig:
    axis_Id: E
-    host: x12sa-eb-smaract-mcs-02.psi.ch
+    host: x12sa-eb-smaract-mcs-05.psi.ch
    limits:
    - -200
    - 200
@@ -481,6 +515,7 @@ sl5trxb:
  onFailure: buffer
  readOnly: false
  readoutPriority: baseline
+  connectionTimeout: 20
  userParameter:
    init_position: -5.5
    # bl_smar_stage to use csaxs reference method. assign number according to axis channel
@@ -491,7 +526,7 @@ sl5trxt:
  deviceClass: csaxs_bec.devices.smaract.smaract_ophyd.SmaractMotor
  deviceConfig:
    axis_Id: F
-    host: x12sa-eb-smaract-mcs-02.psi.ch
+    host: x12sa-eb-smaract-mcs-05.psi.ch
    limits:
    - -200
    - 200
@@ -503,6 +538,7 @@ sl5trxt:
  onFailure: buffer
  readOnly: false
  readoutPriority: baseline
+  connectionTimeout: 20
  userParameter:
    init_position: 6
    # bl_smar_stage to use csaxs reference method. assign number according to axis channel
@@ -513,7 +549,7 @@ xbimtrx:
  deviceClass: csaxs_bec.devices.smaract.smaract_ophyd.SmaractMotor
  deviceConfig:
    axis_Id: A
-    host: x12sa-eb-smaract-mcs-02.psi.ch
+    host: x12sa-eb-smaract-mcs-05.psi.ch
    limits:
    - -200
    - 200
@@ -525,6 +561,7 @@ xbimtrx:
  onFailure: buffer
  readOnly: false
  readoutPriority: baseline
+  connectionTimeout: 20
  userParameter:
    init_position: -14.7
    # bl_smar_stage to use csaxs reference method. assign number according to axis channel
@@ -535,7 +572,7 @@ xbimtry:
  deviceClass: csaxs_bec.devices.smaract.smaract_ophyd.SmaractMotor
  deviceConfig:
    axis_Id: B
-    host: x12sa-eb-smaract-mcs-02.psi.ch
+    host: x12sa-eb-smaract-mcs-05.psi.ch
    limits:
    - -200
    - 200
@@ -547,6 +584,7 @@ xbimtry:
  onFailure: buffer
  readOnly: false
  readoutPriority: baseline
+  connectionTimeout: 20
  userParameter:
    init_position: 0
    # bl_smar_stage to use csaxs reference method. assign number according to axis channel
--- a/csaxs_bec/device_configs/bl_optics_hutch.yaml
+++ b/csaxs_bec/device_configs/bl_optics_hutch.yaml
@@ -89,6 +89,7 @@ xbpm2x:
  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
@@ -108,6 +109,7 @@ xbpm2y:
  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
@@ -127,6 +129,7 @@ cu_foilx:
  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
@@ -146,6 +149,7 @@ scinx:
  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
--- a/csaxs_bec/device_configs/ptycho_flomni.yaml
+++ b/csaxs_bec/device_configs/ptycho_flomni.yaml
@@ -17,6 +17,7 @@ feyex:
  onFailure: buffer
  readOnly: false
  readoutPriority: baseline
+  connectionTimeout: 20
  userParameter:
    in: -16.267
    out: -1
@@ -35,6 +36,7 @@ feyey:
  onFailure: buffer
  readOnly: false
  readoutPriority: baseline
+  connectionTimeout: 20
  userParameter:
    in: -10.467
 fheater:
@@ -52,6 +54,7 @@ fheater:
  onFailure: buffer
  readOnly: false
  readoutPriority: baseline
+  connectionTimeout: 20
 foptx:
  description: Optics X
  deviceClass: csaxs_bec.devices.omny.galil.fgalil_ophyd.FlomniGalilMotor
@@ -67,6 +70,7 @@ foptx:
  onFailure: buffer
  readOnly: true
  readoutPriority: baseline
+  connectionTimeout: 20
  userParameter:
    in: -13.761
 fopty:
@@ -84,6 +88,7 @@ fopty:
  onFailure: buffer
  readOnly: true
  readoutPriority: baseline
+  connectionTimeout: 20
  userParameter:
    in: 0.552
    out: 0.752
@@ -102,6 +107,7 @@ foptz:
  onFailure: buffer
  readOnly: false
  readoutPriority: baseline
+  connectionTimeout: 20
  userParameter:
    in: 23
 fsamroy:
@@ -119,6 +125,7 @@ fsamroy:
  onFailure: buffer
  readOnly: false
  readoutPriority: baseline
+  connectionTimeout: 20
 fsamx:
  description: Sample coarse X
  deviceClass: csaxs_bec.devices.omny.galil.fgalil_ophyd.FlomniGalilMotor
@@ -134,6 +141,7 @@ fsamx:
  onFailure: buffer
  readOnly: true
  readoutPriority: baseline
+  connectionTimeout: 20
  userParameter:
    in: -1.1
 fsamy:
@@ -151,6 +159,7 @@ fsamy:
  onFailure: buffer
  readOnly: true
  readoutPriority: baseline
+  connectionTimeout: 20
  userParameter:
    in: 2.75
 ftracky:
@@ -168,6 +177,7 @@ ftracky:
  onFailure: buffer
  readOnly: false
  readoutPriority: baseline
+  connectionTimeout: 20
 ftrackz:
  description: Laser Tracker coarse Z
  deviceClass: csaxs_bec.devices.omny.galil.fgalil_ophyd.FlomniGalilMotor
@@ -183,6 +193,7 @@ ftrackz:
  onFailure: buffer
  readOnly: false
  readoutPriority: baseline
+  connectionTimeout: 20
 ftransx:
  description: Sample transer X
  deviceClass: csaxs_bec.devices.omny.galil.fgalil_ophyd.FlomniGalilMotor
@@ -198,6 +209,7 @@ ftransx:
  onFailure: buffer
  readOnly: false
  readoutPriority: baseline
+  connectionTimeout: 20
 ftransy:
  description: Sample transer Y
  deviceClass: csaxs_bec.devices.omny.galil.fgalil_ophyd.FlomniGalilMotor
@@ -213,6 +225,7 @@ ftransy:
  onFailure: buffer
  readOnly: false
  readoutPriority: baseline
+  connectionTimeout: 20
  userParameter:
    sensor_voltage: -2.4
 ftransz:
@@ -230,6 +243,7 @@ ftransz:
  onFailure: buffer
  readOnly: false
  readoutPriority: baseline
+  connectionTimeout: 20
 ftray:
  description: Sample transfer tray
  deviceClass: csaxs_bec.devices.omny.galil.fgalil_ophyd.FlomniGalilMotor
@@ -245,6 +259,7 @@ ftray:
  onFailure: buffer
  readOnly: false
  readoutPriority: baseline
+  connectionTimeout: 20


 ############################################################
@@ -279,6 +294,7 @@ fosax:
  onFailure: buffer
  readOnly: false
  readoutPriority: baseline
+  connectionTimeout: 20
  userParameter:
    in: 9.124
    out: 5.3
@@ -297,6 +313,7 @@ fosay:
  onFailure: buffer
  readOnly: false
  readoutPriority: baseline
+  connectionTimeout: 20
  userParameter:
    in: 0.367
 fosaz:
@@ -314,6 +331,7 @@ fosaz:
  onFailure: buffer
  readOnly: false
  readoutPriority: baseline
+  connectionTimeout: 20
  userParameter:
    in: 8.5
    out: 6
@@ -334,6 +352,7 @@ rtx:
  onFailure: buffer
  readOnly: false
  readoutPriority: on_request
+  connectionTimeout: 20
  userParameter:
    low_signal: 10000
    min_signal: 9000
@@ -350,6 +369,7 @@ rty:
  onFailure: buffer
  readOnly: false
  readoutPriority: on_request
+  connectionTimeout: 20
  userParameter:
    tomo_additional_offsety: 0
 rtz:
@@ -364,6 +384,7 @@ rtz:
  onFailure: buffer
  readOnly: false
  readoutPriority: on_request
+  connectionTimeout: 20

 ############################################################
 ####################### Cameras ############################
@@ -414,9 +435,9 @@ cam_xeye:
 #   deviceConfig:
 #     camera_id: 203
 #     bits_per_pixel: 24
-#     num_rotation_90: 2
+#     num_rotation_90: 3
 #     transpose: false
-#     force_monochrome: false
+#     force_monochrome: true
 #     m_n_colormode: 1
 #   enabled: true
 #   onFailure: buffer
@@ -439,8 +460,8 @@ flomni_temphum:
 # ########## OMNY / flOMNI / LamNI fast shutter ##############
 # ############################################################
 omnyfsh:
-  description: omnyfsh connects to read fast shutter at X12 if in that network
-  deviceClass: csaxs_bec.devices.omny.shutter.OMNYFastEpicsShutter
+  description: omnyfsh connects to  fast shutter at X12 if device fsh exists
+  deviceClass: csaxs_bec.devices.omny.shutter.OMNYFastShutter
  deviceConfig: {}
  enabled: true
  onFailure: buffer
@@ -450,10 +471,19 @@ omnyfsh:
 #################### GUI Signals ###########################
 ############################################################
 omny_xray_gui:
-  description: Gui signals
-  deviceClass: csaxs_bec.devices.omny.xray_epics_gui.OMNYXRayAlignGUI
+  description: Gui Epics signals
+  deviceClass: csaxs_bec.devices.omny.xray_epics_gui.OMNYXRayEpicsGUI
  deviceConfig: {}
  enabled: true
  onFailure: buffer
  readOnly: false
-  readoutPriority: on_request
+  readoutPriority: on_request
+
+calculated_signal:
+  description: Calculated signal from alignment for fit
+  deviceClass: ophyd_devices.ComputedSignal
+  deviceConfig:
+    compute_method: "def just_rand():\n return 42"
+  enabled: true
+  readOnly: false
+  readoutPriority: baseline
--- a/csaxs_bec/device_configs/ptycho_lamni.yaml
+++ b/csaxs_bec/device_configs/ptycho_lamni.yaml
@@ -19,6 +19,7 @@ leyex:
  onFailure: buffer
  readOnly: false
  readoutPriority: baseline
+  connectionTimeout: 20
  userParameter:
    in: 14.117
 leyey:
@@ -38,6 +39,7 @@ leyey:
  onFailure: buffer
  readOnly: false
  readoutPriority: baseline
+  connectionTimeout: 20
  userParameter:
    in: 48.069
    out: 0.5
@@ -58,6 +60,7 @@ loptx:
  onFailure: buffer
  readOnly: false
  readoutPriority: baseline
+  connectionTimeout: 20
  userParameter:
    in: -0.244
    out: -0.699
@@ -78,6 +81,7 @@ lopty:
  onFailure: buffer
  readOnly: false
  readoutPriority: baseline
+  connectionTimeout: 20
  userParameter:
    in: 3.724
    out: 3.53
@@ -98,6 +102,7 @@ loptz:
  onFailure: buffer
  readOnly: false
  readoutPriority: baseline
+  connectionTimeout: 20
 lsamrot:
  description: Sample rotation
  deviceClass: csaxs_bec.devices.omny.galil.lgalil_ophyd.LamniGalilMotor
@@ -115,6 +120,7 @@ lsamrot:
  onFailure: buffer
  readOnly: false
  readoutPriority: baseline
+  connectionTimeout: 20
 lsamx:
  description: Sample coarse X
  deviceClass: csaxs_bec.devices.omny.galil.lgalil_ophyd.LamniGalilMotor
@@ -132,6 +138,7 @@ lsamx:
  onFailure: buffer
  readOnly: false
  readoutPriority: baseline
+  connectionTimeout: 20
  userParameter:
    center: 8.768
 lsamy:
@@ -151,6 +158,7 @@ lsamy:
  onFailure: buffer
  readOnly: false
  readoutPriority: baseline
+  connectionTimeout: 20
  userParameter:
    center: 10.041

@@ -176,6 +184,7 @@ losax:
  onFailure: buffer
  readOnly: false
  readoutPriority: baseline
+  connectionTimeout: 20
  userParameter:
    in: -1.442
 losay:
@@ -195,6 +204,7 @@ losay:
  onFailure: buffer
  readOnly: false
  readoutPriority: baseline
+  connectionTimeout: 20
  userParameter:
    in: -0.171
    out: 3.8
@@ -215,6 +225,7 @@ losaz:
  onFailure: buffer
  readOnly: false
  readoutPriority: baseline
+  connectionTimeout: 20
  userParameter:
    in: -1
    out: -3
@@ -238,6 +249,7 @@ rtx:
  deviceTags:
  - lamni
  readoutPriority: baseline
+  connectionTimeout: 20
  enabled: true
  readOnly: False
 rty:
@@ -255,6 +267,7 @@ rty:
  deviceTags:
  - lamni
  readoutPriority: baseline
+  connectionTimeout: 20
  enabled: true
  readOnly: False

--- a/csaxs_bec/device_configs/ptycho_omny.yaml
+++ b/csaxs_bec/device_configs/ptycho_omny.yaml
@@ -69,6 +69,7 @@ rtx:
  onFailure: buffer
  readOnly: false
  readoutPriority: on_request
+  connectionTimeout: 20
  userParameter:
    low_signal: 8500
    min_signal: 8000
@@ -84,6 +85,7 @@ rty:
  onFailure: buffer
  readOnly: false
  readoutPriority: on_request
+  connectionTimeout: 20
  userParameter:
    tomo_additional_offsety: 0
 rtz:
@@ -98,6 +100,7 @@ rtz:
  onFailure: buffer
  readOnly: false
  readoutPriority: on_request
+  connectionTimeout: 20
  
 # ############################################################
 # ##################### OMNY samples #########################
@@ -165,6 +168,7 @@ ofzpx:
  onFailure: buffer
  readOnly: false
  readoutPriority: baseline
+  connectionTimeout: 20
  userParameter:
    in: -0.4317
 ofzpy:
@@ -184,6 +188,7 @@ ofzpy:
  onFailure: buffer
  readOnly: false
  readoutPriority: baseline
+  connectionTimeout: 20
  userParameter:
    in: 0.7944
    out: 0.6377
@@ -204,6 +209,7 @@ ofzpz:
  onFailure: buffer
  readOnly: false
  readoutPriority: baseline
+  connectionTimeout: 20
  userParameter:
    in: 0
 otransx:
@@ -223,6 +229,7 @@ otransx:
  onFailure: buffer
  readOnly: false
  readoutPriority: baseline
+  connectionTimeout: 20
  userParameter:
    in: 0
 otransy:
@@ -242,6 +249,7 @@ otransy:
  onFailure: buffer
  readOnly: false
  readoutPriority: baseline
+  connectionTimeout: 20
  userParameter:
    up_position: -1.2
    gripper_sensorvoltagetarget: -2.30
@@ -262,6 +270,7 @@ otransz:
  onFailure: buffer
  readOnly: false
  readoutPriority: baseline
+  connectionTimeout: 20
  userParameter:
    in: 0
 osamx:
@@ -281,6 +290,7 @@ osamx:
  onFailure: buffer
  readOnly: false
  readoutPriority: baseline
+  connectionTimeout: 20
  userParameter:
    in: -0.1
 osamz:
@@ -300,6 +310,7 @@ osamz:
  onFailure: buffer
  readOnly: true
  readoutPriority: baseline
+  connectionTimeout: 20
  userParameter:
    in: 0
 oosay:
@@ -319,6 +330,7 @@ oosay:
  onFailure: buffer
  readOnly: false
  readoutPriority: baseline
+  connectionTimeout: 20
  userParameter:
    near_field_in: 0.531
    far_field_in: 0.4122
@@ -339,6 +351,7 @@ oosax:
  onFailure: buffer
  readOnly: false
  readoutPriority: baseline
+  connectionTimeout: 20
  userParameter:
    near_field_in: 3.2044
    far_field_in: 3.022
@@ -359,6 +372,7 @@ oosaz:
  onFailure: buffer
  readOnly: false
  readoutPriority: baseline
+  connectionTimeout: 20
  userParameter:
    near_field_in: -0.4452
    far_field_in: 6.5
@@ -379,6 +393,7 @@ oparkz:
  onFailure: buffer
  readOnly: false
  readoutPriority: baseline
+  connectionTimeout: 20
  userParameter:
    in: 0
 oshuttleopen:
@@ -398,6 +413,7 @@ oshuttleopen:
  onFailure: buffer
  readOnly: true
  readoutPriority: baseline
+  connectionTimeout: 20
  userParameter:
    in: 0
 oshuttlealign:
@@ -417,6 +433,7 @@ oshuttlealign:
  onFailure: buffer
  readOnly: true
  readoutPriority: baseline
+  connectionTimeout: 20
  userParameter:
    in: 0
 osamy:
@@ -436,6 +453,7 @@ osamy:
  onFailure: buffer
  readOnly: false
  readoutPriority: baseline
+  connectionTimeout: 20
  userParameter:
    in: 0
 otracky:
@@ -455,6 +473,7 @@ otracky:
  onFailure: buffer
  readOnly: false
  readoutPriority: baseline
+  connectionTimeout: 20
  userParameter:
    start_pos: -4.3431
 osamroy:
@@ -474,6 +493,7 @@ osamroy:
  onFailure: buffer
  readOnly: false
  readoutPriority: baseline
+  connectionTimeout: 20
  userParameter:
    in: 0
 otrackz:
@@ -493,6 +513,7 @@ otrackz:
  onFailure: buffer
  readOnly: false
  readoutPriority: baseline
+  connectionTimeout: 20
  userParameter:
    start_pos: -0.6948
 oeyex:
@@ -512,6 +533,7 @@ oeyex:
  onFailure: buffer
  readOnly: false
  readoutPriority: baseline
+  connectionTimeout: 20
  userParameter:
    xray_in: -45.7394
 oeyez:
@@ -531,6 +553,7 @@ oeyez:
  onFailure: buffer
  readOnly: false
  readoutPriority: baseline
+  connectionTimeout: 20
  userParameter:
    xray_in: -2
 oeyey:
@@ -550,6 +573,7 @@ oeyey:
  onFailure: buffer
  readOnly: false
  readoutPriority: baseline
+  connectionTimeout: 20
  userParameter:
    xray_in: 0.0229

@@ -572,6 +596,7 @@ ocsx:
  onFailure: buffer
  readOnly: false
  readoutPriority: baseline
+  connectionTimeout: 20
  userParameter:
    nothing: 0
 ocsy:
@@ -589,6 +614,7 @@ ocsy:
  onFailure: buffer
  readOnly: false
  readoutPriority: baseline
+  connectionTimeout: 20
  userParameter:
    nothing: 0
 oshield:
@@ -606,5 +632,6 @@ oshield:
  onFailure: buffer
  readOnly: false
  readoutPriority: baseline
+  connectionTimeout: 20
  userParameter:
    nothing: 0
--- a/csaxs_bec/device_configs/user_setup.yaml
+++ b/csaxs_bec/device_configs/user_setup.yaml
@@ -1 +1,15 @@
 ############################################################
+
+
+
+############################################################
+##################### EPS ##################################
+############################################################
+x12saEPS:
+  description: X12SA EPS info and control
+  deviceClass: csaxs_bec.devices.epics.eps.EPS
+  deviceConfig: {}
+  enabled: true
+  onFailure: buffer
+  readOnly: false
+  readoutPriority: baseline
--- a/csaxs_bec/device_configs/user_template.yaml
+++ b/csaxs_bec/device_configs/user_template.yaml
@@ -64,6 +64,7 @@ npx:
  onFailure: buffer
  readOnly: false
  readoutPriority: baseline
+  connectionTimeout: 20
  deviceTags:
  - npoint
 npy:
@@ -81,5 +82,6 @@ npy:
  onFailure: buffer
  readOnly: false
  readoutPriority: baseline
+  connectionTimeout: 20
  deviceTags:
  - npoint
--- a/csaxs_bec/devices/epics/allied_vision_camera.py
+++ b/csaxs_bec/devices/epics/allied_vision_camera.py
@@ -1,149 +0,0 @@
-"""Module for the EPICS integration of the AlliedVision Camera via Vimba SDK."""
-
-import threading
-import traceback
-from enum import IntEnum
-
-import numpy as np
-from bec_lib.logger import bec_logger
-from ophyd import Component as Cpt, Kind, Signal
-from ophyd.areadetector import ADComponent as ADCpt
-from ophyd.areadetector import DetectorBase
-from ophyd_devices import PreviewSignal
-from ophyd_devices.devices.areadetector.cam import VimbaDetectorCam
-from ophyd_devices.devices.areadetector.plugins import ImagePlugin_V35 as ImagePlugin
-from ophyd_devices.interfaces.base_classes.psi_device_base import PSIDeviceBase
-from typeguard import typechecked
-
-logger = bec_logger.logger
-
-
-class ACQUIRE_MODES(IntEnum):
-    """Acquiring enums for Allied Vision Camera"""
-
-    ACQUIRING = 1
-    DONE = 0
-
-
-class AlliedVisionCamera(PSIDeviceBase, DetectorBase):
-    """
-    Epics Area Detector interface for the Allied Vision Alvium G1-507m camera via Vimba SDK.
-    The IOC runs with under the prefix: 'X12SA-GIGECAM-AV1:'.
-    """
-
-    USER_ACCESS = ["start_live_mode", "stop_live_mode"]
-
-    cam = ADCpt(VimbaDetectorCam, "cam1:")
-    image = ADCpt(ImagePlugin, "image1:")
-
-    preview = Cpt(
-        PreviewSignal,
-        name="preview",
-        ndim=2,
-        num_rotation_90=0,
-        doc="Preview signal of the AlliedVision camera.",
-    )
-
-    live_mode_enabled = Cpt(
-        Signal,
-        name="live_mode_enabled",
-        value=False,
-        doc="Enable or disable live mode.",
-        kind=Kind.config,
-    )
-
-    def __init__(
-        self,
-        *,
-        name: str,
-        prefix: str,
-        poll_rate: int = 5,
-        scan_info=None,
-        device_manager=None,
-        **kwargs,
-    ):
-        super().__init__(
-            name=name, prefix=prefix, scan_info=scan_info, device_manager=device_manager, **kwargs
-        )
-        self._poll_thread = threading.Thread(
-            target=self._poll_array_data, daemon=True, name=f"{self.name}_poll_thread"
-        )
-        self._poll_thread_kill_event = threading.Event()
-        self._poll_start_event = threading.Event()
-        if poll_rate > 10:
-            logger.warning(f"Poll rate too high for Camera {self.name}, setting to 10 Hz max.")
-            poll_rate = 10
-        self._poll_rate = poll_rate
-        self._unique_array_id = 0
-        self._pv_timeout = 2.0
-        self.image: ImagePlugin
-        self._live_mode_lock = threading.RLock()
-        self.live_mode_enabled.subscribe(self._on_live_mode_enabled_changed, run=False)
-
-    def start_live_mode(self) -> None:
-        """Start live mode."""
-        self.live_mode_enabled.put(True)
-
-    def stop_live_mode(self) -> None:
-        """Stop live mode."""
-        self.live_mode_enabled.put(False)
-
-    def _on_live_mode_enabled_changed(self, *args, value, **kwargs) -> None:
-        self._apply_live_mode(bool(value))
-
-    def _apply_live_mode(self, enabled: bool) -> None:
-        with self._live_mode_lock:
-            if enabled:
-                if not self._poll_start_event.is_set():
-                    self._poll_start_event.set()
-                    self.cam.acquire.put(ACQUIRE_MODES.ACQUIRING.value)  # Start acquisition
-                else:
-                    logger.info(f"Live mode already started for {self.name}.")
-                return
-
-            if self._poll_start_event.is_set():
-                self._poll_start_event.clear()
-                self.cam.acquire.put(ACQUIRE_MODES.DONE.value)  # Stop acquisition
-            else:
-                logger.info(f"Live mode already stopped for {self.name}.")
-
-    def on_connected(self):
-        """Reset the unique array ID on connection."""
-        self.cam.array_counter.set(0).wait(timeout=self._pv_timeout)
-        self.cam.array_callbacks.set(1).wait(timeout=self._pv_timeout)
-        self._poll_thread.start()
-
-    def _poll_array_data(self):
-        """Poll the array data for preview updates."""
-        while not self._poll_thread_kill_event.wait(1 / self._poll_rate):
-            while self._poll_start_event.wait():
-                try:
-                    # First check if there is a new image
-                    if self.image.unique_id.get() != self._unique_array_id:
-                        self._unique_array_id = self.image.unique_id.get()
-                    else:
-                        continue  # No new image, skip update
-                    # Get new image data
-                    value = self.image.array_data.get()
-                    if value is None:
-                        logger.info(f"No image data available for preview of {self.name}")
-                        continue
-
-                    array_size = self.image.array_size.get()
-                    if array_size[0] == 0:  # 2D image, not color image
-                        array_size = array_size[1:]
-                    # Geometry correction for the image
-                    data = np.reshape(value, array_size)
-                    self.preview.put(data)
-                except Exception:  # pylint: disable=broad-except
-                    content = traceback.format_exc()
-                    logger.error(
-                        f"Error while polling array data for preview of {self.name}: {content}"
-                    )
-
-    def on_destroy(self):
-        """Stop the polling thread on destruction."""
-        self._poll_thread_kill_event.set()
-        self._poll_start_event.set()
-        if self._poll_thread.is_alive():
-            self._poll_thread.join(timeout=2)
--- a/csaxs_bec/devices/epics/delay_generator_csaxs/README.md
+++ b/csaxs_bec/devices/epics/delay_generator_csaxs/README.md
@@ -37,7 +37,7 @@ to interrupt and ongoing sequence if needed.
 - a = t0 + 2ms (2ms delay to allow the shutter to open)
 - b = a + 1us (short pulse)
 - c = t0
- d = a + exp_time * burst_count + 1ms (to allow the shutter to close)
+- d = a + exp_time * burst_count
 - e = d
 - f = e + 1us (short pulse to OR gate for MCS triggering)

--- a/csaxs_bec/devices/epics/delay_generator_csaxs/ddg_1.py
+++ b/csaxs_bec/devices/epics/delay_generator_csaxs/ddg_1.py
@@ -24,7 +24,7 @@ DELAY CHANNELS:
 - a = t0 + 2ms (2ms delay to allow the shutter to open)
 - b = a + 1us (short pulse)
 - c = t0
- d = a + exp_time * burst_count + 1ms (to allow the shutter to close)
+- d = a + exp_time * burst_count
 - e = d
 - f = e + 1us (short pulse to OR gate for MCS triggering)
 """
@@ -37,7 +37,9 @@ import traceback
 from typing import TYPE_CHECKING

 from bec_lib.logger import bec_logger
-from ophyd_devices import CompareStatus, DeviceStatus, TransitionStatus
+from ophyd import Component as Cpt
+from ophyd import EpicsSignalRO, Kind
+from ophyd_devices import CompareStatus, DeviceStatus, StatusBase, TransitionStatus
 from ophyd_devices.interfaces.base_classes.psi_device_base import PSIDeviceBase

 from csaxs_bec.devices.epics.delay_generator_csaxs.delay_generator_csaxs import (
@@ -69,7 +71,7 @@ logger = bec_logger.logger
 # This can be adapted as needed, or fine-tuned per channel. On every reload of the
 # device configuration in BEC, these values will be set into the DDG1 device.
 _DEFAULT_CHANNEL_CONFIG: ChannelConfig = {
-    "amplitude": 5.0,
+    "amplitude": 4.5,
    "offset": 0.0,
    "polarity": OUTPUTPOLARITY.POSITIVE,
    "mode": "ttl",
@@ -131,6 +133,27 @@ class DDG1(PSIDeviceBase, DelayGeneratorCSAXS):
        device_manager (DeviceManagerBase | None, optional): Device manager. Defaults to None.
    """

+    USER_ACCESS = ["keep_shutter_open_during_scan", "set_trigger"]
+
+    # TODO Consider using the 'fsh' device instead.
+    fast_shutter_readback = Cpt(
+        EpicsSignalRO,
+        read_pv="X12SA-ES1-TTL:INP_01",
+        add_prefix=("",),  # Add this to prevent the prefix to be added to the signal
+        kind=Kind.omitted,
+        auto_monitor=True,
+    )
+    # The shutter control PV can indicate if the shutter is requested to be kept open. If that
+    # is the case, we can not use the signal shutter_readback signal to check if the delay cycle
+    # finishes but have to use the polling of the event status register to check if the burst finished.
+    fast_shutter_control = Cpt(
+        EpicsSignalRO,
+        read_pv="X12SA-ES1-TTL:OUT_01",
+        add_prefix=("",),  # Add this to prevent the prefix to be added to the signal
+        kind=Kind.omitted,
+        auto_monitor=True,
+    )
+
    def __init__(
        self,
        name: str,
@@ -142,6 +165,7 @@ class DDG1(PSIDeviceBase, DelayGeneratorCSAXS):
        super().__init__(
            name=name, prefix=prefix, scan_info=scan_info, device_manager=device_manager, **kwargs
        )
+        self._shutter_to_open_delay = 2e-3
        self.device_manager = device_manager
        self._poll_thread = threading.Thread(target=self._poll_event_status, daemon=True)
        self._poll_thread_run_event = threading.Event()
@@ -192,6 +216,21 @@ class DDG1(PSIDeviceBase, DelayGeneratorCSAXS):
        self.burst_delay.put(0)
        self.burst_count.put(1)

+    def keep_shutter_open_during_scan(self, open: True) -> None:
+        """
+        Method to configure the delay generator for keeping the shutter open during a scans.
+        This means that the additional delay to open the shutter needs to be removed (2e-3)
+        from the timing of the signals.
+
+        Args:
+            open (bool): If True, the shutter will be kept open during the scan.
+                         If False, the shutter will be opened and closed for each trigger cycle.
+        """
+        if open is True:
+            self._shutter_to_open_delay = 0
+        else:
+            self._shutter_to_open_delay = 2e-3
+
    def on_stage(self) -> None:
        """

@@ -230,6 +269,18 @@ class DDG1(PSIDeviceBase, DelayGeneratorCSAXS):
        if self.burst_count.get() != 1:
            self.burst_count.put(1)

+        #####################################
+        ## Setup trigger source if needed ###
+        #####################################
+
+        # NOTE Some scans may change the trigger source to an external trigger,
+        # so we will make sure that the default trigger source is set for the DDG1
+        # before each scan. If a scan requires a different trigger source, i.e.
+        # external triggers then the scan should implement this change after the
+        # on_stage method was called.
+        if self.trigger_source.get() != DEFAULT_TRIGGER_SOURCE:
+            self.set_trigger(DEFAULT_TRIGGER_SOURCE)
+
        #########################################
        ### Setup timing for burst and delays ###
        #########################################
@@ -239,27 +290,34 @@ class DDG1(PSIDeviceBase, DelayGeneratorCSAXS):

        # Burst Period DDG1
        # Set burst_period to shutter width
-        # c/t0 + 2ms + exp_time * burst_count + 1ms
-        shutter_width = 2e-3 + exp_time * frames_per_trigger + 1e-3
+        # c/t0 + self._shutter_to_open_delay + exp_time * burst_count
+        shutter_width = (
+            self._shutter_to_open_delay + exp_time * frames_per_trigger
+        )  # Shutter starts closing at end of exposure
        if self.burst_period.get() != shutter_width:
            self.burst_period.put(shutter_width)

        # Trigger DDG2
        # a = t0 + 2ms, b = a + 1us
        # a has reference to t0, b has reference to a
-        # Add delay of 2ms to allow shutter to open
-        self.set_delay_pairs(channel="ab", delay=2e-3, width=1e-6)
+        # Add delay of self._shutter_to_open_delay to allow shutter to open
+        self.set_delay_pairs(channel="ab", delay=self._shutter_to_open_delay, width=1e-6)

        # Trigger shutter
-        # d = c/t0 + 2ms + exp_time * burst_count + 1ms
+        # d = c/t0 + self._shutter_to_open_delay + exp_time * burst_count + 1ms
        # c has reference to t0, d has reference to c
-        # Shutter opens without delay at t0, closes after exp_time * burst_count + 3ms (2ms open, 1ms close)
+        # Shutter opens without delay at t0, closes after exp_time * burst_count + 2ms (self._shutter_to_open_delay)
        self.set_delay_pairs(channel="cd", delay=0, width=shutter_width)

+        self.set_delay_pairs(channel="gh", delay=self._shutter_to_open_delay, width=(shutter_width-self._shutter_to_open_delay))
+
        # Trigger extra pulse for MCS OR gate
        # f = e + 1us
        # e has refernce to d, f has reference to e
-        self.set_delay_pairs(channel="ef", delay=0, width=1e-6)
+        if self.scan_info.msg.scan_type == "fly":
+            self.set_delay_pairs(channel="ef", delay=0, width=0)
+        else:
+            self.set_delay_pairs(channel="ef", delay=0, width=1e-6)

        # NOTE Add additional sleep to make sure that the IOC and DDG HW process the values properly
        # This value has been choosen empirically after testing with the HW. It's
@@ -431,7 +489,19 @@ class DDG1(PSIDeviceBase, DelayGeneratorCSAXS):

    def on_trigger(self) -> DeviceStatus:
        """
-        This method is called from BEC as a software trigger.
+        This method is called from BEC as a software trigger. Here the logic is as follows:
+
+        We first check if the trigger_source is set to SINGLE_SHOT. Only then will we received,
+        otherwise we return a status object directly as the DDG is triggered by an external
+        source which will have to implement its own logic to wait for trigger signals to
+        be received.
+
+        I SINGLE_SHOT, the implementation here will send a software trigger. Now there are
+        two options to wait for the trigger (burst) cycle to be done. One is to rely on the
+        signal of the "mcs" card if it is present. However, this is only possible if the
+        scan_type is not "fly" as in fly scans the ef channel is not triggered to send the last
+        pulse to the card (but the card is finishing its acquisition in complete itself). Then
+        we rely on the polling of the event status register to check if the burst cycle is done.

        It follows a specific procedure to ensure that the DDG1 and MCS card are properly handled
        on a trigger event. The established logic is as follows:
@@ -450,33 +520,46 @@ class DDG1(PSIDeviceBase, DelayGeneratorCSAXS):
        - Return the status object to BEC which will automatically resolve once the status register has
            the END_OF_BURST bit set. The callback of the status object will also stop the polling loop.
        """
+        overall_start = time.time()
        self._stop_polling()
-        self._poll_thread_poll_loop_done.wait(timeout=1)
-        # NOTE: This sleep is important to ensure that the HW is ready to process new commands.
-        # It has been empirically determined after long testing that this improves stability.
-        time.sleep(0.02)
+
+        # NOTE If the trigger source is not SINGLE_SHOT, the DDG is triggered by an external source
+        # thus we can not expect that trigger signals are meant to be awaited for. In this case,
+        # we can directly return.
+        if self.trigger_source.get() != TRIGGERSOURCE.SINGLE_SHOT.value:
+            status = StatusBase(obj=self)
+            status.set_finished()
+            return status

        # NOTE If the MCS card is present in the current session of BEC,
        # we prepare the card for the next trigger. The procedure is implemented
-        # in the '_prepare_mcs_on_trigger' method.
-        # Prepare the MCS card for the next software trigger
+        # in the '_prepare_mcs_on_trigger' method. We will also use the mcs card
+        # to indicate when the burst cycle is done. If no mcs card is available
+        # the fallback is to use the polling of the DDG
        mcs = self.device_manager.devices.get("mcs", None)
-        if mcs is None or mcs.enabled is False:
-            logger.info("Did not find mcs card with name 'mcs' in current session")
+        if mcs is None or mcs.enabled is False or self.scan_info.msg.scan_type == "fly":
+            self._poll_thread_poll_loop_done.wait(timeout=1)
+            logger.warning("Did not find mcs card with name 'mcs' in current session")
+            time.sleep(0.02)
+            # Shutter is kept open, we can only rely on the event status register
+            status = self._prepare_trigger_status_event()
+            # Start polling thread again to monitor event status
+            self._start_polling()
        else:
+            start_time = time.time()
+            logger.debug(f"Preparing mcs card ")
            status_mcs = self._prepare_mcs_on_trigger(mcs)
            # NOTE Timeout of 3s should be plenty, any longer wait should checked. If this happens to crash
            # an acquisition regularly with a WaitTimeoutError, the timeout can be increased but it should
            # be investigated why the EPICS interface is slow to respond.
            status_mcs.wait(timeout=3)
+            status = TransitionStatus(mcs.acquiring, [ACQUIRING.ACQUIRING, ACQUIRING.DONE])
+            logger.debug(f"Finished preparing mcs card {time.time()-start_time}")

-        # Prepare StatusBitsCompareStatus to resolve once the END_OF_BURST bit was set.
-        status = self._prepare_trigger_status_event()
-
-        # Start polling thread again to monitor event status
-        self._start_polling()
-        # Trigger the DDG1
+        # Send trigger
        self.trigger_shot.put(1, use_complete=True)
+        self.cancel_on_stop(status)
+        logger.info(f"Configured ddg in {time.time()-overall_start}")
        return status

    def on_stop(self) -> None:
--- a/csaxs_bec/devices/epics/delay_generator_csaxs/ddg_2.py
+++ b/csaxs_bec/devices/epics/delay_generator_csaxs/ddg_2.py
@@ -37,6 +37,7 @@ from csaxs_bec.devices.epics.delay_generator_csaxs.delay_generator_csaxs import
    ChannelConfig,
    DelayGeneratorCSAXS,
    LiteralChannels,
+    BURSTCONFIG,
 )

 logger = bec_logger.logger
@@ -47,7 +48,7 @@ logger = bec_logger.logger

 # NOTE Default channel configuration for the DDG2 delay generator channels
 _DEFAULT_CHANNEL_CONFIG: ChannelConfig = {
-    "amplitude": 5.0,
+    "amplitude": 4.5,
    "offset": 0.0,
    "polarity": OUTPUTPOLARITY.POSITIVE,
    "mode": "ttl",
@@ -134,6 +135,9 @@ class DDG2(PSIDeviceBase, DelayGeneratorCSAXS):
        self.set_trigger(DEFAULT_TRIGGER_SOURCE)
        self.set_references_for_channels(DEFAULT_REFERENCES)

+        # Set burst config
+        self.burst_config.put(BURSTCONFIG.FIRST_CYCLE.value)
+
    def on_stage(self) -> DeviceStatus | StatusBase | None:
        """

--- a/csaxs_bec/devices/epics/delay_generator_csaxs/delay_generator_csaxs.py
+++ b/csaxs_bec/devices/epics/delay_generator_csaxs/delay_generator_csaxs.py
@@ -488,6 +488,7 @@ class DelayGeneratorCSAXS(Device):
        name="trigger_source",
        kind=Kind.omitted,
        doc="Trigger Source for the DDG, options in TRIGGERSOURCE",
+        auto_monitor=True,
    )
    trigger_level = Cpt(
        EpicsSignal,
--- a/csaxs_bec/devices/epics/eps.py
+++ b/csaxs_bec/devices/epics/eps.py
@@ -0,0 +1,435 @@
+"""EPS module for cSAXS beamline: defines the EPS device with its components and methods."""
+
+# fmt: off
+# Disable Black formatting for this file to preserve an easier readable structure for the component definitions.
+
+# pylint: disable=line-too-long
+from __future__ import annotations
+
+import time
+
+from bec_lib.logger import bec_logger
+from ophyd import Component as Cpt
+from ophyd import Device, EpicsSignal, EpicsSignalRO, Kind
+from ophyd_devices import PSIDeviceBase
+
+logger = bec_logger.logger
+
+# ---------------------------
+# Registry: sections/channels
+# ---------------------------
+
+
+class EPSSubDevices(Device):
+    """Base class for EPS sub-device components (e.g. alarms, valves, shutters). with common methods if needed."""
+
+    def describe(self) -> dict:
+        desc = super().describe()
+        for walk in self.walk_signals():
+            if walk.item.attr_name not in desc:
+                desc[walk.item.attr_name] = walk.item.describe()
+        return desc
+
+
+class EPSAlarms(EPSSubDevices):
+    """EPS alarms at the cSAXS beamline."""
+
+    eps_alarm_cnt = Cpt(EpicsSignalRO, read_pv="X12SA-EPS-PLC:AlarmCnt_EPS", add_prefix=("",), name="eps_alarm_cnt", kind=Kind.omitted, doc="X12SA EPS Alarm count", auto_monitor=True, labels={"alarm"})
+    mis_alarm_cnt = Cpt(EpicsSignalRO, read_pv="ARS00-MIS-PLC-01:AlarmCnt_Frontends", add_prefix=("",), name="mis_alarm_cnt", kind=Kind.omitted, doc="FrontEnd MIS Alarm count", auto_monitor=True, labels={"alarm"})
+
+
+class ValvesFrontend(EPSSubDevices):
+    """Valves frontend at the cSAXS beamline."""
+
+
+    fe_vvpg_0000 = Cpt(EpicsSignalRO, read_pv="X12SA-FE-VVPG-0000:PLC_OPEN", add_prefix=("",), name="fevvpg0000", kind=Kind.omitted, doc="FE-VVPG-0000", auto_monitor=True, labels={"valve"})
+    fe_vvpg_1010 = Cpt(EpicsSignalRO, read_pv="X12SA-FE-VVPG-1010:PLC_OPEN", add_prefix=("",), name="fevvpg1010", kind=Kind.omitted, doc="FE-VVPG-1010", auto_monitor=True, labels={"valve"})
+    fe_vvfv_2010 = Cpt(EpicsSignalRO, read_pv="X12SA-FE-VVFV-2010:PLC_OPEN", add_prefix=("",), name="fevvfv2010", kind=Kind.omitted, doc="FE-VVFV-2010", auto_monitor=True, labels={"valve"})
+    fe_vvpg_2010 = Cpt(EpicsSignalRO, read_pv="X12SA-FE-VVPG-2010:PLC_OPEN", add_prefix=("",), name="fevvpg2010", kind=Kind.omitted, doc="FE-VVPG-2010", auto_monitor=True, labels={"valve"})
+
+class ValvesOptics(EPSSubDevices):
+    """Valves at the optics hutch."""
+
+    op_vvpg_1010 = Cpt(EpicsSignalRO, read_pv="X12SA-OP-VVPG-1010:PLC_OPEN", add_prefix=("",), name="opvvpg1010", kind=Kind.omitted, doc="OP-VVPG-1010", auto_monitor=True, labels={"valve"})
+    op_vvpg_2010 = Cpt(EpicsSignalRO, read_pv="X12SA-OP-VVPG-2010:PLC_OPEN", add_prefix=("",), name="opvvpg2010", kind=Kind.omitted, doc="OP-VVPG-2010", auto_monitor=True, labels={"valve"})
+    op_vvpg_3010 = Cpt(EpicsSignalRO, read_pv="X12SA-OP-VVPG-3010:PLC_OPEN", add_prefix=("",), name="opvvpg3010", kind=Kind.omitted, doc="OP-VVPG-3010", auto_monitor=True, labels={"valve"})
+    op_vvpg_3020 = Cpt(EpicsSignalRO, read_pv="X12SA-OP-VVPG-3020:PLC_OPEN", add_prefix=("",), name="opvvpg3020", kind=Kind.omitted, doc="OP-VVPG-3020", auto_monitor=True, labels={"valve"})
+    op_vvpg_4010 = Cpt(EpicsSignalRO, read_pv="X12SA-OP-VVPG-4010:PLC_OPEN", add_prefix=("",), name="opvvpg4010", kind=Kind.omitted, doc="OP-VVPG-4010", auto_monitor=True, labels={"valve"})
+    op_vvpg_5010 = Cpt(EpicsSignalRO, read_pv="X12SA-OP-VVPG-5010:PLC_OPEN", add_prefix=("",), name="opvvpg5010", kind=Kind.omitted, doc="OP-VVPG-5010", auto_monitor=True, labels={"valve"})
+    op_vvpg_6010 = Cpt(EpicsSignalRO, read_pv="X12SA-OP-VVPG-6010:PLC_OPEN", add_prefix=("",), name="opvvpg6010", kind=Kind.omitted, doc="OP-VVPG-6010", auto_monitor=True, labels={"valve"})
+    op_vvpg_7010 = Cpt(EpicsSignalRO, read_pv="X12SA-OP-VVPG-7010:PLC_OPEN", add_prefix=("",), name="opvvpg7010", kind=Kind.omitted, doc="OP-VVPG-7010", auto_monitor=True, labels={"valve"})
+    
+    
+class ValvesEndstation(EPSSubDevices):
+    """Endstation valves at the cSAXS beamline."""
+
+    es_vvpg_1010 = Cpt(EpicsSignalRO, read_pv="X12SA-ES-VVPG-1010:PLC_OPEN", add_prefix=("",), name="esvvpg1010", kind=Kind.omitted, doc="ES-VVPG-1010", auto_monitor=True, labels={"valve"})
+
+
+class ShuttersFrontend(EPSSubDevices):
+    """Shutters frontend."""
+
+    fe_psh1 = Cpt(EpicsSignalRO, read_pv="X12SA-FE-PSH1-EMLS-0010:OPEN", add_prefix=("",), name="fepsh1", kind=Kind.omitted, doc="FE-PSH1-EMLS-0010", auto_monitor=True, labels={"shutter"})
+    fe_sto1 = Cpt(EpicsSignalRO, read_pv="X12SA-FE-STO1-EMLS-0010:OPEN", add_prefix=("",), name="festo1", kind=Kind.omitted, doc="FE-STO1-EMLS-0010", auto_monitor=True, labels={"shutter"})
+
+
+class ShuttersEndstation(EPSSubDevices):
+    """Shutters at the endstation."""
+
+    es_psh17010 = Cpt(EpicsSignalRO, read_pv="X12SA-OP-PSH1-EMLS-7010:OPEN", add_prefix=("",), name="espsh17010", kind=Kind.omitted, doc="OP-PSH1-EMLS-7010", auto_monitor=True, labels={"shutter"})
+
+
+class DMMMonochromator(EPSSubDevices):
+    """DMM monochromator signals at the cSAXS beamline."""
+
+    dmm_temp_surface_1 = Cpt(EpicsSignalRO, read_pv="X12SA-OP-DMM-ETTC-3010:TEMP", add_prefix=("",), name="dmm_temp_surface_1", kind=Kind.omitted, doc="DMM Temp Surface 1", auto_monitor=True, labels={"temp"})
+    dmm_temp_surface_2 = Cpt(EpicsSignalRO, read_pv="X12SA-OP-DMM-ETTC-3020:TEMP", add_prefix=("",), name="dmm_temp_surface_2", kind=Kind.omitted, doc="DMM Temp Surface 2", auto_monitor=True, labels={"temp"})
+    dmm_temp_shield_1_disaster = Cpt(EpicsSignalRO, read_pv="X12SA-OP-DMM-ETTC-3030:TEMP", add_prefix=("",), name="dmm_temp_shield_1_disaster", kind=Kind.omitted, doc="DMM Temp Shield 1 (disaster)", auto_monitor=True, labels={"temp"})
+    dmm_temp_shield_2_disaster = Cpt(EpicsSignalRO, read_pv="X12SA-OP-DMM-ETTC-3040:TEMP", add_prefix=("",), name="dmm_temp_shield_2_disaster", kind=Kind.omitted, doc="DMM Temp Shield 2 (disaster)", auto_monitor=True, labels={"temp"})
+
+    dmm_translation_thru = Cpt(EpicsSignalRO, read_pv="X12SA-OP-DMM-EMLS-3010:THRU", add_prefix=("",), name="dmm_translation_thru", kind=Kind.omitted, doc="DMM Translation ThruPos", auto_monitor=True, labels={"switch"})
+    dmm_translation_in = Cpt(EpicsSignalRO, read_pv="X12SA-OP-DMM-EMLS-3020:IN", add_prefix=("",), name="dmm_translation_in", kind=Kind.omitted, doc="DMM Translation InPos", auto_monitor=True, labels={"switch"})
+    dmm_bragg_thru = Cpt(EpicsSignalRO, read_pv="X12SA-OP-DMM-EMLS-3030:THRU", add_prefix=("",), name="dmm_bragg_thru", kind=Kind.omitted, doc="DMM Bragg ThruPos", auto_monitor=True, labels={"switch"})
+    dmm_bragg_in = Cpt(EpicsSignalRO, read_pv="X12SA-OP-DMM-EMLS-3040:IN", add_prefix=("",), name="dmm_bragg_in", kind=Kind.omitted, doc="DMM Bragg InPos", auto_monitor=True, labels={"switch"})
+
+    dmm_heater_fault_xtal_1 = Cpt(EpicsSignalRO, read_pv="X12SA-OP-DMM-EMSW-3050:SWITCH", add_prefix=("",), name="dmm_heater_fault_xtal_1", kind=Kind.omitted, doc="DMM Heater Fault XTAL 1", auto_monitor=True, labels={"fault"})
+    dmm_heater_fault_xtal_2 = Cpt(EpicsSignalRO, read_pv="X12SA-OP-DMM-EMSW-3060:SWITCH", add_prefix=("",), name="dmm_heater_fault_xtal_2", kind=Kind.omitted, doc="DMM Heater Fault XTAL 2", auto_monitor=True, labels={"fault"})
+    dmm_heater_fault_support_1 = Cpt(EpicsSignalRO, read_pv="X12SA-OP-DMM-EMSW-3070:SWITCH", add_prefix=("",), name="dmm_heater_fault_support_1", kind=Kind.omitted, doc="DMM Heater Fault Support 1", auto_monitor=True, labels={"fault"})
+
+    dmm_energy = Cpt(EpicsSignalRO, read_pv="X12SA-OP-DMM1:ENERGY-GET", add_prefix=("",), name="dmm_energy", kind=Kind.omitted, doc="DMM Energy", auto_monitor=True, labels={"energy"})
+    dmm_position = Cpt(EpicsSignalRO, read_pv="X12SA-OP-DMM1:POSITION", add_prefix=("",), name="dmm_position", kind=Kind.omitted, doc="DMM Position", auto_monitor=True, labels={"string"})
+    dmm_stripe = Cpt(EpicsSignalRO, read_pv="X12SA-OP-DMM1:STRIPE", add_prefix=("",), name="dmm_stripe", kind=Kind.omitted, doc="DMM Stripe", auto_monitor=True, labels={"string"})
+
+
+class CCMMonochromator(EPSSubDevices):
+    """CCM monochromator signals at the cSAXS beamline."""
+
+    ccm_temp_crystal = Cpt(EpicsSignalRO, read_pv="X12SA-OP-CCM-ETTC-4010:TEMP", add_prefix=("",), name="ccm_temp_crystal", kind=Kind.omitted, doc="CCM Temp Crystal", auto_monitor=True, labels={"temp"})
+    ccm_temp_shield_disaster = Cpt(EpicsSignalRO, read_pv="X12SA-OP-CCM-ETTC-4020:TEMP", add_prefix=("",), name="ccm_temp_shield_disaster", kind=Kind.omitted, doc="CCM Temp Shield (disaster)", auto_monitor=True, labels={"temp"})
+
+    ccm_heater_fault_1 = Cpt(EpicsSignalRO, read_pv="X12SA-OP-CCM-EMSW-4010:SWITCH", add_prefix=("",), name="ccm_heater_fault_1", kind=Kind.omitted, doc="CCM Heater Fault 1", auto_monitor=True, labels={"fault"})
+    ccm_heater_fault_2 = Cpt(EpicsSignalRO, read_pv="X12SA-OP-CCM-EMSW-4020:SWITCH", add_prefix=("",), name="ccm_heater_fault_2", kind=Kind.omitted, doc="CCM Heater Fault 2", auto_monitor=True, labels={"fault"})
+    ccm_heater_fault_3 = Cpt(EpicsSignalRO, read_pv="X12SA-OP-CCM-EMSW-4030:SWITCH", add_prefix=("",), name="ccm_heater_fault_3", kind=Kind.omitted, doc="CCM Heater Fault 3", auto_monitor=True, labels={"fault"})
+
+    ccm_energy = Cpt(EpicsSignalRO, read_pv="X12SA-OP-CCM1:ENERGY-GET", add_prefix=("",), name="ccm_energy", kind=Kind.omitted, doc="CCM Energy", auto_monitor=True, labels={"energy"})
+    ccm_position = Cpt(EpicsSignalRO, read_pv="X12SA-OP-CCM1:POSITION", add_prefix=("",), name="ccm_position", kind=Kind.omitted, doc="CCM Position", auto_monitor=True, labels={"string"})
+
+
+class CoolingWater(EPSSubDevices):
+    """Cooling water signals at the cSAXS beamline."""
+
+    op_sl1_efsw_2010_flow = Cpt(EpicsSignalRO, read_pv="X12SA-OP-SL1-EFSW-2010:FLOW", add_prefix=("",), name="op_sl1_efsw_2010_flow", kind=Kind.omitted, doc="OP-SL1-EFSW-2010", auto_monitor=True, labels={"flow"})
+    op_sl2_efsw_2010_flow = Cpt(EpicsSignalRO, read_pv="X12SA-OP-SL2-EFSW-2010:FLOW", add_prefix=("",), name="op_sl2_efsw_2010_flow", kind=Kind.omitted, doc="OP-SL2-EFSW-2010", auto_monitor=True, labels={"flow"})
+    op_eb1_efsw_5010_flow = Cpt(EpicsSignalRO, read_pv="X12SA-OP-EB1-EFSW-5010:FLOW", add_prefix=("",), name="op_eb1_efsw_5010_flow", kind=Kind.omitted, doc="OP-EB1-EFSW-5010", auto_monitor=True, labels={"flow"})
+    op_eb1_efsw_5020_flow = Cpt(EpicsSignalRO, read_pv="X12SA-OP-EB1-EFSW-5020:FLOW", add_prefix=("",), name="op_eb1_efsw_5020_flow", kind=Kind.omitted, doc="OP-EB1-EFSW-5020", auto_monitor=True, labels={"flow"})
+    op_sl3_efsw_5010_flow = Cpt(EpicsSignalRO, read_pv="X12SA-OP-SL3-EFSW-5010:FLOW", add_prefix=("",), name="op_sl3_efsw_5010_flow", kind=Kind.omitted, doc="OP-SL3-EFSW-5010", auto_monitor=True, labels={"flow"})
+    op_kb_efsw_6010_flow = Cpt(EpicsSignalRO, read_pv="X12SA-OP-KB-EFSW-6010:FLOW", add_prefix=("",), name="op_kb_efsw_6010_flow", kind=Kind.omitted, doc="OP-KB-EFSW-6010", auto_monitor=True, labels={"flow"})
+    op_psh1_efsw_7010_flow = Cpt(EpicsSignalRO, read_pv="X12SA-OP-PSH1-EFSW-7010:FLOW", add_prefix=("",), name="op_psh1_efsw_7010_flow", kind=Kind.omitted, doc="OP-PSH1-EFSW-7010", auto_monitor=True, labels={"flow"})
+    es_eb2_efsw_1010_flow = Cpt(EpicsSignalRO, read_pv="X12SA-ES-EB2-EFSW-1010:FLOW", add_prefix=("",), name="es_eb2_efsw_1010_flow", kind=Kind.omitted, doc="ES-EB2-EFSW-1010", auto_monitor=True, labels={"flow"})
+
+    op_cs_ecvw_0010 = Cpt(EpicsSignalRO, read_pv="X12SA-OP-CS-ECVW-0010:PLC_OPEN", add_prefix=("",), name="op_cs_ecvw_0010", kind=Kind.omitted, doc="OP-CS-ECVW-0010", auto_monitor=True, labels={"valve"})
+    op_cs_ecvw_0020 = Cpt(EpicsSignalRO, read_pv="X12SA-OP-CS-ECVW-0020:PLC_OPEN", add_prefix=("",), name="op_cs_ecvw_0020", kind=Kind.omitted, doc="OP-CS-ECVW-0020", auto_monitor=True, labels={"valve"})
+
+
+class EPS(PSIDeviceBase):
+    """EPS device for the cSAXS beamline."""
+    USER_ACCESS = [
+        "show_all",
+        "water_cooling_op",
+    ]
+    alarms = Cpt(EPSAlarms, name="alarms", doc="EPS Alarms")
+    valves_frontend = Cpt(ValvesFrontend, name="valves_frontend", doc="Valves Frontend")
+    valves_optics = Cpt(ValvesOptics, name="valves_optics", doc="Valves Optics Hutch")
+    valves_es = Cpt(ValvesEndstation, name="valves_es", doc="Valves ES Hutch")
+    shutters_frontend = Cpt(ShuttersFrontend, name="shutters_frontend", doc="Shutters Frontend")
+    shutters_es = Cpt(ShuttersEndstation, name="shutters_es", doc="Shutters Endstation")
+    dmm_monochromator = Cpt(DMMMonochromator, name="dmm_monochromator", doc="DMM Monochromator")
+    ccm_monochromator = Cpt(CCMMonochromator, name="ccm_monochromator", doc="CCM Monochromator")
+    cooling_water = Cpt(CoolingWater, name="cooling_water", doc="Cooling Water")
+
+    # Acknowledgment signals for PLC communication (if needed for future use)
+    ackerr = Cpt(EpicsSignal, read_pv="X12SA-EPS-PLC:ACKERR-REQUEST", add_prefix=("",), name="ackerr", kind=Kind.omitted, doc="ACKERR request - OP-CS-ECVW-0020", auto_monitor=True, labels={"request"})
+    request = Cpt(EpicsSignal, read_pv="X12SA-OP-CS-ECVW:PLC_REQUEST", add_prefix=("",), name="op_cs_ecvw_request", kind=Kind.omitted, doc="PLC request - OP-CS-ECVW-PLC_REQUEST", auto_monitor=True, labels={"request"})
+
+    def _notify(self, msg: str, show_as_client_msg: bool = True):
+        """Utility method to print a message, and optionally send it to the client UI if it should be shown also as a client message."""
+        try:
+            if show_as_client_msg:
+                self.device_manager.connector.send_client_info(msg, scope="", show_asap=True)
+            else:
+                print(msg)
+        except Exception:
+            logger.error(f"Failed to send client message, falling back to print: {msg}")
+            print(str(msg))
+
+    # ----------------------------------------------------------
+    # Water cooling operation
+    # ----------------------------------------------------------
+
+    def safe_get(self, sig, default=None):
+        """Helper method to safely get a signal value, returning a default if there's an error."""
+        try:
+            return sig.get()
+        except Exception as ex:
+            logger.warning(f"Failed to get signal {sig.pvname}: {ex}")
+            return default
+
+    def water_cooling_op(self):
+        """
+        Open ECVW valves, reset EPS alarms, monitor for 20s,
+        then ensure stability (valves remain open) for 10s.
+        All messages sent to client.
+        """
+
+        POLL_PERIOD = 2
+        TIMEOUT = 20
+        STABILITY = 15
+
+        self._notify("=== Water Cooling Operation ===")
+
+        # --- Signals ---
+        eps_alarm_sig = self.alarms.eps_alarm_cnt
+        ackerr = self.ackerr
+        request = self.request
+
+        valves = [self.cooling_water.op_cs_ecvw_0010, self.cooling_water.op_cs_ecvw_0020]
+
+        # Flow channels list extracted from CHANNELS
+        flow_items = [walk.item for walk in self.cooling_water.walk_signals() if "flow" in walk.item._ophyd_labels_]
+
+        # --- Step 1: EPS alarm reset ---
+        alarm_value = self.safe_get(eps_alarm_sig, 0)
+        if alarm_value and alarm_value > 0:
+            self._notify(f"[WaterCooling] EPS alarms present ({alarm_value}) → resetting…")
+            try:
+                ackerr.put(1)
+            except Exception as ex:
+                self._notify(f"[WaterCooling] WARNING: ACKERR write failed: {ex}")
+            time.sleep(0.3)
+        else:
+            self._notify("[WaterCooling] No EPS alarms detected.")
+
+        # --- Step 2: Issue open request ---
+        self._notify("[WaterCooling] Sending cooling-valve OPEN request…")
+        try:
+            request.put(1)
+        except Exception as ex:
+            self._notify(f"[WaterCooling] ERROR: Failed to send OPEN request: {ex}")
+            return False
+
+        # --- Step 3: Monitoring loop (clean client table output) ---
+        start = time.time()
+        end = start + TIMEOUT
+        stable_until = None
+
+        # Print (server-side) header once
+        print("Monitoring valves and flow sensors...")
+        print(f"  Valves: {valves[0].attr_name[-4:]}, {valves[1].attr_name[-4:]}")
+        print(f"  Note: stability requires valves to remain OPEN for {STABILITY} seconds.")
+
+        # One table header to the client (via device manager)
+        # Fixed-width columns for alignment in monospaced UI
+        table_header = f"{'Time':>6} | {'Valves':<21} | {'Flows (OK/FAIL/N/A)':<20}"
+        self._notify(table_header)
+
+        def snapshot():
+            # Valve snapshot
+            v_states = [self.safe_get(v, None) for v in valves]
+            v1 = f"{valves[0].attr_name[-4:]}=" + ("OPEN  " if v_states[0] is True or v_states[0] == 1 else "CLOSED" if v_states[0] is False or v_states[0] == 0 else "N/A  ")
+            v2 = f"{valves[1].attr_name[-4:]}=" + ("OPEN  " if v_states[1] is True or v_states[1] == 1 else "CLOSED" if v_states[1] is False or v_states[1] == 0 else "N/A  ")
+            # 2 valves with a single space between => width ~ 21
+            valve_str = f"{v1} {v2}"
+
+            # Flow summary: OK/FAIL/N/A counts (compact)
+            flow_states = []
+            for fsig in flow_items:
+                fval = self.safe_get(fsig, None)
+                flow_states.append(True if fval in (1, True) else False if fval in (0, False) else None)
+
+            ok = sum(1 for f in flow_states if f is True)
+            fail = sum(1 for f in flow_states if f is False)
+            na = sum(1 for f in flow_states if f is None)
+            flow_summary = f"{ok:>2} / {fail:>2} / {na:>2}"
+
+            return v_states, valve_str, flow_summary
+
+        while True:
+            # TODO Consider adding a timeout to avoid infinite loop.
+            now = time.time()
+            elapsed = int(now - start)
+
+            if now > end:
+                # One last line to client
+                v_states, valves_s, flows_s = snapshot()
+                self._notify(f"{elapsed:>6}s | {valves_s:<21} | {flows_s:<20}")
+                print("→ TIMEOUT: Cooling valves failed to remain OPEN.")
+                return False
+
+            # Live snapshot
+            v_states, valves_s, flows_s = snapshot()
+            # Exactly one concise line to client per cycle
+            self._notify(f"{elapsed:>6}s | {valves_s:<21} | {flows_s:<20}")
+
+            both_open = all(s is not None and bool(s) for s in v_states)
+
+            if both_open:
+                if stable_until is None:
+                    stable_until = now + STABILITY
+                    print(f"[WaterCooling] Both valves OPEN → starting {STABILITY}s stability window…")
+                else:
+                    if now >= stable_until:
+                        print("→ SUCCESS: Valves remained OPEN during stability window.")
+                        return True
+            else:
+                if stable_until is not None:
+                    print("[WaterCooling] Valve closed again → restarting stability window.")
+                stable_until = None
+
+            time.sleep(POLL_PERIOD)
+
+    def show_all(self):
+        red = "\x1b[91m"
+        green = "\x1b[92m"
+        white = "\x1b[0m"
+        bold = "\x1b[1m"
+        cyan = "\x1b[96m"
+
+        # ---- New: enum maps for numeric -> string rendering ----
+        POSITION_ENUM = {0: "out of beam", 1: "in beam"}
+        STRIPE_ENUM = {0: "Stripe 1 W/B4C", 1: "Stripe 2 NiV/B4C"}
+        POSITION_ATTRS = {self.dmm_monochromator.dmm_position.attr_name, self.ccm_monochromator.ccm_position.attr_name}
+        STRIPE_ATTRS = {self.dmm_monochromator.dmm_stripe.attr_name}
+
+        def is_bool_like(v):
+            return isinstance(v, (bool, int)) and v in (0, 1, True, False)
+
+        # ---- Changed: accept attr in formatter so we can apply enum mapping ----
+        def fmt_value(value: any, signal: EpicsSignalRO):
+            if value is None:
+                return f"{red}MISSING{white}"
+
+            attr = signal.attr_name
+
+            # ---------- Explicit enum mappings by attribute ----------
+            if attr in POSITION_ATTRS:
+                # Position comes as numeric 0/1
+                try:
+                    iv = int(value)
+                    return POSITION_ENUM.get(iv, f"{iv}")
+                except Exception:
+                    # Fallback if it’s already a string or unexpected
+                    return f"{value}"
+
+            if attr in STRIPE_ATTRS:
+                # Stripe comes as numeric 0/1
+                try:
+                    iv = int(value)
+                    return STRIPE_ENUM.get(iv, f"{iv}")
+                except Exception:
+                    return f"{value}"
+
+            # ------------------- TEMPERATURE -------------------
+            if "temp" in signal._ophyd_labels_ and isinstance(value, (int, float)):
+                return f"{value:.1f}"
+
+            # ------------------- ENERGY ------------------------
+            if "energy" in signal._ophyd_labels_ and isinstance(value, (int, float)):
+                return f"{value:.4f}"
+
+            # ------------------- STRINGS -----------------------
+            if "string" in signal._ophyd_labels_ or "position" in signal._ophyd_labels_:
+                # For other strings, just echo the value
+                return f"{value}"
+
+            # ------------------- SWITCH (ACTIVE/INACTIVE) ------
+            if "switch" in signal._ophyd_labels_ and is_bool_like(value):
+                return f"{green+'ACTIVE'+white if value else red+'INACTIVE'+white}"
+
+            # ------------------- FAULT (OK/FAULT) --------------
+            if "fault" in signal._ophyd_labels_ and is_bool_like(value):
+                return f"{green+'OK'+white if not value else red+'FAULT'+white}"
+
+            # ------------------- VALVE/SHUTTER -----------------
+            if ("valve" in signal._ophyd_labels_ or "shutter" in signal._ophyd_labels_) and is_bool_like(value):
+                return f"{green+'OPEN'+white if value else red+'CLOSED'+white}"
+
+            # ------------------- FLOW (OK/FAIL) ----------------
+            if "flow" in signal._ophyd_labels_ and is_bool_like(value):
+                return f"{green}OK{white}" if bool(value) else f"{red}FAIL{white}"
+
+            # ------------------- FALLBACK -----------------------
+            return f"{value}"
+
+        # ------------------- PRINT START ---------------------
+        print(f"{bold}X12SA EPS status{white}")
+
+        for name, component in self._sig_attrs.items():
+            sub_device = getattr(self, name)
+            rows = []
+            # Only print sub-devices, not individual request signals
+            if not isinstance(sub_device, Device):
+                continue
+            print(f"\n{bold}{component.doc}{white}")
+            for sub_walk in sub_device.walk_components():
+                cpt: Cpt = sub_walk.item
+                it: EpicsSignalRO = getattr(sub_device, cpt.attr)
+                val = self.safe_get(it)
+                rows.append((cpt.doc, val, it))
+
+            label_width = max(32, *(len(label) for (label, _, _) in rows))
+
+            for label, value, it in rows:
+                fv = fmt_value(value, it)  # <-- pass attr to formatter
+                print(f"  - {label:<{label_width}} {fv}")
+
+            if sub_device.attr_name == "cooling_water":
+                v1 = self.safe_get(self.cooling_water.op_cs_ecvw_0010)
+                v2 = self.safe_get(self.cooling_water.op_cs_ecvw_0020)
+
+                def closed(v):
+                    return is_bool_like(v) and not bool(v)
+
+                if closed(v1) and closed(v2):
+                    print(f"\n{cyan}Hint:{white} Both water cooling valves are CLOSED.\n" f"You can open them using: {bold}dev.x12saEPS.water_cooling_op(){white}")
+
+# fmt: on
+# ----------------------------------------------------------
+# Consistency report
+# ----------------------------------------------------------
+# def consistency_report(self, *, verbose=True):
+#     missing = []
+#     dupes = []
+#     seen = {}
+
+#     for sub_device in self.walk_components():
+#         section = sub_device.name
+#         for walk in sub_device.walk_components():
+#             cpt: Cpt = walk.ancestors[-1]
+#             it: EpicsSignalRO = walk.item
+#             if not hasattr(self, it["attr"]):
+#                 missing.append((section, it["attr"], it["label"], it["pv"]))
+
+#             pv = it["pv"]
+#             if pv in seen:
+#                 dupes.append((pv, seen[pv], (section, it["attr"], it["label"])))
+#             else:
+#                 seen[pv] = (section, it["attr"], it["label"])
+
+#     if verbose:
+#         print("=== Consistency Report ===")
+
+#         if missing:
+#             print("\nMissing attributes:")
+#             for sec, a, lbl, pv in missing:
+#                 print(f"  - [{sec}] {a} {lbl} pv={pv}")
+#         else:
+#             print("\nNo missing attributes.")
+
+#         if dupes:
+#             print("\nDuplicate PVs:")
+#             for pv, f1, f2 in dupes:
+#                 print(f"  {pv} → {f1} AND {f2}")
+#         else:
+#             print("\nNo duplicate PVs.")
+
+#     return {"missing_attrs": missing, "duplicate_pvs": dupes}
--- a/csaxs_bec/devices/epics/fast_shutter.py
+++ b/csaxs_bec/devices/epics/fast_shutter.py
@@ -0,0 +1,67 @@
+"""
+Shutter device for the cSAXS beamline with 2 PVs. One is connected to a
+signal can be set to control the shutter signal, and the other is a readback signal
+that can be monitored to check the shutter status as it may be controlled directly by
+the delay generator."""
+
+from ophyd import Component as Cpt
+from ophyd import Device, EpicsSignal, EpicsSignalRO, Kind
+
+
+class cSAXSFastEpicsShutter(Device):
+    """
+    Fast EPICS shutter with automatic PV selection based on host subnet. IOC prefix is 'X12SA-ES1-TTL:'
+    """
+
+    USER_ACCESS = ["fshopen", "fshclose", "fshstatus", "fshinfo", "fshstatus_readback", "help"]
+    SUB_VALUE = "value"
+    _default_sub = SUB_VALUE
+
+    # PVs
+    shutter = Cpt(EpicsSignal, "OUT_01", kind=Kind.normal, auto_monitor=True)
+    shutter_readback = Cpt(EpicsSignalRO, "INP_01", kind=Kind.normal, auto_monitor=True)
+
+    # -----------------------------------------------------
+    # User-facing shutter control functions
+    # -----------------------------------------------------
+
+    # pylint: disable=protetced-access
+    def fshopen(self) -> None:
+        """Open the fast shutter."""
+        self.shutter.set(1).wait(timeout=self.shutter._timeout)  # 2s default for ES
+
+    # pylint: disable=protetced-access
+    def fshclose(self) -> None:
+        """Close the fast shutter."""
+        self.shutter.set(0).wait(timeout=self.shutter._timeout)  # 2s default for ES
+
+    def fshstatus(self) -> int:
+        """Return the fast shutter control status (0=closed, 1=open)."""
+        return self.shutter.get()  # Ensure we have the latest value from EPICS
+
+    def fshstatus_readback(self) -> int:
+        """Return the fast shutter status (0=closed, 1=open)."""
+        return self.shutter_readback.get()  # Ensure we have the latest value from EPICS
+
+    def fshinfo(self) -> None:
+        """Print information about which EPICS PV channel is being used."""
+        pvname = self.shutter.pvname
+        shutter_readback_pvname = self.shutter_readback.pvname
+        print(
+            f"Fast shutter connected to EPICS channel: {pvname} with shutter readback: {shutter_readback_pvname}"
+        )
+
+    def stop(self, *, success: bool = False) -> None:
+        """Stop the shutter device. Make sure to close it."""
+        self.shutter.put(0)
+        super().stop(success=success)
+
+    def help(self):
+        """Display available user methods."""
+        print("Available methods:")
+        for method in self.USER_ACCESS:
+            print(f"  - {method}")
+
+
+if __name__ == "__main__":
+    fsh = cSAXSFastEpicsShutter(name="fsh", prefix="X12SA-ES1-TTL:")
--- a/csaxs_bec/devices/epics/mcs_card/mcs_card_csaxs.py
+++ b/csaxs_bec/devices/epics/mcs_card/mcs_card_csaxs.py
@@ -22,7 +22,13 @@ import numpy as np
 from bec_lib.logger import bec_logger
 from ophyd import Component as Cpt
 from ophyd import EpicsSignalRO, Kind
-from ophyd_devices import AsyncMultiSignal, CompareStatus, ProgressSignal, StatusBase
+from ophyd_devices import (
+    AsyncMultiSignal,
+    CompareStatus,
+    ProgressSignal,
+    StatusBase,
+    TransitionStatus,
+)
 from ophyd_devices.interfaces.base_classes.psi_device_base import PSIDeviceBase

 from csaxs_bec.devices.epics.mcs_card.mcs_card import (
@@ -255,6 +261,7 @@ class MCSCardCSAXS(PSIDeviceBase, MCSCard):
            **kwargs: Additional keyword arguments from the subscription, including 'obj' (the EpicsSignalRO instance).
        """
        with self._rlock:
+            logger.info(f"Received update on mcs card {self.name}")
            if self._omit_mca_callbacks.is_set():
                return  # Suppress callbacks when erasing all channels
            self._mca_counter_index += 1
@@ -286,7 +293,7 @@ class MCSCardCSAXS(PSIDeviceBase, MCSCard):
            )

            # Once we have received all channels, push data to BEC and reset for next accumulation
-            logger.debug(
+            logger.info(
                f"Received update for {attr_name}, index {self._mca_counter_index}/{self.NUM_MCA_CHANNELS}"
            )
            if len(self._current_data) == self.NUM_MCA_CHANNELS:
@@ -363,7 +370,10 @@ class MCSCardCSAXS(PSIDeviceBase, MCSCard):
        self._num_total_triggers = triggers * num_points
        self._acquisition_group = "monitored" if triggers == 1 else "burst_group"
        self.preset_real.set(0).wait(timeout=self._pv_timeout)
-        self.num_use_all.set(triggers).wait(timeout=self._pv_timeout)
+        if self.scan_info.msg.scan_type == "step":
+            self.num_use_all.set(triggers).wait(timeout=self._pv_timeout)
+        elif self.scan_info.msg.scan_type == "fly":
+            self.num_use_all.set(self._num_total_triggers).wait(timeout=self._pv_timeout)

        # Clear any previous data, just to be sure
        with self._rlock:
@@ -385,6 +395,21 @@ class MCSCardCSAXS(PSIDeviceBase, MCSCard):
        self._omit_mca_callbacks.clear()

        logger.info(f"MCS Card {self.name} on_stage completed in {time.time() - start_time:.3f}s.")
+        # For a fly scan we need to start the mcs card ourselves
+        if self.scan_info.msg.scan_type == "fly":
+            self.erase_start.put(1)
+
+    def on_prescan(self) -> None | StatusBase:
+        """
+        This method is called after on_stage and before the scan starts. For the MCS card, we need to make sure
+        that the card is properly started for fly scans. For step scans, this will be handled by the DDG,
+        so no action is required here.
+        """
+        if self.scan_info.msg.scan_type == "fly":
+            status_acquiring = CompareStatus(self.acquiring, ACQUIRING.ACQUIRING)
+            self.cancel_on_stop(status_acquiring)
+            return status_acquiring
+        return None

    def on_unstage(self) -> None:
        """
@@ -422,9 +447,16 @@ class MCSCardCSAXS(PSIDeviceBase, MCSCard):
                        hasattr(self.scan_info.msg, "num_points")
                        and self.scan_info.msg.num_points is not None
                    ):
-                        if self._current_data_index == self.scan_info.msg.num_points:
-                            for callback in self._scan_done_callbacks:
-                                callback(exception=None)
+                        if self.scan_info.msg.scan_type == "step":
+                            if self._current_data_index == self.scan_info.msg.num_points:
+                                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)
+
                    time.sleep(0.02)  # 20ms delay to avoid busy loop
                except Exception as exc:  # pylint: disable=broad-except
                    content = traceback.format_exc()
@@ -452,7 +484,6 @@ class MCSCardCSAXS(PSIDeviceBase, MCSCard):
        """Callback for status failure, the monitoring thread should be stopped."""
        # NOTE Check for status.done and status.success is important to avoid
        if status.done:
-
            self._start_monitor_async_data_emission.clear()  # Stop monitoring

    def on_complete(self) -> CompareStatus:
@@ -478,6 +509,13 @@ class MCSCardCSAXS(PSIDeviceBase, MCSCard):
            monitoring thread is stopped properly.

        """
+        # NOTE For fly scans with EXT/EN enabled triggering, the MCS card needs to receive an
+        # additional trigger at the end of the scan to advance the channel. This will ensure
+        # that the acquisition finishes on the card and that data is emitted to BEC. If the acquisition
+        # was already finished (i.e. normal step scan sends 1 extra pulse per burst cycle), this will
+        # not have any effect as the card will already be in DONE state and signal.
+        self.software_channel_advance.put(1)
+
        # Prepare and register status callback for the async monitoring loop
        status_async_data = StatusBase(obj=self)
        self._scan_done_callbacks.append(partial(self._status_callback, status_async_data))
@@ -491,7 +529,7 @@ class MCSCardCSAXS(PSIDeviceBase, MCSCard):

        # Combine both statuses
        ret_status = status & status_async_data
-        # Handle external stop/cancel, and stop monitoring
+        # NOTE: Handle external stop/cancel, and stop monitoring
        ret_status.add_callback(self._status_failed_callback)
        self.cancel_on_stop(ret_status)
        return ret_status
--- a/csaxs_bec/devices/ids_cameras/base_integration/camera.py
+++ b/csaxs_bec/devices/ids_cameras/base_integration/camera.py
@@ -156,6 +156,7 @@ class Camera:
        camera_id (int): The ID of the camera device.
        m_n_colormode (Literal[0, 1, 2, 3]): Color mode for the camera.
        bits_per_pixel (Literal[8, 24]): Number of bits per pixel for the camera.
+        live_mode (bool): Whether to enable live mode for the camera.
    """

    def __init__(
--- a/csaxs_bec/devices/ids_cameras/ids_camera.py
+++ b/csaxs_bec/devices/ids_cameras/ids_camera.py
@@ -3,19 +3,21 @@
 from __future__ import annotations

 import threading
-from typing import TYPE_CHECKING, Literal
+import time
+from typing import TYPE_CHECKING, Literal, Tuple, TypedDict

 import numpy as np
-from ophyd import Component as Cpt, Signal, Kind
-
 from bec_lib import messages
 from bec_lib.logger import bec_logger
-from csaxs_bec.devices.ids_cameras.base_integration.camera import Camera
+from ophyd import Component as Cpt
 from ophyd_devices.interfaces.base_classes.psi_device_base import PSIDeviceBase
 from ophyd_devices.utils.bec_signals import AsyncSignal, PreviewSignal

+from csaxs_bec.devices.ids_cameras.base_integration.camera import Camera
+
 if TYPE_CHECKING:
    from bec_lib.devicemanager import ScanInfo
+    from pydantic import ValidationInfo

 logger = bec_logger.logger

@@ -43,15 +45,8 @@ class IDSCamera(PSIDeviceBase):
        doc="Signal for the region of interest (ROI).",
        async_update={"type": "add", "max_shape": [None]},
    )
-    live_mode_enabled = Cpt(
-        Signal,
-        name="live_mode_enabled",
-        value=False,
-        doc="Enable or disable live mode.",
-        kind=Kind.config,
-    )

-    USER_ACCESS = ["start_live_mode", "stop_live_mode", "mask", "set_rect_roi", "get_last_image"]
+    USER_ACCESS = ["live_mode", "mask", "set_rect_roi", "get_last_image"]

    def __init__(
        self,
@@ -88,22 +83,15 @@ class IDSCamera(PSIDeviceBase):
            bits_per_pixel=bits_per_pixel,
            connect=False,
        )
+        self._live_mode = False
        self._inputs = {"live_mode": live_mode}
        self._mask = np.zeros((1, 1), dtype=np.uint8)
        self.image.num_rotation_90 = num_rotation_90
        self.image.transpose = transpose
        self._force_monochrome = force_monochrome
-        self.live_mode_enabled.subscribe(self._on_live_mode_enabled_changed, run=False)
-        self.live_mode_enabled.put(bool(live_mode))

    ############## Live Mode Methods ##############

-    def start_live_mode(self) -> None:
-        self.live_mode_enabled.put(True)
-
-    def stop_live_mode(self) -> None:
-        self.live_mode_enabled.put(False)
-
    @property
    def mask(self) -> np.ndarray:
        """Return the current region of interest (ROI) for the camera."""
@@ -126,15 +114,22 @@ class IDSCamera(PSIDeviceBase):
            )
        self._mask = value

-    def _on_live_mode_enabled_changed(self, *args, value, **kwargs):
-        """Callback for when live mode is changed."""
-        enabled = bool(value)
-        if enabled and self.cam._connected is False:  # pylint: disable=protected-access
-            self.cam.on_connect()
-        if enabled:
-            self._start_live()
-        else:
-            self._stop_live()
+    @property
+    def live_mode(self) -> bool:
+        """Return whether the camera is in live mode."""
+        return self._live_mode
+
+    @live_mode.setter
+    def live_mode(self, value: bool):
+        """Set the live mode for the camera."""
+        if value != self._live_mode:
+            if self.cam._connected is False:  # $ pylint: disable=protected-access
+                self.cam.on_connect()
+            self._live_mode = value
+            if value:
+                self._start_live()
+            else:
+                self._stop_live()

    def set_rect_roi(self, x: int, y: int, width: int, height: int):
        """Set the rectangular region of interest (ROI) for the camera."""
@@ -201,7 +196,7 @@ class IDSCamera(PSIDeviceBase):
        """Connect to the camera."""
        self.cam.force_monochrome = self._force_monochrome
        self.cam.on_connect()
-        self.live_mode_enabled.put(bool(self._inputs.get("live_mode", False)))
+        self.live_mode = self._inputs.get("live_mode", False)
        self.set_rect_roi(0, 0, self.cam.cam.width.value, self.cam.cam.height.value)

    def on_destroy(self):
@@ -211,7 +206,7 @@ class IDSCamera(PSIDeviceBase):

    def on_trigger(self):
        """Handle the trigger event."""
-        if not bool(self.live_mode_enabled.get()):
+        if not self.live_mode:
            return
        image = self.image.get()
        if image is not None:
--- a/csaxs_bec/devices/omny/rt/rt_flomni_ophyd.py
+++ b/csaxs_bec/devices/omny/rt/rt_flomni_ophyd.py
@@ -498,6 +498,9 @@ class RtFlomniController(Controller):
        )
        # while scan is running
        while mode > 0:
+
+            #TODO here?: scan abortion if no progress in scan *raise error
+
            # logger.info(f"Current scan position {current_position_in_scan} out of {number_of_positions_planned}")
            mode, number_of_positions_planned, current_position_in_scan = self.get_scan_status()
            time.sleep(0.01)
@@ -629,6 +632,8 @@ class RtFlomniMotor(Device, PositionerBase):
    SUB_CONNECTION_CHANGE = "connection_change"
    _default_sub = SUB_READBACK

+    connectionTimeout = 20
+
    def __init__(
        self,
        axis_Id,
--- a/csaxs_bec/devices/omny/shutter.py
+++ b/csaxs_bec/devices/omny/shutter.py
@@ -1,82 +1,87 @@
-import time
-import socket
+"""
+Fast Shutter control for OMNY setup. If started with a config file in which the device_manager
+has a 'fsh' device (cSAXSFastEpicsShutter), this device will be used as the shutter.
+Otherwise, the device will create a dummy shutter device that will log warnings when shutter
+methods are called, but will not raise exceptions.
+"""
+
+from bec_lib.logger import bec_logger
 from ophyd import Component as Cpt
-from ophyd import Device
-from ophyd import EpicsSignal
+from ophyd import Device, Signal
+from ophyd_devices import PSIDeviceBase
+
+logger = bec_logger.logger


-class OMNYFastEpicsShutterError(Exception):
-    pass
-
-
-def _detect_host_pv():
-    """Detect host subnet and return appropriate PV name."""
-    try:
-        hostname = socket.gethostname()
-        local_ip = socket.gethostbyname(hostname)
-        if local_ip.startswith("129.129.122."):
-            return "X12SA-ES1-TTL:OUT_01"
-        else:
-            return "XOMNYI-XEYE-DUMMYSHUTTER:0"
-    except Exception as ex:
-        print(f"Warning: could not detect IP subnet ({ex}), using dummy shutter.")
-        return "XOMNYI-XEYE-DUMMYSHUTTER:0"
-
-
-class OMNYFastEpicsShutter(Device):
+class OMNYFastShutter(PSIDeviceBase, Device):
    """
-    Fast EPICS shutter with automatic PV selection based on host subnet.
+    Fast Shutter control for OMNY setup. If started with at the beamline, it will expose
+    the shutter control methods (fshopen, fshclose, fshstatus, fshinfo) from the
+    cSAXSFastEpicsShutter device. The device is identified by the 'fsh' name in the device manager.
+    If the 'fsh' device is not found in the device manager, this device will create a dummy shutter
+    and log warnings when shutter methods are called, but will not raise exceptions.
    """

-    USER_ACCESS = ["fshopen", "fshclose", "fshstatus", "fshinfo", "help"]
+    USER_ACCESS = ["fshopen", "fshclose", "fshstatus", "fshinfo", "help", "fshstatus_readback"]
    SUB_VALUE = "value"
    _default_sub = SUB_VALUE

-    # PV is detected dynamically at import time
-    shutter = Cpt(EpicsSignal, name="shutter", read_pv=_detect_host_pv(), auto_monitor=True)
-
-    def __init__(self, prefix="", *, name, **kwargs):
-        super().__init__(prefix, name=name, **kwargs)
-        self.shutter.subscribe(self._emit_value)
-
-    def _emit_value(self, **kwargs):
-        timestamp = kwargs.pop("timestamp", time.time())
-        self.wait_for_connection()
-        self._run_subs(sub_type=self.SUB_VALUE, timestamp=timestamp, obj=self)
+    shutter = Cpt(Signal, name="shutter")

    # -----------------------------------------------------
    # User-facing shutter control functions
    # -----------------------------------------------------

+    # pylint: disable=invalid-name
+    def _check_if_cSAXS_shutter_exists_in_config(self) -> bool:
+        """
+        Check on the device manager if the shutter device exists.
+
+        Returns:
+            bool: True if the 'fsh' device exists in the device manager, False otherwise
+        """
+        if self.device_manager.devices.get("fsh", None) is None:
+            logger.warning(f"Fast shutter device not found for {self.name}.")
+            return False
+        return True
+
    def fshopen(self):
        """Open the fast shutter."""
-        try:
-            self.shutter.put(1, wait=True)
-        except Exception as ex:
-            raise OMNYFastEpicsShutterError(f"Failed to open shutter: {ex}")
+        if self._check_if_cSAXS_shutter_exists_in_config():
+            return self.device_manager.devices["fsh"].fshopen()
+        else:
+            self.shutter.put(1)

    def fshclose(self):
        """Close the fast shutter."""
-        try:
-            self.shutter.put(0, wait=True)
-        except Exception as ex:
-            raise OMNYFastEpicsShutterError(f"Failed to close shutter: {ex}")
+        if self._check_if_cSAXS_shutter_exists_in_config():
+            return self.device_manager.devices["fsh"].fshclose()
+        else:
+            self.shutter.put(0)

    def fshstatus(self):
        """Return the fast shutter status (0=closed, 1=open)."""
-        try:
+        if self._check_if_cSAXS_shutter_exists_in_config():
+            return self.device_manager.devices["fsh"].fshstatus()
+        else:
            return self.shutter.get()
-        except Exception as ex:
-            raise OMNYFastEpicsShutterError(f"Failed to read shutter status: {ex}")

    def fshinfo(self):
        """Print information about which EPICS PV channel is being used."""
-        pvname = self.shutter.pvname
-        print(f"Fast shutter connected to EPICS channel: {pvname}")
-        return pvname
+        if self._check_if_cSAXS_shutter_exists_in_config():
+            return self.device_manager.devices["fsh"].fshinfo()
+        else:
+            print("Using dummy fast shutter device. No EPICS channel is connected.")

    def help(self):
        """Display available user methods."""
        print("Available methods:")
        for method in self.USER_ACCESS:
            print(f"  - {method}")
+
+    def fshstatus_readback(self):
+        """Return the fast shutter status (0=closed, 1=open) from the readback signal."""
+        if self._check_if_cSAXS_shutter_exists_in_config():
+            return self.device_manager.devices["fsh"].fshstatus_readback()
+        else:
+            self.shutter.get()
--- a/csaxs_bec/devices/omny/webcam_viewer.py
+++ b/csaxs_bec/devices/omny/webcam_viewer.py
@@ -2,7 +2,7 @@ import requests
 import threading
 import cv2
 import numpy as np
-from ophyd import Device, Component as Cpt, Kind, Signal
+from ophyd import Device, Component as Cpt
 from ophyd_devices import PreviewSignal
 import traceback 

@@ -13,13 +13,6 @@ logger = bec_logger.logger
 class WebcamViewer(Device):
    USER_ACCESS = ["start_live_mode", "stop_live_mode"]
    preview = Cpt(PreviewSignal, ndim=2, num_rotation_90=0, transpose=False)
-    live_mode_enabled = Cpt(
-        Signal,
-        name="live_mode_enabled",
-        value=False,
-        doc="Enable or disable live mode.",
-        kind=Kind.config,
-    )

    def __init__(self, url:str, name:str, num_rotation_90=0, transpose=False, **kwargs) -> None:
        super().__init__(name=name, **kwargs)
@@ -28,54 +21,20 @@ class WebcamViewer(Device):
        self._update_thread = None
        self._buffer = b""
        self._shutdown_event = threading.Event()
-        self._live_mode_lock = threading.RLock()
        self.preview.num_rotation_90 = num_rotation_90
        self.preview.transpose = transpose
-        self.live_mode_enabled.subscribe(self._on_live_mode_enabled_changed, run=False)

    def start_live_mode(self) -> None:
-        self.live_mode_enabled.put(True)
-
-    def stop_live_mode(self) -> None:
-        self.live_mode_enabled.put(False)
-
-    def _on_live_mode_enabled_changed(self, *args, value, **kwargs) -> None:
-        self._apply_live_mode(bool(value))
-
-    def _apply_live_mode(self, enabled: bool) -> None:
-        with self._live_mode_lock:
-            if enabled:
-                if self._update_thread is not None and self._update_thread.is_alive():
-                    return
-                self._shutdown_event.clear()
-                self._update_thread = threading.Thread(target=self._update_loop, daemon=True)
-                self._update_thread.start()
-                return
-
-            if self._update_thread is None:
-                return
-            self._shutdown_event.set()
-            if self._connection is not None:
-                try:
-                    self._connection.close()
-                except Exception:  # pylint: disable=broad-except
-                    pass
-                self._connection = None
-            self._update_thread.join(timeout=2)
-            if self._update_thread.is_alive():
-                logger.warning("Webcam live mode thread did not stop within timeout.")
-                return
-            self._update_thread = None
-            self._buffer = b""
-            self._shutdown_event.clear()
+        if self._connection is not None:
+            return
+        self._update_thread = threading.Thread(target=self._update_loop, daemon=True)
+        self._update_thread.start()

    def _update_loop(self) -> None:
        while not self._shutdown_event.is_set():
            try:
-                self._connection = requests.get(self.url, stream=True, timeout=5)
+                self._connection = requests.get(self.url, stream=True)
                for chunk in self._connection.iter_content(chunk_size=1024):
-                    if self._shutdown_event.is_set():
-                        break
                    self._buffer += chunk
                    start = self._buffer.find(b'\xff\xd8') # JPEG start
                    end = self._buffer.find(b'\xff\xd9') # JPEG end
@@ -91,3 +50,16 @@ class WebcamViewer(Device):
            except Exception as exc:
                content = traceback.format_exc()
                logger.error(f"Image update loop failed: {content}")
+
+    def stop_live_mode(self) -> None:
+        if self._connection is None:
+            return
+        self._shutdown_event.set()
+        if self._connection is not None:
+            self._connection.close()
+            self._connection = None
+        if self._update_thread is not None:
+            self._update_thread.join()
+            self._update_thread = None
+
+        self._shutdown_event.clear()
--- a/csaxs_bec/devices/omny/xray_epics_gui.py
+++ b/csaxs_bec/devices/omny/xray_epics_gui.py
@@ -1,46 +1,74 @@
-import numpy as np
-from ophyd import Component as Cpt, Signal, EpicsSignal
+
+from ophyd import Component as Cpt
 from ophyd import Device
 from ophyd import DynamicDeviceComponent as Dcpt
+from ophyd import EpicsSignal

-class OMNYXRayAlignGUI(Device):

-    update_frame_acqdone = Cpt(Signal, value=0)
-    update_frame_acq = Cpt(Signal, value=0)
-    enable_mv_x = Cpt(Signal, value=0)
-    enable_mv_y = Cpt(Signal, value=0)
-    send_message = Cpt(Signal, value=0)
-    sample_name  = Cpt(Signal, value=0)
-    angle = Cpt(Signal, value=0)
-    pixel_size = Cpt(Signal, value=0)
+
+class OMNYXRayEpicsGUI(Device):
+
+    save_frame = Cpt(
+    EpicsSignal, name="save_frame", read_pv="XOMNYI-XEYE-SAVFRAME:0",auto_monitor=True
+    )
+    update_frame_acqdone = Cpt(
+    EpicsSignal, name="update_frame_acqdone", read_pv="XOMNYI-XEYE-ACQDONE:0",auto_monitor=True
+    )
+    update_frame_acq = Cpt(
+    EpicsSignal, name="update_frame_acq", read_pv="XOMNYI-XEYE-ACQ:0",auto_monitor=True
+    )
+    width_y_dynamic = {
+        f"width_y_{i}": (EpicsSignal, f"XOMNYI-XEYE-YWIDTH_Y:{i}", {"auto_monitor": True}) for i in range(0, 11)
+    }
+    width_y = Dcpt(width_y_dynamic)
+    width_x_dynamic = {
+        f"width_x_{i}": (EpicsSignal, f"XOMNYI-XEYE-XWIDTH_X:{i}", {"auto_monitor": True}) for i in range(0, 11)
+    }
+    width_x = Dcpt(width_x_dynamic)
+    enable_mv_x = Cpt(
+    EpicsSignal, name="enable_mv_x", read_pv="XOMNYI-XEYE-ENAMVX:0",auto_monitor=True
+    )
+    enable_mv_y = Cpt(
+    EpicsSignal, name="enable_mv_y", read_pv="XOMNYI-XEYE-ENAMVY:0",auto_monitor=True
+    )
+    send_message = Cpt(
+    EpicsSignal, name="send_message", read_pv="XOMNYI-XEYE-MESSAGE:0.DESC",auto_monitor=True
+    )
+    sample_name  = Cpt(
+    EpicsSignal, name="sample_name", read_pv="XOMNYI-XEYE-SAMPLENAME:0.DESC",auto_monitor=True
+    )
+    angle = Cpt(
+    EpicsSignal, name="angle", read_pv="XOMNYI-XEYE-ANGLE:0",auto_monitor=True
+    )
+    pixel_size = Cpt(
+    EpicsSignal, name="pixel_size", read_pv="XOMNYI-XEYE-PIXELSIZE:0",auto_monitor=True
+    )
    submit = Cpt(
    EpicsSignal, name="submit", read_pv="XOMNYI-XEYE-SUBMIT:0",auto_monitor=True
-    )    
-    step = Cpt(Signal, value=0)
-    recbg = Cpt(Signal, value=0)
-    mvx = Cpt(Signal, value=0)
-    mvy = Cpt(Signal, value=0)
+    )
+    step = Cpt(
+    EpicsSignal, name="step", read_pv="XOMNYI-XEYE-STEP:0",auto_monitor=True
+    )
+    xval_x_dynamic = {
+        f"xval_x_{i}": (EpicsSignal, f"XOMNYI-XEYE-XVAL_X:{i}", {"auto_monitor": True}) for i in range(0, 11)
+    }
+    xval_x = Dcpt(xval_x_dynamic)
+    yval_y_dynamic = {
+        f"yval_y_{i}": (EpicsSignal, f"XOMNYI-XEYE-YVAL_Y:{i}", {"auto_monitor": True}) for i in range(0, 11)
+    }
+    yval_y = Dcpt(yval_y_dynamic)
+    recbg = Cpt(
+    EpicsSignal, name="recbg", read_pv="XOMNYI-XEYE-RECBG:0",auto_monitor=True
+    )
+    stage_pos_x_dynamic = {
+        f"stage_pos_x_{i}": (EpicsSignal, f"XOMNYI-XEYE-STAGEPOSX:{i}", {"auto_monitor": True}) for i in range(1, 6)
+    }
+    stage_pos_x = Dcpt(stage_pos_x_dynamic)
+    mvx = Cpt(
+    EpicsSignal, name="mvx", read_pv="XOMNYI-XEYE-MVX:0",auto_monitor=True
+    )
+    mvy = Cpt(
+    EpicsSignal, name="mvy", read_pv="XOMNYI-XEYE-MVY:0",auto_monitor=True
+    )

-    fit_array = Cpt(Signal, value=np.zeros((3, 10)))
-    fit_params_x = Cpt(Signal, value=np.zeros((2, 3)))
-    fit_params_y = Cpt(Signal, value=np.zeros((2, 3)))

-    # Generate width_y_0 to width_y_10
-    for i in range(11):
-        locals()[f'width_y_{i}'] = Cpt(Signal, value=0)
-    
-    # Generate width_x_0 to width_x_10
-    for i in range(11):
-        locals()[f'width_x_{i}'] = Cpt(Signal, value=0)
-    
-    # Generate xval_x_0 to xval_x_10
-    for i in range(11):
-        locals()[f'xval_x_{i}'] = Cpt(Signal, value=0)
-    
-    # Generate yval_y_0 to yval_y_10
-    for i in range(11):
-        locals()[f'yval_y_{i}'] = Cpt(Signal, value=0)
-    
-    # Generate stage_pos_x_1 to stage_pos_x_5
-    for i in range(1, 6):
-        locals()[f'stage_pos_x_{i}'] = Cpt(Signal, value=0)
--- a/csaxs_bec/scans/flomni_fermat_scan.py
+++ b/csaxs_bec/scans/flomni_fermat_scan.py
@@ -27,6 +27,7 @@ from bec_lib import bec_logger, messages
 from bec_lib.endpoints import MessageEndpoints
 from bec_server.scan_server.errors import ScanAbortion
 from bec_server.scan_server.scans import SyncFlyScanBase
+from csaxs_bec.devices.epics.delay_generator_csaxs.delay_generator_csaxs import TRIGGERSOURCE

 logger = bec_logger.logger

@@ -73,14 +74,13 @@ class FlomniFermatScan(SyncFlyScanBase):
            >>> scans.flomni_fermat_scan(fovx=20, fovy=25, cenx=0.02, ceny=0, zshift=0, angle=0, step=0.5, exp_time=0.01)
        """

-        super().__init__(parameter=parameter, **kwargs)
+        super().__init__(parameter=parameter, exp_time=exp_time, **kwargs)
        self.show_live_table = False
        self.axis = []
        self.fovx = fovx
        self.fovy = fovy
        self.cenx = cenx
        self.ceny = ceny
-        self.exp_time = exp_time
        self.step = step
        self.zshift = zshift
        self.angle = angle
@@ -151,6 +151,9 @@ class FlomniFermatScan(SyncFlyScanBase):
        yield from self.stubs.send_rpc_and_wait("rty", "set", self.positions[0][1])

    def _prepare_setup_part2(self):
+        # Prepare DDG1 to use 
+        yield from self.stubs.send_rpc_and_wait("ddg1", "set_trigger", TRIGGERSOURCE.EXT_RISING_EDGE.value)
+        
        if self.flomni_rotation_status:
            self.flomni_rotation_status.wait()

@@ -307,6 +310,10 @@ class FlomniFermatScan(SyncFlyScanBase):

        logger.warning("No positions found to return to start")

+    def cleanup(self):
+        yield from self.stubs.send_rpc_and_wait("ddg1", "set_trigger", TRIGGERSOURCE.SINGLE_SHOT.value)
+        yield from super().cleanup()
+
    def run(self):
        self.initialize()
        yield from self.read_scan_motors()
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -0,0 +1,14 @@
+"""
+Conftest runs for all tests in this directory and subdirectories. Thereby, we know for
+certain that the SocketSignal.READBACK_TIMEOUT is set to 0 for all tests, which prevents
+hanging tests when a readback is attempted on a non-connected socket.
+"""
+
+# conftest.py
+import pytest
+from ophyd_devices.utils.socket import SocketSignal
+
+
+@pytest.fixture(autouse=True)
+def patch_socket_timeout(monkeypatch):
+    monkeypatch.setattr(SocketSignal, "READBACK_TIMEOUT", 0.0)
--- a/tests/tests_devices/test_delay_generator_csaxs.py
+++ b/tests/tests_devices/test_delay_generator_csaxs.py
@@ -282,10 +282,11 @@ def test_ddg1_stage(mock_ddg1: DDG1):

    mock_ddg1.scan_info.msg.scan_parameters["exp_time"] = exp_time
    mock_ddg1.scan_info.msg.scan_parameters["frames_per_trigger"] = frames_per_trigger
+    mock_ddg1.fast_shutter_control._read_pv.mock_data = 0  # Simulate shutter control

    mock_ddg1.stage()

-    shutter_width = 2e-3 + exp_time * frames_per_trigger + 1e-3
+    shutter_width = mock_ddg1._shutter_to_open_delay + exp_time * frames_per_trigger

    assert np.isclose(mock_ddg1.burst_mode.get(), 1)  # burst mode is enabled
    assert np.isclose(mock_ddg1.burst_delay.get(), 0)
@@ -302,6 +303,25 @@ def test_ddg1_stage(mock_ddg1: DDG1):
    assert np.isclose(mock_ddg1.ef.width.get(), 1e-6)

    assert mock_ddg1.staged == ophyd.Staged.yes
+    mock_ddg1.unstage()
+
+    # Test if shutter is kept open..
+    mock_ddg1.fast_shutter_control._read_pv.mock_data = 1  # Simulate shutter control is kept open
+    # Test method
+    mock_ddg1.keep_shutter_open_during_scan(True)
+    shutter_width = mock_ddg1._shutter_to_open_delay + exp_time * frames_per_trigger
+    assert np.isclose(
+        shutter_width, exp_time * frames_per_trigger
+    )  # Shutter to open delay is not added as shutter is kept open
+    # Simulate fly scan, so no extra trigger for MCS card.
+    mock_ddg1.scan_info.msg.scan_type = "fly"
+    mock_ddg1.stage()
+    # Shutter channel cd
+    assert np.isclose(mock_ddg1.cd.delay.get(), 0)
+    assert np.isclose(mock_ddg1.cd.width.get(), shutter_width)
+    # MCS channel ef or gate
+    assert np.isclose(mock_ddg1.ef.delay.get(), 0)
+    assert np.isclose(mock_ddg1.ef.width.get(), 0)  # No triggering of MCS due to shutter fly scan


 def test_ddg1_on_trigger(mock_ddg1: DDG1):
@@ -331,9 +351,28 @@ def test_ddg1_on_trigger(mock_ddg1: DDG1):
    #################################
    with mock.patch.object(ddg, "_prepare_mcs_on_trigger") as mock_prepare_mcs:
        mock_prepare_mcs.return_value = ophyd.StatusBase(done=True, success=True)
+        # MCS card is present and enabled, should call prepare_mcs_on_trigger
+        # and the status should resolve once acuiring goes from 1 to 0.
        status = ddg.trigger()
+        assert status.done is False
+        mcs = ddg.device_manager.devices.get("mcs", None)
+        assert mcs is not None
+        mcs.acquiring._read_pv.mock_data = 1  # Simulate acquiring started
+        assert status.done is False
+        mcs.acquiring._read_pv.mock_data = 0  # Simulate acquiring stopped
+        status.wait(timeout=1)  # Wait for the status to be done
+        assert status.done is True
+        assert status.success is True
+        mock_prepare_mcs.assert_called_once()

+        # Now we disable the mcs card, and trigger again. This should not call prepare_mcs_on_trigger
+        # and should fallback to polling the DDG for END_OF_BURST status bit.
+
+        # Disable mcs card
+        mcs.enabled = False
+        status = ddg.trigger()
        # Check that the poll thread run event is set
+        # Careful in debugger, there is a timeout based on the exp_time + 5s default
        assert ddg._poll_thread_run_event.is_set()
        assert not ddg._poll_thread_poll_loop_done.is_set()

--- a/tests/tests_devices/test_epics_devices.py
+++ b/tests/tests_devices/test_epics_devices.py
@@ -0,0 +1,37 @@
+"""Module to test epics devices."""
+
+import pytest
+from ophyd_devices.tests.utils import patched_device
+
+from csaxs_bec.devices.epics.fast_shutter import cSAXSFastEpicsShutter
+
+
+@pytest.fixture
+def fast_shutter_device():
+    """Fixture to create a patched cSAXSFastEpicsShutter device for testing."""
+    with patched_device(cSAXSFastEpicsShutter, name="fsh", prefix="X12SA-ES1-TTL:") as device:
+        yield device
+
+
+def test_fast_shutter_methods(fast_shutter_device):
+    """Test the user-facing methods of the cSAXSFastEpicsShutter device."""
+    assert fast_shutter_device.name == "fsh", "Device name should be 'fsh'"
+    assert fast_shutter_device.prefix == "X12SA-ES1-TTL:", "Device prefix is 'X12SA-ES1-TTL:'"
+    # Test fshopen and fshclose
+    fast_shutter_device.fshopen()
+    assert fast_shutter_device.shutter.get() == 1, "Shutter should be open (1) after fshopen()"
+    assert fast_shutter_device.fshstatus() == 1, "fshstatus should return 1 when shutter is open"
+
+    fast_shutter_device.fshclose()
+    assert fast_shutter_device.shutter.get() == 0, "Shutter should be closed (0) after fshclose()"
+    assert fast_shutter_device.fshstatus() == 0, "fshstatus should return 0 when shutter is closed"
+
+    # shutter_readback is connected to separate PV.
+    fast_shutter_device.shutter_readback._read_pv.mock_data = 1  # Simulate readback showing open
+    assert (
+        fast_shutter_device.fshstatus_readback() == 1
+    ), "fshstatus_readback should return 1 when shutter readback shows open"
+    fast_shutter_device.shutter_readback._read_pv.mock_data = 0  # Simulate readback showing closed
+    assert (
+        fast_shutter_device.fshstatus_readback() == 0
+    ), "fshstatus_readback should return 0 when shutter readback shows closed"
--- a/tests/tests_devices/test_eps.py
+++ b/tests/tests_devices/test_eps.py
@@ -0,0 +1,99 @@
+# pylint: skip-file
+from __future__ import annotations
+
+import pytest
+from ophyd_devices.tests.utils import patched_device
+
+from csaxs_bec.devices.epics.eps import EPS
+
+ALL_PVS = [
+    # ALARMS
+    "X12SA-EPS-PLC:AlarmCnt_EPS",
+    "ARS00-MIS-PLC-01:AlarmCnt_Frontends",
+    # FRONTEND VALVES
+    "X12SA-FE-VVPG-0000:PLC_OPEN",
+    "X12SA-FE-VVPG-1010:PLC_OPEN",
+    "X12SA-FE-VVFV-2010:PLC_OPEN",
+    "X12SA-FE-VVPG-2010:PLC_OPEN",
+    # Optics VALVES
+    "X12SA-OP-VVPG-1010:PLC_OPEN",
+    "X12SA-OP-VVPG-2010:PLC_OPEN",
+    "X12SA-OP-VVPG-3010:PLC_OPEN",
+    "X12SA-OP-VVPG-3020:PLC_OPEN",
+    "X12SA-OP-VVPG-4010:PLC_OPEN",
+    "X12SA-OP-VVPG-5010:PLC_OPEN",
+    "X12SA-OP-VVPG-6010:PLC_OPEN",
+    "X12SA-OP-VVPG-7010:PLC_OPEN",
+    # Endstation VALVES
+    "X12SA-ES-VVPG-1010:PLC_OPEN",
+    # Frontend SHUTTERS
+    "X12SA-FE-PSH1-EMLS-0010:OPEN",
+    "X12SA-FE-STO1-EMLS-0010:OPEN",
+    # Optics SHUTTERS
+    "X12SA-OP-PSH1-EMLS-7010:OPEN",
+    # DMM Monochromator
+    "X12SA-OP-DMM-ETTC-3010:TEMP",
+    "X12SA-OP-DMM-ETTC-3020:TEMP",
+    "X12SA-OP-DMM-ETTC-3030:TEMP",
+    "X12SA-OP-DMM-ETTC-3040:TEMP",
+    "X12SA-OP-DMM-EMLS-3010:THRU",
+    "X12SA-OP-DMM-EMLS-3020:IN",
+    "X12SA-OP-DMM-EMLS-3030:THRU",
+    "X12SA-OP-DMM-EMLS-3040:IN",
+    "X12SA-OP-DMM-EMSW-3050:SWITCH",
+    "X12SA-OP-DMM-EMSW-3060:SWITCH",
+    "X12SA-OP-DMM-EMSW-3070:SWITCH",
+    "X12SA-OP-DMM1:ENERGY-GET",
+    "X12SA-OP-DMM1:POSITION",
+    "X12SA-OP-DMM1:STRIPE",
+    # CCM Monochromator
+    "X12SA-OP-CCM-ETTC-4010:TEMP",
+    "X12SA-OP-CCM-ETTC-4020:TEMP",
+    "X12SA-OP-CCM-EMSW-4010:SWITCH",
+    "X12SA-OP-CCM-EMSW-4020:SWITCH",
+    "X12SA-OP-CCM-EMSW-4030:SWITCH",
+    "X12SA-OP-CCM1:ENERGY-GET",
+    "X12SA-OP-CCM1:POSITION",
+    # Water Cooling
+    "X12SA-OP-SL1-EFSW-2010:FLOW",
+    "X12SA-OP-SL2-EFSW-2010:FLOW",
+    "X12SA-OP-EB1-EFSW-5010:FLOW",
+    "X12SA-OP-EB1-EFSW-5020:FLOW",
+    "X12SA-OP-SL3-EFSW-5010:FLOW",
+    "X12SA-OP-KB-EFSW-6010:FLOW",
+    "X12SA-OP-PSH1-EFSW-7010:FLOW",
+    "X12SA-ES-EB2-EFSW-1010:FLOW",
+    "X12SA-OP-CS-ECVW-0010:PLC_OPEN",
+    "X12SA-OP-CS-ECVW-0020:PLC_OPEN",
+    # Request PVs
+    "X12SA-EPS-PLC:ACKERR-REQUEST",
+    "X12SA-OP-CS-ECVW:PLC_REQUEST",
+]
+
+
+@pytest.fixture
+def eps():
+    dev_name = "EPS"
+    with patched_device(EPS, name=dev_name) as eps:
+        yield eps
+
+
+def test_eps_has_signals(eps):
+    """Test that all expected PVs are present in the eps device."""
+    found_pvs = [walk.item._read_pv.pvname for walk in eps.walk_signals()]
+    assert set(found_pvs) == set(
+        ALL_PVS
+    ), f"Expected PVs {ALL_PVS} but found {set(ALL_PVS) - set(found_pvs)}"
+
+
+# pylint: disable=line-too-long
+expected_show_all_output = "\x1b[1mX12SA EPS status\x1b[0m\n\n\x1b[1mEPS Alarms\x1b[0m\n  - X12SA EPS Alarm count            0\n  - FrontEnd MIS Alarm count         0\n\n\x1b[1mValves Frontend\x1b[0m\n  - FE-VVPG-0000                     \x1b[91mCLOSED\x1b[0m\n  - FE-VVPG-1010                     \x1b[91mCLOSED\x1b[0m\n  - FE-VVFV-2010                     \x1b[91mCLOSED\x1b[0m\n  - FE-VVPG-2010                     \x1b[91mCLOSED\x1b[0m\n\n\x1b[1mValves Optics Hutch\x1b[0m\n  - OP-VVPG-1010                     \x1b[91mCLOSED\x1b[0m\n  - OP-VVPG-2010                     \x1b[91mCLOSED\x1b[0m\n  - OP-VVPG-3010                     \x1b[91mCLOSED\x1b[0m\n  - OP-VVPG-3020                     \x1b[91mCLOSED\x1b[0m\n  - OP-VVPG-4010                     \x1b[91mCLOSED\x1b[0m\n  - OP-VVPG-5010                     \x1b[91mCLOSED\x1b[0m\n  - OP-VVPG-6010                     \x1b[91mCLOSED\x1b[0m\n  - OP-VVPG-7010                     \x1b[91mCLOSED\x1b[0m\n\n\x1b[1mValves ES Hutch\x1b[0m\n  - ES-VVPG-1010                     \x1b[91mCLOSED\x1b[0m\n\n\x1b[1mShutters Frontend\x1b[0m\n  - FE-PSH1-EMLS-0010                \x1b[91mCLOSED\x1b[0m\n  - FE-STO1-EMLS-0010                \x1b[91mCLOSED\x1b[0m\n\n\x1b[1mShutters Endstation\x1b[0m\n  - OP-PSH1-EMLS-7010                \x1b[91mCLOSED\x1b[0m\n\n\x1b[1mDMM Monochromator\x1b[0m\n  - DMM Temp Surface 1               0.0\n  - DMM Temp Surface 2               0.0\n  - DMM Temp Shield 1 (disaster)     0.0\n  - DMM Temp Shield 2 (disaster)     0.0\n  - DMM Translation ThruPos          \x1b[91mINACTIVE\x1b[0m\n  - DMM Translation InPos            \x1b[91mINACTIVE\x1b[0m\n  - DMM Bragg ThruPos                \x1b[91mINACTIVE\x1b[0m\n  - DMM Bragg InPos                  \x1b[91mINACTIVE\x1b[0m\n  - DMM Heater Fault XTAL 1          \x1b[92mOK\x1b[0m\n  - DMM Heater Fault XTAL 2          \x1b[92mOK\x1b[0m\n  - DMM Heater Fault Support 1       \x1b[92mOK\x1b[0m\n  - DMM Energy                       0.0000\n  - DMM Position                     out of beam\n  - DMM Stripe                       Stripe 1 W/B4C\n\n\x1b[1mCCM Monochromator\x1b[0m\n  - CCM Temp Crystal                 0.0\n  - CCM Temp Shield (disaster)       0.0\n  - CCM Heater Fault 1               \x1b[92mOK\x1b[0m\n  - CCM Heater Fault 2               \x1b[92mOK\x1b[0m\n  - CCM Heater Fault 3               \x1b[92mOK\x1b[0m\n  - CCM Energy                       0.0000\n  - CCM Position                     out of beam\n\n\x1b[1mCooling Water\x1b[0m\n  - OP-SL1-EFSW-2010                 \x1b[91mFAIL\x1b[0m\n  - OP-SL2-EFSW-2010                 \x1b[91mFAIL\x1b[0m\n  - OP-EB1-EFSW-5010                 \x1b[91mFAIL\x1b[0m\n  - OP-EB1-EFSW-5020                 \x1b[91mFAIL\x1b[0m\n  - OP-SL3-EFSW-5010                 \x1b[91mFAIL\x1b[0m\n  - OP-KB-EFSW-6010                  \x1b[91mFAIL\x1b[0m\n  - OP-PSH1-EFSW-7010                \x1b[91mFAIL\x1b[0m\n  - ES-EB2-EFSW-1010                 \x1b[91mFAIL\x1b[0m\n  - OP-CS-ECVW-0010                  \x1b[91mCLOSED\x1b[0m\n  - OP-CS-ECVW-0020                  \x1b[91mCLOSED\x1b[0m\n\n\x1b[96mHint:\x1b[0m Both water cooling valves are CLOSED.\nYou can open them using: \x1b[1mdev.x12saEPS.water_cooling_op()\x1b[0m\n"
+
+
+def test_eps_show_all(eps, capsys):
+    """Test that the show_all method outputs the expected status."""
+    eps.show_all()
+    output = capsys.readouterr().out
+    assert (
+        output == expected_show_all_output
+    ), f"Expected output does not match actual output.\nExpected:\n{expected_show_all_output}\nActual:\n{output}"
Author	SHA1	Message	Date
x12sa	5ab763ad38	test at beamline All checks were successful CI for csaxs_bec / test (pull_request) Successful in 1m28s Details CI for csaxs_bec / test (push) Successful in 1m33s Details	2026-02-16 12:33:15 +01:00
appel_c	fa35ddf1a9	refactor(eps): deactivate black for eps.py to keep signal component formatted in single line.	2026-02-16 12:33:15 +01:00
appel_c	501bc52867	fix(eps): Fix tests and eps integration	2026-02-16 12:33:15 +01:00
appel_c	f35c51efa7	test(eps): Add tests for EPS device	2026-02-16 12:33:15 +01:00
appel_c	0c81c718d8	refactor(eps): Refactoring of EPS device from cSAXS	2026-02-16 12:33:15 +01:00
x12sa	ce88310125	fixed enable of water cooling	2026-02-16 12:33:15 +01:00
x12sa	e860571a64	water on method	2026-02-16 12:33:15 +01:00
x12sa	24bd5a71bc	added water cooling channels	2026-02-16 12:33:15 +01:00
x12sa	541eb97096	added "kind" to channel list	2026-02-16 12:33:15 +01:00
x12sa	7911717142	create class dynamically, monos added	2026-02-16 12:33:15 +01:00
x12sa	bdf94533a5	first version of csaxs eps	2026-02-16 12:33:15 +01:00
appel_c	5784331073	test(conftest): Add monkey patch for SocketSignal Readback_Timeout All checks were successful CI for csaxs_bec / test (push) Successful in 1m35s Details	2026-02-16 11:10:47 +01:00
x12sa	7a2c6629f7	refactor: add gh signal for ddg1 with TTL for full acquisition All checks were successful CI for csaxs_bec / test (pull_request) Successful in 1m31s Details CI for csaxs_bec / test (push) Successful in 1m33s Details	2026-02-16 10:18:37 +01:00
appel_c	75cc672f08	tests: fix tests for ddg1 All checks were successful CI for csaxs_bec / test (push) Successful in 1m32s Details CI for csaxs_bec / test (pull_request) Successful in 1m31s Details	2026-02-11 11:50:22 +01:00
appel_c	67ef20cfc8	fix(ddg): fix logic to resolve trigger on ddg1. Some checks failed CI for csaxs_bec / test (pull_request) Failing after 1m26s Details CI for csaxs_bec / test (push) Failing after 1m28s Details	2026-02-11 11:22:09 +01:00
appel_c	f8d2af4c5b	fix(ddg1): revert to shutter signal as mcs status signal is too slow Some checks failed CI for csaxs_bec / test (push) Failing after 1m27s Details CI for csaxs_bec / test (pull_request) Failing after 1m31s Details	2026-02-11 09:45:40 +01:00
appel_c	8195c12a35	fix(fast-shutter): Add close shutter on 'stop' call. Some checks failed CI for csaxs_bec / test (push) Failing after 1m25s Details CI for csaxs_bec / test (pull_request) Failing after 1m26s Details	2026-02-11 08:53:00 +01:00
appel_c	a45aa094ef	refactor(ddg1): Use mcs acquiring status to resolve trigger of DDG1	2026-02-11 08:52:38 +01:00
x12sa	2814add2de	fixes at beamline Some checks failed CI for csaxs_bec / test (push) Failing after 3m23s Details CI for csaxs_bec / test (pull_request) Failing after 3m25s Details	2026-02-10 10:59:18 +01:00
appel_c	32b4c39659	refactor(ddg): Add fsh signal to ddg, improve trigger logic. Some checks failed CI for csaxs_bec / test (push) Failing after 1m26s Details CI for csaxs_bec / test (pull_request) Failing after 1m27s Details	2026-02-09 14:11:00 +01:00
appel_c	8849b9ffea	fix(shutter); fix shutter_readback signal	2026-02-09 10:10:44 +01:00
appel_c	c3aa882b1d	fix(configs): add connectionTimeout=20s defaults to devices with SocketController Some checks failed CI for csaxs_bec / test (push) Failing after 1m28s Details CI for csaxs_bec / test (pull_request) Failing after 1m28s Details	2026-02-09 08:39:19 +01:00
appel_c	6fad4f2034	fix(fast-shutter): Fix cSAXS fast shutter device Some checks failed CI for csaxs_bec / test (push) Failing after 1m30s Details CI for csaxs_bec / test (pull_request) Failing after 1m30s Details	2026-02-09 08:29:08 +01:00
x12sa	ed8d012632	feat: add logic for ext/en in ddg, mcs and flomni Some checks failed CI for csaxs_bec / test (push) Failing after 1m24s Details CI for csaxs_bec / test (pull_request) Failing after 1m33s Details	2026-01-30 12:55:06 +01:00