Changeset 2200 for trunk/external-alma

Timestamp:

06/23/11 18:02:32 (14 years ago)

Author:

Takeshi Nakazato

Message:

New Development: No

JIRA Issue: Yes CAS-2819

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

Equinox is always 2000.0 since direction is converted to J2000.

Bug fix on conversion from AZEL to J2000.

File:

• trunk/external-alma/atnf/PKSIO/NROReader.cc (modified) (3 diffs)

trunk/external-alma/atnf/PKSIO/NROReader.cc

@@ -39 +39 @@
 #include <atnf/PKSIO/ASTEDataset.h>
 
+#include <measures/Measures/MEpoch.h>
+#include <measures/Measures/MPosition.h>
 #include <measures/Measures/MDirection.h>
 #include <measures/Measures/MCDirection.h>
+#include <measures/Measures/MeasFrame.h>
 #include <measures/Measures/MeasConvert.h>
 
@@ -359 +362 @@
   else if ( icoord == 2 ) {
     // convert from AZEL to RADEC
+    vector<double> antpos = getAntennaPosition() ;
+    Vector<Quantity> qantpos( 3 ) ;
+    for ( int ip = 0 ; ip < 3 ; ip++ )
+      qantpos[ip] = Quantity( antpos[ip], "m" ) ;
+    Double scantime = Double( dataset_->getScanTime( i ) ) ;
+    MEpoch me( Quantity( scantime, "d" ), MEpoch::UTC ) ;
+    MPosition mp( MVPosition( qantpos ), MPosition::ITRF ) ;
+    MeasFrame mf( me, mp ) ;
     MDirection result = 
       MDirection::Convert( MDirection( Quantity( dirx, "rad" ), 
                                        Quantity( diry, "rad" ),
                                        MDirection::Ref( MDirection::AZEL ) ),
-                           MDirection::Ref( MDirection::J2000 ) ) () ;
+                           MDirection::Ref( MDirection::J2000, mf ) ) () ;
     v = result.getAngle().getValue() ;
     //cout << "NROReader::getDirection()  DIRECTION convert from (" 
@@ -441 +452 @@
   //cout << "antpos = " << antpos << endl ;
   string eq = dataset_->getEPOCH() ;
-  if ( eq.compare( 0, 5, "B1950" ) == 0 )
-    equinox = 1950.0 ;
-  else if ( eq.compare( 0, 5, "J2000" ) == 0 ) 
-    equinox = 2000.0 ;
+//   if ( eq.compare( 0, 5, "B1950" ) == 0 )
+//     equinox = 1950.0 ;
+//   else if ( eq.compare( 0, 5, "J2000" ) == 0 ) 
+//     equinox = 2000.0 ;
+  // equinox is always 2000.0
+  equinox = 2000.0 ;
   //cout << "equinox = " << equinox << endl ;
   string vref = dataset_->getVREF() ;