Changeset 2638 for trunk

Timestamp:

08/09/12 12:40:16 (12 years ago)

Author:

Takeshi Nakazato

Message:

New Development: No

JIRA Issue: No

Ready for Test: Yes

Interface Changes: No

What Interface Changed: Please list interface changes

Test Programs: test_sdgrid

Put in Release Notes: No

Module(s): Module Names change impacts.

Description: Describe your changes here...

toPixel is redefined using DirectionCoordinate.

Location:

trunk/src

Files:

• STGrid.cpp (modified) (4 diffs)
• STGrid.h (modified) (1 diff)

trunk/src/STGrid.cpp

@@ -17 +17 @@
 #include <casa/Utilities/CountedPtr.h>
 #include <casa/Logging/LogIO.h>
+
+#include <coordinates/Coordinates/DirectionCoordinate.h>
 
 #include <tables/Tables/Table.h>
@@ -1084 +1086 @@
 //   os << "xmin=" << xmin << LogIO::POST ;
 //   os << "center_=" << center_ << LogIO::POST ;
-  decCorr_ = 1.0 / cos( center_[1] ) ;
 
   nx_ = nx ;
@@ -1143 +1144 @@
   cellx_ = qcellx.getValue( "rad" ) ;
   // DEC correction
-  cellx_ *= decCorr_ ;
+  cellx_ /= cos( center_[1] ) ;
   celly_ = qcelly.getValue( "rad" ) ;
   //os << "cellx_=" << cellx_ << ", celly_=" << celly_ << ", cos("<<center_(1)<<")=" << cos(center_(1)) << LogIO::POST ;
@@ -1527 +1528 @@
 void STGrid::toPixel( Array<Double> &world, Array<Double> &pixel )
 {
-  // gridding will be done on (nx_+2*convSupport_) x (ny_+2*convSupport_) 
-  // grid plane to avoid unexpected behavior on grid edge
-  Block<Double> pixc( 2 ) ;
-  pixc[0] = Double( nx_-1 ) * 0.5 ;
-  pixc[1] = Double( ny_-1 ) * 0.5 ;
-//   pixc[0] = Double( nx_+2*convSupport_-1 ) * 0.5 ;
-//   pixc[1] = Double( ny_+2*convSupport_-1 ) * 0.5 ;
+  // using DirectionCoordinate
+  Matrix<Double> xform(2,2) ;
+  xform = 0.0 ;
+  xform.diagonal() = 1.0 ;
+  DirectionCoordinate coord( MDirection::J2000,
+                             Projection( Projection::SIN ),
+                             center_[0], center_[1],
+                             cellx_, celly_,
+                             xform,
+                             0.5*Double(nx_-1), 
+                             0.5*Double(ny_-1) ) ;
   uInt nrow = world.shape()[1] ;
   Bool bw, bp ;
-  const Double *w_p = world.getStorage( bw ) ;
+  Double *w_p = world.getStorage( bw ) ;
   Double *p_p = pixel.getStorage( bp ) ;
-  const Double *ww_p = w_p ;
+  Double *ww_p = w_p ;
   Double *wp_p = p_p ;
+  IPosition vshape( 1, 2 ) ;
+  Vector<Double> _world, _pixel ;
   for ( uInt i = 0 ; i < nrow ; i++ ) {
-    *wp_p = pixc[0] + ( *ww_p - center_[0] ) / cellx_ ;
-    wp_p++ ;
-    ww_p++ ;
-    *wp_p = pixc[1] + ( *ww_p - center_[1] ) / celly_ ;
-    wp_p++ ;
-    ww_p++ ;
-  }
-  world.freeStorage( w_p, bw ) ;
-  pixel.putStorage( p_p, bp ) ;  
+    _world.takeStorage( vshape, ww_p, SHARE ) ;
+    _pixel.takeStorage( vshape, wp_p, SHARE ) ;
+    coord.toPixel( _pixel, _world ) ;
+    ww_p += 2 ;
+    wp_p += 2 ;
+  }
+  world.putStorage( w_p, bw ) ;
+  pixel.putStorage( p_p, bp ) ;
 }
 

trunk/src/STGrid.h

@@ -226 +226 @@
   Double celly_ ;
   Vector<Double> center_ ;
-  Double decCorr_ ;
   String convType_ ;
   Int convSupport_ ;