From fe0a125a30fa3f5f554d74facef15856f7e059c6 Mon Sep 17 00:00:00 2001 From: gac-x03da Date: Wed, 3 Oct 2018 03:13:27 +0200 Subject: [PATCH] Script execution --- script/users/TUM_multi_XPS.py | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/script/users/TUM_multi_XPS.py b/script/users/TUM_multi_XPS.py index e88c6151..a4c6d6ff 100644 --- a/script/users/TUM_multi_XPS.py +++ b/script/users/TUM_multi_XPS.py @@ -12,7 +12,7 @@ MOTORS = [Eph] POSITIONS_1 = [550] #for nn in range(0): # POSITIONS_1.append(POSITIONS_1[-1]+4) -REGION_1 = {'name': 'N 1s', 'elo': 140., 'ehi': 153., 'estep': 0.05, 'epass': 50, 'tstep': 0.5, 'iter': 1, 'cis': True} +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] @@ -189,13 +189,13 @@ try: setup_live_plots(REGIONS_B) task = fork(update_live_plots) # theta (polar), phi (azimuth), x, y, z - #sample_pos = [#[-9.1,-105.0,0.5, 0.0, 115.0], - #[21.0,-105.0,0.8, 0.1, 115.0], - #[51.0,-105.0,0.45, 1.4, 115.0]] - #[21.0,-75.0, 0.8, 0.1, 115.0], - #[51.0,-75.0, 0.45, 1.4, 115.0], - #[-9.1,-75.0,0.5, 0.0, 115.0]] - sample_pos = [[-9.1,-90.0,0.5,-0.5,117.0]] + 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]] + #[-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: polar = nn[0] azimuth = nn[1] @@ -206,8 +206,8 @@ try: #ManipulatorPhi.move(nn[1]) #do_scan(MOTORS, POSITIONB, REGIONSB, LATENCY) #XPS before PhD - for bb in range(6): - do_scan(MOTORS, POSITIONS_1, REGIONS_1, LATENCY, nn) #PhD + #for bb in range(6): + do_scan(MOTORS, POSITIONS_1, REGIONS_1, LATENCY, nn) #PhD #do_scan(MOTORS, POSITIONS_1, REGIONS_1, LATENCY, nn) #PhD #do_scan(MOTORS, POSITIONS_3, REGIONS_3, LATENCY, nn) #PhD