devices: removed further unused epics variables

This commit is contained in:
appleb_m authored and appleb_m committed 2026-06-24 15:29:56 +02:00
1 parent 0256eb502b
commit 29d0b6d423
1 file changed
+1 -41
+1 -41
View File
@@ -27,10 +27,10 @@ from aare.devices.zmq_client import ZMQCameraClient
logger = setup_logger("aareDAQ")
class BeamlineDevices:
def __init__(self, beamline: MXBeamline):
self._beamline = beamline
self.detector_distance_minimum = 170
BEAMLINE = beamline.value.upper()
self.tell = make_tell_client(beamline)
self.aerotech = aerotech.AerotechController(beamline)
@@ -46,13 +46,6 @@ class BeamlineDevices:
self.__sample_cam = epicsAD(f"{BEAMLINE}-ES-MS:")
self.__zmq_camera: ZMQCameraClient | None = None
self.__use_zmq_camera = False
#TODO make this ZMQCameraCLient work - it kills the threads that it gets a lbox request in...
if self.__use_zmq_camera:
self.__zmq_camera = ZMQCameraClient(beamline)
logger.info(f"ZMQ camera source configured: {beamline}")
self.__front_light = PredefinedPV(name='front_light',
setpv=f"{BEAMLINE}-ES-FL:SET",
getpv=f"{BEAMLINE}-ES-FL:SET",
@@ -286,22 +279,6 @@ class BeamlineDevices:
"""
return int(self.__sample_cam.uid.get())
@property
def zmq_camera_enabled(self) -> bool:
"""Check if ZMQ camera source is enabled."""
return self.__use_zmq_camera
@zmq_camera_enabled.setter
def zmq_camera_enabled(self, enabled: bool):
"""Enable or disable ZMQ camera source (fallback to EPICS when disabled)."""
self.__use_zmq_camera = enabled and self.__zmq_camera is not None
logger.info(f"ZMQ camera source {'enabled' if self.__use_zmq_camera else 'disabled'}")
@property
def zmq_camera_connected(self) -> bool:
"""Check if ZMQ camera is currently connected."""
return self.__zmq_camera is not None and self.__zmq_camera.is_connected()
# Detector Z
@property
def dtz(self) -> float:
@@ -375,14 +352,6 @@ class BeamlineDevices:
incremental=incremental,
)
@property
def aerotech_lock(self) -> bool:
return False
@aerotech_lock.setter
def aerotech_lock(self, val: bool):
pass
def aerotech_stop(self):
pass
@@ -410,15 +379,6 @@ class BeamlineDevices:
def smargon_initialize(self):
self.__smargon.initialize()
@property
def det_cov(self):
return devs.bec_worker.get_det_cov()
@det_cov.setter
def det_cov(self, val: DetectorCoverEnum):
devs.bec_worker.det_cov(val)
if __name__ == "__main__":
from aare.common.beamline import mx_beamline
beamline = mx_beamline()