Automatic backup triggered by new deployment

csaxs_bec/bec_ipython_client/plugins/flomni/gui_tools.py

@@ -17,17 +17,10 @@ class flomniGuiToolsError(Exception):
 
 
 class flomniGuiTools:
-    GUI_RPC_TIMEOUT = 20
 
     def __init__(self):
         self.text_box = None
         self.progressbar = None
-        self.flomni_window = None
-        self.xeyegui = None
-        self.pdf_viewer = None
-        self.idle_text_box = None
-        self.camera_gripper_image = None
-        self.camera_overview_image = None
 
     def set_client(self, client):
         self.client = client
@@ -35,10 +28,9 @@ class flomniGuiTools:
 
     def flomnigui_show_gui(self):
         if "flomni" in self.gui.windows:
-            self.flomni_window = self.gui.windows["flomni"]
             self.gui.flomni.raise_window()
         else:
-            self.flomni_window = self.gui.new("flomni", timeout=self.GUI_RPC_TIMEOUT)
+            self.gui.new("flomni")
 
     def flomnigui_stop_gui(self):
         self.gui.flomni.hide()
@@ -48,11 +40,9 @@ class flomniGuiTools:
 
     def flomnigui_show_xeyealign(self):
         self.flomnigui_show_gui()
-        if self._flomnigui_is_missing("xeyegui"):
+        if self._flomnigui_check_attribute_not_exists("xeyegui"):
             self.flomnigui_remove_all_docks()
-            self.xeyegui = self.gui.flomni.new(
-                "XRayEye", object_name="xrayeye", timeout=self.GUI_RPC_TIMEOUT
-            )
+            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_enabled.put(True)
@@ -60,11 +50,9 @@ class flomniGuiTools:
 
     def flomnigui_show_xeyealign_fittab(self):
         self.flomnigui_show_gui()
-        if self._flomnigui_is_missing("xeyegui"):
+        if self._flomnigui_check_attribute_not_exists("xeyegui"):
             self.flomnigui_remove_all_docks()
-            self.xeyegui = self.gui.flomni.new(
-                "XRayEye", object_name="xrayeye", timeout=self.GUI_RPC_TIMEOUT
-            )
+            self.xeyegui = self.gui.flomni.new("XRayEye")
         self.xeyegui.switch_tab("fit")
 
     def _flomnigui_check_attribute_not_exists(self, attribute_name):
@@ -73,39 +61,31 @@ class flomniGuiTools:
                 return False
         return True
 
-    def _flomnigui_is_missing(self, attribute_name):
-        widget = getattr(self, attribute_name, None)
-        if widget is None:
-            return True
-        if hasattr(widget, "_is_deleted") and widget._is_deleted():
-            return True
-        return False
-
     def flomnigui_show_cameras(self):
         self.flomnigui_show_gui()
-        if self._flomnigui_is_missing("camera_gripper_image") or self._flomnigui_is_missing(
-            "camera_overview_image"
-        ):
+        if self._flomnigui_check_attribute_not_exists(
+            "camera_gripper"
+        ) or self._flomnigui_check_attribute_not_exists("camera_overview"):
             self.flomnigui_remove_all_docks()
-            self.camera_gripper_image = self.gui.flomni.new("Image")
+            camera_gripper_image = self.gui.flomni.new("Image")
             if self._flomnicam_check_device_exists(dev.cam_flomni_gripper):
-                self.camera_gripper_image.image(device="cam_flomni_gripper", signal="preview")
-                self.camera_gripper_image.lock_aspect_ratio = True
-                self.camera_gripper_image.enable_fps_monitor = True
-                self.camera_gripper_image.enable_toolbar = False
-                self.camera_gripper_image.outer_axes = False
-                self.camera_gripper_image.inner_axes = False
+                camera_gripper_image.image(device="cam_flomni_gripper", signal="preview")
+                camera_gripper_image.lock_aspect_ratio = True
+                camera_gripper_image.enable_fps_monitor = True
+                camera_gripper_image.enable_toolbar = False
+                camera_gripper_image.outer_axes = False
+                camera_gripper_image.inner_axes = False
                 dev.cam_flomni_gripper.start_live_mode()
             else:
                 print("Cannot open camera_gripper. Device does not exist.")
-            self.camera_overview_image = self.gui.flomni.new("Image")
+            camera_overview_image = self.gui.flomni.new("Image")
             if self._flomnicam_check_device_exists(dev.cam_flomni_overview):
