Index: trunk/psModules/test/tst_pmReadoutCombine.c
===================================================================
--- trunk/psModules/test/tst_pmReadoutCombine.c	(revision 2856)
+++ trunk/psModules/test/tst_pmReadoutCombine.c	(revision 2915)
@@ -5,6 +5,6 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.9 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-12-30 21:35:04 $
+ *  @version $Revision: 1.10 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-01-05 23:25:25 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -44,5 +44,5 @@
         for (psS32 j = 0 ; j < output->numCols ; j++) {
             if (output->data.F32[i][j] != expect) {
-                printf("ERROR: output[%d][%d] is %.2f, should be %f\n", i, j, output->data.F32[i][j], expect);
+                printf("TEST ERROR: output[%d][%d] is %.2f, should be %f\n", i, j, output->data.F32[i][j], expect);
                 testStatus = false;
             }
@@ -261,10 +261,10 @@
 
         if (rc->type.type != scale->type.type) {
-            printf("ERROR: output readout->image has incorrect type.\n");
+            printf("TEST ERROR: output readout->image has incorrect type.\n");
             testStatus = false;
         }
         psFree(rc);
     } else {
-        printf("ERROR: pmReadoutCombine() returned NULL\n");
+        printf("TEST ERROR: pmReadoutCombine() returned NULL\n");
         testStatus = false;
 
@@ -275,5 +275,5 @@
     rc = pmReadoutCombine(NULL, list, params, zeroHalf, scale, true, 0.0, 0.0);
     if (rc != NULL) {
-        printf("ERROR: pmReadoutCombine() did not return NULL\n");
+        printf("TEST ERROR: pmReadoutCombine() did not return NULL\n");
         testStatus = false;
     }
@@ -283,5 +283,5 @@
     rc = pmReadoutCombine(NULL, list, params, zeroF64, scale, true, 0.0, 0.0);
     if (rc != NULL) {
-        printf("ERROR: pmReadoutCombine() did not return NULL\n");
+        printf("TEST ERROR: pmReadoutCombine() did not return NULL\n");
         testStatus = false;
     }
@@ -300,5 +300,5 @@
         rc = NULL;
     } else {
-        printf("ERROR: pmReadoutCombine() returned NULL\n");
+        printf("TEST ERROR: pmReadoutCombine() returned NULL\n");
         testStatus = false;
     }
@@ -316,10 +316,10 @@
 
         if (rc->type.type != scale->type.type) {
-            printf("ERROR: output readout->image has incorrect type.\n");
+            printf("TEST ERROR: output readout->image has incorrect type.\n");
             testStatus = false;
         }
         psFree(rc);
     } else {
-        printf("ERROR: pmReadoutCombine() returned NULL\n");
+        printf("TEST ERROR: pmReadoutCombine() returned NULL\n");
         testStatus = false;
 
@@ -330,5 +330,5 @@
     rc = pmReadoutCombine(output, list, params, zero, scaleHalf, true, 0.0, 0.0);
     if (rc != NULL) {
-        printf("ERROR: pmReadoutCombine() did not return NULL\n");
+        printf("TEST ERROR: pmReadoutCombine() did not return NULL\n");
         testStatus = false;
     }
@@ -338,5 +338,5 @@
     rc = pmReadoutCombine(output, list, params, zero, scaleF64, true, 0.0, 0.0);
     if (rc != NULL) {
-        printf("ERROR: pmReadoutCombine() did not return NULL\n");
+        printf("TEST ERROR: pmReadoutCombine() did not return NULL\n");
         testStatus = false;
     }
@@ -355,5 +355,5 @@
         rc = NULL;
     } else {
-        printf("ERROR: pmReadoutCombine() returned NULL\n");
+        printf("TEST ERROR: pmReadoutCombine() returned NULL\n");
         testStatus = false;
     }
@@ -364,5 +364,5 @@
     rc = pmReadoutCombine(output, list, params, zero, scale, true, 0.0, 0.0);
     if (rc != NULL) {
-        printf("ERROR: pmReadoutCombine() did not return NULL\n");
+        printf("TEST ERROR: pmReadoutCombine() did not return NULL\n");
         testStatus = false;
     }
@@ -377,5 +377,5 @@
     rc = pmReadoutCombine(output, list, params, zero, scale, true, 0.0, 0.0);
     if (rc != NULL) {
-        printf("ERROR: pmReadoutCombine() did not return NULL\n");
+        printf("TEST ERROR: pmReadoutCombine() did not return NULL\n");
         testStatus = false;
     }
@@ -387,5 +387,5 @@
     rc = pmReadoutCombine(output, NULL, params, zero, scale, true, 0.0, 0.0);
     if (rc != NULL) {
-        printf("ERROR: pmReadoutCombine() did not return NULL\n");
+        printf("TEST ERROR: pmReadoutCombine() did not return NULL\n");
         testStatus = false;
     }
@@ -395,5 +395,5 @@
     rc = pmReadoutCombine(output, list, NULL, zero, scale, true, 0.0, 0.0);
     if (rc != NULL) {
-        printf("ERROR: pmReadoutCombine() did not return NULL\n");
+        printf("TEST ERROR: pmReadoutCombine() did not return NULL\n");
         testStatus = false;
     }
@@ -404,5 +404,5 @@
     rc = pmReadoutCombine(output, list, params, zero, scale, true, 0.0, 0.0);
     if (rc != NULL) {
-        printf("ERROR: pmReadoutCombine() did not return NULL\n");
+        printf("TEST ERROR: pmReadoutCombine() did not return NULL\n");
         testStatus = false;
     }
@@ -412,7 +412,8 @@
     psStats *oldStats = params->stats;
     printf("Calling pmReadoutCombine() with NULL param->stats.  Should generate error, return NULL.\n");
+    params->stats = NULL;
     rc = pmReadoutCombine(output, list, params, zero, scale, true, 0.0, 0.0);
     if (rc != NULL) {
-        printf("ERROR: pmReadoutCombine() did not return NULL\n");
+        printf("TEST ERROR: pmReadoutCombine() did not return NULL\n");
         testStatus = false;
     }