From f9df23f9daac712839e4a95e6ead4e7cf9a50520 Mon Sep 17 00:00:00 2001 From: gobbo_a Date: Wed, 20 Sep 2017 09:57:28 +0200 Subject: [PATCH] Startup --- config/devices.properties | 6 +++--- devices/cam_server.properties | 10 +++++----- script/Rolf/Example.py | 11 ++++++----- script/test/TestCamServer.py | 2 +- 4 files changed, 15 insertions(+), 14 deletions(-) diff --git a/config/devices.properties b/config/devices.properties index 6d46a57..f4aa657 100644 --- a/config/devices.properties +++ b/config/devices.properties @@ -1,3 +1,5 @@ +dispatcher=ch.psi.pshell.bs.Dispatcher|https://dispatcher-api.psi.ch/sf||| +cam_server=ch.psi.pshell.bs.PipelineServer|sf-daqsync-01:8889||| 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 @@ -10,11 +12,9 @@ xbpm_x=ch.psi.pshell.epics.ChannelDouble|SARFE10-PBPG050:XBPM-XPOS|||true xbpm_y=ch.psi.pshell.epics.ChannelDouble|SARFE10-PBPG050:XBPM-YPOS|||true hamp_x=ch.psi.pshell.epics.ChannelDouble|SARFE10-PBPG050:HAMP-XPOS|||true hamp_y=ch.psi.pshell.epics.ChannelDouble|SARFE10-PBPG050:HAMP-YPOS|||true -dispatcher=ch.psi.pshell.bs.Dispatcher|https://dispatcher-api.psi.ch/sf||| -cam_server=ch.psi.pshell.bs.PipelineServer|sf-daqsync-01:8889||| pbpg_mx=ch.psi.pshell.epics.Motor|SARFE10-PBPG050:MOTOR_X|||true pbpg_my=ch.psi.pshell.epics.Motor|SARFE10-PBPG050:MOTOR_Y|||true adc_xh1=ch.psi.pshell.epics.ChannelInteger|SARFE10-PBPG050:HAMP-014-x-h1-DATA-SUM|||true adc_yh2=ch.psi.pshell.epics.ChannelInteger|SARFE10-PBPG050:HAMP-011-y-h2-DATA-SUM|||true -camtool=ch.psi.pshell.bs.Camtool|localhost:10000||| m2rx=ch.psi.pshell.epics.Motor|SAROP21-OOMV096:W_RX|||true +#camtool=ch.psi.pshell.bs.Camtool|localhost:10000||| diff --git a/devices/cam_server.properties b/devices/cam_server.properties index edac462..64554c9 100644 --- a/devices/cam_server.properties +++ b/devices/cam_server.properties @@ -1,4 +1,4 @@ -#Mon Sep 04 14:59:52 CEST 2017 +#Wed Sep 06 09:26:00 CEST 2017 colormap=Flame colormapAutomatic=true colormapMax=NaN @@ -16,9 +16,9 @@ roiY=0 rotation=0.0 rotationCrop=false scale=1.0 -spatialCalOffsetX=-50.075987841945285 -spatialCalOffsetY=-50.10141987829615 -spatialCalScaleX=-1.0 -spatialCalScaleY=-1.0 +spatialCalOffsetX=0.0 +spatialCalOffsetY=0.0 +spatialCalScaleX=1.0 +spatialCalScaleY=1.0 spatialCalUnits=mm transpose=false diff --git a/script/Rolf/Example.py b/script/Rolf/Example.py index 4af3921..8d8eb43 100644 --- a/script/Rolf/Example.py +++ b/script/Rolf/Example.py @@ -1,8 +1,9 @@ -camtool.start("SARFE10-PPRM053") -#camtool.start("SAROP21-PPRM102") -#sensors = [xbpm_x, camtool.stream.getChild("x_rms"), camtool.stream.getChild("y_rms")] -#sensors = [camtool.stream.getChild("x_center_of_mass"), camtool.stream.getChild("x_rms"), camtool.stream.getChild("y_center_of_mass"),camtool.stream.getChild("y_rms")] -sensors = [camtool.stream.getChild("x_fit_mean"), camtool.stream.getChild("x_fit_standard_deviation"), camtool.stream.getChild("y_fit_mean"),camtool.stream.getChild("y_fit_standard_deviation")] +cam_server.start("SARFE10-PPRM053") +cam_server.stream.waitCacheChange(10000) +#cam_server.start("SAROP21-PPRM102") +#sensors = [xbpm_x, cam_server.stream.getChild("x_rms"), cam_server.stream.getChild("y_rms")] +#sensors = [cam_server.stream.getChild("x_center_of_mass"), cam_server.stream.getChild("x_rms"), cam_server.stream.getChild("y_center_of_mass"),cam_server.stream.getChild("y_rms")] +sensors = [cam_server.stream.getChild("x_fit_mean"), cam_server.stream.getChild("x_fit_standard_deviation"), cam_server.stream.getChild("y_fit_mean"),cam_server.stream.getChild("y_fit_standard_deviation")] #tscan(sensors, 10, 1.0) lscan (m2rx, sensors, -3.15, -2.85 , 0.01) diff --git a/script/test/TestCamServer.py b/script/test/TestCamServer.py index 9a4e301..c1985b0 100644 --- a/script/test/TestCamServer.py +++ b/script/test/TestCamServer.py @@ -8,5 +8,5 @@ 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) +tscan(SENSORS, 10, cam_server.stop() \ No newline at end of file