Changes in trunk/src/STGrid.h [2413:2371]

File:

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

trunk/src/STGrid.h

@@ -19 +19 @@
 
 #include <casa/BasicSL/String.h>
-#include <casa/Arrays/Array.h>
 #include <casa/Arrays/Vector.h>
-#include <casa/Containers/RecordField.h>
+#include <casa/Arrays/Matrix.h>
+#include <casa/Arrays/Cube.h>
+// #include <casa/Arrays/ArrayMath.h>
+// #include <casa/Inputs/Input.h>
+// #include <casa/Quanta/Quantum.h>
+// #include <casa/Quanta/QuantumHolder.h>
+// #include <casa/Utilities/CountedPtr.h>
 
 #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 "concurrent.h"
+// #include <measures/Measures/MDirection.h>
+
+// #include "Scantable.h"
 
 using namespace std ;
@@ -38 +45 @@
   STGrid() ;
   STGrid( const string infile ) ;
-  STGrid( const vector<string> infile ) ;
   virtual ~STGrid() {} ;
 
   void setFileIn( const string infile ) ;
-  void setFileList( const vector<string> infile ) ;
 
   void setIF( unsigned int ifno ) { ifno_ = ifno ; } ;
@@ -60 +65 @@
   void setWeight( const string wType="uniform" ) ;
 
-  void enableClip() { doclip_ = True ; } ;
-  void disableClip() { doclip_ = False ; } ;
-
   void grid() ;
   
@@ -70 +72 @@
   void init() ;
 
-  // actual gridding
-  void gridPerRow() ;
-  void gridPerRowWithClipping() ;
-
-  // clipping
-  void clipMinMax( Array<Complex> &data,
-                   Array<Float> &weight,
-                   Array<Int> &npoints,
-                   Array<Complex> &clipmin,
-                   Array<Float> &clipwmin,
-                   Array<Float> &clipcmin,
-                   Array<Complex> &clipmax,
-                   Array<Float> &clipwmax,
-                   Array<Float> &clipcmax ) ;
-                   
-
-  void setupGrid() ;
   void setupGrid( Int &nx, 
                   Int &ny, 
@@ -96 +81 @@
                   Double &ymax,
                   String &center ) ;
-  void mapExtent( Double &xmin, Double &xmax,
-                  Double &ymin, Double &ymax ) ;
 
