diff --git a/script/users/TUM_multi_XPS.py b/script/users/TUM_multi_XPS.py index a4c6d6ff..29d7c6de 100644 --- a/script/users/TUM_multi_XPS.py +++ b/script/users/TUM_multi_XPS.py @@ -15,24 +15,52 @@ POSITIONS_1 = [550] REGION_1 = {'name': 'N 1s', 'elo': 140., 'ehi': 153., 'estep': 0.05, 'epass': 20, 'tstep': 0.5, 'iter': 1, 'cis': True} REGIONS_1 = [REGION_1] - -POSITIONS_2 = [435] +POSITIONS_2 = [550] #for nn in range(0): -# POSITIONS_2.append(POSITIONS_2[-1]+4) -REGION_2 = {'name': 'Cu 3p', 'elo': 349., 'ehi': 360., 'estep': 0.05, 'epass': 10, 'tstep': 0.5, 'iter': 1, 'cis': True} +# POSITIONS_1.append(POSITIONS_1[-1]+4) +REGION_2 = {'name': 'N 1s', 'elo': 140., 'ehi': 153., 'estep': 0.05, 'epass': 20, 'tstep': 0.5, 'iter': 5, 'cis': True} REGIONS_2 = [REGION_2] -POSITIONS_3 = [70] + +POSITIONS_3 = [550] #for nn in range(0): -# POSITIONS_3.append(POSITIONS_3[-1]+4) -REGION_3 = {'name': 'VB', 'elo': 55., 'ehi': 68., 'estep': 0.05, 'epass': 10, 'tstep': 0.5, 'iter': 10, 'cis': True} +# POSITIONS_1.append(POSITIONS_1[-1]+4) +REGION_3 = {'name': 'N 1s', 'elo': 140., 'ehi': 153., 'estep': 0.05, 'epass': 20, 'tstep': 0.5, 'iter': 5, 'cis': True} REGIONS_3 = [REGION_3] +POSITIONS_4 = [550] +#for nn in range(0): +# POSITIONS_3.append(POSITIONS_3[-1]+4) +REGION_4 = {'name': 'AG 3d', 'elo': 174., 'ehi': 181., 'estep': 0.05, 'epass': 20, 'tstep': 0.5, 'iter': 1, 'cis': True} +REGIONS_4 = [REGION_4] + +POSITIONS_5 = [435] +#for nn in range(0): +# POSITIONS_3.append(POSITIONS_3[-1]+4) +REGION_5 = {'name': 'ge 3d', 'elo': 398., 'ehi': 405., 'estep': 0.05, 'epass': 10, 'tstep': 0.5, 'iter': 6, 'cis': True} +REGIONS_5 = [REGION_5] + +POSITIONS_6 = [435] +#for nn in range(0): +# POSITIONS_3.append(POSITIONS_3[-1]+4) +REGION_6 = {'name': 'c 1s', 'elo': 142., 'ehi': 149., 'estep': 0.05, 'epass': 10, 'tstep': 0.5, 'iter': 3, 'cis': True} +REGIONS_6 = [REGION_6] +POSITIONS_7 = [435] +#for nn in range(0): +# POSITIONS_3.append(POSITIONS_3[-1]+4) +REGION_7 = {'name': 'ag 3d', 'elo': 53., 'ehi': 67., 'estep': 0.05, 'epass': 10, 'tstep': 0.5, 'iter': 1, 'cis': True} +REGIONS_7 = [REGION_7] +POSITIONS_8 = [70] +#for nn in range(0): +# POSITIONS_3.append(POSITIONS_3[-1]+4) +REGION_8 = {'name': 'vb', 'elo': 55., 'ehi': 68., 'estep': 0.05, 'epass': 10, 'tstep': 0.5, 'iter': 7, 'cis': True} +REGIONS_8 = [REGION_8] + # XSP check for beam damage POSITIONB = [550] REGION3 = {'name': 'N 1s peak', 'elo': 134., 'ehi': 154, 'estep': 0.05, 'epass': 50, 'tstep': 0.5, 'iter': 1, 'cis': True} @@ -189,11 +217,15 @@ try: setup_live_plots(REGIONS_B) task = fork(update_live_plots) # theta (polar), phi (azimuth), x, y, z - sample_pos = [[-9.1,-90.0,0.5, -0.4, 114.0], - [-9.1,-90.0,0.5, -0.2, 114.0], - [-9.1,-90.0,0.5, 0.0, 114.0], - [-9.1,-90.0,0.5, 0.2, 114.0], - [-9.1,-90.0,0.5, 0.4, 114.0]] + sample_pos = [[-9.1,-90.0,0.5, -0.4, 115.0], + [-9.1,-90.0,0.5, -0.2, 115.0], + [-9.1,-90.0,0.5, 0.4, 115.0], + [-9.1,-90.0,0.5, 0.4, 115.0], + [-9.1,-90.0,0.5, 0.4, 115.0], + [-9.1,-90.0,0.5, 0.4, 115.0], + [-9.1,-90.0,0.5, 0.4, 115.0], + [-9.1,-90.0,0.5, 0.4, 115.0], + [-9.1,-90.0,0.5, 0.4, 115.0]] #[-9.1,-90.0,0.5, 0.0, 114.0]] #sample_pos = [[-9.1,-90.0,0.5,-0.5,117.0]] for nn in sample_pos: