Changeset 2413 for trunk/src

Timestamp:

02/17/12 19:41:49 (13 years ago)

Author:

Takeshi Nakazato

Message:

New Development: No

JIRA Issue: Yes CAS-2816

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...

Fill Main columns: IFNO, FREQ_ID

Location:

trunk/src

Files:

• STGrid.cpp (modified) (3 diffs)
• STGrid.h (modified) (1 diff)

trunk/src/STGrid.cpp

@@ -20 +20 @@
 #include <tables/Tables/Table.h>
 #include <tables/Tables/TableRecord.h>
+#include <tables/Tables/TableRow.h>
 #include <tables/Tables/ExprNode.h>
 #include <tables/Tables/ScalarColumn.h>
@@ -1656 +1657 @@
   os << "saveData: elapsed time is " << t1-t0 << " sec." << LogIO::POST ; 
 
+  fillMainColumns( tab ) ;
+
   return outfile_ ;
 }
@@ -1670 +1673 @@
 }
 
-}
+void STGrid::fillMainColumns( Table &tab ) 
+{
+  Table t( infileList_[0], Table::Old ) ;
+  Table tsel = t( t.col( "IFNO" ) == (uInt)ifno_, 1 ) ;
+  ROTableRow row( tab ) ;
+  row.get( 0 ) ;
+  const TableRecord &rec = row.record() ;
+  uInt freqId = rec.asuInt( "FREQ_ID" ) ;
+  Int nrow = tab.nrow() ;
+  ScalarColumn<uInt> ifnoCol( tab, "IFNO" ) ;
+  ScalarColumn<uInt> freqIdCol( tab, "FREQ_ID" ) ;
+  for ( Int i = 0 ; i < nrow ; i++ ) {
+    ifnoCol.put( i, (uInt)ifno_ ) ;
+    freqIdCol.put( i, freqId ) ;
+  }
+}
+
+}

trunk/src/STGrid.h

@@ -195 +195 @@
   void initTable( uInt idx ) ;
   Bool isMultiIF( Table &tab ) ;
+  void fillMainColumns( Table &tab ) ;
   static bool produceChunk(void *ctx) throw(concurrent::PCException);
   static void consumeChunk(void *ctx) throw(concurrent::PCException);