diff --git a/script/users/TUM/TUM_multi_XPS_201908.py b/script/users/TUM/TUM_multi_XPS_201908.py index 643d1040..ecf3f8d1 100644 --- a/script/users/TUM/TUM_multi_XPS_201908.py +++ b/script/users/TUM/TUM_multi_XPS_201908.py @@ -21,50 +21,38 @@ MOTORS = [Eph] #REGION_1 = {'name': 'C1s', 'elo': 141., 'ehi': 151., 'estep': 0.05, 'epass': 10, 'tstep': 0.5, 'iter': 3, 'cis': True} #REGIONS_1 = [REGION_1] -#POSITIONS_1 = [850] -#REGION_1 = {'name': 'Survey', 'elo': 100., 'ehi': 850., 'estep': 0.5, 'epass': 50, 'tstep': 0.5, 'iter': 1, 'cis': True} -#REGIONS_1 = [REGION_1] +POSITIONS_1 = [850] +REGION_1 = {'name': 'Survey', 'elo': 100., 'ehi': 850., 'estep': 0.5, 'epass': 50, 'tstep': 0.5, 'iter': 1, 'cis': True} +REGIONS_1 = [REGION_1] -#POSITIONS_2 = [550] -#REGION_2 = {'name': 'N1s', 'elo': 143., 'ehi': 149., 'estep': 0.05, 'epass': 10, 'tstep': 0.5, 'iter': 15, 'cis': True} -#REGIONS_2 = [REGION_2] +POSITIONS_2 = [550] +REGION_2 = {'name': 'N1s', 'elo': 143., 'ehi': 149., 'estep': 0.05, 'epass': 10, 'tstep': 0.5, 'iter': 15, 'cis': True} +REGIONS_2 = [REGION_2] -#POSITIONS_3 = [550] -#REGION_3 = {'name': 'Au4f', 'elo': 460, 'ehi': 464., 'estep': 0.05, 'epass': 10, 'tstep': 0.5, 'iter': 1, 'cis': True} -#REGIONS_3 = [REGION_3] +POSITIONS_3 = [550] +REGION_3 = {'name': 'Ag3d', 'elo': 174, 'ehi': 180., 'estep': 0.05, 'epass': 10, 'tstep': 0.5, 'iter': 1, 'cis': True} +REGIONS_3 = [REGION_3] -#POSITIONS_4 = [435] -#REGION_4 = {'name': 'C1s', 'elo': 141., 'ehi': 151., 'estep': 0.05, 'epass': 10, 'tstep': 0.5, 'iter': 10, 'cis': True} -#REGIONS_4 = [REGION_4] +POSITIONS_4 = [435] +REGION_4 = {'name': 'C1s', 'elo': 141., 'ehi': 151., 'estep': 0.05, 'epass': 10, 'tstep': 0.5, 'iter': 10, 'cis': True} +REGIONS_4 = [REGION_4] -#POSITIONS_5 = [435] -#REGION_5 = {'name': 'Au4f', 'elo': 345, 'ehi': 349., 'estep': 0.05, 'epass': 10, 'tstep': 0.5, 'iter': 1, 'cis': True} -#REGIONS_5 = [REGION_5] +POSITIONS_5 = [435] +REGION_5 = {'name': 'Ag3d', 'elo': 59, 'ehi': 66., 'estep': 0.05, 'epass': 10, 'tstep': 0.5, 'iter': 1, 'cis': True} +REGIONS_5 = [REGION_5] -#POSITIONS_6 = [350] -#REGION_6 = {'name': 'B1s', 'elo': 152., 'ehi': 160., 'estep': 0.05, 'epass': 10, 'tstep': 0.5, 'iter': 15 , 'cis': True} -#REGIONS_6 = [REGION_6] +POSITIONS_6 = [350] +REGION_6 = {'name': 'B1s', 'elo': 152., 'ehi': 160., 'estep': 0.05, 'epass': 10, 'tstep': 0.5, 'iter': 15 , 'cis': True} +REGIONS_6 = [REGION_6] -#POSITIONS_7 = [350] -#REGION_7 = {'name': 'Ag3d', 'elo': 260., 'ehi': 264., 'estep': 0.05, 'epass': 10, 'tstep': 0.5, 'iter': 1, 'cis': True} -#REGIONS_7 = [REGION_7] +POSITIONS_7 = [350] +REGION_7 = {'name': 'Ag4s', 'elo': 243., 'ehi': 253., 'estep': 0.05, 'epass': 10, 'tstep': 0.5, 'iter': 10, 'cis': True} +REGIONS_7 = [REGION_7] -POSITIONS_8 = [350] -REGION_8 = {'name': 'Cl2p', 'elo': 141., 'ehi': 149., 'estep': 0.05, 'epass': 10, 'tstep': 0.5, 'iter': 3, 'cis': True} +POSITIONS_8 = [70] +REGION_8 = {'name': 'Valence', 'elo': 55., 'ehi': 68., 'estep': 0.05, 'epass': 10, 'tstep': 0.5, 'iter': 10, 'cis': True} REGIONS_8 = [REGION_8] -POSITIONS_9 = [190] -REGION_9 = {'name': 'Br3d', 'elo': 113., 'ehi': 121., 'estep': 0.05, 'epass': 10, 'tstep': 0.5, 'iter': 3, 'cis': True} -REGIONS_9 = [REGION_9] - -POSITIONS_10 = [190] -REGION_10 = {'name': 'Au4f', 'elo': 100., 'ehi': 104., 'estep': 0.05, 'epass': 10, 'tstep': 0.5, 'iter': 1, 'cis': True} -REGIONS_10 = [REGION_10] - -POSITIONS_11 = [70] -REGION_11 = {'name': 'Valence', 'elo': 55., 'ehi': 68., 'estep': 0.05, 'epass': 10, 'tstep': 0.5, 'iter': 10, 'cis': True} -REGIONS_11 = [REGION_11] - @@ -220,7 +208,8 @@ try: setup_live_plots(REGIONS_1) task = fork(update_live_plots) # theta (polar), phi (azimuth), x, y, z - sample_pos = [[-9.1,-90.0,-3.45, -0.5, 115.1]] + #sample_pos = [[-9.1,-90.0,-3.45, -0.5, 115.1]] + sample_pos = [[-9.1,-90.0,0.45, -0.5, 115.1]] for (index, nn) in enumerate(sample_pos): polar = nn[0] @@ -232,18 +221,18 @@ try: #ManipulatorPhi.move(nn[1]) if index == 0: - #do_scan(MOTORS, POSITIONS_QUICK, REGIONS_QUICK, LATENCY, nn) - #do_scan(MOTORS, POSITIONS_1, REGIONS_1, LATENCY, nn) - #do_scan(MOTORS, POSITIONS_2, REGIONS_2, LATENCY, nn) - #do_scan(MOTORS, POSITIONS_3, REGIONS_3, LATENCY, nn) - #do_scan(MOTORS, POSITIONS_4, REGIONS_4, LATENCY, nn) - #do_scan(MOTORS, POSITIONS_5, REGIONS_5, LATENCY, nn) - #do_scan(MOTORS, POSITIONS_6, REGIONS_6, LATENCY, nn) - #do_scan(MOTORS, POSITIONS_7, REGIONS_7, LATENCY, nn) + do_scan(MOTORS, POSITIONS_QUICK, REGIONS_QUICK, LATENCY, nn) + do_scan(MOTORS, POSITIONS_1, REGIONS_1, LATENCY, nn) + do_scan(MOTORS, POSITIONS_2, REGIONS_2, LATENCY, nn) + do_scan(MOTORS, POSITIONS_3, REGIONS_3, LATENCY, nn) + do_scan(MOTORS, POSITIONS_4, REGIONS_4, LATENCY, nn) + do_scan(MOTORS, POSITIONS_5, REGIONS_5, LATENCY, nn) + do_scan(MOTORS, POSITIONS_6, REGIONS_6, LATENCY, nn) + do_scan(MOTORS, POSITIONS_7, REGIONS_7, LATENCY, nn) do_scan(MOTORS, POSITIONS_8, REGIONS_8, LATENCY, nn) - do_scan(MOTORS, POSITIONS_9, REGIONS_9, LATENCY, nn) - do_scan(MOTORS, POSITIONS_10, REGIONS_10, LATENCY, nn) - do_scan(MOTORS, POSITIONS_11, REGIONS_11, LATENCY, nn) + #do_scan(MOTORS, POSITIONS_9, REGIONS_9, LATENCY, nn) + #do_scan(MOTORS, POSITIONS_10, REGIONS_10, LATENCY, nn) + #do_scan(MOTORS, POSITIONS_11, REGIONS_11, LATENCY, nn)