diff --git a/script/MultiRegionScan.py b/script/MultiRegionScan.py index 9e1fb95b..049d842d 100644 --- a/script/MultiRegionScan.py +++ b/script/MultiRegionScan.py @@ -39,7 +39,7 @@ MOTORS = (ManipulatorPhi, ManipulatorTheta) #SCAN = 'ascan' # holo scan -PHI_RANGE = (-100, -100) # (tuple (min, max)) +PHI_RANGE = (-100, 80) # (tuple (min, max)) THETA_RANGE = (-11.0, 70.0) # (tuple (min, max)) STEPS = (20.0, 1) # (tuple (phi, theta)) ZIGZAG = True @@ -69,11 +69,12 @@ LATENCY = 0.0 # 'cis': True = constant initial state (photoemission line), False = constant final state (Auger peak), (default False) # 'slit': exit slit (default: unchanged) -REGION1 = {'name': 'Peak Te+Sb', 'elo': 628.00, 'ehi': 641.00, 'estep': 0.15, 'epass': 50., 'tstep': 0.2, 'iter': 1} -REGION2 = {'name': 'Peak Mn', 'elo': 621.00, 'ehi': 627.00, 'estep': 0.2, 'epass': 50., 'tstep': 0.6, 'iter': 1} +REGION1 = {'name': 'Peak Sb', 'elo': 636.50, 'ehi': 641.00, 'estep': 0.15, 'epass': 50., 'tstep': 0.1, 'iter': 1} +REGION2 = {'name': 'Peak Te', 'elo': 629.00, 'ehi': 633.95, 'estep': 0.15, 'epass': 50., 'tstep': 0.1, 'iter': 1} +REGION3 = {'name': 'Peak Mn', 'elo': 621.00, 'ehi': 627.00, 'estep': 0.2, 'epass': 50., 'tstep': 0.6, 'iter': 1} # list of region dictionaries to execute at each scan position -REGIONS = [REGION1, REGION2] +REGIONS = [REGION1, REGION2, REGION3] # close beam shutter and turn off analyser at the end of the scan CLOSE_SHUTTER_AT_END = True