Changeset 2639 for trunk/src

Timestamp:

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

Author:

Takeshi Nakazato

Message:

New Development: No

JIRA Issue: Yes CAS-2825

Ready for Test: Yes

Interface Changes: No

What Interface Changed: Please list interface changes

Test Programs: not available

Put in Release Notes: No

Module(s): Module Names change impacts.

Description: Describe your changes here...

Correct DEC correction on R.A.

Location:

trunk/src

Files:

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

trunk/src/GenericEdgeDetector.cpp

@@ -17 +17 @@
 #include <casa/Arrays/ArrayIO.h>
 #include <casa/Utilities/GenSort.h>
+
+#include <coordinates/Coordinates/DirectionCoordinate.h>
 
 #include "GenericEdgeDetector.h"
@@ -99 +101 @@
 
   setup() ;
+  // using DirectionCoordinate
+  Matrix<Double> xform(2,2) ;
+  xform = 0.0 ;
+  xform.diagonal() = 1.0 ;
+  DirectionCoordinate coord( MDirection::J2000,
+                             Projection( Projection::SIN ),
+                             cenx_, ceny_,
+                             dx_, dy_,
+                             xform,
+                             0.5*Double(nx_-1), 
+                             0.5*Double(ny_-1) ) ;
   Double *pdir_p = new Double[dir_.nelements()] ;
   pdir_.takeStorage( dir_.shape(), pdir_p, TAKE_OVER ) ;
   uInt len = time_.nelements() ;
   Bool b ;
-  Double *px_p = pdir_p ;
-  Double *py_p = pdir_p + 1 ;
-  const Double *dir_p = dir_.getStorage( b ) ;
-  const Double *x_p = dir_p ;
-  const Double *y_p = dir_p + 1 ;
+  Double *dir_p = dir_.getStorage( b ) ;
+  Double *wdir_p = dir_p ;
+  Vector<Double> world ;
+  Vector<Double> pixel ;
+  IPosition vshape( 1, 2 ) ;
   for ( uInt i = 0 ; i < len ; i++ ) {
-    *px_p = pcenx_ + ( *x_p - cenx_ ) / dx_ ;
-    *py_p = pceny_ + ( *y_p - ceny_ ) / dy_ ;
-    px_p += 2 ;
-    py_p += 2 ;
-    x_p += 2 ;
-    y_p += 2 ;
-  }
-  dir_.freeStorage( dir_p, b ) ;
+    world.takeStorage( vshape, wdir_p, SHARE ) ;
+    pixel.takeStorage( vshape, pdir_p, SHARE ) ;
+    coord.toPixel( pixel, world ) ;
+    pdir_p += 2 ;
+    wdir_p += 2 ;
+  }
+  dir_.putStorage( dir_p, b ) ;
 }
 
@@ -131 +143 @@
   cenx_ = 0.5 * ( xmin + xmax ) ;
   ceny_ = 0.5 * ( ymin + ymax ) ;
-  decCorr_ = 1.0 / cos( ceny_ ) ;
+  Double decCorr = cos( ceny_ ) ;
 
   uInt len = time_.nelements() ;
   Matrix<Double> dd = dir_.copy() ;
   for ( uInt i = len-1 ; i > 0 ; i-- ) {
-    dd(0,i) = ( dd(0,i) - dd(0,i-1) ) * decCorr_ ;
+    //dd(0,i) = ( dd(0,i) - dd(0,i-1) ) * decCorr ;
+    dd(0,i) = ( dd(0,i) - dd(0,i-1) ) * cos( 0.5*(dd(1,i-1)+dd(1,i)) ) ;
     dd(1,i) = dd(1,i) - dd(1,i-1) ;
   }
@@ -152 +165 @@
   Double med = median( dr, False, True, True ) ;
   dy_ = med * width_ ;
-  dx_ = dy_ * decCorr_ ;
+  dx_ = dy_ / decCorr ;
 
   nx_ = uInt( ceil( wx / dx_ ) ) ;

trunk/src/GenericEdgeDetector.h

@@ -62 +62 @@
   casa::Double dx_ ;
   casa::Double dy_ ;
-  casa::Double decCorr_ ;
   
   // storage for detection