Changeset 2915

Timestamp:

Jan 5, 2005, 1:25:25 PM (22 years ago)

Author:

gusciora

Message:

Added tests to for various input parameters being NULL, or of incorrect
length.

Location:

trunk/psModules

Files:

• src/pmNonLinear.c (modified) (7 diffs)
• src/pmReadoutCombine.c (modified) (2 diffs)
• test/tst_pmNonLinear.c (modified) (7 diffs)
• test/tst_pmReadoutCombine.c (modified) (16 diffs)
• test/tst_pmSubtractBias.c (modified) (25 diffs)
• test/tst_pmSubtractSky.c (modified) (13 diffs)

trunk/psModules/src/pmNonLinear.c

@@ -5 +5 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.7 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-12-30 22:22:00 $
+ *  @version $Revision: 1.8 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-01-05 23:25:24 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
+ *
+ *  XXX: The SDR is silent about image types.  Only F32 was implemented.
  *
  */
@@ -28 +30 @@
  *****************************************************************************/
 
-psReadout *pmNonLinearityPolynomial(psReadout *in,
-                                    const psPolynomial1D *coeff)
+psReadout *pmNonLinearityPolynomial(psReadout *inputReadout,
+                                    const psPolynomial1D *input1DPoly)
 {
-    PS_PTR_CHECK_NULL(in,NULL);
-    PS_PTR_CHECK_NULL(in->image, NULL);
-    PS_PTR_CHECK_NULL(coeff,NULL);
+    PS_PTR_CHECK_NULL(inputReadout, NULL);
+    PS_PTR_CHECK_NULL(inputReadout->image, NULL);
+    PS_PTR_CHECK_NULL(input1DPoly, NULL);
 
     psS32 i;
     psS32 j;
 
-    for (i=0;i<(in->image)->numRows;i++) {
-        for (j=0;j<(in->image)->numCols;j++) {
-            (in->image)->data.F32[i][j] = psPolynomial1DEval(coeff, (in->image)->data.F32[i][j]);
+    for (i=0;i<(inputReadout->image)->numRows;i++) {
+        for (j=0;j<(inputReadout->image)->numCols;j++) {
+            (inputReadout->image)->data.F32[i][j] = psPolynomial1DEval(input1DPoly, (inputReadout->image)->data.F32[i][j]);
         }
     }
-    return(in);
+    return(inputReadout);
 }
 
@@ -54 +56 @@
 be set to the value from outFlux.
  *****************************************************************************/
-psReadout *pmNonLinearityLookup(psReadout *in,
+psReadout *pmNonLinearityLookup(psReadout *inputReadout,
                                 const psVector *inFlux,
                                 const psVector *outFlux)
 {
-    PS_PTR_CHECK_NULL(in,NULL);
-    PS_PTR_CHECK_NULL(in->image,NULL);
+    PS_PTR_CHECK_NULL(inputReadout,NULL);
+    PS_PTR_CHECK_NULL(inputReadout->image,NULL);
     PS_PTR_CHECK_NULL(inFlux,NULL);
+    psS32 tableSize = inFlux->n;
+    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);
+    if (inFlux->n != outFlux->n) {
+        tableSize = PS_MIN(inFlux->n, outFlux->n);
+        psLogMsg(__func__, PS_LOG_WARN,
+                 "WARNING: pmNonLinear.c: pmNonLinearityLookup(): input vectors have different sizes (%d, %d)\n", inFlux->n, outFlux->n);
+    }
 
     psS32 i;
     psS32 j;
-    psS32 tableSize = inFlux->n;
     psS32 binNum;
     psScalar x;
@@ -72 +83 @@
 
     x.type.type = PS_TYPE_F32;
-    if (inFlux->n != outFlux->n) {
-        tableSize = PS_MIN(inFlux->n, outFlux->n);
-        psLogMsg(__func__, PS_LOG_WARN,
-                 "WARNING: pmNonLinear.c: pmNonLinearityLookup(): input vectors have different sizes (%d, %d)\n", inFlux->n, outFlux->n);
-    }
-    if (inFlux->n < 2) {
-        psError(PS_ERR_UNKNOWN,true, "pmNonLinearityLookup(): input vector less than 2 elements.  Returning in image.");
-        return(in);
-    }
-    for (i=0;i<(in->image)->numRows;i++) {
-        for (j=0;j<(in->image)->numCols;j++) {
-            x.data.F32 = (in->image)->data.F32[i][j];
+    for (i=0;i<(inputReadout->image)->numRows;i++) {
+        for (j=0;j<(inputReadout->image)->numCols;j++) {
+            x.data.F32 = (inputReadout->image)->data.F32[i][j];
 
             binNum = p_psVectorBinDisect((psVector *)inFlux, &x);
@@ -89 +91 @@
             if (binNum == -2) {
                 // We get here if x is below the table lookup range.
-                (in->image)->data.F32[i][j] = outFlux->data.F32[0];
+                (inputReadout->image)->data.F32[i][j] = outFlux->data.F32[0];
                 numPixels++;
 
             } else if (binNum == -1) {
                 // We get here if x is above the table lookup range.
-                (in->image)->data.F32[i][j] = outFlux->data.F32[tableSize-1];
+                (inputReadout->image)->data.F32[i][j] = outFlux->data.F32[tableSize-1];
 
                 numPixels++;
             } else if (binNum < -2) {
                 // We get here if there was some other problem.
-                psError(PS_ERR_UNKNOWN,true, "pmNonLinearityLookup(): Could not perform p_psVectorBinDisect().  Returning in image.");
-                return(in);
+                psError(PS_ERR_UNKNOWN,true, "pmNonLinearityLookup(): Could not perform p_psVectorBinDisect().  Returning inputReadout image.");
+                return(inputReadout);
                 numPixels++;
             } else {
@@ -106 +108 @@
                 slope = (outFlux->data.F32[binNum+1] - outFlux->data.F32[binNum]) /
                         (inFlux->data.F32[binNum+1]  - inFlux->data.F32[binNum]);
-                (in->image)->data.F32[i][j] = outFlux->data.F32[binNum] +
-                                              ((x.data.F32 - inFlux->data.F32[binNum]) * slope);
+                (inputReadout->image)->data.F32[i][j] = outFlux->data.F32[binNum] +
+                                                        ((x.data.F32 - inFlux->data.F32[binNum]) * slope);
             }
         }
@@ -115 +117 @@
                  "WARNING: pmNonLinear.c: pmNonLinearityLookup(): %d pixels outside table.", numPixels);
     }
-    return(in);
+    return(inputReadout);
 }

trunk/psModules/src/pmReadoutCombine.c

@@ -5 +5 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.18 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-12-30 22:22:00 $
+ *  @version $Revision: 1.19 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-01-05 23:25:24 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -144 +144 @@
         } else if (numInputs < scale->n) {
             psLogMsg(__func__, PS_LOG_WARN,
-                     "WARNING: the scale vector too many elements (%d)\n", scale->n);
+                     "WARNING: the scale vector has too many elements (%d)\n", scale->n);
         }
     }

