Index: trunk/psLib/src/astro/psTime.c
===================================================================
--- trunk/psLib/src/astro/psTime.c	(revision 10065)
+++ trunk/psLib/src/astro/psTime.c	(revision 10092)
@@ -10,6 +10,6 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.104 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-11-15 01:27:55 $
+ *  @version $Revision: 1.105 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-11-20 05:22:15 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -1732,8 +1732,9 @@
 
     // Error checks
+    // XXX nsec is U32, use an integer for comparison
     PS_ASSERT_PTR_NON_NULL(time1,0.0);
-    PS_ASSERT_INT_WITHIN_RANGE(time1->nsec,0,(psU32)((1e9)-1),0.0);
+    PS_ASSERT_INT_WITHIN_RANGE(time1->nsec,0,(psU32)(999999999),0.0);
     PS_ASSERT_PTR_NON_NULL(time2,0.0);
-    PS_ASSERT_INT_WITHIN_RANGE(time2->nsec,0,(psU32)((1e9)-1),0.0);
+    PS_ASSERT_INT_WITHIN_RANGE(time2->nsec,0,(psU32)(999999999),0.0);
 
     // Verify both times of the same type
@@ -1797,5 +1798,6 @@
     }
     strncpy(timerName, name, 256);
-    start = psTimeGetNow (PS_TIME_UTC);
+    // XXX EAM : TAI timer makes more sense (monotonically increasing seconds)
+    start = psTimeGetNow (PS_TIME_TAI);
     psHashAdd (timers, name, start);
     psFree (start);
@@ -1832,5 +1834,5 @@
     if (start == NULL)
         return (0);
-    mark = psTimeGetNow (PS_TIME_UTC);
+    mark = psTimeGetNow (PS_TIME_TAI);
     delta = psTimeDelta (mark, start);
     psFree (mark);