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 fc10406..3290cbc 100644 --- a/csaxs_bec/devices/epics/delay_generator_csaxs/ddg_1.py +++ b/csaxs_bec/devices/epics/delay_generator_csaxs/ddg_1.py @@ -575,7 +575,7 @@ class DDG1(PSIDeviceBase, DelayGeneratorCSAXS): # NOTE If the MCS card is present in the current session of BEC, # we prepare the card for the next trigger. The procedure is implemented - # in the '_prepare_mcs_on_trigger' method. We will also use the mcs card + # in the 'prepare_mcs_on_trigger' method. We will also use the mcs card # to indicate when the burst cycle is done. If no mcs card is available # the fallback is to use the polling of the DDG mcs = self.device_manager.devices.get("mcs", None) @@ -594,7 +594,7 @@ class DDG1(PSIDeviceBase, DelayGeneratorCSAXS): else: start_time = time.time() logger.debug(f"Preparing mcs card ") - status_mcs = self._prepare_mcs_on_trigger() + status_mcs = self.prepare_mcs_on_trigger() # NOTE Timeout of 3s should be plenty, any longer wait should checked. If this happens to crash # an acquisition regularly with a WaitTimeoutError, the timeout can be increased but it should # be investigated why the EPICS interface is slow to respond. diff --git a/csaxs_bec/devices/jungfraujoch/eiger.py b/csaxs_bec/devices/jungfraujoch/eiger.py index eccb857..bac13b2 100644 --- a/csaxs_bec/devices/jungfraujoch/eiger.py +++ b/csaxs_bec/devices/jungfraujoch/eiger.py @@ -332,7 +332,7 @@ class Eiger(PSIDeviceBase): logger.debug(f"Setting data_settings: {yaml.dump(data_settings.to_dict(), indent=4)}") prep_time = time.time() self.jfj_client.wait_for_idle(timeout=10) # Ensure we are in IDLE state - self.jfj_client.start(settings=data_settings) # Takes around ~0.6s + self.jfj_client.start(settings=data_settings) # Takes around ~0.6s -> 6s currently. # Time the stage process logger.info(