From b5cfacc4d62247215ef42eb78318477fd8b32870 Mon Sep 17 00:00:00 2001
From: sfop <sfop@sf-cons-01.psi.ch>
Date: Fri, 17 Feb 2017 15:27:00 +0100
Subject: [PATCH] Closedown

---
 devices/CurrentCamera.properties       | 16 ++++++++--------
 script/RFscan/phase_scan_caqtdm.py     |  5 ++---
 script/RFscan/phase_scan_caqtdm_sim.py |  7 +++----
 3 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/devices/CurrentCamera.properties b/devices/CurrentCamera.properties
index 0d5151f..e488a91 100644
--- a/devices/CurrentCamera.properties
+++ b/devices/CurrentCamera.properties
@@ -1,13 +1,13 @@
-#Tue Feb 14 15:23:48 CET 2017
+#Fri Feb 17 15:11:49 CET 2017
 colormap=Temperature
 colormapAutomatic=true
 colormapMax=0.0
 colormapMin=0.0
 flipHorizontally=false
-flipVertically=false
+flipVertically=true
 grayscale=false
-imageHeight=1040
-imageWidth=1392
+imageHeight=1200
+imageWidth=1246
 invert=false
 rescaleFactor=1.0
 rescaleOffset=0.0
@@ -19,9 +19,9 @@ rotation=0.0
 rotationCrop=false
 scale=1.0
 serverURL=sf-cons-01\:10000
-spatialCalOffsetX=0.0
-spatialCalOffsetY=0.0
-spatialCalScaleX=1.0
-spatialCalScaleY=1.0
+spatialCalOffsetX=-630.0
+spatialCalOffsetY=-612.0
+spatialCalScaleX=-26.761819803746654
+spatialCalScaleY=-26.595744680851062
 spatialCalUnits=mm
 transpose=false
diff --git a/script/RFscan/phase_scan_caqtdm.py b/script/RFscan/phase_scan_caqtdm.py
index b89ab84..ed22bfa 100644
--- a/script/RFscan/phase_scan_caqtdm.py
+++ b/script/RFscan/phase_scan_caqtdm.py
@@ -40,14 +40,13 @@ arr_phase,arr_energy = [],[]
 def after(rec):
    global disp, energy0
    arr_phase.append(rec.positions[0])
-   arr_energy.append(rec.values[1].mean/1000.0/disp*energy0)
+   arr_energy.append(rec.values[0].mean/1000.0/disp*energy0)
    caput(station + "-RSYS:GET-ENERGY-ARRAY", to_array(arr_energy,'d'))
    caput(station + "-RSYS:GET-PHASE-ARRAY",  to_array(arr_phase, 'd'))
 
 try:
-    Vb = create_averager(V, nb, 0.100)
     xb = create_averager(x, nb, 0.100)
-    r = lscan(phase, [Vb, xb], start, stop, step , latency=lat, after_read = after)
+    r = lscan(phase, xb, start, stop, step , latency=lat, after_read = after)
     rf_phase = r.getPositions(0)
     energy   = [val.mean/1000.0/disp*energy0 for val in r.getReadable(1)]
     caput(station + "-RSYS:GET-ENERGY-ARRAY", to_array(energy,  'd'))
diff --git a/script/RFscan/phase_scan_caqtdm_sim.py b/script/RFscan/phase_scan_caqtdm_sim.py
index fb08fe7..635b405 100644
--- a/script/RFscan/phase_scan_caqtdm_sim.py
+++ b/script/RFscan/phase_scan_caqtdm_sim.py
@@ -40,16 +40,15 @@ arr_phase,arr_energy = [],[]
 def after(rec):
    global disp, energy0
    arr_phase.append(rec.positions[0])
-   arr_energy.append(rec.values[1].mean/1000.0/disp*energy0)
+   arr_energy.append(rec.values[0].mean/1000.0/disp*energy0)
    caput(station + "-RSYS:GET-ENERGY-ARRAY", to_array(arr_energy,'d'))
    caput(station + "-RSYS:GET-PHASE-ARRAY",  to_array(arr_phase, 'd'))
 
 try:
-    Vb = create_averager(V, nb, 0.100)
     xb = create_averager(x, nb, 0.100)
-    r = lscan(phase, [Vb, xb], start, stop, step , latency=lat, after_read = after)
+    r = lscan(phase, xb, start, stop, step , latency=lat, after_read = after)
     rf_phase = r.getPositions(0)
-    energy   = [val.mean/1000.0/disp*energy0 for val in r.getReadable(1)]
+    energy   = [val.mean/1000.0/disp*energy0 for val in r.getReadable(0)]
     caput(station + "-RSYS:GET-ENERGY-ARRAY", to_array(energy,  'd'))
     caput(station + "-RSYS:GET-PHASE-ARRAY",  to_array(rf_phase,'d'))
     phase_fit_max = None