diff --git a/script/users/DAD_PhD.py b/script/users/DAD_PhD.py index 90d543f6..460c51f1 100644 --- a/script/users/DAD_PhD.py +++ b/script/users/DAD_PhD.py @@ -4,14 +4,34 @@ Arguments: """ MOTORS = [Eph] -POSITIONS = [540] +POSITIONS_N = [540] for nn in range(52): - POSITIONS.append(POSITIONS[-1]+4) + POSITIONS_N.append(POSITIONS_N[-1]+4) + + +POSITIONS_C = [355] +for nn in range(64): + POSITIONS_C.append(POSITIONS_C[-1]+4) + +POSITIONS_O = [600] +for nn in range(64): + POSITIONS_O.append(POSITIONS_O[-1]+4) + LATENCY = 0.0 -REGION1 = {'name': 'N 1s peak', 'elo': 129., 'ehi': 138.5, 'estep': 0.15, 'epass': 100, 'tstep': 1.5, 'iter': 1, 'cis': True} -REGION2 = {'name': 'N 1s tail', 'elo': 138.5, 'ehi': 148.0, 'estep': 0.5, 'epass': 100, 'tstep': 1.5, 'iter': 1, 'cis': True} -REGIONS = [REGION1, REGION2] +REGION_N1 = {'name': 'N 1s peak', 'elo': 129., 'ehi': 138.5, 'estep': 0.15, 'epass': 100, 'tstep': 1.5, 'iter': 1, 'cis': True} +REGION_N2 = {'name': 'N 1s tail', 'elo': 138.5, 'ehi': 148.0, 'estep': 0.5, 'epass': 100, 'tstep': 1.5, 'iter': 1, 'cis': True} +REGIONS_N = [REGION_N1, REGION_N2] + +REGION_C1 = {'name': 'C 1s lower tail', 'elo': 50, 'ehi': 58, 'estep': 0.5, 'epass': 50, 'tstep': 1.5, 'iter': 1, 'cis': True} +REGION_C2 = {'name': 'C 1s peak', 'elo': 58, 'ehi': 68.5, 'estep': 0.15, 'epass': 50, 'tstep': 1.5, 'iter': 1, 'cis': True} +REGION_C3 = {'name': 'C 1s upper tail', 'elo': 68.5, 'ehi': 78.5, 'estep': 0.5, 'epass': 50, 'tstep': 1.5, 'iter': 1, 'cis': True} +REGIONS_C = [REGION_C1, REGION_C2, REGION_C3] + +REGION_O1 = {'name': 'O 1s lower tail', 'elo': 50, 'ehi': 60, 'estep': 0.5, 'epass': 50, 'tstep': 1.5, 'iter': 1, 'cis': True} +REGION_O2 = {'name': 'O 1s peak', 'elo': 60, 'ehi': 67, 'estep': 0.15, 'epass': 50, 'tstep': 1.5, 'iter': 1, 'cis': True} +REGION_O3 = {'name': 'O 1s upper tail', 'elo': 67, 'ehi': 77, 'estep': 0.5, 'epass': 50, 'tstep': 1.5, 'iter': 1, 'cis': True} +REGIONS_O = [REGION_O1, REGION_O2, REGION_O3] POSITIONB = [550] REGION3 = {'name': 'N 1s peak', 'elo': 134., 'ehi': 154, 'estep': 0.05, 'epass': 50, 'tstep': 0.5, 'iter': 1, 'cis': True} @@ -170,21 +190,32 @@ try: # [11.2,-3.75,0.2,113.], # [1.2,-3.65,0.2,112.], # [-8.8,-3.6,0.2,111.]] - sample_pos = [ [51.2,-0.90,-2.2,112.1], - [41.2,-2.00,-2.2,113.1], - [31.2,-2.70,-2.2,114.1], - [21.2,-2.90,-2.2,115.1], - [11.2,-3.10,-2.2,116.1], - [1.2 ,-3.30,-2.2,117.1], - [-8.8,-3.60,-2.2,118.1]] - for nn in sample_pos: - ManipulatorX.move(nn[1]) - ManipulatorY.move(nn[2]) - ManipulatorZ.move(nn[3]) - ManipulatorTheta.move(nn[0]) - do_scan(MOTORS, POSITIONB, REGIONSB, LATENCY) #XPS before PhD - do_scan(MOTORS, POSITIONS, REGIONS, LATENCY) #PhD - do_scan(MOTORS, POSITIONB, REGIONSB, LATENCY) #XPS after PhD +# sample_pos = [ [51.2,-0.90,-2.2,112.1], +# [41.2,-2.00,-2.2,113.1], +# [31.2,-2.70,-2.2,114.1], +# [21.2,-2.90,-2.2,115.1], +# [11.2,-3.10,-2.2,116.1], +# [1.2 ,-3.30,-2.2,117.1], +# [-8.8,-3.60,-2.2,118.1]] +# for nn in sample_pos: + sample_pos = [[-8.8,-3.6,1.00,-118.1], + [-8.8,-3.6,1.00,-117.1]] + nn = sample_pos[0] + ManipulatorX.move(nn[1]) + ManipulatorY.move(nn[2]) + ManipulatorZ.move(nn[3]) + ManipulatorTheta.move(nn[0]) + do_scan(MOTORS, POSITIONB, REGIONSB, LATENCY) #XPS before PhD + do_scan(MOTORS, POSITIONS_C, REGIONS_C, LATENCY) #PhD + do_scan(MOTORS, POSITIONB, REGIONSB, LATENCY) #XPS after PhD + nn = sample_pos[1] + ManipulatorX.move(nn[1]) + ManipulatorY.move(nn[2]) + ManipulatorZ.move(nn[3]) + ManipulatorTheta.move(nn[0]) + do_scan(MOTORS, POSITIONB, REGIONSB, LATENCY) #XPS before PhD + do_scan(MOTORS, POSITIONS_O, REGIONS_O, LATENCY) #PhD + do_scan(MOTORS, POSITIONB, REGIONSB, LATENCY) #XPS after PhD finally: if CLOSE_SHUTTER_AT_END: after_scan()