diff --git a/script/users/TUM_multi_XPS.py b/script/users/TUM_multi_XPS.py index 396c188f..056916a3 100644 --- a/script/users/TUM_multi_XPS.py +++ b/script/users/TUM_multi_XPS.py @@ -9,9 +9,13 @@ MOTORS = [Eph] #262eV : KE = 70eV for B 1s #200eV : KE = 70eV for Ge 3p -#POSITIONS_QUICK = [435] -#REGION_QUICK = {'name': 'QUICK', 'elo': 398., 'ehi': 405., 'estep': 0.05, 'epass': 10, 'tstep': 0.5, 'iter': 1, 'cis': True} -#REGIONS_QUICK = [REGION_QUICK] +POSITIONS_dummy = [300] +REGION_dummy = {'name': 'dummy', 'elo': 398., 'ehi': 405., 'estep': 1, 'epass': 10, 'tstep': 0.5, 'iter': 1, 'cis': True} +REGIONS_dummy = [REGION_dummy] + +POSITIONS_dummy2 = [650] +REGION_dummy2 = {'name': 'dummy', 'elo': 398., 'ehi': 405., 'estep': 1, 'epass': 10, 'tstep': 0.5, 'iter': 1, 'cis': True} +REGIONS_dummy2 = [REGION_dummy2] POSITIONS_1 = [435] REGION_1 = {'name': 'Ge 3d', 'elo': 398., 'ehi': 405., 'estep': 0.05, 'epass': 10, 'tstep': 0.5, 'iter': 10, 'cis': True} @@ -35,10 +39,18 @@ POSITIONS_5 = [300] REGION_5 = {'name': 'Cu 3p', 'elo': 210., 'ehi': 230., 'estep': 0.05, 'epass': 10, 'tstep': 0.5, 'iter': 8, 'cis': True} REGIONS_5 = [REGION_5] -POSITIONS_6 = [70] -REGION_6 = {'name': 'VB', 'elo': 55., 'ehi': 68., 'estep': 0.05, 'epass': 10, 'tstep': 0.5, 'iter': 10, 'cis': True} +POSITIONS_6 = [300] +REGION_6 = {'name': 'Ge 3s', 'elo': 110., 'ehi': 119., 'estep': 0.05, 'epass': 10, 'tstep': 0.5, 'iter': 8, 'cis': True} REGIONS_6 = [REGION_6] +POSITIONS_7 = [70] +REGION_7 = {'name': 'VB', 'elo': 55., 'ehi': 68., 'estep': 0.05, 'epass': 10, 'tstep': 0.5, 'iter': 10, 'cis': True} +REGIONS_7 = [REGION_7] + +POSITIONS_8 = [650] +REGION_8 = {'name': 'O 1s', 'elo': 109., 'ehi': 119., 'estep': 0.05, 'epass': 10, 'tstep': 0.5, 'iter': 8, 'cis': True} +REGIONS_8 = [REGION_8] + CLOSE_SHUTTER_AT_END = True Scienta.setAcquisitionMode(ch.psi.pshell.epics.Scienta.AcquisitionMode.Swept) @@ -212,13 +224,17 @@ try: elif index == 1: #do_scan(MOTORS, POSITIONS_QUICK, REGIONS_QUICK, LATENCY, nn) + do_scan(MOTORS, POSITIONS_dummy, REGIONS_dummy, LATENCY, nn) do_scan(MOTORS, POSITIONS_3, REGIONS_3, LATENCY, nn) elif index == 2: - 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) elif index == 3: do_scan(MOTORS, POSITIONS_6, REGIONS_6, LATENCY, nn) + do_scan(MOTORS, POSITIONS_7, REGIONS_7, LATENCY, nn) + do_scan(MOTORS, POSITIONS_dummy2, REGIONS_dummy2, LATENCY, nn) + do_scan(MOTORS, POSITIONS_8, REGIONS_8, LATENCY, nn) finally: if CLOSE_SHUTTER_AT_END: