From 706cc441ad9cbe5a22e5648b1ce6211e8eeb6c5d Mon Sep 17 00:00:00 2001
From: X11MA <X11MA@x11ma-cons-1.psi.ch>
Date: Thu, 9 Feb 2017 12:35:27 +0100
Subject: [PATCH] Script execution

---
 script/EnergyScanID2only.py | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/script/EnergyScanID2only.py b/script/EnergyScanID2only.py
index fecafca..4da967f 100644
--- a/script/EnergyScanID2only.py
+++ b/script/EnergyScanID2only.py
@@ -45,7 +45,7 @@ def stopPlot():
 # Parameters
 ###############################################################################
 
-
+'''
 E1 = 680
 E2 = 690
 TIME = 0.5 #min
@@ -56,6 +56,7 @@ ROUNDS = 1
 OFFSETp = 0.0
 OFFSETm = 0.0
 PLOT_TYPE = 1
+'''
 
 print "\nStarting energy scan - Parameters: ",
 print E1,E2,TIME,DELAY,RUNTYPE
@@ -72,16 +73,17 @@ number_of_scans = 1
 ###############################################################################
 
 caput ("X11PHS-E:OPT","PGM+ID2")
-
+caput(OTF_OFF1,-40) #detune ID2
+wait_channel(OTF_DONE, 1, type = 'i')
 
 if RUNTYPE in ["+/-", "+", "-"]:
     if RUNTYPE == "+":
         caput(OTF_MODE2,1) # circ+ in ID2
-        caput(OTF_OFF,OFFSETp)
+        caput(OTF_OFF2,OFFSETp)
         number_of_scans = ROUNDS
     elif RUNTYPE == "-":
         caput(OTF_MODE2,2) # circ- in ID2
-        caput(OTF_OFF,OFFSETm)
+        caput(OTF_OFF2,OFFSETm)
         number_of_scans = ROUNDS
     elif RUNTYPE == "+/-":
         caput(OTF_MODE2,1) # circ+ in ID2