Index: trunk/psModules/src/pmReadoutCombine.c
===================================================================
--- trunk/psModules/src/pmReadoutCombine.c	(revision 2928)
+++ trunk/psModules/src/pmReadoutCombine.c	(revision 4030)
@@ -5,6 +5,6 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.21 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-01-07 20:00:34 $
+ *  @version $Revision: 1.22 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-05-25 20:28:32 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -51,18 +51,18 @@
                           psF32 readnoise)
 {
-    PS_PTR_CHECK_NULL(inputs, NULL);
-    PS_PTR_CHECK_NULL(params, NULL);
-    PS_PTR_CHECK_NULL(params->stats, NULL);
+    PS_ASSERT_PTR_NON_NULL(inputs, NULL);
+    PS_ASSERT_PTR_NON_NULL(params, NULL);
+    PS_ASSERT_PTR_NON_NULL(params->stats, NULL);
     if (zero != NULL) {
-        PS_VECTOR_CHECK_TYPE(zero, PS_TYPE_F32, NULL);
-        //        PS_VECTOR_CHECK_TYPE_S16_S32_F32(zero, NULL);
+        PS_ASSERT_VECTOR_TYPE(zero, PS_TYPE_F32, NULL);
+        //        PS_ASSERT_VECTOR_TYPE_S16_S32_F32(zero, NULL);
     }
     if (scale != NULL) {
-        PS_VECTOR_CHECK_TYPE(scale, PS_TYPE_F32, NULL);
-        //        PS_VECTOR_CHECK_TYPE_S16_S32_F32(scale, NULL);
+        PS_ASSERT_VECTOR_TYPE(scale, PS_TYPE_F32, NULL);
+        //        PS_ASSERT_VECTOR_TYPE_S16_S32_F32(scale, NULL);
     }
     if ((zero != NULL) && (scale != NULL)) {
-        PS_VECTOR_CHECK_TYPE_EQUAL(zero, scale, NULL);
-        // PS_VECTOR_CHECK_TYPE_S16_S32_F32(scale, NULL);
+        PS_ASSERT_VECTOR_TYPE_EQUAL(zero, scale, NULL);
+        // PS_ASSERT_VECTOR_TYPE_S16_S32_F32(scale, NULL);
     }
 
@@ -102,7 +102,7 @@
     while (NULL != tmpInput) {
         tmpReadout = (psReadout *) tmpInput->data;
-        PS_READOUT_CHECK_NULL(tmpReadout, output);
-        PS_READOUT_CHECK_EMPTY(tmpReadout, output);
-        PS_READOUT_CHECK_TYPE(tmpReadout, PS_TYPE_F32, output);
+        PS_ASSERT_READOUT_NON_NULL(tmpReadout, output);
+        PS_ASSERT_READOUT_NON_EMPTY(tmpReadout, output);
+        PS_ASSERT_READOUT_TYPE(tmpReadout, PS_TYPE_F32, output);
         outputType = tmpReadout->image->type.type;
 
@@ -126,5 +126,5 @@
     // We ensure that the zero vector is of the proper size.
     if (zero != NULL) {
-        PS_VECTOR_CHECK_TYPE(zero, PS_TYPE_F32, NULL);
+        PS_ASSERT_VECTOR_TYPE(zero, PS_TYPE_F32, NULL);
         if (numInputs > zero->n) {
             psError(PS_ERR_UNKNOWN, true, "zero vector has incorrect size (%d).  Returning NULL.\n", zero->n);
@@ -138,5 +138,5 @@
     // We ensure that the scale vector is of the proper size.
     if (scale != NULL) {
-        PS_VECTOR_CHECK_TYPE(scale, PS_TYPE_F32, NULL);
+        PS_ASSERT_VECTOR_TYPE(scale, PS_TYPE_F32, NULL);
         if (numInputs > scale->n) {
             psError(PS_ERR_UNKNOWN, true, "scale vector has incorrect size (%d).  Returning NULL.\n", scale->n);
@@ -160,5 +160,5 @@
         *(psS32 *) &(output->row0) = minInputRows;
     } else {
-        PS_IMAGE_CHECK_TYPE(output, PS_TYPE_F32, NULL);
+        PS_ASSERT_IMAGE_TYPE(output, PS_TYPE_F32, NULL);
         if (((output->col0 + output->numCols) < maxInputCols) ||
                 ((output->row0 + output->numRows) < maxInputRows)) {