Add comments to trigger.py, add option to add devices to existing devices in... #6

Merged
wakonig_k merged 19 commits from x07mb_v1.1 into main 2024-11-14 11:38:32 +01:00
2 changed files with 82 additions and 1 deletions
Showing only changes of commit f162e8585f - Show all commits

File diff suppressed because one or more lines are too long

View File

@@ -95,7 +95,20 @@ class PhoenixTriggerSetup(CustomDetectorMixin):
raise PhoenixTriggerError(
f"Device {self.parent.name} is not ready to take trigger, timeout due to waiting for Falcon to get ready. Timeout after {timeout}s"
)
start_csmpl = Cpt(e is set.
if self.parent.scaninfo.scan_type == "step":
time.sleep(0.2)
self.parent.smpl.put(1)
# Minimum of 1 cycle has to be waited. Cycle == 0.2s
time.sleep(0.2)
# Trigger function from ophyd.Device returns a DeviceStatus. This function
# starts a process that creates a DeviceStatus, and waits for the signal_conditions
# self.parent.smpl_done.get to change to the value SAMPLING.DONE
# Once this takes place, the DeviceStatus.done flag will be set to True.
# When BEC calls trigger() on the devices, this method will be called assuming that
# the devices config softwareTrigger=True is set.
# In ScanBase, the _at_each_point function calls
# self.stubs.wait(wait_type="trigger", group="trigger", wait_time=self.exp_time)
# which ensures that the DeviceStatus object resolves before continuing, i.e. DeviceStatus.done = True