diff --git a/script/EnergyScan.py b/script/EnergyScan.py
index 30c1b3d..b1a4cdd 100644
--- a/script/EnergyScan.py
+++ b/script/EnergyScan.py
@@ -13,16 +13,16 @@ if str(SET_OFFSETS) == "1":
     elif RUNTYPE in ["LH/LV", "LH", "LV"]:
         caput(OTF_MODE1,0)
         caput(OTF_MODE2,0)
-        wait_channel(OTF_DONE, 1, type = 'i')
+        #wait_channel(OTF_DONE, 1, type = 'i')
         caput(OTF_ALPHA1, 0.0)  # LH in ID1
         caput(OTF_ALPHA2, 90.0) # LV in ID2
-        wait_channel(OTF_DONE, 1, type = 'i') 
+        #wait_channel(OTF_DONE, 1, type = 'i') 
     else:
         raise Exception("Invalid run type: " +  RUNTYPE) 
        
     caput(OTF_OFF1,OFFSET1)
     caput(OTF_OFF2,OFFSET2-40) #detune ID2
-    wait_channel(OTF_DONE, 1, type = 'i')
+    #wait_channel(OTF_DONE, 1, type = 'i')
     print "Offsets are set"
     import sys
     sys.exit(0)
@@ -242,7 +242,7 @@ number_of_scans = 1
 if RUNTYPE in ["+/-", "+", "-"]:
     caput(OTF_MODE1,1) # circ + in ID1 
     caput(OTF_MODE2,2) # circ - in ID2
-    wait_channel(OTF_DONE, 1, type = 'i')
+    #wait_channel(OTF_DONE, 1, type = 'i')
     if RUNTYPE == "+/-":
         number_of_scans = 2 * ROUNDS
     else: 
@@ -250,10 +250,10 @@ if RUNTYPE in ["+/-", "+", "-"]:
 elif RUNTYPE in ["LH/LV", "LH", "LV"]:
     caput(OTF_MODE1,0)
     caput(OTF_MODE2,0)
-    wait_channel(OTF_DONE, 1, type = 'i')
+    #wait_channel(OTF_DONE, 1, type = 'i')
     caput(OTF_ALPHA1, 0.0)  # LH in ID1
     caput(OTF_ALPHA2, 90.0) # LV in ID2
-    wait_channel(OTF_DONE, 1, type = 'i')
+    #wait_channel(OTF_DONE, 1, type = 'i')
     if RUNTYPE == "LH/LV":
         number_of_scans = 2 * ROUNDS
     else:
@@ -268,7 +268,7 @@ elif RUNTYPE in ["+/-", "+", "LH/LV", "LH"]:
     switchpol(1, RUNTYPE) # tune ID1 --> polarization: C+ or LH
 time.sleep(1.0)
 
-wait_channel(OTF_DONE, 1, type = 'i')
+#wait_channel(OTF_DONE, 1, type = 'i')
 
 open_vg10()
 time.sleep(0.5)
@@ -289,7 +289,7 @@ for scan_no  in range(number_of_scans):
     caput(OTF_FID,fid)
     time.sleep(2.0) 
     caput(OTF_ESET, E1)
-    wait_channel(OTF_DONE, 1, type = 'i')
+    #wait_channel(OTF_DONE, 1, type = 'i')
     time.sleep(DELAY)    
     time.sleep(2.0)
 
@@ -306,7 +306,9 @@ for scan_no  in range(number_of_scans):
         print "********    OTF STOP TIMEOUT   **********"
         otf_start.write(0)    
     finally:
-        stopPlot()tead of sleep
+        stopPlot()
+        
+    time.sleep(5.0)    
     #Convert file
     output_file = output_path + "os" + file_prefix + "_" + suffix + ".dat"
 
diff --git a/script/scan_horizontal_outfocus.xml b/script/scan_horizontal_outfocus.xml
index 7e6671c..bd78207 100644
--- a/script/scan_horizontal_outfocus.xml
+++ b/script/scan_horizontal_outfocus.xml
@@ -3,41 +3,31 @@
     <data format="txt" fileName="scan_horizontal_outfocus"/>
     <scan>
         <dimension zigzag="false" dataGroup="false">
-            <preAction xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="ChannelAction" channel="X07MA-OP-VG13:WT_SET" value="1"/>
-            <positioner xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="RegionPositioner" name="X07MA-ES1-MAG:TRZ1" asynchronous="false" id="horizontal">
+            <positioner xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="RegionPositioner" name="X11MA-VME-ES4:TRY" asynchronous="false" id="horizontal">
                 <region>
-                    <start>101.0</start>
-                    <end>111.0</end>
+                    <start>10.0</start>
+                    <end>17.0</end>
                     <stepSize>0.25</stepSize>
                 </region>
             </positioner>
-            <detector xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="ScalarDetector" type="Double" name="X07MA-ES1-AI:SIGNAL0" id="TEY"/>
-            <detector xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="ScalarDetector" type="Double" name="X07MA-ES1-AI:SIGNAL1" id="I0"/>
-            <detector xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="ScalarDetector" name="X07MA-ES1-AI:SIGNAL2" id="ADC3"/>
-            <detector xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="ScalarDetector" type="Double" name="X07MA-ID:ALPHA" id="polangle"/>
-            <detector xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="ScalarDetector" type="Double" name="X07MA-ID:MODE" id="polarization"/>
-            <detector xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="ScalarDetector" type="Double" name="X07MA-PC-TC:STS:T1" id="temperature"/>
+            <detector xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="ScalarDetector" type="Double" name="X11MA-ES1:CADC1" id="TEY"/>
+            <detector xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="ScalarDetector" type="Double" name="X11MA-ES1:CADC2" id="I0"/>
+            <detector xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="ScalarDetector" type="Double" name="X11MA-ID1:ALPHA" id="polangle"/>
+            <detector xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="ScalarDetector" type="Double" name="X11MA-ID1:MODE" id="polarization"/>
+            <detector xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="ScalarDetector" type="Double" name="X11MA-ES3-LSCI:TEMP_RBV" id="temperature"/>
             <detector xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="ScalarDetector" type="Double" name="ARIDI-PCT:CURRENT" id="ringCurrent"/>
-            <detector xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="ScalarDetector" type="Double" name="X07MA-PHS-E:GO.A" id="energy"/>
-            <detector xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="ScalarDetector" type="Double" name="X07MA-PC-PS2:STS:PMCURRENT" id="field"/>
-            <detector xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="ScalarDetector" name="X07MA-ES1-MAG:TRY1.RBV" id="vertical"/>
+            <detector xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="ScalarDetector" type="Double" name="X11MA-PHS:E_SP" id="energy"/>
+            <detector xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="ScalarDetector" name="X11MA-VME-ES4:TRY.RBV" id="vertical"/>
         </dimension>
         <dimension zigzag="false" dataGroup="false">
-            <positioner xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="ArrayPositioner" name="X07MA-PHS-E:GO.A" readback="X07MA-PGM:CERBK" asynchronous="false" id="p2">
-                <positions>1235 1225</positions>
+            <positioner xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="ArrayPositioner" name="X11MA-PHS:E_SP" readback="X11MA-PGM:rbkenergy" settlingTime="0.0" done="X11MA-PHS:ALL-DONE" asynchronous="false" id="p2">
+                <positions>709.7 700</positions>
             </positioner>
         </dimension>
         <manipulation xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="ScriptManipulation" returnArray="false" id="norm">
             <mapping xsi:type="IDParameterMapping" refid="TEY" variable="c"/>
             <mapping xsi:type="IDParameterMapping" refid="I0" variable="d"/>
             <script>import math
-def process(c,d):
-	return c/d</script>
-        </manipulation>
-        <manipulation xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="ScriptManipulation" returnArray="false" id="ADC3_norm">
-            <mapping xsi:type="IDParameterMapping" refid="ADC3" variable="c"/>
-            <mapping xsi:type="IDParameterMapping" refid="I0" variable="d"/>
-            <script>import math
 def process(c,d):
 	return c/d</script>
         </manipulation>
@@ -45,6 +35,4 @@ def process(c,d):
     <visualization xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="LinePlot" x="horizontal" y="TEY" title="TEY"/>
     <visualization xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="LinePlot" x="horizontal" y="norm" title="TEY norm"/>
     <visualization xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="LinePlot" x="horizontal" y="I0" title=" I0"/>
-    <visualization xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="LinePlot" x="horizontal" y="ADC3_norm" title=" photodiode norm"/>
-    <visualization xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="LinePlot" x="horizontal" y="ADC3" title=" photodiode"/>
 </configuration>
diff --git a/script/scan_vertical.xml b/script/scan_vertical.xml
index 163b112..c2f08bf 100644
--- a/script/scan_vertical.xml
+++ b/script/scan_vertical.xml
@@ -3,38 +3,30 @@
     <data format="txt" fileName="scan_vertical"/>
     <scan>
         <dimension zigzag="false" dataGroup="false">
-            <positioner xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="RegionPositioner" name="X07MA-ES1-MAG:TRY1" settlingTime="0.5" asynchronous="false" id="vertical">
+            <positioner xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="RegionPositioner" name="X11MA-VME-ES4:TRZ" settlingTime="0.5" asynchronous="false" id="vertical">
                 <region>
-                    <start>10.0</start>
-                    <end>20.0</end>
-                    <stepSize>0.5</stepSize>
+                    <start>12.0</start>
+                    <end>23.0</end>
+                    <stepSize>0.25</stepSize>
                 </region>
             </positioner>
-            <detector xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="ScalarDetector" type="Double" name="X07MA-ES1-AI:SIGNAL0" id="ADC1"/>
-            <detector xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="ScalarDetector" type="Double" name="X07MA-ES1-AI:SIGNAL1" id="ADC2"/>
-            <detector xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="ScalarDetector" type="Double" name="X07MA-ID:MODE" id="polarization"/>
-            <detector xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="ScalarDetector" type="Double" name="X07MA-ID:ALPHA" id="polangle"/>
-            <detector xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="ScalarDetector" type="Double" name="X07MA-PC-TC:STS:T1" id="temperature"/>
+            <detector xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="ScalarDetector" type="Double" name="X11MA-ES1:CADC1" id="ADC1"/>
+            <detector xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="ScalarDetector" type="Double" name="X11MA-ES1:CADC2" id="ADC2"/>
+            <detector xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="ScalarDetector" type="Double" name="X11MA-ID1:MODE" id="polarization"/>
+            <detector xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="ScalarDetector" type="Double" name="X11MA-ID1:ALPHA" id="polangle"/>
+            <detector xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="ScalarDetector" type="Double" name="X11MA-ES3-LSCI:TEMP_RBV" id="temperature"/>
             <detector xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="ScalarDetector" type="Double" name="ARIDI-PCT:CURRENT" id="ringCurrent"/>
-            <detector xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="ScalarDetector" type="Double" name="X07MA-PHS-E:GO.A" id="energy"/>
-            <detector xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="ScalarDetector" name="X07MA-ES1-AI:SIGNAL2" id="ADC3"/>
+            <detector xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="ScalarDetector" type="Double" name="X11MA-PHS:E_SP" id="energy"/>
         </dimension>
         <dimension zigzag="false" dataGroup="false">
-            <positioner xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="ArrayPositioner" name="X07MA-PHS-E:GO.A" readback="X07MA-PGM:CERBK" asynchronous="false" id="p2">
-                <positions>706.8 700</positions>
+            <positioner xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="ArrayPositioner" name="X11MA-PHS:E_SP" readback="X11MA-PGM:rbkenergy" done="X11MA-PHS:ALL-DONE" asynchronous="false" id="p2">
+                <positions>709.7 700</positions>
             </positioner>
         </dimension>
         <manipulation xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="ScriptManipulation" returnArray="false" id="ADC1_norm">
             <mapping xsi:type="IDParameterMapping" refid="ADC1" variable="c"/>
             <mapping xsi:type="IDParameterMapping" refid="ADC2" variable="d"/>
             <script>import math
-def process(c,d):
-	return c/d</script>
-        </manipulation>
-        <manipulation xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="ScriptManipulation" returnArray="false" id="ADC3_norm">
-            <mapping xsi:type="IDParameterMapping" refid="ADC3" variable="c"/>
-            <mapping xsi:type="IDParameterMapping" refid="ADC2" variable="d"/>
-            <script>import math
 def process(c,d):
 	return c/d</script>
         </manipulation>
@@ -42,6 +34,4 @@ def process(c,d):
     <visualization xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="LinePlot" x="vertical" y="ADC1" title="TEY"/>
     <visualization xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="LinePlot" x="vertical" y="ADC1_norm" title="TEY norm"/>
     <visualization xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="LinePlot" x="vertical" y="ADC2" title="I0"/>
-    <visualization xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="LinePlot" x="vertical" y="ADC3_norm" title="photodiode norm"/>
-    <visualization xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="LinePlot" x="vertical" y="ADC3" title="photodiode"/>
 </configuration>