diff --git a/script/users/TUM_multi_XPS_2019.py b/script/users/TUM_multi_XPS_2019.py index f5b714da..3477bd48 100644 --- a/script/users/TUM_multi_XPS_2019.py +++ b/script/users/TUM_multi_XPS_2019.py @@ -13,12 +13,12 @@ MOTORS = [Eph] #REGION_dummy = {'name': 'dummy', 'elo': 398., 'ehi': 405., 'estep': 1, 'epass': 10, 'tstep': 0.5, 'iter': 1, 'cis': True} #REGIONS_dummy = [REGION_dummy] -POSITIONS_1 = [435] +POSITIONS_1 = [710] REGION_1 = {'name': 'Ag3d5/2', 'elo': 60., 'ehi': 64., 'estep': 0.075, 'epass': 10, 'tstep': 0.5, 'iter': 1, 'cis': True} REGIONS_1 = [REGION_1] -POSITIONS_2 = [435] -REGION_2 = {'name': 'Ge', 'elo': 60., 'ehi': 64., 'estep': 0.075, 'epass': 50, 'tstep': 0.5, 'iter': 1, 'cis': True} +POSITIONS_2 = [705] +REGION_2 = {'name': 'Ge', 'elo': 20., 'ehi': 24., 'estep': 0.075, 'epass': 50, 'tstep': 0.5, 'iter': 1, 'cis': True} REGIONS_2 = [REGION_2] POSITIONS_3 = [429] @@ -177,9 +177,8 @@ try: setup_live_plots(REGIONS_1) task = fork(update_live_plots) # theta (polar), phi (azimuth), x, y, z - sample_pos = [[-9.1,-90.0,0.65, -0.25, 115.0], - [-9.1,-90.0,-0.6, -0.5, 114.8], - #[-9.1,-90.0,-0.6, -0.5, 114.8], + sample_pos = [[-9.1,-90.0,-0.6, -0.5, 114.8], + [50.9,-90.0,-0.6, -0.5, 114.2], [-9.1,-90.0,-0.6, -0.5, 114.8]] for (index, nn) in enumerate(sample_pos): @@ -194,9 +193,10 @@ try: if index == 0: #do_scan(MOTORS, POSITIONS_QUICK, REGIONS_QUICK, LATENCY, nn) do_scan(MOTORS, POSITIONS_1, REGIONS_1, LATENCY, nn) + + elif index == 1: do_scan(MOTORS, POSITIONS_2, REGIONS_2, LATENCY, nn) do_scan(MOTORS, POSITIONS_3, REGIONS_3, LATENCY, nn) - #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)