Index: trunk/psModules/test/tst_pmNonLinear.c
===================================================================
--- trunk/psModules/test/tst_pmNonLinear.c	(revision 2961)
+++ trunk/psModules/test/tst_pmNonLinear.c	(revision 4770)
@@ -16,6 +16,6 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.14 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-01-11 23:39:41 $
+ *  @version $Revision: 1.15 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-08-16 01:10:36 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -40,4 +40,5 @@
 int main(int argc, char* argv[])
 {
+    psLogSetFormat("HLNM");
     return !runTestSuite(stderr, "Test Point Driver", tests, argc, argv);
 }
@@ -53,5 +54,5 @@
     int testStatus = true;
     psImage *myImage = psImageAlloc(numCols, numRows, PS_TYPE_F32);
-    psReadout *myReadout = psReadoutAlloc();
+    pmReadout *myReadout = pmReadoutAlloc(NULL);
     myReadout->image = myImage;
     psPolynomial1D *myPoly = psPolynomial1DAlloc(2, PS_POLYNOMIAL_ORD);
@@ -106,5 +107,5 @@
     int tableSize = PS_MAX(numCols, numRows)*2;
     psImage *myImage = psImageAlloc(numCols, numRows, PS_TYPE_F32);
-    psReadout *myReadout = psReadoutAlloc();
+    pmReadout *myReadout = pmReadoutAlloc(NULL);
     myReadout->image = myImage;
     psVector *in = psVectorAlloc(tableSize, PS_TYPE_F32);
@@ -161,6 +162,6 @@
     int testStatus = true;
     psImage *myImage = psImageAlloc(NUM_COLS, NUM_ROWS, PS_TYPE_F32);
-    psReadout *myReadout = psReadoutAlloc();
-    psReadout *rc = NULL;
+    pmReadout *myReadout = pmReadoutAlloc(NULL);
+    pmReadout *rc = NULL;
     myReadout->image = myImage;
     psPolynomial1D *myPoly = psPolynomial1DAlloc(2, PS_POLYNOMIAL_ORD);
@@ -178,5 +179,5 @@
     rc = pmNonLinearityPolynomial(NULL, myPoly);
     if (rc != NULL) {
-        printf("TEST ERROR: pmNonLinearityPolynomial() returned a non-NULL psReadout\n");
+        printf("TEST ERROR: pmNonLinearityPolynomial() returned a non-NULL pmReadout\n");
         testStatus = false;
     }
@@ -188,5 +189,5 @@
     rc = pmNonLinearityPolynomial(myReadout, myPoly);
     if (rc != NULL) {
-        printf("TEST ERROR: pmNonLinearityPolynomial() returned a non-NULL psReadout\n");
+        printf("TEST ERROR: pmNonLinearityPolynomial() returned a non-NULL pmReadout\n");
         testStatus = false;
     }
@@ -197,5 +198,5 @@
     rc = pmNonLinearityPolynomial(myReadout, NULL);
     if (rc != NULL) {
-        printf("TEST ERROR: pmNonLinearityPolynomial() returned a non-NULL psReadout\n");
+        printf("TEST ERROR: pmNonLinearityPolynomial() returned a non-NULL pmReadout\n");
         testStatus = false;
     }
@@ -207,5 +208,5 @@
 
 
-int test03Init(psReadout *myReadout)
+int test03Init(pmReadout *myReadout)
 {
     for (psS32 i=0;i<NUM_ROWS;i++) {
@@ -224,6 +225,6 @@
     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;
+    pmReadout *myReadout = pmReadoutAlloc(NULL);
+    pmReadout *rc = NULL;
     myReadout->image = myImage;
     psVector *in = psVectorAlloc(tableSize, PS_TYPE_F32);
@@ -253,18 +254,18 @@
 
     printf("------------------------------------------------------------\n");
-    printf("Calling pmNonLinearityLookup() with NULL input psReadout.  Should generate error, return NULL.\n");
+    printf("Calling pmNonLinearityLookup() with NULL input pmReadout.  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");
+        printf("TEST ERROR: pmNonLinearityPolynomial() returned a non-NULL pmReadout\n");
+        testStatus = false;
+    }
+
+    printf("------------------------------------------------------------\n");
+    printf("Calling pmNonLinearityLookup() with NULL input pmReadout->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");
+        printf("TEST ERROR: pmNonLinearityPolynomial() returned a non-NULL pmReadout\n");
         testStatus = false;
     }
