diff --git a/script/EnergyScan.py b/script/EnergyScan.py
index e177cac..81208f5 100644
--- a/script/EnergyScan.py
+++ b/script/EnergyScan.py
@@ -31,7 +31,7 @@ else:
     print "Running full script"
 
 file_prefix = time.strftime("%y%m%d")
-input_path =  "/sls/X11MA/data/X11MA/beamtime_oct201/"+file_prefix+"/"
+input_path =  "/sls/X11MA/data/X11MA/beamtime_oct2017/"+file_prefix+"/"
 output_path = input_path #+file_Data1/beamtime_oct2017prefix+"/" #"/sls/X11MA/Data1/public/e10989/"+file_prefix+"/"
 
 
diff --git a/script/EnergyScanID2andID2only.py b/script/EnergyScanID2andID2only.py
index c1e4294..031f333 100644
--- a/script/EnergyScanID2andID2only.py
+++ b/script/EnergyScanID2andID2only.py
@@ -46,15 +46,15 @@ def stopPlot():
 ###############################################################################
 
 
-E1 = 770
-E2 = 815
+E1 = 760
+E2 = 810
 TIME = 4.0 #min
-DELAY = 20.0 #s
+DELAY = 5.0 #s
 #PREFIX = 'Data'
-RUNTYPE = "+"
-ROUNDS = 1
-OFFSETp = -12.5
-OFFSETm = -12.5
+RUNTYPE = "+/-"
+ROUNDS = 5
+OFFSETp = -0.4
+OFFSETm = -1.9
 OFFSETp_ID1 = -0.4
 PLOT_TYPE = 1
 
@@ -74,9 +74,10 @@ number_of_scans = 1
 #Prepare scan for PGM+ID2
 ###############################################################################
 
-caput ("X11PHS-E:OPT","PGM+ID2")
+#caput ("X11PHS-E:OPT","PGM+ID2")
 #caput(OTF_OFF1,-40) #detune ID2
 #wait_channel(OTF_DONE, 1, type = 'i')
+caput ("X11PHS-E:OPT","PGM+ID1+ID2")
 
 if RUNTYPE in ["+/-", "+", "-"]:
     if RUNTYPE == "+":
@@ -88,11 +89,16 @@ if RUNTYPE in ["+/-", "+", "-"]:
     
     elif RUNTYPE == "-":
         caput(OTF_MODE2,2) # circ- in ID2
+        caput(OTF_MODE1,2) # circ- in ID1
         caput(OTF_OFF2,OFFSETm)
+        caput(OTF_OFF1,OFFSETp_ID1) #offset for ID1 may be same or different for C+ and C-
         number_of_scans = ROUNDS
+        
     elif RUNTYPE == "+/-":
         caput(OTF_MODE2,1) # circ+ in ID2
+        caput(OTF_MODE1,1) # circ+ in ID1
         caput(OTF_OFF2,OFFSETp)
+        caput(OTF_OFF1,OFFSETp_ID1)
         number_of_scans = 2 * ROUNDS
     wait_channel(OTF_DONE, 1, type = 'i')
 
@@ -152,12 +158,17 @@ for scan_no  in range(number_of_scans):
     
     if RUNTYPE in ["+/-"]:
         pol_str = caget(OTF_MODE2)
-        if pol_str == "CIRC +":
+        pol_str_1 = caget(OTF_MODE1)
+        if pol_str == "CIRC +" and pol_str_1 == "CIRC +":
            caput(OTF_MODE2,2) # circ- in ID2
+           caput(OTF_MODE1,2) # circ- in ID1
            caput(OTF_OFF2,OFFSETm)
-        elif pol_str == "CIRC -":
+           caput(OTF_OFF1,OFFSETp_ID1)
+        elif pol_str == "CIRC -" and pol_str_1 == "CIRC -":
             caput(OTF_MODE2,1) # circ+ in ID2
+            caput(OTF_MODE1,1) #circ+ in ID1
             caput(OTF_OFF2,OFFSETp)
+            caput(OTF_OFF1,OFFSETp_ID1)
         else: print "Check pol. change"
         wait_channel(OTF_DONE, 1, type = 'i')
     else:
diff --git a/script/EnergyScanID2only.py b/script/EnergyScanID2only.py
index 971f149..4e416a4 100644
--- a/script/EnergyScanID2only.py
+++ b/script/EnergyScanID2only.py
@@ -46,16 +46,16 @@ def stopPlot():
 ###############################################################################
 
 
-E1 = 770
-E2 = 815
-TIME = 4.0 #min
-DELAY = 20.0 #s
+E1 = 760
+E2 = 810
+TIME = 5.0 #min
+DELAY = 5.0 #s
 #PREFIX = 'Data'
 RUNTYPE = "+/-"
 ROUNDS = 1
-OFFSETp = -12.5
-OFFSETm = -12.5
-PLOT_TYPE = 2
+OFFSETp = -1.9
+OFFSETm = -1.9
+PLOT_TYPE = 1
 
 
 print "\nStarting energy scan - Parameters: ",