From 3af83db044a64adeaf72cbdea4f4fc66123a7b46 Mon Sep 17 00:00:00 2001
From: sfop <sfop@sf-cons-02.psi.ch>
Date: Wed, 31 May 2017 08:34:58 +0200
Subject: [PATCH] Closedown

---
 devices/CurrentCamera.properties | 12 ++++++------
 devices/camtool.properties       | 10 +++++-----
 script/RFscan/SchottkyScan.py    | 18 +++++++++---------
 3 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/devices/CurrentCamera.properties b/devices/CurrentCamera.properties
index 595bae3..09af6af 100644
--- a/devices/CurrentCamera.properties
+++ b/devices/CurrentCamera.properties
@@ -1,10 +1,10 @@
-#Tue May 30 17:05:36 CEST 2017
+#Wed May 31 08:29:52 CEST 2017
 colormap=Flame
 colormapAutomatic=true
 colormapMax=35000.0
 colormapMin=300.0
 flipHorizontally=false
-flipVertically=false
+flipVertically=true
 grayscale=false
 imageHeight=1680
 imageWidth=1744
@@ -21,9 +21,9 @@ rotation=0.0
 rotationCrop=false
 scale=1.0
 serverURL=localhost\:10000
-spatialCalOffsetX=-1093.4812581603794
-spatialCalOffsetY=-1098.5114274849898
-spatialCalScaleX=-7.617446798629459
-spatialCalScaleY=-7.774538463917676
+spatialCalOffsetX=-861.0
+spatialCalOffsetY=-820.0
+spatialCalScaleX=-18.90359168241966
+spatialCalScaleY=-19.37984496124031
 spatialCalUnits=mm
 transpose=false
diff --git a/devices/camtool.properties b/devices/camtool.properties
index b4c6b11..c3d663c 100644
--- a/devices/camtool.properties
+++ b/devices/camtool.properties
@@ -1,4 +1,4 @@
-#Wed May 24 10:23:44 CEST 2017
+#Wed May 31 08:30:57 CEST 2017
 colormap=Flame
 colormapAutomatic=true
 colormapMax=578.797
@@ -18,9 +18,9 @@ roiY=0
 rotation=0.0
 rotationCrop=false
 scale=1.0
-spatialCalOffsetX=-642.5156395013756
-spatialCalOffsetY=-609.5079128412647
-spatialCalScaleX=-26.85765405371486
-spatialCalScaleY=-27.12477275985196
+spatialCalOffsetX=-861.4939970777481
+spatialCalOffsetY=-820.4883730911062
+spatialCalScaleX=-18.90359092620482
+spatialCalScaleY=-19.37984500632817
 spatialCalUnits=mm
 transpose=false
diff --git a/script/RFscan/SchottkyScan.py b/script/RFscan/SchottkyScan.py
index 552bc83..30f3ba3 100644
--- a/script/RFscan/SchottkyScan.py
+++ b/script/RFscan/SchottkyScan.py
@@ -51,12 +51,12 @@ phase_ref = x[index_max] - 80
 
 set_return(phase_ref)
 
- save the entry in the logbook
-if get_option("Generated data file:\n" + get_exec_pars().path +"\n\n" + "Save to ELOG?", "YesNo") == "Yes":
-    log_msg =           "Start:        %0.1f"   % start   + "deg\n"
-    log_msg = log_msg + "Stop:         %0.1f"   % stop    + "deg\n"
-    log_msg = log_msg + "Step:         %0.1f"   % nb      + "deg\n"
-    log_msg = log_msg + "Nb samples:   %0.0f"   % nb      + "\n"
-    log_msg = log_msg + "Latency:      %0.3f"   % lat     + "s\n"
-    log_msg = log_msg + "Data file:    " + get_exec_pars().path
-    elog("Schottky Scan", log_msg, get_plot_snapshots())
+# save the entry in the logbook
+#if get_option("Generated data file:\n" + get_exec_pars().path +"\n\n" + "Save to ELOG?", "YesNo") == "Yes":
+#    log_msg =           "Start:        %0.1f"   % start   + "deg\n"
+#    log_msg = log_msg + "Stop:         %0.1f"   % stop    + "deg\n"
+#    log_msg = log_msg + "Step:         %0.1f"   % nb      + "deg\n"
+#    log_msg = log_msg + "Nb samples:   %0.0f"   % nb      + "\n"
+#    log_msg = log_msg + "Latency:      %0.3f"   % lat     + "s\n"
+#    log_msg = log_msg + "Data file:    " + get_exec_pars().path
+#    elog("Schottky Scan", log_msg, get_plot_snapshots())