From 39b755d5a3808ae2fef0deca85c5aad6368cbec1 Mon Sep 17 00:00:00 2001
From: X11MA <X11MA@x11ma-cons-1.psi.ch>
Date: Sun, 14 May 2017 05:14:40 +0200
Subject: [PATCH] Closedown

---
 script/Sridhar/EnergyScanID1only.py | 18 +++++++++---------
 script/Sridhar/EnergyScanID2only.py | 18 +++++++++---------
 script/Sridhar/field_sweepID1.py    |  4 ++--
 script/Sridhar/field_sweepID2.py    |  2 +-
 script/harmonic_ID2.xml             | 12 ++++++------
 script/scan_horizontal_outfocus.xml | 18 ++++++++++++++----
 script/scan_vertical.xml            | 18 ++++++++++++++----
 7 files changed, 55 insertions(+), 35 deletions(-)

diff --git a/script/Sridhar/EnergyScanID1only.py b/script/Sridhar/EnergyScanID1only.py
index bb1345b..67da9ac 100644
--- a/script/Sridhar/EnergyScanID1only.py
+++ b/script/Sridhar/EnergyScanID1only.py
@@ -74,7 +74,7 @@ number_of_scans = 1
 ###############################################################################
 
 caput ("X11PHS-E:OPT","PGM+ID1")
-caput(OTF_OFF2,-50) #detune ID2
+#caput(OTF_OFF2,-50) #detune ID2
 wait_channel(OTF_DONE, 1, type = 'i')
 
 if RUNTYPE in ["+/-", "+", "-"]:
@@ -102,13 +102,13 @@ elif RUNTYPE in ["LH/LV", "LH", "LV"]:
 else:
     raise Exception("Invalid run type: " +  RUNTYPE)
 
-open_vg10()
-time.sleep(0.5)
-open_vg11()
-time.sleep(0.5)
-open_vg12()
-time.sleep(0.5)
-open_vg13()
+#open_vg10()
+#time.sleep(0.5)
+#open_vg11()
+#time.sleep(0.5)
+#open_vg12()
+#time.sleep(0.5)
+#open_vg13()
 
 ###############################################################################
 #Main scan loop
@@ -173,7 +173,7 @@ for scan_no  in range(number_of_scans):
     fid = fid + 1
    
 caput(OTF_ESET, E1) 
-close_vg13()
+#close_vg13()
 
 print "Finished Energy scan"
 
diff --git a/script/Sridhar/EnergyScanID2only.py b/script/Sridhar/EnergyScanID2only.py
index e68e012..4e600bf 100644
--- a/script/Sridhar/EnergyScanID2only.py
+++ b/script/Sridhar/EnergyScanID2only.py
@@ -74,7 +74,7 @@ number_of_scans = 1
 ###############################################################################
 
 caput ("X11PHS-E:OPT","PGM+ID2")
-caput(OTF_OFF1,-50) #detune ID1
+#caput(OTF_OFF1,-50) #detune ID1
 wait_channel(OTF_DONE, 1, type = 'i')
 
 if RUNTYPE in ["+/-", "+", "-"]:
@@ -99,13 +99,13 @@ elif RUNTYPE in ["LH/LV", "LH", "LV"]:
 else:
     raise Exception("Invalid run type: " +  RUNTYPE)
 
-open_vg10()
-time.sleep(0.5)
-open_vg11()
-time.sleep(0.5)
-open_vg12()
-time.sleep(0.5)
-open_vg13()
+#open_vg10()
+#time.sleep(0.5)
+#open_vg11()
+#time.sleep(0.5)
+#open_vg12()
+#time.sleep(0.5)
+#open_vg13()
 
 ###############################################################################
 #Main scan loop
@@ -170,7 +170,7 @@ for scan_no  in range(number_of_scans):
     fid = fid + 1
    
 caput(OTF_ESET, E1) 
-close_vg13()
+#close_vg13()
 
 print "Finished Energy scan"
 
diff --git a/script/Sridhar/field_sweepID1.py b/script/Sridhar/field_sweepID1.py
index 35fcec6..9ae989c 100644
--- a/script/Sridhar/field_sweepID1.py
+++ b/script/Sridhar/field_sweepID1.py
@@ -22,8 +22,8 @@ RANGES = [(B1, B2, -BSTEP),(B2,B1,BSTEP)]
 # Here polarization and offsets are set
 
 caput ("X11PHS-E:OPT","PGM+ID1")
-caput(OTF_OFF1,OFFSET1) #detune ID1
-caput(OTF_OFF2,OFFSET2) 
+#caput(OTF_OFF2,-50) #detune ID2
+caput(OTF_OFF1,OFFSET1) 
 wait_channel(OTF_DONE, 1, type = 'i')
 
 if MODE is 1 or 2:
diff --git a/script/Sridhar/field_sweepID2.py b/script/Sridhar/field_sweepID2.py
index 022a433..0c73f5e 100644
--- a/script/Sridhar/field_sweepID2.py
+++ b/script/Sridhar/field_sweepID2.py
@@ -22,7 +22,7 @@ RANGES = [(B1, B2, -BSTEP),(B2,B1,BSTEP)]
 # Here polarization and offsets are set
 
 caput ("X11PHS-E:OPT","PGM+ID2")
-caput(OTF_OFF1,OFFSET1) #detune ID1
+#caput(OTF_OFF1,-50) #detune ID1
 caput(OTF_OFF2,OFFSET2) 
 wait_channel(OTF_DONE, 1, type = 'i')
 
diff --git a/script/harmonic_ID2.xml b/script/harmonic_ID2.xml
index 5dd836f..5bb27cb 100644
--- a/script/harmonic_ID2.xml
+++ b/script/harmonic_ID2.xml
@@ -2,15 +2,15 @@
 <configuration xmlns="http://www.psi.ch/~ebner/models/scan/1.0" numberOfExecution="1" failOnSensorError="true">
     <data format="txt" fileName="harmonic"/>
     <scan>
