Changeset 2479 for trunk

Timestamp:

04/24/12 11:14:39 (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...

bug fixes in STMath::new_average

• proper handling of scan average
• proper handling of multi-beam data

File:

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

trunk/src/STMath.cpp

@@ -3325 +3325 @@
 
     // reset SCANNO and IFNO/FREQ_ID: IF is reset by the result of sortation 
-    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() ;
+    // reset SCANNO only when avmode != "SCAN"
+    if ( avmode != "SCAN" ) {
+      os << "All scan number is set to 0" << LogIO::POST ;
+      for ( uInt itable = 0 ; itable < insize ; itable++ ) {
+        uInt nrow = newin[itable]->nrow() ;
+        Table &tmpt = newin[itable]->table() ;
+        scannoCol.attach( tmpt, "SCANNO" ) ;
+        for ( uInt irow = 0 ; irow < nrow ; irow++ )
+          scannoCol.put( irow, 0 ) ;
+      }
+    }
     for ( uInt itable = 0 ; itable < insize ; itable++ ) {
       uInt rows = newin[itable]->nrow() ;
       Table &tmpt = newin[itable]->table() ;
       freqIDCol.attach( tmpt, "FREQ_ID" ) ;
-      scannoCol.attach( tmpt, "SCANNO" ) ;
       ifnoCol.attach( tmpt, "IFNO" ) ;
       for ( uInt irow=0 ; irow < rows ; irow++ ) {
-        scannoCol.put( irow, 0 ) ;
         uInt freqID = freqIDCol( irow ) ;
         vector<uInt>::iterator iter = find( freqid[newtableids[itable]].begin(), freqid[newtableids[itable]].end(), freqID ) ;
@@ -3617 +3625 @@
 //     dirColOut.attach( out->table(), "DIRECTION" ) ;
     Table &tab = tmpout->table() ;
-    Block<String> cols(1);
+//     Block<String> cols(1);
+//     cols[0] = String("POLNO") ;
+    Block<String> cols(3);
     cols[0] = String("POLNO") ;
+    cols[1] = String("SCANNO") ;
+    cols[2] = String("BEAMNO") ;
     TableIterator iter( tab, cols ) ;
     vector< vector<uInt> > sizes( freqgrp.size() ) ;