Changeset 2477 for trunk/src

Timestamp:

04/24/12 10:34:06 (13 years ago)

Author:

Takeshi Nakazato

Message:

New Development: No

JIRA Issue: No

Ready for Test: 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...

Update IF group properly when more than one tables should be copied.

File:

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

trunk/src/STMath.cpp

@@ -3222 +3222 @@
 
     // print membership
-    //oss.str("") ;
-    //for ( uInt i = 0 ; i < insize ; i++ ) {
-    //oss << "Table " << i << endl ;
-    //for ( uInt j = 0 ; j < groups[i].size() ; j++ ) {
-    //oss << "   FREQ_ID " <<  setw( 2 ) << freqid[i][j] << ": " ;
-    //for ( uInt k = 0 ; k < groups[i][j].size() ; k++ ) {
-    //oss << setw( 2 ) << groups[i][j][k] << " " ;
-    //}
-    //oss << endl ;
-    //}
-    //}
-    //os << oss.str() << LogIO::POST ;
+//     oss.str("") ;
+//     for ( uInt i = 0 ; i < insize ; i++ ) {
+//       oss << "Table " << i << endl ;
+//       for ( uInt j = 0 ; j < groups[i].size() ; j++ ) {
+//         oss << "   FREQ_ID " <<  setw( 2 ) << freqid[i][j] << ": " ;
+//         for ( uInt k = 0 ; k < groups[i][j].size() ; k++ ) {
+//           oss << setw( 2 ) << groups[i][j][k] << " " ;
+//         }
+//         oss << endl ;
+//       }
+//     }
+//     os << oss.str() << LogIO::POST ;
 
     // set back coordinfo
@@ -3293 +3293 @@
 
     // udpate ifgrp
+    uInt offset = insize ;
     for ( uInt itable = 0 ; itable < insize ; itable++ ) {
       for ( uInt iadd = 0 ; iadd < addtable[itable] ; iadd++ ) {
@@ -3299 +3300 @@
             uInt igrp = groups[itable][ifrow][iadd+1] ;
             for ( uInt imem = 0 ; imem < ifgrp[igrp].size()/2 ; imem++ ) {
-              if ( ifgrp[igrp][2*imem] == newtableids[iadd+insize] && ifgrp[igrp][2*imem+1] == freqid[newtableids[iadd+insize]][ifrow] ) {
-                ifgrp[igrp][2*imem] = insize + iadd ;
+              if ( ifgrp[igrp][2*imem] == newtableids[offset+iadd] && ifgrp[igrp][2*imem+1] == freqid[newtableids[offset+iadd]][ifrow] ) {
+                ifgrp[igrp][2*imem] = offset + iadd ;
               }
             }
@@ -3306 +3307 @@
         }
       }
+      offset += addtable[itable] ;
     }
 
     // print IF groups again for debug
-    //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++ ) {
-    //oss << "   GROUP " << setw( 2 ) << i << " [" << ifgfreq[2*i] << "," << ifgfreq[2*i+1] << "]: " ;
-    //for ( uInt j = 0 ; j < ifgrp[i].size()/2 ; j++ ) {
-    //oss << "(" << ifgrp[i][2*j] << "," << ifgrp[i][2*j+1] << ") " ; 
-    //}
-    //oss << endl ;
-    //}
-    //oss << endl ;
-    //os << oss.str() << LogIO::POST ;
+//     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++ ) {
+//       oss << "   GROUP " << setw( 2 ) << i << " [" << ifgfreq[2*i] << "," << ifgfreq[2*i+1] << "]: " ;
+//       for ( uInt j = 0 ; j < ifgrp[i].size()/2 ; j++ ) {
+//         oss << "(" << ifgrp[i][2*j] << "," << ifgrp[i][2*j+1] << ") " ; 
+//       }
+//       oss << endl ;
+//     }
+//     oss << endl ;
+//     os << oss.str() << LogIO::POST ;
 
     // reset SCANNO and IFNO/FREQ_ID: IF is reset by the result of sortation