Changeset 2393 for trunk/src/STGrid.h

Timestamp:

01/05/12 12:10:37 (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...

Parallel version of STGrid. Implemented using concurrent module.
Two threads are running in parallel. Those are responsible for
retrieving data and processing data respectively.

File:

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

trunk/src/STGrid.h

@@ -26 +26 @@
 #include <tables/Tables/ScalarColumn.h>
 #include <tables/Tables/ArrayColumn.h>
+
+#include "concurrent.h"
 //#include <tables/Tables/TableRow.h>
 
@@ -100 +102 @@
                       Array<uInt> &rflag,
                       Array<Float> &weight ) ;
+  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,
@@ -128 +138 @@
   void prepareTable( Table &tab, String &name ) ;
 
-  Bool pastEnd() ;
+//   Bool pastEnd() ;
 
   void selectData() ;
@@ -160 +170 @@
   void initTable( uInt idx ) ;
   Bool isMultiIF( Table &tab ) ;
+  static bool produceChunk(void *ctx) throw(concurrent::PCException);
+  static void consumeChunk(void *ctx) throw(concurrent::PCException);
 
 
@@ -172 +184 @@
   uInt nfile_ ;
   Int ifno_ ;
+
   Int nx_ ;
   Int ny_ ;
@@ -177 +190 @@
   Int npolOrg_ ;
   Int nchan_ ;
-  Int nrow_ ;
-  Block<Int> rows_ ;
   Double cellx_ ;
   Double celly_ ;
@@ -186 +197 @@
   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_ ;
-  Block<Table> tableList_ ;
+  // per pol
   Table ptab_ ;
   ROArrayColumn<Float> spectraCol_ ;
@@ -200 +221 @@
   ROArrayColumn<Float> tsysCol_ ;
   ROScalarColumn<Double> intervalCol_ ;
+
   Int nprocessed_ ;
-  Int nchunk_ ;
-
-  Array<Float> spectraF_ ;
-  Array<uChar> flagtraUC_ ;
-  Array<uInt> rflagUI_ ;
-
+
+
+  double eGetData_;
+  double eToPixel_;
+  double eGGridSD_;
 };
 }