trunk/psModules/test/tst_pmNonLinear.c

@@ -11 +11 @@
  * N), (N, 1), (N, N)].  
  *
+ * test02, test03: This code tests the functions with various unallowable
+ * input parameters (NULLS) and incorrect vector sizes.
+ *
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.9 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-12-30 22:22:00 $
+ *  @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
@@ -24 +27 @@
 static int test00(void);
 static int test01(void);
+static int test02(void);
+static int test03(void);
 testDescription tests[] = {
-                              {test00, 000, "pmNonLinearityPolynomial", 0, false},
-                              {test01, 000, "pmNonLinearityLookup", 0, false},
+                              {test00, 000, "pmNonLinearityPolynomial", true, false},
+                              {test01, 000, "pmNonLinearityLookup", true, false},
+                              {test02, 000, "pmNonLinearityPolynomial(): error/warning conditions", true, false},
+                              {test03, 000, "pmNonLinearityLookup(): error/warning conditions", true, false},
                               {NULL}
                           };
@@ -44 +51 @@
     float actual;
     float expect;
-    int testStatus = 0;
+    int testStatus = true;
     psImage *myImage = psImageAlloc(numCols, numRows, PS_TYPE_F32);
-    //    psReadout *myReadout = psReadoutAlloc(numCols, numRows, myImage);
     psReadout *myReadout = psReadoutAlloc();
     myReadout->image = myImage;
@@ -64 +70 @@
             actual = myReadout->image->data.F32[i][j];
             if (FLT_EPSILON < fabs(expect - actual)) {
-                printf("ERROR: image[%d][%d] is %f, should be %f\n", i, j, actual, expect);
-                testStatus = 1;
+                printf("TEST ERROR: image[%d][%d] is %f, should be %f\n", i, j, actual, expect);
+                testStatus = false;
             }
         }
@@ -94 +100 @@
     float actual;
     float expect;
-    int testStatus = 0;
+    int testStatus = true;
     int tableSize = PS_MAX(numCols, numRows)*2;
     psImage *myImage = psImageAlloc(numCols, numRows, PS_TYPE_F32);
-    //    psReadout *myReadout = psReadoutAlloc(numCols, numRows, myImage);
     psReadout *myReadout = psReadoutAlloc();
     myReadout->image = myImage;
@@ -120 +125 @@
             actual = myReadout->image->data.F32[i][j];
             if (FLT_EPSILON < fabs(expect - actual)) {
-                printf("ERROR: image[%d][%d] is %f, should be %f\n", i, j, actual, expect);
-                testStatus = 1;
+                printf("TEST ERROR: image[%d][%d] is %f, should be %f\n", i, j, actual, expect);
+                testStatus = false;
             }
         }
