From 68517d2a5272dc1feccf29f61a24499fe129311e Mon Sep 17 00:00:00 2001 From: holler Date: Thu, 27 Nov 2025 14:50:41 +0100 Subject: [PATCH] removed Epics communication, just a signal device now --- csaxs_bec/devices/omny/xray_epics_gui.py | 47 ++++++++++++------------ 1 file changed, 23 insertions(+), 24 deletions(-) diff --git a/csaxs_bec/devices/omny/xray_epics_gui.py b/csaxs_bec/devices/omny/xray_epics_gui.py index 94290c4..c9705da 100644 --- a/csaxs_bec/devices/omny/xray_epics_gui.py +++ b/csaxs_bec/devices/omny/xray_epics_gui.py @@ -1,75 +1,74 @@ - import numpy as np from ophyd import Component as Cpt, Signal from ophyd import Device from ophyd import DynamicDeviceComponent as Dcpt -from ophyd import EpicsSignal +#from ophyd import EpicsSignal -class OMNYXRayEpicsGUI(Device): +class OMNYXRayAlignGUI(Device): - save_frame = Cpt( - EpicsSignal, name="save_frame", read_pv="XOMNYI-XEYE-SAVFRAME:0",auto_monitor=True - ) +# 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 + Signal, 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 + Signal, 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) + f"width_y_{i}": (Signal, 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) + f"width_x_{i}": (Signal, 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 + Signal, 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 + Signal, 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 + Signal, 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 + Signal, 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 + Signal, 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 + Signal, 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 + Signal, name="submit", read_pv="XOMNYI-XEYE-SUBMIT:0",auto_monitor=True ) step = Cpt( - EpicsSignal, name="step", read_pv="XOMNYI-XEYE-STEP:0",auto_monitor=True + Signal, 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) + f"xval_x_{i}": (Signal, 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) + f"yval_y_{i}": (Signal, 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 + Signal, 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) + f"stage_pos_x_{i}": (Signal, 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 + Signal, 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 + Signal, name="mvy", read_pv="XOMNYI-XEYE-MVY:0",auto_monitor=True )