Index: trunk/psLib/src/astronomy/psAstrometry.c
===================================================================
--- trunk/psLib/src/astronomy/psAstrometry.c	(revision 3991)
+++ trunk/psLib/src/astronomy/psAstrometry.c	(revision 4029)
@@ -8,6 +8,6 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.65 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-04-19 00:17:05 $
+ *  @version $Revision: 1.66 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-05-25 20:26:55 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -41,5 +41,5 @@
                                    psImage* tmpImage)
 {
-    PS_IMAGE_CHECK_NULL(tmpImage, 0);
+    PS_ASSERT_IMAGE_NON_NULL(tmpImage, 0);
 
     if ((x < 0.0) || (x > (double)tmpImage->numCols) ||
@@ -154,8 +154,8 @@
     psS32 j;
 
-    PS_IMAGE_CHECK_NULL(x, NULL);
-    PS_IMAGE_CHECK_NULL(y, NULL);
-    PS_IMAGE_CHECK_TYPE(x, PS_TYPE_F64, NULL);
-    PS_IMAGE_CHECK_TYPE(y, PS_TYPE_F64, NULL);
+    PS_ASSERT_IMAGE_NON_NULL(x, NULL);
+    PS_ASSERT_IMAGE_NON_NULL(y, NULL);
+    PS_ASSERT_IMAGE_TYPE(x, PS_TYPE_F64, NULL);
+    PS_ASSERT_IMAGE_TYPE(y, PS_TYPE_F64, NULL);
 
     tmp = (psFixedPattern *) psAlloc(sizeof(psFixedPattern));
@@ -211,5 +211,5 @@
                             const psObservatory* observatory)
 {
-    PS_PTR_CHECK_NULL(observatory, NULL);
+    PS_ASSERT_PTR_NON_NULL(observatory, NULL);
 
     psExposure* exp = psAlloc(sizeof(psExposure));
@@ -271,5 +271,5 @@
                   const psExposure* exp)
 {
-    PS_INT_CHECK_NON_NEGATIVE(nChips, NULL);
+    PS_ASSERT_INT_NONNEGATIVE(nChips, NULL);
 
     psFPA* newFPA = psAlloc(sizeof(psFPA));
@@ -315,5 +315,5 @@
                     psFPA *parentFPA)
 {
-    PS_INT_CHECK_NON_NEGATIVE(nCells, NULL);
+    PS_ASSERT_INT_NONNEGATIVE(nCells, NULL);
 
     psChip* chip = psAlloc(sizeof(psChip));
@@ -350,5 +350,5 @@
                     psChip* parentChip)
 {
-    PS_INT_CHECK_NON_NEGATIVE(nReadouts, NULL);
+    PS_ASSERT_INT_NONNEGATIVE(nReadouts, NULL);
 
     psCell* cell = psAlloc(sizeof(psCell));
@@ -406,5 +406,5 @@
 psGrommit* psGrommitAlloc(const psExposure* exp)
 {
-    PS_PTR_CHECK_NULL(exp, NULL);
+    PS_ASSERT_PTR_NON_NULL(exp, NULL);
 
     double date = psTimeToMJD(exp->time);
@@ -436,6 +436,6 @@
                     const psFPA* FPA)
 {
-    PS_PTR_CHECK_NULL(fpaCoord, NULL);
-    PS_PTR_CHECK_NULL(FPA, NULL);
+    PS_ASSERT_PTR_NON_NULL(fpaCoord, NULL);
+    PS_ASSERT_PTR_NON_NULL(FPA, NULL);
 
     psChip* tmpChip = NULL;
@@ -461,7 +461,7 @@
                     const psFPA* FPA)
 {
-    PS_PTR_CHECK_NULL(fpaCoord, NULL);
-    PS_PTR_CHECK_NULL(FPA, NULL);
-    PS_PTR_CHECK_NULL(FPA->chips, NULL);
+    PS_ASSERT_PTR_NON_NULL(fpaCoord, NULL);
+    PS_ASSERT_PTR_NON_NULL(FPA, NULL);
+    PS_ASSERT_PTR_NON_NULL(FPA->chips, NULL);
 
     psArray* chips = FPA->chips;
@@ -476,6 +476,6 @@
     for (psS32 i = 0; i < nChips; i++) {
         psChip* tmpChip = chips->data[i];
-        PS_PTR_CHECK_NULL(tmpChip, NULL);
-        PS_PTR_CHECK_NULL(tmpChip->fromFPA, NULL);
+        PS_ASSERT_PTR_NON_NULL(tmpChip, NULL);
+        PS_ASSERT_PTR_NON_NULL(tmpChip->fromFPA, NULL);
 
         psPlaneTransformApply(&chipCoord, tmpChip->fromFPA, fpaCoord);
@@ -494,6 +494,6 @@
                      const psChip* chip)
 {
-    PS_PTR_CHECK_NULL(chipCoord, NULL);
-    PS_PTR_CHECK_NULL(chip, NULL);
+    PS_ASSERT_PTR_NON_NULL(chipCoord, NULL);
+    PS_ASSERT_PTR_NON_NULL(chip, NULL);
 
     psPlane cellCoord;
@@ -511,6 +511,6 @@
     for (psS32 i = 0; i < cells->n; i++) {
         psCell* tmpCell = (psCell* ) cells->data[i];
-        PS_PTR_CHECK_NULL(tmpCell, NULL);
-        PS_PTR_CHECK_NULL(tmpCell->fromChip, NULL);
+        PS_ASSERT_PTR_NON_NULL(tmpCell, NULL);
+        PS_ASSERT_PTR_NON_NULL(tmpCell->fromChip, NULL);
         psArray* readouts = tmpCell->readouts;
 
@@ -518,5 +518,5 @@
             for (psS32 j = 0; j < readouts->n; j++) {
                 psReadout* tmpReadout = readouts->data[j];
-                PS_READOUT_CHECK_NULL(tmpReadout, NULL);
+                PS_ASSERT_READOUT_NON_NULL(tmpReadout, NULL);
 
                 psPlaneTransformApply(&cellCoord,
@@ -540,6 +540,6 @@
                            const psCell* cell)
 {
-    PS_PTR_CHECK_NULL(inCoord, NULL);
-    PS_PTR_CHECK_NULL(cell, NULL);
+    PS_ASSERT_PTR_NON_NULL(inCoord, NULL);
+    PS_ASSERT_PTR_NON_NULL(cell, NULL);
 
     return (psPlaneTransformApply(outCoord, cell->toChip, inCoord));
@@ -550,6 +550,6 @@
                           const psChip* chip)
 {
-    PS_PTR_CHECK_NULL(inCoord, NULL);
-    PS_PTR_CHECK_NULL(chip, NULL);
+    PS_ASSERT_PTR_NON_NULL(inCoord, NULL);
+    PS_ASSERT_PTR_NON_NULL(chip, NULL);
 
     return (psPlaneTransformApply(outCoord, chip->toFPA, inCoord));
@@ -562,6 +562,6 @@
                         const psFPA* fpa)
 {
-    PS_PTR_CHECK_NULL(inCoord, NULL);
-    PS_PTR_CHECK_NULL(fpa, NULL);
+    PS_ASSERT_PTR_NON_NULL(inCoord, NULL);
+    PS_ASSERT_PTR_NON_NULL(fpa, NULL);
 
     return(psPlaneDistortApply(outCoord, fpa->toTangentPlane, inCoord,
@@ -576,6 +576,6 @@
                          const psGrommit* grommit)
 {
-    PS_PTR_CHECK_NULL(tpCoord, NULL);
-    PS_PTR_CHECK_NULL(grommit, NULL);
+    PS_ASSERT_PTR_NON_NULL(tpCoord, NULL);
+    PS_ASSERT_PTR_NON_NULL(grommit, NULL);
 
     double AOB = 0.0;
@@ -596,6 +596,6 @@
                           const psCell* cell)
 {
-    PS_PTR_CHECK_NULL(cellCoord, NULL);
-    PS_PTR_CHECK_NULL(cell, NULL);
+    PS_ASSERT_PTR_NON_NULL(cellCoord, NULL);
+    PS_ASSERT_PTR_NON_NULL(cell, NULL);
 
     return (psPlaneTransformApply(fpaCoord, cell->toFPA, cellCoord));
@@ -608,11 +608,11 @@
                            const psCell* cell)
 {
-    PS_PTR_CHECK_NULL(cellCoord, NULL);
-    PS_PTR_CHECK_NULL(cell, NULL);
-    PS_PTR_CHECK_NULL(cell->toFPA, NULL);
-    PS_PTR_CHECK_NULL(cell->parent, NULL);
-    PS_PTR_CHECK_NULL(cell->parent->parent, NULL);
-    PS_PTR_CHECK_NULL(cell->parent->parent->toTangentPlane, NULL);
-    PS_PTR_CHECK_NULL(cell->parent->parent->exposure, NULL);
+    PS_ASSERT_PTR_NON_NULL(cellCoord, NULL);
+    PS_ASSERT_PTR_NON_NULL(cell, NULL);
+    PS_ASSERT_PTR_NON_NULL(cell->toFPA, NULL);
+    PS_ASSERT_PTR_NON_NULL(cell->parent, NULL);
+    PS_ASSERT_PTR_NON_NULL(cell->parent->parent, NULL);
+    PS_ASSERT_PTR_NON_NULL(cell->parent->parent->toTangentPlane, NULL);
+    PS_ASSERT_PTR_NON_NULL(cell->parent->parent->exposure, NULL);
 
     psPlane* fpaCoord = NULL;
@@ -645,10 +645,10 @@
                                 const psCell* cell)
 {
-    PS_PTR_CHECK_NULL(cellCoord, NULL);
-    PS_PTR_CHECK_NULL(cell, NULL);
-    PS_PTR_CHECK_NULL(cell->toSky, NULL);
-    PS_PTR_CHECK_NULL(cell->parent, NULL);
-    PS_PTR_CHECK_NULL(cell->parent->parent, NULL);
-    PS_PTR_CHECK_NULL(cell->parent->parent->projection, NULL);
+    PS_ASSERT_PTR_NON_NULL(cellCoord, NULL);
+    PS_ASSERT_PTR_NON_NULL(cell, NULL);
+    PS_ASSERT_PTR_NON_NULL(cell->toSky, NULL);
+    PS_ASSERT_PTR_NON_NULL(cell->parent, NULL);
+    PS_ASSERT_PTR_NON_NULL(cell->parent->parent, NULL);
+    PS_ASSERT_PTR_NON_NULL(cell->parent->parent->projection, NULL);
     if (cell->toSky) {
         // XXX: Should we use toTP or toSky?
@@ -690,6 +690,6 @@
                         const psGrommit* grommit)
 {
-    PS_PTR_CHECK_NULL(in, NULL);
-    PS_PTR_CHECK_NULL(grommit, NULL);
+    PS_ASSERT_PTR_NON_NULL(in, NULL);
+    PS_ASSERT_PTR_NON_NULL(grommit, NULL);
 
     char* type = "RA";
@@ -711,7 +711,7 @@
                         const psFPA* fpa)
 {
-    PS_PTR_CHECK_NULL(tpCoord, NULL);
-    PS_PTR_CHECK_NULL(fpa, NULL);
-    PS_PTR_CHECK_NULL(fpa->fromTangentPlane, NULL);
+    PS_ASSERT_PTR_NON_NULL(tpCoord, NULL);
+    PS_ASSERT_PTR_NON_NULL(fpa, NULL);
+    PS_ASSERT_PTR_NON_NULL(fpa->fromTangentPlane, NULL);
 
     return (psPlaneDistortApply(fpaCoord, fpa->fromTangentPlane,
@@ -723,7 +723,7 @@
                           const psChip* chip)
 {
-    PS_PTR_CHECK_NULL(fpaCoord, NULL);
-    PS_PTR_CHECK_NULL(chip, NULL);
-    PS_PTR_CHECK_NULL(chip->fromFPA, NULL);
+    PS_ASSERT_PTR_NON_NULL(fpaCoord, NULL);
+    PS_ASSERT_PTR_NON_NULL(chip, NULL);
+    PS_ASSERT_PTR_NON_NULL(chip->fromFPA, NULL);
 
     chipCoord = psPlaneTransformApply(chipCoord, chip->fromFPA, fpaCoord);
@@ -735,7 +735,7 @@
                            const psCell* cell)
 {
-    PS_PTR_CHECK_NULL(chipCoord, NULL);
-    PS_PTR_CHECK_NULL(cell, NULL);
-    PS_PTR_CHECK_NULL(cell->fromChip, NULL);
+    PS_ASSERT_PTR_NON_NULL(chipCoord, NULL);
+    PS_ASSERT_PTR_NON_NULL(cell, NULL);
+    PS_ASSERT_PTR_NON_NULL(cell->fromChip, NULL);
 
     cellCoord = psPlaneTransformApply(cellCoord, cell->fromChip, chipCoord);
@@ -749,9 +749,9 @@
                           const psCell* cell)
 {
-    PS_PTR_CHECK_NULL(skyCoord, NULL);
-    PS_PTR_CHECK_NULL(cell, NULL);
-    PS_PTR_CHECK_NULL(cell->parent, NULL);
-    PS_PTR_CHECK_NULL(cell->parent->parent, NULL);
-    PS_PTR_CHECK_NULL(cell->parent->parent->grommit, NULL);
+    PS_ASSERT_PTR_NON_NULL(skyCoord, NULL);
+    PS_ASSERT_PTR_NON_NULL(cell, NULL);
+    PS_ASSERT_PTR_NON_NULL(cell->parent, NULL);
+    PS_ASSERT_PTR_NON_NULL(cell->parent->parent, NULL);
+    PS_ASSERT_PTR_NON_NULL(cell->parent->parent->grommit, NULL);
 
     psChip *parChip = cell->parent;
@@ -783,10 +783,10 @@
                                const psCell* cell)
 {
-    PS_PTR_CHECK_NULL(skyCoord, NULL);
-    PS_PTR_CHECK_NULL(cell, NULL);
-    PS_PTR_CHECK_NULL(cell->parent, NULL);
-    PS_PTR_CHECK_NULL(cell->parent->parent, NULL);
-    PS_PTR_CHECK_NULL(cell->parent->parent->projection, NULL);
-    PS_PTR_CHECK_NULL(cell->toTP, NULL);
+    PS_ASSERT_PTR_NON_NULL(skyCoord, NULL);
+    PS_ASSERT_PTR_NON_NULL(cell, NULL);
+    PS_ASSERT_PTR_NON_NULL(cell->parent, NULL);
+    PS_ASSERT_PTR_NON_NULL(cell->parent->parent, NULL);
+    PS_ASSERT_PTR_NON_NULL(cell->parent->parent->projection, NULL);
+    PS_ASSERT_PTR_NON_NULL(cell->toTP, NULL);
     if (cell->toSky) {
         // XXX: Should we use toTP or toSky?
Index: trunk/psLib/src/astronomy/psCoord.c
===================================================================
--- trunk/psLib/src/astronomy/psCoord.c	(revision 3991)
+++ trunk/psLib/src/astronomy/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/astronomy/psTime.c
===================================================================
--- trunk/psLib/src/astronomy/psTime.c	(revision 3991)
+++ trunk/psLib/src/astronomy/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