-  void setData( Array<Complex> &gdata,
+  void setData( Array<Float> &data,
+                Array<Float> &gdata,
                 Array<Float> &gwgt ) ;
   
-  Int getDataChunk( IPosition const &wshape,
-                    IPosition const &vshape,
-                    IPosition const &dshape,
-                    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 getData( Cube<Float> &spectra,
+                Matrix<Double> &direction,
+                Cube<uChar> &flagtra,
+                Matrix<uInt> &rflag,
+                Matrix<Float> &weight ) ;
 
-  void getWeight( Array<Float> &w,
-                  Array<Float> &tsys,
-                  Array<Double> &tint ) ;
-  
-  void toInt( Array<uChar> &u, Array<Int> &v ) ;
-  void toInt( Array<uInt> &u, Array<Int> &v ) ;
+  void getWeight( Matrix<Float> &w,
+                  Cube<Float> &tsys,
+                  Matrix<Double> &tint ) ;
 
-  void toPixel( Array<Double> &world, Array<Double> &pixel ) ;
+  void toInt( Array<uChar> *u, Array<Int> *v ) ;
+  void toInt( Array<uInt> *u, Array<Int> *v ) ;
+
+  void toPixel( Matrix<Double> &world, Matrix<Double> &pixel ) ;
   
   void boxFunc( Vector<Float> &convFunc, Int &convSize ) ;
@@ -135 +106 @@
   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 updatePolList( Table &tab ) ;
 
   void prepareTable( Table &tab, String &name ) ;
 
-  void selectData() ;
-  void setupArray() ;
-
-  void updateChunkShape() ;
-  void attach( Table &tab ) ;
-
-  void call_ggridsd( Array<Double> &xy,
-                     Array<Complex> &values,
-                     Int &nvispol,
-                     Int &nvischan,
-                     Array<Int> &flag,
-                     Array<Int> &rflag,
-                     Array<Float> &weight,
-                     Int &nrow,
-                     Int &irow,
-                     Array<Complex> &grid,
-                     Array<Float> &wgrid,
-                     Int &nx,
-                     Int &ny,
-                     Int &npol,
-                     Int &nchan,
-                     Int &support,
-                     Int &sampling,
-                     Vector<Float> &convFunc,
-                     Int *chanMap,
-                     Int *polMap ) ;
-  void call_ggridsd2( Array<Double> &xy,
-                      Array<Complex> &values,
-                      Int &nvispol,
-                      Int &nvischan,
-                      Array<Int> &flag,
-                      Array<Int> &rflag,
-                      Array<Float> &weight,
-                      Int &nrow,
-                      Int &irow,
-                      Array<Complex> &grid,
-                      Array<Float> &wgrid,
-                      Array<Int> &npoints,
-                      Array<Complex> &clipmin,
-                      Array<Float> &clipwmin,
-                      Array<Float> &clipcmin,
-                      Array<Complex> &clipmax,
-                      Array<Float> &clipwmax,
-                      Array<Float> &clipcmax,
-                      Int &nx,
-                      Int &ny,
-                      Int &npol,
-                      Int &nchan,
-                      Int &support,
-                      Int &sampling,
-                      Vector<Float> &convFunc,
-                      Int *chanMap,
-                      Int *polMap ) ;
-
-  void initPol( Int ipol ) ;
-  void initTable( uInt idx ) ;
-  Bool isMultiIF( Table &tab ) ;
-  void fillMainColumns( Table &tab ) ;
-  static bool produceChunk(void *ctx) throw(concurrent::PCException);
-  static void consumeChunk(void *ctx) throw(concurrent::PCException);
-  static void consumeChunkWithClipping(void *ctx) throw(concurrent::PCException);
-
-
-  // user input
-  Int nxUI_ ;
-  Int nyUI_ ;
-  String cellxUI_ ;
-  String cellyUI_ ;
-  String centerUI_ ;
-
-  Block<String> infileList_ ;
-  uInt nfile_ ;
+  String infile_ ;
   Int ifno_ ;
-  Bool doclip_ ;
-
   Int nx_ ;
   Int ny_ ;
   Int npol_ ;
-  Int npolOrg_ ;
   Int nchan_ ;
+  Int nrow_ ;
   Double cellx_ ;
   Double celly_ ;
@@ -225 +129 @@
   Int userSupport_ ;
   Int convSampling_ ;
+  Array<Float> data_ ;
   Vector<uInt> pollist_ ;
   Vector<uInt> scanlist_ ;
   String wtype_ ;
-  Block<Table> tableList_ ;
-  Vector<uInt> rows_ ;
-  Int nchunk_ ;
-
-  /////////////// gridPerRow variable
-  IPosition vshape_;
-  IPosition wshape_;
-  IPosition dshape_;
-  // loop variable
-  Int nrow_ ;
-  Array<Float> data_ ;
 
   Table tab_ ;
-  // per pol
-  Table ptab_ ;
-  ROArrayColumn<Float> spectraCol_ ;
-  ROArrayColumn<uChar> flagtraCol_ ;
-  ROArrayColumn<Double> directionCol_ ;
-  ROScalarColumn<uInt> flagRowCol_ ;
-  ROArrayColumn<Float> tsysCol_ ;
-  ROScalarColumn<Double> intervalCol_ ;
-
-  Int nprocessed_ ;
-
-
-  double eGetData_;
-  double eToPixel_;
-  double eGGridSD_;
 };
 }