From c7b873bce9cc98ef80ca8b3fb7d1ef0716173398 Mon Sep 17 00:00:00 2001 From: gac-x03da Date: Sun, 6 Nov 2022 12:30:30 +0100 Subject: [PATCH] Script execution --- script/users/Niels/MultiRegionScan2022_v2.py | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/script/users/Niels/MultiRegionScan2022_v2.py b/script/users/Niels/MultiRegionScan2022_v2.py index 8dd6532f..4f449a1b 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 = 9. +NUMBER_OF_CYCLES = 0. POSITIONS = [1., 10., NUMBER_OF_CYCLES] SCAN = 'lscan' @@ -52,11 +52,11 @@ REFERENCE_POSITION = {'X': -0.8,'Y': 1.2, 'Z': 116.2, 'Theta': -9., 'Tilt': -2.0 SAMPLE_POSITION = {'X': -1.2,'Y': 0., 'Z': 113.7, '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., 'ehi':534.5, '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': 573., 'ehi':574.5, '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., 'ehi':534.5, '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': 573., 'ehi':574.5, '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'} @@ -65,6 +65,12 @@ REGION5 = {'name': 'AuEF','elo': 573., 'ehi':574.5, 'estep': 0.02, 'epass': 50., #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': 1045., 'ehi':1046.5, 'estep':0.02, 'epass': 50., 'tstep': 0.6, 'iter': 1, 'cis': False, 'position': 'reference'} +# Regions of hv dependence +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.1, '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.1, 'iter': 1, 'cis': False, 'position': 'sample'} # list of region dictionaries to execute at each scan position