From 107981f3925a10f46f1a70d95d68d2118c4e9692 Mon Sep 17 00:00:00 2001 From: x01dc Date: Tue, 28 Jul 2026 12:16:41 +0200 Subject: [PATCH] fix(devices): remove deprecated XOMNYI-XEYE-ACQ:0 EPICS PV writes This PV belonged to the old EPICS/LabView X-ray-eye acquisition system that both LamNI and OMNY alignment have already replaced with the BEC-native cam_xeye (IDSCamera) device and GUI-driven workflow. The PV no longer has a listener, so the write only produced a "cannot connect" warning at the start of LamNI's tomo_alignment_scan() (via leye_out()) and OMNY's oeye_out() -- remove both, plus the now-dead epics_put imports left behind in lamni_optics_mixin.py, omny_optics_mixin.py, and flomni_optics_mixin.py, and a leftover print() in flomni's x_ray_eye_align.py that referenced the same PV without ever writing it. --- .../bec_ipython_client/plugins/LamNI/lamni_optics_mixin.py | 2 -- .../bec_ipython_client/plugins/flomni/flomni_optics_mixin.py | 2 -- .../bec_ipython_client/plugins/flomni/x_ray_eye_align.py | 1 - .../bec_ipython_client/plugins/omny/omny_optics_mixin.py | 4 ---- 4 files changed, 9 deletions(-) diff --git a/csaxs_bec/bec_ipython_client/plugins/LamNI/lamni_optics_mixin.py b/csaxs_bec/bec_ipython_client/plugins/LamNI/lamni_optics_mixin.py index 981d526..dcb02d8 100644 --- a/csaxs_bec/bec_ipython_client/plugins/LamNI/lamni_optics_mixin.py +++ b/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) diff --git a/csaxs_bec/bec_ipython_client/plugins/flomni/flomni_optics_mixin.py b/csaxs_bec/bec_ipython_client/plugins/flomni/flomni_optics_mixin.py index cfa05ea..bd309f4 100644 --- a/csaxs_bec/bec_ipython_client/plugins/flomni/flomni_optics_mixin.py +++ b/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 diff --git 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 index 5119676..2a8e23c 100644 --- 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 @@ -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" diff --git a/csaxs_bec/bec_ipython_client/plugins/omny/omny_optics_mixin.py b/csaxs_bec/bec_ipython_client/plugins/omny/omny_optics_mixin.py index d30a224..f3fe51b 100644 --- a/csaxs_bec/bec_ipython_client/plugins/omny/omny_optics_mixin.py +++ b/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.") -- 2.54.0