Ignore:
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:
5 edited

Legend:

Unmodified
Added
Removed
  • branches/casa-prerelease/pre-asap

    • Property svn:mergeinfo changed
      /trunkmerged: 2127
  • branches/casa-prerelease/pre-asap/src

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

    r2126 r2128  
    3030//#---------------------------------------------------------------------------
    3131
    32 #include <iostream>
    3332#include <casa/aips.h>
    3433#include <casa/Arrays/Vector.h>
     
    162161  out.resize(in.nelements());
    163162  out[0] = in[0];out[out.nelements()-1] = in[in.nelements()-1];
    164   //--s
    165   cout << "out[0]=" << out[0] << ";" << endl;
    166   //--e
    167163  outmask.resize(mask.nelements());
    168164  outmask[0] = mask[0]; outmask[outmask.nelements()-1] = mask[mask.nelements()-1];
     
    173169    if (weighted[m]) {
    174170      out[i] = (*w)[0]*in[i-1] + (*w)[1]*in[i] + (*w)[2]*in[i+1];
    175       //outmask[i] = True;
    176171    } else { // mask it
    177172      out[i] = in[i];//use arbitrary value
    178       //outmask[i] = False;
    179173    }
    180     //--s
    181     if (i < 13) {
    182       cout << "mask[" << i-1 << "-" << i+1 << "]=[" << mask[i-1] << ", " << mask[i] << ", " << mask[i+1] << "];  ";
    183       cout << "m="   << m   << ";  ";
    184       cout << "weights[" << m << "]="   << weights[m]   << ";  ";
    185       cout << "in[" << i-1 << "-" << i+1 << "]=[" << in[i-1] << ", " << in[i] << ", " << in[i+1] << "] --> ";
    186       cout << out[i]  << ";" << endl;
    187       cout << "-------------------------------" << endl;
    188     }
    189     //--e
    190174    outmask[i] = mask[i];
    191175  }
  • branches/casa-prerelease/pre-asap/src/RowAccumulator.cpp

    r2126 r2128  
    1010//
    1111//
    12 
    13 #include <iostream>
    1412
    1513#include <casa/iomanip.h>
     
    111109    n_ += inc;
    112110  }
    113 
    114   //
    115   cout << "***" << endl;
    116   Vector<Float> spe = spectrum_.getArray();
    117   Vector<Float> spe0 = spectrumNoMask_.getArray();
    118   Vector<Float> wei = weightSum_.getArray();
    119   Vector<Float> wei0 = weightSumNoMask_.getArray();
    120   Vector<uInt>  n = n_.getArray();
    121   Vector<uInt>  n0 = nNoMask_.getArray();
    122   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;
    123   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;
    124   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;
    125   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;
    126   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;
    127   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;
    128   cout << "***" << endl;
    129   //
    130111}
    131112
     
    241222  Vector<Float> wRef = weightSumNoMask_.getArray();
    242223
    243   //-------
    244   cout << "SB-";
    245   for (uInt i=0; i<13; ++i) {
    246     cout << "[" << v[i] << "]";
    247   }
    248   cout << endl;
    249   cout << "WB-";
    250   for (uInt i=0; i<13; ++i) {
    251     cout << "[" << w[i] << "]";
    252   }
    253   cout << endl;
    254   //-------
    255 
    256224  for (uInt i = 0; i < v.size(); ++i) {
    257225    if (w[i] == 0.0) {
     
    263231  spectrum_.setData(v, Vector<Bool>(v.nelements(), True));
    264232  weightSum_.setData(w, Vector<Bool>(w.nelements(), True));
    265 
    266   //-------
    267   cout << "SA-";
    268   for (uInt i=0; i<13; ++i) {
    269     cout << "[" << v[i] << "]";
    270   }
    271   cout << endl;
    272   cout << "WA-";
    273   for (uInt i=0; i<13; ++i) {
    274     cout << "[" << w[i] << "]";
    275   }
    276   cout << endl;
    277   //-------
    278 }
     233}
  • branches/casa-prerelease/pre-asap/src/SConscript

    • Property svn:mergeinfo changed (with no actual effect on merging)
Note: See TracChangeset for help on using the changeset viewer.