diff --git a/phoenix_bec/devices/phoenix_trigger.py b/phoenix_bec/devices/phoenix_trigger.py index 9291367..18326c1 100644 --- a/phoenix_bec/devices/phoenix_trigger.py +++ b/phoenix_bec/devices/phoenix_trigger.py @@ -103,7 +103,20 @@ class PhoenixTriggerSetup(CustomDetectorMixin): ) if self.parent.scaninfo.scan_type == "step": - time.sleep(0.2)elf.exp_time) + 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 diff --git a/phoenix_bec/scripts/phoenix.py b/phoenix_bec/scripts/phoenix.py index 4ccb811..7cd5509 100644 --- a/phoenix_bec/scripts/phoenix.py +++ b/phoenix_bec/scripts/phoenix.py @@ -368,7 +368,7 @@ class PhGroup: print(this_scan.scan.data.keys()) for outer_key in this_scan.scan.data.keys(): print("outer_key", outer_key) - n_outer = len(this_scan.scan.data.keys()) + # n_outer = len(this_scan.scan.data.keys()) for inner_key in this_scan.scan.data[outer_key].keys(): print("inner_key", inner_key) # calculate nunber of points