-                self.camera_overview_image.image(device="cam_flomni_overview", signal="preview")
-                self.camera_overview_image.lock_aspect_ratio = True
-                self.camera_overview_image.enable_fps_monitor = True
-                self.camera_overview_image.enable_toolbar = False
-                self.camera_overview_image.outer_axes = False
-                self.camera_overview_image.inner_axes = False
+                camera_overview_image.image(device="cam_flomni_overview", signal="preview")
+                camera_overview_image.lock_aspect_ratio = True
+                camera_overview_image.enable_fps_monitor = True
+                camera_overview_image.enable_toolbar = False
+                camera_overview_image.outer_axes = False
+                camera_overview_image.inner_axes = False
                 dev.cam_flomni_overview.start_live_mode()
             else:
                 print("Cannot open camera_overview. Device does not exist.")
@@ -114,21 +94,15 @@ class flomniGuiTools:
         # dev.cam_flomni_overview.stop_live_mode()
         # dev.cam_flomni_gripper.stop_live_mode()
         # dev.cam_xeye.live_mode = False
-        if "flomni" in self.gui.windows:
-            self.gui.flomni.delete_all(timeout=self.GUI_RPC_TIMEOUT)
+        self.gui.flomni.delete_all()
         self.progressbar = None
         self.text_box = None
-        self.xeyegui = None
-        self.pdf_viewer = None
-        self.idle_text_box = None
-        self.camera_gripper_image = None
-        self.camera_overview_image = None
 
     def flomnigui_idle(self):
         self.flomnigui_show_gui()
-        if self._flomnigui_is_missing("idle_text_box"):
+        if self._flomnigui_check_attribute_not_exists("idle_text_box"):
             self.flomnigui_remove_all_docks()
-            self.idle_text_box = self.gui.flomni.new("TextBox")
+            idle_text_box = self.gui.flomni.new("TextBox")
         text = (
             "<pre>"
             + "██████╗ ███████╗ ██████╗     ███████╗██╗      ██████╗ ███╗   ███╗███╗   ██╗██╗\n"
@@ -139,7 +113,7 @@ class flomniGuiTools:
             + "╚═════╝ ╚══════╝ ╚═════╝     ╚═╝     ╚══════╝ ╚═════╝ ╚═╝     ╚═╝╚═╝  ╚═══╝╚═╝\n"
             + "</pre>"
         )
-        self.idle_text_box.set_html_text(text)
+        idle_text_box.set_html_text(text)
 
     def flomnigui_docs(self, filename: str | None = None):
         import csaxs_bec
@@ -183,7 +157,7 @@ class flomniGuiTools:
         # --- GUI handling (active existence check) ----------------------------
         self.flomnigui_show_gui()
 
-        if self._flomnigui_is_missing("pdf_viewer"):
+        if self._flomnigui_check_attribute_not_exists("PdfViewerWidget"):
             self.flomnigui_remove_all_docks()
             self.pdf_viewer = self.gui.flomni.new(widget="PdfViewerWidget")
 
@@ -201,7 +175,7 @@ class flomniGuiTools:
 
     def flomnigui_show_progress(self):
         self.flomnigui_show_gui()
-        if self._flomnigui_is_missing("progressbar"):
+        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")

csaxs_bec/bec_widgets/widgets/client.py

@@ -38,14 +38,12 @@ class XRayEye(RPCBase):
         None
         """
 
-    @rpc_timeout(20)
     @rpc_call
     def on_live_view_enabled(self, enabled: "bool"):
         """
         None
         """
 
-    @rpc_timeout(20)
     @rpc_call
     def on_motors_enable(self, x_enable: "bool", y_enable: "bool"):
         """
@@ -56,7 +54,6 @@ class XRayEye(RPCBase):
             y_enable(bool): enable y motor controls
         """
 
-    @rpc_timeout(20)
     @rpc_call
     def enable_submit_button(self, enable: "bool"):
         """
@@ -93,14 +90,12 @@ class XRayEye(RPCBase):
         None
         """
 
-    @rpc_timeout(20)
     @rpc_call
     def switch_tab(self, tab: "str"):
         """
         None
         """
 
-    @rpc_timeout(20)
     @rpc_call
     def submit_fit_array(self, fit_array):
         """

csaxs_bec/bec_widgets/widgets/xray_eye/x_ray_eye.py

@@ -4,7 +4,6 @@ from bec_lib import bec_logger
 from bec_lib.endpoints import MessageEndpoints
 from bec_qthemes import material_icon
 from bec_widgets import BECWidget, SafeProperty, SafeSlot
-from bec_widgets.utils.rpc_decorator import rpc_timeout
 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
@@ -367,7 +366,6 @@ class XRayEye(BECWidget, QWidget):
         return self.message_line_edit.text()
 
     @user_message.setter
-    @rpc_timeout(20)
     def user_message(self, message: str):
         self.message_line_edit.setText(message)
 
@@ -376,7 +374,6 @@ class XRayEye(BECWidget, QWidget):
         return self.sample_name_line_edit.text()
 
     @sample_name.setter
-    @rpc_timeout(20)
     def sample_name(self, message: str):
         self.sample_name_line_edit.setText(message)
 
@@ -397,7 +394,6 @@ class XRayEye(BECWidget, QWidget):
     ################################################################################
 
     @SafeSlot(str)
-    @rpc_timeout(20)
     def switch_tab(self, tab: str):
         if tab == "fit":
             self.tab_widget.setCurrentIndex(1)
@@ -415,7 +411,6 @@ class XRayEye(BECWidget, QWidget):
         return roi.get_coordinates()
 
     @SafeSlot(bool)
-    @rpc_timeout(20)
     def on_live_view_enabled(self, enabled: bool):
         logger.info(f"Live view is enabled: {enabled}")
         self.live_preview_toggle.blockSignals(True)
@@ -464,7 +459,6 @@ class XRayEye(BECWidget, QWidget):
         self.shutter_toggle.blockSignals(False)
 
     @SafeSlot(bool, bool)
-    @rpc_timeout(20)
     def on_motors_enable(self, x_enable: bool, y_enable: bool):
         """
         Enable/Disable motor controls
@@ -477,7 +471,6 @@ class XRayEye(BECWidget, QWidget):
         self.motor_control_2d.enable_controls_ver(y_enable)
 
     @SafeSlot(bool)
-    @rpc_timeout(20)
     def enable_submit_button(self, enable: bool):
         """
         Enable/disable submit button.
@@ -515,7 +508,6 @@ class XRayEye(BECWidget, QWidget):
         print(f"meta: {meta}")
 
     @SafeSlot()
-    @rpc_timeout(20)
     def submit_fit_array(self, fit_array):
         self.tab_widget.setCurrentIndex(1)
         # self.fix_x.title = " got fit array"

csaxs_bec/device_configs/main.yaml

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

csaxs_bec/device_configs/ptycho_flomni.yaml

@@ -288,7 +288,7 @@ fosax:
     limits:
     - 10.2
     - 10.6
-    port: 3334
+    port: 3332
     sign: -1
   enabled: true
   onFailure: buffer
@@ -307,7 +307,7 @@ fosay:
     limits:
     - -3.1
     - -2.9
-    port: 3334
+    port: 3332
     sign: -1
   enabled: true
   onFailure: buffer
@@ -325,7 +325,7 @@ fosaz:
     limits:
     - -6
     - -4
-    port: 3334
+    port: 3332
     sign: 1
   enabled: true
   onFailure: buffer
@@ -429,20 +429,20 @@ cam_xeye:
   readOnly: false
   readoutPriority: async
 
-# cam_ids_rgb:
-#   description: Camera flOMNI Xray eye ID203
-#   deviceClass: csaxs_bec.devices.ids_cameras.ids_camera.IDSCamera
-#   deviceConfig:
-#     camera_id: 203
-#     bits_per_pixel: 24
-#     num_rotation_90: 2
-#     transpose: false
-#     force_monochrome: false
-#     m_n_colormode: 1
-#   enabled: true
-#   onFailure: buffer
-#   readOnly: false
-#   readoutPriority: async
+cam_ids_rgb:
+  description: Camera flOMNI Xray eye ID203
+  deviceClass: csaxs_bec.devices.ids_cameras.ids_camera.IDSCamera
+  deviceConfig:
+    camera_id: 2
+    bits_per_pixel: 24
+    num_rotation_90: 2
+    transpose: true
+    force_monochrome: false
+    m_n_colormode: 1
+  enabled: true
+  onFailure: buffer
+  readOnly: false
+  readoutPriority: async
 
 
 # ############################################################
@@ -490,21 +490,21 @@ calculated_signal:
 
 ############################################################
 #################### OMNY Pandabox #########################
