From 91ff86487544a101526312227a591e4b7f46d25b Mon Sep 17 00:00:00 2001 From: gac-x03da Date: Sun, 6 Nov 2022 23:25:35 +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 810ed730..10e94092 100644 --- a/script/users/Niels/MultiRegionScan2022_v2.py +++ b/script/users/Niels/MultiRegionScan2022_v2.py @@ -59,25 +59,25 @@ SAMPLE_POSITION = {'X': -1.2,'Y': 0., 'Z': 114., 'Theta': -9., 'Tilt': -2.0, 'Ph #REGION5 = {'name': 'AuEF','elo': 572.5, 'ehi':574., 'estep': 0.02, 'epass': 50., 'tstep': 0.6, 'iter': 1, 'cis': False, 'position': 'reference'} # REGIONS for 1050 eV -#REGION1 = {'name': 'Au4f', 'elo': 954., 'ehi':964, 'estep': 0.02, 'epass': 50., 'tstep': 0.1, 'iter': 1, 'cis': False, 'position': 'reference'} -#REGION2 = {'name': 'In4d', 'elo': 1024.5, 'ehi':1031.5, 'estep':0.02, 'epass': 50., 'tstep': 0.2, 'iter': 1, 'cis': False, 'position': 'sample'} -#REGION3 = {'name': 'As3d', 'elo': 1001.5, 'ehi':1007., 'estep':0.02, 'epass': 50., 'tstep': 0.2, 'iter': 1, 'cis': False, 'position': 'sample'} -#REGION4 = {'name': 'In3d', 'elo': 591., 'ehi':596., 'estep':0.02, 'epass': 50., 'tstep': 0.2, 'iter': 1, 'cis': False, 'position': 'sample'} -#REGION5 = {'name': 'AuEF', 'elo': 1044.5, 'ehi':1046, 'estep':0.02, 'epass': 50., 'tstep': 0.6, 'iter': 1, 'cis': False, 'position': 'reference'} +REGION1 = {'name': 'Au4f', 'elo': 954., 'ehi':964, 'estep': 0.02, 'epass': 50., 'tstep': 0.1, 'iter': 1, 'cis': False, 'position': 'reference'} +REGION2 = {'name': 'In4d', 'elo': 1024.5, 'ehi':1031.5, 'estep':0.02, 'epass': 50., 'tstep': 0.2, 'iter': 1, 'cis': False, 'position': 'sample'} +REGION3 = {'name': 'As3d', 'elo': 1001.5, 'ehi':1007., 'estep':0.02, 'epass': 50., 'tstep': 0.2, 'iter': 1, 'cis': False, 'position': 'sample'} +REGION4 = {'name': 'In3d', 'elo': 591., 'ehi':596., 'estep':0.02, 'epass': 50., 'tstep': 0.2, 'iter': 1, 'cis': False, 'position': 'sample'} +REGION5 = {'name': 'AuEF', 'elo': 1044.5, 'ehi':1046, 'estep':0.02, 'epass': 50., 'tstep': 0.6, 'iter': 1, 'cis': False, 'position': 'reference'} # Regions of hv dependence -iii=6. +#iii=6. -REGION1 = {'name': 'Au4f','elo': (54.+150.*iii), 'ehi':(64.+150.*iii), 'estep': 0.02, 'epass': 50., 'tstep': 0.1, 'iter': 1, 'cis': False, 'position': 'reference'} -REGION2 = {'name': 'In4d','elo': (124.5+150.*iii), 'ehi':(131.+150.*iii), 'estep':0.02, 'epass': 50., 'tstep': 0.2, 'iter': 1, 'cis': False, 'position': 'sample'} -REGION3 = {'name': 'As3d','elo': (101.+150.*iii), 'ehi':(106.5+150.*iii), 'estep':0.02, 'epass': 50., 'tstep': 0.2, 'iter': 1, 'cis': False, 'position': 'sample'} +#REGION1 = {'name': 'Au4f','elo': (54.+150.*iii), 'ehi':(64.+150.*iii), 'estep': 0.02, 'epass': 50., 'tstep': 0.1, 'iter': 1, 'cis': False, 'position': 'reference'} +#REGION2 = {'name': 'In4d','elo': (124.5+150.*iii), 'ehi':(131.+150.*iii), 'estep':0.02, 'epass': 50., 'tstep': 0.2, 'iter': 1, 'cis': False, 'position': 'sample'} +#REGION3 = {'name': 'As3d','elo': (101.+150.*iii), 'ehi':(106.5+150.*iii), 'estep':0.02, 'epass': 50., 'tstep': 0.2, 'iter': 1, 'cis': False, 'position': 'sample'} # 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,REGION2,REGION3] # close beam shutter and turn off analyser at the end of the scan # True or False