@@ -144 +149 @@
     return(testStatus);
 }
+
+int test02( void )
+{
+    int i;
+    int j;
+    int testStatus = true;
+    psImage *myImage = psImageAlloc(NUM_COLS, NUM_ROWS, PS_TYPE_F32);
+    psReadout *myReadout = psReadoutAlloc();
+    psReadout *rc = NULL;
+    myReadout->image = myImage;
+    psPolynomial1D *myPoly = psPolynomial1DAlloc(2, PS_POLYNOMIAL_ORD);
+    myPoly->coeff[1] = 1.0;
+
+    for (i=0;i<NUM_ROWS;i++) {
+        for (j=0;j<NUM_COLS;j++) {
+            myReadout->image->data.F32[i][j] = (float) (i + j);
+        }
+    }
+
+    printf("------------------------------------------------------------\n");
+    printf("Calling pmNonLinearityPolynomial() with NULL input readout.  Should generate error, return NULL.\n");
+    rc = pmNonLinearityPolynomial(NULL, myPoly);
+    if (rc != NULL) {
+        printf("TEST ERROR: pmNonLinearityPolynomial() returned a non-NULL psReadout\n");
+        testStatus = false;
+    }
+
+    printf("------------------------------------------------------------\n");
+    printf("Calling pmNonLinearityPolynomial() with NULL input readout->image.  Should generate error, return NULL.\n");
+    psImage *tmpImage = myReadout->image;
+    myReadout->image = NULL;
+    rc = pmNonLinearityPolynomial(myReadout, myPoly);
+    if (rc != NULL) {
+        printf("TEST ERROR: pmNonLinearityPolynomial() returned a non-NULL psReadout\n");
+        testStatus = false;
+    }
+    myReadout->image = tmpImage;
+
+    printf("------------------------------------------------------------\n");
+    printf("Calling pmNonLinearityPolynomial() with NULL polynomial.  Should generate error, return NULL.\n");
+    rc = pmNonLinearityPolynomial(myReadout, NULL);
+    if (rc != NULL) {
+        printf("TEST ERROR: pmNonLinearityPolynomial() returned a non-NULL psReadout\n");
+        testStatus = false;
+    }
+
+    psFree(myReadout);
+    psFree(myPoly);
+    return(testStatus);
+}
+
+
+int test03Init(psReadout *myReadout)
+{
+    for (psS32 i=0;i<NUM_ROWS;i++) {
+        for (psS32 j=0;j<NUM_COLS;j++) {
+            myReadout->image->data.F32[i][j] = (float) (i + j);
+        }
+    }
+    return(0);
+}
+
+int test03()
+{
+    int i;
+    int j;
+    int testStatus = true;
+    int tableSize = PS_MAX(NUM_COLS, NUM_ROWS)*3;
+    psImage *myImage = psImageAlloc(NUM_COLS, NUM_ROWS, PS_TYPE_F32);
+    psReadout *myReadout = psReadoutAlloc();
+    psReadout *rc = NULL;
+    myReadout->image = myImage;
+    psVector *in = psVectorAlloc(tableSize, PS_TYPE_F32);
+    psVector *inOne = psVectorAlloc(1, PS_TYPE_F32);
+    psVector *inSmall = psVectorAlloc(tableSize-1, PS_TYPE_F32);
+    psVector *inBig = psVectorAlloc(tableSize+1, PS_TYPE_F32);
+    psVector *out = psVectorAlloc(tableSize, PS_TYPE_F32);
+    psVector *outOne = psVectorAlloc(1, PS_TYPE_F32);
+    psVector *outSmall = psVectorAlloc(tableSize-1, PS_TYPE_F32);
+    psVector *outBig = psVectorAlloc(tableSize+1, PS_TYPE_F32);
+
+    test03Init(myReadout);
+    for (i=0;i<tableSize;i++) {
+        in->data.F32[i] = (float) i;
+        out->data.F32[i] = (float) (2 * i);
+        inBig->data.F32[i] = (float) i;
+        outBig->data.F32[i] = (float) (2 * i);
+        if (i < tableSize-1) {
+            inSmall->data.F32[i] = (float) (2 * i);
+            outSmall->data.F32[i] = (float) (2 * i);
+        }
+    }
+    inBig->data.F32[tableSize] = (float) tableSize;
+    outBig->data.F32[tableSize] = (float) (2 * tableSize);
+    inOne->data.F32[0] = 0.0;
+    outOne->data.F32[0] = 0.0;
+
+    printf("------------------------------------------------------------\n");
+    printf("Calling pmNonLinearityLookup() with NULL input psReadout.  Should generate error, return NULL.\n");
+    rc = pmNonLinearityLookup(NULL, in, out);
+    if (rc != NULL) {
+        printf("TEST ERROR: pmNonLinearityPolynomial() returned a non-NULL psReadout\n");
+        testStatus = false;
+    }
+
+    printf("------------------------------------------------------------\n");
+    printf("Calling pmNonLinearityLookup() with NULL input psReadout->image.  Should generate error, return NULL.\n");
+    psImage *tmpImage = myReadout->image;
+    myReadout->image = NULL;
+    rc = pmNonLinearityLookup(myReadout, in, out);
+    if (rc != NULL) {
+        printf("TEST ERROR: pmNonLinearityPolynomial() returned a non-NULL psReadout\n");
+        testStatus = false;
+    }
+    myReadout->image = tmpImage;
+
+    printf("------------------------------------------------------------\n");
+    printf("Calling pmNonLinearityLookup() with NULL inFlux psVector.  Should generate error, return NULL.\n");
+    rc = pmNonLinearityLookup(myReadout, NULL, out);
+    if (rc != NULL) {
+        printf("TEST ERROR: pmNonLinearityPolynomial() returned a non-NULL psReadout\n");
+        testStatus = false;
+    }
+
+    printf("------------------------------------------------------------\n");
+    printf("Calling pmNonLinearityLookup() with NULL outFlux psVector.  Should generate error, return NULL.\n");
+    rc = pmNonLinearityLookup(myReadout, in, NULL);
+    if (rc != NULL) {
+        printf("TEST ERROR: pmNonLinearityPolynomial() returned a non-NULL psReadout\n");
+        testStatus = false;
+    }
+
+    test03Init(myReadout);
+    printf("------------------------------------------------------------\n");
+    printf("Calling pmNonLinearityLookup() with size difference in inFlux/outFLux psVectors.  Should generate warning.\n");
+    rc = pmNonLinearityLookup(myReadout, in, outBig);
+    if (rc == NULL) {
+        printf("TEST ERROR: pmNonLinearityPolynomial() returned a NULL psReadout\n");
+        testStatus = false;
+    }
+    for (i=0;i<NUM_ROWS;i++) {
+        for (j=0;j<NUM_COLS;j++) {
+            psF32 expect = (float) (2 * (i + j));
+            psF32 actual = rc->image->data.F32[i][j];
+            if (FLT_EPSILON < fabs(expect - actual)) {
+                printf("TEST ERROR: image[%d][%d] is %f, should be %f\n", i, j, actual, expect);
+                testStatus = false;
+            }
+        }
+    }
+
+
+    test03Init(myReadout);
+    printf("------------------------------------------------------------\n");
+    printf("Calling pmNonLinearityLookup() with size difference in inFlux/outFLux psVectors.  Should generate warning.\n");
+    rc = pmNonLinearityLookup(myReadout, in, outSmall);
+    if (rc == NULL) {
+        printf("TEST ERROR: pmNonLinearityPolynomial() returned a NULL psReadout\n");
+        testStatus = false;
+    }
+
+    test03Init(myReadout);
+    printf("------------------------------------------------------------\n");
+    printf("Calling pmNonLinearityLookup() with size difference in inFlux/outFLux psVectors.  Should generate warning.\n");
+    rc = pmNonLinearityLookup(myReadout, inSmall, out);
+    if (rc == NULL) {
+        printf("TEST ERROR: pmNonLinearityPolynomial() returned a NULL psReadout\n");
+        testStatus = false;
+    }
+
+    test03Init(myReadout);
+    printf("------------------------------------------------------------\n");
+    printf("Calling pmNonLinearityLookup() with size difference in inFlux/outFLux psVectors.  Should generate warning.\n");
+    rc = pmNonLinearityLookup(myReadout, inBig, out);
+    if (rc == NULL) {
+        printf("TEST ERROR: pmNonLinearityPolynomial() returned a NULL psReadout\n");
+        testStatus = false;
+    }
+
+    test03Init(myReadout);
+    printf("------------------------------------------------------------\n");
+    printf("Calling pmNonLinearityLookup() with size difference in inFlux/outFLux psVectors.  Should generate warning.\n");
+    rc = pmNonLinearityLookup(myReadout, inSmall, outBig);
+    if (rc == NULL) {
+        printf("TEST ERROR: pmNonLinearityPolynomial() returned a NULL psReadout\n");
+        testStatus = false;
+    }
+
+    test03Init(myReadout);
+    printf("------------------------------------------------------------\n");
+    printf("Calling pmNonLinearityLookup() with size difference in inFlux/outFLux psVectors.  Should generate warning.\n");
+    rc = pmNonLinearityLookup(myReadout, inBig, outSmall);
+    if (rc == NULL) {
+        printf("TEST ERROR: pmNonLinearityPolynomial() returned a NULL psReadout\n");
+        testStatus = false;
+    }
+
+    test03Init(myReadout);
+    printf("------------------------------------------------------------\n");
+    printf("Calling pmNonLinearityLookup() with inFlux psVector size 1.  Should generate error, return original psReadout.\n");
+    rc = pmNonLinearityLookup(myReadout, inOne, out);
+    if (rc != myReadout) {
+        printf("TEST ERROR: pmNonLinearityPolynomial() did not return the original psReadout\n");
+        testStatus = false;
+    }
+
+    printf("------------------------------------------------------------\n");
+    printf("Calling pmNonLinearityLookup() with one pixels outside inFlux range.  Should generate warnings.\n");
+    test03Init(myReadout);
+    myReadout->image->data.F32[0][0] = -1;
+    rc = pmNonLinearityLookup(myReadout, in, out);
+    if (rc == NULL) {
+        printf("TEST ERROR: pmNonLinearityPolynomial() returned a NULL psReadout\n");
+        testStatus = false;
+    }
+
+
+    psFree(myReadout);
+    psFree(in);
+    psFree(inOne);
+    psFree(inSmall);
+    psFree(inBig);
+    psFree(out);
+    psFree(outOne);
+    psFree(outSmall);
+    psFree(outBig);
+
+    return(testStatus);
+}

