Changeset 2467 for trunk/src

Timestamp:

04/16/12 21:18:11 (13 years ago)

Author:

Kana Sugimoto

Message:

New Development: No

JIRA Issue: No (bug fixes)

Ready for Test: Yes

Interface Changes: No

What Interface Changed:

Test Programs: unit test of sdcal

Put in Release Notes: No

Module(s):

Description: fixed minor bug in a log message. also removed unused variables.

File:

• trunk/src/STMath.cpp (modified) (5 diffs)

trunk/src/STMath.cpp

@@ -3166 +3166 @@
       freqrange = ifgfreq[2*i+1] ;
     }
-        
+
 
     // print IF groups
@@ -3355 +3355 @@
 
     // save column values in the vector
-    vector< vector<uInt> > freqTableIdVec( insize ) ;
     vector< vector<uInt> > freqIdVec( insize ) ;
     vector< vector<uInt> > ifNoVec( insize ) ;
     for ( uInt itable = 0 ; itable < insize ; itable++ ) {
-      ScalarColumn<uInt> freqIDs ;
-      freqIDs.attach( newin[itable]->frequencies().table(), "ID" ) ;
       ifnoCol.attach( newin[itable]->table(), "IFNO" ) ;
       freqIDCol.attach( newin[itable]->table(), "FREQ_ID" ) ;
-      for ( uInt irow = 0 ; irow < newin[itable]->frequencies().table().nrow() ; irow++ ) {
-        freqTableIdVec[itable].push_back( freqIDs( irow ) ) ;
-      }
       for ( uInt irow = 0 ; irow < newin[itable]->table().nrow() ; irow++ ) {
         freqIdVec[itable].push_back( freqIDCol( irow ) ) ;
@@ -3380 +3374 @@
       vector<uInt> freqIdUpdate ; 
       for ( uInt irow = 0 ; irow < rows ; irow++ ) {
-        uInt ifno = ifNoVec[itable][irow] ;  // IFNO is reset by group index
+        uInt ifno = ifNoVec[itable][irow] ;  // IFNO is reset by group index (IF group index)
         double minfreq = ifgfreq[2*ifno] ;
         double maxfreq = ifgfreq[2*ifno+1] ;
@@ -3414 +3408 @@
           nmaxchan = imax - sigres * (int(cfreq) +( ( cfreq - int(cfreq) >= 0.5 ) ? 1 : 0 )) ;
         }
-        //os << "freqrange = [" << abcissa[nminchan] << ", " << abcissa[nmaxchan] << "]"<< LogIO::POST; 
+        //os << "channel range (" << irow << "): [" << nminchan << "," << nmaxchan << "]" << LogIO::POST ;
         if ( nmaxchan < nminchan ) {
           int tmp = nmaxchan ;
@@ -3570 +3564 @@
     // combine frequency group
     os << "Combine spectra based on frequency grouping" << LogIO::POST ;
-    //os << "IFNO is renumbered as frequency group ID (see above)" << LogIO::POST ;
-    os << "IFNO is renumbered as IF group ID (see above)" << LogIO::POST ;
+    os << "IFNO is renumbered as frequency group ID (see above)" << LogIO::POST ;
     vector<string> coordinfo = tmpout->getCoordInfo() ;
     oldinfo[0] = coordinfo[0] ;