From 04c5ccdac8633833fe7b4b3d882a550e108f4f92 Mon Sep 17 00:00:00 2001
From: gac-x11ma <gac-x11ma@x11ma-cons-1.psi.ch>
Date: Thu, 21 Dec 2017 05:12:43 +0100
Subject: [PATCH] Script execution

---
 script/Krieger/xmcdID2_Bi.py | 66 ++++++++++++++++++++++++------------
 1 file changed, 45 insertions(+), 21 deletions(-)

diff --git a/script/Krieger/xmcdID2_Bi.py b/script/Krieger/xmcdID2_Bi.py
index adca7c2..8b6c1ca 100644
--- a/script/Krieger/xmcdID2_Bi.py
+++ b/script/Krieger/xmcdID2_Bi.py
@@ -1,31 +1,55 @@
 caput("X11MA-ES1-10ADC:AVG",1) # acquisition time otf to 1
 
 
-E1 = 425
-E2 = 475
-TIME = 3 #min
-DELAY = 2.0 #s
+E1 = 625
+E2 = 875
+TIME = 11 #min
+DELAY = 0.10 #s
 #PREFIX = 'Data'
-OFFSETp = -5.5
-OFFSETm = -6.5
+OFFSETp = -8
+OFFSETm = -9
 PLOT_TYPE = 1
 FIELD_CHANGE_SLEEP = 10
 
-for B in [-10, 10]:
-    if B > 0:
-        caput("X11MA-XMCD:I-SETraw",10) #SET FIELD TO 10 AMPS
-        time.sleep( FIELD_CHANGE_SLEEP )     # Settling time
-    if B < 0:
-        caput("X11MA-XMCD:I-SETraw",-10) # SET FIELD TO -10 AMPS
-        time.sleep( FIELD_CHANGE_SLEEP )     # Settling time
-    caput("X11MA-XMCD:I-SETraw",B) # SET FIELD TO b
-    time.sleep( FIELD_CHANGE_SLEEP )     # Settling time
+#for B in [-10, 10]:
+#    if B > 0:
+#        caput("X11MA-XMCD:I-SETraw",10) #SET FIELD TO 10 AMPS
+#        time.sleep( FIELD_CHANGE_SLEEP )     # Settling time
+#    if B < 0:
+#        caput("X11MA-XMCD:I-SETraw",-10) # SET FIELD TO -10 AMPS
+#        time.sleep( FIELD_CHANGE_SLEEP )     # Settling time
+#    caput("X11MA-XMCD:I-SETraw",B) # SET FIELD TO b
+#    time.sleep( FIELD_CHANGE_SLEEP )     # Settling time
 
-    RUNTYPE = "+"
-    ROUNDS = 1
-    run("Krieger/EnergyScanID2only")
+ROUNDS = 1
 
-    RUNTYPE = "-"
-    ROUNDS = 1
-    run("Krieger/EnergyScanID2only")
+caput("X11MA-XMCD:I-SETraw",10) #SET FIELD TO 10 AMPS
+RUNTYPE = "+"
+run("Krieger/EnergyScanID2only")
 
+RUNTYPE = "-"
+run("Krieger/EnergyScanID2only")
+
+
+
+caput("X11MA-XMCD:I-SETraw",-10) #SET FIELD TO 10 AMPS
+RUNTYPE = "-"
+run("Krieger/EnergyScanID2only")
+
+RUNTYPE = "+"
+run("Krieger/EnergyScanID2only")
+
+RUNTYPE = "+"
+run("Krieger/EnergyScanID2only")
+
+RUNTYPE = "-"
+run("Krieger/EnergyScanID2only")
+
+
+
+caput("X11MA-XMCD:I-SETraw",+10) #SET FIELD TO 10 AMPS
+RUNTYPE = "-"
+run("Krieger/EnergyScanID2only")
+
+RUNTYPE = "+"
+run("Krieger/EnergyScanID2only")
\ No newline at end of file