Changeset 2549 for branches/hpc33

Timestamp:

05/27/12 17:28:25 (13 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...

Use approximate calculation of calcEarth.

File:

• branches/hpc33/src/MSFiller.cpp (modified) (7 diffs)

branches/hpc33/src/MSFiller.cpp

@@ -306 +306 @@
 
     // initialize dirType
-    dirType = MDirection::N_Types ;
+    //dirType = MDirection::N_Types ;
 
     //
@@ -677 +677 @@
     MDirection::getType( dirType, pointingRef ) ;
     getpt = True ;
+
+    // initialize toj2000 and toazel
+    toj2000 = MDirection::Convert( dirType, MDirection::Ref( MDirection::J2000, mf ) ) ;
+    toazel = MDirection::Convert( dirType, MDirection::Ref( MDirection::AZELGEO, mf ) ) ;
   }
   void setWeatherTime( const Vector<Double> &t, const Vector<Double> &it )
@@ -953 +957 @@
                     pointingDirection.xyPlane( idx-1 ), pointingDirection.xyPlane( idx ) ) ;
     }
-    mf.resetEpoch( currentTime ) ;
+    //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 ) ) ;
+      //MDirection::Convert toj2000( dirType, MDirection::Ref( MDirection::J2000, mf ) ) ;
       dir = toj2000( tmp ).getAngle( "rad" ).getValue() ;
     }
@@ -963 +968 @@
     }
     if ( dirType != MDirection::AZELGEO ) {
-      MDirection::Convert toazel( dirType, MDirection::Ref( MDirection::AZELGEO, mf ) ) ;
+      //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 +982 @@
     dir = sourceDir.getAngle( "rad" ).getValue() ;
     mf.resetEpoch( currentTime ) ;
-    MDirection::Convert toazel( dirType, MDirection::Ref( MDirection::AZELGEO, mf ) ) ;
+    //MDirection::Convert toazel( dirType, MDirection::Ref( MDirection::AZELGEO, mf ) ) ;
     azel = toazel( Quantum< Vector<Double> >( dir, Unit("rad") ) ).getAngle( "rad" ).getValue() ;
     if ( dirType != MDirection::J2000 ) {
-      MDirection::Convert toj2000( dirType, MDirection::Ref( MDirection::J2000, mf ) ) ;
+      //MDirection::Convert toj2000( dirType, MDirection::Ref( MDirection::J2000, mf ) ) ;
       dir = toj2000( Quantum< Vector<Double> >( dir, Unit("rad") ) ).getAngle( "rad" ).getValue() ;
     }
@@ -1260 +1265 @@
   MPosition antpos;
   MEpoch currentTime;
+  MeasFrame mf;
+  MDirection::Convert toj2000;
+  MDirection::Convert toazel;
   map<Int,uInt> ifmap;
   Block<uInt> polnos;
@@ -1292 +1300 @@
   Matrix<Float> sp;
   Matrix<uChar> fl;
-  MeasFrame mf;
 
   // MS MAIN columns