Index: trunk/psModules/src/pmSubtractSky.c
===================================================================
--- trunk/psModules/src/pmSubtractSky.c	(revision 3046)
+++ trunk/psModules/src/pmSubtractSky.c	(revision 4030)
@@ -6,6 +6,6 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.19 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-01-19 00:06:10 $
+ *  @version $Revision: 1.20 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-05-25 20:28:32 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -249,13 +249,13 @@
     psTrace(".psModule.pmSubtractSky.ImageFitPolynomial", 4,
             "---- ImageFitPolynomial() begin ----\n");
-    PS_POLY_CHECK_NULL(myPoly, NULL);
-    PS_POLY_CHECK_TYPE(myPoly, PS_POLYNOMIAL_ORD, NULL);
-    PS_IMAGE_CHECK_NULL(dataImage, NULL);
-    PS_IMAGE_CHECK_EMPTY(dataImage, NULL);
-    PS_IMAGE_CHECK_TYPE(dataImage, PS_TYPE_F32, NULL);
-    PS_IMAGE_CHECK_NULL(maskImage, NULL);
-    PS_IMAGE_CHECK_EMPTY(maskImage, NULL);
-    PS_IMAGE_CHECK_TYPE(maskImage, PS_TYPE_U8, NULL);
-    PS_IMAGE_CHECK_SIZE_EQUAL(dataImage, maskImage, NULL);
+    PS_ASSERT_POLY_NON_NULL(myPoly, NULL);
+    PS_ASSERT_POLY_TYPE(myPoly, PS_POLYNOMIAL_ORD, NULL);
+    PS_ASSERT_IMAGE_NON_NULL(dataImage, NULL);
+    PS_ASSERT_IMAGE_NON_EMPTY(dataImage, NULL);
+    PS_ASSERT_IMAGE_TYPE(dataImage, PS_TYPE_F32, NULL);
+    PS_ASSERT_IMAGE_NON_NULL(maskImage, NULL);
+    PS_ASSERT_IMAGE_NON_EMPTY(maskImage, NULL);
+    PS_ASSERT_IMAGE_TYPE(maskImage, PS_TYPE_U8, NULL);
+    PS_ASSERT_IMAGES_SIZE_EQUAL(dataImage, maskImage, NULL);
     psS32 oldPolyX = -1;
     psS32 oldPolyY = -1;
@@ -356,6 +356,6 @@
     //
     Aout = psMatrixLUD(Aout, &outPerm, A);
-    PS_IMAGE_CHECK_NULL(Aout, NULL);
-    PS_IMAGE_CHECK_EMPTY(Aout, NULL);
+    PS_ASSERT_IMAGE_NON_NULL(Aout, NULL);
+    PS_ASSERT_IMAGE_NON_EMPTY(Aout, NULL);
     psVector *C = psVectorAlloc(localPolyTerms, PS_TYPE_F64);
     psMatrixLUSolve(C, Aout, B, outPerm);
@@ -424,7 +424,7 @@
                          psF32 clipSD)
 {
-    PS_READOUT_CHECK_NULL(in, NULL);
-    PS_READOUT_CHECK_EMPTY(in, NULL);
-    PS_READOUT_CHECK_TYPE(in, PS_TYPE_F32, NULL);
+    PS_ASSERT_READOUT_NON_NULL(in, NULL);
+    PS_ASSERT_READOUT_NON_EMPTY(in, NULL);
+    PS_ASSERT_READOUT_TYPE(in, PS_TYPE_F32, NULL);
     psTrace(".psModule.pmSubtractSky", 4,
             "---- pmSubtractSky() begin ----\n");
@@ -584,6 +584,6 @@
     if (fit == PM_FIT_POLYNOMIAL) {
         myPoly = (psPolynomial2D *) fitSpec;
-        PS_POLY_CHECK_NULL(myPoly, NULL);
-        PS_POLY_CHECK_TYPE(myPoly, PS_POLYNOMIAL_ORD, NULL);
+        PS_ASSERT_POLY_NON_NULL(myPoly, NULL);
+        PS_ASSERT_POLY_TYPE(myPoly, PS_POLYNOMIAL_ORD, NULL);
 
         myPoly = ImageFitPolynomial(myPoly, binnedImage, binnedMaskImage);