From 793523156188187429ac5dc631dabca29c9338f2 Mon Sep 17 00:00:00 2001
From: x07maop <x07maop@x07ma-cons-1.psi.ch>
Date: Tue, 7 Jul 2015 15:47:45 +0200
Subject: [PATCH] Closedown

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

diff --git a/script/HystScan.py b/script/HystScan.py
index f3e99a9..0582e16 100644
--- a/script/HystScan.py
+++ b/script/HystScan.py
@@ -1,10 +1,11 @@
 #Script imported from: Fe_hyst_plus.xml
 
 #Parameters
-START_FIELD = -1.0
-END_FIELD = 1.0
+START_FIELD = -0.2
+END_FIELD = 0.2
 ENERGIES = (707.90, 703.90)
 RAMP_RATE = 2.0
+ENERGY_CHANGE_SLEEP = 0.5 
 
 #Pre-actions
 #cawait('ACOAU-ACCU:OP-MODE', 'Light Available', type = 's')
@@ -64,25 +65,32 @@ print "Waiting for start field"
 if abs(fieldReadback.get() - START_FIELD) < 0.005:
     caput('X07MA-PC-PS2:M:GO.A', START_FIELD + 0.01)
 caput('X07MA-PC-PS2:M:GO.A', START_FIELD)
+#caputq('X07MA-PC-PS2:M:GO.A', START_FIELD)
 """
-caputq('X07MA-PC-PS2:M:GO.A', START_FIELD)
-sleep(5.0)
-ramp_done.wait_for_value(1.0)
 
+caput("X07MA-PC-MAG:X:DMD", START_FIELD)
+caput("X07MA-PC-MAG:STARTRAMP.PROC", 1)
+ramp_done.wait_for_value(1.0)
 print "Set end field"
-caputq('X07MA-PC-PS2:M:GO.A', END_FIELD)
+caput("X07MA-PC-MAG:X:DMD", END_FIELD)
+caputq("X07MA-PC-MAG:STARTRAMP.PROC", 1)
 
 
 index = 0
 while(True):
-    #Dimension 2
+    #Dimension 2START_FIELD = -0.2
+END_FIELD = 0.2
+ENERGIES = (707.90, 703.90)
+RAMP_RATE = 2.0
+
     #ArrayPositioner Energy
     for setpoint2 in ENERGIES:
         Energy.put(setpoint2, timeout=None) # TODO: Set appropriate timeout
+        sleep( ENERGY_CHANGE_SLEEP ) # Settling time
+
         readback2 = EnergyReadback.get()
         if abs(readback2 - setpoint2) > 0.1 : # TODO: Check accuracy
             raise Exception('Actor Energy could not be set to the value ' + str(setpoint2))
-        sleep( 0.5 ) # Settling time
 
         #Detector field readback
         field_readback = fieldReadback.get()