Changeset 2670 for trunk/src

Timestamp:

10/18/12 14:08:21 (12 years ago)

Author:

Malte Marquarding

Message:

Fix for #270: rmedian flags were incorrectly handled. Also remove excessive conversion step

Location:

trunk/src

Files:

• MathUtils.cpp (modified) (1 diff)
• STMath.cpp (modified) (1 diff)

trunk/src/MathUtils.cpp

@@ -197 +197 @@
     // add data value
     out[i] = ms.add(in[i+hwidth], flag[i+hwidth]);
-    outflag[i] = (ms.nval() == 0);
+    outflag[i] = (ms.nval() > 0 );
   }
   // replicate edge values from first value with full width of values

trunk/src/STMath.cpp

@@ -2455 +2455 @@
       if (kernel == "hanning") {
         mathutil::hanning(specout, maskout, spec, !mask);
-        convertArray(flag, !maskout);
       } else if (kernel == "rmedian") {
         mathutil::runningMedian(specout, maskout, spec , mask, width);
-        convertArray(flag, maskout);
       } else if (kernel == "poly") {
         mathutil::polyfit(specout, maskout, spec, !mask, width, order);
-        convertArray(flag, !maskout);
       }