From 903b7f52e8d3b25d50907e2b73176bbd2bd10747 Mon Sep 17 00:00:00 2001
From: gac-x11ma <gac-x11ma@x11ma-cons-1.psi.ch>
Date: Mon, 30 Sep 2019 18:01:06 +0200
Subject: [PATCH] Script execution

---
 script/test/otf_NCM111.py | 92 +++++++++++++++++++++++++++++----------
 1 file changed, 69 insertions(+), 23 deletions(-)

diff --git a/script/test/otf_NCM111.py b/script/test/otf_NCM111.py
index cd2e355..464b8ba 100644
--- a/script/test/otf_NCM111.py
+++ b/script/test/otf_NCM111.py
@@ -1,6 +1,4 @@
-otf(start=630, end=670, time=1, delay=5.0, mode='LINEAR', alpha = 0.0, offset=0.0, name='pshell-test')
-
-
+otf(start=630, end=670, time=1, delay=5.0, mode='LINEAR', alpha = 0.0, offset=0.0, name='pshell2')
 #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')
@@ -9,46 +7,94 @@ otf(start=630, end=670, time=1, delay=5.0, mode='LINEAR', alpha = 0.0, offset=0.
 
 
 
-
-'''    long acquisition Sn M-edge + O K-edge
+'''    long acquisition edges in loop
 nr_loops=1000
 loop_count = 0
 while loop_count < nr_loops:
+    caput('X11MA-KEI10:RANGE', 7)
+    caput('X11MA-KEI11:RANGE', 8)
     caput('X11MA-KEI12:RANGE', 10)
-    otf(start=480, end=510, time=5, delay=900, mode='LINEAR', alpha = 0.0, offset=0.0, name='pshell-test')
+    otf(start=845, end=885, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='pshell-test')
+    caput('X11MA-KEI10:RANGE', 7)
+    caput('X11MA-KEI11:RANGE', 8)
+    caput('X11MA-KEI12:RANGE', 10)
+    otf(start=772, end=805, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='pshell-test')
+    caput('X11MA-KEI10:RANGE', 7)
+    caput('X11MA-KEI11:RANGE', 8)
     caput('X11MA-KEI12:RANGE', 9)
-    otf(start=520, end=570, time=5, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='pshell-test')
-    loop_count = loop_count + 1
-#     '''
+    otf(start=630, end=670, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='pshell-test')
+    caput('X11MA-KEI10:RANGE', 6)
+    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='pshell-test')
+        loop_count = loop_count + 1
+     '''
 
-'''    repeating scans C
+
+
+
+'''    repeating scans Ni
+caput('X11MA-KEI10:RANGE', 7)
+caput('X11MA-KEI11:RANGE', 8)
 caput('X11MA-KEI12:RANGE', 10)
-nr_loops=2
+nr_loops=3
 loop_count = 0
 while loop_count < nr_loops:
-    otf(start=270, end=320, time=5, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='pshell-test')
+    otf(start=845, end=885, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='pshell-test')
     loop_count = loop_count + 1
+    '''
 
-#     '''
-
-
-'''    repeating scans Sn
+'''    repeating scans Co
+caput('X11MA-KEI10:RANGE', 7)
+caput('X11MA-KEI11:RANGE', 8)
 caput('X11MA-KEI12:RANGE', 10)
-nr_loops=5
+nr_loops=3
 loop_count = 0
 while loop_count < nr_loops:
-    otf(start=480, end=510, time=5, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='pshell-test')
+    otf(start=772, end=805, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='pshell-test')
     loop_count = loop_count + 1
+    '''
 
-#    '''
-
+'''    repeating scans Mn
+caput('X11MA-KEI10:RANGE', 7)
+caput('X11MA-KEI11:RANGE', 8)
+caput('X11MA-KEI12:RANGE', 9)
+nr_loops=6
+loop_count = 0
+while loop_count < nr_loops:
+    otf(start=630, end=670, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='pshell-test')
+    loop_count = loop_count + 1
+    '''
 
 '''    repeating scans O
+caput('X11MA-KEI10:RANGE', 6)
+caput('X11MA-KEI11:RANGE', 8)
 caput('X11MA-KEI12:RANGE', 9)
-nr_loops=2
+nr_loops=3
 loop_count = 0
 while loop_count < nr_loops:
-    otf(start=520, end=570, time=5, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='pshell-test')
+    otf(start=520, end=570, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='pshell-test')
     loop_count = loop_count + 1
+    '''
 
-#     '''
\ No newline at end of file
+'''    repeating scans C
+caput('X11MA-KEI10:RANGE', 7)
+caput('X11MA-KEI11:RANGE', 8)
+caput('X11MA-KEI12:RANGE', 9)
+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='pshell-test')
+    loop_count = loop_count + 1
+    '''
+
+'''    repeating scans Survey
+caput('X11MA-KEI10:RANGE', 6)
+caput('X11MA-KEI11:RANGE', 8)
+caput('X11MA-KEI12:RANGE', 9)
+nr_loops=3
+loop_count = 0
+while loop_count < nr_loops:
+    otf(start=500, end=900, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='pshell-test')
+    loop_count = loop_count + 1
+    '''