Changeset 2755 for trunk/external-alma/asdm2ASAP/ASDMReader.h

Timestamp:

01/31/13 16:39:48 (11 years ago)

Author:

Takeshi Nakazato

Message:

New Development: No

JIRA Issue: No

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

Speed up asdm2ASAP by reusing MDirection::Convert object.

File:

• trunk/external-alma/asdm2ASAP/ASDMReader.h (modified) (5 diffs)

trunk/external-alma/asdm2ASAP/ASDMReader.h

@@ -10 +10 @@
 #include <ASDMAll.h>
 #include <SDMBinData.h>
+
+class casa::MDirection;
+class casa::MeasFrame;
+class casa::MPosition;
+class casa::MEpoch;
 
 class ASDMReader
@@ -489 +494 @@
                 double &az, 
                 double &el,
-                double &mjd,
-                casa::Vector<casa::Quantity> &antpos ) ;
-
+                double &mjd ) ;
   /**
   * to J2000
@@ -503 +506 @@
   std::vector<double> toJ2000( std::vector<double> &dir,
                                casa::String &dirref,
-                               double &mjd,
-                               casa::Vector<casa::Quantity> &antpos ) ;
+                               double &mjd ) ;
+
   /**
    * get nIF
@@ -537 +540 @@
    **/
   std::vector< std::vector<double> > pointingDir( asdm::PointingRow *row ) ;
+
+  /**
+   * initialize conversion engine
+   **/
+  void initConvert() ;
 
   asdm::ASDM *asdm_ ; // pointer to ASDM object
@@ -606 +614 @@
   // time
   asdm::ArrayTimeInterval timeInterval_ ;
+
+  casa::MDirection::Convert toj2000_ ;
+  casa::MeasFrame mf_ ;
+  casa::MPosition mp_ ;
+  casa::MEpoch me_ ;
 } ;
 #endif // ASAP_ASDM_READER_H