diff --git a/script/MultiRegionScan.py b/script/MultiRegionScan.py index 64c53679..7c8b6a91 100644 --- a/script/MultiRegionScan.py +++ b/script/MultiRegionScan.py @@ -39,9 +39,9 @@ MOTORS = (ManipulatorPhi, ManipulatorTheta) #SCAN = 'ascan' # holo scan -PHI_RANGE = (-170.0, 170.0) # (tuple (min, max)) -THETA_RANGE = (-11.0, 80.0) # (tuple (min, max)) -STEPS = (20.0, 1.0) # (tuple (phi, theta)) +PHI_RANGE = (-45, 45.0) # (tuple (min, max)) +THETA_RANGE = (-11.0, 55.0) # (tuple (min, max)) +STEPS = (15.0, 1.5) # (tuple (phi, theta)) ZIGZAG = True POSITIONS = [(PHI_RANGE[0], THETA_RANGE[0]), (PHI_RANGE[1], THETA_RANGE[1]), STEPS] SCAN = 'ascan' @@ -69,8 +69,8 @@ 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': 'Te 3d', 'efix': 63.0, 'epass': 20., 'tstep': 15., 'iter': 1, 'cis': False} -REGION2 = {'name': 'Mn valence', 'efix': 631.9, 'epass': 50., 'tstep': 20., 'iter': 1, 'cis': False} +REGION1 = {'name': 'Peak 1', 'elo': 165, 'ehi': 167.5, 'estep': 0.02, 'epass': 20., 'tstep': 0.2, 'iter': 1} +REGION2 = {'name': 'Peak 2', 'elo': 170.3, 'ehi': 170.9, 'estep': 0.01, 'epass': 20., 'tstep': 0.2, 'iter': 1} # list of region dictionaries to execute at each scan position REGIONS = [REGION1, REGION2]