Changeset 2126 for branches/casa-prerelease/pre-asap/src/MathUtils.cpp

Timestamp:

04/08/11 21:06:20 (13 years ago)

Author:

WataruKawasaki

Message:

merged bug fixes from trunk (r2124)

Location:

branches/casa-prerelease/pre-asap

Files:

• . (modified) (1 prop)
• src (modified) (1 prop)
• src/MathUtils.cpp (modified) (3 diffs)

branches/casa-prerelease/pre-asap/src/MathUtils.cpp

@@ -30 +30 @@
 //#---------------------------------------------------------------------------
 
+#include <iostream>
 #include <casa/aips.h>
 #include <casa/Arrays/Vector.h>
@@ -161 +162 @@
   out.resize(in.nelements());
   out[0] = in[0];out[out.nelements()-1] = in[in.nelements()-1];
+  //--s
+  cout << "out[0]=" << out[0] << ";" << endl;
+  //--e
   outmask.resize(mask.nelements());
-  outmask = False;
+  outmask[0] = mask[0]; outmask[outmask.nelements()-1] = mask[mask.nelements()-1];
   uInt m;Vector<Float>* w;
   for (uInt i=1; i < out.nelements()-1;++i) {
@@ -169 +173 @@
     if (weighted[m]) {
       out[i] = (*w)[0]*in[i-1] + (*w)[1]*in[i] + (*w)[2]*in[i+1];
-      outmask[i] = True;
+      //outmask[i] = True;
     } else { // mask it
       out[i] = in[i];//use arbitrary value
-      outmask[i] = False;
+      //outmask[i] = False;
     }
+    //--s
+    if (i < 13) {
+      cout << "mask[" << i-1 << "-" << i+1 << "]=[" << mask[i-1] << ", " << mask[i] << ", " << mask[i+1] << "];  ";
+      cout << "m="   << m   << ";  ";
+      cout << "weights[" << m << "]="   << weights[m]   << ";  ";
+      cout << "in[" << i-1 << "-" << i+1 << "]=[" << in[i-1] << ", " << in[i] << ", " << in[i+1] << "] --> ";
+      cout << out[i]  << ";" << endl;
+      cout << "-------------------------------" << endl;
+    }
+    //--e
+    outmask[i] = mask[i];
   }
 }