-############################################################
-omny_panda:
-  readoutPriority: async
-  deviceClass: csaxs_bec.devices.panda_box.panda_box_omny.PandaBoxOMNY
-  deviceConfig:
-    host: omny-panda.psi.ch
-    signal_alias:
-      FMC_IN.VAL1.Min: cap_voltage_fzp_y_min
-      FMC_IN.VAL1.Max: cap_voltage_fzp_y_max
-      FMC_IN.VAL1.Mean: cap_voltage_fzp_y_mean
-      FMC_IN.VAL2.Min: cap_voltage_fzp_x_min
-      FMC_IN.VAL2.Max: cap_voltage_fzp_x_max
-      FMC_IN.VAL2.Mean: cap_voltage_fzp_x_mean
-  deviceTags:
-    - detector
-  enabled: true
-  readOnly: false
-  softwareTrigger: false
+# ############################################################
+# omny_panda:
+#   readoutPriority: async
+#   deviceClass: csaxs_bec.devices.panda_box.panda_box_omny.PandaBoxOMNY
+#   deviceConfig:
+#     host: omny-panda.psi.ch
+#     signal_alias:
+#       FMC_IN.VAL1.Min: cap_voltage_fzp_y_min
+#       FMC_IN.VAL1.Max: cap_voltage_fzp_y_max
+#       FMC_IN.VAL1.Mean: cap_voltage_fzp_y_mean
+#       FMC_IN.VAL2.Min: cap_voltage_fzp_x_min
+#       FMC_IN.VAL2.Max: cap_voltage_fzp_x_max
+#       FMC_IN.VAL2.Mean: cap_voltage_fzp_x_mean
+#   deviceTags:
+#     - detector
+#   enabled: true
+#   readOnly: false
+#   softwareTrigger: false

csaxs_bec/devices/omny/rt/rt_flomni_ophyd.py

@@ -175,7 +175,10 @@ class RtFlomniController(Controller):
         self.set_device_read_write("fopty", False)
 
     def move_samx_to_scan_region(self, fovx: float, cenx: float):
+        #new routine not using fovx anymore
+        self.device_manager.devices.rtx.obj.move(cenx, wait=True)
         time.sleep(0.05)
+        #at cenx we expect the PID to be close to zero for a good fsamx position
         if self.rt_pid_voltage is None:
             rtx = self.device_manager.devices.rtx
             self.rt_pid_voltage = rtx.user_parameter.get("rt_pid_voltage")
@@ -184,31 +187,39 @@ class RtFlomniController(Controller):
                     "rt_pid_voltage not set in rtx user parameters. Please run feedback_enable_with_reset first."
                 )
             logger.info(f"Using PID voltage from rtx user parameter: {self.rt_pid_voltage}")
-        expected_voltage = self.rt_pid_voltage + fovx / 2 * 7 / 100
-        logger.info(f"Expected PID voltage: {expected_voltage}")
+        expected_voltage = self.rt_pid_voltage
+        #logger.info(f"Expected PID voltage: {expected_voltage}")
         logger.info(f"Current PID voltage: {self.get_pid_x()}")
-
         wait_on_exit = False
-        while True:
-            if np.abs(self.get_pid_x() - expected_voltage) < 1:
-                break
-            wait_on_exit = True
-            self.socket_put("v0")
+        #we allow 2V range from center, this corresponds to 30 microns
+        if np.abs(self.get_pid_x() - expected_voltage) < 2:
+            logger.info("No correction of fsamx needed")
+        else:
             fsamx = self.device_manager.devices.fsamx
-            fsamx.read_only = False
             fsamx.obj.controller.socket_put_confirmed("axspeed[4]=0.1*stppermm[4]")
-            fsamx.obj.pid_x_correction -= (self.get_pid_x() - expected_voltage) * 0.007
-            logger.info(f"Correcting fsamx by {fsamx.obj.pid_x_correction}")
-            fsamx_in = fsamx.user_parameter.get("in")
-            fsamx.obj.move(fsamx_in + cenx / 1000 + fsamx.obj.pid_x_correction, wait=True)
-            fsamx.read_only = True
-            time.sleep(0.1)
-            self.laser_tracker_on()
-            time.sleep(0.01)
+            while True:
+                #when we correct, then to 1 V, within 15 microns
+                if np.abs(self.get_pid_x() - expected_voltage) < 1:
+                    logger.info("No further correction needed")
+                    break
+                wait_on_exit = True
+                #disable FZP piezo feedback
+                self.socket_put("v0")
+                fsamx.read_only = False
+                logger.info(f"Current PID voltage: {self.get_pid_x()}")
+                #here we accumulate the correction
+                fsamx.obj.pid_x_correction -= (self.get_pid_x() - expected_voltage) * 0.006
+                fsamx_in = fsamx.user_parameter.get("in")
+                logger.info(f"Moving fsamx to {cenx / 1000 * 0.7 + fsamx.obj.pid_x_correction}, PID portion of that {fsamx.obj.pid_x_correction}")
+                fsamx.obj.move(fsamx_in + cenx / 1000 * 0.7 + fsamx.obj.pid_x_correction, wait=True)
+                fsamx.read_only = True
+                time.sleep(0.1)
+                self.laser_tracker_on()
+                time.sleep(0.01)
 
         if wait_on_exit:
             time.sleep(1)
-
+        #enable fast FZP feedback again
         self.socket_put("v1")
 
     @threadlocked