Changeset 2593 for trunk/src

Timestamp:

07/09/12 16:54:10 (13 years ago)

Author:

Takeshi Nakazato

Message:

New Development: No

JIRA Issue: No

Ready for Test: Yes

Interface Changes: Yes/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...

New class asapgrid2 is defined. Difference from asapgrid class is
that input and output is a scantable instance, not a table name.

Location:

trunk/src

Files:

• STGrid.cpp (modified) (6 diffs)
• STGrid.h (modified) (4 diffs)
• python_STGrid.cpp (modified) (3 diffs)

trunk/src/STGrid.cpp

@@ -1185 +1185 @@
 }
 
+void STGrid::table( Table &tab, uInt i )
+{
+  if ( i >= 0 && i < nfile_ )
+    tab = Table( infileList_[i] ) ;
+}
+
 void STGrid::selectData()
 {
@@ -1191 +1197 @@
   tableList_.resize( nfile_ ) ;
   if ( ifno_ == -1 ) {
-    Table taborg( infileList_[0] ) ;
+    //Table taborg( infileList_[0] ) ;
+    Table taborg ;
+    table( taborg, 0 ) ;
     ROScalarColumn<uInt> ifnoCol( taborg, "IFNO" ) ;
     ifno_ = ifnoCol( 0 ) ;
@@ -1198 +1206 @@
   }
   for ( uInt i = 0 ; i < nfile_ ; i++ ) {
-    Table taborg( infileList_[i] ) ;
+    //Table taborg( infileList_[i] ) ;
+    Table taborg ;
+    table( taborg, i ) ;
     TableExprNode node ;
     if ( ifno != -1 || isMultiIF( taborg ) ) {
@@ -1639 +1649 @@
   Table tab ;
   prepareTable( tab, outfile_ ) ;
+  fillTable( tab ) ;
+
+  t1 = mathutil::gettimeofday_sec() ;
+  os << LogIO::DEBUGGING << "saveData: elapsed time is " << t1-t0 << " sec." << LogIO::POST ; 
+
+  return outfile_ ;
+}
+
+void STGrid::prepareTable( Table &tab, String &name ) 
+{
+  Table t( infileList_[0], Table::Old ) ;
+  t.deepCopy( name, Table::New, False, t.endianFormat(), True ) ;
+  tab = Table( name, Table::Update ) ;
+  // 2012/02/13 TN
+  // explicitly copy subtables since no rows including subtables are 
+  // copied by Table::deepCopy with noRows=True
+  TableCopy::copySubTables( tab, t ) ;
+}
+
+void STGrid::fillTable( Table &tab )
+{
   IPosition dshape = data_.shape() ;
   Int nrow = nx_ * ny_ * npol_ ;
@@ -1687 +1718 @@
   data_.freeStorage( data_p, bdata ) ;
 
-  t1 = mathutil::gettimeofday_sec() ;
-  os << LogIO::DEBUGGING << "saveData: elapsed time is " << t1-t0 << " sec." << LogIO::POST ; 
-
   fillMainColumns( tab ) ;
-
-  return outfile_ ;
-}
-
-void STGrid::prepareTable( Table &tab, String &name ) 
-{
-  Table t( infileList_[0], Table::Old ) ;
-  t.deepCopy( name, Table::New, False, t.endianFormat(), True ) ;
-  tab = Table( name, Table::Update ) ;
-  // 2012/02/13 TN
-  // explicitly copy subtables since no rows including subtables are 
-  // copied by Table::deepCopy with noRows=True
-  TableCopy::copySubTables( tab, t ) ;
 }
 
@@ -1779 +1794 @@
 }
 
-}
+// STGrid2
+STGrid2::STGrid2()
+  : STGrid()
+{
+}
+
+STGrid2::STGrid2( const ScantableWrapper &s )
+  : STGrid()
+{
+  setScantable( s ) ;
+}
+
+STGrid2::STGrid2( const vector<ScantableWrapper> &v )
+  : STGrid()
+{
+  setScantableList( v ) ;
+}
+
+void STGrid2::setScantable( const ScantableWrapper &s )
+{
+  nfile_ = 1 ;
+  dataList_.resize( nfile_ ) ;
+  dataList_[0] = s ;
+  infileList_.resize( nfile_ ) ;
+  infileList_[0] = s.getCP()->table().tableName() ;
+}
+
+void STGrid2::setScantableList( const vector<ScantableWrapper> &v )
+{
+  nfile_ = v.size() ;
+  dataList_.resize( nfile_ ) ;
+  infileList_.resize( nfile_ ) ;
+  for ( uInt i = 0 ; i < nfile_ ; i++ ) {
+    dataList_[i] = v[i] ;
+    infileList_[i] = v[i].getCP()->table().tableName() ;
+  }
+}
+
+ScantableWrapper STGrid2::getResultAsScantable()
+{
+  CountedPtr<Scantable> s = new Scantable( Table::Plain ) ;
+  s->setHeader( dataList_[0].getCP()->getHeader() ) ;
+  Table tout, tin ;
+  String subt[] = { "FREQUENCIES", "FOCUS", "WEATHER", 
+                    "TCAL", "MOLECULES", "HISTORY", "FIT" } ;
+  for ( uInt i = 0 ; i < 7 ; i++ ) {
+    tout = s->table().rwKeywordSet().asTable(subt[i]) ;
+    tin = dataList_[0].getCP()->table().rwKeywordSet().asTable(subt[i]) ;
+    TableCopy::copyRows( tout, tin ) ;
+  }
+  fillTable( s->table() ) ;
+  ScantableWrapper sw( s ) ;
+  return sw ;
+}
+
+void STGrid2::table( Table &tab, uInt i ) 
+{
+  if ( i < nfile_ )
+    tab = dataList_[i].getCP()->table() ;
+}
+
+}

