diff --git a/script/users/Niels/MultiRegionScan2022_v2.py b/script/users/Niels/MultiRegionScan2022_v2.py index 2d8350b8..83aca663 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 = 0 +NUMBER_OF_CYCLES = 20 POSITIONS = [1., 10., NUMBER_OF_CYCLES] SCAN = 'lscan' @@ -52,11 +52,11 @@ REFERENCE_POSITION = {'X': -1.15,'Y': 0., 'Z': 116.2, 'Theta': -9., 'Tilt': -2.0 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'} -#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','elo': 572.5, 'ehi':574., 'estep': 0.02, 'epass': 50., 'tstep': 0.6, 'iter': 1, 'cis': False, 'position': 'reference'} +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','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'} @@ -66,18 +66,18 @@ SAMPLE_POSITION = {'X': -1.3,'Y': 1., 'Z': 114., 'Theta': -9., 'Tilt': -2.0, 'Ph #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=0. +#iii=0. -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