Changeset 1967 for trunk/src

Timestamp:

12/14/10 19:31:05 (14 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...

Changed a way to get time information from the data.

File:

• trunk/src/STMath.cpp (modified) (6 diffs)

trunk/src/STMath.cpp

@@ -4279 +4279 @@
       }
       else {
-        double t0 = getMJD( s->getTime( idx[0] ) ) ;
-        double t1 = getMJD( s->getTime( idx[1] ) ) ;
+        //double t0 = getMJD( s->getTime( idx[0] ) ) ;
+        //double t1 = getMJD( s->getTime( idx[1] ) ) ;
+        double t0 = s->getEpoch( idx[0] ).get( Unit( "d" ) ).getValue() ;
+        double t1 = s->getEpoch( idx[1] ).get( Unit( "d" ) ).getValue() ;
         double tref = getMJD( reftime ) ;
         if ( abs( t0 - tref ) > abs( t1 - tref ) ) {
@@ -4317 +4319 @@
         // do interpolation
         //os << "interpolate between " << idx[0] << " and " << idx[1] << " (scanno: " << s->getScan( idx[0] ) << ", " << s->getScan( idx[1] ) << ")" << LogIO::POST ;
-        double t0 = getMJD( s->getTime( idx[0] ) ) ;
-        double t1 = getMJD( s->getTime( idx[1] ) ) ;
+        //double t0 = getMJD( s->getTime( idx[0] ) ) ;
+        //double t1 = getMJD( s->getTime( idx[1] ) ) ;
+        double t0 = s->getEpoch( idx[0] ).get( Unit( "d" ) ).getValue() ;
+        double t1 = s->getEpoch( idx[1] ).get( Unit( "d" ) ).getValue() ;
         double tref = getMJD( reftime ) ;
         vector<float> sp0 = s->getSpectrum( idx[0] ) ;
@@ -4459 +4463 @@
       }
       else {
-        double t0 = getMJD( s->getTime( idx[0] ) ) ;
-        double t1 = getMJD( s->getTime( idx[1] ) ) ;
+        //double t0 = getMJD( s->getTime( idx[0] ) ) ;
+        //double t1 = getMJD( s->getTime( idx[1] ) ) ;
+        double t0 = s->getEpoch( idx[0] ).get( Unit( "d" ) ).getValue() ;
+        double t1 = s->getEpoch( idx[1] ).get( Unit( "d" ) ).getValue() ;
         double tref = getMJD( reftime ) ;
         if ( abs( t0 - tref ) > abs( t1 - tref ) ) {
@@ -4505 +4511 @@
         // do interpolation
         //os << "interpolate between " << idx[0] << " and " << idx[1] << " (scanno: " << s->getScan( idx[0] ) << ", " << s->getScan( idx[1] ) << ")" << LogIO::POST ;
-        double t0 = getMJD( s->getTime( idx[0] ) ) ;
-        double t1 = getMJD( s->getTime( idx[1] ) ) ;
+        //double t0 = getMJD( s->getTime( idx[0] ) ) ;
+        //double t1 = getMJD( s->getTime( idx[1] ) ) ;
+        double t0 = s->getEpoch( idx[0] ).get( Unit( "d" ) ).getValue() ;
+        double t1 = s->getEpoch( idx[1] ).get( Unit( "d" ) ).getValue() ;
         double tref = getMJD( reftime ) ;
         vector<float> tcal0 ;
@@ -4589 +4597 @@
       }
       else {
-        double t0 = getMJD( s->getTime( idx[0] ) ) ;
-        double t1 = getMJD( s->getTime( idx[1] ) ) ;
+        //double t0 = getMJD( s->getTime( idx[0] ) ) ;
+        //double t1 = getMJD( s->getTime( idx[1] ) ) ;
+        double t0 = s->getEpoch( idx[0] ).get( Unit( "d" ) ).getValue() ;
+        double t1 = s->getEpoch( idx[1] ).get( Unit( "d" ) ).getValue() ;
         double tref = getMJD( reftime ) ;
         if ( abs( t0 - tref ) > abs( t1 - tref ) ) {
@@ -4631 +4641 @@
         // do interpolation
         //os << "interpolate between " << idx[0] << " and " << idx[1] << " (scanno: " << s->getScan( idx[0] ) << ", " << s->getScan( idx[1] ) << ")" << LogIO::POST ;
-        double t0 = getMJD( s->getTime( idx[0] ) ) ;
-        double t1 = getMJD( s->getTime( idx[1] ) ) ;
+        //double t0 = getMJD( s->getTime( idx[0] ) ) ;
+        //double t1 = getMJD( s->getTime( idx[1] ) ) ;
+        double t0 = s->getEpoch( idx[0] ).get( Unit( "d" ) ).getValue() ;
+        double t1 = s->getEpoch( idx[1] ).get( Unit( "d" ) ).getValue() ;
         double tref = getMJD( reftime ) ;
         vector<float> tsys0 ;