Changeset 1033 for trunk/src/MathUtils2.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/MathUtils2.cpp (modified) (3 diffs)

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;
   }
 }