From 0a069d467cf25c86782c1ceebd4415b6036266df Mon Sep 17 00:00:00 2001 From: wagner_u Date: Tue, 13 Mar 2018 20:52:28 +0100 Subject: [PATCH] Startup --- config/config.properties | 4 ++-- config/devices.properties | 6 ++---- script/PbpgPosXScan.py | 2 +- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/config/config.properties b/config/config.properties index 92f5dbd..10400f9 100644 --- a/config/config.properties +++ b/config/config.properties @@ -1,4 +1,4 @@ -#Thu Nov 23 08:49:13 CET 2017 +#Wed Jan 24 10:56:20 CET 2018 autoSaveScanData=true createSessionFiles=false dataLayout=default @@ -11,7 +11,7 @@ dataServerPort=-1 depthDimension=0 hostName= instanceName=PH -logDaysToLive=-1 +logDaysToLive=50 logLevel=Fine logLevelConsole=Off logPath={logs}/{date}_{time} diff --git a/config/devices.properties b/config/devices.properties index f4aa657..304a0cc 100644 --- a/config/devices.properties +++ b/config/devices.properties @@ -2,8 +2,8 @@ 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 -pbps53_xpos=ch.psi.pshell.epics.ChannelDouble|SARFE10-PBPS053:PD-XPOS|||true +pbps53_ypos=ch.psi.pshell.epics.ChannelDouble|SARFE10-PBPS053:YPOS|||true +pbps53_xpos=ch.psi.pshell.epics.ChannelDouble|SARFE10-PBPS053: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 @@ -14,7 +14,5 @@ hamp_x=ch.psi.pshell.epics.ChannelDouble|SARFE10-PBPG050:HAMP-XPOS|||true hamp_y=ch.psi.pshell.epics.ChannelDouble|SARFE10-PBPG050:HAMP-YPOS|||true 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 m2rx=ch.psi.pshell.epics.Motor|SAROP21-OOMV096:W_RX|||true #camtool=ch.psi.pshell.bs.Camtool|localhost:10000||| diff --git a/script/PbpgPosXScan.py b/script/PbpgPosXScan.py index 7fe3d95..e367caf 100644 --- a/script/PbpgPosXScan.py +++ b/script/PbpgPosXScan.py @@ -12,7 +12,7 @@ av_xbpm_x = create_averager(xbpm_x, count = 50, interval = -1, name = "av_xbpm_x av_xbpm_x.monitored = True #The actuals scan -r=lscan(pbpg_mx, [av_hamp_x, av_xbpm_x], -1.5, 1.5, 20, latency = 0.0) +r=lscan(pbpg_mx, [av_hamp_x, av_xbpm_x], -1.5, 1.5, 100, latency = 0.0) #Fitting values = to_array(r.getReadable(0), 'd')