From 819b067e170b35365e0dad39b10f603687eb0135 Mon Sep 17 00:00:00 2001 From: appel_c Date: Fri, 8 Aug 2025 07:54:57 +0200 Subject: [PATCH] refactor(asitpxcam): fix ASI Timepix integration, add relevant PVs. --- ophyd_devices/devices/areadetector/cam.py | 5 +++++ ophyd_devices/devices/undulator.py | 3 --- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/ophyd_devices/devices/areadetector/cam.py b/ophyd_devices/devices/areadetector/cam.py index a7a69a4..e7136d0 100644 --- a/ophyd_devices/devices/areadetector/cam.py +++ b/ophyd_devices/devices/areadetector/cam.py @@ -274,6 +274,10 @@ class ASItpxCam(CamBase): """ + acquire = ADCpt(EpicsSignal, "Acquire") + acquire_busy = ADCpt(EpicsSignalRO, "AcquireBusy") + detector_state = ADCpt(EpicsSignalRO, "DetectorState_RBV") + tdc1_enable = ADCpt(EpicsSignalWithRBV, "TDC1Enable") tdc1_edge = ADCpt(EpicsSignalWithRBV, "TDC1Edge") tdc1_output = ADCpt(EpicsSignalWithRBV, "TDC1Output") @@ -282,6 +286,7 @@ class ASItpxCam(CamBase): tdc2_output = ADCpt(EpicsSignalWithRBV, "TDC2Output") trigger_source = ADCpt(EpicsSignalWithRBV, "TriggerSource") + trigger_mode = ADCpt(EpicsSignalWithRBV, "TriggerMode") trigger_polarity = ADCpt(EpicsSignalWithRBV, "TriggerPolarity") trigger_delay = ADCpt(EpicsSignalWithRBV, "TriggerDelay") exposure_mode = ADCpt(EpicsSignalWithRBV, "ExposureMode") diff --git a/ophyd_devices/devices/undulator.py b/ophyd_devices/devices/undulator.py index b7c906b..7653d85 100644 --- a/ophyd_devices/devices/undulator.py +++ b/ophyd_devices/devices/undulator.py @@ -77,9 +77,6 @@ class UndulatorStopSignal(EpicsSignal): If the undulator is operator controlled, it will not move. """ if self.parent.select_control.get() == UNDULATORCONTROL.OPERATOR.value: - logger.error( - f"Cannot use put for signal {self.name}; Undulator is operator controlled!" - ) return None return super().put( value,