Changeset 2262 for branches/parallel/external-alma/atnf/PKSIO/NROReader.cc

Timestamp:

08/04/11 12:58:21 (13 years ago)

Author:

Takeshi Nakazato

Message:

New Development: No

JIRA Issue: No

Ready for Test: No

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

Preparation for check in tuning on NRO filler.
Merge changes in trunk.

r2154
r2156
r2158
r2198-2203
r2212
r2261

Location:

branches/parallel

Files:

• . (modified) (1 prop)
• external-alma (modified) (1 prop)
• external-alma/atnf/PKSIO/NROReader.cc (modified) (10 diffs)

branches/parallel/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>
 
@@ -314 +317 @@
     //<< srcra << "," << srcdec << ") B1950 to (" 
     //<< v( 0 ) << ","<< v( 1 ) << ") J2000" << endl ;
-    os << LogIO::NORMAL << "SRCDIRECTION convert from (" 
-       << srcra << "," << srcdec << ") B1950 to (" 
-       << v( 0 ) << ","<< v( 1 ) << ") J2000" << LogIO::POST ;
+    //os << LogIO::NORMAL << "SRCDIRECTION convert from (" 
+    //   << srcra << "," << srcdec << ") B1950 to (" 
+    //   << v( 0 ) << ","<< v( 1 ) << ") J2000" << LogIO::POST ;
   }
   else if ( strncmp( epoch, "J2000", 5 ) == 0 ) {
@@ -353 +356 @@
     //<< dirx << "," << diry << ") LB to (" 
     //<< v( 0 ) << ","<< v( 1 ) << ") RADEC" << endl ;
-    os << LogIO::NORMAL << "DIRECTION convert from (" 
-       << dirx << "," << diry << ") LB to (" 
-       << v( 0 ) << ","<< v( 1 ) << ") RADEC" << LogIO::POST ;
+    //os << LogIO::NORMAL << "DIRECTION convert from (" 
+    //   << dirx << "," << diry << ") LB to (" 
+    //   << v( 0 ) << ","<< v( 1 ) << ") RADEC" << LogIO::POST ;
   }
   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 (" 
     //<< dirx << "," << diry << ") AZEL to (" 
     //<< v( 0 ) << ","<< v( 1 ) << ") RADEC" << endl ;
-    os << LogIO::NORMAL << "DIRECTION convert from (" 
-       << dirx << "," << diry << ") AZEL to (" 
-       << v( 0 ) << ","<< v( 1 ) << ") RADEC" << LogIO::POST ;
+    //os << LogIO::NORMAL << "DIRECTION convert from (" 
+    //   << dirx << "," << diry << ") AZEL to (" 
+    //   << v( 0 ) << ","<< v( 1 ) << ") RADEC" << LogIO::POST ;
   }
   else if ( icoord == 0 ) {
@@ -387 +398 @@
       //<< dirx << "," << diry << ") B1950 to (" 
       //<< v( 0 ) << ","<< v( 1 ) << ") J2000" << endl ;
-      os << LogIO::NORMAL << "DIRECTION convert from (" 
-         << dirx << "," << diry << ") B1950 to (" 
-         << v( 0 ) << ","<< v( 1 ) << ") J2000" << LogIO::POST ;
+      //os << LogIO::NORMAL << "DIRECTION convert from (" 
+      //   << dirx << "," << diry << ") B1950 to (" 
+      //   << v( 0 ) << ","<< v( 1 ) << ") J2000" << LogIO::POST ;
     }
     else if ( strncmp( epoch, "J2000", 5 ) == 0 ) {
@@ -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() ;
@@ -456 +469 @@
   }
   //freqref = vref ;
-  freqref = "LSRK" ;
+  //freqref = "LSRK" ;
+  freqref = "REST" ;
   //cout << "freqref = " << freqref << endl ;
   NRODataRecord *record = dataset_->getRecord( 0 ) ;
@@ -483 +497 @@
   //cout << "poltype = " << poltype << endl ;
 
-  vector<Bool> ifs = getIFs() ;
-  nif = ifs.size() ;
+  //vector<Bool> ifs = getIFs() ;
+  //nif = ifs.size() ;
+  nif = getNumIF() ;
   //cout << "nif = " << nif << endl ;
 
-  vector<Bool> beams = getBeams() ;
-  nbeam = beams.size() ;
+  //vector<Bool> beams = getBeams() ;
+  //nbeam = beams.size() ;
+  nbeam = getNumBeam() ;
   //cout << "nbeam = " << nbeam << endl ;
 
@@ -505 +521 @@
                             uInt &scanno,
                             uInt &cycleno,
+                            uInt &ifno,
                             uInt &beamno,
                             uInt &polno,
@@ -548 +565 @@
   //cout << "cycleno = " << cycleno << endl ;
 
-  // beamno
-  string arryt = string( record->ARRYT ) ;
-  string sbeamno = arryt.substr( 1, arryt.size()-1 ) ;
-  uInt ibeamno = atoi( sbeamno.c_str() ) ; 
-  beamno = ibeamno - 1 ;
+  // beamno and ifno
+  string rxname = dataset_->getRX()[0] ;
+  if ( rxname.find("MULT2") != string::npos ) {
+    string arryt = string( record->ARRYT ) ;
+    beamno = dataset_->getArrayId( arryt ) ;
+    ifno = 0 ;
+  }
+  else {
+    beamno = 0 ;
+    string arryt = string( record->ARRYT ) ;
+    ifno = dataset_->getArrayId( arryt ) ;
+  }
   //cout << "beamno = " << beamno << endl ;
 
@@ -575 +599 @@
 
   // scantime
-  scantime = Double( dataset_->getStartIntTime( irow ) ) ;
+  //scantime = Double( dataset_->getStartIntTime( irow ) ) ;
+  scantime = Double( dataset_->getScanTime( irow ) ) ;
   //cout << "scantime = " << scantime << endl ;