trunk/psModules/test/tst_pmReadoutCombine.c

@@ -5 +5 @@
  *  @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 +44 @@
         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 +261 @@
 
         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 +275 @@
     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 +283 @@
     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 +300 @@
         rc = NULL;
     } else {
-        printf("ERROR: pmReadoutCombine() returned NULL\n");
+        printf("TEST ERROR: pmReadoutCombine() returned NULL\n");
         testStatus = false;
     }
@@ -316 +316 @@
 
         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 +330 @@
     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 +338 @@
     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 +355 @@
         rc = NULL;
     } else {
-        printf("ERROR: pmReadoutCombine() returned NULL\n");
+        printf("TEST ERROR: pmReadoutCombine() returned NULL\n");
         testStatus = false;
     }
@@ -364 +364 @@
     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 +377 @@
     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 +387 @@
     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 +395 @@
     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 +404 @@
     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 +412 @@
     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;
     }

trunk/psModules/test/tst_pmSubtractBias.c

@@ -13 +13 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.12 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-12-30 21:35:04 $
+ *  @version $Revision: 1.13 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-01-05 23:25:25 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -82 +82 @@
             actual = myReadout->image->data.F32[i][j];
             if (FLT_EPSILON < fabs(expect - actual)) {
-                printf("ERROR: image[%d][%d] is %f, should be %f\n", i, j, actual, expect);
+                printf("TEST ERROR: image[%d][%d] is %f, should be %f\n", i, j, actual, expect);
                 testStatus = 1;
             }
