Index: /trunk/psModules/test/tst_pmReadoutCombine.c
===================================================================
--- /trunk/psModules/test/tst_pmReadoutCombine.c	(revision 4810)
+++ /trunk/psModules/test/tst_pmReadoutCombine.c	(revision 4811)
@@ -5,6 +5,6 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.12 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-08-16 01:10:36 $
+ *  @version $Revision: 1.13 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-08-17 22:49:18 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -26,6 +26,6 @@
 static int test01(void);
 testDescription tests[] = {
-                              {test00, 000, "pmSubtractBias", 0, false},
-                              {test01, 000, "pmSubtractBias(): input parameter error conditions", 0, false},
+                              {test00, 000, "pmSubtractBias(): Basic readout combines with no image overlap", true, false},
+                              {test01, 000, "pmSubtractBias(): input parameter error conditions", true, false},
                               {NULL}
                           };
@@ -64,5 +64,4 @@
 readouts and calls pmReadoutCombine().
  *****************************************************************************/
-
 int simpleCombineNoOverlap(psS32 numInputCols, psS32 numInputRows)
 {
@@ -99,4 +98,8 @@
     params->nKeep = 0;
 
+    //
+    // Create a psList of psReadouts.  The pixels in readout r will all have the
+    // value r.
+    //
     for (r=0;r<NUM_READOUTS;r++) {
         baseRowsReadout[r] = r + 40;
@@ -118,10 +121,7 @@
         *(int *) (& (tmpImage->row0)) = baseRows[r];
         *(int *) (& (tmpImage->col0)) = baseCols[r];
-        /*
-                pmReadout *tmpReadout = pmReadoutAlloc(baseColsReadout[r],
-                                                       baseRowsReadout[r],
-                                                       tmpImage);
-        */
         pmReadout *tmpReadout = pmReadoutAlloc(NULL);
+        tmpReadout->row0 = 0;
+        tmpReadout->col0 = 0;
         tmpReadout->image = tmpImage;
 
@@ -142,8 +142,7 @@
     output = pmReadoutCombine(output, list, params, zero, scale, true, 0.0, 0.0);
     psF32 NR = (psF32) NUM_READOUTS;
-    //    psF32 expectedPixel = ((((NR-1.0) * (NR/2.0)) / NR) + VEC_ZERO) * VEC_SCALE;
     psF32 expectedPixel = ((NR/2.0) * (VEC_ZERO + (VEC_ZERO + VEC_SCALE * (NR - 1)))) / NR;
 
-    VerifyTheOutput(output, expectedPixel);
+    int testStatus = VerifyTheOutput(output, expectedPixel);
 
     psFree(params->stats);
@@ -162,5 +161,5 @@
 
     printFooter(stdout, "pmReadoutCombine", "simpleCombineNoOverlap", true);
-    return(0);
+    return(testStatus);
 }
 
@@ -177,6 +176,11 @@
 }
 
