Changeset 2755 for trunk/external-alma

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.

Location:

trunk/external-alma/asdm2ASAP

Files:

• ASDMReader.cc (modified) (8 diffs)
• ASDMReader.h (modified) (5 diffs)

trunk/external-alma/asdm2ASAP/ASDMReader.cc

@@ -48 +48 @@
   corrMode_.reset() ;
   timeSampling_.reset() ;
+  initConvert() ;
 }
 
@@ -224 +225 @@
   for ( casa::uInt i = 0 ; i < 3 ; i++ ) 
     antennaPosition_[i] = Quantity( casa::Double( antpos[i].get() ), Unit( "m" ) ) ;
+  mp_ = casa::MPosition( casa::MVPosition( antennaPosition_ ),
+                         casa::MPosition::ITRF ) ;
+  mf_.set( mp_ ) ;
 
   // create SDMBinData object
@@ -887 +891 @@
         String ref( CDirectionReferenceCode::toString( dircode ) ) ;
         double mjd = vmsData_->v_time[dataIndex_] * s2d ;
-        srcdir = toJ2000( srcdir, ref, mjd, antennaPosition_ ) ;
+        srcdir = toJ2000( srcdir, ref, mjd ) ;
       }
     }
@@ -1670 +1674 @@
     }
     
-    toJ2000( dir, az, el, tcen, antennaPosition_ ) ;
+    toJ2000( dir, az, el, tcen ) ;
   }
 
@@ -1694 +1698 @@
                           double &az, 
                           double &el,
-                          double &mjd,
-                          casa::Vector<casa::Quantity> &antpos ) 
-//                          casa::Vector<casa::Double> antpos ) 
+                          double &mjd )
 {
   String funcName = "toJ2000" ;
@@ -1704 +1706 @@
   azel[0] = az ;
   azel[1] = el ;
-  dir = toJ2000( azel, ref, mjd, antpos ) ;
+  dir = toJ2000( azel, ref, mjd ) ;
 }
 
 vector<double> ASDMReader::toJ2000( vector<double> &dir,
                                     casa::String &dirref,
-                                    double &mjd,
-                                    casa::Vector<casa::Quantity> &antpos ) 
-//                                    casa::Vector<casa::Double> antpos ) 
+                                    double &mjd )
 {
   casa::String funcName = "toJ2000" ;
@@ -1717 +1717 @@
   vector<double> newd( dir ) ;
   if ( dirref != "J2000" ) {
-    casa::MEpoch me( casa::Quantity( (casa::Double)mjd, "d" ), casa::MEpoch::UTC ) ;
-    casa::MPosition mp( casa::MVPosition( antpos ),
-                        casa::MPosition::ITRF ) ;
-    //ostringstream oss ;
-    //mp.print( oss ) ;
-    //logsink_->postLocally( LogMessage(oss.str(),LogOrigin(className_,funcName,WHERE)) ) ;
-    
-    casa::MeasFrame mf( me, mp ) ;
+    me_ = casa::MEpoch( casa::Quantity( (casa::Double)mjd, "d" ), casa::MEpoch::UTC ) ;
+    mf_.set( me_ ) ;
     casa::MDirection::Types dirtype ;
     casa::Bool b = casa::MDirection::getType( dirtype, dirref ) ;
     if ( b ) {
-      casa::MDirection::Convert toj2000( dirtype,
-                                         casa::MDirection::Ref( casa::MDirection::J2000, mf ) ) ;
-      casa::Vector<casa::Double> cdir = toj2000( dir ).getAngle( "rad" ).getValue() ; 
+      casa::Vector<casa::Double> cdir = toj2000_( dir ).getAngle( "rad" ).getValue() ; 
       //logsink_->postLocally( LogMessage("cdir = "+String::toString(cdir),LogOrigin(className_,funcName,WHERE)) ) ;
       newd[0] = (double)(cdir[0]) ;
@@ -1896 +1888 @@
   return dir ;
 }
+
+void ASDMReader::initConvert()
+{
+  toj2000_ = MDirection::Convert(MDirection::AZELGEO, 
+                                 MDirection::Ref(MDirection::J2000, mf_));
+}

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