Changeset 2396 for trunk/src/STGrid.h

Timestamp:

01/11/12 13:51:25 (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...

Added min/max clipping functionality.
Introduced control parameter and methods for clipping.

File:

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

trunk/src/STGrid.h

@@ -65 +65 @@
   void setWeight( const string wType="uniform" ) ;
 
+  void enableClip() { doclip_ = True ; } ;
+  void disableClip() { doclip_ = False ; } ;
+
   void grid() ;
   
@@ -74 +77 @@
   // actual gridding
   void gridPerRow() ;
+  void gridPerRowWithClipping() ;
   void gridPerPol() ;
+
+  // 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() ;
@@ -166 +182 @@
                      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 ) ;
@@ -172 +215 @@
   static bool produceChunk(void *ctx) throw(concurrent::PCException);
   static void consumeChunk(void *ctx) throw(concurrent::PCException);
+  static void consumeChunkWithClipping(void *ctx) throw(concurrent::PCException);
 
 
@@ -184 +228 @@
   uInt nfile_ ;
   Int ifno_ ;
+  Bool doclip_ ;
 
   Int nx_ ;