Changeset 1033 for trunk/src/STMath.cpp

Timestamp:

04/26/06 13:51:58 (18 years ago)

Author:

mar637

Message:

Fix for Ticket #33; was confusing mask and flag again. == flag svn diff ../python/scantable.py!

File:

• trunk/src/STMath.cpp (modified) (2 diffs)

trunk/src/STMath.cpp

@@ -792 +792 @@
 {
   CountedPtr< Scantable > out = getScantable(in, false);
-  Table& table = in->table();
+  Table& table = out->table();
   VectorKernel::KernelTypes type = VectorKernel::toKernelType(kernel);
   // same IFNO should have same no of channels
@@ -815 +815 @@
       if ( type == VectorKernel::HANNING ) {
         Vector<Bool> maskout;
-        mathutil::hanning(specout, maskout, spec , mask);
-        convertArray(flag, maskout);
+        mathutil::hanning(specout, maskout, spec , !mask);
+        convertArray(flag, !maskout);
         flagCol.put(i, flag);
-      } else {
+        specCol.put(i, specout);
+     } else {
         mathutil::replaceMaskByZero(specout, mask);
         conv.linearConv(specout, spec);
+        specCol.put(i, specout);
       }
-      specCol.put(i, specout);
     }
     ++iter;