From 776241c08d68e9d71eb760a011a2c7b06dc23443 Mon Sep 17 00:00:00 2001 From: gac-x03da Date: Mon, 24 Apr 2023 17:18:51 +0200 Subject: [PATCH] Script execution --- script/MultiRegionScan.py | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/script/MultiRegionScan.py b/script/MultiRegionScan.py index d8e6955e..daa714cf 100644 --- a/script/MultiRegionScan.py +++ b/script/MultiRegionScan.py @@ -39,9 +39,9 @@ MOTORS = (ManipulatorPhi, ManipulatorTheta) #SCAN = 'ascan' # holo scan -PHI_RANGE = (-100, 80) # (tuple (min, max)) -THETA_RANGE = (-11.0, 70.0) # (tuple (min, max)) -STEPS = (20.0, 1) # (tuple (phi, theta)) +PHI_RANGE = (-45, 45) # (tuple (min, max)) +THETA_RANGE = (-11.0, 55.0) # (tuple (min, max)) +STEPS = (15.0, 1) # (tuple (phi, theta)) ZIGZAG = True POSITIONS = [(PHI_RANGE[0], THETA_RANGE[0]), (PHI_RANGE[1], THETA_RANGE[1]), STEPS] SCAN = 'ascan' @@ -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 1', 'elo': 165.20, 'ehi': 166.48, 'estep': 0.04, 'epass': 50., 'tstep': 0.1, 'iter': 1} -REGION2 = {'name': 'Peak 2', 'elo': 170.40, 'ehi': 171.30, 'estep': 0.03, 'epass': 50., 'tstep': 0.1, 'iter': 1} +REGION1 = {'name': 'Peak 1', 'elo': 164.50, 'ehi': 166.20, 'estep': 0.05, 'epass': 50., 'tstep': 0.12, 'iter': 1} +REGION2 = {'name': 'multiplet 1', 'elo': 167.50, 'ehi': 171.01, 'estep': 0.03, 'epass': 50., 'tstep': 0.12, '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, REGION2] +REGIONS = [REGION1, REGION2, REGION3] # close beam shutter and turn off analyser at the end of the scan CLOSE_SHUTTER_AT_END = True