From e212aed88f296a6495493dc5ade581870efc2c8a Mon Sep 17 00:00:00 2001 From: gobbo_a Date: Fri, 5 May 2017 10:09:57 +0200 Subject: [PATCH] Closedown --- devices/CurrentCamera.properties | 16 ++++++++-------- script/Diagnostics/sig_process.py | 5 +++-- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/devices/CurrentCamera.properties b/devices/CurrentCamera.properties index 8529ac1..b365040 100644 --- a/devices/CurrentCamera.properties +++ b/devices/CurrentCamera.properties @@ -1,10 +1,10 @@ -#Fri May 05 08:12:42 CEST 2017 +#Fri May 05 09:51:51 CEST 2017 colormap=Flame -colormapAutomatic=false +colormapAutomatic=true colormapMax=500.0 colormapMin=0.0 -flipHorizontally=false -flipVertically=false +flipHorizontally=true +flipVertically=true grayscale=false imageHeight=2160 imageWidth=2560 @@ -21,9 +21,9 @@ rotation=0.0 rotationCrop=false scale=1.0 serverURL=localhost\:10000 -spatialCalOffsetX=-1057.4895329398094 -spatialCalOffsetY=-1420.5549062527236 -spatialCalScaleX=-8.510638153514359 -spatialCalScaleY=-8.235817137431614 +spatialCalOffsetX=-1292.0 +spatialCalOffsetY=-1062.0 +spatialCalScaleX=-8.784773060029282 +spatialCalScaleY=-8.854454897620366 spatialCalUnits=mm transpose=false diff --git a/script/Diagnostics/sig_process.py b/script/Diagnostics/sig_process.py index 5e3c856..626716e 100644 --- a/script/Diagnostics/sig_process.py +++ b/script/Diagnostics/sig_process.py @@ -34,11 +34,12 @@ def blm_remove_spikes(x): # 1 point spike x[i+2] = (x[i:i+5].sum() - x[i+2])/4 - if d_x[i+1] > 0.5 * maximum and d_x[i+2] >= -0.5 * maximum: - print ("B") + if d_x[i+1] > 0.5 * maximum and d_x[i+2] >= -0.5 * maximum: # 2 point spikes x[i+2] = (x[i:i+2].sum() + x[i+4])/3 + print ("C") x[i+3] = (x[i+1] + x[i+4:i+6].sum())/3 + print ("D") # Handle edge points if d_x[-1] > 0.5 * maximum: x[-1] = x[-3:-1].sum() / 2