From dc8dec4d1e6874a22fa142d778b28511f034f204 Mon Sep 17 00:00:00 2001
From: X11MA <X11MA@x11ma-cons-1.psi.ch>
Date: Fri, 19 May 2017 22:23:56 +0200
Subject: [PATCH] Startup

---
 config/energy_scan.properties       | 5 +++--
 script/EnergyScan.py                | 2 +-
 script/scan_horizontal_outfocus.xml | 4 ++--
 script/scan_vertical.xml            | 4 ++--
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/config/energy_scan.properties b/config/energy_scan.properties
index ac3592b..cc47e69 100644
--- a/config/energy_scan.properties
+++ b/config/energy_scan.properties
@@ -1,3 +1,4 @@
+N=385.0;440.0;2.0;10.0;-2.0;-4.0
 Fe_Sridhar=690.0;760.0;3.0;10.0;-8.0;-9.0
 Cu=920.0;970.0;1.0;10.0;-2.3;-2.3
 V&O_lin_FE1.25x1.25=505.0;560.0;2.0;10.0;-1.2;-2.5
@@ -7,11 +8,11 @@ Fe_FE1.25x1.25=680.0;750.0;0.5;10.0;-5.0;-4.0
 MCP test=778.0;779.0;0.2;0.0;-8.8;-9.5
 Cr2x2=560.0;610.0;2.0;10.0;1.9;0.9
 V=505.0;540.0;2.0;10.0;-7.5;-8.5
-Ni=825.0;890.0;2.0;10.0;-3.5;3.0
+Ni=825.0;890.0;2.0;10.0;-9.0;-11.5
 Ni Linear=825.0;890.0;2.0;10.0;-3.5;-5.5
 O=500.0;560.0;2.0;10.0;-7.5;-8.5
 Gd=1170.0;1240.0;2.0;10.0;-13.0;-11.5
-Cr=560.0;610.0;2.0;10.0;-6.2;-7.2
+Cr=560.0;610.0;3.0;10.0;-7.5;-9.0
 Co=750.0;825.0;2.0;10.0;-9.5;-11.5
 Mn=620.0;670.0;2.0;10.0;-7.5;-8.1
 Fe=680.0;750.0;2.0;10.0;-8.0;-9.0
diff --git a/script/EnergyScan.py b/script/EnergyScan.py
index c7ca862..4572784 100644
--- a/script/EnergyScan.py
+++ b/script/EnergyScan.py
@@ -282,7 +282,7 @@ open_vg11()
 time.sleep(0.5)
 open_vg12()
 time.sleep(0.5)
-#open_vg13()
+open_vg13()
 
 for scan_no  in range(number_of_scans):
     suffix = ("%03d" % fid)
diff --git a/script/scan_horizontal_outfocus.xml b/script/scan_horizontal_outfocus.xml
index 13fe5d7..0af8441 100644
--- a/script/scan_horizontal_outfocus.xml
+++ b/script/scan_horizontal_outfocus.xml
@@ -5,8 +5,8 @@
         <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>10.0</start>
-                    <end>20.0</end>
+                    <start>11.0</start>
+                    <end>18.0</end>
                     <stepSize>0.25</stepSize>
                 </region>
             </positioner>
diff --git a/script/scan_vertical.xml b/script/scan_vertical.xml
index 1b6f5fb..086818f 100644
--- a/script/scan_vertical.xml
+++ b/script/scan_vertical.xml
@@ -5,8 +5,8 @@
         <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>8.0</start>
-                    <end>16.0</end>
+                    <start>7.0</start>
+                    <end>15.0</end>
                     <stepSize>0.5</stepSize>
                 </region>
             </positioner>