From dce93c086877464a49f168c8aca9d8437620686a Mon Sep 17 00:00:00 2001 From: gac-x03da Date: Mon, 25 Mar 2019 21:41:46 +0100 Subject: [PATCH] Script execution --- script/users/TUM_multi_XPS_2019.py | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/script/users/TUM_multi_XPS_2019.py b/script/users/TUM_multi_XPS_2019.py index 17cc8a68..9bd8b27c 100644 --- a/script/users/TUM_multi_XPS_2019.py +++ b/script/users/TUM_multi_XPS_2019.py @@ -13,15 +13,17 @@ 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 = [710] -REGION_1 = {'name': 'VB', 'elo': 121., 'ehi': 133., 'estep': 1, 'epass': 10, 'tstep': 0.5, 'iter': 1, 'cis': True} +POSITIONS_1 = [435] +REGION_1 = {'name': 'Ag3d5/2', 'elo': 60., 'ehi': 64., 'estep': 0.075, 'epass': 20, 'tstep': 0.5, 'iter': 1, 'cis': True} REGIONS_1 = [REGION_1] -POSITIONS_2 = [705] -REGION_2 = {'name': 'VB', 'elo': 55., 'ehi': 68., 'estep': 1, 'epass': 10, 'tstep': 0.5, 'iter': 1, 'cis': True} +POSITIONS_2 = [430] +REGION_2 = {'name': 'Ge', 'elo': 399., 'ehi': 403., 'estep': 0.075, 'epass': 20, 'tstep': 0.5, 'iter': 1, 'cis': True} REGIONS_2 = [REGION_2] - +POSITIONS_3 = [429] +REGION_3 = {'name': 'Ag', 'elo': 60., 'ehi': 64., 'estep': 0.075, 'epass':10, 'tstep': 0.5, 'iter': 2, 'cis': True} +REGIONS_3 = [REGION_3] CLOSE_SHUTTER_AT_END = True @@ -193,7 +195,7 @@ try: #do_scan(MOTORS, POSITIONS_QUICK, REGIONS_QUICK, LATENCY, nn) 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) #elif index == 1: #do_scan(MOTORS, POSITIONS_QUICK, REGIONS_QUICK, LATENCY, nn) #do_scan(MOTORS, POSITIONS_dummy, REGIONS_dummy, LATENCY, nn)