Changeset 1987 for trunk/src/MSFiller.h

Timestamp:

02/02/11 13:15:19 (13 years ago)

Author:

Takeshi Nakazato

Message:

New Development: No

JIRA Issue: Yes CAS-2718

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

Improved MSFiller/MSWriter.
Changed Scantable::get_antennaName() to fit with MSFiller/MSWriter.

File:

• trunk/src/MSFiller.h (modified) (5 diffs)

trunk/src/MSFiller.h

@@ -16 +16 @@
 // STL
 #include <string>
+
+// Boost
+#include <boost/pool/object_pool.hpp>
+
 // AIPS++
 #include <casa/aips.h>
 #include <casa/Utilities/CountedPtr.h>
 #include <casa/Arrays/Vector.h>
+#include <casa/Arrays/Matrix.h>
 #include <casa/Logging/LogIO.h>
 
 #include <casa/Containers/Record.h>
-#include <tables/Tables/RefRows.h>
+
+//#include <tables/Tables/TableColumn.h>
 
 #include <ms/MeasurementSets/MeasurementSet.h>
-#include <ms/MeasurementSets/MSColumns.h>
+#include <ms/MeasurementSets/MSPointing.h>
 
 #include "Scantable.h"
@@ -59 +65 @@
   //void fillHistory() ;
   //void fillFit() ;
-  void fillTcal() ;
-
-  // fill ID columns
-  void fillId( casa::uInt idx, const char *colname, casa::RefRows &rows ) ; 
-  void fillId( casa::Int idx, const char *colname, casa::RefRows &rows ) ; 
+  void fillTcal( boost::object_pool<casa::ROTableColumn> *pool ) ;
 
   // get SRCTYPE from STATE_ID
-  casa::Int getSrcType( casa::Int stateId ) ;
+  casa::Int getSrcType( casa::Int stateId, boost::object_pool<casa::ROTableColumn> *pool ) ;
+  //casa::Int getSrcType( casa::Int stateId ) ;
 
   // get POLNO from CORR_TYPE
@@ -85 +88 @@
   // assume that tab is selected by ANTENNA_ID, FEED_ID, SPECTRAL_WINDOW_ID 
   // and sorted by TIME
-  casa::uInt getTsys( casa::uInt idx, casa::Array<casa::Float> &tsys, casa::MSSysCal &tab, casa::Double t ) ;
+  casa::uInt getTsys( casa::uInt idx, casa::Matrix<casa::Float> &tsys, casa::MSSysCal &tab, casa::Double t ) ;
 
   // get TCAL_ID 
@@ -91 +94 @@
 
   // get direction for DIRECTION, AZIMUTH, and ELEVATION columns
-  casa::uInt getDirection( casa::uInt idx, casa::Vector<casa::Double> &dir, casa::Vector<casa::Double> &srate, casa::String &ref, casa::ROMSPointingColumns &cols, casa::Double t ) ;
+  casa::uInt getDirection( casa::uInt idx, casa::Vector<casa::Double> &dir, casa::Vector<casa::Double> &srate, casa::String &ref, casa::MSPointing &tab, casa::Double t ) ;
   
   casa::CountedPtr<Scantable> table_ ;
   casa::MeasurementSet mstable_ ;
-  casa::MeasurementSet tablesel_ ;
+  casa::String tablename_ ;
   casa::Int antenna_ ;
   casa::Bool getPt_ ;
@@ -115 +118 @@
   casa::Vector<casa::Double> mwInterval_ ;
 
+  // Record for TCAL_ID
+  // "FIELD0": "SPW0": Vector<uInt>
+  //           "SPW1": Vector<uInt>
+  //  ...
   casa::Record tcalrec_ ;
+
+  //casa::ROTableColumn *scCol_ ;
 };