trunk/src/STGrid.h

@@ -27 +27 @@
 #include <tables/Tables/ArrayColumn.h>
 
+#include "ScantableWrapper.h"
+#include "Scantable.h"
 #include "concurrent.h"
 
@@ -67 +69 @@
   string saveData( string outfile="" ) ;
 
-private:
+//private:
+protected:
   void init() ;
 
@@ -196 +199 @@
   Bool isMultiIF( Table &tab ) ;
   void fillMainColumns( Table &tab ) ;
+  void fillTable( Table &tab ) ;
+  virtual void table( Table &tab, uInt i ) ;
   static bool produceChunk(void *ctx) throw(concurrent::PCException);
   static void consumeChunk(void *ctx) throw(concurrent::PCException);
@@ -257 +262 @@
   double eGGridSD_;
 };
+
+class STGrid2 : public STGrid
+{
+public:
+  STGrid2() ;
+  STGrid2( const ScantableWrapper &s ) ;
+  STGrid2( const vector<ScantableWrapper> &v ) ;
+  void setScantable( const ScantableWrapper &s ) ;
+  void setScantableList( const vector<ScantableWrapper> &v ) ;
+  void selectData() ;
+  virtual void table( Table &tab, uInt i ) ;
+  ScantableWrapper getResultAsScantable() ;
+
+private:
+  Block<ScantableWrapper> dataList_ ;
+};
 }
 #endif

trunk/src/python_STGrid.cpp

@@ -9 +9 @@
 
 #include "STGrid.h"
-//#include "STGridWrapper.h"
+#include "ScantableWrapper.h"
 
 using namespace boost::python;
@@ -17 +17 @@
 
 void python_STGrid() {
-  //class_<STGridWrapper>("stgrid")
   class_<STGrid>("stgrid")
     .def( init <> () )
@@ -35 +34 @@
     .def("_save", &STGrid::saveData)
     ;
+
+  class_<STGrid2>("stgrid2")
+    .def( init <> () )
+    .def( init < const ScantableWrapper & > () )
+    .def( init < const std::vector<ScantableWrapper> & > () )
+    .def("_setif", &STGrid2::setIF)
+    .def("_setpollist", &STGrid2::setPolList)
+    .def("_setscanlist", &STGrid2::setScanList)
+    .def("_defineimage", &STGrid2::defineImage)
+    .def("_setfunc", &STGrid2::setFunc)
+    .def("_grid", &STGrid2::grid)
+    .def("_setin", &STGrid2::setScantable)
+    .def("_setfiles", &STGrid2::setScantableList)
+    .def("_setweight", &STGrid2::setWeight)
+    .def("_enableclip", &STGrid2::enableClip) 
+    .def("_disableclip", &STGrid2::disableClip) 
+    .def("_get", &STGrid2::getResultAsScantable)
+    ;
+    
 };