Changeset 2128

Timestamp:

04/08/11 22:15:11 (14 years ago)

Author:

WataruKawasaki

Message:

merged bug fixes from trunk (r2126)

Location:

branches/casa-prerelease/pre-asap

Files:

• . (modified) (1 prop)
• Makefile (modified) (1 prop)
• SConstruct (modified) (1 prop)
• apps (modified) (1 prop)
• external-alma (modified) (1 prop)
• external-alma/atnf/pks/pks_maths.cc (modified) (1 prop)
• getsvnrev.sh (modified) (1 prop)
• python (modified) (1 prop)
• src (modified) (1 prop)
• src/MathUtils.cpp (modified) (3 diffs)
• src/RowAccumulator.cpp (modified) (4 diffs)
• src/SConscript (modified) (1 prop)

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

@@ -30 +30 @@
 //#---------------------------------------------------------------------------
 
-#include <iostream>
 #include <casa/aips.h>
 #include <casa/Arrays/Vector.h>
@@ -162 +161 @@
   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[0] = mask[0]; outmask[outmask.nelements()-1] = mask[mask.nelements()-1];
@@ -173 +169 @@
     if (weighted[m]) {
       out[i] = (*w)[0]*in[i-1] + (*w)[1]*in[i] + (*w)[2]*in[i+1];
-      //outmask[i] = True;
     } else { // mask it
       out[i] = in[i];//use arbitrary value
-      //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];
   }

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

@@ -10 +10 @@
 //
 //
-
-#include <iostream>
 
 #include <casa/iomanip.h>
@@ -111 +109 @@
     n_ += inc;
   }
-
-  //
-  cout << "***" << endl;
-  Vector<Float> spe = spectrum_.getArray();
-  Vector<Float> spe0 = spectrumNoMask_.getArray();
-  Vector<Float> wei = weightSum_.getArray();
-  Vector<Float> wei0 = weightSumNoMask_.getArray();
-  Vector<uInt>  n = n_.getArray();
-  Vector<uInt>  n0 = nNoMask_.getArray();
-  cout << "S__" << "[" << spe[0] << "][" << spe[1] << "][" << spe[2] << "][" << spe[3] << "][" << spe[4] << "][" << spe[5] << "][" << spe[6] << "][" << spe[7] << "][" << spe[8] << "][" << spe[9] << "][" << spe[10] << "][" << spe[11] << "][" << spe[12] << "]" << endl;
-  cout << "S0_" << "[" << spe0[0] << "][" << spe0[1] << "][" << spe0[2] << "][" << spe0[3] << "][" << spe0[4] << "][" << spe0[5] << "][" << spe0[6] << "][" << spe0[7] << "][" << spe0[8] << "][" << spe0[9] << "][" << spe0[10] << "][" << spe0[11] << "][" << spe0[12] << "]" << endl;
-  cout << "W__" << "[" << wei[0] << "][" << wei[1] << "][" << wei[2] << "][" << wei[3] << "][" << wei[4] << "][" << wei[5] << "][" << wei[6] << "][" << wei[7] << "][" << wei[8] << "][" << wei[9] << "][" << wei[10] << "][" << wei[11] << "][" << wei[12] << "]" << endl;
-  cout << "W0_" << "[" << wei0[0] << "][" << wei0[1] << "][" << wei0[2] << "][" << wei0[3] << "][" << wei0[4] << "][" << wei0[5] << "][" << wei0[6] << "][" << wei0[7] << "][" << wei0[8] << "][" << wei0[9] << "][" << wei0[10] << "][" << wei0[11] << "][" << wei0[12] << "]" << endl;
-  cout << "N__" << "[" << n[0] << "][" << n[1] << "][" << n[2] << "][" << n[3] << "][" << n[4] << "][" << n[5] << "][" << n[6] << "][" << n[7] << "][" << n[8] << "][" << n[9] << "][" << n[10] << "][" << n[11] << "][" << n[12] << "]" << endl;
-  cout << "N0_" << "[" << n0[0] << "][" << n0[1] << "][" << n0[2] << "][" << n0[3] << "][" << n0[4] << "][" << n0[5] << "][" << n0[6] << "][" << n0[7] << "][" << n0[8] << "][" << n0[9] << "][" << n0[10] << "][" << n0[11] << "][" << n0[12] << "]" << endl;
-  cout << "***" << endl;
-  //
 }
 
@@ -241 +222 @@
   Vector<Float> wRef = weightSumNoMask_.getArray();
 
-  //-------
-  cout << "SB-";
-  for (uInt i=0; i<13; ++i) {
-    cout << "[" << v[i] << "]";
-  }
-  cout << endl;
-  cout << "WB-";
-  for (uInt i=0; i<13; ++i) {
-    cout << "[" << w[i] << "]";
-  }
-  cout << endl;
-  //-------
-
   for (uInt i = 0; i < v.size(); ++i) {
     if (w[i] == 0.0) {
@@ -263 +231 @@
   spectrum_.setData(v, Vector<Bool>(v.nelements(), True));
   weightSum_.setData(w, Vector<Bool>(w.nelements(), True));
-
-  //-------
-  cout << "SA-";
-  for (uInt i=0; i<13; ++i) {
-    cout << "[" << v[i] << "]";
-  }
-  cout << endl;
-  cout << "WA-";
-  for (uInt i=0; i<13; ++i) {
-    cout << "[" << w[i] << "]";
-  }
-  cout << endl;
-  //-------
-}
+}