Changeset 2291 for trunk/src/MSWriter.h

Timestamp:

09/12/11 12:07:41 (13 years ago)

Author:

Takeshi Nakazato

Message:

New Development: No

JIRA Issue: No

Ready for Test: Yes

Interface Changes: Yes

What Interface Changed: MSFillerUtils and MSWriterUtils added

Test Programs: sd regressions, test_sdsave

Put in Release Notes: No

Module(s): Module Names change impacts.

Description: Describe your changes here...

Rewrote MSFiller and MSWriter based on TableTraverse?.
TableTraverse? is changed a bit since it doesn't work on plain table.

File:

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

trunk/src/MSWriter.h

@@ -23 +23 @@
 #include <casa/Logging/LogIO.h>
 #include <casa/Containers/Record.h>
+#include <casa/Containers/RecordField.h>
 
 #include <tables/Tables/Table.h>
@@ -39 +40 @@
 namespace asap
 {
+class MSWriterUtils
+{
+protected:
+  template<class T> void putField( const String &name, 
+                                   TableRecord &r, 
+                                   T &val )
+  {
+    RecordFieldPtr<T> rf( r, name ) ;
+    *rf = val ;
+  }
+  template<class T> void defineField( const String &name, 
+                                      TableRecord &r, 
+                                      T &val )
+  {
+    RecordFieldPtr<T> rf( r, name ) ;
+    rf.define( val ) ;
+  }
+};
 
 class MSWriter
@@ -65 +84 @@
   void fillSource() ;
   void fillWeather() ;
-  void fillSysCal() ;
+  void fillSysCal( std::map< casa::Int,casa::Vector<casa::uInt> > &idrec, 
+                   std::map< casa::Int,casa::Vector<casa::uInt> > &rowrec ) ;
+//   void fillSysCal( Record &idrec, Record &rowrec ) ;
+//   void fillSysCal() ;
 
   // fill empty rows
@@ -86 +108 @@
   void queryType( casa::Int type, casa::String &stype, casa::Bool &b, casa::Double &t, Double &l ) ; 
   casa::Double getDishDiameter( casa::String antname ) ;
+  void antennaProperty( casa::String &name, casa::String &mount, casa::String &type, casa::Double &diameter ) ;
 
   // tool for HPC
@@ -111 +134 @@
   casa::LogIO os_ ;
 
-  casa::Record tcalIdRec_ ;
-  casa::Record tcalRowRec_ ;
+//   casa::Record tcalIdRec_ ;
+//   casa::Record tcalRowRec_ ;
+  casa::Record srcRec_ ;
   
   MSWriter();