Changeset 1616 for branches/alma/src/STMath.cpp

Timestamp:

08/07/09 15:49:27 (15 years ago)

Author:

Takeshi Nakazato

Message:

New Development: No

JIRA Issue: Yes CAS-729, CAS-1147

Ready to Release: Yes

Interface Changes: No

What Interface Changed: Please list interface changes

Test Programs: List test programs

Put in Release Notes: Yes/No?

Module(s): Module Names change impacts.

Description: Describe your changes here...

Use LogIO instead of std::cout and std::cerr.

File:

• branches/alma/src/STMath.cpp (modified) (43 diffs)

branches/alma/src/STMath.cpp

@@ -44 +44 @@
 #include <scimath/Functionals/Polynomial.h>
 
+#include <casa/Logging/LogIO.h>
+#include <sstream>
+
 #include "MathUtils.h"
 #include "RowAccumulator.h"
@@ -74 +77 @@
                  const std::string& avmode)
 {
+  LogIO os( LogOrigin( "STMath", "average()", WHERE ) ) ;
   if ( avmode == "SCAN" && in.size() != 1 )
     throw(AipsError("Can't perform 'SCAN' averaging on multiple tables.\n"
@@ -81 +85 @@
   // check if OTF observation
   String obstype = in[0]->getHeader().obstype ;
-  //bool otfscan = false ;
   Double tol = 0.0 ;
   if ( obstype.find( "OTF" ) != String::npos ) {
-    //cout << "OTF scan" << endl ;
-    //otfscan = true ;
     tol = TOL_OTF ;
   }
@@ -156 +157 @@
     for ( Int i = 0 ; i < length ; i++ ) {
       Vector<Double> t = dircol(i).getAngle(Unit(String("rad"))).getValue() ;
-      //cout << setw( 3 ) << count++ << ": " ;
-      //cout << "[" << t[0] << "," << t[1] << "]" <<  endl ;
+      //os << << count++ << ": " ;
+      //os << "[" << t[0] << "," << t[1] << "]" << LogIO::POST ;
       bool adddir = true ;
       for ( uInt j = 0 ; j < dirs.size() ; j++ ) {
@@ -176 +177 @@
     }
     uInt rowNum = dirs.size() ;
-    //cout << "dirs.size()=" << dirs.size() << endl ;
     tout.addRow( rowNum ) ;
     for ( uInt i = 0 ; i < rowNum ; i++ ) {
@@ -233 +233 @@
         }
       }
-      //cout << "removeRows.size()=" << removeRows.size() << endl ;
       if ( removeRows.size() != 0 ) {
-        //cout << "[" ;
-        //for ( uInt irow=0 ; irow<removeRows.size()-1 ; irow++ )
-        //cout << removeRows[irow] << "," ;
-        //cout << removeRows[removeRows.size()-1] << "]" << endl ;
         subt.removeRow( removeRows ) ;
       }
@@ -298 +293 @@
   }
   if (rowstodelete.nelements() > 0) {
-    cout << rowstodelete << endl;
+    //cout << rowstodelete << endl;
+    os << rowstodelete << LogIO::POST ;
     tout.removeRow(rowstodelete);
     if (tout.nrow() == 0) {
@@ -314 +310 @@
   // check if OTF observation
   String obstype = in->getHeader().obstype ;
-  //bool otfscan = false ;
   Double tol = 0.0 ;
   if ( obstype.find( "OTF" ) != String::npos ) {
-    //cout << "OTF scan" << endl ;
-    //otfscan = true ;
     tol = TOL_OTF ;
   }
@@ -428 +421 @@
       Vector<uChar> flags = flagCol.getColumn(Slicer(Slice(0)));
       // mask spectra for different DIRECTION
-      //cout << "irow=" << outrowCount+irow << ": flagged [" ;
       for ( uInt jrow = 0 ; jrow < subt.nrow() ; jrow++ ) {
         Vector<Double> direction = dircol(jrow).getAngle(Unit(String("rad"))).getValue() ;
@@ -437 +429 @@
         //if ( !allNearAbs( t, direction, tol ) ) {
         if ( dd > tol ) {
-          //cout << jrow << " " ;
           flags[jrow] = userflag ;
         }
       }
-      //cout << "]" << endl ;
-      //cout << "flags=" << flags << endl ;
       Vector<Float> outspec(nchan);
       Vector<uChar> outflag(nchan,0);
@@ -835 +824 @@
          //Debug
          //if(noff!=ndiff) cerr<<"noff and ndiff is not equal"<<endl;
+         //LogIO os( LogOrigin( "STMath", "dototalpower()", WHERE ) ) ; 
+         //if(noff!=ndiff) os<<"noff and ndiff is not equal"<<LogIO::POST;
          meanoff = sum(spoff)/noff;
          meandiff = sum(spdiff)/ndiff;
@@ -954 +945 @@
       //Debug
       //cerr<<"Tsys used="<<tsysrefscalar<<endl;
+      //LogIO os( LogOrigin( "STMath", "dosigref", WHERE ) ) ;
+      //os<<"Tsys used="<<tsysrefscalar<<LogIO::POST;
       // fill the result, replay signal tsys by reference tsys
       outintCol.put(i, resint);
@@ -1120 +1113 @@
       //Array<Float> avtsys =  Float(0.5) * (tsys1 + tsys2);
       // cerr<< "Tsys1="<<tsys1<<" Tsys2="<<tsys2<<endl;
+      // LogIO os( LogOrigin( "STMath", "donod", WHERE ) ) ;
+      // os<< "Tsys1="<<tsys1<<" Tsys2="<<tsys2<<LogIO::POST;
       tsys1[0] = sqrt(tsyssq1 + tsyssq2);
       Array<Float> avtsys =  tsys1;
@@ -1185 +1180 @@
   out2->frequencies().getEntry(rp2, rv2, inc2, freqid2);
   //cerr << out1->frequencies().table().nrow() << " " << out2->frequencies().table().nrow() << endl ;
+  //LogIO os( LogOrigin( "STMath", "dofs()", WHERE ) ) ;
+  //os << out1->frequencies().table().nrow() << " " << out2->frequencies().table().nrow() << LogIO::POST ;
   if (rp1==rp2) {
     Double foffset = rv1 - rv2;
     uInt choffset = static_cast<uInt>(foffset/abs(inc2));
     if (choffset >= nchan) {
-      cerr<<"out-band frequency switching, no folding"<<endl;
+      //cerr<<"out-band frequency switching, no folding"<<endl;
+      LogIO os( LogOrigin( "STMath", "dofs()", WHERE ) ) ;
+      os<<"out-band frequency switching, no folding"<<LogIO::POST;
       nofold = True;
     }
@@ -1230 +1229 @@
   // check
   if ( choffset == 0 ) {
-    cerr << "channel offset is zero, no folding" << endl ;
+    LogIO os( LogOrigin( "STMath", "dofold()", WHERE ) ) ;
+    os << "channel offset is zero, no folding" << LogIO::POST ;
     return out ;
   }
   int nchan = ref->nchan() ;
   if ( abs(choffset) >= nchan ) {
-    cerr << "out-band frequency switching, no folding" << endl ;
+    LogIO os( LogOrigin( "STMath", "dofold()", WHERE ) ) ;
+    os << "out-band frequency switching, no folding" << LogIO::POST ;
     return out ;
   }
@@ -2384 +2385 @@
   throw ( casa::AipsError )
 {
+  LogIO os( LogOrigin( "STMath", "new_average()", WHERE ) ) ;
   if ( avmode == "SCAN" && in.size() != 1 )
     throw(AipsError("Can't perform 'SCAN' averaging on multiple tables.\n"
@@ -2390 +2392 @@
   // check if OTF observation
   String obstype = in[0]->getHeader().obstype ;
-  //bool otfscan = false ;
   Double tol = 0.0 ;
   if ( obstype.find( "OTF" ) != String::npos ) {
-    //cout << "OTF scan" << endl ;
-    //otfscan = true ;
     tol = TOL_OTF ;
   }
@@ -2407 +2406 @@
 
     // TEST: do normal average in each table before IF grouping
-    cout << "Do preliminary averaging" << endl ;
+    os << "Do preliminary averaging" << LogIO::POST ;
     vector< CountedPtr<Scantable> > tmpin( insize ) ;
     for ( uInt itable = 0 ; itable < insize ; itable++ ) {
@@ -2415 +2414 @@
 
     // warning
-    cout << "Average spectra with different spectral resolution" << endl ;
-    cout << endl ;
+    os << "Average spectra with different spectral resolution" << LogIO::POST ;
 
     // temporarily set coordinfo
@@ -2447 +2445 @@
     //          ...
     //          [min_idn0, max_idn0, min_idn1, max_idn1, ...]]
-    //cout << "Check IF settings in each table" << endl ;
+    //os << "Check IF settings in each table" << LogIO::POST ;
     vector< vector<uInt> > freqid( insize );
     vector< vector<double> > iffreq( insize ) ;
@@ -2462 +2460 @@
           uInt id = freqIDCol( irow ) ;
           if ( freqid[itable].size() == 0 || count( freqid[itable].begin(), freqid[itable].end(), id ) == 0 ) {
-            //cout << "itable = " << itable << ": IF " << id << " is included in the list" << endl ;
+            //os << "itable = " << itable << ": IF " << id << " is included in the list" << LogIO::POST ;
             vector<double> abcissa = tmpin[itable]->getAbcissa( irow ) ;
             freqid[itable].push_back( id ) ;
@@ -2473 +2471 @@
 
     // debug
-    //cout << "IF settings summary:" << endl ;
+    //os << "IF settings summary:" << endl ;
     //for ( uInt i = 0 ; i < freqid.size() ; i++ ) {
-    //cout << "   Table" << i << endl ;
+    //os << "   Table" << i << endl ;
     //for ( uInt j = 0 ; j < freqid[i].size() ; j++ ) {
-    //cout << "      id = " << freqid[i][j] << " (min,max) = (" << iffreq[i][2*j] << "," << iffreq[i][2*j+1] << ")" << endl ;
+    //os << "      id = " << freqid[i][j] << " (min,max) = (" << iffreq[i][2*j] << "," << iffreq[i][2*j+1] << ")" << endl ;
     //}
     //}
-    //cout << endl ;
+    //os << endl ;
+    //os.post() ;
 
     // IF grouping based on their frequency coverage
@@ -2492 +2491 @@
     // ifgfreq[numgrp*2] 
     // ifgfreq: [min0_grp0, max0_grp0, min1_grp1, max1_grp1, ...]
-    //cout << "IF grouping based on their frequency coverage" << endl ;
+    //os << "IF grouping based on their frequency coverage" << LogIO::POST ;
     vector< vector<uInt> > ifgrp ;
     vector<double> ifgfreq ;
@@ -2576 +2575 @@
 
     // print IF groups
-    cout << "IF Group summary: " << endl ;
-    cout << "   GROUP_ID [FREQ_MIN, FREQ_MAX]: (TABLE_ID, FREQ_ID)" << endl ;
+    ostringstream oss ;
+    oss << "IF Group summary: " << endl ;
+    oss << "   GROUP_ID [FREQ_MIN, FREQ_MAX]: (TABLE_ID, FREQ_ID)" << endl ;
     for ( uInt i = 0 ; i < ifgrp.size() ; i++ ) {
-      cout << "   GROUP " << setw( 2 ) << i << " [" << ifgfreq[2*i] << "," << ifgfreq[2*i+1] << "]: " ;
+      oss << "   GROUP " << setw( 2 ) << i << " [" << ifgfreq[2*i] << "," << ifgfreq[2*i+1] << "]: " ;
       for ( uInt j = 0 ; j < ifgrp[i].size()/2 ; j++ ) {
-        cout << "(" << ifgrp[i][2*j] << "," << ifgrp[i][2*j+1] << ") " ; 
-      }
-      cout << endl ;
-    }
-    cout << endl ;
+        oss << "(" << ifgrp[i][2*j] << "," << ifgrp[i][2*j+1] << ") " ; 
+      }
+      oss << endl ;
+    }
+    oss << endl ;
+    os << oss.str() << LogIO::POST ;
     
     // print frequency group
-    cout << "Frequency Group summary: " << endl ;
-    cout << "   GROUP_ID [FREQ_MIN, FREQ_MAX]: IF_GROUP_ID" << endl ;
+    oss.str("") ;
+    oss << "Frequency Group summary: " << endl ;
+    oss << "   GROUP_ID [FREQ_MIN, FREQ_MAX]: IF_GROUP_ID" << endl ;
     for ( uInt i = 0 ; i < freqgrp.size() ; i++ ) {
-      cout << "   GROUP " << setw( 2 ) << i << " [" << ifgfreq[2*freqgrp[i][0]] << "," << ifgfreq[2*freqgrp[i][freqgrp[i].size()-1]+1] << "]: " ;
+      oss << "   GROUP " << setw( 2 ) << i << " [" << ifgfreq[2*freqgrp[i][0]] << "," << ifgfreq[2*freqgrp[i][freqgrp[i].size()-1]+1] << "]: " ;
       for ( uInt j = 0 ; j < freqgrp[i].size() ; j++ ) {
-        cout << freqgrp[i][j] << " " ;
-      }
-      cout << endl ;
-    }
-    cout << endl ;
+        oss << freqgrp[i][j] << " " ;
+      }
+      oss << endl ;
+    }
+    oss << endl ;
+    os << oss.str() << LogIO::POST ;
 
     // membership check
@@ -2623 +2626 @@
 
     // print membership
+    //oss.str("") ;
     //for ( uInt i = 0 ; i < insize ; i++ ) {
-    //cout << "Table " << i << endl ;
+    //oss << "Table " << i << endl ;
     //for ( uInt j = 0 ; j < groups[i].size() ; j++ ) {
-    //cout << "   FREQ_ID " <<  setw( 2 ) << freqid[i][j] << ": " ;
+    //oss << "   FREQ_ID " <<  setw( 2 ) << freqid[i][j] << ": " ;
     //for ( uInt k = 0 ; k < groups[i][j].size() ; k++ ) {
-    //cout << setw( 2 ) << groups[i][j][k] << " " ;
+    //oss << setw( 2 ) << groups[i][j][k] << " " ;
     //}
-    //cout << endl ;
+    //oss << endl ;
     //}
     //}
+    //os << oss.str() << LogIO::POST ;
 
     // set back coordinfo
@@ -2649 +2654 @@
     vector<uInt> newifids( insize, 0 ) ;
     for ( uInt itable = 0 ; itable < insize ; itable++ ) {
-      //cout << "Table " << setw(2) << itable << ": " ;
+      //os << "Table " << itable << ": " ;
       for ( uInt ifrow = 0 ; ifrow < groups[itable].size() ; ifrow++ ) {
         addrow[itable].push_back( groups[itable][ifrow].size()-1 ) ;
-        //cout << addrow[itable][ifrow] << " " ;
+        //os << addrow[itable][ifrow] << " " ;
       }
       addtable[itable] = *max_element( addrow[itable].begin(), addrow[itable].end() ) ;
-      //cout << "(" << addtable[itable] << ")" << endl ;
+      //os << "(" << addtable[itable] << ")" << LogIO::POST ;
     }
     newin.resize( insize ) ;
@@ -2681 +2686 @@
         }
         string taql = taqlstream.str() ;
-        //cout << "taql = " << taql << endl ;
+        //os << "taql = " << taql << LogIO::POST ;
         STSelector selector = STSelector() ;
         selector.setTaQL( taql ) ;
@@ -2708 +2713 @@
 
     // print IF groups again for debug
-    //cout << "IF Group summary: " << endl ;
-    //cout << "   GROUP_ID [FREQ_MIN, FREQ_MAX]: (TABLE_ID, FREQ_ID)" << endl ;
+    //oss.str( "" ) ;
+    //oss << "IF Group summary: " << endl ;
+    //oss << "   GROUP_ID [FREQ_MIN, FREQ_MAX]: (TABLE_ID, FREQ_ID)" << endl ;
     //for ( uInt i = 0 ; i < ifgrp.size() ; i++ ) {
-    //cout << "   GROUP " << setw( 2 ) << i << " [" << ifgfreq[2*i] << "," << ifgfreq[2*i+1] << "]: " ;
+    //oss << "   GROUP " << setw( 2 ) << i << " [" << ifgfreq[2*i] << "," << ifgfreq[2*i+1] << "]: " ;
     //for ( uInt j = 0 ; j < ifgrp[i].size()/2 ; j++ ) {
-    //cout << "(" << ifgrp[i][2*j] << "," << ifgrp[i][2*j+1] << ") " ; 
+    //oss << "(" << ifgrp[i][2*j] << "," << ifgrp[i][2*j+1] << ") " ; 
     //}
-    //cout << endl ;
+    //oss << endl ;
     //}
-    //cout << endl ;
+    //oss << endl ;
+    //os << oss.str() << LogIO::POST ;
 
     // reset SCANNO and IFNO/FREQ_ID: IF is reset by the result of sortation 
-    cout << "All scan number is set to 0" << endl ;
-    //cout << "All IF number is set to IF group index" << endl ;
-    cout << endl ;
+    os << "All scan number is set to 0" << LogIO::POST ;
+    //os << "All IF number is set to IF group index" << LogIO::POST ;
     insize = newin.size() ;
     for ( uInt itable = 0 ; itable < insize ; itable++ ) {
@@ -2773 +2779 @@
 
     // reset spectra and flagtra: pick up common part of frequency coverage
-    //cout << "Pick common frequency range and align resolution" << endl ;
+    //os << "Pick common frequency range and align resolution" << LogIO::POST ;
     for ( uInt itable = 0 ; itable < insize ; itable++ ) {
       uInt rows = newin[itable]->nrow() ;
@@ -2783 +2789 @@
         double minfreq = ifgfreq[2*ifno] ;
         double maxfreq = ifgfreq[2*ifno+1] ;
-        //cout << "frequency range: [" << minfreq << "," << maxfreq << "]" << endl ;
+        //os << "frequency range: [" << minfreq << "," << maxfreq << "]" << LogIO::POST ;
         vector<double> abcissa = newin[itable]->getAbcissa( irow ) ;
         int nchan = abcissa.size() ;
         double resol = abcissa[1] - abcissa[0] ;
-        //cout << "abcissa range  : [" << abcissa[0] << "," << abcissa[nchan-1] << "]" << endl ;
+        //os << "abcissa range  : [" << abcissa[0] << "," << abcissa[nchan-1] << "]" << LogIO::POST ;
         if ( minfreq <= abcissa[0] ) 
           nminchan = 0 ;
@@ -2802 +2808 @@
           nmaxchan = abcissa.size() - 1 - int(cfreq) - ( ( cfreq - int(cfreq) >= 0.5 ) ? 1 : 0 ) ;
         }
-        //cout << "channel range (" << irow << "): [" << nminchan << "," << nmaxchan << "]" << endl ;
+        //os << "channel range (" << irow << "): [" << nminchan << "," << nmaxchan << "]" << LogIO::POST ;
         if ( nmaxchan > nminchan ) {
           newin[itable]->reshapeSpectrum( nminchan, nmaxchan, irow ) ;
@@ -2829 +2835 @@
     
     // reset spectra and flagtra: align spectral resolution
-    //cout << "Align spectral resolution" << endl ;
+    //os << "Align spectral resolution" << LogIO::POST ;
     // gmaxdnu: the coarsest frequency resolution in the frequency group
     // gmemid: member index that have a resolution equal to gmaxdnu
@@ -2858 +2864 @@
             int nchan = abcissa.size() ;
             double dnu = abcissa[1] - abcissa[0] ;
-            //cout << "GROUP " << igrp << " (" << tableid << "," << rowid << "): nchan = " << nchan << " (minchan = " << minchan << ")" << endl ; 
+            //os << "GROUP " << igrp << " (" << tableid << "," << rowid << "): nchan = " << nchan << " (minchan = " << minchan << ")" << LogIO::POST ; 
             if ( nchan < minchan ) {
               minchan = nchan ;
@@ -2869 +2875 @@
         }
         // regrid spectra in each group
-        cout << "GROUP " << igrp << endl ;
-        cout << "   Channel number is adjusted to " << minchan << endl ;
-        cout << "   Corresponding frequency resolution is " << maxdnu << "Hz" << endl ;
+        os << "GROUP " << igrp << endl ;
+        os << "   Channel number is adjusted to " << minchan << endl ;
+        os << "   Corresponding frequency resolution is " << maxdnu << "Hz" << LogIO::POST ;
         for ( uInt imem = 0 ; imem < ifgrp[igrp].size()/2 ; imem++ ) {
           uInt tableid = ifgrp[igrp][2*imem] ;
           uInt rowid = ifgrp[igrp][2*imem+1] ;
           freqIDCol.attach( newin[tableid]->table(), "FREQ_ID" ) ;
-          //cout << "tableid = " << tableid << " rowid = " << rowid << ": " << endl ;
-          //cout << "   regridChannel applied to " ;
+          //os << "tableid = " << tableid << " rowid = " << rowid << ": " << LogIO::POST ;
+          //os << "   regridChannel applied to " ;
           if ( tableid != reftable ) 
             refreqid = newin[tableid]->frequencies().addEntry( refpixref, refvalref, refinc ) ;
@@ -2883 +2889 @@
             uInt tfreqid = freqIdVec[tableid][irow] ;
             if ( tfreqid == rowid ) {     
-              //cout << irow << " " ;
+              //os << irow << " " ;
               newin[tableid]->regridChannel( minchan, maxdnu, irow ) ;
               freqIDCol.put( irow, refreqid ) ;
@@ -2889 +2895 @@
             }
           }
-          //cout << endl ;
+          //os << LogIO::POST ;
         } 
       }
@@ -2913 +2919 @@
       }
     }
-    cout << endl ;
 
     // set back coordinfo
@@ -2938 +2943 @@
 
     // combine frequency group
-    cout << "Combine spectra based on frequency grouping" << endl ;
-    cout << "IFNO is renumbered as frequency group ID (see above)" << endl ;
+    os << "Combine spectra based on frequency grouping" << LogIO::POST ;
+    os << "IFNO is renumbered as frequency group ID (see above)" << LogIO::POST ;
     vector<string> coordinfo = tmpout->getCoordInfo() ;
     oldinfo[0] = coordinfo[0] ;
@@ -2955 +2960 @@
     }
     string taql = taqlstream.str() ;
-    //cout << "taql = " << taql << endl ;
+    //os << "taql = " << taql << LogIO::POST ;
     STSelector selector = STSelector() ;
     selector.setTaQL( taql ) ;
@@ -3009 +3014 @@
       dircol.attach( iter.table(), "DIRECTION" ) ;
       uInt polno = polnos( 0 ) ;
-      //cout << "POLNO iteration: " << polno << endl ;
+      //os << "POLNO iteration: " << polno << LogIO::POST ;
 //       for ( uInt igrp = 0 ; igrp < freqgrp.size() ; igrp++ ) {
 //      sizes[igrp].resize( freqgrp[igrp].size() ) ;
@@ -3022 +3027 @@
 //            vector<uChar> fvec ;
 //            flag.tovector( fvec ) ;
-//            //cout << "spec.size() = " << svec.size() << " fvec.size() = " << fvec.size() << endl ;
+//            //os << "spec.size() = " << svec.size() << " fvec.size() = " << fvec.size() << LogIO::POST ;
 //            specout[igrp].insert( specout[igrp].end(), svec.begin(), svec.end() ) ;
 //            flagout[igrp].insert( flagout[igrp].end(), fvec.begin(), fvec.end() ) ;
-//            //cout << "specout[" << igrp << "].size() = " << specout[igrp].size() << endl ;
+//            //os << "specout[" << igrp << "].size() = " << specout[igrp].size() << LogIO::POST ;
 //            sizes[igrp][imem] = spec.nelements() ;
 //          }
@@ -3090 +3095 @@
                 vector<uChar> fvec ;
                 flag.tovector( fvec ) ;
-                //cout << "spec.size() = " << svec.size() << " fvec.size() = " << fvec.size() << endl ;
+                //os << "spec.size() = " << svec.size() << " fvec.size() = " << fvec.size() << LogIO::POST ;
                 specout[igrp].insert( specout[igrp].end(), svec.begin(), svec.end() ) ;
                 flagout[igrp].insert( flagout[igrp].end(), fvec.begin(), fvec.end() ) ;
-                //cout << "specout[" << igrp << "].size() = " << specout[igrp].size() << endl ;
+                //os << "specout[" << igrp << "].size() = " << specout[igrp].size() << LogIO::POST ;
               }
             }
@@ -3119 +3124 @@
         if ( ifnoColOut( irow ) == gmemid[igrp] && !updated[igrp] ) {
           uInt freqidOut = freqidColOut( irow ) ;
-          //cout << "freqgrp " << igrp << " freqidOut = " << freqidOut << endl ;
+          //os << "freqgrp " << igrp << " freqidOut = " << freqidOut << LogIO::POST ;
           double refpix ;
           double refval ;