From 30bc98030c2ca1b82f3a868587e4273e61f675f1 Mon Sep 17 00:00:00 2001 From: gac-x03da Date: Sat, 4 Sep 2021 21:28:17 +0200 Subject: [PATCH] Script execution --- script/MultiRegionScan.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/script/MultiRegionScan.py b/script/MultiRegionScan.py index aff70b53..c2f018b7 100644 --- a/script/MultiRegionScan.py +++ b/script/MultiRegionScan.py @@ -40,9 +40,9 @@ MOTORS = (ManipulatorPhi, ManipulatorTheta) # holo scan #PHI_RANGE = (-170.0, 170.0) # (tuple (min, max)) -PHI_RANGE = (-10.0, 170.0) # (tuple (min, max)) -THETA_RANGE = (-11.5, 70.5) # (tuple (min, max)) -STEPS = (20.0, 1.0) # (tuple (phi, theta)) +PHI_RANGE = (-160.0, 160.0) # (tuple (min, max)) +THETA_RANGE = (-9.5, 80.5) # (tuple (min, max)) +STEPS = (40.0, 1.0) # (tuple (phi, theta)) ZIGZAG = True POSITIONS = [(PHI_RANGE[0], THETA_RANGE[0]), (PHI_RANGE[1], THETA_RANGE[1]), STEPS] SCAN = 'ascan' @@ -70,11 +70,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': 'Te 4d', 'efix': 104.6, 'epass': 50., 'tstep': 20., 'iter': 1, 'cis': False} -REGION2 = {'name': 'Ge 3d', 'efix': 115.6, 'epass': 50., 'tstep': 10., 'iter': 1, 'cis': False} +REGION1 = {'name': 'Tb 4d', 'elo': 267.0, 'ehi': 272.5, 'estep': 0.1, 'epass': 50., 'tstep': 1., 'iter': 1, 'cis': False} +REGION2 = {'name': 'Au 4f', 'efix': 332.65, 'epass': 20., 'tstep': 1., 'iter': 1, 'cis': False} # list of region dictionaries to execute at each scan position REGIONS = [REGION1, REGION2] +#REGIONS = [REGION1] # close beam shutter and turn off analyser at the end of the scan CLOSE_SHUTTER_AT_END = True