From bfd33eeac9130283d39d4a77fed73ebb0751a966 Mon Sep 17 00:00:00 2001 From: gac-x03da Date: Mon, 7 Nov 2022 10:57:40 +0100 Subject: [PATCH] Script execution --- script/users/Niels/MultiRegionScan2022_v2.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/script/users/Niels/MultiRegionScan2022_v2.py b/script/users/Niels/MultiRegionScan2022_v2.py index d15bcb1f..25704578 100644 --- a/script/users/Niels/MultiRegionScan2022_v2.py +++ b/script/users/Niels/MultiRegionScan2022_v2.py @@ -21,7 +21,7 @@ MOTORS = [dummy] # number of cycles (integer - not decimal point!) # (actual number of cycles is + 1) -NUMBER_OF_CYCLES = 60 +NUMBER_OF_CYCLES = 2 POSITIONS = [1., 10., NUMBER_OF_CYCLES] SCAN = 'lscan' @@ -48,8 +48,8 @@ LATENCY = 0.0 # 'slit': exit slit (default: unchanged) # 'position': 'reference' or 'sample' -REFERENCE_POSITION = {'X': -1.,'Y': 0., 'Z': 116.4, 'Theta': -9., 'Tilt': -2.0, 'Phi': -90.} -SAMPLE_POSITION = {'X': -1.2,'Y': 0., 'Z': 114., 'Theta': -9., 'Tilt': -2.0, 'Phi': -90.} +REFERENCE_POSITION = {'X': -1.15,'Y': 0., 'Z': 116.2, 'Theta': -9., 'Tilt': -2.0, 'Phi': -90.} +SAMPLE_POSITION = {'X': -1.3,'Y': 1., 'Z': 114., 'Theta': -9., 'Tilt': -2.0, 'Phi': -90.} # REGIONS for 578 eV #REGION1 = {'name': 'Au4f','elo': 482., 'ehi':492., 'estep': 0.02, 'epass': 50., 'tstep': 0.1, 'iter': 1, 'cis': False, 'position': 'reference'} @@ -74,10 +74,10 @@ REGION5 = {'name': 'AuEF', 'elo': 1044.5, 'ehi':1046, 'estep':0.02, 'epass': 50. # list of region dictionaries to execute at each scan position -REGIONS = [REGION1, REGION2, REGION3, REGION4] +#REGIONS = [REGION1, REGION2, REGION3, REGION4] #self-designed regions -#REGIONS = [REGION1,REGION2,REGION3] +REGIONS = [REGION1,REGION5] # close beam shutter and turn off analyser at the end of the scan # True or False