From 2ea6e1a25005dfaa7e8b10b97d463b1bfefbfc7d Mon Sep 17 00:00:00 2001
From: sfop <sfop@sf-cons-01.psi.ch>
Date: Mon, 10 Jul 2017 19:56:54 +0200
Subject: [PATCH] Closedown

---
 devices/Beam phase.properties      |  4 ++--
 devices/CurrentCamera.properties   | 20 ++++++++++----------
 script/RFscan/SchottkyScan.py      |  2 +-
 script/RFscan/phase_scan_caqtdm.py |  2 ++
 4 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/devices/Beam phase.properties b/devices/Beam phase.properties
index 1300b7f..11237ad 100644
--- a/devices/Beam phase.properties	
+++ b/devices/Beam phase.properties	
@@ -1,9 +1,9 @@
-#Tue Jul 04 09:53:47 CEST 2017
+#Mon Jul 10 19:49:59 CEST 2017
 maxValue=360.0
 minValue=-360.0
 offset=0.0
 precision=3
-resolution=1.0
+resolution=0.01
 rotation=false
 scale=1.0
 unit=deg
diff --git a/devices/CurrentCamera.properties b/devices/CurrentCamera.properties
index 0d57206..9a5ed4b 100644
--- a/devices/CurrentCamera.properties
+++ b/devices/CurrentCamera.properties
@@ -1,16 +1,16 @@
-#Mon Jul 10 16:47:54 CEST 2017
+#Mon Jul 10 19:55:52 CEST 2017
 colormap=Flame
 colormapAutomatic=true
-colormapMax=606.0
+colormapMax=251.0
 colormapMin=0.0
 flipHorizontally=false
 flipVertically=false
 grayscale=false
-imageHeight=1206
-imageWidth=1192
+imageHeight=1680
+imageWidth=1744
 invert=false
-regionStartX=352
-regionStartY=2
+regionStartX=433
+regionStartY=241
 rescaleFactor=1.0
 rescaleOffset=0.0
 roiHeight=-1
@@ -21,9 +21,9 @@ rotation=0.0
 rotationCrop=false
 scale=1.0
 serverURL=localhost\:10000
-spatialCalOffsetX=-307.51337366396956
-spatialCalOffsetY=-328.50773007539067
-spatialCalScaleX=-29.549881440739966
-spatialCalScaleY=-26.711185419891642
+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 3e92910..0a74405 100644
--- a/script/RFscan/SchottkyScan.py
+++ b/script/RFscan/SchottkyScan.py
@@ -48,7 +48,7 @@ bph.config.minValue   = -360.0
 bph.config.maxValue   = 360.0
 bph.config.precision  = 3
 bph.config.rotation   = False
-bph.config.resolution = 1.0
+bph.config.resolution = 0.01
 bph.config.save()
 bph.initialize()
 rph.initialize()
diff --git a/script/RFscan/phase_scan_caqtdm.py b/script/RFscan/phase_scan_caqtdm.py
index 738f11c..6c7a5d0 100644
--- a/script/RFscan/phase_scan_caqtdm.py
+++ b/script/RFscan/phase_scan_caqtdm.py
@@ -58,6 +58,8 @@ def after(rec):
    caput(station + "-RSYS:GET-ENERGY-ARRAY", to_array(arr_energy,'d'))
 
 try:
+    phase.write(start)
+    time.sleep(1.0)
     x_averager = create_averager(x, nb, 0.100)
     r = lscan(phase, x_averager, start, stop, step, latency=lat, after_read = after)
     rf_phase = r.getPositions(0)