Changeset 2669

Timestamp:

10/17/12 17:20:35 (12 years ago)

Author:

Takeshi Nakazato

Message:

New Development: No

JIRA Issue: Yes CAS-4429

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...

Use DirectionCoordinate? for conversion between world and pixel.

Location:

trunk

Files:

• python/asapgrid.py (modified) (3 diffs)
• src/STGrid.cpp (modified) (6 diffs)
• src/STGrid.h (modified) (2 diffs)

trunk/python/asapgrid.py

@@ -448 +448 @@
         #print 'nrow=',nrow
 
-        idx = 0
-        d0 = s.get_direction( 0 ).split()[-1]
-        while ( s.get_direction(self.npol*idx) is not None \
-                and s.get_direction(self.npol*idx).split()[-1] == d0 ):
+        idx = 1
+        d0 = s.get_direction( 0 ).split()[-2]
+        d = s.get_direction(self.npol*idx)
+        while( d is not None \
+               and d.split()[-2] != d0):
             idx += 1
+            d = s.get_direction(self.npol*idx)
         
         self.nx = idx
@@ -484 +486 @@
             opt += ', channel %s'%(chan)
         data = self.getData( chan, pol )
-        data = numpy.fliplr( data )
+        #data = numpy.fliplr( data )
         title = 'Gridded Image (%s)'%(opt)
         pl.figure(10)
@@ -530 +532 @@
         if self.ifno < 0:
             ifno = self.tablein.getif(0)
-            print 'ifno=',ifno
+            #print 'ifno=',ifno
         else:
             ifno = self.ifno

trunk/src/STGrid.cpp

@@ -1143 +1143 @@
   }
   cellx_ = qcellx.getValue( "rad" ) ;
-  // DEC correction
-  cellx_ /= cos( center_[1] ) ;
   celly_ = qcelly.getValue( "rad" ) ;
   //os << "cellx_=" << cellx_ << ", celly_=" << celly_ << ", cos("<<center_(1)<<")=" << cos(center_(1)) << LogIO::POST ;
@@ -1156 +1154 @@
       wy = 0.00290888 ;
     }
-    nx_ = Int( ceil( wx/cellx_ ) ) ;
+    nx_ = Int( ceil( wx/(cellx_/cos(center_[1])) ) ) ;
     ny_ = Int( ceil( wy/celly_ ) ) ;
   }
+
+  // create DirectionCoordinate
+  Matrix<Double> xform(2,2) ;
+  xform = 0.0 ;
+  xform.diagonal() = 1.0 ;
+  dircoord_ = new DirectionCoordinate(MDirection::J2000,
+                                      Projection( Projection::SIN ),
+                                      center_[0], center_[1],
+                                      -cellx_, celly_,
+                                      xform,
+                                      0.5*Double(nx_-1), 
+                                      0.5*Double(ny_-1)) ;
 }
 
@@ -1528 +1538 @@
 void STGrid::toPixel( Array<Double> &world, Array<Double> &pixel )
 {
-  // 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 ;
@@ -1550 +1549 @@
     _world.takeStorage( vshape, ww_p, SHARE ) ;
     _pixel.takeStorage( vshape, wp_p, SHARE ) ;
-    coord.toPixel( _pixel, _world ) ;
+    dircoord_->toPixel( _pixel, _world ) ;
     ww_p += 2 ;
     wp_p += 2 ;
@@ -1690 +1689 @@
   cpix(1) = Double( ny_ - 1 ) * 0.5 ;
   Vector<Double> dir( 2 ) ;
+  Vector<Double> pix( 2 );
   ArrayColumn<Double> directionCol( tab, "DIRECTION" ) ;
   ArrayColumn<Float> spectraCol( tab, "SPECTRA" ) ;
@@ -1704 +1704 @@
   uInt scanno = 0 ;
   for ( Int iy = 0 ; iy < ny_ ; iy++ ) {
-    dir(1) = center_(1) - ( cpix(1) - (Double)iy ) * celly_ ;
+    pix(1) = (Double)(iy);
     for ( Int ix = 0 ; ix < nx_ ; ix++ ) {
-      dir(0) = center_(0) - ( cpix(0) - (Double)ix ) * cellx_ ;
+      pix(0) = (Double)(nx_-1-ix);
+      dircoord_->toWorld(dir,pix);
+      //os << "dir[" << ix << "," << iy << "]=" << dir << LogIO::POST;
       for ( Int ipol = 0 ; ipol < npol_ ; ipol++ ) {
-        offset = ix + iy * nx_ + ipol * nx_ * ny_ ;
+        offset = ix + nx_ * (iy + ipol * ny_) ;
         //os << "offset = " << offset << LogIO::POST ;
         sp_p = sp.getStorage( bsp ) ;

trunk/src/STGrid.h

@@ -22 +22 @@
 #include <casa/Arrays/Vector.h>
 #include <casa/Containers/RecordField.h>
+#include <casa/Utilities/CountedPtr.h>
 
 #include <tables/Tables/Table.h>
 #include <tables/Tables/ScalarColumn.h>
 #include <tables/Tables/ArrayColumn.h>
+
+#include <coordinates/Coordinates/DirectionCoordinate.h>
 
 #include "ScantableWrapper.h"
@@ -236 +239 @@
   Vector<uInt> rows_ ;
   Int nchunk_ ;
+  CountedPtr<DirectionCoordinate> dircoord_;
 
   /////////////// gridPerRow variable