From e39b1864e7d0db99b27dc9718b37c751a3eec0aa Mon Sep 17 00:00:00 2001
From: gac-x11ma <gac-x11ma@x11ma-cons-1.psi.ch>
Date: Wed, 15 Jan 2020 09:15:50 +0100
Subject: [PATCH]

---
 config/variables.properties   |  4 ++--
 devices/image.properties      | 30 +++++++++++++++---------------
 script/templates/Eiger2Img.py |  2 +-
 3 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/config/variables.properties b/config/variables.properties
index 026cc04..a644466 100644
--- a/config/variables.properties
+++ b/config/variables.properties
@@ -1,2 +1,2 @@
-#Tue Jan 14 17:13:08 CET 2020
-FileSequentialNumber=86
+#Wed Jan 15 09:15:11 CET 2020
+FileSequentialNumber=88
diff --git a/devices/image.properties b/devices/image.properties
index f22bedb..72ccd4f 100644
--- a/devices/image.properties
+++ b/devices/image.properties
@@ -1,25 +1,25 @@
-#Mon Jan 13 16:25:54 CET 2020
-colormapLogarithmic=false
-spatialCalScaleX=NaN
-spatialCalScaleY=NaN
-rescaleOffset=0.0
-roiWidth=-1
-colormap=Flame
-invert=false
-colormapMin=2.906652671323E9
-rotationCrop=false
-roiHeight=-1
-colormapAutomatic=false
-roiY=0
-roiX=0
+#Wed Jan 15 09:14:50 CET 2020
 spatialCalOffsetY=NaN
 spatialCalOffsetX=NaN
+colormapLogarithmic=false
 scale=1.0
 grayscale=false
-colormapMax=3.808717293458E9
+spatialCalScaleX=NaN
+spatialCalScaleY=NaN
+colormapMax=3300.457
+rescaleOffset=0.0
+roiWidth=-1
+colormap=Grayscale
+invert=false
+colormapMin=0.0
+rotationCrop=false
 rotation=0.0
 rescaleFactor=1.0
 spatialCalUnits=null
 flipVertically=false
+roiHeight=-1
 flipHorizontally=false
+colormapAutomatic=false
+roiY=0
+roiX=0
 transpose=false
diff --git a/script/templates/Eiger2Img.py b/script/templates/Eiger2Img.py
index a783f28..e4b212c 100644
--- a/script/templates/Eiger2Img.py
+++ b/script/templates/Eiger2Img.py
@@ -41,8 +41,8 @@ if METHOD == "Two_Energies":
         if en < 89.9 or en > 2000:
             raise Exception("Bad energy argument")
 
+set_exec_pars(path= path, format="txt", layout="table", open=True)
 path = "{data}/{year}_{month}/{date}" + "/" + METHOD + "_{seq}%03d"
-set_exec_pars(path= path, format="txt", layout="table", open="True")
 data_path = get_context().setup.expandPath(path)
 #get_context().incrementFileSequentialNumber()