diff --git a/script/users/Niels/MultiRegionScan2022.py b/script/users/Niels/MultiRegionScan2022.py index 3ff607da..ede7bc85 100644 --- a/script/users/Niels/MultiRegionScan2022.py +++ b/script/users/Niels/MultiRegionScan2022.py @@ -21,7 +21,7 @@ MOTORS = [dummy] # number of cycles (integer - not decimal point!) # (actual number of cycles is + 1) -NUMBER_OF_CYCLES = 17 +NUMBER_OF_CYCLES = 20 POSITIONS = [1., 10., NUMBER_OF_CYCLES] SCAN = 'lscan' @@ -51,10 +51,16 @@ LATENCY = 0.0 REFERENCE_POSITION = {'X': -0.65 ,'Y': 0., 'Z': 117.7, 'Theta': -9., 'Tilt': -2.0, 'Phi': -90.} SAMPLE_POSITION = {'X': -1.32 ,'Y': 0., 'Z': 114., 'Theta': -9., 'Tilt': -2.0, 'Phi': -90.} -REGION1 = {'name': 'Au4f', 'ephot': 578., 'elo': 482, 'ehi':491.5, 'estep': 0.02, 'epass': 50., 'tstep': 0.4, 'iter': 1, 'cis': False, 'position': 'reference'} -REGION2 = {'name': 'In4d','ephot': 578., 'elo': 552.5, 'ehi':559., 'estep':0.02, 'epass': 50., 'tstep': 0.2, 'iter': 1, 'cis': False, 'position': 'sample'} -REGION3 = {'name': 'As3d','ephot': 578., 'elo': 529., 'ehi':534.5, 'estep':0.02, 'epass': 50., 'tstep': 0.2, 'iter': 1, 'cis': False, 'position': 'sample'} -REGION4 = {'name': 'In3d','ephot': 578., 'elo': 119., 'ehi':124., 'estep':0.02, 'epass': 50., 'tstep': 0.2, 'iter': 1, 'cis': False, 'position': 'sample'} +# REGION1 = {'name': 'Au4f', 'ephot': 578., 'elo': 482, 'ehi':491.5, 'estep': 0.02, 'epass': 50., 'tstep': 0.4, 'iter': 1, 'cis': False, 'position': 'reference'} +# REGION2 = {'name': 'In4d','ephot': 578., 'elo': 552.5, 'ehi':559., 'estep':0.02, 'epass': 50., 'tstep': 0.2, 'iter': 1, 'cis': False, 'position': 'sample'} +# REGION3 = {'name': 'As3d','ephot': 578., 'elo': 529., 'ehi':534.5, 'estep':0.02, 'epass': 50., 'tstep': 0.2, 'iter': 1, 'cis': False, 'position': 'sample'} +# REGION4 = {'name': 'In3d','ephot': 578., 'elo': 119., 'ehi':124., 'estep':0.02, 'epass': 50., 'tstep': 0.2, 'iter': 1, 'cis': False, 'position': 'sample'} + +REGION1 = {'name': 'Au4f', 'ephot': 1050., 'elo': 954., 'ehi':963.5, 'estep': 0.02, 'epass': 50., 'tstep': 0.4, 'iter': 1, 'cis': False, 'position': 'reference'} +REGION2 = {'name': 'In4d','ephot': 1050., 'elo': 1024.5, 'ehi':1031., 'estep':0.02, 'epass': 50., 'tstep': 0.2, 'iter': 1, 'cis': False, 'position': 'sample'} +REGION3 = {'name': 'As3d','ephot': 1050., 'elo': 1001., 'ehi':1006.5, 'estep':0.02, 'epass': 50., 'tstep': 0.2, 'iter': 1, 'cis': False, 'position': 'sample'} +REGION4 = {'name': 'In3d','ephot': 1050., 'elo': 591., 'ehi':596., '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]