Merge branch 'main' into fix/lamni-xrayeye-approach-angle-shutter

csaxs_bec/bec_ipython_client/plugins/LamNI/lamni_optics_mixin.py

@@ -6,7 +6,6 @@ from rich import box
 from rich.console import Console
 from rich.table import Table
 
-from csaxs_bec.bec_ipython_client.plugins.cSAXS import epics_put
 from csaxs_bec.bec_ipython_client.plugins.OMNY_shared.omny_general_tools import OMNYTools
 
 dev = builtins.__dict__.get("dev")
@@ -221,7 +220,6 @@ class LamNIOpticsMixin:
         leyey_out = self._get_user_param_safe("leyey", "out")
         umv(dev.leyey, leyey_out)
 
-        epics_put("XOMNYI-XEYE-ACQ:0", 2)
         umv(dev.lsamrot, 0)
         #umv(dev.dttrz, 5854, dev.fttrz, 2395)
 

csaxs_bec/bec_ipython_client/plugins/flomni/flomni_optics_mixin.py

@@ -4,8 +4,6 @@ from rich import box
 from rich.console import Console
 from rich.table import Table
 
-from csaxs_bec.bec_ipython_client.plugins.cSAXS import epics_put
-
 
 class FlomniOpticsMixin:
     @staticmethod

csaxs_bec/bec_ipython_client/plugins/flomni/x_ray_eye_align.py

@@ -394,7 +394,6 @@ class XrayEyeAlign:
             if self.flomni.OMNYTools.yesno("Close the shutter now?", "y"):
                 dev.fsh.fshclose()
                 self.gui.on_live_view_enabled(False)
-                print("setting 'XOMNYI-XEYE-ACQ:0'")
 
         self.flomni.OMNYTools.printgreenbold(
             f"The largest field of view from the xrayeyealign was \nfovx = {fovx:.0f} microns, fovy"

csaxs_bec/bec_ipython_client/plugins/omny/omny_optics_mixin.py

@@ -5,8 +5,6 @@ from rich import box
 from rich.console import Console
 from rich.table import Table
 
-from csaxs_bec.bec_ipython_client.plugins.cSAXS import epics_put, fshclose
-
 
 class OMNYError(Exception):
     pass
@@ -52,8 +50,6 @@ class OMNYOpticsMixin:
         if self.OMNYTools.yesno("Did you move in the optics?"):
             umv(dev.oeyez, -2)
             self._oeyey_mv(-60.3)
-            # free camera
-            epics_put("XOMNYI-XEYE-ACQ:0", 2)
         else:
             raise OMNYError("The optics were not moved in. Please do so prior to eyey_out")
         self.OMNYTools.printgreen("Oeye is out.")

csaxs_bec/device_configs/ptycho_lamni.yaml

@@ -301,7 +301,6 @@ cam_xeye:
     transpose: false
     force_monochrome: true
     m_n_colormode: 1
-    live_mode_poll_interval_s: 0.02
   enabled: true
   onFailure: buffer
   readOnly: false