From d2eaa659e4ce0c82d4e686dd95b7da6e8c37934b Mon Sep 17 00:00:00 2001
From: gobbo_a <gobbo_a@sf-lc6a.psi.ch>
Date: Fri, 14 Jul 2017 16:39:23 +0200
Subject: [PATCH] Closedown

---
 devices/CurrentCamera.properties       | 20 ++++++++++----------
 script/RFscan/phase_scan_caqtdm_set.py | 17 ++++++++++++++++-
 2 files changed, 26 insertions(+), 11 deletions(-)

diff --git a/devices/CurrentCamera.properties b/devices/CurrentCamera.properties
index ca05c61..857191a 100644
--- a/devices/CurrentCamera.properties
+++ b/devices/CurrentCamera.properties
@@ -1,16 +1,16 @@
-#Fri Jul 14 13:24:34 CEST 2017
+#Fri Jul 14 16:19:11 CEST 2017
 colormap=Flame
 colormapAutomatic=true
-colormapMax=3054.0
+colormapMax=5.0
 colormapMin=0.0
 flipHorizontally=false
 flipVertically=false
 grayscale=false
-imageHeight=2160
-imageWidth=2560
+imageHeight=1200
+imageWidth=1246
 invert=false
-regionStartX=1
-regionStartY=1
+regionStartX=304
+regionStartY=8
 rescaleFactor=1.0
 rescaleOffset=0.0
 roiHeight=-1
@@ -21,9 +21,9 @@ rotation=0.0
 rotationCrop=false
 scale=1.0
 serverURL=localhost\:10000
-spatialCalOffsetX=-283.5983027819687
-spatialCalOffsetY=-226.5368173595303
-spatialCalScaleX=-26.714159330404335
-spatialCalScaleY=-27.10027046837886
+spatialCalOffsetX=-543.4734026062152
+spatialCalOffsetY=-402.4506689243812
+spatialCalScaleX=-7.7264088212456405
+spatialCalScaleY=-7.804878269075813
 spatialCalUnits=mm
 transpose=false
diff --git a/script/RFscan/phase_scan_caqtdm_set.py b/script/RFscan/phase_scan_caqtdm_set.py
index 48794f8..28695f2 100644
--- a/script/RFscan/phase_scan_caqtdm_set.py
+++ b/script/RFscan/phase_scan_caqtdm_set.py
@@ -1,3 +1,5 @@
+do_elog = True
+
 if get_exec_pars().source == CommandSource.ui:
     station = "STEST01"
 else:
@@ -7,16 +9,29 @@ phase_set = caget(station + "-RSYS:PHASE-SET")
 ampli_set = caget(station + "-RSYS:AMPLT-SET")
 power_set = caget(station + "-RSYS:POWER-SET")
 
+n = 0
 if (phase_set == 'True'):
     phase_offset    = caget(station + "-RSYS:SET-VSUM-PHASE-OFFSET-BASE-CALC")
     caput(station + "-RSYS:SET-VSUM-PHASE-OFFSET-BASE",  phase_offset)
     print phase_set
+    n = n + 1
 if (ampli_set == 'True'):
     amplitude_scale    = caget(station + "-RSYS:SET-VSUM-AMPLT-SCALE-CALC")
     caput(station + "-RSYS:SET-VSUM-AMPLT-SCALE",  amplitude_scale)
     print ampli_set
+    n = n + 1
 if (power_set == 'True'):
     power_scale    = caget(station + "-RSYS:SET-VOLT-POWER-SCALE-CALC")
     caput(station + "-RSYS:SET-VOLT-POWER-SCALE",  power_scale)
     print power_set
-caput(station + "-RSYS:CMD-LOAD-CALIB-BEAM",  1)       
+    n = n + 1
+caput(station + "-RSYS:CMD-LOAD-CALIB-BEAM",  1)
+
+if do_elog == True and n > 0:
+    title = "Set phase" + station
+    log_msg = ""
+    if (phase_set == 'True'): log_msg = log_msg + station + "-RSYS:SET-VSUM-PHASE-OFFSET-BASE:     %0.2f" % phase_offset    + " deg \n"
+    if (ampli_set == 'True'): log_msg = log_msg + station + "-RSYS:SET-VSUM-AMPLT-SCALE:           %0.3f" % amplitude_scale + " MV \n"
+    if (power_set == 'True'): log_msg = log_msg + station + "-RSYS:SET-VOLT-POWER-SCALE:           %0.5f" % power_scale     + " MW/MV^2"
+    attachments = []
+    elog(title, log_msg, attachments)
\ No newline at end of file