Changeset 1033 for trunk/src

Timestamp:

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

Author:

mar637

Message:

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

Location:

trunk/src

Files:

• MathUtils.h (modified) (3 diffs)
• MathUtils2.cpp (modified) (3 diffs)
• STMath.cpp (modified) (2 diffs)

trunk/src/MathUtils.h

@@ -27 +27 @@
 //#                        AUSTRALIA
 //#
-//# $Id:$
+//# $Id$
 //#---------------------------------------------------------------------------
 #ifndef MATHUTILS_H
@@ -41 +41 @@
 
 // Hanning smoothing
-template <class T>
 /**
  * Hanning smooth a masked vector
@@ -51 +50 @@
  * @param ignoreOther drop every second channel (NYI)
  */
+template <class T>
 void hanning(casa::Vector<T>& out, casa::Vector<casa::Bool>& outmask,
-             const casa::Vector<T>& in, const casa::Vector<casa::Bool>& mask,
-             casa::Bool relaxed=casa::False,
-             casa::Bool ignoreOther=casa::False);
+             const casa::Vector<T>& in, const casa::Vector<casa::Bool>& mask,
+             casa::Bool relaxed=casa::False,
+             casa::Bool ignoreOther=casa::False);
 
 // Generate specified statistic
 float statistics(const casa::String& which,
-                 const casa::MaskedArray<casa::Float>& data);
+                 const casa::MaskedArray<casa::Float>& data);
 
 // Replace masked value by zero
 void replaceMaskByZero(casa::Vector<casa::Float>& data,
-                       const casa::Vector<casa::Bool>& mask);
+                       const casa::Vector<casa::Bool>& mask);
 
 /**

trunk/src/MathUtils2.cpp

@@ -27 +27 @@
 //#                        AUSTRALIA
 //#
-//# $Id:
+//# $Id:$
 //#---------------------------------------------------------------------------
 
@@ -42 +42 @@
 template <class T>
 void mathutil::hanning(Vector<T>& out, Vector<Bool>& outmask,
-                       const Vector<T>& in, const Vector<Bool>& mask,
-                       Bool relaxed, Bool ignoreOther) {
-
+                       const Vector<T>& in, const Vector<Bool>& mask,
+                       Bool relaxed, Bool ignoreOther) {
   Vector< Vector<T> > weights(8);
   Vector<Float> vals(3);
@@ -68 +67 @@
   out.resize(in.nelements());
   outmask.resize(mask.nelements());
-
   // make special case for first and last
   /// ...here
   // loop from 1..n-2
-  uInt i = 1;
-  VectorSTLIterator<T> outit(out);
-  outit++;
-  VectorSTLIterator<Bool> outmit(outmask);outmit++;
+  out.resize(in.nelements());
+  out[0] = in[0];out[out.nelements()-1] = in[in.nelements()-1];
+  outmask.resize(mask.nelements());
+  outmask = False;
   uInt m;Vector<T>* w;
-  for (VectorSTLIterator<T> it = outit;it != out.end()-1;++it) {
-
+  for (uInt i=1; i < out.nelements()-1;++i) {
     m = mask[i-1] + 2*mask[i] + 4*mask[i+1];
     w = &(weights[m]);
     if (weighted[m]) {
-      (*it) = (*w)[0]*in[i-1] + (*w)[1]*in[i] + (*w)[2]*in[i+1];
-      (*outmit) = True;
+      out[i] = (*w)[0]*in[i-1] + (*w)[1]*in[i] + (*w)[2]*in[i+1];
+      outmask[i] = True;
     } else { // mask it
-      (*outmit) = False;
+      out[i] = in[i];//use arbitrary value
+      outmask[i] = False;
     }
-    ++i;
-    ++outmit;
   }
 }

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;