diff --git a/script/users/TUM/TUM_multi_XPS_201908.py b/script/users/TUM/TUM_multi_XPS_201908.py index b83b8971..dc2755be 100644 --- a/script/users/TUM/TUM_multi_XPS_201908.py +++ b/script/users/TUM/TUM_multi_XPS_201908.py @@ -17,22 +17,41 @@ MOTORS = [Eph] #REGION_1 = {'name': 'B1s', 'elo': 152., 'ehi': 160., 'estep': 0.05, 'epass': 10, 'tstep': 0.5, 'iter': 6, 'cis': True} #REGIONS_1 = [REGION_1] -POSITIONS_1 = [435] -REGION_1 = {'name': 'C1s', 'elo': 141., 'ehi': 151., 'estep': 0.05, 'epass': 10, 'tstep': 0.5, 'iter': 3, 'cis': True} +#POSITIONS_1 = [435] +#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 = [350] +REGION_1 = {'name': 'B1s', 'elo': 152., 'ehi': 160., 'estep': 0.05, 'epass': 10, 'tstep': 0.5, 'iter': 15 , 'cis': True} REGIONS_1 = [REGION_1] -POSITIONS_2 = [435] -REGION_2 = {'name': 'Ag3d', 'elo': 59., 'ehi': 66., 'estep': 0.05, 'epass': 10, 'tstep': 0.5, 'iter': 1, 'cis': True} +POSITIONS_2 = [350] +REGION_2 = {'name': 'Ag3d', 'elo': 260., 'ehi': 264., 'estep': 0.05, 'epass': 10, 'tstep': 0.5, 'iter': 1, 'cis': True} REGIONS_2 = [REGION_2] -#POSITIONS_4 = [550] -#REGION_4 = {'name': 'N1s', 'elo': 143., 'ehi': 149., 'estep': 0.05, 'epass': 10, 'tstep': 0.5, 'iter': 6, 'cis': True} -#REGIONS_4 = [REGION_4] - -POSITIONS_3 = [650] -REGION_3 = {'name': 'O1s', 'elo': 102., 'ehi': 120., 'estep': 0.05, 'epass': 10, 'tstep': 0.5, 'iter': 6, 'cis': True} +POSITIONS_3 = [350] +REGION_3 = {'name': 'Cl2p', 'elo': 141., 'ehi': 149., 'estep': 0.05, 'epass': 10, 'tstep': 0.5, 'iter': 10, 'cis': True} REGIONS_3 = [REGION_3] +POSITIONS_4 = [190] +REGION_4 = {'name': 'Br3d', 'elo': 113., 'ehi': 121., 'estep': 0.05, 'epass': 10, 'tstep': 0.5, 'iter': 10, 'cis': True} +REGIONS_4 = [REGION_4] + +POSITIONS_5 = [190] +REGION_5 = {'name': 'Au4f', 'elo': 100., 'ehi': 104., 'estep': 0.05, 'epass': 10, 'tstep': 0.5, 'iter': 1, 'cis': True} +REGIONS_5 = [REGION_5] + +POSITIONS_6 = [70] +REGION_6 = {'name': 'Valence', 'elo': 57., 'ehi': 66.5., 'estep': 0.05, 'epass': 10, 'tstep': 0.5, 'iter': 10, 'cis': True} +REGIONS_6 = [REGION_6] + +POSITIONS_7 = [550] +REGION_7 = {'name': 'N1s', 'elo': 143.5., 'ehi': 149., 'estep': 0.05, 'epass': 10, 'tstep': 0.5, 'iter': 15, 'cis': True} +REGIONS_7 = [REGION_7] + +POSITIONS_8 = [550] +REGION_8 = {'name': 'Au4f', 'elo': 460, 'ehi': 464., 'estep': 0.05, 'epass': 10, 'tstep': 0.5, 'iter': 15, 'cis': True} +REGIONS_8 = [REGION_8] CLOSE_SHUTTER_AT_END = True @@ -186,7 +205,7 @@ try: setup_live_plots(REGIONS_1) task = fork(update_live_plots) # theta (polar), phi (azimuth), x, y, z - sample_pos = [[-9.1,-90.0,0.45, -0.5, 115.1]] + sample_pos = [[-9.1,-90.0,-3.45, -0.5, 115.1]] for (index, nn) in enumerate(sample_pos): polar = nn[0]