minor changes

This commit is contained in:
gac-x07mb
2024-12-17 16:28:15 +01:00
parent 3c618b431e
commit 1654f7cfa4
4 changed files with 13 additions and 14 deletions

View File

@ -89,7 +89,9 @@ def ph_reload(line):
print("to update version server restart server ") print("to update version server restart server ")
# need to use global statement here, as I like to reload into space on # need to use global statement here, as I like to reload into space on
# iphyton consoel # iphyton consoel
global PH, phoenix global PH, phoenix
print("from phoenix_bec.scripts import phoenix as PH") print("from phoenix_bec.scripts import phoenix as PH")
print("phoenix = PH.PhoenixBL()") print("phoenix = PH.PhoenixBL()")
phoenix = PH.PhoenixBL() phoenix = PH.PhoenixBL()

View File

@ -103,20 +103,7 @@ class PhoenixTriggerSetup(CustomDetectorMixin):
) )
if self.parent.scaninfo.scan_type == "step": if self.parent.scaninfo.scan_type == "step":
time.sleep(0.2) time.sleep(0.2)elf.exp_time)
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, # which ensures that the DeviceStatus object resolves before continuing,
# i.e. DeviceStatus.done = True # i.e. DeviceStatus.done = True

View File

@ -1,3 +1,7 @@
"""
test script for linescans
"""
# from unittest import mock # from unittest import mock
import numpy as np import numpy as np

View File

@ -1,3 +1,9 @@
"""
General collection of calsses for PHEONIX beamline
"""
# from unittest import mock # from unittest import mock
import os import os
import sys import sys