diff --git a/script/users/Niels/MultiRegionScan2022.py b/script/users/Niels/MultiRegionScan2022.py index f3d1b1db..093d9098 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 = 3 +NUMBER_OF_CYCLES = 1 POSITIONS = [1., 10., NUMBER_OF_CYCLES] SCAN = 'lscan' @@ -48,13 +48,13 @@ LATENCY = 0.0 # 'slit': exit slit (default: unchanged) # 'position': 'reference' or 'sample' -REFERENCE_POSITION = {'X': -2.5 ,'Y': 0., 'Z': 118., 'Theta': -6.2, 'Tilt': -2.0, 'Phi': 0.} -SAMPLE_POSITION = {'X': -2.5 ,'Y': 0.1, 'Z': 115., 'Theta': -6.2, 'Tilt': -2.0, 'Phi': 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': 80.00, 'ehi':92.00, 'estep': 0.02, 'epass': 10., 'tstep': 0.1, 'iter': 1, 'cis': False, 'position': 'reference'} -REGION2 = {'name': 'In4d','ephot': 578., 'elo': 15.00, 'ehi':22.0, 'estep':0.02, 'epass': 10., 'tstep': 0.1, 'iter': 1, 'cis': False, 'position': 'sample'} -REGION3 = {'name': 'As3d','ephot': 578., 'elo': 39.00, 'ehi':45.00, 'estep':0.02, 'epass': 10., 'tstep': 0.1, 'iter': 1, 'cis': False, 'position': 'sample'} -REGION4 = {'name': 'In3d','ephot': 578., 'elo': 450., 'ehi':455.0, 'estep':0.02, 'epass': 10., 'tstep': 0.1, 'iter': 1, 'cis': False, 'position': 'sample'} +REGION1 = {'name': 'Au4f', 'ephot': 578., 'elo': 80.00, 'ehi':92.00, 'estep': 0.02, 'epass': 50., 'tstep': 0.5, 'iter': 1, 'cis': False, 'position': 'reference'} +REGION2 = {'name': 'In4d','ephot': 578., 'elo': 15.00, 'ehi':22.0, 'estep':0.02, 'epass': 50., 'tstep': 0.4, 'iter': 1, 'cis': False, 'position': 'sample'} +REGION3 = {'name': 'As3d','ephot': 578., 'elo': 39.00, 'ehi':45.00, 'estep':0.02, 'epass': 50., 'tstep': 0.4, 'iter': 1, 'cis': False, 'position': 'sample'} +REGION4 = {'name': 'In3d','ephot': 578., 'elo': 450., 'ehi':455.0, 'estep':0.02, 'epass': 50., 'tstep': 0.4, 'iter': 1, 'cis': False, 'position': 'sample'} # list of region dictionaries to execute at each scan position REGIONS = [REGION1, REGION2, REGION3, REGION4]