Changeset 2019

Timestamp:

Oct 7, 2004, 3:40:11 PM (22 years ago)

Author:

harman

Message:

Fixed per Robert's astrometry bug.

Location:

trunk/psLib/src

Files:

• astro/psTime.c (modified) (2 diffs)
• astronomy/psTime.c (modified) (2 diffs)

trunk/psLib/src/astro/psTime.c

@@ -11 +11 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.26 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-10-08 01:07:22 $
+ *  @version $Revision: 1.27 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-10-08 01:40:11 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -461 +461 @@
         ALLOC_TIME(utcTime);
         utcTime->sec = taiTime->sec - psGetTAIDelta(time);
+        utcTime->usec = taiTime->usec;
+        utcTime->type = PS_TIME_UTC;
     } else if(time->type == PS_TIME_UTC) {
         utcTime = psMemIncrRefCounter(time);
         ALLOC_TIME(taiTime);
         taiTime->sec = utcTime->sec + psGetTAIDelta(time);
+        taiTime->usec = utcTime->usec;
+        taiTime->type = PS_TIME_TAI;
     }
 
     // Convert Universal Time (UTC) to  UT1
     ALLOC_TIME(ut1UtcDelta);
+    ut1UtcDelta->type = PS_TIME_UTC;
     ut1UtcDelta->usec = psGetUT1Delta(utcTime)*1e6;
     ut1Time = psTimeAdd(utcTime, ut1UtcDelta);

trunk/psLib/src/astronomy/psTime.c

@@ -11 +11 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.26 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-10-08 01:07:22 $
+ *  @version $Revision: 1.27 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-10-08 01:40:11 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -461 +461 @@
         ALLOC_TIME(utcTime);
         utcTime->sec = taiTime->sec - psGetTAIDelta(time);
+        utcTime->usec = taiTime->usec;
+        utcTime->type = PS_TIME_UTC;
     } else if(time->type == PS_TIME_UTC) {
         utcTime = psMemIncrRefCounter(time);
         ALLOC_TIME(taiTime);
         taiTime->sec = utcTime->sec + psGetTAIDelta(time);
+        taiTime->usec = utcTime->usec;
+        taiTime->type = PS_TIME_TAI;
     }
 
     // Convert Universal Time (UTC) to  UT1
     ALLOC_TIME(ut1UtcDelta);
+    ut1UtcDelta->type = PS_TIME_UTC;
     ut1UtcDelta->usec = psGetUT1Delta(utcTime)*1e6;
     ut1Time = psTimeAdd(utcTime, ut1UtcDelta);