Index: trunk/psLib/src/astro/psTime.h
===================================================================
--- trunk/psLib/src/astro/psTime.h	(revision 1788)
+++ trunk/psLib/src/astro/psTime.h	(revision 2048)
@@ -54,6 +54,6 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.14 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-09-11 00:55:13 $
+ *  @version $Revision: 1.15 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-10-12 01:34:09 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -69,4 +69,6 @@
 #include "psType.h"
 #include "psImage.h"
+
+struct psSphere;
 
 /// @addtogroup Time
@@ -138,6 +140,6 @@
  *  @return  double: Time difference.
  */
-double psGetUT1Delta(
-    psTime *time                        ///< psTime to be looked up.
+double psTimeGetUT1Delta(
+    const psTime *time                  ///< psTime to be looked up.
 );
 
@@ -148,6 +150,6 @@
  *  @return  double: Time difference.
  */
-double psGetTAIDelta(
-    psTime *time                        ///< psTime to be looked up.
+double psTimeGetTAIDelta(
+    const psTime *time                  ///< psTime to be looked up.
 );
 
@@ -158,7 +160,7 @@
  *  @return  psSphere*: Spherical coordinates of Earth's polar axias.
  */
-/*psSphere* psGetPoleCoords(
-    psTime *time                        ///< psTime determine polar orientation.
-);*/
+struct psSphere* psTimeGetPoleCoords(
+                const psTime *time                  ///< psTime determine polar orientation.
+            );
 
 /** Calculate the number of leapseconds between two times.
@@ -166,9 +168,9 @@
  *  Calculates the number of leapseconds between two times.
  *
- *  @return  psSphere*: Spherical coordinates of Earth's polar axias.
- */
-psF64 psTimeLeapseconds(
-    const psTime *time1,                ///< First input time.
-    const psTime *time2                 ///< Second input time.
+ *  @return  long: leapseconds added between given times
+ */
+long psTimeLeapseconds(
+    const psTime* time1,                ///< First input time.
+    const psTime* time2                 ///< Second input time.
 );
 
@@ -180,5 +182,5 @@
  */
 double psTimeToJD(
-    psTime *time                        ///< Input time to be converted.
+    const psTime* time                  ///< Input time to be converted.
 );
 /** Convert psTime to modified Julian date time.
@@ -189,5 +191,5 @@
  */
 double psTimeToMJD(
-    psTime *time                        ///< Input time to be converted.
+    const psTime* time                  ///< Input time to be converted.
 );
 
@@ -199,6 +201,6 @@
  *  @return  char*: Pointer null terminated array of chars in ISO time.
  */
-char* psTimeToISO(
-    psTime *time                        ///< Input time to be converted.
+char* psTimeToISOTime(
+    const psTime* time                  ///< Input time to be converted.
 );
 
@@ -210,5 +212,5 @@
  */
 struct timeval psTimeToTimeval(
-                psTime *time                        ///< Input time to be converted.
+                const psTime* time                  ///< Input time to be converted.
             );
 
@@ -221,5 +223,5 @@
  */
 struct tm* psTimeToTM(
-                psTime *time                        ///< Input time to be converted.
+                const psTime *time                  ///< Input time to be converted.
             );
 
@@ -230,5 +232,5 @@
  *  @return  psTime: time.
  */
-psTime* psJDToTime(
+psTime* psTimeFromJD(
     double time                         ///< Input time to be converted.
 );
@@ -240,5 +242,5 @@
  *  @return  psTime: time.
  */
-psTime* psMJDToTime(
+psTime* psTimeFromMJD(
     double time                         ///< Input time to be converted.
 );
@@ -250,6 +252,6 @@
  *  @return  psTime*: time
  */
-psTime* psISOToTime(
-    char *time                          ///< Input time to be converted.
+psTime* psTimeFromISOTime(
+    const char* time                    ///< Input time to be converted.
 );
 
@@ -260,6 +262,6 @@
  *  @return  psTime*: time.
  */
-psTime* psTimevalToTime(
-    struct timeval *time                ///< Input time to be converted.
+psTime* psTimeFromTimeval(
+    const struct timeval *time          ///< Input time to be converted.
 );
 
@@ -271,6 +273,6 @@
  *  @return  psTime*: time.
  */
-psTime* psTMToTime(
-    struct tm *time                     ///< Input time to be converted.
+psTime* psTimeFromTM(
+    const struct tm *time               ///< Input time to be converted.
 );
 
@@ -282,6 +284,6 @@
  */
 psTime* psTimeAdd(
-    psTime *tai1,                       ///< First TAI time.
-    psTime *tai2                        ///< Second TAI time.
+    const psTime *tai1,                 ///< First TAI time.
+    const psTime *tai2                  ///< Second TAI time.
 );
 
@@ -292,7 +294,7 @@
  *  @return  psTime*: time.
  */
-psTime* psTimeSub(
-    psTime *tai1,                       ///< First TAI time.
-    psTime *tai2                        ///< Second TAI time.
+psTime* psTimeSubtract(
+    const psTime *tai1,                 ///< First TAI time.
+    const psTime *tai2                  ///< Second TAI time.
 );
 
@@ -305,72 +307,8 @@
  */
 psTime* psTimeDelta(
-    psTime *tai1,                       ///< First TAI time.
-    psTime *tai2                        ///< Second TAI time.
-);
-
-
-/** Read TAI/UTC data file.
- *
- *  Reads TAI/UTC data file.
- *
- *  @return  psImage*: Two-dimensional array with table data.
- */
-psImage* readTaiUtcFile(
-    char *fileName                      ///< Name of file to read.
-);
-
-
-/** Read SER7 data file.
- *
- *  Reads SER7 data file.
- *
- *  @return  psImage*: Two-dimensional array with table data.
- */
-psImage* readSer7File(
-    char *fileName                      ///< Name of file to read.
-);
-
-/** Read finals data file.
- *
- *  Reads finals data file.
- *
- *  @return  psImage*: Two-dimensional array with table data.
- */
-psImage* readFinalsFile(
-    char *fileName                      ///< Name of file to read.
-);
-
-/** Read EOPC data file.
- *
- *  Reads EOPC data file.
- *
- *  @return  psImage*: Two-dimensional array with table data.
- */
-psImage* readEopcFile(
-    char *fileName                      ///< Name of file to read.
-);
-
-/** Lookup and interpolate TAI-UTC data
- *
- *  Interpolates TAI-UTC data, given time in MJD format.
- *
- *  @return  double: Interpolated value.
- */
-double lookupTaiUtcTable(
-    psImage *table,                     ///< Table with data.
-    psTime *time                        ///< time to lookup.
-);
-
-/** Lookup and interpolate polar or UT1-UTC data
- *
- *  Interpolates TAI-UT1 or polar coordinate data, given time in MJD format.
- *
- *  @return  double: Interpolated value.
- */
-double lookupSer7Table(
-    psImage *table,                      ///< Table with data.
-    psTime *time,                        ///< time to lookup.
-    int col                              ///< Column to lookup.
-);
+    const psTime *tai1,                 ///< First TAI time.
+    const psTime *tai2                  ///< Second TAI time.
+);
+
 /// @}