From a71b6acd92cda295952574dc615067dd45d36a51 Mon Sep 17 00:00:00 2001
From: gac-x03da <gac-x03da@x03da-cons-1.psi.ch>
Date: Wed, 20 Nov 2019 20:29:04 +0100
Subject: [PATCH] Startup

---
 config/variables.properties       |  4 ++--
 script/optics/CheckMachineBump.py | 12 +++++++-----
 script/test/demo_calling_xps.py   |  2 +-
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/config/variables.properties b/config/variables.properties
index 71891732..217efe47 100644
--- a/config/variables.properties
+++ b/config/variables.properties
@@ -1,2 +1,2 @@
-#Tue Nov 19 17:27:26 CET 2019
-FileSequentialNumber=950
+#Wed Nov 20 20:15:40 CET 2019
+FileSequentialNumber=996
diff --git a/script/optics/CheckMachineBump.py b/script/optics/CheckMachineBump.py
index 6cc9a70c..3a4f1bf3 100644
--- a/script/optics/CheckMachineBump.py
+++ b/script/optics/CheckMachineBump.py
@@ -6,15 +6,17 @@
 import ch.psi.pshell.plot.RangeSelectionPlot.RangeSelection as RangeSelection
 
 rs = RangeSelection(706., 714.)
-rs.setVars([0.1, 0.05, 1, 800.]) #Time, Size, Iteration, photon energy
+rs.setVars([0.3, 0.025, 1, 800.]) #Time, Size, Iteration, photon energy
 
 
 # DynamicBumpLock.write("X03DA")
 # DynamicBumpLock.write("none")
 
+BUMP_TIMEOUT = 30000
+
 print "switching to linear"
 DynamicBumpMode.write("off")
-DynamicBumpYAngle.waitValueInRange(0.0, 0.02, 30000)
+DynamicBumpYAngle.waitValueInRange(0.0, 0.002, BUMP_TIMEOUT)
 print "running XPS spectrum"
 run("XPSSpectrum", {"save_scienta_image":True, 
                     "ranges":[rs, ], 
@@ -23,7 +25,7 @@ run("XPSSpectrum", {"save_scienta_image":True,
 
 print "switching to positive helicity"
 DynamicBumpMode.write("pos")
-DynamicBumpYAngle.waitValueInRange(0.2, 0.02, 30000)
+DynamicBumpYAngle.waitValueInRange(0.2, 0.002, BUMP_TIMEOUT)
 print "running XPS spectrum"
 run("XPSSpectrum", {"save_scienta_image":True, 
                     "ranges":[rs, ], 
@@ -32,7 +34,7 @@ run("XPSSpectrum", {"save_scienta_image":True,
 
 print "switching to negative helicity"
 DynamicBumpMode.write("neg")
-DynamicBumpYAngle.waitValueInRange(-0.2, 0.02, 30000)
+DynamicBumpYAngle.waitValueInRange(-0.2, 0.002, BUMP_TIMEOUT)
 print "running XPS spectrum"
 run("XPSSpectrum", {"save_scienta_image":True, 
                     "ranges":[rs, ], 
@@ -41,5 +43,5 @@ run("XPSSpectrum", {"save_scienta_image":True,
 
 print "switching to linear"
 DynamicBumpMode.write("off")
-DynamicBumpYAngle.waitValueInRange(0.0, 0.02, 30000)
+DynamicBumpYAngle.waitValueInRange(0.0, 0.002, BUMP_TIMEOUT)
 print "done"
diff --git a/script/test/demo_calling_xps.py b/script/test/demo_calling_xps.py
index 44f1fd79..82ff15cb 100644
--- a/script/test/demo_calling_xps.py
+++ b/script/test/demo_calling_xps.py
@@ -1,7 +1,7 @@
 import ch.psi.pshell.plot.RangeSelectionPlot.RangeSelection as RangeSelection
 
 rs = RangeSelection(902.0,920.0)
-rs.setVars([0.5, 0.5, 1]) #Time, Size, Itaration
+rs.setVars([0.5, 0.5, 1, 800.]) #Time, Size, Iteration, photon energy
 
 run("XPSSpectrum", {"save_scienta_image":True, 
                     "ranges":[rs, ],