From e6279fa48ab4944cc468cf488ecb310411c98031 Mon Sep 17 00:00:00 2001
From: x07maop <x07maop@x07ma-cons-1.psi.ch>
Date: Fri, 18 Nov 2016 10:01:36 +0100
Subject: [PATCH] Script execution

---
 script/HystScan.py | 27 +++++++++++++++++++--------
 1 file changed, 19 insertions(+), 8 deletions(-)

diff --git a/script/HystScan.py b/script/HystScan.py
index c57168d..980e4f1 100644
--- a/script/HystScan.py
+++ b/script/HystScan.py
@@ -1,5 +1,5 @@
 #Parameters
-"""
+
 FIELD = "Hx"
 START_FIELD = -0.1
 END_FIELD = 0.1
@@ -8,13 +8,14 @@ RAMP_RATE = 0.2
 ENERGY_CHANGE_SLEEP = 0.5 
 MODE = 'CIRC +'
 OFFSET = -1.0
-"""
 
 
+iPS = True
+
 FIELD_PRECISION = 0.01
-field = field_z if FIELD == "Hz" else field_x
-field_done = field_z_done if FIELD == "Hz" else field_x_done
-ramp_rate = ramp_rate_z if FIELD == "Hz" else ramp_rate_x
+field = field_z if FIELD == "Hz" else (field_x_ips if  iPS else field_x )
+field_done = field_z_done if FIELD == "Hz" else (None if iPS else field_x_done)
+ramp_rate = ramp_rate_z if FIELD == "Hz" else (ramp_rate_x_ips if iPS else ramp_rate_x) 
 
 #Pre-actions
 #cawait('ACOAU-ACCU:OP-MODE', 'Light Available', type = 's')
@@ -47,9 +48,19 @@ scan.start()
 print "SKIPPED Waiting for start field"
 
 if abs(field.readback.read() - START_FIELD) > FIELD_PRECISION:
-    field.write(START_FIELD)
-    time.sleep(3.0)
-    wait_device(field_done, 1)   #ramp_done.wait_for_value(1.0)
+    field.write(START_FIELD)    
+    if field_done is None:
+        time.sleep(1.0)
+        caput("X07MA-ES1-IPS:ACTION", 1)
+        time.sleep(3.0)
+        wait_device_in_range(field, START_FIELD, FIELD_PRECISION)
+        print "Waiting field done..."
+        while caget("X07MA-ES1-IPS:OUTPUT_RBV", "i") != 0):
+            time.sleep(0.1)
+        print "Done waiting"
+    else:
+        time.sleep(3.0)
+        wait_device(field_done, 1)   #ramp_done.wait_for_value(1.0)
 wait_device(pol_done, "DONE") 
 
 #open(2.0)