From 20ed72e4827174f4f1d84d0f9b60e20184aba01b Mon Sep 17 00:00:00 2001 From: gac-x03da Date: Fri, 5 Oct 2018 07:44:04 +0200 Subject: [PATCH] Script execution --- script/users/TUM_multi_XPS_Ge_Si_Cu.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/script/users/TUM_multi_XPS_Ge_Si_Cu.py b/script/users/TUM_multi_XPS_Ge_Si_Cu.py index 5c8f4aae..7941543f 100644 --- a/script/users/TUM_multi_XPS_Ge_Si_Cu.py +++ b/script/users/TUM_multi_XPS_Ge_Si_Cu.py @@ -10,7 +10,7 @@ REGION_1 = {'name': 'Ge 3d', 'elo': 398., 'ehi': 405., 'estep': 0.05, 'epass': 1 REGIONS_1 = [REGION_1] POSITIONS_2 = [435] -REGION_2 = {'name': 'Cu 3p', 'elo': 349., 'ehi': 360., 'estep': 0.05, 'epass': 10, 'tstep': 0.5, 'iter': 1, 'cis': True} +REGION_2 = {'name': 'Ag 3d', 'elo': 53., 'ehi': 67., 'estep': 0.05, 'epass': 10, 'tstep': 0.5, 'iter': 1, 'cis': True} REGIONS_2 = [REGION_2] POSITIONS_dummy = [300] @@ -26,7 +26,7 @@ REGION_4 = {'name': 'Si 2s', 'elo': 140., 'ehi': 150., 'estep': 0.05, 'epass': 1 REGIONS_4 = [REGION_4] POSITIONS_5 = [300] -REGION_5 = {'name': 'Cu 3p', 'elo': 210., 'ehi': 230., 'estep': 0.05, 'epass': 10, 'tstep': 0.5, 'iter': 8, 'cis': True} +REGION_5 = {'name': 'Ag 4s', 'elo': 198., 'ehi': 208., 'estep': 0.05, 'epass': 10, 'tstep': 0.5, 'iter': 3, 'cis': True} REGIONS_5 = [REGION_5] POSITIONS_6 = [300] @@ -196,7 +196,7 @@ def do_scan(motors, positions, regions, latency, sample_position): try: setup_live_plots(REGIONS_B) task = fork(update_live_plots) - # theta (polar), phi (azimuth), x, y, z + #theta (polar), phi (azimuth), x, y, z sample_pos = [[-9.1,-90.0,0.7, -0.4, 115.0], [-9.1,-90.0,0.6, -0.4, 116.0], [-9.1,-90.0,0.5, -0.5, 116.0], @@ -225,7 +225,7 @@ try: 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_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)