From bcfca3bf77c4c402058eefb8aa87f83bf4f1af29 Mon Sep 17 00:00:00 2001 From: gac-x03da Date: Sun, 25 Aug 2019 01:33:45 +0200 Subject: [PATCH] Script execution --- script/users/TUM/TUM_multi_XPS_201908.py | 40 +++++++++++++++--------- 1 file changed, 26 insertions(+), 14 deletions(-) diff --git a/script/users/TUM/TUM_multi_XPS_201908.py b/script/users/TUM/TUM_multi_XPS_201908.py index 0ece240a..dd321ed5 100644 --- a/script/users/TUM/TUM_multi_XPS_201908.py +++ b/script/users/TUM/TUM_multi_XPS_201908.py @@ -21,38 +21,50 @@ 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} +#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 = [550] +REGION_1 = {'name': 'N1s', 'elo': 143., 'ehi': 148., 'estep': 0.05, 'epass': 10, 'tstep': 0.5, 'iter': 15, '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} +REGION_2 = {'name': 'Ag3d', 'elo': 174, 'ehi': 180., 'estep': 0.05, 'epass': 10, 'tstep': 0.5, 'iter': 1, 'cis': True} REGIONS_2 = [REGION_2] -POSITIONS_3 = [550] -REGION_3 = {'name': 'Ag3d', 'elo': 174, 'ehi': 180., 'estep': 0.05, 'epass': 10, 'tstep': 0.5, 'iter': 1, 'cis': True} +POSITIONS_3 = [435] +REGION_3 = {'name': 'C1s', 'elo': 142., 'ehi': 149., 'estep': 0.05, 'epass': 10, 'tstep': 0.5, 'iter': 10, '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} +REGION_4 = {'name': 'Ag3d', 'elo': 59, 'ehi': 66., 'estep': 0.05, 'epass': 10, 'tstep': 0.5, 'iter': 1, 'cis': True} REGIONS_4 = [REGION_4] -POSITIONS_5 = [435] -REGION_5 = {'name': 'Ag3d', 'elo': 59, 'ehi': 66., 'estep': 0.05, 'epass': 10, 'tstep': 0.5, 'iter': 1, 'cis': True} +POSITIONS_5 = [350] +REGION_5 = {'name': 'B1s', 'elo': 152., 'ehi': 159., 'estep': 0.05, 'epass': 10, 'tstep': 0.5, 'iter': 15, '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} +REGION_6 = {'name': 'Cl2p', 'elo': 141., 'ehi': 149., 'estep': 0.05, 'epass': 10, 'tstep': 0.5, 'iter': 15, 'cis': True} REGIONS_6 = [REGION_6] 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 = [70] -REGION_8 = {'name': 'Valence', 'elo': 55., 'ehi': 68., 'estep': 0.05, 'epass': 10, 'tstep': 0.5, 'iter': 10, 'cis': True} +POSITIONS_8 = [190] +REGION_8 = {'name': 'Br3d', 'elo': 113., 'ehi': 121., 'estep': 0.05, 'epass': 10, 'tstep': 0.5, 'iter': 15, 'cis': True} REGIONS_8 = [REGION_8] +POSITIONS_9 = [190] +REGION_9 = {'name': 'Ag4s', 'elo': 113., 'ehi': 121., 'estep': 0.05, 'epass': 10, 'tstep': 0.5, 'iter': 10, 'cis': True} +REGIONS_9 = [REGION_99] + +POSITIONS_10 = [70] +REGION_10 = {'name': 'Valence', 'elo': 55., 'ehi': 67., 'estep': 0.05, 'epass': 10, 'tstep': 0.5, 'iter': 10, 'cis': True} +REGIONS_10 = [REGION_10] + @@ -209,7 +221,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, 0.45, -0.5, 115.1]] + sample_pos = [[-9.1,-90.0, -2.6, -0.5, 115.1]] for (index, nn) in enumerate(sample_pos): polar = nn[0] @@ -230,8 +242,8 @@ try: 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_9, REGIONS_9, LATENCY, nn) + do_scan(MOTORS, POSITIONS_10, REGIONS_10, LATENCY, nn) #do_scan(MOTORS, POSITIONS_11, REGIONS_11, LATENCY, nn)