Closedown

This commit is contained in:
gac-x03da
2019-03-01 00:53:11 +01:00
parent 904108184e
commit aaf5ad8659
+7 -5
View File
@@ -1,5 +1,5 @@
"""
Discrete photon energy scan (vector scan) of multiple spectral regions
Discrete scan (vector scan) of multiple spectral regions
"""
PHI_RANGE = (-160.0, 160.0) # (tuple (min, max))
@@ -8,11 +8,13 @@ STEPS = (40.0, 1.0) # (tuple (phi, theta))
ZIGZAG = True
# scan positioner: Eph = photon energy
MOTORS = (ManipulatorPhi, ManipulatorTheta)
#MOTORS = (ManipulatorPhi, ManipulatorTheta)
#MOTORS = [ManipulatorPhi]
MOTORS = [dummy]
# comma-separated discrete list of scan positions
POSITIONS = [(PHI_RANGE[0], THETA_RANGE[0]), (PHI_RANGE[1], THETA_RANGE[1]), STEPS]
#POSITIONS = [(PHI_RANGE[0], THETA_RANGE[0]), (PHI_RANGE[1], THETA_RANGE[1]), STEPS]
#POSITIONS = [-175., 180., 5.]
POSITIONS = [0.]
# seconds to wait between positioning command and triggering the detector
LATENCY = 0.0
@@ -230,9 +232,9 @@ def do_scan(motors, positions, regions, latency):
adjust_sensors()
set_adc_averaging()
ascan(motors, SENSORS, positions[0], positions[1], positions[2], latency, False, zigzag = True, before_read=wait_beam, after_read = after_readout)
#ascan(motors, SENSORS, positions[0], positions[1], positions[2], latency, False, zigzag = True, before_read=wait_beam, after_read = after_readout)
#lscan(motors, SENSORS, positions[0], positions[1], positions[2], latency, False, before_read=wait_beam, after_read = after_readout)
#vscan(motors, SENSORS, positions, True, latency,False, before_read=wait_beam, after_read = after_readout)
vscan(motors, SENSORS, positions, True, latency,False, before_read=wait_beam, after_read = after_readout)
for (index, region) in enumerate(regions):
set_attribute(get_exec_pars().scanPath + "region{0}/ScientaSpectrum".format(index + 1), "RegionName", region['name'])