Index: trunk/psLib/src/astro/psCoord.c
===================================================================
--- trunk/psLib/src/astro/psCoord.c	(revision 3991)
+++ trunk/psLib/src/astro/psCoord.c	(revision 4029)
@@ -10,6 +10,6 @@
 *  @author GLG, MHPCC
 *
-*  @version $Revision: 1.69 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-05-20 00:15:50 $
+*  @version $Revision: 1.70 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-05-25 20:26:55 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -94,7 +94,7 @@
 psPlaneTransform *p_psPlaneTransformLinearInvert(psPlaneTransform *transform)
 {
-    PS_PTR_CHECK_NULL(transform, 0);
-    PS_PTR_CHECK_NULL(transform->x, 0);
-    PS_PTR_CHECK_NULL(transform->y, 0);
+    PS_ASSERT_PTR_NON_NULL(transform, 0);
+    PS_ASSERT_PTR_NON_NULL(transform->x, 0);
+    PS_ASSERT_PTR_NON_NULL(transform->y, 0);
 
     psF64 A = 0.0;
@@ -160,7 +160,7 @@
 psS32 p_psIsProjectionLinear(psPlaneTransform *transform)
 {
-    PS_PTR_CHECK_NULL(transform, 0);
-    PS_PTR_CHECK_NULL(transform->x, 0);
-    PS_PTR_CHECK_NULL(transform->y, 0);
+    PS_ASSERT_PTR_NON_NULL(transform, 0);
+    PS_ASSERT_PTR_NON_NULL(transform->x, 0);
+    PS_ASSERT_PTR_NON_NULL(transform->y, 0);
 
     for (psS32 i=0;i<(transform->x->nX);i++) {
@@ -223,6 +223,6 @@
 psPlaneTransform* psPlaneTransformAlloc(psS32 n1, psS32 n2)
 {
-    PS_INT_CHECK_NON_NEGATIVE(n1, NULL);
-    PS_INT_CHECK_NON_NEGATIVE(n2, NULL);
+    PS_ASSERT_INT_NONNEGATIVE(n1, NULL);
+    PS_ASSERT_INT_NONNEGATIVE(n2, NULL);
 
     psPlaneTransform *pt = psAlloc(sizeof(psPlaneTransform));
@@ -238,8 +238,8 @@
                                const psPlane* coords)
 {
-    PS_PTR_CHECK_NULL(transform, NULL);
-    PS_PTR_CHECK_NULL(transform->x, NULL);
-    PS_PTR_CHECK_NULL(transform->y, NULL);
-    PS_PTR_CHECK_NULL(coords, NULL);
+    PS_ASSERT_PTR_NON_NULL(transform, NULL);
+    PS_ASSERT_PTR_NON_NULL(transform->x, NULL);
+    PS_ASSERT_PTR_NON_NULL(transform->y, NULL);
+    PS_ASSERT_PTR_NON_NULL(coords, NULL);
 
     if (out == NULL) {
@@ -267,8 +267,8 @@
 psPlaneDistort* psPlaneDistortAlloc(psS32 n1, psS32 n2, psS32 n3, psS32 n4)
 {
-    PS_INT_CHECK_NON_NEGATIVE(n1, NULL);
-    PS_INT_CHECK_NON_NEGATIVE(n2, NULL);
-    PS_INT_CHECK_NON_NEGATIVE(n3, NULL);
-    PS_INT_CHECK_NON_NEGATIVE(n4, NULL);
+    PS_ASSERT_INT_NONNEGATIVE(n1, NULL);
+    PS_ASSERT_INT_NONNEGATIVE(n2, NULL);
+    PS_ASSERT_INT_NONNEGATIVE(n3, NULL);
+    PS_ASSERT_INT_NONNEGATIVE(n4, NULL);
 
     psPlaneDistort *pt = psAlloc(sizeof(psPlaneDistort));
@@ -290,8 +290,8 @@
                              float magnitude)
 {
-    PS_PTR_CHECK_NULL(transform, NULL);
-    PS_PTR_CHECK_NULL(transform->x, NULL);
-    PS_PTR_CHECK_NULL(transform->y, NULL);
-    PS_PTR_CHECK_NULL(coords, NULL);
+    PS_ASSERT_PTR_NON_NULL(transform, NULL);
+    PS_ASSERT_PTR_NON_NULL(transform->x, NULL);
+    PS_ASSERT_PTR_NON_NULL(transform->y, NULL);
+    PS_ASSERT_PTR_NON_NULL(coords, NULL);
 
     if (out == NULL) {
@@ -364,6 +364,6 @@
                                  const psSphere* coord)
 {
-    PS_PTR_CHECK_NULL(transform, NULL);
-    PS_PTR_CHECK_NULL(coord, NULL);
+    PS_ASSERT_PTR_NON_NULL(transform, NULL);
+    PS_ASSERT_PTR_NON_NULL(coord, NULL);
 
     if (out == NULL) {
@@ -394,5 +394,5 @@
 
     // Check for null parameter
-    PS_PTR_CHECK_NULL(time, NULL);
+    PS_ASSERT_PTR_NON_NULL(time, NULL);
 
     // Convert psTime to MJD
@@ -427,5 +427,5 @@
 
     // Check for null parameter
-    PS_PTR_CHECK_NULL(time, NULL);
+    PS_ASSERT_PTR_NON_NULL(time, NULL);
 
     // Convert psTime to MJD
@@ -498,6 +498,6 @@
                    const psProjection* projection)
 {
-    PS_PTR_CHECK_NULL(coord, NULL);
-    PS_PTR_CHECK_NULL(projection, NULL);
+    PS_ASSERT_PTR_NON_NULL(coord, NULL);
+    PS_ASSERT_PTR_NON_NULL(projection, NULL);
 
     psF64   theta = 0.0;
@@ -550,6 +550,6 @@
                       const psProjection* projection)
 {
-    PS_PTR_CHECK_NULL(coord, NULL);
-    PS_PTR_CHECK_NULL(projection, NULL);
+    PS_ASSERT_PTR_NON_NULL(coord, NULL);
+    PS_ASSERT_PTR_NON_NULL(projection, NULL);
 
     psF64  theta = 0.0;
@@ -622,6 +622,6 @@
                             psSphereOffsetUnit unit)
 {
-    PS_PTR_CHECK_NULL(position1, NULL);
-    PS_PTR_CHECK_NULL(position2, NULL);
+    PS_ASSERT_PTR_NON_NULL(position1, NULL);
+    PS_ASSERT_PTR_NON_NULL(position2, NULL);
 
     // Check positions near 90 degree and issue warnings if necessary
@@ -721,6 +721,6 @@
                             psSphereOffsetUnit unit)
 {
-    PS_PTR_CHECK_NULL(position, NULL);
-    PS_PTR_CHECK_NULL(offset, NULL);
+    PS_ASSERT_PTR_NON_NULL(position, NULL);
+    PS_ASSERT_PTR_NON_NULL(offset, NULL);
 
     psSphere* tmp;
@@ -811,7 +811,7 @@
 {
     // Check input for NULL pointers
-    PS_PTR_CHECK_NULL(coords, NULL);
-    PS_PTR_CHECK_NULL(fromTime, NULL);
-    PS_PTR_CHECK_NULL(toTime, NULL);
+    PS_ASSERT_PTR_NON_NULL(coords, NULL);
+    PS_ASSERT_PTR_NON_NULL(fromTime, NULL);
+    PS_ASSERT_PTR_NON_NULL(toTime, NULL);
 
     // Calculate Julian centuries
@@ -904,6 +904,6 @@
     // XXX: This does not yet use region and nSamples:  need to modify -rdd
 
-    PS_PTR_CHECK_NULL(trans1, NULL);
-    PS_PTR_CHECK_NULL(trans2, NULL);
+    PS_ASSERT_PTR_NON_NULL(trans1, NULL);
+    PS_ASSERT_PTR_NON_NULL(trans2, NULL);
     //TRACE: printf("psPlaneTransformCombine(%d, %d, %d, %d: %d, %d, %d, %d)\n", trans1->x->nX, trans1->x->nY, trans1->y->nX, trans1->y->nY, trans2->x->nX, trans2->x->nY, trans2->y->nX, trans2->y->nY);
     //
@@ -1047,7 +1047,7 @@
                          float sigmaClip)
 {
-    PS_PTR_CHECK_NULL(trans, NULL);
-    PS_PTR_CHECK_NULL(source, NULL);
-    PS_PTR_CHECK_NULL(dest, NULL);
+    PS_ASSERT_PTR_NON_NULL(trans, NULL);
+    PS_ASSERT_PTR_NON_NULL(source, NULL);
+    PS_ASSERT_PTR_NON_NULL(dest, NULL);
 
     psS32 numCoords = PS_MIN(source->n, dest->n);
@@ -1159,5 +1159,5 @@
         int nSamples)
 {
-    PS_PTR_CHECK_NULL(in, NULL);
+    PS_ASSERT_PTR_NON_NULL(in, NULL);
     //
     // If the transform is linear, then invert it exactly and return.
Index: trunk/psLib/src/astro/psTime.c
===================================================================
--- trunk/psLib/src/astro/psTime.c	(revision 3991)
+++ trunk/psLib/src/astro/psTime.c	(revision 4029)
@@ -10,6 +10,6 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.60 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-05-11 22:02:15 $
+ *  @version $Revision: 1.61 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-05-25 20:26:55 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -178,5 +178,5 @@
         }
         table = (psLookupTable*)tableMetadataItem->data.V;
-        PS_PTR_CHECK_NULL(table,0.0);
+        PS_ASSERT_PTR_NON_NULL(table,0.0);
 
         // Attempt to interpolate table
@@ -403,6 +403,6 @@
 
     // Error checks
-    PS_PTR_CHECK_NULL(time,NULL);
-    PS_INT_CHECK_RANGE(time->nsec,0,1e9-1,NULL);
+    PS_ASSERT_PTR_NON_NULL(time,NULL);
+    PS_ASSERT_INT_WITHIN_RANGE(time->nsec,0,1e9-1,NULL);
 
     if (time->type == type) { // time already right type.  That was easy!
@@ -448,6 +448,6 @@
 
     // Error checks
-    PS_PTR_CHECK_NULL(time,NAN);
-    PS_INT_CHECK_RANGE(time->nsec,0,1e9-1,NAN);
+    PS_ASSERT_PTR_NON_NULL(time,NAN);
+    PS_ASSERT_INT_WITHIN_RANGE(time->nsec,0,1e9-1,NAN);
 
     // Calculate TAI or UTC time based on type of time user passes
@@ -519,6 +519,6 @@
 
     // Error checks
-    PS_PTR_CHECK_NULL(time,NAN);
-    PS_INT_CHECK_RANGE(time->nsec,0,1e9-1,NAN);
+    PS_ASSERT_PTR_NON_NULL(time,NAN);
+    PS_ASSERT_INT_WITHIN_RANGE(time->nsec,0,1e9-1,NAN);
 
     if(time->type != PS_TIME_TAI) {
@@ -560,5 +560,5 @@
         }
         dut = (psVector*)tableMetadataItem->data.V;
-        PS_PTR_CHECK_NULL(dut,0.0);
+        PS_ASSERT_PTR_NON_NULL(dut,0.0);
 
         t = 2000.0 + (mjd - 51544.03)/365.2422;
@@ -592,6 +592,6 @@
 
     // Error checks
-    PS_PTR_CHECK_NULL(time,NULL);
-    PS_INT_CHECK_RANGE(time->nsec,0,1e9-1,NULL);
+    PS_ASSERT_PTR_NON_NULL(time,NULL);
+    PS_ASSERT_INT_WITHIN_RANGE(time->nsec,0,1e9-1,NULL);
 
     if(time->type != PS_TIME_TAI)
@@ -658,5 +658,5 @@
         }
         xp = (psVector*)tableMetadataItem->data.V;
-        PS_PTR_CHECK_NULL(xp,NULL);
+        PS_ASSERT_PTR_NON_NULL(xp,NULL);
 
         // Get yp
@@ -667,5 +667,5 @@
         }
         yp = (psVector*)tableMetadataItem->data.V;
-        PS_PTR_CHECK_NULL(yp,NULL);
+        PS_ASSERT_PTR_NON_NULL(yp,NULL);
 
         // Calculate "a" and "c" constants
@@ -715,6 +715,6 @@
 
     // Error checks
-    PS_PTR_CHECK_NULL(time,NAN);
-    PS_INT_CHECK_RANGE(time->nsec,0,1e9-1,NAN);
+    PS_ASSERT_PTR_NON_NULL(time,NAN);
+    PS_ASSERT_INT_WITHIN_RANGE(time->nsec,0,1e9-1,NAN);
 
     // Check time metadata
@@ -733,5 +733,5 @@
     }
     table = (psLookupTable*)tableMetadataItem->data.V;
-    PS_PTR_CHECK_NULL(table,0);
+    PS_ASSERT_PTR_NON_NULL(table,0);
 
     // Determine Julian and modified Julian dates used in table lookup and time delta calculation
@@ -767,8 +767,8 @@
 
     // Error checks
-    PS_PTR_CHECK_NULL(time1,0);
-    PS_PTR_CHECK_NULL(time2,0);
-    PS_INT_CHECK_RANGE(time1->nsec,0,1e9-1,0);
-    PS_INT_CHECK_RANGE(time2->nsec,0,1e9-1,0);
+    PS_ASSERT_PTR_NON_NULL(time1,0);
+    PS_ASSERT_PTR_NON_NULL(time2,0);
+    PS_ASSERT_INT_WITHIN_RANGE(time1->nsec,0,1e9-1,0);
+    PS_ASSERT_INT_WITHIN_RANGE(time2->nsec,0,1e9-1,0);
     diff = abs((psS64)psTimeGetTAIDelta((psTime*)time1)-(psS64)psTimeGetTAIDelta((psTime*)time2));
 
@@ -781,6 +781,6 @@
 
     // Error checks
-    PS_PTR_CHECK_NULL(time,NAN);
-    PS_INT_CHECK_RANGE(time->nsec,0,1e9-1,NAN);
+    PS_ASSERT_PTR_NON_NULL(time,NAN);
+    PS_ASSERT_INT_WITHIN_RANGE(time->nsec,0,1e9-1,NAN);
 
     // Julian date conversion
@@ -800,6 +800,6 @@
 
     // Error checks
-    PS_PTR_CHECK_NULL(time,NAN);
-    PS_INT_CHECK_RANGE(time->nsec,0,1e9-1,NAN);
+    PS_ASSERT_PTR_NON_NULL(time,NAN);
+    PS_ASSERT_INT_WITHIN_RANGE(time->nsec,0,1e9-1,NAN);
 
     // Modified Julian date conversion
@@ -823,6 +823,6 @@
 
     // Error checks
-    PS_PTR_CHECK_NULL(time,NULL);
-    PS_INT_CHECK_RANGE(time->nsec,0,1e9-1,NULL);
+    PS_ASSERT_PTR_NON_NULL(time,NULL);
+    PS_ASSERT_INT_WITHIN_RANGE(time->nsec,0,1e9-1,NULL);
 
     tempString = psAlloc(MAX_TIME_STRING_LENGTH);
@@ -856,6 +856,6 @@
 
     // Error checks
-    PS_PTR_CHECK_NULL(time,timevalTime);
-    PS_INT_CHECK_RANGE(time->nsec,0,1e9-1,timevalTime);
+    PS_ASSERT_PTR_NON_NULL(time,timevalTime);
+    PS_ASSERT_INT_WITHIN_RANGE(time->nsec,0,1e9-1,timevalTime);
 
     timevalTime.tv_sec = time->sec;
@@ -879,6 +879,6 @@
 
     // Error checks
-    PS_PTR_CHECK_NULL(time,NULL);
-    PS_INT_CHECK_RANGE(time->nsec,0,1e9-1,NULL);
+    PS_ASSERT_PTR_NON_NULL(time,NULL);
+    PS_ASSERT_INT_WITHIN_RANGE(time->nsec,0,1e9-1,NULL);
 
     seconds = time->sec%60;
@@ -949,5 +949,5 @@
 
     // Error check
-    PS_INT_CHECK_RANGE(outTime->nsec,0,1e9-1,outTime);
+    PS_ASSERT_INT_WITHIN_RANGE(outTime->nsec,0,1e9-1,outTime);
 
     return outTime;
@@ -975,5 +975,5 @@
 
     // Error check
-    PS_INT_CHECK_RANGE(outTime->nsec,0,1e9-1,outTime);
+    PS_ASSERT_INT_WITHIN_RANGE(outTime->nsec,0,1e9-1,outTime);
 
     return outTime;
@@ -993,11 +993,11 @@
     }
 
-    PS_INT_CHECK_NON_NEGATIVE(tmTime.tm_year, outTime);
-    PS_INT_CHECK_RANGE(tmTime.tm_mon,1,12,outTime);
-    PS_INT_CHECK_RANGE(tmTime.tm_mday,1,31,outTime);
-    PS_INT_CHECK_RANGE(tmTime.tm_hour,0,23,outTime);
-    PS_INT_CHECK_RANGE(tmTime.tm_min,0,59,outTime);
-    PS_INT_CHECK_RANGE(tmTime.tm_sec,0,59,outTime);
-    PS_INT_CHECK_RANGE(millisecond,0,999,outTime);
+    PS_ASSERT_INT_NONNEGATIVE(tmTime.tm_year, outTime);
+    PS_ASSERT_INT_WITHIN_RANGE(tmTime.tm_mon,1,12,outTime);
+    PS_ASSERT_INT_WITHIN_RANGE(tmTime.tm_mday,1,31,outTime);
+    PS_ASSERT_INT_WITHIN_RANGE(tmTime.tm_hour,0,23,outTime);
+    PS_ASSERT_INT_WITHIN_RANGE(tmTime.tm_min,0,59,outTime);
+    PS_ASSERT_INT_WITHIN_RANGE(tmTime.tm_sec,0,59,outTime);
+    PS_ASSERT_INT_WITHIN_RANGE(millisecond,0,999,outTime);
 
     tmTime.tm_year -= 1900;
@@ -1018,5 +1018,5 @@
 
     // Error check
-    PS_PTR_CHECK_NULL(time,NULL);
+    PS_ASSERT_PTR_NON_NULL(time,NULL);
 
     // Allocate psTime struct
@@ -1028,5 +1028,5 @@
 
     // Error check
-    PS_INT_CHECK_RANGE(outTime->nsec,0,1e9-1,outTime);
+    PS_ASSERT_INT_WITHIN_RANGE(outTime->nsec,0,1e9-1,outTime);
 
     return outTime;
@@ -1046,5 +1046,5 @@
 
     // Error check
-    PS_PTR_CHECK_NULL(time,NULL);
+    PS_ASSERT_PTR_NON_NULL(time,NULL);
 
     // Allocate psTime struct
@@ -1087,5 +1087,5 @@
 
     // Error check
-    PS_INT_CHECK_RANGE(outTime->nsec,0,1e9-1,outTime);
+    PS_ASSERT_INT_WITHIN_RANGE(outTime->nsec,0,1e9-1,outTime);
 
     return outTime;
@@ -1100,6 +1100,6 @@
 
     // Error checks
-    PS_PTR_CHECK_NULL(time,NULL);
-    PS_INT_CHECK_RANGE(time->nsec,0,1e9-1,NULL);
+    PS_ASSERT_PTR_NON_NULL(time,NULL);
+    PS_ASSERT_INT_WITHIN_RANGE(time->nsec,0,1e9-1,NULL);
 
     // Convert time to TAI if necessary, but without changing input arguments
@@ -1120,5 +1120,5 @@
 
     // Error check
-    PS_INT_CHECK_RANGE(outTime->nsec,0,1e9-1,outTime);
+    PS_ASSERT_INT_WITHIN_RANGE(outTime->nsec,0,1e9-1,outTime);
 
     // Convert result to same time type as input
@@ -1142,8 +1142,8 @@
 
     // Error checks
-    PS_PTR_CHECK_NULL(time1,0.0);
-    PS_INT_CHECK_RANGE(time1->nsec,0,1e9-1,0.0);
-    PS_PTR_CHECK_NULL(time2,0.0);
-    PS_INT_CHECK_RANGE(time2->nsec,0,1e9-1,0.0);
+    PS_ASSERT_PTR_NON_NULL(time1,0.0);
+    PS_ASSERT_INT_WITHIN_RANGE(time1->nsec,0,1e9-1,0.0);
+    PS_ASSERT_PTR_NON_NULL(time2,0.0);
+    PS_ASSERT_INT_WITHIN_RANGE(time2->nsec,0,1e9-1,0.0);
 
     // Convert time to TAI if necessary, but without changing input arguments