-        <preAction xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="ChannelAction" channel="X11MA-ID2:ENERGY" value="710"/>
+        <preAction xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="ChannelAction" channel="X11MA-ID2:ENERGY" value="790"/>
         <preAction xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="ChannelAction" channel="X11MA-ID2:DONE" value="DONE" operation="wait"/>
         <preAction xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="ChannelAction" channel="X11PHS-E:OPT" value="PGM" operation="put" type="String"/>
         <dimension zigzag="false" dataGroup="false">
-            <positioner xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="RegionPositioner" name="X11MA-PHS:E_SP" readback="X11MA-PGM:rbkenergy" settlingTime="0.5" asynchronous="false" id="PGMenergy">
+            <positioner xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="RegionPositioner" name="X11MA-PHS:E_SP" readback="X11MA-PGM:rbkenergy" settlingTime="0.5" done="X11MA-PHS:ALL-DONE" asynchronous="false" id="PGMenergy">
                 <region>
-                    <start>700.0</start>
-                    <end>720.0</end>
-                    <stepSize>0.5</stepSize>
+                    <start>785.0</start>
+                    <end>795.0</end>
+                    <stepSize>1.0</stepSize>
                 </region>
             </positioner>
             <detector xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="ScalarDetector" type="Double" name="X11MA-ES1:CADC2" id="sample"/>
@@ -19,7 +19,7 @@
             <detector xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="ScalarDetector" type="Double" name="X11MA-ID2:ALPHA" id="polangle"/>
             <detector xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="ScalarDetector" name="X11MA-ID2:ENERGY-OFFS" id="offset"/>
         </dimension>
-        <postAction xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="ChannelAction" channel="X07MA-PHS-E:OPT" value="PGM+ID" operation="put" type="String"/>
+        <postAction xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="ChannelAction" channel="X11PHS-E:OPT" value="PGM+ID2" operation="put" type="String"/>
     </scan>
     <visualization xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="LinePlot" x="PGMenergy" y="I0" title="I0"/>
     <visualization xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="LinePlot" x="PGMenergy" y="sample" title="sample"/>
diff --git a/script/scan_horizontal_outfocus.xml b/script/scan_horizontal_outfocus.xml
index a7cf996..13fe5d7 100644
--- a/script/scan_horizontal_outfocus.xml
+++ b/script/scan_horizontal_outfocus.xml
@@ -5,9 +5,9 @@
         <dimension zigzag="false" dataGroup="false">
             <positioner xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="RegionPositioner" name="X11MA-VME-ES4:TRY" asynchronous="false" id="horizontal">
                 <region>
-                    <start>9.0</start>
-                    <end>18.0</end>
-                    <stepSize>0.1</stepSize>
+                    <start>10.0</start>
+                    <end>20.0</end>
+                    <stepSize>0.25</stepSize>
                 </region>
             </positioner>
             <detector xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="ScalarDetector" type="Double" name="X11MA-ES1:CADC1" id="I0"/>
@@ -18,16 +18,24 @@
             <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="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"/>
+            <detector xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="ScalarDetector" name="X11MA-ES1:CADC3" id="TFY"/>
         </dimension>
         <dimension zigzag="false" dataGroup="false">
             <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.4 700</positions>
+                <positions>782.7 778</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="TFYnorm">
+            <mapping xsi:type="IDParameterMapping" refid="TFY" variable="c"/>
+            <mapping xsi:type="IDParameterMapping" refid="I0" variable="d"/>
+            <script>import math
 def process(c,d):
 	return c/d</script>
         </manipulation>
@@ -35,4 +43,6 @@ 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="TFY" title=" TFY"/>
+    <visualization xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="LinePlot" x="horizontal" y="TFYnorm" title=" TFY norm"/>
 </configuration>
diff --git a/script/scan_vertical.xml b/script/scan_vertical.xml
index d8e7cdb..cbd3bc3 100644
--- a/script/scan_vertical.xml
+++ b/script/scan_vertical.xml
@@ -5,9 +5,9 @@
         <dimension zigzag="false" dataGroup="false">
             <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>9.0</start>
-                    <end>17.0</end>
-                    <stepSize>0.25</stepSize>
+                    <start>3.0</start>
+                    <end>20.0</end>
+                    <stepSize>0.5</stepSize>
                 </region>
             </positioner>
             <detector xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="ScalarDetector" type="Double" name="X11MA-ES1:CADC1" id="I0"/>
@@ -17,16 +17,24 @@
             <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="X11MA-PHS:E_SP" id="energy"/>
+            <detector xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="ScalarDetector" name="X11MA-ES1:CADC3" id="TFY"/>
         </dimension>
         <dimension zigzag="false" dataGroup="false">
             <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.4 700</positions>
+                <positions>782.7 778</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="tfynorm">
+            <mapping xsi:type="IDParameterMapping" refid="TFY" variable="c"/>
+            <mapping xsi:type="IDParameterMapping" refid="I0" variable="d"/>
+            <script>import math
 def process(c,d):
 	return c/d</script>
         </manipulation>
@@ -34,4 +42,6 @@ def process(c,d):
     <visualization xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="LinePlot" x="vertical" y="TEY" title="TEY"/>
     <visualization xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="LinePlot" x="vertical" y="norm" title="TEY norm"/>
     <visualization xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="LinePlot" x="vertical" y="I0" title="I0"/>
+    <visualization xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="LinePlot" x="vertical" y="TFY" title=" TFY"/>
+    <visualization xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="LinePlot" x="vertical" y="tfynorm" title=" TFY norm"/>
 </configuration>