@@ -150 +150 @@
             actual = myReadout->image->data.F32[i][j];
             if (FLT_EPSILON < fabs(expect - actual)) {
-                printf("ERROR: image[%d][%d] is %f, should be %f\n", i, j, actual, expect);
+                printf("TEST ERROR: image[%d][%d] is %f, should be %f\n", i, j, actual, expect);
                 testStatus = 1;
             }
@@ -223 +223 @@
             actual = myReadout->image->data.F32[i][j];
             if (FLT_EPSILON < fabs(expect - actual)) {
-                printf("ERROR: image[%d][%d] is %f, should be %f\n", i, j, actual, expect);
+                printf("TEST ERROR: image[%d][%d] is %f, should be %f\n", i, j, actual, expect);
                 testStatus = 1;
             }
@@ -285 +285 @@
             actual = myReadout->image->data.F32[i][j];
             if (FLT_EPSILON < fabs(expect - actual)) {
-                printf("ERROR: image[%d][%d] is %f, should be %f\n", i, j, actual, expect);
+                printf("TEST ERROR: image[%d][%d] is %f, should be %f\n", i, j, actual, expect);
                 testStatus = 1;
             }
@@ -351 +351 @@
             actual = myReadout->image->data.F32[i][j];
             if (FLT_EPSILON < fabs(expect - actual)) {
-                printf("ERROR: image[%d][%d] is %f, should be %f\n", i, j, actual, expect);
+                printf("TEST ERROR: image[%d][%d] is %f, should be %f\n", i, j, actual, expect);
                 testStatus = 1;
             }
@@ -431 +431 @@
             actual = myReadout->image->data.F32[i][j];
             if (FLT_EPSILON < fabs(expect - actual)) {
-                printf("ERROR: image[%d][%d] is %f, should be %f\n", i, j, actual, expect);
+                printf("TEST ERROR: image[%d][%d] is %f, should be %f\n", i, j, actual, expect);
                 testStatus = 1;
             }
@@ -505 +505 @@
             actual = myReadout->image->data.F32[i][j];
             if (FLT_EPSILON < fabs(expect - actual)) {
-                printf("ERROR: image[%d][%d] is %f, should be %f\n", i, j, actual, expect);
+                printf("TEST ERROR: image[%d][%d] is %f, should be %f\n", i, j, actual, expect);
                 testStatus = 1;
             }
