From 088493ceb8d2e9eac3f1880bf07ae3383df4fdca Mon Sep 17 00:00:00 2001
From: gac-x11ma <gac-x11ma@x11ma-cons-1.psi.ch>
Date: Wed, 6 Mar 2019 10:21:09 +0100
Subject: [PATCH] Startup

---
 script/EnergyMultiScan.py                      |  2 +-
 script/{ => Juraj}/B_scan.py                   |  2 +-
 script/{Energy_MagScan.py => Juraj/E_scan.py}  |  0
 script/{ => Juraj}/FixedE.py                   |  0
 script/{EnergyMagScanMain.py => Juraj/Main.py} | 14 +++++++++++---
 5 files changed, 13 insertions(+), 5 deletions(-)
 rename script/{ => Juraj}/B_scan.py (97%)
 rename script/{Energy_MagScan.py => Juraj/E_scan.py} (100%)
 rename script/{ => Juraj}/FixedE.py (100%)
 rename script/{EnergyMagScanMain.py => Juraj/Main.py} (64%)

diff --git a/script/EnergyMultiScan.py b/script/EnergyMultiScan.py
index 1d3b7f0..6c0133e 100644
--- a/script/EnergyMultiScan.py
+++ b/script/EnergyMultiScan.py
@@ -1,6 +1,6 @@
 file_prefix = time.strftime("%Y%m%d")
 # CHANGE THE PATH IN THE OTH
-input_path =  "/sls/X11MA/data/X11MA/Data1/public/scans/GMT_Juraj/"
+input_path =  "/sls/X11MA/data/X11MA/Data1/public/scans/1809_Armin/"
 #input_path =  "/sls/X11MA/data/X11MA/slsbl/x11ma/e17174/Data1/Aug_2018/sample02-LMNO_pristine/"
 
 output_path = input_path 
diff --git a/script/B_scan.py b/script/Juraj/B_scan.py
similarity index 97%
rename from script/B_scan.py
rename to script/Juraj/B_scan.py
index 825f3d2..93af30f 100644
--- a/script/B_scan.py
+++ b/script/Juraj/B_scan.py
@@ -29,7 +29,7 @@ for B in setpoints:
         readback1 = caget("X11MA-XMCD:Ireadout")
         time.sleep(0.5)
 
-    run("Energy_MagScan.py")
+    run("E_scan.py")
     
 
 
diff --git a/script/Energy_MagScan.py b/script/Juraj/E_scan.py
similarity index 100%
rename from script/Energy_MagScan.py
rename to script/Juraj/E_scan.py
diff --git a/script/FixedE.py b/script/Juraj/FixedE.py
similarity index 100%
rename from script/FixedE.py
rename to script/Juraj/FixedE.py
diff --git a/script/EnergyMagScanMain.py b/script/Juraj/Main.py
similarity index 64%
rename from script/EnergyMagScanMain.py
rename to script/Juraj/Main.py
index d24fa41..241d0e1 100644
--- a/script/EnergyMagScanMain.py
+++ b/script/Juraj/Main.py
@@ -1,9 +1,9 @@
 #Parameters
 
 ROUNDS = 1
-E1 = 625
-E2 = 635
-TIME = 1
+E1 = 634
+E2 = 665
+TIME = 3
 
 B1 = 0     # starting mag. field in Amps
 B2 = 1     # final mag. field in Amps
@@ -21,6 +21,14 @@ B2 = 0.5     # final mag. field in Amps
 BSTEP = 0.5   # step size mag. field in Amps
 ENERGIES = [635, 637, 639] #list of energies in eV
 
+OFFSET1 = -2.0 #eV
+OFFSET2 = -2.9 #eV
+caput(OTF_OFF2,OFFSET2)    # tune ID2 ---> C-
+caput(OTF_OFF1,OFFSET1-40) # detune ID1 
+
+#caput(OTF_OFF1,OFFSET1)    # tune ID1 ---> C+
+#caput(OTF_OFF2,OFFSET2-40) # detune ID2 
+wait_channel(OTF_DONE, 1, type = 'i')
 run("FixedE.py")