From 5fbb606083ed81d29cd997f13a104f8465499a5f Mon Sep 17 00:00:00 2001 From: x03daop Date: Fri, 9 Jun 2017 14:02:28 +0200 Subject: [PATCH] Script execution --- script/users/DAD_PhD.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/script/users/DAD_PhD.py b/script/users/DAD_PhD.py index d8ba0554..fa66f622 100644 --- a/script/users/DAD_PhD.py +++ b/script/users/DAD_PhD.py @@ -4,13 +4,13 @@ Arguments: """ MOTORS = [Eph] -POSITIONS = [500] -for nn in range(62): +POSITIONS = [540] +for nn in range(52): POSITIONS.append(POSITIONS[-1]+4) LATENCY = 0.0 -REGION1 = {'name': 'N 1s peak', 'elo': 89.0, 'ehi': 98.5, 'estep': 0.15, 'epass': 50, 'tstep': 2, 'iter': 1, 'cis': True} -REGION2 = {'name': 'N 1s tail', 'elo': 98.5, 'ehi': 108.0, 'estep': 0.5, 'epass': 50, 'tstep': 2, 'iter': 1, 'cis': True} +REGION1 = {'name': 'N 1s peak', 'elo': 129., 'ehi': 138.5, 'estep': 0.15, 'epass': 100, 'tstep': 1, 'iter': 1, 'cis': True} +REGION2 = {'name': 'N 1s tail', 'elo': 138.5, 'ehi': 148.0, 'estep': 0.5, 'epass': 100, 'tstep': 1, 'iter': 1, 'cis': True} REGIONS = [REGION1, REGION2] CLOSE_SHUTTER_AT_END = True @@ -163,7 +163,7 @@ try: # for nn in range(): # ManipulatorX.move(1.0) # ManipulatorY.move() -# ManipulatorZ.move() + ManipulatorZ.move(114.2) # ManipulatorTheta.move() do_scan(MOTORS, POSITIONS, REGIONS, LATENCY)