@@ -614 +614 @@
     rc = pmSubtractBias(myReadout, NULL, NULL, PM_OVERSCAN_ALL, stat, 0, PM_FIT_NONE, NULL);
     if (rc != myReadout) {
-        printf("ERROR: pmSubtractBias() did not return input psReadout.\n");
+        printf("TEST ERROR: pmSubtractBias() did not return input psReadout.\n");
         testStatus = false;
     }
@@ -622 +622 @@
     rc = pmSubtractBias(myReadout, NULL, NULL, PM_OVERSCAN_ROWS, stat, 0, PM_FIT_NONE, NULL);
     if (rc != myReadout) {
-        printf("ERROR: pmSubtractBias() did not return input psReadout.\n");
+        printf("TEST ERROR: pmSubtractBias() did not return input psReadout.\n");
         testStatus = false;
         psFree(rc);
@@ -631 +631 @@
     rc = pmSubtractBias(myReadout, NULL, NULL, PM_OVERSCAN_COLUMNS, stat, 0, PM_FIT_NONE, NULL);
     if (rc != myReadout) {
-        printf("ERROR: pmSubtractBias() did not return input psReadout.\n");
+        printf("TEST ERROR: pmSubtractBias() did not return input psReadout.\n");
         testStatus = false;
         psFree(rc);
@@ -645 +645 @@
             psF32 actual = rc->image->data.F32[i][j];
             if (FLT_EPSILON < fabs(expect - actual)) {
-                printf("ERROR: image[%d][%d] is %f, should be %f\n", i, j, actual, expect);
+                printf("TEST ERROR: image[%d][%d] is %f, should be %f\n", i, j, actual, expect);
                 testStatus = 1;
             }
@@ -664 +664 @@
             psF32 actual = rc->image->data.F32[i][j];
             if (FLT_EPSILON < fabs(expect - actual)) {
-                printf("ERROR: image[%d][%d] is %f, should be %f\n", i, j, actual, expect);
+                printf("TEST ERROR: image[%d][%d] is %f, should be %f\n", i, j, actual, expect);
                 testStatus = 1;
             }
@@ -681 +681 @@
             psF32 actual = rc->image->data.F32[i][j];
             if (FLT_EPSILON < fabs(expect - actual)) {
-                printf("ERROR: image[%d][%d] is %f, should be %f\n", i, j, actual, expect);
+                printf("TEST ERROR: image[%d][%d] is %f, should be %f\n", i, j, actual, expect);
                 testStatus = 1;
             }
@@ -695 +695 @@
     rc = pmSubtractBias(myReadout, NULL, NULL, PM_OVERSCAN_NONE, stat, 0, PM_FIT_SPLINE, myBias);
     if (rc != myReadout) {
-        printf("ERROR: pmSubtractBias() did not return input psReadout.\n");
+        printf("TEST ERROR: pmSubtractBias() did not return input psReadout.\n");
         testStatus = false;
         psFree(rc);
@@ -705 +705 @@
             psF32 actual = rc->image->data.F32[i][j];
             if (FLT_EPSILON < fabs(expect - actual)) {
-                printf("ERROR: image[%d][%d] is %f, should be %f\n", i, j, actual, expect);
+                printf("TEST ERROR: image[%d][%d] is %f, should be %f\n", i, j, actual, expect);
                 testStatus = 1;
             }
@@ -725 +725 @@
             psF32 actual = rc->image->data.F32[i][j];
             if (FLT_EPSILON < fabs(expect - actual)) {
-                printf("ERROR: image[%d][%d] is %f, should be %f\n", i, j, actual, expect);
+                printf("TEST ERROR: image[%d][%d] is %f, should be %f\n", i, j, actual, expect);
                 testStatus = 1;
             }
@@ -742 +742 @@
                 psF32 actual = rc->image->data.F32[i][j];
                 if (FLT_EPSILON < fabs(expect - actual)) {
-                    printf("ERROR: image[%d][%d] is %f, should be %f\n", i, j, actual, expect);
+                    printf("TEST ERROR: image[%d][%d] is %f, should be %f\n", i, j, actual, expect);
                     testStatus = 1;
                 }
@@ -759 +759 @@
                 psF32 actual = rc->image->data.F32[i][j];
                 if (FLT_EPSILON < fabs(expect - actual)) {
-                    printf("ERROR: image[%d][%d] is %f, should be %f\n", i, j, actual, expect);
+                    printf("TEST ERROR: image[%d][%d] is %f, should be %f\n", i, j, actual, expect);
                     testStatus = 1;
                 }
@@ -771 +771 @@
                                0, PM_FIT_NONE, myBiasShortRows);
     if (rc != myReadout) {
-        printf("ERROR: pmSubtractBias() did not return input psReadout.\n");
+        printf("TEST ERROR: pmSubtractBias() did not return input psReadout.\n");
         testStatus = false;
         psFree(rc);
@@ -782 +782 @@
                                0, PM_FIT_NONE, myBiasShortCols);
     if (rc != myReadout) {
-        printf("ERROR: pmSubtractBias() did not return input psReadout.\n");
+        printf("TEST ERROR: pmSubtractBias() did not return input psReadout.\n");
         testStatus = false;
         psFree(rc);
@@ -792 +792 @@
                                0, 54321, NULL);
     if (rc != myReadout) {
-        printf("ERROR: pmSubtractBias() did not return input psReadout.\n");
+        printf("TEST ERROR: pmSubtractBias() did not return input psReadout.\n");
         testStatus = false;
         psFree(rc);
@@ -802 +802 @@
                                0, PM_FIT_NONE, NULL);
     if (rc != myReadout) {
-        printf("ERROR: pmSubtractBias() did not return input psReadout.\n");
+        printf("TEST ERROR: pmSubtractBias() did not return input psReadout.\n");
         testStatus = false;
         psFree(rc);
@@ -813 +813 @@
                 psF32 actual = rc->image->data.F32[i][j];
                 if (FLT_EPSILON < fabs(expect - actual)) {
-                    printf("ERROR: image[%d][%d] is %f, should be %f\n", i, j, actual, expect);
+                    printf("TEST ERROR: image[%d][%d] is %f, should be %f\n", i, j, actual, expect);
                     testStatus = 1;
                 }
@@ -921 +921 @@
             actual = myReadout->image->data.F32[i][j];
             if (FLT_EPSILON < fabs(expect - actual)) {
-                printf("ERROR: image[%d][%d] is %f, should be %f\n", i, j, actual, expect);
+                printf("TEST ERROR: image[%d][%d] is %f, should be %f\n", i, j, actual, expect);
                 testStatus = 1;
             }

trunk/psModules/test/tst_pmSubtractSky.c

@@ -7 +7 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.6 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-12-30 21:35:04 $
+ *  @version $Revision: 1.7 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-01-05 23:25:25 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -65 +65 @@
         for (j=0;j<numCols;j++) {
             if (ERROR_TOLERANCE < fabs(myReadout->image->data.F32[i][j])) {
-                printf("ERROR: image[%d][%d] is %f, should be 0.0\n", i, j, myReadout->image->data.F32[i][j]);
+                printf("TEST ERROR: image[%d][%d] is %f, should be 0.0\n", i, j, myReadout->image->data.F32[i][j]);
                 testStatus = 1;
             }
@@ -113 +113 @@
         for (j=0;j<numCols;j++) {
             if (errorTolerance < fabs(myReadout->image->data.F32[i][j] - trueImage->data.F32[i][j])) {
-                printf("ERROR: image[%d][%d] is %f, should be %f\n", i, j,
+                printf("TEST ERROR: image[%d][%d] is %f, should be %f\n", i, j,
                        myReadout->image->data.F32[i][j], trueImage->data.F32[i][j]);
                 testStatus = 1;
@@ -201 +201 @@
     rc = pmSubtractSky(NULL, (void *) myPoly, PM_FIT_POLYNOMIAL, 1, myStats, 2.0);
     if (rc != NULL) {
-        printf("ERROR: pmSubtractSky() returned a non-NULL psReadout\n");
+        printf("TEST ERROR: pmSubtractSky() returned a non-NULL psReadout\n");
         testStatus = false;
     }
@@ -210 +210 @@
     rc = pmSubtractSky(myReadout, (void *) myPoly, PM_FIT_POLYNOMIAL, 1, myStats, 2.0);
     if (rc != NULL) {
-        printf("ERROR: pmSubtractSky() returned a non-NULL psReadout\n");
+        printf("TEST ERROR: pmSubtractSky() returned a non-NULL psReadout\n");
         testStatus = false;
     }
@@ -220 +220 @@
     rc = pmSubtractSky(myReadout, (void *) myPoly, PM_FIT_POLYNOMIAL, 1, myStats, 2.0);
     if (rc != NULL) {
-        printf("ERROR: pmSubtractSky() returned a non-NULL psReadout\n");
-        testStatus = false;
-    }
-    myReadout->image = tmpImageF32;
-
-    printf("----------------------------------------------------------------\n");
-    printf("Calling pmSubtractSky() with NULL fitSpec.  Should return image, no ERROR, no WARNING.\n\n");
+        printf("TEST ERROR: pmSubtractSky() returned a non-NULL psReadout\n");
+        testStatus = false;
+    }
+    myReadout->image = tmpImageF32;
+
+    printf("----------------------------------------------------------------\n");
+    printf("Calling pmSubtractSky() with NULL fitSpec.  Should return image, no TEST ERROR, no WARNING.\n\n");
     rc = pmSubtractSky(myReadout, NULL, PM_FIT_POLYNOMIAL, 1, myStats, 2.0);
     if (rc != myReadout) {
-        printf("ERROR: pmSubtractSky() returned something other than psReadout\n");
-        testStatus = false;
-    }
-
-    printf("----------------------------------------------------------------\n");
-    printf("Calling pmSubtractSky() with PM_FIT_NONE fit.  Should return image, no ERROR, no WARNING.\n\n");
+        printf("TEST ERROR: pmSubtractSky() returned something other than psReadout\n");
+        testStatus = false;
+    }
+
+    printf("----------------------------------------------------------------\n");
+    printf("Calling pmSubtractSky() with PM_FIT_NONE fit.  Should return image, no TEST ERROR, no WARNING.\n\n");
     rc = pmSubtractSky(myReadout, (void *) myPoly, PM_FIT_NONE, 1, myStats, 2.0);
     if (rc != myReadout) {
-        printf("ERROR: pmSubtractSky() returned something other than psReadout\n");
-        testStatus = false;
-    }
-
-    printf("----------------------------------------------------------------\n");
-    printf("Calling pmSubtractSky() with PM_FIT_SPLINE fit.  Should return image, no ERROR, no WARNING.\n\n");
+        printf("TEST ERROR: pmSubtractSky() returned something other than psReadout\n");
+        testStatus = false;
+    }
+
+    printf("----------------------------------------------------------------\n");
+    printf("Calling pmSubtractSky() with PM_FIT_SPLINE fit.  Should return image, no TEST ERROR, no WARNING.\n\n");
     rc = pmSubtractSky(myReadout, (void *) myPoly, PM_FIT_SPLINE, 1, myStats, 2.0);
     if (rc != myReadout) {
-        printf("ERROR: pmSubtractSky() returned something other than psReadout\n");
+        printf("TEST ERROR: pmSubtractSky() returned something other than psReadout\n");
         testStatus = false;
     }
@@ -255 +255 @@
         for (j=0;j<NUM_COLS_SMALL;j++) {
             if (ERROR_TOLERANCE < fabs(rc->image->data.F32[i][j])) {
-                printf("ERROR: image[%d][%d] is %f, should be 0.0\n", i, j,
+                printf("TEST ERROR: image[%d][%d] is %f, should be 0.0\n", i, j,
                        rc->image->data.F32[i][j]);
                 testStatus = false;
@@ -270 +270 @@
         for (j=0;j<NUM_COLS_SMALL;j++) {
             if (ERROR_TOLERANCE < fabs(rc->image->data.F32[i][j])) {
-                printf("ERROR: image[%d][%d] is %f, should be 0.0\n", i, j,
+                printf("TEST ERROR: image[%d][%d] is %f, should be 0.0\n", i, j,
                        rc->image->data.F32[i][j]);
                 testStatus = false;
@@ -286 +286 @@
         for (j=0;j<NUM_COLS_SMALL;j++) {
             if (ERROR_TOLERANCE < fabs(rc->image->data.F32[i][j])) {
-                printf("ERROR: image[%d][%d] is %f, should be 0.0\n", i, j,
+                printf("TEST ERROR: image[%d][%d] is %f, should be 0.0\n", i, j,
                        rc->image->data.F32[i][j]);
                 testStatus = false;
@@ -300 +300 @@
         for (j=0;j<NUM_COLS_SMALL;j++) {
             if (ERROR_TOLERANCE < fabs(rc->image->data.F32[i][j])) {
-                printf("ERROR: image[%d][%d] is %f, should be 0.0\n", i, j,
+                printf("TEST ERROR: image[%d][%d] is %f, should be 0.0\n", i, j,
                        rc->image->data.F32[i][j]);
                 testStatus = false;
@@ -313 +313 @@
         for (j=0;j<NUM_COLS_SMALL;j++) {
             if (ERROR_TOLERANCE < fabs(rc->image->data.F32[i][j])) {
-                printf("ERROR: image[%d][%d] is %f, should be 0.0\n", i, j,
+                printf("TEST ERROR: image[%d][%d] is %f, should be 0.0\n", i, j,
                        rc->image->data.F32[i][j]);
                 testStatus = false;
@@ -326 +326 @@
         for (j=0;j<NUM_COLS_SMALL;j++) {
             if (ERROR_TOLERANCE < fabs(rc->image->data.F32[i][j])) {
-                printf("ERROR: image[%d][%d] is %f, should be 0.0\n", i, j,
+                printf("TEST ERROR: image[%d][%d] is %f, should be 0.0\n", i, j,
                        rc->image->data.F32[i][j]);
                 testStatus = false;
@@ -337 +337 @@
     rc = pmSubtractSky(myReadout, (void *) myPoly, 54321, 1, myStats, -1.0);
     if (rc != myReadout) {
-        printf("ERROR: pmSubtractSky() returned something other than psReadout\n");
+        printf("TEST ERROR: pmSubtractSky() returned something other than psReadout\n");
         testStatus = false;
     }