From 3d8bb3f7a177f3e793a1290dfcc4cc07e9494620 Mon Sep 17 00:00:00 2001
From: x07maop <x07maop@x07ma-cons-1.psi.ch>
Date: Mon, 6 Jul 2015 10:12:12 +0200
Subject: [PATCH] Closedown

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

diff --git a/script/HystScan.py b/script/HystScan.py
index 6e57812..a4427e6 100644
--- a/script/HystScan.py
+++ b/script/HystScan.py
@@ -1,8 +1,8 @@
 #Script imported from: Fe_hyst_plus.xml
 
 #Parameters
-START_FIELD = 1.0
-END_FIELD = -1.0
+START_FIELD = -1.0
+END_FIELD = 1.0
 ENERGIES = (707.90, 703.90)
 
 #Pre-actions
@@ -16,8 +16,15 @@ caputq('X07MA-PC:CSCALER.INPB', '1')
 caputq('X07MA-PC-PS2:SET:DMD:RAMPRATE:TPM', '2.0')
 #sleep(15.0)
 
-#TODO: Set the diplay names of positioners and detectors
-scan = ManualScan(['index', 'Energy'], ['FieldRbk', 'TEY', 'I0', 'trans', 'polarization', 'polAngle', 'temperature', 'RingCurrent', 'fieldAnalogX', 'tey_norm', 'trans_norm'] , [0.0, 703.9], [80.0, 707.9], [80, 1])
+set_preference(Preference.ENABLED_PLOTS,  ['FieldRbk', 'tey_norm', 'trans_norm'])
+set_preference(Preference.PLOT_TYPES, {'FieldRbk':1, 'tey_norm':1, 'trans_norm':1})
+
+#TODO:
+#Option to have time scane for X 
+#Separate 2 series in 1D plot
+#Plot differences of 2 plotsin tey_norm
+
+scan = ManualScan(['index', 'Energy'], ['FieldRbk', 'TEY', 'I0', 'trans', 'polarization', 'polAngle', 'temperature', 'RingCurrent', 'fieldAnalogX', 'tey_norm', 'trans_norm'])
 scan.start()
 
 #Stop condition
@@ -104,6 +111,7 @@ while(True):
         		
         scan.append ([index, setpoint2], [index, readback2], [field_readback, detector1, detector2, detector3, detector4, detector5, detector6, detector7, detector8, tey_norm, trans_norm])
 
+
     print "Field = " + str(fieldReadback.get())
     if ramp_done.get() == 1:    #If not ramping
         print "Not ramping, breaking execution"