diff --git a/phoenix_bec/Documentation/2024_08_26_bookmarks.html b/phoenix_bec/Documentation/2024_08_26_bookmarks.html new file mode 100644 index 0000000..828cddc --- /dev/null +++ b/phoenix_bec/Documentation/2024_08_26_bookmarks.html @@ -0,0 +1,68 @@ + + + + +Bookmarks +

Bookmarks Menu

+ +

+

Bookmarks Toolbar

+

+

Scilog_Scicat

+

+

SciLog +

+

BEC

+

+

bec · GitLab +
Projects · GitLab +
Beamline Experiment Control (BEC) — BEC 2.18.3 documentation +

+

Python_documentation

+

+

venv — Creation of virtual environments — Python 3.12.4 documentation +
Python Virtual Environments: A Primer – Real Python +

+

Customer Portal +
Red Hat +
Red Hat Products Documentation +
Red Hat Enterprise Linux 8 Documentation +
Red Hat Developer Portal +
Red Hat Container Catalog +
Red Hat Hybrid Cloud Console +

+

BEC

+

+

bec · GitLab +
Projects · GitLab +
Beamline Experiment Control (BEC) — BEC 2.18.3 documentation +

+

Bookmarks Toolbar

+

+

BEC

+

+

bec · GitLab +
Projects · GitLab +
Beamline Experiment Control (BEC) — BEC 2.18.3 documentation +

+

Scilog_Scicat

+

+

SciLog +

+

Python_documentation

+

+

venv — Creation of virtual environments — Python 3.12.4 documentation +
Python Virtual Environments: A Primer – Real Python +

+

Customer Portal +
Red Hat +
Red Hat Products Documentation +
Red Hat Enterprise Linux 8 Documentation +
Red Hat Developer Portal +
Red Hat Container Catalog +
Red Hat Hybrid Cloud Console +

+

diff --git a/phoenix_bec/devices/phoenix_trigger.py b/phoenix_bec/devices/phoenix_trigger.py index a79974a..ad69889 100644 --- a/phoenix_bec/devices/phoenix_trigger.py +++ b/phoenix_bec/devices/phoenix_trigger.py @@ -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