From 41b1178e2c8506fa84651d62467675169d35f078 Mon Sep 17 00:00:00 2001
From: X11MA <X11MA@x11ma-cons-1.psi.ch>
Date: Tue, 2 Feb 2016 15:52:14 +0100
Subject: [PATCH] Script execution

---
 script/EnergyScan.py | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/script/EnergyScan.py b/script/EnergyScan.py
index c9cfb4c..b445ce5 100644
--- a/script/EnergyScan.py
+++ b/script/EnergyScan.py
@@ -1,7 +1,7 @@
 import os
 import traceback
 ############################PGM+ID1+ID2###################################################
-if str(SET_OFFSETS) == "1":
+'''if str(SET_OFFSETS) == "1":
     print "Setting offsets"
     if RUNTYPE in ["+/-", "+" , "-"]:  
         caput(OTF_MODE1,1) # circ + in ID1 
@@ -93,7 +93,7 @@ def stopPlot():
 def switchpol(activeID, runtype):
     global pol_str
     if activeID == 1:
-        caput(OTF_OFF1,OFFSET2)
+        caput(OTF_OFF1,OFFSET1)
         caput(OTF_OFF2,OFFSET2-40) #detune ID2
         if runtype in ["+/-", "+"]:
             pol_str = "circ +"
@@ -120,11 +120,11 @@ fid = get_next_fid(input_path, "o" + file_prefix)
 ###############################################################################
 #Prepare scan
 ###############################################################################
-#caput ("X11PHS-E:OPT","PGM+ID1+ID2")
+caput ("X11PHS-E:OPT","PGM+ID1+ID2")
 
 number_of_scans = 1
 if RUNTYPE in ["+/-", "+", "-"]:
-    caput(OTF_MODE1,2) # circ + in ID1 
+    caput(OTF_MODE1,1) # circ + in ID1 
     caput(OTF_MODE2,2) # circ - in ID2
     wait_channel(OTF_DONE, 1, type = 'i')
     if RUNTYPE == "+/-":
@@ -219,4 +219,5 @@ close_vg13()
 
 print "Finished Energy scan"
 
-print("Success")        
+print("Success")        '''
+print(ID_TYPE)