From 0196b9f9fdbcd0d6080dbeed72f5da722e4ab7c3 Mon Sep 17 00:00:00 2001 From: gac-x03da Date: Mon, 21 Nov 2022 13:38:02 +0100 Subject: [PATCH] Script execution --- script/users/Niels/MultiRegionScan2022_v2.py | 28 ++++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/script/users/Niels/MultiRegionScan2022_v2.py b/script/users/Niels/MultiRegionScan2022_v2.py index e42fda88..6719f98c 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 = 50 +NUMBER_OF_CYCLES = 30 POSITIONS = [1., 10., NUMBER_OF_CYCLES] SCAN = 'lscan' @@ -48,22 +48,22 @@ LATENCY = 0.0 # 'slit': exit slit (default: unchanged) # 'position': 'reference' or 'sample' -REFERENCE_POSITION = {'X': -0.9,'Y': 1.6, 'Z': 116.5, 'Theta': -9., 'Tilt': -2.0, 'Phi': -90.} -SAMPLE_POSITION = {'X': -1.15,'Y': 0., 'Z': 114.5, 'Theta': -9., 'Tilt': -2.0, 'Phi': -90.} +REFERENCE_POSITION = {'X': -0.85,'Y': 1.25, 'Z': 116.9, 'Theta': -9., 'Tilt': -2.0, 'Phi': -90.} +SAMPLE_POSITION = {'X': -1.20,'Y': 0.2, 'Z': 114.0, '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'} -REGION2 = {'name': 'In4d','elo': 552.5, 'ehi':559., 'estep':0.02, 'epass': 50., 'tstep': 0.1, 'iter': 1, 'cis': False, 'position': 'sample'} -REGION3 = {'name': 'As3d','elo': 529.5, 'ehi':535., 'estep':0.02, 'epass': 50., 'tstep': 0.1, 'iter': 1, 'cis': False, 'position': 'sample'} -REGION4 = {'name': 'In3d','elo': 119., 'ehi':124., 'estep':0.02, 'epass': 50., 'tstep': 0.1, 'iter': 1, 'cis': False, 'position': 'sample'} -REGION5 = {'name': 'AuEF','ephot': 578., 'elo': 572.5, 'ehi':574., 'estep': 0.02, 'epass': 50., 'tstep': 0.6, 'iter': 1, 'cis': False, 'position': 'reference'} +REGION_A1 = {'name': 'Au4f','elo': 482., 'ehi':492., 'estep': 0.02, 'epass': 50., 'tstep': 0.1, 'iter': 1, 'cis': False, 'position': 'reference'} +REGION_A2 = {'name': 'In4d','elo': 552.5, 'ehi':559., 'estep':0.02, 'epass': 50., 'tstep': 0.1, 'iter': 1, 'cis': False, 'position': 'sample'} +REGION_A3 = {'name': 'As3d','elo': 529.5, 'ehi':535., 'estep':0.02, 'epass': 50., 'tstep': 0.1, 'iter': 1, 'cis': False, 'position': 'sample'} +REGION_A4 = {'name': 'In3d','elo': 119., 'ehi':124., 'estep':0.02, 'epass': 50., 'tstep': 0.1, 'iter': 1, 'cis': False, 'position': 'sample'} +REGION_A5 = {'name': 'AuEF','ephot': 578., 'elo': 572.5, 'ehi':574., 'estep': 0.02, 'epass': 50., 'tstep': 0.6, 'iter': 1, 'cis': False, 'position': 'reference'} # REGIONS for 1050 eV -REGION11 = {'name': 'Au4f', 'elo': 954., 'ehi':964, 'estep': 0.02, 'epass': 50., 'tstep': 0.1, 'iter': 1, 'cis': False, 'position': 'reference'} -REGION21 = {'name': 'In4d', 'elo': 1024.5, 'ehi':1031.5, 'estep':0.02, 'epass': 50., 'tstep': 0.1, 'iter': 1, 'cis': False, 'position': 'sample'} -REGION31 = {'name': 'As3d', 'elo': 1001.5, 'ehi':1007., 'estep':0.02, 'epass': 50., 'tstep': 0.1, 'iter': 1, 'cis': False, 'position': 'sample'} -REGION41 = {'name': 'In3d', 'elo': 591., 'ehi':596., 'estep':0.02, 'epass': 50., 'tstep': 0.1, 'iter': 1, 'cis': False, 'position': 'sample'} -REGION51 = {'name': 'AuEF', 'ephot': 1050., 'elo': 1044.5, 'ehi':1046, 'estep':0.02, 'epass': 50., 'tstep': 0.6, 'iter': 1, 'cis': False, 'position': 'reference'} +REGION_B1 = {'name': 'Au4f', 'elo': 954., 'ehi':964, 'estep': 0.02, 'epass': 50., 'tstep': 0.1, 'iter': 1, 'cis': False, 'position': 'reference'} +REGION_B2 = {'name': 'In4d', 'elo': 1024.5, 'ehi':1031.5, 'estep':0.02, 'epass': 50., 'tstep': 0.1, 'iter': 1, 'cis': False, 'position': 'sample'} +REGION_B3 = {'name': 'As3d', 'elo': 1001.5, 'ehi':1007., 'estep':0.02, 'epass': 50., 'tstep': 0.1, 'iter': 1, 'cis': False, 'position': 'sample'} +REGION_B4 = {'name': 'In3d', 'elo': 591., 'ehi':596., 'estep':0.02, 'epass': 50., 'tstep': 0.1, 'iter': 1, 'cis': False, 'position': 'sample'} +REGION_B5 = {'name': 'AuEF', 'ephot': 1050., 'elo': 1044.5, 'ehi':1046, 'estep':0.02, 'epass': 50., 'tstep': 0.6, 'iter': 1, 'cis': False, 'position': 'reference'} # Regions of hv dependence #iii=0. @@ -77,7 +77,7 @@ REGION51 = {'name': 'AuEF', 'ephot': 1050., 'elo': 1044.5, 'ehi':1046, 'estep':0 #REGIONS = [REGION1, REGION2, REGION3, REGION4] #self-designed regions -REGIONS = [REGION5,REGION1,REGION2,REGION3,REGION4,REGION51,REGION11,REGION21,REGION31,REGION41] +REGIONS = [REGION_B5,REGION_B1,REGION_B2,REGION_B3,REGION_B4] # close beam shutter and turn off analyser at the end of the scan # True or False