From 9acade192c117aee09ff14c968668981050b29aa Mon Sep 17 00:00:00 2001 From: gac-x03da Date: Sat, 24 Aug 2019 10:44:56 +0200 Subject: [PATCH] Script execution --- script/users/TUM/TUM_multi_XPS_201908.py | 63 ++++++++++++++++-------- 1 file changed, 42 insertions(+), 21 deletions(-) diff --git a/script/users/TUM/TUM_multi_XPS_201908.py b/script/users/TUM/TUM_multi_XPS_201908.py index 9138c3ec..a6fa9bdb 100644 --- a/script/users/TUM/TUM_multi_XPS_201908.py +++ b/script/users/TUM/TUM_multi_XPS_201908.py @@ -21,38 +21,53 @@ 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 = [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_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 = [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_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 = [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_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_4 = [190] -REGION_4 = {'name': 'Br3d', 'elo': 113., 'ehi': 121., 'estep': 0.05, 'epass': 10, 'tstep': 0.5, 'iter': 10, 'cis': True} +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 = [190] -REGION_5 = {'name': 'Au4f', 'elo': 100., 'ehi': 104., 'estep': 0.05, 'epass': 10, 'tstep': 0.5, 'iter': 1, 'cis': True} +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_6 = [70] -REGION_6 = {'name': 'Valence', 'elo': 57., 'ehi': 67., 'estep': 0.05, 'epass': 10, 'tstep': 0.5, 'iter': 10, 'cis': True} +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 = [550] -REGION_7 = {'name': 'N1s', 'elo': 143., 'ehi': 149., 'estep': 0.05, 'epass': 10, 'tstep': 0.5, 'iter': 15, 'cis': True} +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_8 = [550] -REGION_8 = {'name': 'Au4f', 'elo': 460, 'ehi': 464., 'estep': 0.05, 'epass': 10, 'tstep': 0.5, 'iter': 1, 'cis': True} +POSITIONS_8 = [350] +REGION_8 = {'name': 'Cl2p', 'elo': 141., 'ehi': 149., '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': 10, '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] + + + + CLOSE_SHUTTER_AT_END = True Scienta.setAcquisitionMode(ch.psi.pshell.epics.Scienta.AcquisitionMode.Swept) @@ -221,8 +236,14 @@ try: 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_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)