diff --git a/script/users/chong/MultiRegionScan.py b/script/users/chong/MultiRegionScan.py index ecdeed66..c6c6f7ed 100644 --- a/script/users/chong/MultiRegionScan.py +++ b/script/users/chong/MultiRegionScan.py @@ -25,7 +25,7 @@ MOTORS = [dummy] #MOTORS = [ManipulatorY, ManipulatorZ] # line scan [start, stop, step] -POSITIONS = [0., 50., 12] +POSITIONS = [0., 50., 2] SCAN = 'lscan' # vector scan [pos1, pos2, pos3, ...] @@ -47,7 +47,7 @@ SCAN = 'lscan' #SCAN = 'ascan' # seconds to wait between positioning command and triggering the detector -LATENCY = 3.0 +LATENCY = 0.0 # region setup @@ -69,14 +69,14 @@ LATENCY = 3.0 # 'cis': True = constant initial state (photoemission line), False = constant final state (Auger peak), (default False) # 'slit': exit slit (default: unchanged) -REGION1 = {'name': 'Second', 'elo': 13, 'ehi': 15.6, 'estep': 0.01, 'epass': 5., 'tstep': 0.2, 'iter': 1} -#REGION1 = {'name': 'c1s', 'elo': 444, 'ehi': 454, 'estep': 0.2, 'epass': 50., 'tstep': 0.15, 'iter': 1} -#REGION2 = {'name': 'o1s', 'elo': 195, 'ehi': 205, 'estep': 0.2, 'epass': 50., 'tstep': 0.15, 'iter': 1} +#REGION1 = {'name': 'Second', 'elo': 13, 'ehi': 15.6, 'estep': 0.01, 'epass': 5., 'tstep': 0.2, 'iter': 1} +REGION1 = {'name': 'c1s', 'elo': 750, 'ehi': 765, 'estep': 0.1, 'epass': 50., 'tstep': 0.2, 'iter': 1} +REGION2 = {'name': 'o1s', 'elo': 505, 'ehi': 520, 'estep': 0.1, 'epass': 50., 'tstep': 0.2, 'iter': 1} #REGION3 = {'name': 'multiplet 2', 'elo': 173.5, 'ehi': 176.8, 'estep': 0.03, 'epass': 50., 'tstep': 0.12, 'iter': 1} # list of region dictionaries to execute at each scan position -REGIONS=[REGION1] -#REGIONS = [REGION1, REGION2] +#REGIONS=[REGION1] +REGIONS = [REGION1, REGION2] # close beam shutter and turn off analyser at the end of the scan CLOSE_SHUTTER_AT_END = True