Changeset 2632 for trunk

Timestamp:

08/07/12 18:28:59 (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: List test programs

Put in Release Notes: No

Module(s): Module Names change impacts.

Description: Describe your changes here...

DEC. correction on R.A. grid.

Location:

trunk/src

Files:

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

trunk/src/GenericEdgeDetector.cpp

@@ -109 +109 @@
   const Double *y_p = dir_p + 1 ;
   for ( uInt i = 0 ; i < len ; i++ ) {
-    *px_p = pcenx_ + ( *x_p - cenx_ ) / dx_ ;
+    *px_p = pcenx_ + ( *x_p - cenx_ ) * decCorr_ / dx_ ;
     *py_p = pceny_ + ( *y_p - ceny_ ) / dy_ ;
     px_p += 2 ;
@@ -123 +123 @@
   os_.origin(LogOrigin( "GenericEdgeDetector", "setup", WHERE )) ;
 
+  Double xmax, xmin, ymax, ymin ;
+  minMax( xmin, xmax, dir_.row( 0 ) ) ;
+  minMax( ymin, ymax, dir_.row( 1 ) ) ;
+  Double wx = ( xmax - xmin ) * 1.1 ;
+  Double wy = ( ymax - ymin ) * 1.1 ;
+
+  cenx_ = 0.5 * ( xmin + xmax ) ;
+  ceny_ = 0.5 * ( ymin + ymax ) ;
+  decCorr_ = 1.0 / 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) ;
+    dd(0,i) = ( dd(0,i) - dd(0,i-1) ) * decCorr_ ;
     dd(1,i) = dd(1,i) - dd(1,i-1) ;
   }
@@ -141 +151 @@
   dir_.freeStorage( dir_p, b ) ;
   Double med = median( dr, False, True, True ) ;
-  dx_ = med * width_ ;
-  dy_ = dx_ ;
-
-  Double xmax, xmin, ymax, ymin ;
-  minMax( xmin, xmax, dir_.row( 0 ) ) ;
-  minMax( ymin, ymax, dir_.row( 1 ) ) ;
-  Double wx = ( xmax - xmin ) * 1.1 ;
-  Double wy = ( ymax - ymin ) * 1.1 ;
-
-  cenx_ = 0.5 * ( xmin + xmax ) ;
-  ceny_ = 0.5 * ( ymin + ymax ) ;
+  dy_ = med * width_ ;
+  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