Changeset 2375 for trunk/src/STGrid.h

Timestamp:

12/19/11 19:40:37 (13 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...

Several bug fixes and updates

• fixed misunderstanding of array shape when getting data
• load flag data as Int (originally uChar/uInt) at the beginning of gridding
• do not plot observed position and grid position by default
• use Array (instead of Vector/Matrix/Cube?) as much as possible

File:

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

trunk/src/STGrid.h

@@ -86 +86 @@
                 Array<Float> &gwgt ) ;
   
-  void getData( Cube<Complex> &spectra,
-                Matrix<Double> &direction,
-                Cube<uChar> &flagtra,
-                Matrix<uInt> &rflag,
-                Matrix<Float> &weight ) ;
+  void getData( Array<Complex> &spectra,
+                Array<Double> &direction,
+                Array<uChar> &flagtra,
+                Array<uInt> &rflag,
+                Array<Float> &weight ) ;
+  void getData( Array<Complex> &spectra,
+                Array<Double> &direction,
+                Array<Int> &flagtra,
+                Array<Int> &rflag,
+                Array<Float> &weight ) ;
 
-  void getWeight( Matrix<Float> &w,
-                  Cube<Float> &tsys,
-                  Matrix<Double> &tint ) ;
+  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 toInt( Array<uChar> &u, Array<Int> &v ) ;
+  void toInt( Array<uInt> &u, Array<Int> &v ) ;
 
-  void toPixel( Matrix<Double> &world, Matrix<Double> &pixel ) ;
+  void toPixel( Array<Double> &world, Array<Double> &pixel ) ;
   
   void boxFunc( Vector<Float> &convFunc, Int &convSize ) ;
@@ -111 +116 @@
   Double polMean( const Double *p ) ;
 
-  void updatePolList( Table &tab ) ;
+  void setupArray( Table &tab ) ;
 
   void prepareTable( Table &tab, String &name ) ;