Changeset 2593 for trunk/src/STGrid.h

Timestamp:

07/09/12 16:54:10 (12 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.

File:

• trunk/src/STGrid.h (modified) (4 diffs)

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