diff --git a/script/users/TUM/TUM_multi_XPS_201908.py b/script/users/TUM/TUM_multi_XPS_201908.py index 098dbeb6..a04e9976 100644 --- a/script/users/TUM/TUM_multi_XPS_201908.py +++ b/script/users/TUM/TUM_multi_XPS_201908.py @@ -5,38 +5,46 @@ Arguments: LATENCY = 0.0 MOTORS = [Eph] -#POSITIONS_1 = [190] -#REGION_1 = {'name': 'Br3d', 'elo': 113., 'ehi': 121., 'estep': 0.05, 'epass': 10, 'tstep': 0.5, 'iter': 15, 'cis': True} -#REGIONS_1 = [REGION_1] +POSITIONS_1 = [190] +REGION_1 = {'name': 'Br3d', 'elo': 113., 'ehi': 119., 'estep': 0.05, 'epass': 10, 'tstep': 0.5, 'iter': 15, 'cis': True} +REGIONS_1 = [REGION_1] -#POSITIONS_2 = [350] -#REGION_2 = {'name': 'Cl2p', 'elo': 141., 'ehi': 149., 'estep': 0.05, 'epass': 10, 'tstep': 0.5, 'iter': 15, 'cis': True} -#REGIONS_2 = [REGION_2] +POSITIONS_2 = [190] +REGION_2 = {'name': 'FE', 'elo': 184, 'ehi': 187., 'estep': 0.05, 'epass': 10, 'tstep': 0.5, 'iter': 20, 'cis': True} +REGIONS_2 = [REGION_2] -#POSITIONS_3 = [350] -#REGION_3 = {'name': 'B1s', 'elo': 152., 'ehi': 159., 'estep': 0.05, 'epass': 10, 'tstep': 0.5, 'iter': 10, 'cis': True} -#REGIONS_3 = [REGION_3] - -POSITIONS_3 = [435] -REGION_3 = {'name': 'Ag3d', 'elo': 59., 'ehi': 66., 'estep': 0.05, 'epass': 10, 'tstep': 0.5, 'iter': 1, 'cis': True} +POSITIONS_3 = [350] +REGION_3 = {'name': 'Cl2p', 'elo': 142., 'ehi': 148., 'estep': 0.05, 'epass': 10, 'tstep': 0.5, 'iter': 15, '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} +POSITIONS_4 = [350] +REGION_4 = {'name': 'B1s', 'elo': 153., 'ehi': 158., 'estep': 0.05, 'epass': 10, 'tstep': 0.5, 'iter': 10, 'cis': True} REGIONS_4 = [REGION_4] -POSITIONS_5 = [550] -REGION_5 = {'name': 'N1s', 'elo': 143., 'ehi': 149., 'estep': 0.05, 'epass': 10, 'tstep': 0.5, 'iter': 10, 'cis': True} +POSITIONS_5 = [350] +REGION_5 = {'name': 'FE', 'elo': 344, 'ehi': 347., 'estep': 0.05, 'epass': 10, 'tstep': 0.5, 'iter': 20, 'cis': True} REGIONS_5 = [REGION_5] -POSITIONS_6 = [550] -REGION_6 = {'name': 'Ag3d', 'elo': 174, 'ehi': 180., 'estep': 0.05, 'epass': 10, 'tstep': 0.5, 'iter': 1, 'cis': True} +POSITIONS_6 = [435] +REGION_6 = {'name': 'Ag3d', 'elo': 59., 'ehi': 66., 'estep': 0.05, 'epass': 10, 'tstep': 0.5, 'iter': 1, 'cis': True} REGIONS_6 = [REGION_6] -POSITIONS_7 = [70] -REGION_7 = {'name': 'Valence', 'elo': 55., 'ehi': 67., 'estep': 0.05, 'epass': 10, 'tstep': 0.5, 'iter': 10, 'cis': True} +POSITIONS_7 = [435] +REGION_7 = {'name': 'C1s', 'elo': 141., 'ehi': 151., 'estep': 0.05, 'epass': 10, 'tstep': 0.5, 'iter': 15, 'cis': True} REGIONS_7 = [REGION_7] +POSITIONS_8 = [550] +REGION_8 = {'name': 'N1s', 'elo': 143., 'ehi': 149., 'estep': 0.05, 'epass': 10, 'tstep': 0.5, 'iter': 10, 'cis': True} +REGIONS_8 = [REGION_8] + +POSITIONS_9 = [550] +REGION_9 = {'name': 'Ag3d', 'elo': 174, 'ehi': 180., 'estep': 0.05, 'epass': 10, 'tstep': 0.5, 'iter': 1, 'cis': True} +REGIONS_9 = [REGION_9] + +#POSITIONS_7 = [70] +#REGION_7 = {'name': 'Valence', 'elo': 55., 'ehi': 67., 'estep': 0.05, 'epass': 10, 'tstep': 0.5, 'iter': 10, 'cis': True} +#REGIONS_7 = [REGION_7] + #POSITIONS_4 = [435] #REGION_4 = {'name': 'Ag3d', 'elo': 59, 'ehi': 66., 'estep': 0.05, 'epass': 10, 'tstep': 0.5, 'iter': 1, 'cis': True} #REGIONS_4 = [REGION_4] @@ -206,7 +214,7 @@ try: 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, -2.6, 0.5, 115.1]] + sample_pos = [[-9.1,-90.0, -3.45, 0.0, 115.1]] for (index, nn) in enumerate(sample_pos): polar = nn[0] @@ -218,16 +226,16 @@ 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_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_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)