diff --git a/phoenix_bec/bec_ipython_client/startup/post_startup.py b/phoenix_bec/bec_ipython_client/startup/post_startup.py index ae8ac4a..4a1215f 100644 --- a/phoenix_bec/bec_ipython_client/startup/post_startup.py +++ b/phoenix_bec/bec_ipython_client/startup/post_startup.py @@ -89,7 +89,9 @@ def ph_reload(line): print("to update version server restart server ") # need to use global statement here, as I like to reload into space on # iphyton consoel + global PH, phoenix + print("from phoenix_bec.scripts import phoenix as PH") print("phoenix = PH.PhoenixBL()") phoenix = PH.PhoenixBL() diff --git a/phoenix_bec/devices/phoenix_trigger.py b/phoenix_bec/devices/phoenix_trigger.py index 18326c1..9291367 100644 --- a/phoenix_bec/devices/phoenix_trigger.py +++ b/phoenix_bec/devices/phoenix_trigger.py @@ -103,20 +103,7 @@ class PhoenixTriggerSetup(CustomDetectorMixin): ) 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) + time.sleep(0.2)elf.exp_time) # which ensures that the DeviceStatus object resolves before continuing, # i.e. DeviceStatus.done = True diff --git a/phoenix_bec/local_scripts/TEST_scanning/Linescan_1.py b/phoenix_bec/local_scripts/TEST_scanning/Linescan_1.py index bd034f0..086bbef 100644 --- a/phoenix_bec/local_scripts/TEST_scanning/Linescan_1.py +++ b/phoenix_bec/local_scripts/TEST_scanning/Linescan_1.py @@ -1,3 +1,7 @@ +""" +test script for linescans +""" + # from unittest import mock import numpy as np diff --git a/phoenix_bec/scripts/phoenix.py b/phoenix_bec/scripts/phoenix.py index d6def14..43177f7 100644 --- a/phoenix_bec/scripts/phoenix.py +++ b/phoenix_bec/scripts/phoenix.py @@ -1,3 +1,9 @@ +""" + +General collection of calsses for PHEONIX beamline + +""" + # from unittest import mock import os import sys