This commit is contained in:
wagner_u
2018-03-13 20:52:28 +01:00
parent 37ac663cfc
commit 0a069d467c
3 changed files with 5 additions and 7 deletions

View File

@@ -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}

View File

@@ -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|||

View File

@@ -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')