Changeset 2379 for trunk/src/STGrid.h

Timestamp:

12/21/11 15:42:01 (12 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...

Introduced row-by-row gridding.

File:

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

trunk/src/STGrid.h

@@ -29 +29 @@
 
 #include <tables/Tables/Table.h>
-// #include <tables/Tables/ScalarColumn.h>
-// #include <tables/Tables/ArrayColumn.h>
+#include <tables/Tables/ScalarColumn.h>
+#include <tables/Tables/ArrayColumn.h>
 
 // #include <measures/Measures/MDirection.h>
@@ -66 +66 @@
 
   void grid() ;
+  void gridAll() ;
   void gridPerRow() ;
   
@@ -96 +97 @@
                 Array<uInt> &rflag,
                 Array<Float> &weight ) ;
-  void getDataChunk( Array<Complex> &spectra,
-                     Array<Double> &direction,
-                     Array<Int> &flagtra,
-                     Array<Int> &rflag,
-                     Array<Float> &weight ) ;
+  Int getDataChunk( Array<Complex> &spectra,
+                    Array<Double> &direction,
+                    Array<Int> &flagtra,
+                    Array<Int> &rflag,
+                    Array<Float> &weight ) ;
+  Int getDataChunk( Array<Float> &spectra,
+                    Array<Double> &direction,
+                    Array<uChar> &flagtra,
+                    Array<uInt> &rflag,
+                    Array<Float> &weight ) ;
 
   void getWeight( Array<Float> &w,
@@ -116 +122 @@
   void pbFunc( Vector<Float> &convFunc ) ;
   void setConvFunc( Vector<Float> &convFunc ) ;
-  void selectData( Table &tab ) ;
 
   Float polMean( const Float *p ) ;
   Double polMean( const Double *p ) ;
 
-  void setupArray( Table &tab ) ;
-
   void prepareTable( Table &tab, String &name ) ;
 
   Bool pastEnd() ;
+
+  void selectData() ;
+  void setupArray() ;
+  void sortData() ;
+
+  Bool examine() ;
+  void attach() ;
 
 
@@ -148 +158 @@
 
   Table tab_ ;
-  Int irow_ ;
+  ROArrayColumn<Float> spectraCol_ ;
+  ROArrayColumn<uChar> flagtraCol_ ;
+  ROArrayColumn<Double> directionCol_ ;
+  ROScalarColumn<uInt> flagRowCol_ ;
+  ROArrayColumn<Float> tsysCol_ ;
+  ROScalarColumn<Double> intervalCol_ ;
+  Int nprocessed_ ;
+  Vector<uInt> rows_ ;
+  Int nchunk_ ;
 };
 }