From 3acc64bb7a8db03862339955f65af3f8ce73b4f3 Mon Sep 17 00:00:00 2001
From: sfop <sfop@sf-cons-02.psi.ch>
Date: Tue, 5 Sep 2017 08:47:27 +0200
Subject: [PATCH] Startup

---
 config/devices.properties     |  8 ++++++--
 devices/cam_server.properties | 10 +++++-----
 script/PbpgPosXScan.py        |  4 ++--
 script/PbpgPosYScan.py        |  4 ++--
 script/test/TestCamServer.py  | 12 ++++++++++++
 5 files changed, 27 insertions(+), 11 deletions(-)
 create mode 100644 script/test/TestCamServer.py

diff --git a/config/devices.properties b/config/devices.properties
index 952dda5..6d46a57 100644
--- a/config/devices.properties
+++ b/config/devices.properties
@@ -1,5 +1,9 @@
-apu44x=ch.psi.pshell.epics.Motor|SARFE10-OAPU044:MOTOR_X|||
-apu44y=ch.psi.pshell.epics.Motor|SARFE10-OAPU044:MOTOR_Y|||
+pbps53_mx=ch.psi.pshell.epics.Motor|SARFE10-PBPS053:MOTOR_X1|||true
+apu44x=ch.psi.pshell.epics.Motor|SARFE10-OAPU044:MOTOR_X|||true
+pbps53_ypos=ch.psi.pshell.epics.ChannelDouble|SARFE10-PBPS053:PD-YPOS|||true
+pbps53_xpos=ch.psi.pshell.epics.ChannelDouble|SARFE10-PBPS053:PD-XPOS|||true
+pbps53_my=ch.psi.pshell.epics.Motor|SARFE10-PBPS053:MOTOR_Y1|||true
+apu44y=ch.psi.pshell.epics.Motor|SARFE10-OAPU044:MOTOR_Y|||true
 m1ba=ch.psi.pshell.epics.Motor|SAROP21-OOMV092:BA|||false
 m1bb=ch.psi.pshell.epics.Motor|SAROP21-OOMV092:BB|||
 xbpm_x=ch.psi.pshell.epics.ChannelDouble|SARFE10-PBPG050:XBPM-XPOS|||true
diff --git a/devices/cam_server.properties b/devices/cam_server.properties
index 874b2b3..edac462 100644
--- a/devices/cam_server.properties
+++ b/devices/cam_server.properties
@@ -1,4 +1,4 @@
-#Fri Sep 01 16:45:20 CEST 2017
+#Mon Sep 04 14:59:52 CEST 2017
 colormap=Flame
 colormapAutomatic=true
 colormapMax=NaN
@@ -16,9 +16,9 @@ roiY=0
 rotation=0.0
 rotationCrop=false
 scale=1.0
-spatialCalOffsetX=-677.5082585941401
-spatialCalOffsetY=-627.4707187276099
-spatialCalScaleX=-8.737659534534535
-spatialCalScaleY=-8.834897886167417
+spatialCalOffsetX=-50.075987841945285
+spatialCalOffsetY=-50.10141987829615
+spatialCalScaleX=-1.0
+spatialCalScaleY=-1.0
 spatialCalUnits=mm
 transpose=false
diff --git a/script/PbpgPosXScan.py b/script/PbpgPosXScan.py
index 480a08e..73e0836 100644
--- a/script/PbpgPosXScan.py
+++ b/script/PbpgPosXScan.py
@@ -6,8 +6,8 @@ print "Starting"
 
 
 #Creating averaging devices
-av_hamp_x = create_averager(hamp_x, count = 10, interval = -1, name = "av_hamp_x")
-av_xbpm_x = create_averager(xbpm_x, count = 10, interval = -1, name = "av_xbpm_x")
+av_hamp_x = create_averager(hamp_x, count = 20, interval = -1, name = "av_hamp_x")
+av_xbpm_x = create_averager(xbpm_x, count = 20, interval = -1, name = "av_xbpm_x")
 #av_hamp_x.monitored = True
 av_xbpm_x.monitored = True
 
diff --git a/script/PbpgPosYScan.py b/script/PbpgPosYScan.py
index 4db2580..409589a 100644
--- a/script/PbpgPosYScan.py
+++ b/script/PbpgPosYScan.py
@@ -6,8 +6,8 @@ print "Starting"
 
 
 #Creating averaging devices
-av_hamp_y = create_averager(hamp_y, count = 10, interval = -1, name = "av_hamp_y")
-av_xbpm_y = create_averager(xbpm_y, count = 10, interval = -1, name = "av_xbpm_y")
+av_hamp_y = create_averager(hamp_y, count = 20, interval = -1, name = "av_hamp_y")
+av_xbpm_y = create_averager(xbpm_y, count = 20, interval = -1, name = "av_xbpm_y")
 
 av_xbpm_y.monitored = True
 
diff --git a/script/test/TestCamServer.py b/script/test/TestCamServer.py
new file mode 100644
index 0000000..9a4e301
--- /dev/null
+++ b/script/test/TestCamServer.py
@@ -0,0 +1,12 @@
+
+cam_server.start("SAROP21-PPRM102")
+cam_server.stream.waitCacheChange(10000)
+
+print cam_server.stream.take().identifiers
+
+
+SENSORS = [cam_server.stream.getChild("x_rms"), cam_server.stream.getChild("x_rms"), adc_xh1]
+
+
+tscan(SENSORS, 10, 0.5)
+cam_server.stop()
\ No newline at end of file