Index: trunk/psModules/src/pmNonLinear.c
===================================================================
--- trunk/psModules/src/pmNonLinear.c	(revision 2928)
+++ trunk/psModules/src/pmNonLinear.c	(revision 4030)
@@ -5,6 +5,6 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.10 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-01-07 20:00:34 $
+ *  @version $Revision: 1.11 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-05-25 20:28:32 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -33,8 +33,8 @@
                                     const psPolynomial1D *input1DPoly)
 {
-    PS_PTR_CHECK_NULL(inputReadout, NULL);
-    PS_PTR_CHECK_NULL(inputReadout->image, NULL);
-    PS_IMAGE_CHECK_TYPE(inputReadout->image, PS_TYPE_F32, NULL);
-    PS_PTR_CHECK_NULL(input1DPoly, NULL);
+    PS_ASSERT_PTR_NON_NULL(inputReadout, NULL);
+    PS_ASSERT_PTR_NON_NULL(inputReadout->image, NULL);
+    PS_ASSERT_IMAGE_TYPE(inputReadout->image, PS_TYPE_F32, NULL);
+    PS_ASSERT_PTR_NON_NULL(input1DPoly, NULL);
 
     psS32 i;
@@ -61,13 +61,13 @@
                                 const psVector *outFlux)
 {
-    PS_PTR_CHECK_NULL(inputReadout,NULL);
-    PS_PTR_CHECK_NULL(inputReadout->image,NULL);
-    PS_IMAGE_CHECK_TYPE(inputReadout->image, PS_TYPE_F32, NULL);
-    PS_PTR_CHECK_NULL(inFlux,NULL);
+    PS_ASSERT_PTR_NON_NULL(inputReadout,NULL);
+    PS_ASSERT_PTR_NON_NULL(inputReadout->image,NULL);
+    PS_ASSERT_IMAGE_TYPE(inputReadout->image, PS_TYPE_F32, NULL);
+    PS_ASSERT_PTR_NON_NULL(inFlux,NULL);
     if (inFlux->n < 2) {
         psError(PS_ERR_UNKNOWN,true, "pmNonLinearityLookup(): input vector less than 2 elements.  Returning inputReadout image.");
         return(inputReadout);
     }
-    PS_PTR_CHECK_NULL(outFlux,NULL);
+    PS_ASSERT_PTR_NON_NULL(outFlux,NULL);
     psS32 tableSize = inFlux->n;
     if (inFlux->n != outFlux->n) {
@@ -76,6 +76,6 @@
                  "WARNING: pmNonLinear.c: pmNonLinearityLookup(): input vectors have different sizes (%d, %d)\n", inFlux->n, outFlux->n);
     }
-    PS_VECTOR_CHECK_TYPE(inFlux, PS_TYPE_F32, NULL);
-    PS_VECTOR_CHECK_TYPE(outFlux, PS_TYPE_F32, NULL);
+    PS_ASSERT_VECTOR_TYPE(inFlux, PS_TYPE_F32, NULL);
+    PS_ASSERT_VECTOR_TYPE(outFlux, PS_TYPE_F32, NULL);
 
     psS32 i;