From 2f0aa0712f2660e33f430b4dc3919d3c5070b868 Mon Sep 17 00:00:00 2001
From: sfop <sfop@sf-cons-02.psi.ch>
Date: Mon, 10 Jul 2017 21:47:33 +0200
Subject: [PATCH] Closedown

---
 devices/CurrentCamera.properties | 14 +++++++-------
 script/RFscan/GunScan.py         |  4 ++--
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/devices/CurrentCamera.properties b/devices/CurrentCamera.properties
index fc8bc6e..aac9219 100644
--- a/devices/CurrentCamera.properties
+++ b/devices/CurrentCamera.properties
@@ -1,8 +1,8 @@
-#Mon Jul 10 21:21:54 CEST 2017
+#Mon Jul 10 21:46:52 CEST 2017
 colormap=Flame
 colormapAutomatic=false
-colormapMax=2871.141
-colormapMin=95.477
+colormapMax=2871.0
+colormapMin=95.0
 flipHorizontally=false
 flipVertically=false
 grayscale=false
@@ -21,9 +21,9 @@ rotation=0.0
 rotationCrop=false
 scale=1.0
 serverURL=localhost\:10000
-spatialCalOffsetX=-861.4939970777481
-spatialCalOffsetY=-820.4883730911062
-spatialCalScaleX=-18.90359092620482
-spatialCalScaleY=-19.37984500632817
+spatialCalOffsetX=-1057.4895329398094
+spatialCalOffsetY=-1420.5549062527236
+spatialCalScaleX=-8.510638153514359
+spatialCalScaleY=-8.235817137431614
 spatialCalUnits=mm
 transpose=false
diff --git a/script/RFscan/GunScan.py b/script/RFscan/GunScan.py
index 6840d39..896f505 100644
--- a/script/RFscan/GunScan.py
+++ b/script/RFscan/GunScan.py
@@ -58,8 +58,8 @@ kill_camtool()
 check_camtool()
 camtool.start(camera_name)
 wait_camtool_message()
-x   = camtool.stream.getChild("x_center_of_mass")
-dx  = camtool.stream.getChild("x_rms")
+x   = camtool.stream.getChild("x_fit_mean")
+dx  = camtool.stream.getChild("x_fit_standard_deviation")
 
 #Creating averagers
 x_averager  = create_averager(x,  nb, -1)    # -1 event based, waits for the next value