+/******************************************************************************
+test01(): we simply call pmReadoutCombine() with a variety of erroneous input
+parameter combinations and verify that it behaves properly.
+ *****************************************************************************/
 int test01()
 {
+    int testStatus = true;
     int i;
     int r;
@@ -203,5 +207,4 @@
     psVector *scaleBig = psVectorAlloc(NUM_READOUTS*2, PS_TYPE_F32);
     psVector *scaleF64 = psVectorAlloc(NUM_READOUTS, PS_TYPE_F64);
-    int testStatus = true;
     for (i=0;i<NUM_READOUTS;i++) {
         zero->data.F32[i] = 3.0;
@@ -236,10 +239,7 @@
         *(int *) (& (tmpImage->row0)) = baseRows[r];
         *(int *) (& (tmpImage->col0)) = baseCols[r];
-        /*
-                pmReadout *tmpReadout = pmReadoutAlloc(baseColsReadout[r],
-                                                       baseRowsReadout[r],
-                                                       tmpImage);
-        */
         pmReadout *tmpReadout = pmReadoutAlloc(NULL);
+        tmpReadout->row0 = 0;
+        tmpReadout->col0 = 0;
         tmpReadout->image = tmpImage;
         minOutRow = PS_MIN(minOutRow, (baseRowsReadout[r] + baseRows[r]));
@@ -449,4 +449,4 @@
 
     printFooter(stdout, "pmReadoutCombine", "Testing bad input parameter conditions", true);
-    return(!testStatus);
+    return(testStatus);
 }
Index: /trunk/psModules/test/verified/tst_pmReadoutCombine.stderr
===================================================================
--- /trunk/psModules/test/verified/tst_pmReadoutCombine.stderr	(revision 4810)
+++ /trunk/psModules/test/verified/tst_pmReadoutCombine.stderr	(revision 4811)
@@ -1,10 +1,10 @@
 /***************************** TESTPOINT ******************************************\
 *             TestFile: tst_pmReadoutCombine.c                                     *
-*            TestPoint: Test Point Driver{pmSubtractBias}                          *
+*            TestPoint: Test Point Driver{pmSubtractBias(): Basic readout combines with no image overla *
 *             TestType: Positive                                                   *
 \**********************************************************************************/
 
 
----> TESTPOINT PASSED (Test Point Driver{pmSubtractBias} | tst_pmReadoutCombine.c)
+---> TESTPOINT PASSED (Test Point Driver{pmSubtractBias(): Basic readout combines with no image overlap} | tst_pmReadoutCombine.c)
 
 /***************************** TESTPOINT ******************************************\
@@ -14,27 +14,27 @@
 \**********************************************************************************/
 
-<DATE><TIME>|<HOST>|E|pmReadoutCombine (FILE:LINENO)
+<HOST>|E|pmReadoutCombine (FILE:LINENO)
     zero vector has incorrect size (5).  Returning NULL.
-<DATE><TIME>|<HOST>|E|pmReadoutCombine (FILE:LINENO)
+<HOST>|E|pmReadoutCombine (FILE:LINENO)
     Unallowable operation: psVector zero has incorrect type.
-<DATE><TIME>|<HOST>|W|pmReadoutCombine
+<HOST>|W|pmReadoutCombine
     WARNING: the zero vector too many elements (11)
-<DATE><TIME>|<HOST>|E|pmReadoutCombine (FILE:LINENO)
+<HOST>|E|pmReadoutCombine (FILE:LINENO)
     scale vector has incorrect size (5).  Returning NULL.
-<DATE><TIME>|<HOST>|E|pmReadoutCombine (FILE:LINENO)
+<HOST>|E|pmReadoutCombine (FILE:LINENO)
     Unallowable operation: psVector scale has incorrect type.
-<DATE><TIME>|<HOST>|W|pmReadoutCombine
+<HOST>|W|pmReadoutCombine
     WARNING: the scale vector has too many elements (20)
-<DATE><TIME>|<HOST>|E|pmReadoutCombine (FILE:LINENO)
+<HOST>|E|pmReadoutCombine (FILE:LINENO)
     Output image (1, 1) is too small to hold combined images.  Returning NULL.
-<DATE><TIME>|<HOST>|E|pmReadoutCombine (FILE:LINENO)
+<HOST>|E|pmReadoutCombine (FILE:LINENO)
     Output image offset is larger then input image offset.  Returning NULL.
-<DATE><TIME>|<HOST>|E|pmReadoutCombine (FILE:LINENO)
+<HOST>|E|pmReadoutCombine (FILE:LINENO)
     Unallowable operation: inputs is NULL.
-<DATE><TIME>|<HOST>|E|pmReadoutCombine (FILE:LINENO)
+<HOST>|E|pmReadoutCombine (FILE:LINENO)
     Unallowable operation: params is NULL.
-<DATE><TIME>|<HOST>|E|pmReadoutCombine (FILE:LINENO)
+<HOST>|E|pmReadoutCombine (FILE:LINENO)
     Multiple statistical options have been requested.  Returning NULL.
-<DATE><TIME>|<HOST>|E|pmReadoutCombine (FILE:LINENO)
+<HOST>|E|pmReadoutCombine (FILE:LINENO)
     Unallowable operation: params->stats is NULL.