diff --git a/script/MultiRegionScan.py b/script/MultiRegionScan.py index f41e4b47..922e6631 100644 --- a/script/MultiRegionScan.py +++ b/script/MultiRegionScan.py @@ -3,9 +3,9 @@ Discrete photon energy scan (vector scan) of multiple spectral regions """ # scan positioner: Eph = photon energy -MOTORS = [Eph] +MOTORS = [dummy] # comma-separated discrete list of scan positions -POSITIONS = [405.0, 410.0] +POSITIONS = [1., 2., 400] # seconds to wait between positioning command and triggering the detector LATENCY = 0.0 @@ -27,8 +27,8 @@ LATENCY = 0.0 # 'cis': True = constant initial state (photoemission line), False = constant final state (Auger peak), (default False) # 'slit': exit slit (default current value) -REGION1 = {'name': 'Peak 1', 'elo': 243.0, 'ehi': 253.0, 'estep': 0.1, 'epass': 50, 'tstep': 0.1, 'iter': 1, 'cis': True} -REGION2 = {'name': 'Peak 2', 'elo': 214.0, 'ehi': 219.0, 'estep': 0.1, 'epass': 50, 'tstep': 0.1, 'iter': 2, 'cis': False} +REGION1 = {'name': 'secondary', 'elo': 9.0, 'ehi': 11.0, 'estep': 0.02, 'epass': 2, 'tstep': 0.20, 'iter': 1, 'cis': False} +REGION2 = {'name': 'fermi', 'elo': 23.5, 'ehi': 27.5, 'estep': 0.02, 'epass': 2, 'tstep': 0.25, 'iter': 1, 'cis': False} # list of region dictionaries to execute at each scan position REGIONS = [REGION1, REGION2] @@ -215,7 +215,8 @@ def do_scan(motors, positions, regions, latency): adjust_sensors() set_adc_averaging() - vscan(motors, SENSORS, positions, True, latency,False, 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) for (index, region) in enumerate(regions): set_attribute(get_exec_pars().scanPath + "region{0}/ScientaSpectrum".format(index + 1), "RegionName", region['name'])