From ccad01cf6f921e49c3e96460014b0ffece0b055a Mon Sep 17 00:00:00 2001
From: x03daop <x03daop@x03da-cons-1.psi.ch>
Date: Tue, 13 Jun 2017 08:07:20 +0200
Subject: [PATCH] Script execution

---
 script/users/DAD_PhD.py | 67 +++++++++++++++++++++--------------------
 1 file changed, 34 insertions(+), 33 deletions(-)

diff --git a/script/users/DAD_PhD.py b/script/users/DAD_PhD.py
index 19b15760..2c279e01 100644
--- a/script/users/DAD_PhD.py
+++ b/script/users/DAD_PhD.py
@@ -183,39 +183,40 @@ def do_scan(motors, positions, regions, latency):
 try:
     setup_live_plots(REGIONSB)
     task = fork(update_live_plots)
-#    sample_pos = [ [51.2,-3.8,-0.1,118.5],
-#                   [41.2,-3.75,-0.1,117.5],
-#                   [31.2,-3.6,-0.1,116.5],
-#                   [21.2,-3.9,0.25,115.5],
-#                   [11.2,-3.75,0.2,113.],
-#                   [1.2,-3.65,0.2,112.],
-#                   [-8.8,-3.6,0.2,111.]]
-#    sample_pos = [ [51.2,-0.90,-2.2,112.1],
-#                   [41.2,-2.00,-2.2,113.1],
-#                   [31.2,-2.70,-2.2,114.1],
-#                   [21.2,-2.90,-2.2,115.1],
-#                   [11.2,-3.10,-2.2,116.1],
-#                   [1.2 ,-3.30,-2.2,117.1],
-#                   [-8.8,-3.60,-2.2,118.1]]
-#    for nn in sample_pos:
-    sample_pos = [[-8.8,-3.6,1.00,118.1],
-                  [-8.8,-3.6,1.00,117.1]]
-    nn = sample_pos[0]
-    ManipulatorX.move(nn[1])
-    ManipulatorY.move(nn[2])
-    ManipulatorZ.move(nn[3])
-    ManipulatorTheta.move(nn[0])
-    do_scan(MOTORS, POSITIONB, REGIONSB, LATENCY) #XPS before PhD
-    do_scan(MOTORS, POSITIONS_C, REGIONS_C, LATENCY)  #PhD
-    do_scan(MOTORS, POSITIONB, REGIONSB, LATENCY) #XPS after PhD
-    nn = sample_pos[1]
-    ManipulatorX.move(nn[1])
-    ManipulatorY.move(nn[2])
-    ManipulatorZ.move(nn[3])
-    ManipulatorTheta.move(nn[0])
-    do_scan(MOTORS, POSITIONB, REGIONSB, LATENCY) #XPS before PhD
-    do_scan(MOTORS, POSITIONS_O, REGIONS_O, LATENCY)  #PhD
-    do_scan(MOTORS, POSITIONB, REGIONSB, LATENCY) #XPS after PhD    
+    sample_pos = [ [-8.8,-3.60, 0.20,111.0],
+                   [-8.8,-3.60,-2.20,118.1],
+                   [-8.8,-3.60,-2.20,117.1],
+                   [11.2,-3.75, 0.20,113.0],
+                   [11.2,-3.75, 0.20,112.0],
+                   [11.2,-3.10,-2.20,116.1],   
+                   [31.2,-3.60,-0.10,116.5],
+                   [31.2,-3.60, 0.25,115.5],
+                   [31.2,-2.70,-2.20,114.1],                                   
+                   [51.2,-3.80,-0.10,118.5],
+                   [51.2,-3.80,-0.10,117.5],
+                   [51.2,-0.90,-2.20,112.1]]
+    jj = 0
+    for nn in sample_pos:
+        ManipulatorX.move(nn[1])
+        ManipulatorY.move(nn[2])
+        ManipulatorZ.move(nn[3])
+        ManipulatorTheta.move(nn[0])
+        if jj == 0:
+            do_scan(MOTORS, POSITIONB, REGIONSB, LATENCY) #XPS before PhD
+            do_scan(MOTORS, POSITIONS_N, REGIONS_N, LATENCY)  #PhD
+            do_scan(MOTORS, POSITIONB, REGIONSB, LATENCY) #XPS after PhD     
+            jj = 1 
+        elif jj == 1:      
+            do_scan(MOTORS, POSITIONB, REGIONSB, LATENCY) #XPS before PhD
+            do_scan(MOTORS, POSITIONS_C, REGIONS_C, LATENCY)  #PhD
+            do_scan(MOTORS, POSITIONB, REGIONSB, LATENCY) #XPS after PhD
+            jj = 2
+        else:
+            do_scan(MOTORS, POSITIONB, REGIONSB, LATENCY) #XPS before PhD
+            do_scan(MOTORS, POSITIONS_O, REGIONS_O, LATENCY)  #PhD
+            do_scan(MOTORS, POSITIONB, REGIONSB, LATENCY) #XPS after PhD            
+            jj = 0 
+  
 finally:
     if CLOSE_SHUTTER_AT_END:
         after_scan()