beamline_updates

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)

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(