@@ -275,5 +276,5 @@
     rc = pmNonLinearityLookup(myReadout, NULL, out);
     if (rc != NULL) {
-        printf("TEST ERROR: pmNonLinearityPolynomial() returned a non-NULL psReadout\n");
+        printf("TEST ERROR: pmNonLinearityPolynomial() returned a non-NULL pmReadout\n");
         testStatus = false;
     }
@@ -283,5 +284,5 @@
     rc = pmNonLinearityLookup(myReadout, in, NULL);
     if (rc != NULL) {
-        printf("TEST ERROR: pmNonLinearityPolynomial() returned a non-NULL psReadout\n");
+        printf("TEST ERROR: pmNonLinearityPolynomial() returned a non-NULL pmReadout\n");
         testStatus = false;
     }
@@ -292,5 +293,5 @@
     rc = pmNonLinearityLookup(myReadout, in, outBig);
     if (rc == NULL) {
-        printf("TEST ERROR: pmNonLinearityPolynomial() returned a NULL psReadout\n");
+        printf("TEST ERROR: pmNonLinearityPolynomial() returned a NULL pmReadout\n");
         testStatus = false;
     }
@@ -312,5 +313,5 @@
     rc = pmNonLinearityLookup(myReadout, in, outSmall);
     if (rc == NULL) {
-        printf("TEST ERROR: pmNonLinearityPolynomial() returned a NULL psReadout\n");
+        printf("TEST ERROR: pmNonLinearityPolynomial() returned a NULL pmReadout\n");
         testStatus = false;
     }
@@ -331,5 +332,5 @@
     rc = pmNonLinearityLookup(myReadout, inSmall, out);
     if (rc == NULL) {
-        printf("TEST ERROR: pmNonLinearityPolynomial() returned a NULL psReadout\n");
+        printf("TEST ERROR: pmNonLinearityPolynomial() returned a NULL pmReadout\n");
         testStatus = false;
     }
@@ -350,5 +351,5 @@
     rc = pmNonLinearityLookup(myReadout, inBig, out);
     if (rc == NULL) {
-        printf("TEST ERROR: pmNonLinearityPolynomial() returned a NULL psReadout\n");
+        printf("TEST ERROR: pmNonLinearityPolynomial() returned a NULL pmReadout\n");
         testStatus = false;
     }
@@ -369,5 +370,5 @@
     rc = pmNonLinearityLookup(myReadout, inSmall, outBig);
     if (rc == NULL) {
-        printf("TEST ERROR: pmNonLinearityPolynomial() returned a NULL psReadout\n");
+        printf("TEST ERROR: pmNonLinearityPolynomial() returned a NULL pmReadout\n");
         testStatus = false;
     }
@@ -388,24 +389,24 @@
     rc = pmNonLinearityLookup(myReadout, inBig, outSmall);
     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 inFlux psVector size 1.  Should generate error, return original psReadout.\n");
+        printf("TEST ERROR: pmNonLinearityPolynomial() returned a NULL pmReadout\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 inFlux psVector size 1.  Should generate error, return original pmReadout.\n");
     rc = pmNonLinearityLookup(myReadout, inOne, out);
     if (rc != myReadout) {
-        printf("TEST ERROR: pmNonLinearityPolynomial() did not return the original psReadout\n");
+        printf("TEST ERROR: pmNonLinearityPolynomial() did not return the original pmReadout\n");
         testStatus = false;
     }
@@ -427,5 +428,5 @@
     rc = pmNonLinearityLookup(myReadout, in, out);
     if (rc == NULL) {
-        printf("TEST ERROR: pmNonLinearityPolynomial() returned a NULL psReadout\n");
+        printf("TEST ERROR: pmNonLinearityPolynomial() returned a NULL pmReadout\n");
         testStatus = false;
     }
@@ -453,5 +454,5 @@
     rc = pmNonLinearityLookup(myReadout, in, out);
     if (rc == NULL) {
-        printf("TEST ERROR: pmNonLinearityPolynomial() returned a NULL psReadout\n");
+        printf("TEST ERROR: pmNonLinearityPolynomial() returned a NULL pmReadout\n");
         testStatus = false;
     }
@@ -479,5 +480,5 @@
     rc = pmNonLinearityLookup(myReadout, in, out);
     if (rc == NULL) {
-        printf("TEST ERROR: pmNonLinearityPolynomial() returned a NULL psReadout\n");
+        printf("TEST ERROR: pmNonLinearityPolynomial() returned a NULL pmReadout\n");
         testStatus = false;
     }