Changeset 2619 for trunk/src

Timestamp:

08/02/12 18:19: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: not available

Put in Release Notes: No

Module(s): Module Names change impacts.

Description: Describe your changes here...

Take care of 2pi rotation on RA axis.

Location:

trunk/src

Files:

• EdgeDetector.cpp (modified) (2 diffs)
• MathUtils.cpp (modified) (1 diff)
• MathUtils.h (modified) (1 diff)

trunk/src/EdgeDetector.cpp

@@ -12 +12 @@
 
 #include "EdgeDetector.h"
+#include "MathUtils.h"
 
 using namespace std ;
@@ -28 +29 @@
 void EdgeDetector::setDirection( const Matrix<Double> &dir ) 
 {
-  dir_.reference( dir ) ;
+  //dir_.reference( dir ) ;
+  dir_ = dir.copy() ;
+  Vector<Double> ra( dir_.row(0) ) ;
+  mathutil::rotateRA( ra ) ;
   resizeTempArea( dir.nrow() ) ;
 }

trunk/src/MathUtils.cpp

@@ -292 +292 @@
 }
 
+void mathutil::rotateRA( Vector<Double> &v )
+{
+  uInt len = v.nelements() ;  
+  Vector<Double> work( len ) ;
+
+  for ( uInt i = 0 ; i < len ; i++ ) {
+    work[i] = fmod( v[i], C::_2pi ) ;
+    if ( work[i] < 0.0 ) {
+      work[i] += C::_2pi ;
+    }
+  }
+  //cout << "zero2twopi: out=" << work << endl ; 
+
+  Vector<uInt> quad( len ) ;
+  Vector<uInt> nquad( 4, 0 ) ;
+  for ( uInt i = 0 ; i < len ; i++ ) {
+    uInt q = uInt( work[i] / C::pi_2 ) ;
+    nquad[q]++ ;
+    quad[i] = q ;
+  }
+  //cout << "nquad = " << nquad << endl ;
+
+  Vector<Bool> rot( 4, False ) ;
+  if ( nquad[0] > 0 && nquad[3] > 0 
+       && ( nquad[1] == 0 || nquad[2] == 0 ) ) {
+    //cout << "need rotation" << endl ;
+    rot[3] = True ;
+    rot[2] = (nquad[1]==0 && nquad[2]>0) ;
+  }
+  //cout << "rot=" << rot << endl ;
+
+  for ( uInt i = 0 ; i < len ; i++ ) {
+    if ( rot[quad[i]] ) {
+      v[i] = work[i] - C::_2pi ;
+    }
+    else {
+      v[i] = work[i] ;
+    }
+  }
+}
+
+void mathutil::rotateRA( const Vector<Double> &in,
+                         Vector<Double> &out ) 
+{
+  out = in.copy() ;
+  rotateRA( out ) ;
+}
+
 double mathutil::gettimeofday_sec()
 {

trunk/src/MathUtils.h

@@ -110 +110 @@
 
 /**
+ * RA nomalization: n*2pi rotation if necessary
+ **/
+void rotateRA( const casa::Vector<casa::Double> &in,
+               casa::Vector<casa::Double> &out ) ;
+void rotateRA( casa::Vector<casa::Double> &v ) ;
+
+/**
  * tool to record current time stamp
  **/