diff --git a/script/users/TUM/TUM_multi_XPS_201908.py b/script/users/TUM/TUM_multi_XPS_201908.py index 85fb385b..18bb06df 100644 --- a/script/users/TUM/TUM_multi_XPS_201908.py +++ b/script/users/TUM/TUM_multi_XPS_201908.py @@ -5,20 +5,24 @@ Arguments: LATENCY = 0.0 MOTORS = [Eph] -POSITIONS_1 = [190] -REGION_1 = {'name': 'Br3d', 'elo': 113., 'ehi': 121., 'estep': 0.05, 'epass': 10, 'tstep': 0.5, 'iter': 15, 'cis': True} -REGIONS_1 = [REGION_1] +#POSITIONS_1 = [190] +#REGION_1 = {'name': 'Br3d', 'elo': 113., 'ehi': 121., 'estep': 0.05, 'epass': 10, 'tstep': 0.5, 'iter': 15, 'cis': True} +#REGIONS_1 = [REGION_1] -POSITIONS_2 = [350] -REGION_2 = {'name': 'Cl2p', 'elo': 141., 'ehi': 149., 'estep': 0.05, 'epass': 10, 'tstep': 0.5, 'iter': 15, 'cis': True} -REGIONS_2 = [REGION_2] +#POSITIONS_2 = [350] +#REGION_2 = {'name': 'Cl2p', 'elo': 141., 'ehi': 149., 'estep': 0.05, 'epass': 10, 'tstep': 0.5, 'iter': 15, 'cis': True} +#REGIONS_2 = [REGION_2] -POSITIONS_3 = [350] -REGION_3 = {'name': 'B1s', 'elo': 152., 'ehi': 159., 'estep': 0.05, 'epass': 10, 'tstep': 0.5, 'iter': 10, 'cis': True} +#POSITIONS_3 = [350] +#REGION_3 = {'name': 'B1s', 'elo': 152., 'ehi': 159., 'estep': 0.05, 'epass': 10, 'tstep': 0.5, 'iter': 10, 'cis': True} +#REGIONS_3 = [REGION_3] + +POSITIONS_3 = [435] +REGION_3 = {'name': 'Ag3d', 'elo': 59., 'ehi': 66., 'estep': 0.05, 'epass': 10, 'tstep': 0.5, 'iter': 1, 'cis': True} REGIONS_3 = [REGION_3] POSITIONS_4 = [435] -REGION_4 = {'name': 'C1s', 'elo': 142., 'ehi': 149., 'estep': 0.05, 'epass': 10, 'tstep': 0.5, 'iter': 10, 'cis': True} +REGION_4 = {'name': 'C1s', 'elo': 141., 'ehi': 151., 'estep': 0.05, 'epass': 10, 'tstep': 0.5, 'iter': 10, 'cis': True} REGIONS_4 = [REGION_4] POSITIONS_5 = [550] @@ -215,13 +219,13 @@ try: if index == 0: #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_1, REGIONS_1, LATENCY, nn) + # do_scan(MOTORS, POSITIONS_2, REGIONS_2, LATENCY, nn) do_scan(MOTORS, POSITIONS_3, REGIONS_3, LATENCY, nn) do_scan(MOTORS, POSITIONS_4, REGIONS_4, LATENCY, nn) do_scan(MOTORS, POSITIONS_5, REGIONS_5, LATENCY, nn) do_scan(MOTORS, POSITIONS_6, REGIONS_6, LATENCY, nn) - do_scan(MOTORS, POSITIONS_7, REGIONS_7, LATENCY, nn) + #do_scan(MOTORS, POSITIONS_7, REGIONS_7, LATENCY, nn) #do_scan(MOTORS, POSITIONS_8, REGIONS_8, LATENCY, nn) #do_scan(MOTORS, POSITIONS_9, REGIONS_9, LATENCY, nn) #do_scan(MOTORS, POSITIONS_10, REGIONS_10, LATENCY, nn)