diff --git a/script/test/otf_NCM111.py b/script/test/otf_NCM111.py index 1bd8eb8..84aaca8 100644 --- a/script/test/otf_NCM111.py +++ b/script/test/otf_NCM111.py @@ -1,4 +1,5 @@ -#otf(start=630, end=670, time=1, delay=5.0, mode='LINEAR', alpha = 0.0, offset=0.0, name='pshell2') +otf(start=700, end=740, time=2, delay=10.0, mode='LINEAR', alpha = 0.0, offset=0.0, name='oXAS-NCM_endPS_Fe') +otf(start=700, end=740, time=2, delay=10.0, mode='LINEAR', alpha = 0.0, offset=0.0, name='oXAS-NCM_endPS_Fe') #otf(start=520, end=570, time=5, delay=5.0, mode='LINEAR', alpha = 0.0, offset=0.0, name='pshell-test') #otf(start=480, end=510, time=2.5, delay=5.0, mode='LINEAR', alpha = 0.0, offset=0.0, name='pshell-test') #otf(start=270, end=320, time=1, delay=5.0, mode='LINEAR', alpha = 0.0, offset=0.0, name='pshell-test') @@ -27,6 +28,12 @@ while loop_count < nr_loops: # caput('X11MA-KEI11:RANGE', 8) caput('X11MA-KEI12:RANGE', 9) otf(start=520, end=570, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='oXAS-NCM_gs_O') + caput('X11MA-KEI10:RANGE', 6) +# caput('X11MA-KEI11:RANGE', 8) + caput('X11MA-KEI12:RANGE', 9) + otf(start=500, end=900, time=3, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='oXAS-NCM_gs_Survey') + + loop_count = loop_count + 1 ''' @@ -73,12 +80,11 @@ while loop_count < nr_loops: otf(start=520, end=570, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='oXAS-NCM_endPS_O') loop_count = loop_count + 1 -''' # repeating scans C caput('X11MA-KEI10:RANGE', 7) caput('X11MA-KEI11:RANGE', 8) caput('X11MA-KEI12:RANGE', 9) -nr_loops=3 +nr_loops=6 loop_count = 0 while loop_count < nr_loops: otf(start=270, end=320, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='oXAS-NCM_endPS_C')