bec/ophyd_devices
1
0
Fork 0
Code Issues 9 Pull Requests 10 Actions Packages Projects Releases 126 Wiki Activity

fix: rename custome_prepare.prepare_detector_backend, bugfix in custom_prepare.wait_for_signals

Browse Source
This commit is contained in:
appel_c 2023-11-21 12:24:00 +01:00
parent cbe8c8c4e5
commit f793ec7b1f
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ophyd_devices/epics/devices/psi_detector_base.py
View File

@ -65,7 +65,7 @@ class CustomDetectorMixin:
Prepare detector for the scan Prepare detector for the scan
""" """
def prepare_data_backend(self) -> None: def prepare_detector_backend(self) -> None:
""" """
Prepare detector backend for the scan Prepare detector backend for the scan
""" """
@ -143,10 +143,10 @@ class CustomDetectorMixin:
get_current_state() == condition get_current_state() == condition
for get_current_state, condition in signal_conditions for get_current_state, condition in signal_conditions
] ]
if (all_signals and all(checks)) or (not all_signals and any(checks)):
return True
if check_stopped is True and self.parent.stopped is True: if check_stopped is True and self.parent.stopped is True:
return False return False
if (all_signals and all(checks)) or (not all_signals and any(checks)):
return True
if timer > timeout: if timer > timeout:
return False return False
time.sleep(interval) time.sleep(interval)
@ -227,9 +227,7 @@ class PSIDetectorBase(Device):
self.wait_for_connection(all_signals=True) self.wait_for_connection(all_signals=True)
# Init custom prepare class with BL specific logic # Init custom prepare class with BL specific logic
self.custom_prepare = self.custom_prepare_cls( self.custom_prepare = self.custom_prepare_cls(parent=self, **kwargs)
parent=self, **kwargs
) # Eiger9MSetup(parent=self, **kwargs)
if not sim_mode: if not sim_mode:
self._update_service_config() self._update_service_config()
self.device_manager = device_manager self.device_manager = device_manager
@ -284,7 +282,7 @@ class PSIDetectorBase(Device):
# Load metadata of the scan # Load metadata of the scan
self.scaninfo.load_scan_metadata() self.scaninfo.load_scan_metadata()
# Prepare detector and file writer # Prepare detector and file writer
self.custom_prepare.prepare_data_backend() self.custom_prepare.prepare_detector_backend()
self.custom_prepare.prepare_detector() self.custom_prepare.prepare_detector()
state = False state = False
self.custom_prepare.publish_file_location(done=state) self.custom_prepare.publish_file_location(done=state)