From e904dbae2d9a2f04d0b073c0963c3f1d0d67ccb6 Mon Sep 17 00:00:00 2001 From: gac-x03da Date: Tue, 22 Nov 2022 03:02:51 +0100 Subject: [PATCH] Script execution --- script/users/Niels/MultiRegionScan2022_v2.py | 22 ++++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/script/users/Niels/MultiRegionScan2022_v2.py b/script/users/Niels/MultiRegionScan2022_v2.py index 614a7904..36790f7c 100644 --- a/script/users/Niels/MultiRegionScan2022_v2.py +++ b/script/users/Niels/MultiRegionScan2022_v2.py @@ -52,18 +52,18 @@ REFERENCE_POSITION = {'X': -0.85,'Y': 1.25, 'Z': 116.9, 'Theta': -9., 'Tilt': -2 SAMPLE_POSITION = {'X': -1.20,'Y': 0.2, 'Z': 114.0, 'Theta': -9., 'Tilt': -2.0, 'Phi': -90.} # REGIONS for 578 eV -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'} +REGION_A1 = {'name': 'AuEF','ephot': 578., 'elo': 578.-6., 'ehi':578.-2., 'estep': 0.02, 'epass': 50., 'tstep': 0.6, 'iter': 1, 'cis': False, 'position': 'reference'} +REGION_A2 = {'name': 'Au4f','elo': 578.-96., 'ehi': 578.-86.,'estep': 0.02, 'epass': 50., 'tstep': 0.1, 'iter': 1, 'cis': False, 'position': 'reference'} +REGION_A3 = {'name': 'In4d','elo': 578.-26., 'ehi': 578.-19., 'estep': 0.02, 'epass': 50., 'tstep': 0.1, 'iter': 1, 'cis': False, 'position': 'sample'} +REGION_A4 = {'name': 'As3d','elo': 578.-49., 'ehi': 578.-43., 'estep': 0.02, 'epass': 50., 'tstep': 0.1, 'iter': 1, 'cis': False, 'position': 'sample'} +REGION_A5 = {'name': 'In3d','elo': 578.-459., 'ehi': 578.-445., 'estep': 0.02, 'epass': 50., 'tstep': 0.1, 'iter': 1, 'cis': False, 'position': 'sample'} # REGIONS for 1050 eV -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'} +REGION_B1 = {'name': 'AuEF','ephot': 1050., 'elo': 1050.-6., 'ehi': 1050.-2., 'estep': 0.02, 'epass': 50., 'tstep': 0.6, 'iter': 1, 'cis': False, 'position': 'reference'} +REGION_B2 = {'name': 'Au4f','elo': 1050.-96., 'ehi': 1050.-86.,'estep': 0.02, 'epass': 50., 'tstep': 0.1, 'iter': 1, 'cis': False, 'position': 'reference'} +REGION_B3 = {'name': 'In4d','elo': 1050.-26., 'ehi': 1050.-19., 'estep': 0.02, 'epass': 50., 'tstep': 0.1, 'iter': 1, 'cis': False, 'position': 'sample'} +REGION_B4 = {'name': 'As3d','elo': 1050.-49., 'ehi': 1050.-43., 'estep': 0.02, 'epass': 50., 'tstep': 0.1, 'iter': 1, 'cis': False, 'position': 'sample'} +REGION_B5 = {'name': 'In3d','elo': 1050.-459., 'ehi': 1050.-445., 'estep': 0.02, 'epass': 50., 'tstep': 0.1, 'iter': 1, 'cis': False, 'position': 'sample'} # Regions of hv dependence #iii=0. @@ -77,7 +77,7 @@ REGION_B5 = {'name': 'AuEF', 'ephot': 1050., 'elo': 1044.5, 'ehi':1046, 'estep': #REGIONS = [REGION1, REGION2, REGION3, REGION4] #self-designed regions -REGIONS = [REGION_A5,REGION_A1,REGION_A2,REGION_A3,REGION_A4] +REGIONS = [REGION_A1,REGION_A2,REGION_A3,REGION_A4,REGION_A5,REGION_B1,REGION_B2,REGION_B3,REGION_B4,REGION_B5] # REGIONS = [REGION_B5,REGION_B1,REGION_B2,REGION_B3,REGION_B4] # close beam shutter and turn off analyser at the end of the scan