Changeset 2580 for trunk/src/MSFiller.cpp

Timestamp:

06/28/12 14:22:10 (12 years ago)

Author:

ShinnosukeKawakami

Message:

hpc33 merged asap-trunk

Location:

trunk

Files:

• . (modified) (1 prop)
• src (modified) (1 prop)
• src/MSFiller.cpp (modified) (9 diffs)

trunk/src/MSFiller.cpp

@@ -304 +304 @@
     // set dummy epoch
     mf.set( currentTime ) ;
-
-    // initialize dirType
-    dirType = MDirection::N_Types ;
 
     //
@@ -677 +674 @@
     MDirection::getType( dirType, pointingRef ) ;
     getpt = True ;
+
+    // initialize toj2000 and toazel
+    initConvert() ;
   }
   void setWeatherTime( const Vector<Double> &t, const Vector<Double> &it )
@@ -710 +710 @@
   uInt getFilledRowNum() { return rowidx ; }
 private:
+  void initConvert()
+  {
+    toj2000 = MDirection::Convert( dirType, MDirection::Ref( MDirection::J2000, mf ) ) ;
+    toazel = MDirection::Convert( dirType, MDirection::Ref( MDirection::AZELGEO, mf ) ) ;
+  }
+
   void fluxUnit( String &u )
   {
@@ -757 +763 @@
       String ref = dir.getRefString() ;
       MDirection::getType( dirType, ref ) ;
+      
+      // initialize toj2000 and toazel
+      initConvert() ;
     }
 
@@ -954 +963 @@
                     pointingDirection.xyPlane( idx-1 ), pointingDirection.xyPlane( idx ) ) ;
     }
-    mf.resetEpoch( currentTime ) ;
+    mf.set( currentTime ) ;
     Quantum< Vector<Double> > tmp( d.column( 0 ), Unit( "rad" ) ) ;
     if ( dirType != MDirection::J2000 ) {
-      MDirection::Convert toj2000( dirType, MDirection::Ref( MDirection::J2000, mf ) ) ;
       dir = toj2000( tmp ).getAngle( "rad" ).getValue() ;
     }
@@ -964 +972 @@
     }
     if ( dirType != MDirection::AZELGEO ) {
-      MDirection::Convert toazel( dirType, MDirection::Ref( MDirection::AZELGEO, mf ) ) ;
-      //MDirection::Convert toazel( dirType, MDirection::Ref( MDirection::AZEL, mf ) ) ;
       azel = toazel( tmp ).getAngle( "rad" ).getValue() ;
     }
@@ -977 +983 @@
   {
     dir = sourceDir.getAngle( "rad" ).getValue() ;
-    mf.resetEpoch( currentTime ) ;
-    MDirection::Convert toazel( dirType, MDirection::Ref( MDirection::AZELGEO, mf ) ) ;
+    mf.set( currentTime ) ;
     azel = toazel( Quantum< Vector<Double> >( dir, Unit("rad") ) ).getAngle( "rad" ).getValue() ;
     if ( dirType != MDirection::J2000 ) {
-      MDirection::Convert toj2000( dirType, MDirection::Ref( MDirection::J2000, mf ) ) ;
       dir = toj2000( Quantum< Vector<Double> >( dir, Unit("rad") ) ).getAngle( "rad" ).getValue() ;
     }
@@ -1261 +1265 @@
   MPosition antpos;
   MEpoch currentTime;
+  MeasFrame mf;
+  MDirection::Convert toj2000;
+  MDirection::Convert toazel;
   map<Int,uInt> ifmap;
   Block<uInt> polnos;
@@ -1293 +1300 @@
   Matrix<Float> sp;
   Matrix<uChar> fl;
-  MeasFrame mf;
 
   // MS MAIN columns