From d3fbff38c17d8afd0b4053496b4b2c7c8e99f572 Mon Sep 17 00:00:00 2001 From: x12sa Date: Tue, 16 Dec 2025 14:43:11 +0100 Subject: [PATCH] beamline_updates --- csaxs_bec/devices/epics/delay_generator_csaxs/ddg_1.py | 2 +- csaxs_bec/devices/epics/mcs_card/mcs_card_csaxs.py | 4 ++-- 2 files changed, 3 insertions(+), 3 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 9085ce9..2b7ff1f 100644 --- a/csaxs_bec/devices/epics/delay_generator_csaxs/ddg_1.py +++ b/csaxs_bec/devices/epics/delay_generator_csaxs/ddg_1.py @@ -273,7 +273,7 @@ class DDG1(PSIDeviceBase, DelayGeneratorCSAXS): # Prepare the MCS card for the next software trigger mcs = self.device_manager.devices.get("mcs", None) - if mcs is None: + if mcs is None or mcs.enabled is False: logger.info("Did not find mcs card with name 'mcs' in current session") else: self._prepare_mcs_on_trigger(mcs) diff --git a/csaxs_bec/devices/epics/mcs_card/mcs_card_csaxs.py b/csaxs_bec/devices/epics/mcs_card/mcs_card_csaxs.py index 7a3f2c3..54a814c 100644 --- a/csaxs_bec/devices/epics/mcs_card/mcs_card_csaxs.py +++ b/csaxs_bec/devices/epics/mcs_card/mcs_card_csaxs.py @@ -220,8 +220,8 @@ class MCSCardCSAXS(PSIDeviceBase, MCSCard): # The buffer needs to be cleared as this will otherwise lead to missing # triggers during the scan. Again, this should not happen if unstage is properly called. # But user interference or a restart of the device_server may lead to this situation. - self.erase_all.put(1) - time.sleep(0.2) + # self.erase_all.put(1) + # time.sleep(3) if self.current_channel.get() != 0: with suppress_mca_callbacks(self): logger.warning(