Closedown

devices/CurrentCamera.properties

@@ -1,4 +1,4 @@
-#Fri May 05 10:22:07 CEST 2017
+#Fri May 05 10:33:48 CEST 2017
 colormap=Flame
 colormapAutomatic=true
 colormapMax=500.0
@@ -21,9 +21,9 @@ rotation=0.0
 rotationCrop=false
 scale=1.0
 serverURL=localhost\:10000
-spatialCalOffsetX=-353.4835668370595
-spatialCalOffsetY=-400.5089076620873
-spatialCalScaleX=-8.512332780393836
-spatialCalScaleY=-8.592910727775127
+spatialCalOffsetX=-1258.4915971545392
+spatialCalOffsetY=-1136.5261706827648
+spatialCalScaleX=-8.47590344433861
+spatialCalScaleY=-8.583690365910144
 spatialCalUnits=mm
 transpose=false

script/Diagnostics/sig_process.py

@@ -22,30 +22,21 @@ def blm_remove_spikes(x):
     :param x: input array
     :return: output array
     """
-    print("0")
     x = copy.copy(x)
     if x.size > 5:  # Must have enough sample points
-        print ("A")
         d_x = x[1:] - x[:-1]
         maximum = x.max() - x.min()
-        print ("B")
         for i in range(x.size-3):
-            print ("I=", i)
             if d_x[i+1] > 0.5 * maximum and d_x[i+2] < -0.5 * maximum:
-                print ("E")
                 # 1 point spike
                 x[i+2] = (x[i:i+5].sum() - x[i+2])/4
-                print ("F")
-            print ("p=", i)
             if d_x[i+1] > 0.5 * maximum and d_x[i+2] >= -0.5 * maximum:                
-                print ("c")
                 # 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")
+                if i < x(.size-4):    #TODO: FIX BY AG, CHECK 
+                    x[i+2] = (x[i:i+2].sum() + x[i+4])/3
+                if i < x(.size-6):    #TODO: FIX BY AG, CHECK 
+                    x[i+3] = (x[i+1] + x[i+4:i+6].sum())/3
         # Handle edge points
-        print ("G")
         if d_x[-1] > 0.5 * maximum:
             x[-1] = x[-3:-1].sum() / 2