From d7e74797de491ec8ade949516a0400cee88394af Mon Sep 17 00:00:00 2001 From: appel_c Date: Tue, 9 Dec 2025 09:58:46 +0100 Subject: [PATCH] fix(ddg): adapt DDG, remove mcs.readytoread --- csaxs_bec/devices/epics/delay_generator_csaxs/ddg_1.py | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/csaxs_bec/devices/epics/delay_generator_csaxs/ddg_1.py b/csaxs_bec/devices/epics/delay_generator_csaxs/ddg_1.py index bbe621d..5c6704e 100644 --- a/csaxs_bec/devices/epics/delay_generator_csaxs/ddg_1.py +++ b/csaxs_bec/devices/epics/delay_generator_csaxs/ddg_1.py @@ -52,7 +52,7 @@ from csaxs_bec.devices.epics.delay_generator_csaxs.delay_generator_csaxs import LiteralChannels, StatusBitsCompareStatus, ) -from csaxs_bec.devices.epics.mcs_card.mcs_card_csaxs import ACQUIRING, READYTOREAD +from csaxs_bec.devices.epics.mcs_card.mcs_card_csaxs import ACQUIRING if TYPE_CHECKING: # pragma: no cover from bec_lib.devicemanager import DeviceManagerBase, ScanInfo @@ -169,14 +169,9 @@ class DDG1(PSIDeviceBase, DelayGeneratorCSAXS): This method holds the logic to ensure that the MCS card is ready to read. It's logic is coupled to the MCS card implementation and the DDG1 trigger logic. """ - status_ready_read = CompareStatus(mcs.ready_to_read, READYTOREAD.DONE) mcs.stop_all.put(1) status_acquiring = TransitionStatus(mcs.acquiring, [ACQUIRING.DONE, ACQUIRING.ACQUIRING]) - self.cancel_on_stop(status_ready_read) self.cancel_on_stop(status_acquiring) - status_ready_read.wait(10) - - mcs.ready_to_read.put(READYTOREAD.PROCESSING) mcs.erase_start.put(1) status_acquiring.wait(timeout=10) # Allow 10 seconds in case communication is slow