From 37ac663cfcc2ba99e6385b52b9f36cf5c27e2ecb Mon Sep 17 00:00:00 2001 From: gobbo_a Date: Thu, 23 Nov 2017 08:49:31 +0100 Subject: [PATCH] Startup --- config/config.properties | 3 ++- devices/pbpg_mx.properties | 4 ++-- devices/pbpg_my.properties | 4 ++-- script/PbpgPosXScan.py | 6 +++--- script/PbpgPosYScan.py | 6 +++--- 5 files changed, 12 insertions(+), 11 deletions(-) diff --git a/config/config.properties b/config/config.properties index d5ab68a..92f5dbd 100644 --- a/config/config.properties +++ b/config/config.properties @@ -1,4 +1,4 @@ -#Mon Nov 06 12:06:12 CET 2017 +#Thu Nov 23 08:49:13 CET 2017 autoSaveScanData=true createSessionFiles=false dataLayout=default @@ -8,6 +8,7 @@ dataScanFlushRecords=false dataScanPreserveTypes=false dataScanReleaseRecords=false dataServerPort=-1 +depthDimension=0 hostName= instanceName=PH logDaysToLive=-1 diff --git a/devices/pbpg_mx.properties b/devices/pbpg_mx.properties index 4cf90e2..dc9fb4b 100644 --- a/devices/pbpg_mx.properties +++ b/devices/pbpg_mx.properties @@ -1,4 +1,4 @@ -#Sat Oct 21 15:38:05 CEST 2017 +#Mon Nov 06 13:38:48 CET 2017 defaultSpeed=1.5 estbilizationDelay=0 hasEnable=false @@ -9,7 +9,7 @@ minSpeed=NaN minValue=-1.6 offset=0.0 precision=3 -resolution=0.001 +resolution=0.01 rotation=false scale=1.0 startRetries=1 diff --git a/devices/pbpg_my.properties b/devices/pbpg_my.properties index 76e2907..bd02d46 100644 --- a/devices/pbpg_my.properties +++ b/devices/pbpg_my.properties @@ -1,4 +1,4 @@ -#Sat Oct 21 15:38:30 CEST 2017 +#Mon Nov 06 13:39:15 CET 2017 defaultSpeed=1.5 estbilizationDelay=0 hasEnable=false @@ -9,7 +9,7 @@ minSpeed=NaN minValue=-1.6 offset=0.0 precision=3 -resolution=0.001 +resolution=0.01 rotation=false scale=1.0 startRetries=1 diff --git a/script/PbpgPosXScan.py b/script/PbpgPosXScan.py index 2aa009b..7fe3d95 100644 --- a/script/PbpgPosXScan.py +++ b/script/PbpgPosXScan.py @@ -6,13 +6,13 @@ print "Starting" #Creating averaging devices -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 = create_averager(hamp_x, count = 50, interval = -1, name = "av_hamp_x") +av_xbpm_x = create_averager(xbpm_x, count = 50, interval = -1, name = "av_xbpm_x") #av_hamp_x.monitored = True av_xbpm_x.monitored = True #The actuals scan -r=lscan(pbpg_mx, [av_hamp_x, av_xbpm_x], -1.5, 1.5, 60, latency = 0.0) +r=lscan(pbpg_mx, [av_hamp_x, av_xbpm_x], -1.5, 1.5, 20, latency = 0.0) #Fitting values = to_array(r.getReadable(0), 'd') diff --git a/script/PbpgPosYScan.py b/script/PbpgPosYScan.py index 0b866f1..e3452b8 100644 --- a/script/PbpgPosYScan.py +++ b/script/PbpgPosYScan.py @@ -6,13 +6,13 @@ print "Starting" #Creating averaging devices -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_hamp_y = create_averager(hamp_y, count = 50, interval = -1, name = "av_hamp_y") +av_xbpm_y = create_averager(xbpm_y, count = 50, interval = -1, name = "av_xbpm_y") av_xbpm_y.monitored = True #The actuals scan -r=lscan(pbpg_my, [av_hamp_y, av_xbpm_y], -1.5, 1.5, 30, latency = 0.0) +r=lscan(pbpg_my, [av_hamp_y, av_xbpm_y], -1.5, 1.5, 20, latency = 0.0) #Fitting values = to_array(r.getReadable(0), 'd')