Index: trunk/psModules/test/tst_pmFlatField.c
===================================================================
--- trunk/psModules/test/tst_pmFlatField.c	(revision 4579)
+++ trunk/psModules/test/tst_pmFlatField.c	(revision 4770)
@@ -16,8 +16,11 @@
  *    Test M - Attempt to use non-mask type mask image
  *
+ * XXX: Added a mask argument to pmFlatField().  Must add tests.  For now, all
+ * masks are NULL.
+ *
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.6 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-01-11 01:17:28 $
+ *  @version $Revision: 1.7 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-08-16 01:10:36 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -68,4 +71,5 @@
 int main(int argc, char* argv[])
 {
+    psLogSetFormat("HLNM");
     return !runTestSuite(stderr, "Test Point Driver", tests, argc, argv);
 }
@@ -77,12 +81,12 @@
     printPositiveTestHeader(stdout, "pmFlatField", "Test A - Divide input image by flat image");
     CREATE_AND_SET_IMAGE(inImage,F64,6.0,3,3)
-    psReadout *inReadout = psReadoutAlloc();
+    pmReadout *inReadout = pmReadoutAlloc(NULL);
     inReadout->image = inImage;
     PRINT_MATRIX(inImage,F64,"Input image:");
     CREATE_AND_SET_IMAGE(flatImage1,F64,2.0,3,3)
-    psReadout *flatReadout = psReadoutAlloc();
+    pmReadout *flatReadout = pmReadoutAlloc(NULL);
     flatReadout->image = flatImage1;
     PRINT_MATRIX(flatImage1,F64,"Flat image:");
-    if ( !pmFlatField(inReadout, flatReadout) ) {
+    if ( !pmFlatField(inReadout, NULL, flatReadout) ) {
         psError(PS_ERR_UNKNOWN,true,"Test A - Returned false should be true");
         return 1;
@@ -99,5 +103,5 @@
     PRINT_MATRIX(flatImage2, F64, "Flat image:");
     flatReadout->image = flatImage2;
-    if ( !pmFlatField(inReadout, flatReadout) ) {
+    if ( !pmFlatField(inReadout, NULL, flatReadout) ) {
         psError(PS_ERR_UNKNOWN,true,"Test B - Returned false should be true");
         return 2;
@@ -118,5 +122,5 @@
     psFree(inReadout->mask);
     inReadout->mask = mask1;
-    if ( !pmFlatField(inReadout, flatReadout) ) {
+    if ( !pmFlatField(inReadout, NULL, flatReadout) ) {
         psError(PS_ERR_UNKNOWN,true,"Test C - Returned false should be true");
         return 3;
@@ -132,5 +136,5 @@
     printNegativeTestHeader(stdout,"pmFlatField", "Test D - Attempt to use null flat readout",
                             "Null not allowed for flat readout", 0);
-    if( pmFlatField(inReadout, NULL) ) {
+    if( pmFlatField(inReadout, NULL, NULL) ) {
         psError(PS_ERR_UNKNOWN,true,"Test D - Returned true should be false");
         return 4;
@@ -145,5 +149,5 @@
     psImage *temp = inReadout->image;
     inReadout->image = NULL;
-    if ( pmFlatField(inReadout, flatReadout) ) {
+    if ( pmFlatField(inReadout, NULL, flatReadout) ) {
         psError(PS_ERR_UNKNOWN,true,"Test E - Returned true should be false" );
         return 5;
@@ -159,5 +163,5 @@
     temp = flatReadout->image;
     flatReadout->image = NULL;
-    if ( pmFlatField(inReadout, flatReadout) ) {
+    if ( pmFlatField(inReadout, NULL, flatReadout) ) {
         psError(PS_ERR_UNKNOWN,true,"Test F - Returned true should be false" );
         return 6;
@@ -174,5 +178,5 @@
     temp = flatReadout->image;
     flatReadout->image = smallFlat;
-    if ( pmFlatField(inReadout, flatReadout) ) {
+    if ( pmFlatField(inReadout, NULL, flatReadout) ) {
         psError(PS_ERR_UNKNOWN,true,"Test G - Returned true should be false");
         return 7;
@@ -189,5 +193,5 @@
     temp = inReadout->mask;
     inReadout->mask = largeMask;
-    if ( pmFlatField(inReadout, flatReadout) ) {
+    if ( pmFlatField(inReadout, NULL, flatReadout) ) {
         psError(PS_ERR_UNKNOWN,true,"Test H - Returned true should be false");
         return 8;
@@ -203,5 +207,5 @@
     *(int*)&inReadout->col0 = 50;
     *(int*)&inReadout->row0 = 50;
-    if ( pmFlatField(inReadout, flatReadout) ) {
+    if ( pmFlatField(inReadout, NULL, flatReadout) ) {
         psError(PS_ERR_UNKNOWN,true,"Test I - Returned true should be false");
         return 9;
@@ -217,5 +221,5 @@
                             "Complex types not allowed for input image", 0);
     *(psElemType* ) & inReadout->image->type.type = PS_TYPE_C64;
-    if ( pmFlatField(inReadout, flatReadout) ) {
+    if ( pmFlatField(inReadout, NULL, flatReadout) ) {
         psError(PS_ERR_UNKNOWN,true,"Test J - Returned true should be false");
         return 10;
@@ -230,5 +234,5 @@
                             "Complex types not allowed for flat image", 0);
     *(psElemType* ) & flatReadout->image->type.type = PS_TYPE_C64;
-    if ( pmFlatField(inReadout, flatReadout) ) {
+    if ( pmFlatField(inReadout, NULL, flatReadout) ) {
         psError(PS_ERR_UNKNOWN,true,"Test K - Returned ture should be false");
         return 11;
@@ -243,5 +247,5 @@
                             "Input and flat image types differ", 0);
     *(psElemType* ) & flatReadout->image->type.type = PS_TYPE_F32;
-    if ( pmFlatField(inReadout, flatReadout) ) {
+    if ( pmFlatField(inReadout, NULL, flatReadout) ) {
         psError(PS_ERR_UNKNOWN,true,"Test L - Returned true should be false");
         return 12;
@@ -256,5 +260,5 @@
                             "Mask must be PS_TYPE_MASK type", 0);
     *(psElemType* ) & inReadout->mask->type.type = PS_TYPE_F32;
-    if ( pmFlatField(inReadout, flatReadout) ) {
+    if ( pmFlatField(inReadout, NULL, flatReadout) ) {
         psError(PS_ERR_UNKNOWN,true,"Test M - Returned true should be false");
         return 13;
Index: trunk/psModules/test/tst_pmImageCombine.c
===================================================================
--- trunk/psModules/test/tst_pmImageCombine.c	(revision 4579)
+++ trunk/psModules/test/tst_pmImageCombine.c	(revision 4770)
@@ -9,6 +9,6 @@
  *  XXX: Must verify the results internally.  Don't use stdout file.
  *
- *  @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-07-19 01:44:48 $
+ *  @version $Revision: 1.4 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-08-16 01:10:36 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -25,4 +25,5 @@
 int main(int argc, char* argv[])
 {
+    psLogSetFormat("HLNM");
     return !runTestSuite(stderr, "Test Point Driver", tests, argc, argv);
 }
Index: trunk/psModules/test/tst_pmMaskBadPixels.c
===================================================================
--- trunk/psModules/test/tst_pmMaskBadPixels.c	(revision 4579)
+++ trunk/psModules/test/tst_pmMaskBadPixels.c	(revision 4770)
@@ -17,6 +17,6 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.4 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-01-11 01:30:16 $
+ *  @version $Revision: 1.5 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-08-16 01:10:36 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -87,4 +87,5 @@
 int main(int argc, char* argv[])
 {
+    psLogSetFormat("HLNM");
     return !runTestSuite(stderr, "Test Point Driver", tests, argc, argv);
 }
@@ -96,6 +97,6 @@
     CREATE_AND_SET_IMAGE(inImage1,F64,0,50,50);
     CREATE_AND_SET_IMAGE(mask1,U8,0,50,50)
-    //    psReadout *inReadout = psReadoutAlloc(0, 0, inImage1);
-    psReadout *inReadout = psReadoutAlloc();
+    //    pmReadout *inReadout = pmReadoutAlloc(0, 0, inImage1);
+    pmReadout *inReadout = pmReadoutAlloc(NULL);
     inReadout->image = inImage1;
     mask1->data.PS_TYPE_MASK_DATA[24][24]=1;
@@ -114,6 +115,6 @@
     CREATE_AND_SET_IMAGE(inImage2,F64,150.0,50,50);
     CREATE_AND_SET_IMAGE(mask2,U8,0,50,50)
-    //    psReadout *inReadout2 = psReadoutAlloc(0, 0, inImage2);
-    psReadout *inReadout2 = psReadoutAlloc();
+    //    pmReadout *inReadout2 = pmReadoutAlloc(0, 0, inImage2);
+    pmReadout *inReadout2 = pmReadoutAlloc(NULL);
     inReadout2->image = inImage2;
     PRINT_MATRIX(mask2, U8, "Data mask:");
@@ -131,6 +132,6 @@
     CREATE_AND_SET_IMAGE(inImage3,F64,50.0,50,50);
     CREATE_AND_SET_IMAGE(mask3,U8,0,50,50)
-    //    psReadout *inReadout3 = psReadoutAlloc(0, 0, inImage3);
-    psReadout *inReadout3 = psReadoutAlloc();
+    //    pmReadout *inReadout3 = pmReadoutAlloc(0, 0, inImage3);
+    pmReadout *inReadout3 = pmReadoutAlloc(NULL);
     inReadout3->image = inImage3;
     mask3->data.PS_TYPE_MASK_DATA[24][24]=1;
@@ -152,6 +153,6 @@
     CREATE_AND_SET_IMAGE(mask4,U8,0,50,50)
     CREATE_AND_SET_IMAGE(mask4i,U8,0,50,50)
-    //    psReadout *inReadout4 = psReadoutAlloc(0, 0, inImage4);
-    psReadout *inReadout4 = psReadoutAlloc();
+    //    pmReadout *inReadout4 = pmReadoutAlloc(0, 0, inImage4);
+    pmReadout *inReadout4 = pmReadoutAlloc(NULL);
     inReadout4->image = inImage4;
     inReadout4->mask = mask4i;
@@ -170,6 +171,6 @@
     // Test E - Attempt to use null mask
     CREATE_AND_SET_IMAGE(inImage5,F64,50.0,50,50);
-    //    psReadout *inReadout5 = psReadoutAlloc(0, 0, inImage5);
-    psReadout *inReadout5 = psReadoutAlloc();
+    //    pmReadout *inReadout5 = pmReadoutAlloc(0, 0, inImage5);
+    pmReadout *inReadout5 = pmReadoutAlloc(NULL);
     inReadout5->image = inImage5;
     pmMaskBadPixels(inReadout5, NULL, 0, 100.0, 1, 10);
@@ -183,6 +184,6 @@
     // Test F - Attempt tp use null input image
     CREATE_AND_SET_IMAGE(mask6,U8,0,50,50)
-    //    psReadout *inReadout6 = psReadoutAlloc(0, 0, NULL);
-    psReadout *inReadout6 = psReadoutAlloc();
+    //    pmReadout *inReadout6 = pmReadoutAlloc(0, 0, NULL);
+    pmReadout *inReadout6 = pmReadoutAlloc(NULL);
     inReadout6->mask = mask6;
     pmMaskBadPixels(inReadout6, mask6, 0, 100.0, 1, 10);
@@ -198,6 +199,6 @@
     CREATE_AND_SET_IMAGE(mask7,U8,0,50,50)
     CREATE_AND_SET_IMAGE(mask7i,U8,0,50,50)
-    //    psReadout *inReadout7 = psReadoutAlloc(0, 0, inImage7);
-    psReadout *inReadout7 = psReadoutAlloc();
+    //    pmReadout *inReadout7 = pmReadoutAlloc(0, 0, inImage7);
+    pmReadout *inReadout7 = pmReadoutAlloc(NULL);
     inReadout7->image = inImage7;
     inReadout7->mask = mask7i;
@@ -215,6 +216,6 @@
     CREATE_AND_SET_IMAGE(mask8,U8,0,50,50)
     CREATE_AND_SET_IMAGE(mask8i,U8,0,60,60)
-    //    psReadout *inReadout8 = psReadoutAlloc(0, 0, inImage8);
-    psReadout *inReadout8 = psReadoutAlloc();
+    //    pmReadout *inReadout8 = pmReadoutAlloc(0, 0, inImage8);
+    pmReadout *inReadout8 = pmReadoutAlloc(NULL);
     inReadout8->image = inImage8;
     inReadout8->mask = mask8i;
@@ -232,6 +233,6 @@
     CREATE_AND_SET_IMAGE(mask9,U8,0,50,50)
     CREATE_AND_SET_IMAGE(mask9i,U8,0,50,50)
-    //    psReadout *inReadout9 = psReadoutAlloc(0, 0, inImage9);
-    psReadout *inReadout9 = psReadoutAlloc();
+    //    pmReadout *inReadout9 = pmReadoutAlloc(0, 0, inImage9);
+    pmReadout *inReadout9 = pmReadoutAlloc(NULL);
     inReadout9->image = inImage9;
     inReadout9->mask = mask9i;
@@ -251,6 +252,6 @@
     CREATE_AND_SET_IMAGE(mask10,U8,0,50,50)
     CREATE_AND_SET_IMAGE(mask10i,U8,0,50,50)
-    //    psReadout *inReadout10 = psReadoutAlloc(0, 0, inImage10);
-    psReadout *inReadout10 = psReadoutAlloc();
+    //    pmReadout *inReadout10 = pmReadoutAlloc(0, 0, inImage10);
+    pmReadout *inReadout10 = pmReadoutAlloc(NULL);
     inReadout10->image = inImage10;
     inReadout10->mask = mask10i;
@@ -268,6 +269,6 @@
     CREATE_AND_SET_IMAGE(mask11,F64,0,50,50)
     CREATE_AND_SET_IMAGE(mask11i,U8,0,50,50)
-    //    psReadout *inReadout11 = psReadoutAlloc(0, 0, inImage11);
-    psReadout *inReadout11 = psReadoutAlloc();
+    //    pmReadout *inReadout11 = pmReadoutAlloc(0, 0, inImage11);
+    pmReadout *inReadout11 = pmReadoutAlloc(NULL);
     inReadout11->image = inImage11;
     inReadout11->mask = mask11i;
Index: trunk/psModules/test/tst_pmNonLinear.c
===================================================================
--- trunk/psModules/test/tst_pmNonLinear.c	(revision 4579)
+++ 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;
     }
Index: trunk/psModules/test/tst_pmObjects01.c
===================================================================
--- trunk/psModules/test/tst_pmObjects01.c	(revision 4579)
+++ trunk/psModules/test/tst_pmObjects01.c	(revision 4770)
@@ -19,6 +19,6 @@
  * abd never deallocate, no error is generated.
  *
- *  @version $Revision: 1.14 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-07-19 01:44:48 $
+ *  @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
@@ -63,6 +63,6 @@
 int main(int argc, char* argv[])
 {
+    psLogSetFormat("HLNM");
     return !runTestSuite(stderr, "Test Point Driver", tests, argc, argv);
-    //    test02();
 }
 
@@ -76,23 +76,23 @@
 
     printf("Testing pmPeakAlloc()...\n");
-    psPeak *tmpPeak = pmPeakAlloc(1, 2, 3.0, PM_PEAK_LONE);
+    pmPeak *tmpPeak = pmPeakAlloc(1, 2, 3.0, PM_PEAK_LONE);
     if (tmpPeak == NULL) {
-        printf("TEST ERROR: pmPeakAlloc() returned a NULL psPeak\n");
+        printf("TEST ERROR: pmPeakAlloc() returned a NULL pmPeak\n");
         testStatus = false;
     } else {
         if (tmpPeak->x != 1) {
-            printf("TEST ERROR: pmPeakAlloc() improperly set psPeak->x\n");
+            printf("TEST ERROR: pmPeakAlloc() improperly set pmPeak->x\n");
             testStatus = false;
         }
         if (tmpPeak->y != 2) {
-            printf("TEST ERROR: pmPeakAlloc() improperly set psPeak->y\n");
+            printf("TEST ERROR: pmPeakAlloc() improperly set pmPeak->y\n");
             testStatus = false;
         }
         if (tmpPeak->counts != 3.0) {
-            printf("TEST ERROR: pmPeakAlloc() improperly set psPeak->counts\n");
+            printf("TEST ERROR: pmPeakAlloc() improperly set pmPeak->counts\n");
             testStatus = false;
         }
         if (tmpPeak->class != PM_PEAK_LONE) {
-            printf("TEST ERROR: pmPeakAlloc() improperly set psPeak->class\n");
+            printf("TEST ERROR: pmPeakAlloc() improperly set pmPeak->class\n");
             testStatus = false;
         }
@@ -101,7 +101,7 @@
 
     printf("Testing pmMomentsAlloc()...\n");
-    psMoments *tmpMoments = pmMomentsAlloc();
+    pmMoments *tmpMoments = pmMomentsAlloc();
     if (tmpMoments == NULL) {
-        printf("TEST ERROR: pmMomentsAlloc() returned a NULL psMoments\n");
+        printf("TEST ERROR: pmMomentsAlloc() returned a NULL pmMoments\n");
         testStatus = false;
     } else {
@@ -115,5 +115,5 @@
                 (fabs(tmpMoments->Sky-0.0) > ERROR_TOL) ||
                 (tmpMoments->nPixels != 0)) {
-            printf("TEST ERROR: pmMomentsAlloc() did not properly initialize the psMoments structure.\n");
+            printf("TEST ERROR: pmMomentsAlloc() did not properly initialize the pmMoments structure.\n");
             testStatus = false;
         }
@@ -122,7 +122,7 @@
 
     printf("Testing pmModelAlloc(PS_MODEL_GAUSS)...\n");
-    psModel *tmpModel = pmModelAlloc(PS_MODEL_GAUSS);
+    pmModel *tmpModel = pmModelAlloc(PS_MODEL_GAUSS);
     if (tmpModel == NULL) {
-        printf("TEST ERROR: pmModelAlloc(PS_MODEL_GAUSS) returned a NULL psModel\n");
+        printf("TEST ERROR: pmModelAlloc(PS_MODEL_GAUSS) returned a NULL pmModel\n");
         testStatus = false;
     } else {
@@ -146,5 +146,5 @@
     tmpModel = pmModelAlloc(PS_MODEL_PGAUSS);
     if (tmpModel == NULL) {
-        printf("TEST ERROR: pmModelAlloc(PS_MODEL_PGAUSS) returned a NULL psModel\n");
+        printf("TEST ERROR: pmModelAlloc(PS_MODEL_PGAUSS) returned a NULL pmModel\n");
         testStatus = false;
     } else {
@@ -168,5 +168,5 @@
     tmpModel = pmModelAlloc(PS_MODEL_TWIST_GAUSS);
     if (tmpModel == NULL) {
-        printf("TEST ERROR: pmModelAlloc(PS_MODEL_TWIST_GAUSS) returned a NULL psModel\n");
+        printf("TEST ERROR: pmModelAlloc(PS_MODEL_TWIST_GAUSS) returned a NULL pmModel\n");
         testStatus = false;
     } else {
@@ -190,5 +190,5 @@
     tmpModel = pmModelAlloc(PS_MODEL_WAUSS);
     if (tmpModel == NULL) {
-        printf("TEST ERROR: pmModelAlloc(PS_MODEL_WAUSS) returned a NULL psModel\n");
+        printf("TEST ERROR: pmModelAlloc(PS_MODEL_WAUSS) returned a NULL pmModel\n");
         testStatus = false;
     } else {
@@ -212,5 +212,5 @@
     tmpModel = pmModelAlloc(PS_MODEL_SERSIC);
     if (tmpModel == NULL) {
-        printf("TEST ERROR: pmModelAlloc(PS_MODEL_SERSIC) returned a NULL psModel\n");
+        printf("TEST ERROR: pmModelAlloc(PS_MODEL_SERSIC) returned a NULL pmModel\n");
         testStatus = false;
     } else {
@@ -234,5 +234,5 @@
     tmpModel = pmModelAlloc(PS_MODEL_SERSIC_CORE);
     if (tmpModel == NULL) {
-        printf("TEST ERROR: pmModelAlloc(PS_MODEL_SERSIC_CORE) returned a NULL psModel\n");
+        printf("TEST ERROR: pmModelAlloc(PS_MODEL_SERSIC_CORE) returned a NULL pmModel\n");
         testStatus = false;
     } else {
@@ -253,7 +253,7 @@
     psFree(tmpModel);
 
-    psSource *tmpSource = pmSourceAlloc();
+    pmSource *tmpSource = pmSourceAlloc();
     if (tmpSource == NULL) {
-        printf("TEST ERROR: pmSourceAlloc() returned a NULL psSource\n");
+        printf("TEST ERROR: pmSourceAlloc() returned a NULL pmSource\n");
         testStatus = false;
     }
@@ -545,5 +545,5 @@
         // HEY: verify
         for (psS32 i = 0 ; i < outData->n ; i++) {
-            psPeak *tmpPeak = (psPeak *) outData->data[i];
+            pmPeak *tmpPeak = (pmPeak *) outData->data[i];
             if (((tmpPeak->x == 0) && (tmpPeak->y == 0)) ||
                     ((tmpPeak->x == 0) && (tmpPeak->y == numRows-1)) ||
@@ -803,6 +803,6 @@
         }
     }
-    psSource *rc = NULL;
-    psPeak *tmpPeak = pmPeakAlloc((psF32) (TST04_NUM_ROWS / 2),
+    pmSource *rc = NULL;
+    pmPeak *tmpPeak = pmPeakAlloc((psF32) (TST04_NUM_ROWS / 2),
                                   (psF32) (TST04_NUM_COLS / 2),
                                   200.0,
@@ -813,5 +813,5 @@
     rc = pmSourceLocalSky(NULL, tmpPeak, PS_STAT_SAMPLE_MEAN, 10.0, 20.0);
     if (rc != NULL) {
-        printf("TEST ERROR: pmSourceLocalSky() returned a non-NULL psSource.\n");
+        printf("TEST ERROR: pmSourceLocalSky() returned a non-NULL pmSource.\n");
         psFree(rc);
         testStatus = false;
@@ -822,5 +822,5 @@
     rc = pmSourceLocalSky(imgDataF64, tmpPeak, PS_STAT_SAMPLE_MEAN, 10.0, 20.0);
     if (rc != NULL) {
-        printf("TEST ERROR: pmSourceLocalSky() returned a non-NULL psSource.\n");
+        printf("TEST ERROR: pmSourceLocalSky() returned a non-NULL pmSource.\n");
         psFree(rc);
         testStatus = false;
@@ -828,8 +828,8 @@
 
     printf("----------------------------------------------------------------------------------\n");
-    printf("Calling pmSourceLocalSky with NULL psPeak.  Should generate error and return NULL.\n");
+    printf("Calling pmSourceLocalSky with NULL pmPeak.  Should generate error and return NULL.\n");
     rc = pmSourceLocalSky(imgData, NULL, PS_STAT_SAMPLE_MEAN, 10.0, 20.0);
     if (rc != NULL) {
-        printf("TEST ERROR: pmSourceLocalSky() returned a non-NULL psSource.\n");
+        printf("TEST ERROR: pmSourceLocalSky() returned a non-NULL pmSource.\n");
         psFree(rc);
         testStatus = false;
@@ -840,5 +840,5 @@
     rc = pmSourceLocalSky(imgData, tmpPeak, PS_STAT_SAMPLE_MEAN, -10.0, 20.0);
     if (rc != NULL) {
-        printf("TEST ERROR: pmSourceLocalSky() returned a non-NULL psSource.\n");
+        printf("TEST ERROR: pmSourceLocalSky() returned a non-NULL pmSource.\n");
         psFree(rc);
         testStatus = false;
@@ -849,5 +849,5 @@
     rc = pmSourceLocalSky(imgData, tmpPeak, PS_STAT_SAMPLE_MEAN, 10.0, 5.0);
     if (rc != NULL) {
-        printf("TEST ERROR: pmSourceLocalSky() returned a non-NULL psSource.\n");
+        printf("TEST ERROR: pmSourceLocalSky() returned a non-NULL pmSource.\n");
         psFree(rc);
         testStatus = false;
@@ -861,5 +861,5 @@
         rc = pmSourceLocalSky(imgData, tmpPeak, PS_STAT_SAMPLE_MEAN, 10.0, 20.0);
         if (rc != NULL) {
-            printf("TEST ERROR: pmSourceLocalSky() returned a non-NULL psSource.\n");
+            printf("TEST ERROR: pmSourceLocalSky() returned a non-NULL pmSource.\n");
             psFree(rc);
             testStatus = false;
@@ -872,5 +872,5 @@
         rc = pmSourceLocalSky(imgData, tmpPeak, PS_STAT_SAMPLE_MEAN, 10.0, 20.0);
         if (rc != NULL) {
-            printf("TEST ERROR: pmSourceLocalSky() returned a non-NULL psSource.\n");
+            printf("TEST ERROR: pmSourceLocalSky() returned a non-NULL pmSource.\n");
             psFree(rc);
             testStatus = false;
@@ -883,5 +883,5 @@
         rc = pmSourceLocalSky(imgData, tmpPeak, PS_STAT_SAMPLE_MEAN, 10.0, 20.0);
         if (rc != NULL) {
-            printf("TEST ERROR: pmSourceLocalSky() returned a non-NULL psSource.\n");
+            printf("TEST ERROR: pmSourceLocalSky() returned a non-NULL pmSource.\n");
             psFree(rc);
             testStatus = false;
@@ -894,5 +894,5 @@
         rc = pmSourceLocalSky(imgData, tmpPeak, PS_STAT_SAMPLE_MEAN, (psF32) TST04_INNER_RADIUS, (psF32) TST04_OUTER_RADIUS);
         if (rc != NULL) {
-            printf("TEST ERROR: pmSourceLocalSky() returned a non-NULL psSource.\n");
+            printf("TEST ERROR: pmSourceLocalSky() returned a non-NULL pmSource.\n");
             psFree(rc);
             testStatus = false;
@@ -915,28 +915,28 @@
 
     if (rc == NULL) {
-        printf("TEST ERROR: pmSourceLocalSky() returned a NULL psSource.\n");
+        printf("TEST ERROR: pmSourceLocalSky() returned a NULL pmSource.\n");
         testStatus = false;
     } else {
         if (rc->peak == NULL) {
-            printf("TEST ERROR: pmSourceLocalSky() returned a NULL psSource->peak.\n");
+            printf("TEST ERROR: pmSourceLocalSky() returned a NULL pmSource->peak.\n");
             testStatus = false;
         } else {
             if (rc->peak->x != tmpPeak->x) {
-                printf("TEST ERROR: pmSourceLocalSky() psSource->peak->x was %d, should have been %d.\n", rc->peak->x, tmpPeak->x);
+                printf("TEST ERROR: pmSourceLocalSky() pmSource->peak->x was %d, should have been %d.\n", rc->peak->x, tmpPeak->x);
                 testStatus = false;
             }
 
             if (rc->peak->y != tmpPeak->y) {
-                printf("TEST ERROR: pmSourceLocalSky() psSource->peak->y was %d, should have been %d.\n", rc->peak->y, tmpPeak->y);
+                printf("TEST ERROR: pmSourceLocalSky() pmSource->peak->y was %d, should have been %d.\n", rc->peak->y, tmpPeak->y);
                 testStatus = false;
             }
 
             if (rc->peak->counts != tmpPeak->counts) {
-                printf("TEST ERROR: pmSourceLocalSky() psSource->peak->counts was %f, should have been %f.\n", rc->peak->counts, tmpPeak->counts);
+                printf("TEST ERROR: pmSourceLocalSky() pmSource->peak->counts was %f, should have been %f.\n", rc->peak->counts, tmpPeak->counts);
                 testStatus = false;
             }
 
             if (rc->peak->class != tmpPeak->class) {
-                printf("TEST ERROR: pmSourceLocalSky() psSource->peak->class was %d, should have been %d.\n", rc->peak->class, tmpPeak->class);
+                printf("TEST ERROR: pmSourceLocalSky() pmSource->peak->class was %d, should have been %d.\n", rc->peak->class, tmpPeak->class);
                 testStatus = false;
             }
@@ -944,9 +944,9 @@
 
         if (rc->pixels == NULL) {
-            printf("TEST ERROR: pmSourceLocalSky() psSource->pixels was NULL.\n");
+            printf("TEST ERROR: pmSourceLocalSky() pmSource->pixels was NULL.\n");
             testStatus = false;
         } else {
             if (rc->pixels->numRows != (2 * TST04_OUTER_RADIUS)) {
-                printf("TEST ERROR: pmSourceLocalSky() psSource->pixels->numRows was %d, should have been %d.\n",
+                printf("TEST ERROR: pmSourceLocalSky() pmSource->pixels->numRows was %d, should have been %d.\n",
                        rc->pixels->numRows, (2 * TST04_OUTER_RADIUS));
                 testStatus = false;
@@ -954,5 +954,5 @@
 
             if (rc->pixels->numCols != (2 * TST04_OUTER_RADIUS)) {
-                printf("TEST ERROR: pmSourceLocalSky() psSource->pixels->numCols was %d, should have been %d.\n",
+                printf("TEST ERROR: pmSourceLocalSky() pmSource->pixels->numCols was %d, should have been %d.\n",
                        rc->pixels->numCols, (2 * TST04_OUTER_RADIUS));
                 testStatus = false;
@@ -960,5 +960,5 @@
 
             if (rc->pixels->col0 != (tmpPeak->x - TST04_OUTER_RADIUS)) {
-                printf("TEST ERROR: pmSourceLocalSky() psSource->pixels->col0 was %d, should have been %d.\n",
+                printf("TEST ERROR: pmSourceLocalSky() pmSource->pixels->col0 was %d, should have been %d.\n",
                        rc->pixels->col0, (tmpPeak->x - TST04_OUTER_RADIUS));
                 testStatus = false;
@@ -966,5 +966,5 @@
 
             if (rc->pixels->row0 != (tmpPeak->y - TST04_OUTER_RADIUS)) {
-                printf("TEST ERROR: pmSourceLocalSky() psSource->pixels->row0 was %d, should have been %d.\n",
+                printf("TEST ERROR: pmSourceLocalSky() pmSource->pixels->row0 was %d, should have been %d.\n",
                        rc->pixels->row0, (tmpPeak->y - TST04_OUTER_RADIUS));
                 testStatus = false;
@@ -972,5 +972,5 @@
 
             if (rc->pixels->type.type != PS_TYPE_F32) {
-                printf("TEST ERROR: pmSourceLocalSky() psSource->pixels->type was %d, should have been %d.\n",
+                printf("TEST ERROR: pmSourceLocalSky() pmSource->pixels->type was %d, should have been %d.\n",
                        rc->pixels->type.type, PS_TYPE_F32);
                 testStatus = false;
@@ -982,9 +982,9 @@
 
         if (rc->mask == NULL) {
-            printf("TEST ERROR: pmSourceLocalSky() psSource->mask was NULL.\n");
+            printf("TEST ERROR: pmSourceLocalSky() pmSource->mask was NULL.\n");
             testStatus = false;
         } else {
             if (rc->mask->numRows != (2 * TST04_OUTER_RADIUS)) {
-                printf("TEST ERROR: pmSourceLocalSky() psSource->mask->numRows was %d, should have been %d.\n",
+                printf("TEST ERROR: pmSourceLocalSky() pmSource->mask->numRows was %d, should have been %d.\n",
                        rc->mask->numRows, (2 * TST04_OUTER_RADIUS));
                 testStatus = false;
@@ -992,5 +992,5 @@
 
             if (rc->mask->numCols != (2 * TST04_OUTER_RADIUS)) {
-                printf("TEST ERROR: pmSourceLocalSky() psSource->mask->numCols was %d, should have been %d.\n",
+                printf("TEST ERROR: pmSourceLocalSky() pmSource->mask->numCols was %d, should have been %d.\n",
                        rc->mask->numCols, (2 * TST04_OUTER_RADIUS));
                 testStatus = false;
@@ -998,5 +998,5 @@
 
             if (rc->mask->type.type != PS_TYPE_U8) {
-                printf("TEST ERROR: pmSourceLocalSky() psSource->mask->type was %d, should have been %d.\n",
+                printf("TEST ERROR: pmSourceLocalSky() pmSource->mask->type was %d, should have been %d.\n",
                        rc->mask->type.type, PS_TYPE_U8);
                 testStatus = false;
@@ -1018,10 +1018,10 @@
             }
             if (maskedPixels != PS_SQR(2*(TST04_INNER_RADIUS-1))) {
-                printf("TEST ERROR: pmSourceLocalSky() psSource->mask had %d masked pixels, should have been %d.\n",
+                printf("TEST ERROR: pmSourceLocalSky() pmSource->mask had %d masked pixels, should have been %d.\n",
                        maskedPixels, PS_SQR(2*(TST04_INNER_RADIUS-1)));
                 testStatus = false;
             }
             if (unmaskedPixels != (PS_SQR(2*TST04_OUTER_RADIUS) - PS_SQR(2*(TST04_INNER_RADIUS-1)))) {
-                printf("TEST ERROR: pmSourceLocalSky() psSource->mask had %d masked pixels, should have been %d.\n",
+                printf("TEST ERROR: pmSourceLocalSky() pmSource->mask had %d masked pixels, should have been %d.\n",
                        unmaskedPixels, (PS_SQR(2*TST04_OUTER_RADIUS) - PS_SQR(2*(TST04_INNER_RADIUS-1))));
                 testStatus = false;
@@ -1030,9 +1030,9 @@
 
         if (rc->moments == NULL) {
-            printf("TEST ERROR: pmSourceLocalSky() returned a NULL psSource->moments.\n");
+            printf("TEST ERROR: pmSourceLocalSky() returned a NULL pmSource->moments.\n");
             testStatus = false;
         } else {
             if (rc->moments->Sky != TST04_SKY) {
-                printf("TEST ERROR: pmSourceLocalSky() psSource->moments->Sky was %f, should have been %f.\n", rc->moments->Sky, TST04_SKY);
+                printf("TEST ERROR: pmSourceLocalSky() pmSource->moments->Sky was %f, should have been %f.\n", rc->moments->Sky, TST04_SKY);
                 testStatus = false;
             }
@@ -1063,5 +1063,5 @@
 {
     bool testStatus = true;
-    psSource *tmpSource = NULL;
+    pmSource *tmpSource = NULL;
     bool rc = false;
     // Create the image used in this test.
@@ -1080,7 +1080,7 @@
 
     //
-    // Create a psPeak with the center pixel set to the peak.
-    //
-    psPeak *tmpPeak = pmPeakAlloc((psF32) (TST06_NUM_ROWS / 2),
+    // Create a pmPeak with the center pixel set to the peak.
+    //
+    pmPeak *tmpPeak = pmPeakAlloc((psF32) (TST06_NUM_ROWS / 2),
                                   (psF32) (TST06_NUM_COLS / 2),
                                   200.0,
@@ -1093,5 +1093,5 @@
                                  (psF32) TST06_OUTER_RADIUS);
     if (tmpSource == NULL) {
-        printf("TEST ERROR: pmSourceLocalSky() returned a NULL psSource.\n");
+        printf("TEST ERROR: pmSourceLocalSky() returned a NULL pmSource.\n");
         psFree(imgData);
         psFree(imgDataF64);
@@ -1102,5 +1102,5 @@
 
     printf("----------------------------------------------------------------------------------\n");
-    printf("Calling pmSourceSetPixelsCircle with NULL psSource.  Should generate error and return NULL.\n");
+    printf("Calling pmSourceSetPixelsCircle with NULL pmSource.  Should generate error and return NULL.\n");
     rc = pmSourceSetPixelsCircle(NULL, imgData, 10.0);
     if (rc == true) {
@@ -1108,5 +1108,5 @@
         testStatus = false;
     }
-    // XXX: test with psSource->peaks NULL
+    // XXX: test with pmSource->peaks NULL
 
     printf("----------------------------------------------------------------------------------\n");
@@ -1218,6 +1218,6 @@
 {
     bool testStatus = true;
-    psSource *tmpSource = NULL;
-    psSource *rc = NULL;
+    pmSource *tmpSource = NULL;
+    pmSource *rc = NULL;
     // Create the image used in this test.
     psImage *imgData = psImageAlloc(TST05_NUM_COLS, TST05_NUM_ROWS, PS_TYPE_F32);
@@ -1229,7 +1229,7 @@
 
     //
-    // Create a psPeak with the center pixel set to the peak.
-    //
-    psPeak *tmpPeak = pmPeakAlloc((psF32) (TST05_NUM_ROWS / 2),
+    // Create a pmPeak with the center pixel set to the peak.
+    //
+    pmPeak *tmpPeak = pmPeakAlloc((psF32) (TST05_NUM_ROWS / 2),
                                   (psF32) (TST05_NUM_COLS / 2),
                                   200.0,
@@ -1242,5 +1242,5 @@
                                  (psF32) TST05_OUTER_RADIUS);
     if (tmpSource == NULL) {
-        printf("TEST ERROR: pmSourceLocalSky() returned a NULL psSource.\n");
+        printf("TEST ERROR: pmSourceLocalSky() returned a NULL pmSource.\n");
         psFree(tmpSource);
         testStatus = false;
@@ -1249,13 +1249,13 @@
 
     printf("----------------------------------------------------------------------------------\n");
-    printf("Calling pmSourceMoments with NULL psSource.  Should generate error and return NULL.\n");
+    printf("Calling pmSourceMoments with NULL pmSource.  Should generate error and return NULL.\n");
     rc = pmSourceMoments(NULL, 10.0);
     if (rc != NULL) {
-        printf("TEST ERROR: pmSourceMoments() returned a non-NULL psSource.\n");
-        testStatus = false;
-    }
-    // XXX: test with psSource->peaks NULL
-    // XXX: test with psSource->pixels NULL
-    // XXX: test with psSource->mask NULL
+        printf("TEST ERROR: pmSourceMoments() returned a non-NULL pmSource.\n");
+        testStatus = false;
+    }
+    // XXX: test with pmSource->peaks NULL
+    // XXX: test with pmSource->pixels NULL
+    // XXX: test with pmSource->mask NULL
 
     printf("----------------------------------------------------------------------------------\n");
@@ -1263,5 +1263,5 @@
     rc = pmSourceMoments(tmpSource, -10.0);
     if (rc != NULL) {
-        printf("TEST ERROR: pmSourceMoments() returned a non-NULL psSource.\n");
+        printf("TEST ERROR: pmSourceMoments() returned a non-NULL pmSource.\n");
         testStatus = false;
     }
@@ -1485,7 +1485,7 @@
         }
     }
-    psSource *mySrc = NULL;
+    pmSource *mySrc = NULL;
     bool rc = false;
-    psPeak *tmpPeak = pmPeakAlloc((psF32) (TST04_NUM_ROWS / 2),
+    pmPeak *tmpPeak = pmPeakAlloc((psF32) (TST04_NUM_ROWS / 2),
                                   (psF32) (TST04_NUM_COLS / 2),
                                   200.0,
@@ -1502,10 +1502,10 @@
 
     if (mySrc == NULL) {
-        printf("TEST ERROR: pmSourceLocalSky() returned a NULL psSource.\n");
-        testStatus = false;
-    }
-
-    printf("----------------------------------------------------------------------------------\n");
-    printf("Calling pmSourceModelGuess with NULL psSource.  Should generate error, return FALSE.\n");
+        printf("TEST ERROR: pmSourceLocalSky() returned a NULL pmSource.\n");
+        testStatus = false;
+    }
+
+    printf("----------------------------------------------------------------------------------\n");
+    printf("Calling pmSourceModelGuess with NULL pmSource.  Should generate error, return FALSE.\n");
     rc = pmSourceModelGuess(NULL, imgData, PS_MODEL_GAUSS);
     if (rc == true) {
@@ -1606,8 +1606,8 @@
         }
     }
-    psSource *mySrc = NULL;
+    pmSource *mySrc = NULL;
     psArray *rc = NULL;
 
-    psPeak *tmpPeak = pmPeakAlloc((psF32) (TST09_NUM_ROWS / 2),
+    pmPeak *tmpPeak = pmPeakAlloc((psF32) (TST09_NUM_ROWS / 2),
                                   (psF32) (TST09_NUM_COLS / 2),
                                   200.0,
@@ -1624,5 +1624,5 @@
 
     if (mySrc == NULL) {
-        printf("TEST ERROR: pmSourceLocalSky() returned a NULL psSource.\n");
+        printf("TEST ERROR: pmSourceLocalSky() returned a NULL pmSource.\n");
         testStatus = false;
     }
@@ -1635,5 +1635,5 @@
 
     printf("----------------------------------------------------------------------------------\n");
-    printf("Calling pmSourceContour with NULL psSource .  Should generate error, return NULL.\n");
+    printf("Calling pmSourceContour with NULL pmSource .  Should generate error, return NULL.\n");
     rc = pmSourceContour(NULL, imgData, LEVEL, PS_CONTOUR_CRUDE);
     if (rc != NULL) {
@@ -1660,11 +1660,11 @@
         printf("Calling pmSourceContour with acceptable data.\n");
         printf("NOTE: must figure out the parameters for this test to be meaningful.\n");
-        mySrc->models->params->data.F32[0] = TST09_SKY;
-        mySrc->models->params->data.F32[1] = 15.0;
-        mySrc->models->params->data.F32[2] = (psF32) (TST09_NUM_ROWS / 2);
-        mySrc->models->params->data.F32[3] = (psF32) (TST09_NUM_COLS / 2);
-        mySrc->models->params->data.F32[4] = 2.0;
-        mySrc->models->params->data.F32[5] = 2.0;
-        mySrc->models->params->data.F32[6] = 2.0;
+        mySrc->modelPSF->params->data.F32[0] = TST09_SKY;
+        mySrc->modelPSF->params->data.F32[1] = 15.0;
+        mySrc->modelPSF->params->data.F32[2] = (psF32) (TST09_NUM_ROWS / 2);
+        mySrc->modelPSF->params->data.F32[3] = (psF32) (TST09_NUM_COLS / 2);
+        mySrc->modelPSF->params->data.F32[4] = 2.0;
+        mySrc->modelPSF->params->data.F32[5] = 2.0;
+        mySrc->modelPSF->params->data.F32[6] = 2.0;
         rc = pmSourceContour(mySrc, imgData, LEVEL, PS_CONTOUR_CRUDE);
         if (rc == NULL) {
@@ -1703,8 +1703,8 @@
         }
     }
-    psSource *mySrc = NULL;
+    pmSource *mySrc = NULL;
     psBool rc = false;
 
-    psPeak *tmpPeak = pmPeakAlloc((psF32) (TST15_NUM_ROWS / 2),
+    pmPeak *tmpPeak = pmPeakAlloc((psF32) (TST15_NUM_ROWS / 2),
                                   (psF32) (TST15_NUM_COLS / 2),
                                   200.0,
@@ -1721,16 +1721,16 @@
 
     if (mySrc == NULL) {
-        printf("TEST ERROR: pmSourceLocalSky() returned a NULL psSource.\n");
-        testStatus = false;
-    }
-
-    mySrc->models = pmModelAlloc(PS_MODEL_GAUSS);
-    mySrc->models->params->data.F32[0] = 5.0;
-    mySrc->models->params->data.F32[1] = 70.0;
-    mySrc->models->params->data.F32[2] = (psF32) (TST15_NUM_ROWS / 2);
-    mySrc->models->params->data.F32[3] = (psF32) (TST15_NUM_COLS / 2);
-    mySrc->models->params->data.F32[4] = 1.0;
-    mySrc->models->params->data.F32[5] = 1.0;
-    mySrc->models->params->data.F32[6] = 2.0;
+        printf("TEST ERROR: pmSourceLocalSky() returned a NULL pmSource.\n");
+        testStatus = false;
+    }
+
+    mySrc->modelPSF = pmModelAlloc(PS_MODEL_GAUSS);
+    mySrc->modelPSF->params->data.F32[0] = 5.0;
+    mySrc->modelPSF->params->data.F32[1] = 70.0;
+    mySrc->modelPSF->params->data.F32[2] = (psF32) (TST15_NUM_ROWS / 2);
+    mySrc->modelPSF->params->data.F32[3] = (psF32) (TST15_NUM_COLS / 2);
+    mySrc->modelPSF->params->data.F32[4] = 1.0;
+    mySrc->modelPSF->params->data.F32[5] = 1.0;
+    mySrc->modelPSF->params->data.F32[6] = 2.0;
 
     printf("----------------------------------------------------------------------------------\n");
@@ -1783,8 +1783,8 @@
         }
     }
-    psSource *mySrc = NULL;
+    pmSource *mySrc = NULL;
     psBool rc = false;
 
-    psPeak *tmpPeak = pmPeakAlloc((psF32) (TST16_NUM_ROWS / 2),
+    pmPeak *tmpPeak = pmPeakAlloc((psF32) (TST16_NUM_ROWS / 2),
                                   (psF32) (TST16_NUM_COLS / 2),
                                   200.0,
@@ -1801,16 +1801,16 @@
 
     if (mySrc == NULL) {
-        printf("TEST ERROR: pmSourceLocalSky() returned a NULL psSource.\n");
-        testStatus = false;
-    }
-
-    mySrc->models = pmModelAlloc(PS_MODEL_GAUSS);
-    mySrc->models->params->data.F32[0] = 5.0;
-    mySrc->models->params->data.F32[1] = 70.0;
-    mySrc->models->params->data.F32[2] = (psF32) (TST16_NUM_ROWS / 2);
-    mySrc->models->params->data.F32[3] = (psF32) (TST16_NUM_COLS / 2);
-    mySrc->models->params->data.F32[4] = 1.0;
-    mySrc->models->params->data.F32[5] = 1.0;
-    mySrc->models->params->data.F32[6] = 2.0;
+        printf("TEST ERROR: pmSourceLocalSky() returned a NULL pmSource.\n");
+        testStatus = false;
+    }
+
+    mySrc->modelPSF = pmModelAlloc(PS_MODEL_GAUSS);
+    mySrc->modelPSF->params->data.F32[0] = 5.0;
+    mySrc->modelPSF->params->data.F32[1] = 70.0;
+    mySrc->modelPSF->params->data.F32[2] = (psF32) (TST16_NUM_ROWS / 2);
+    mySrc->modelPSF->params->data.F32[3] = (psF32) (TST16_NUM_COLS / 2);
+    mySrc->modelPSF->params->data.F32[4] = 1.0;
+    mySrc->modelPSF->params->data.F32[5] = 1.0;
+    mySrc->modelPSF->params->data.F32[6] = 2.0;
 
     printf("----------------------------------------------------------------------------------\n");
@@ -1863,8 +1863,8 @@
         }
     }
-    psSource *mySrc = NULL;
+    pmSource *mySrc = NULL;
     psBool rc = false;
 
-    psPeak *tmpPeak = pmPeakAlloc((psF32) (TST20_NUM_ROWS / 2),
+    pmPeak *tmpPeak = pmPeakAlloc((psF32) (TST20_NUM_ROWS / 2),
                                   (psF32) (TST20_NUM_COLS / 2),
                                   200.0,
@@ -1881,18 +1881,18 @@
 
     if (mySrc == NULL) {
-        printf("TEST ERROR: pmSourceLocalSky() returned a NULL psSource.\n");
-        testStatus = false;
-    }
-
-    mySrc->models = pmModelAlloc(PS_MODEL_GAUSS);
-
-
-    mySrc->models->params->data.F32[0] = 5.0;
-    mySrc->models->params->data.F32[1] = 70.0;
-    mySrc->models->params->data.F32[2] = (psF32) (TST20_NUM_ROWS / 2);
-    mySrc->models->params->data.F32[3] = (psF32) (TST20_NUM_COLS / 2);
-    mySrc->models->params->data.F32[4] = 1.0;
-    mySrc->models->params->data.F32[5] = 1.0;
-    mySrc->models->params->data.F32[6] = 2.0;
+        printf("TEST ERROR: pmSourceLocalSky() returned a NULL pmSource.\n");
+        testStatus = false;
+    }
+
+    mySrc->modelPSF = pmModelAlloc(PS_MODEL_GAUSS);
+
+
+    mySrc->modelPSF->params->data.F32[0] = 5.0;
+    mySrc->modelPSF->params->data.F32[1] = 70.0;
+    mySrc->modelPSF->params->data.F32[2] = (psF32) (TST20_NUM_ROWS / 2);
+    mySrc->modelPSF->params->data.F32[3] = (psF32) (TST20_NUM_COLS / 2);
+    mySrc->modelPSF->params->data.F32[4] = 1.0;
+    mySrc->modelPSF->params->data.F32[5] = 1.0;
+    mySrc->modelPSF->params->data.F32[6] = 2.0;
 
     printf("----------------------------------------------------------------------------------\n");
@@ -1905,5 +1905,5 @@
 
     printf("----------------------------------------------------------------------------------\n");
-    printf("Calling pmSourceFitModel with NULL psSource.  Should generate error, return FALSE.\n");
+    printf("Calling pmSourceFitModel with NULL pmSource.  Should generate error, return FALSE.\n");
     rc = pmSourceFitModel(NULL, imgData);
     if (rc == true) {
Index: trunk/psModules/test/tst_pmReadoutCombine.c
===================================================================
--- trunk/psModules/test/tst_pmReadoutCombine.c	(revision 4579)
+++ trunk/psModules/test/tst_pmReadoutCombine.c	(revision 4770)
@@ -5,6 +5,6 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.11 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-01-10 22:22:52 $
+ *  @version $Revision: 1.12 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-08-16 01:10:36 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -56,4 +56,5 @@
 int main(int argc, char* argv[])
 {
+    psLogSetFormat("HLNM");
     return !runTestSuite(stderr, "Test Point Driver", tests, argc, argv);
 }
@@ -118,9 +119,9 @@
         *(int *) (& (tmpImage->col0)) = baseCols[r];
         /*
-                psReadout *tmpReadout = psReadoutAlloc(baseColsReadout[r],
+                pmReadout *tmpReadout = pmReadoutAlloc(baseColsReadout[r],
                                                        baseRowsReadout[r],
                                                        tmpImage);
         */
-        psReadout *tmpReadout = psReadoutAlloc();
+        pmReadout *tmpReadout = pmReadoutAlloc(NULL);
         tmpReadout->image = tmpImage;
 
@@ -154,5 +155,5 @@
     psListElem *tmpInput = (psListElem *) list->head;
     while (NULL != tmpInput) {
-        psReadout *tmpReadout = (psReadout *) tmpInput->data;
+        pmReadout *tmpReadout = (pmReadout *) tmpInput->data;
         psFree(tmpReadout);
         tmpInput = tmpInput->next;
@@ -236,9 +237,9 @@
         *(int *) (& (tmpImage->col0)) = baseCols[r];
         /*
-                psReadout *tmpReadout = psReadoutAlloc(baseColsReadout[r],
+                pmReadout *tmpReadout = pmReadoutAlloc(baseColsReadout[r],
                                                        baseRowsReadout[r],
                                                        tmpImage);
         */
-        psReadout *tmpReadout = psReadoutAlloc();
+        pmReadout *tmpReadout = pmReadoutAlloc(NULL);
         tmpReadout->image = tmpImage;
         minOutRow = PS_MIN(minOutRow, (baseRowsReadout[r] + baseRows[r]));
@@ -441,5 +442,5 @@
     psListElem *tmpInput = (psListElem *) list->head;
     while (NULL != tmpInput) {
-        psReadout *tmpReadout = (psReadout *) tmpInput->data;
+        pmReadout *tmpReadout = (pmReadout *) tmpInput->data;
         psFree(tmpReadout);
         tmpInput = tmpInput->next;
Index: trunk/psModules/test/tst_pmSubtractBias.c
===================================================================
--- trunk/psModules/test/tst_pmSubtractBias.c	(revision 4579)
+++ trunk/psModules/test/tst_pmSubtractBias.c	(revision 4770)
@@ -14,6 +14,6 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.16 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-03-31 02:01:57 $
+ *  @version $Revision: 1.17 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-08-16 01:10:36 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -42,4 +42,5 @@
 int main(int argc, char* argv[])
 {
+    psLogSetFormat("HLNM");
     return !runTestSuite(stderr, "Test Point Driver", tests, argc, argv);
 }
@@ -48,6 +49,6 @@
 #define NUM_COLS 8
 /******************************************************************************
-doSubtractBiasFullFrame(): a sample psReadout as well as a bias image are
-created and the bias image is subtracted from the psReadout.
+doSubtractBiasFullFrame(): a sample pmReadout as well as a bias image are
+created and the bias image is subtracted from the pmReadout.
  *****************************************************************************/
 int doSubtractBiasFullFrame(int numCols, int numRows)
@@ -60,8 +61,8 @@
     psImage *tmpImage1 = psImageAlloc(numCols, numRows, PS_TYPE_F32);
     psImage *tmpImage2 = psImageAlloc(numCols, numRows, PS_TYPE_F32);
-    //    psReadout *myReadout = psReadoutAlloc(numCols, numRows, tmpImage1);
-    //    psReadout *myBias = psReadoutAlloc(numCols, numRows, tmpImage2);
-    psReadout *myReadout = psReadoutAlloc();
-    psReadout *myBias = psReadoutAlloc();
+    //    pmReadout *myReadout = pmReadoutAlloc(numCols, numRows, tmpImage1);
+    //    pmReadout *myBias = pmReadoutAlloc(numCols, numRows, tmpImage2);
+    pmReadout *myReadout = pmReadoutAlloc(NULL);
+    pmReadout *myBias = pmReadoutAlloc(NULL);
     myReadout->image = tmpImage1;
     myBias->image = tmpImage2;
@@ -110,7 +111,7 @@
 
 /******************************************************************************
-doSubtractFullOverscans(): a sample psReadout as well as several overscan
+doSubtractFullOverscans(): a sample pmReadout as well as several overscan
 images of the same size are created.  The overscan images are then subtracted
-from the psReadout.
+from the pmReadout.
  *****************************************************************************/
 int doSubtractFullOverscans(int numCols, int numRows)
@@ -125,6 +126,6 @@
     psImage *tmpImage3 = psImageAlloc(numCols, numRows, PS_TYPE_F32);
     psImage *tmpImage4 = psImageAlloc(numCols, numRows, PS_TYPE_F32);
-    //    psReadout *myReadout = psReadoutAlloc(numCols, numRows, tmpImage1);
-    psReadout *myReadout = psReadoutAlloc();
+    //    pmReadout *myReadout = pmReadoutAlloc(numCols, numRows, tmpImage1);
+    pmReadout *myReadout = pmReadoutAlloc(NULL);
     myReadout->image = tmpImage1;
 
@@ -185,7 +186,7 @@
 
 /******************************************************************************
-doSubtractFullOverscans(): a sample psReadout as well as several overscan
+doSubtractFullOverscans(): a sample pmReadout as well as several overscan
 images of the same size are created.  The overscan images are collected
-pixel-by-pixel then subtracted column-wise from the psReadout.
+pixel-by-pixel then subtracted column-wise from the pmReadout.
  *****************************************************************************/
 int doSubtractFullOverscanColumns(int numCols, int numRows)
@@ -200,5 +201,5 @@
     psImage *tmpImage3 = psImageAlloc(numCols, numRows, PS_TYPE_F32);
     psImage *tmpImage4 = psImageAlloc(numCols, numRows, PS_TYPE_F32);
-    psReadout *myReadout = psReadoutAlloc();
+    pmReadout *myReadout = pmReadoutAlloc(NULL);
     myReadout->image = tmpImage1;
     psList *list;
@@ -245,7 +246,7 @@
 }
 /******************************************************************************
-doSubtractFullOverscans(): a sample psReadout as well as several overscan
+doSubtractFullOverscans(): a sample pmReadout as well as several overscan
 images of the same size are created.  The overscan images are collected
-pixel-by-pixel then subtracted column-wise from the psReadout.
+pixel-by-pixel then subtracted column-wise from the pmReadout.
  *****************************************************************************/
 int doSubtractFullOverscanColumnsPoly(int numCols, int numRows)
@@ -260,5 +261,5 @@
     psImage *tmpImage3 = psImageAlloc(numCols, numRows, PS_TYPE_F32);
     psImage *tmpImage4 = psImageAlloc(numCols, numRows, PS_TYPE_F32);
-    psReadout *myReadout = psReadoutAlloc();
+    pmReadout *myReadout = pmReadoutAlloc(NULL);
     myReadout->image = tmpImage1;
     psList *list;
@@ -307,7 +308,7 @@
 }
 /******************************************************************************
-doSubtractFullOverscansSmall(): a sample psReadout as well as several overscan
+doSubtractFullOverscansSmall(): a sample pmReadout as well as several overscan
 images of smaller size are created.  The overscan images are collected
-pixel-by-pixel then subtracted column-wise from the psReadout.
+pixel-by-pixel then subtracted column-wise from the pmReadout.
  *****************************************************************************/
 int doSubtractFullOverscanColumnsSmall(int numCols, int numRows)
@@ -319,5 +320,5 @@
     int testStatus = 0;
     psImage *tmpImage1 = psImageAlloc(numCols, numRows, PS_TYPE_F32);
-    psReadout *myReadout = psReadoutAlloc();
+    pmReadout *myReadout = pmReadoutAlloc(NULL);
     myReadout->image = tmpImage1;
     psImage *tmpImage2 = psImageAlloc(numCols/2, numRows/2, PS_TYPE_F32);
@@ -390,7 +391,7 @@
 
 /******************************************************************************
-doSubtractFullOverscans(): a sample psReadout as well as several overscan
+doSubtractFullOverscans(): a sample pmReadout as well as several overscan
 images of the same size are created.  The overscan images are collected
-pixel-by-pixel then subtracted row-wise from the psReadout.
+pixel-by-pixel then subtracted row-wise from the pmReadout.
  *****************************************************************************/
 int doSubtractFullOverscanRows(int numCols, int numRows)
@@ -405,5 +406,5 @@
     psImage *tmpImage3 = psImageAlloc(numCols, numRows, PS_TYPE_F32);
     psImage *tmpImage4 = psImageAlloc(numCols, numRows, PS_TYPE_F32);
-    psReadout *myReadout = psReadoutAlloc();
+    pmReadout *myReadout = pmReadoutAlloc(NULL);
     myReadout->image = tmpImage1;
     psList *list;
@@ -451,7 +452,7 @@
 
 /******************************************************************************
-doSubtractFullOverscansSmall(): a sample psReadout as well as several overscan
+doSubtractFullOverscansSmall(): a sample pmReadout as well as several overscan
 images of smaller size are created.  The overscan images are collected
-pixel-by-pixel then subtracted row-wise from the psReadout.
+pixel-by-pixel then subtracted row-wise from the pmReadout.
  *****************************************************************************/
 int doSubtractFullOverscanRowsSmall(int numCols, int numRows)
@@ -474,5 +475,5 @@
     psImage *tmpImage3 = psImageAlloc(OSnumCols, OSnumRows, PS_TYPE_F32);
     psImage *tmpImage4 = psImageAlloc(OSnumCols, OSnumRows, PS_TYPE_F32);
-    psReadout *myReadout = psReadoutAlloc();
+    pmReadout *myReadout = pmReadoutAlloc(NULL);
     myReadout->image = tmpImage1;
     psList *list;
@@ -554,20 +555,20 @@
     psImage *tmpImage3Short = psImageAlloc(numCols-1, numRows-1, PS_TYPE_F32);
     psImage *tmpImage4Short = psImageAlloc(numCols-1, numRows-1, PS_TYPE_F32);
-    psReadout *myReadout = psReadoutAlloc();
+    pmReadout *myReadout = pmReadoutAlloc(NULL);
     myReadout->image = tmpImage1;
-    psReadout *rc = NULL;
+    pmReadout *rc = NULL;
     psList *list;
     psList *listShort;
     psStats *stat = psStatsAlloc(PS_STAT_SAMPLE_MEAN);
     psImage *tmpImage5 = psImageAlloc(numCols, numRows, PS_TYPE_F32);
-    psReadout *myBias = psReadoutAlloc();
+    pmReadout *myBias = pmReadoutAlloc(NULL);
     myBias->image = tmpImage5;
     printPositiveTestHeader(stdout, "pmSubtractBias", "Testing input parameter error conditions");
 
     psImage *tmpImage5ShortRows = psImageAlloc(numCols, numRows-1, PS_TYPE_F32);
-    psReadout *myBiasShortRows = psReadoutAlloc();
+    pmReadout *myBiasShortRows = pmReadoutAlloc(NULL);
     myBiasShortRows->image = tmpImage5ShortRows;
     psImage *tmpImage5ShortCols = psImageAlloc(numCols-1, numRows, PS_TYPE_F32);
-    psReadout *myBiasShortCols = psReadoutAlloc();
+    pmReadout *myBiasShortCols = pmReadoutAlloc(NULL);
     myBiasShortCols->image = tmpImage5ShortCols;
 
@@ -611,5 +612,5 @@
     rc = pmSubtractBias(myReadout, NULL, NULL, PM_OVERSCAN_ALL, stat, 0, PM_FIT_NONE, NULL);
     if (rc != myReadout) {
-        printf("TEST ERROR: pmSubtractBias() did not return input psReadout.\n");
+        printf("TEST ERROR: pmSubtractBias() did not return input pmReadout.\n");
         testStatus = false;
     }
@@ -619,5 +620,5 @@
     rc = pmSubtractBias(myReadout, NULL, NULL, PM_OVERSCAN_ROWS, stat, 0, PM_FIT_NONE, NULL);
     if (rc != myReadout) {
-        printf("TEST ERROR: pmSubtractBias() did not return input psReadout.\n");
+        printf("TEST ERROR: pmSubtractBias() did not return input pmReadout.\n");
         testStatus = false;
         psFree(rc);
@@ -628,5 +629,5 @@
     rc = pmSubtractBias(myReadout, NULL, NULL, PM_OVERSCAN_COLUMNS, stat, 0, PM_FIT_NONE, NULL);
     if (rc != myReadout) {
-        printf("TEST ERROR: pmSubtractBias() did not return input psReadout.\n");
+        printf("TEST ERROR: pmSubtractBias() did not return input pmReadout.\n");
         testStatus = false;
         psFree(rc);
@@ -694,5 +695,5 @@
     rc = pmSubtractBias(myReadout, NULL, NULL, PM_OVERSCAN_NONE, stat, 0, PM_FIT_SPLINE, myBias);
     if (rc != myReadout) {
-        printf("TEST ERROR: pmSubtractBias() did not return input psReadout.\n");
+        printf("TEST ERROR: pmSubtractBias() did not return input pmReadout.\n");
         testStatus = false;
         psFree(rc);
@@ -770,5 +771,5 @@
                                0, PM_FIT_NONE, myBiasShortRows);
     if (rc != myReadout) {
-        printf("TEST ERROR: pmSubtractBias() did not return input psReadout.\n");
+        printf("TEST ERROR: pmSubtractBias() did not return input pmReadout.\n");
         testStatus = false;
         psFree(rc);
@@ -781,5 +782,5 @@
                                0, PM_FIT_NONE, myBiasShortCols);
     if (rc != myReadout) {
-        printf("TEST ERROR: pmSubtractBias() did not return input psReadout.\n");
+        printf("TEST ERROR: pmSubtractBias() did not return input pmReadout.\n");
         testStatus = false;
         psFree(rc);
@@ -791,5 +792,5 @@
                                0, 54321, NULL);
     if (rc != myReadout) {
-        printf("TEST ERROR: pmSubtractBias() did not return input psReadout.\n");
+        printf("TEST ERROR: pmSubtractBias() did not return input pmReadout.\n");
         testStatus = false;
         psFree(rc);
@@ -801,5 +802,5 @@
                                0, PM_FIT_NONE, NULL);
     if (rc != myReadout) {
-        printf("TEST ERROR: pmSubtractBias() did not return input psReadout.\n");
+        printf("TEST ERROR: pmSubtractBias() did not return input pmReadout.\n");
         testStatus = false;
         psFree(rc);
@@ -847,7 +848,7 @@
 
 /******************************************************************************
-doSubtractFullOverscansSmall(): a sample psReadout as well as several overscan
+doSubtractFullOverscansSmall(): a sample pmReadout as well as several overscan
 images of smaller size are created.  The overscan images are collected
-pixel-by-pixel then subtracted column-wise from the psReadout.
+pixel-by-pixel then subtracted column-wise from the pmReadout.
  *****************************************************************************/
 int doSubtractFullOverscanColumnsGeneric(int imageNumCols,
@@ -866,6 +867,6 @@
 
     psImage *tmpImage1 = psImageAlloc(imageNumCols, imageNumRows, PS_TYPE_F32);
-    //    psReadout *myReadout = psReadoutAlloc(imageNumCols, imageNumRows, tmpImage1);
-    psReadout *myReadout = psReadoutAlloc();
+    //    pmReadout *myReadout = pmReadoutAlloc(imageNumCols, imageNumRows, tmpImage1);
+    pmReadout *myReadout = pmReadoutAlloc(NULL);
     myReadout->image = tmpImage1;
     for (i=0;i<imageNumRows;i++) {
Index: trunk/psModules/test/tst_pmSubtractSky.c
===================================================================
--- trunk/psModules/test/tst_pmSubtractSky.c	(revision 4579)
+++ trunk/psModules/test/tst_pmSubtractSky.c	(revision 4770)
@@ -7,6 +7,6 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.13 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-03-31 20:41:35 $
+ *  @version $Revision: 1.14 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-08-16 01:10:36 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -39,4 +39,5 @@
 int main(int argc, char* argv[])
 {
+    psLogSetFormat("HLNM");
     return !runTestSuite(stderr, "Test Point Driver", tests, argc, argv);
     //    test00();
@@ -51,6 +52,6 @@
     int testStatus = 0;
     psImage *tmpImageF32 = psImageAlloc(numCols, numRows, PS_TYPE_F32);
-    //    psReadout *myReadout = psReadoutAlloc(numCols, numRows, tmpImageF32);
-    psReadout *myReadout = psReadoutAlloc();
+    //    pmReadout *myReadout = pmReadoutAlloc(numCols, numRows, tmpImageF32);
+    pmReadout *myReadout = pmReadoutAlloc(NULL);
     myReadout->image = tmpImageF32;
     psStats *myStats = psStatsAlloc(PS_STAT_SAMPLE_MEAN);
@@ -89,6 +90,6 @@
     int testStatus = 0;
     psImage *tmpImageF32 = psImageAlloc(numCols, numRows, PS_TYPE_F32);
-    //    psReadout *myReadout = psReadoutAlloc(numCols, numRows, tmpImageF32);
-    psReadout *myReadout = psReadoutAlloc();
+    //    pmReadout *myReadout = pmReadoutAlloc(numCols, numRows, tmpImageF32);
+    pmReadout *myReadout = pmReadoutAlloc(NULL);
     myReadout->image = tmpImageF32;
     psStats *myStats = psStatsAlloc(PS_STAT_SAMPLE_MEAN);
@@ -193,8 +194,8 @@
     psImage *tmpImageF32 = psImageAlloc(NUM_COLS_SMALL, NUM_ROWS_SMALL, PS_TYPE_F32);
     psImage *tmpImageF64 = psImageAlloc(NUM_COLS_SMALL, NUM_ROWS_SMALL, PS_TYPE_F64);
-    //    psReadout *myReadout = psReadoutAlloc(NUM_COLS_SMALL, NUM_ROWS_SMALL, tmpImageF32);
-    psReadout *myReadout = psReadoutAlloc();
-    myReadout->image = tmpImageF32;
-    psReadout *rc = NULL;
+    //    pmReadout *myReadout = pmReadoutAlloc(NUM_COLS_SMALL, NUM_ROWS_SMALL, tmpImageF32);
+    pmReadout *myReadout = pmReadoutAlloc(NULL);
+    myReadout->image = tmpImageF32;
+    pmReadout *rc = NULL;
     psStats *myStats = psStatsAlloc(PS_STAT_SAMPLE_MEAN);
     psPolynomial2D *myPoly = psPolynomial2DAlloc(POLY_X_ORDER, POLY_Y_ORDER, PS_POLYNOMIAL_ORD);
@@ -208,27 +209,27 @@
 
     printf("----------------------------------------------------------------\n");
-    printf("Calling pmSubtractSky() with NULL psReadout.  Should error.\n\n");
+    printf("Calling pmSubtractSky() with NULL pmReadout.  Should error.\n\n");
     rc = pmSubtractSky(NULL, (void *) myPoly, PM_FIT_POLYNOMIAL, 1, myStats, 2.0);
     if (rc != NULL) {
-        printf("TEST ERROR: pmSubtractSky() returned a non-NULL psReadout\n");
-        testStatus = false;
-    }
-
-    printf("----------------------------------------------------------------\n");
-    printf("Calling pmSubtractSky() with NULL psReadout->image.  Should error.\n\n");
+        printf("TEST ERROR: pmSubtractSky() returned a non-NULL pmReadout\n");
+        testStatus = false;
+    }
+
+    printf("----------------------------------------------------------------\n");
+    printf("Calling pmSubtractSky() with NULL pmReadout->image.  Should error.\n\n");
     myReadout->image = NULL;
     rc = pmSubtractSky(myReadout, (void *) myPoly, PM_FIT_POLYNOMIAL, 1, myStats, 2.0);
     if (rc != NULL) {
-        printf("TEST ERROR: pmSubtractSky() returned a non-NULL psReadout\n");
-        testStatus = false;
-    }
-    myReadout->image = tmpImageF32;
-
-    printf("----------------------------------------------------------------\n");
-    printf("Calling pmSubtractSky() with PS_TYPE_F64 psReadout->image.  Should error.\n\n");
+        printf("TEST ERROR: pmSubtractSky() returned a non-NULL pmReadout\n");
+        testStatus = false;
+    }
+    myReadout->image = tmpImageF32;
+
+    printf("----------------------------------------------------------------\n");
+    printf("Calling pmSubtractSky() with PS_TYPE_F64 pmReadout->image.  Should error.\n\n");
     myReadout->image = tmpImageF64;
     rc = pmSubtractSky(myReadout, (void *) myPoly, PM_FIT_POLYNOMIAL, 1, myStats, 2.0);
     if (rc != NULL) {
-        printf("TEST ERROR: pmSubtractSky() returned a non-NULL psReadout\n");
+        printf("TEST ERROR: pmSubtractSky() returned a non-NULL pmReadout\n");
         testStatus = false;
     }
@@ -239,5 +240,5 @@
     rc = pmSubtractSky(myReadout, NULL, PM_FIT_POLYNOMIAL, 1, myStats, 2.0);
     if (rc != myReadout) {
-        printf("TEST ERROR: pmSubtractSky() returned something other than psReadout\n");
+        printf("TEST ERROR: pmSubtractSky() returned something other than pmReadout\n");
         testStatus = false;
     }
@@ -247,5 +248,5 @@
     rc = pmSubtractSky(myReadout, (void *) myPoly, PM_FIT_NONE, 1, myStats, 2.0);
     if (rc != myReadout) {
-        printf("TEST ERROR: pmSubtractSky() returned something other than psReadout\n");
+        printf("TEST ERROR: pmSubtractSky() returned something other than pmReadout\n");
         testStatus = false;
     }
@@ -255,5 +256,5 @@
     rc = pmSubtractSky(myReadout, (void *) myPoly, PM_FIT_SPLINE, 1, myStats, 2.0);
     if (rc != myReadout) {
-        printf("TEST ERROR: pmSubtractSky() returned something other than psReadout\n");
+        printf("TEST ERROR: pmSubtractSky() returned something other than pmReadout\n");
         testStatus = false;
     }
@@ -347,5 +348,5 @@
     rc = pmSubtractSky(myReadout, (void *) myPoly, 54321, 1, myStats, -1.0);
     if (rc != myReadout) {
-        printf("TEST ERROR: pmSubtractSky() returned something other than psReadout\n");
+        printf("TEST ERROR: pmSubtractSky() returned something other than pmReadout\n");
         testStatus = false;
     }
Index: trunk/psModules/test/verified/tst_pmImageCombine.stderr
===================================================================
--- trunk/psModules/test/verified/tst_pmImageCombine.stderr	(revision 4579)
+++ trunk/psModules/test/verified/tst_pmImageCombine.stderr	(revision 4770)
@@ -5,19 +5,19 @@
 \**********************************************************************************/
 
-<DATE><TIME>|<HOST>|E|pmCombineImages (FILE:LINENO)
+<HOST>|E|pmCombineImages (FILE:LINENO)
     Unallowable operation: images is NULL.
-<DATE><TIME>|<HOST>|E|pmCombineImages (FILE:LINENO)
+<HOST>|E|pmCombineImages (FILE:LINENO)
     images and errors args must have same length (6 != 5)
-<DATE><TIME>|<HOST>|E|pmCombineImages (FILE:LINENO)
+<HOST>|E|pmCombineImages (FILE:LINENO)
     Unallowable operation: psImage tmpDataImg has incorrect type.
-<DATE><TIME>|<HOST>|E|pmCombineImages (FILE:LINENO)
+<HOST>|E|pmCombineImages (FILE:LINENO)
     images and errors args must have same length (5 != 6)
-<DATE><TIME>|<HOST>|E|pmCombineImages (FILE:LINENO)
+<HOST>|E|pmCombineImages (FILE:LINENO)
     Unallowable operation: psImage tmpErrorImg has incorrect type.
-<DATE><TIME>|<HOST>|E|pmCombineImages (FILE:LINENO)
+<HOST>|E|pmCombineImages (FILE:LINENO)
     images and masks args must have same length (5 != 6)
-<DATE><TIME>|<HOST>|E|pmCombineImages (FILE:LINENO)
+<HOST>|E|pmCombineImages (FILE:LINENO)
     Unallowable operation: psImage tmpMaskImg has incorrect type.
-<DATE><TIME>|<HOST>|E|pmCombineImages (FILE:LINENO)
+<HOST>|E|pmCombineImages (FILE:LINENO)
     Unallowable operation: stats is NULL.
 
Index: trunk/psModules/test/verified/tst_pmImageSubtract.stdout
===================================================================
--- trunk/psModules/test/verified/tst_pmImageSubtract.stdout	(revision 4579)
+++ trunk/psModules/test/verified/tst_pmImageSubtract.stdout	(revision 4770)
@@ -30,5 +30,5 @@
 Calling pmSubtractionSolveEquation() with acceptable input parameters.  Should return non-NULL.
 The solution vector is:
-(1.37) (-0.00) (0.10) (0.08) (0.14) (0.10) (0.01) (0.02) (0.00) (-0.02) (-0.01) (-0.00) (0.00) (0.01) (-0.00) (-0.01) (-0.00) (0.00) (0.02) (-0.01) (-0.01) (0.00) (0.00) (0.00) (-0.02) (0.01) (0.00) (-0.01) (0.00) (-0.00) (0.01) (-0.00) (-0.01) (0.00) (0.01) (0.01) (0.01) (0.01) (-0.00) (-0.01) (-0.00) (0.00) (0.00) (0.00) (0.01) (-0.00) (-0.00) (-0.01) (0.02) (-0.00) (0.00) (-0.00) (-0.00) (-0.01) (-0.01) (0.02) (0.01) (-0.01) (-0.00) (-0.00) (0.00) (0.00) (-0.00) (-0.00) (0.00) (-0.00) (-0.02) (0.01) (0.02) (-0.01) (-0.00) (-0.01) (-0.03) (-0.00) (0.04) (0.01) (-0.00) (-0.03) (0.02) (0.02) (0.01) (-0.03) (-0.03) (-0.02) (0.01) (-0.01) (-0.01) (0.00) (0.00) (0.01) (0.02) (-0.02) (-0.02) (0.02) (0.02) (0.02) (0.03) (-0.03) (-0.03) (0.02) (0.02) (0.02) (0.00) (0.01) (-0.02) (-0.01) (-0.01) (0.02) (-0.03) (0.02) (0.03) (-0.02) (-0.03) (-0.02) (-0.01) (-0.01) (0.00) (0.01) (-0.00) (-0.00) (-0.02) (0.01) (0.02) (-0.01) (-0.01) (-0.01) (-0.02) (0.02) (0.01) (-0.02) (-0.02) (-0.00) (0.02) (-0.01) (-0.02) (0.01) (0.00) (0.01) (-0.02) (0.01) (0.00) (-0.00) (-0.01) (0.00) (0.00) (-0.01) (-0.01) (0.01) (0.01) (0.01) (0.51) 
+(-64611.38) (9775.94) (-39812.77) (9051.88) (0.14) (-36863.67) (0.01) (0.02) (0.00) (-0.02) (-0.01) (-0.00) (0.00) (0.01) (-0.00) (-0.01) (-0.00) (0.00) (0.02) (-0.01) (-0.01) (0.00) (0.00) (0.00) (-0.02) (0.01) (0.00) (-0.01) (0.00) (-0.00) (0.01) (-0.00) (-0.01) (0.00) (0.01) (0.01) (0.01) (0.01) (-0.00) (-0.01) (-0.00) (0.00) (0.00) (0.00) (0.01) (-0.00) (-0.00) (-0.01) (0.02) (-0.00) (0.00) (-0.00) (-0.00) (-0.01) (-0.01) (0.02) (0.01) (-0.01) (-0.00) (-0.00) (0.00) (0.00) (-0.00) (-0.00) (0.00) (-0.00) (-0.02) (0.01) (0.02) (-0.01) (-0.00) (-0.01) (-0.03) (-0.00) (0.04) (0.01) (-0.00) (-0.03) (0.02) (0.02) (0.01) (-0.03) (-0.03) (-0.02) (0.01) (-0.01) (-0.01) (0.00) (0.00) (0.01) (0.02) (-0.02) (-0.02) (0.02) (0.02) (0.02) (0.03) (-0.03) (-0.03) (0.02) (0.02) (0.02) (0.00) (0.01) (-0.02) (-0.01) (-0.01) (0.02) (-0.03) (0.02) (0.03) (-0.02) (-0.03) (-0.02) (-0.01) (-0.01) (0.00) (0.01) (-0.00) (-0.00) (-0.02) (0.01) (0.02) (-0.01) (-0.01) (-0.01) (-0.02) (0.02) (0.01) (-0.02) (-0.02) (-0.00) (0.02) (-0.01) (-0.02) (0.01) (0.00) (0.01) (-0.02) (0.01) (0.00) (-0.00) (-0.01) (0.00) (0.00) (-0.01) (-0.01) (0.01) (0.01) (0.01) (0.51) 
 Calling pmSubtractionRejectStamps() with acceptable input parameters.  Should return TRUE.
 Calling pmSubtractionKernelImage() with NULL solution.  Should generate error, return NULL.
@@ -39,9 +39,9 @@
 Calling pmSubtractionKernelImage() unallowable y value.  Should generate error, return NULL.
 Calling pmSubtractionKernelImage() with acceptable input parameters.  Should return a psImage.
--0.000774 -0.013938 0.010689 -0.013394 -0.015507 
--0.009241 -0.020300 -0.002732 0.016843 0.010743 
-0.008820 0.015628 1.495404 -0.021095 -0.009788 
-0.003371 -0.001256 0.017835 0.003308 0.008175 
-0.009877 -0.010686 0.014775 0.003368 0.006204 
+-0.000791 -0.014015 0.010665 -0.013466 -0.015527 
+-0.009282 -0.020460 -0.002556 0.016698 0.010701 
+0.008812 0.015715 -86582.703125 -0.020967 -0.009787 
+0.003316 -0.001408 0.018001 0.003171 0.008132 
+0.009856 -0.010723 0.014779 0.003320 0.006181 
 Testing pmSubtractionCalculateEquation(): 
     image size is (25, 25)
@@ -58,5 +58,5 @@
 Calling pmSubtractionSolveEquation() with acceptable input parameters.  Should return non-NULL.
 The solution vector is:
-(0.09) (-0.01) (-0.01) (0.00) (-0.00) (-0.00) (0.00) (0.00) (0.00) (0.00) (0.00) (0.00) (0.00) (0.00) (0.00) (0.00) (0.00) (0.00) (0.00) (0.00) (0.00) (0.00) (0.00) (0.00) (0.00) (0.00) (0.00) (0.00) (0.00) (0.00) (0.00) (0.00) (0.00) (0.00) (0.00) (0.00) (0.55) 
+(0.09) (-0.01) (-0.01) (0.00) (-0.00) (-0.00) (0.00) (0.00) (-0.00) (0.00) (-0.00) (-0.00) (0.00) (0.00) (-0.00) (0.00) (-0.00) (-0.00) (0.00) (0.00) (-0.00) (0.00) (-0.00) (-0.00) (0.00) (0.00) (-0.00) (0.00) (-0.00) (-0.00) (0.00) (0.00) (-0.00) (0.00) (-0.00) (-0.00) (0.55) 
 Calling pmSubtractionRejectStamps() with acceptable input parameters.  Should return TRUE.
 Calling pmSubtractionKernelImage() with NULL solution.  Should generate error, return NULL.
Index: trunk/psModules/test/verified/tst_pmNonLinear.stderr
===================================================================
--- trunk/psModules/test/verified/tst_pmNonLinear.stderr	(revision 4579)
+++ trunk/psModules/test/verified/tst_pmNonLinear.stderr	(revision 4770)
@@ -23,9 +23,9 @@
 \**********************************************************************************/
 
-<DATE><TIME>|<HOST>|E|pmNonLinearityPolynomial (FILE:LINENO)
+<HOST>|E|pmNonLinearityPolynomial (FILE:LINENO)
     Unallowable operation: inputReadout is NULL.
-<DATE><TIME>|<HOST>|E|pmNonLinearityPolynomial (FILE:LINENO)
+<HOST>|E|pmNonLinearityPolynomial (FILE:LINENO)
     Unallowable operation: inputReadout->image is NULL.
-<DATE><TIME>|<HOST>|E|pmNonLinearityPolynomial (FILE:LINENO)
+<HOST>|E|pmNonLinearityPolynomial (FILE:LINENO)
     Unallowable operation: input1DPoly is NULL.
 
@@ -38,33 +38,33 @@
 \**********************************************************************************/
 
-<DATE><TIME>|<HOST>|E|pmNonLinearityLookup (FILE:LINENO)
+<HOST>|E|pmNonLinearityLookup (FILE:LINENO)
     Unallowable operation: inputReadout is NULL.
-<DATE><TIME>|<HOST>|E|pmNonLinearityLookup (FILE:LINENO)
+<HOST>|E|pmNonLinearityLookup (FILE:LINENO)
     Unallowable operation: inputReadout->image is NULL.
-<DATE><TIME>|<HOST>|E|pmNonLinearityLookup (FILE:LINENO)
+<HOST>|E|pmNonLinearityLookup (FILE:LINENO)
     Unallowable operation: inFlux is NULL.
-<DATE><TIME>|<HOST>|E|pmNonLinearityLookup (FILE:LINENO)
+<HOST>|E|pmNonLinearityLookup (FILE:LINENO)
     Unallowable operation: outFlux is NULL.
-<DATE><TIME>|<HOST>|W|pmNonLinearityLookup
+<HOST>|W|pmNonLinearityLookup
     WARNING: pmNonLinear.c: pmNonLinearityLookup(): input vectors have different sizes (24, 25)
-<DATE><TIME>|<HOST>|W|pmNonLinearityLookup
+<HOST>|W|pmNonLinearityLookup
     WARNING: pmNonLinear.c: pmNonLinearityLookup(): input vectors have different sizes (24, 23)
-<DATE><TIME>|<HOST>|W|pmNonLinearityLookup
+<HOST>|W|pmNonLinearityLookup
     WARNING: pmNonLinear.c: pmNonLinearityLookup(): input vectors have different sizes (23, 24)
-<DATE><TIME>|<HOST>|W|pmNonLinearityLookup
+<HOST>|W|pmNonLinearityLookup
     WARNING: pmNonLinear.c: pmNonLinearityLookup(): input vectors have different sizes (25, 24)
-<DATE><TIME>|<HOST>|W|pmNonLinearityLookup
+<HOST>|W|pmNonLinearityLookup
     WARNING: pmNonLinear.c: pmNonLinearityLookup(): input vectors have different sizes (23, 25)
-<DATE><TIME>|<HOST>|W|pmNonLinearityLookup
+<HOST>|W|pmNonLinearityLookup
     WARNING: pmNonLinear.c: pmNonLinearityLookup(): input vectors have different sizes (25, 23)
-<DATE><TIME>|<HOST>|E|pmNonLinearityLookup (FILE:LINENO)
+<HOST>|E|pmNonLinearityLookup (FILE:LINENO)
     pmNonLinearityLookup(): input vector less than 2 elements.  Returning inputReadout image.
-<DATE><TIME>|<HOST>|W|vectorBinDisectF32
+<HOST>|W|vectorBinDisectF32
     vectorBinDisectF32(): ordinate -1.000000 is outside vector range (0.000000 - 23.000000).
-<DATE><TIME>|<HOST>|W|pmNonLinearityLookup
+<HOST>|W|pmNonLinearityLookup
     WARNING: pmNonLinear.c: pmNonLinearityLookup(): 1 pixels outside table.
-<DATE><TIME>|<HOST>|W|vectorBinDisectF32
+<HOST>|W|vectorBinDisectF32
     vectorBinDisectF32(): ordinate 100.000000 is outside vector range (0.000000 - 23.000000).
-<DATE><TIME>|<HOST>|W|pmNonLinearityLookup
+<HOST>|W|pmNonLinearityLookup
     WARNING: pmNonLinear.c: pmNonLinearityLookup(): 1 pixels outside table.
 
Index: trunk/psModules/test/verified/tst_pmNonLinear.stdout
===================================================================
--- trunk/psModules/test/verified/tst_pmNonLinear.stdout	(revision 4579)
+++ trunk/psModules/test/verified/tst_pmNonLinear.stdout	(revision 4770)
@@ -84,7 +84,7 @@
 Calling pmNonLinearityPolynomial() with NULL polynomial.  Should generate error, return NULL.
 ------------------------------------------------------------
-Calling pmNonLinearityLookup() with NULL input psReadout.  Should generate error, return NULL.
+Calling pmNonLinearityLookup() with NULL input pmReadout.  Should generate error, return NULL.
 ------------------------------------------------------------
-Calling pmNonLinearityLookup() with NULL input psReadout->image.  Should generate error, return NULL.
+Calling pmNonLinearityLookup() with NULL input pmReadout->image.  Should generate error, return NULL.
 ------------------------------------------------------------
 Calling pmNonLinearityLookup() with NULL inFlux psVector.  Should generate error, return NULL.
@@ -104,5 +104,5 @@
 Calling pmNonLinearityLookup() with size difference in inFlux/outFLux psVectors.  Should generate warning.
 ------------------------------------------------------------
-Calling pmNonLinearityLookup() with inFlux psVector size 1.  Should generate error, return original psReadout.
+Calling pmNonLinearityLookup() with inFlux psVector size 1.  Should generate error, return original pmReadout.
 ------------------------------------------------------------
 Calling pmNonLinearityLookup() with one pixels outside inFlux range.  Should generate warnings.
Index: trunk/psModules/test/verified/tst_pmObjects01.stderr
===================================================================
--- trunk/psModules/test/verified/tst_pmObjects01.stderr	(revision 4579)
+++ trunk/psModules/test/verified/tst_pmObjects01.stderr	(revision 4770)
@@ -14,9 +14,9 @@
 \**********************************************************************************/
 
-<DATE><TIME>|<HOST>|E|pmFindVectorPeaks (FILE:LINENO)
+<HOST>|E|pmFindVectorPeaks (FILE:LINENO)
     Unallowable operation: psVector vector or its data is NULL.
-<DATE><TIME>|<HOST>|E|pmFindVectorPeaks (FILE:LINENO)
+<HOST>|E|pmFindVectorPeaks (FILE:LINENO)
     Unallowable operation: psVector vector has no elements.
-<DATE><TIME>|<HOST>|E|pmFindVectorPeaks (FILE:LINENO)
+<HOST>|E|pmFindVectorPeaks (FILE:LINENO)
     Unallowable operation: psVector vector has incorrect type.
 
@@ -29,11 +29,11 @@
 \**********************************************************************************/
 
-<DATE><TIME>|<HOST>|E|psImageAlloc (FILE:LINENO)
+<HOST>|E|psImageAlloc (FILE:LINENO)
     Specified number of rows (0) or columns (0) is invalid.
-<DATE><TIME>|<HOST>|E|pmFindImagePeaks (FILE:LINENO)
-    Unallowable operation: psImage image or its data is NULL.
-<DATE><TIME>|<HOST>|E|pmFindImagePeaks (FILE:LINENO)
-    Unallowable operation: psImage image or its data is NULL.
-<DATE><TIME>|<HOST>|E|pmFindImagePeaks (FILE:LINENO)
+<HOST>|E|pmFindImagePeaks (FILE:LINENO)
+    Unallowable operation: psImage image or its data is NULL.
+<HOST>|E|pmFindImagePeaks (FILE:LINENO)
+    Unallowable operation: psImage image or its data is NULL.
+<HOST>|E|pmFindImagePeaks (FILE:LINENO)
     Unallowable operation: psImage image has incorrect type.
 
@@ -55,13 +55,13 @@
 \**********************************************************************************/
 
-<DATE><TIME>|<HOST>|E|pmSourceLocalSky (FILE:LINENO)
-    Unallowable operation: psImage image or its data is NULL.
-<DATE><TIME>|<HOST>|E|pmSourceLocalSky (FILE:LINENO)
+<HOST>|E|pmSourceLocalSky (FILE:LINENO)
+    Unallowable operation: psImage image or its data is NULL.
+<HOST>|E|pmSourceLocalSky (FILE:LINENO)
     Unallowable operation: psImage image has incorrect type.
-<DATE><TIME>|<HOST>|E|pmSourceLocalSky (FILE:LINENO)
+<HOST>|E|pmSourceLocalSky (FILE:LINENO)
     Unallowable operation: peak is NULL.
-<DATE><TIME>|<HOST>|E|pmSourceLocalSky (FILE:LINENO)
+<HOST>|E|pmSourceLocalSky (FILE:LINENO)
     Error: (0.0 > innerRadius) (0.000000 -10.000000)
-<DATE><TIME>|<HOST>|E|pmSourceLocalSky (FILE:LINENO)
+<HOST>|E|pmSourceLocalSky (FILE:LINENO)
     Error: (innerRadius > outerRadius) (10.000000 5.000000)
 
@@ -74,11 +74,11 @@
 \**********************************************************************************/
 
-<DATE><TIME>|<HOST>|E|pmSourceSetPixelsCircle (FILE:LINENO)
-    Unallowable operation: source is NULL.
-<DATE><TIME>|<HOST>|E|pmSourceSetPixelsCircle (FILE:LINENO)
-    Unallowable operation: psImage image or its data is NULL.
-<DATE><TIME>|<HOST>|E|pmSourceSetPixelsCircle (FILE:LINENO)
+<HOST>|E|pmSourceSetPixelsCircle (FILE:LINENO)
+    Unallowable operation: source is NULL.
+<HOST>|E|pmSourceSetPixelsCircle (FILE:LINENO)
+    Unallowable operation: psImage image or its data is NULL.
+<HOST>|E|pmSourceSetPixelsCircle (FILE:LINENO)
     Unallowable operation: psImage image has incorrect type.
-<DATE><TIME>|<HOST>|E|pmSourceSetPixelsCircle (FILE:LINENO)
+<HOST>|E|pmSourceSetPixelsCircle (FILE:LINENO)
     Error: (0.0 > radius) (0.000000 -10.000000)
 
@@ -91,7 +91,7 @@
 \**********************************************************************************/
 
-<DATE><TIME>|<HOST>|E|pmSourceMoments (FILE:LINENO)
-    Unallowable operation: source is NULL.
-<DATE><TIME>|<HOST>|E|pmSourceMoments (FILE:LINENO)
+<HOST>|E|pmSourceMoments (FILE:LINENO)
+    Unallowable operation: source is NULL.
+<HOST>|E|pmSourceMoments (FILE:LINENO)
     Error: (0.0 > radius) (0.000000 -10.000000)
 
@@ -104,31 +104,31 @@
 \**********************************************************************************/
 
-<DATE><TIME>|<HOST>|E|pmMinLM_Gauss2D (FILE:LINENO)
-    Unallowable operation: psVector params or its data is NULL.
-<DATE><TIME>|<HOST>|E|pmMinLM_Gauss2D (FILE:LINENO)
-    Unallowable operation: psVector x or its data is NULL.
-<DATE><TIME>|<HOST>|E|pmMinLM_PsuedoGauss2D (FILE:LINENO)
-    Unallowable operation: psVector params or its data is NULL.
-<DATE><TIME>|<HOST>|E|pmMinLM_PsuedoGauss2D (FILE:LINENO)
-    Unallowable operation: psVector x or its data is NULL.
-<DATE><TIME>|<HOST>|E|pmMinLM_Wauss2D (FILE:LINENO)
-    Unallowable operation: psVector params or its data is NULL.
-<DATE><TIME>|<HOST>|E|pmMinLM_Wauss2D (FILE:LINENO)
-    Unallowable operation: psVector x or its data is NULL.
-<DATE><TIME>|<HOST>|E|pmMinLM_TwistGauss2D (FILE:LINENO)
-    Unallowable operation: psVector params or its data is NULL.
-<DATE><TIME>|<HOST>|E|pmMinLM_TwistGauss2D (FILE:LINENO)
-    Unallowable operation: psVector x or its data is NULL.
-<DATE><TIME>|<HOST>|E|pmMinLM_Sersic (FILE:LINENO)
+<HOST>|E|pmMinLM_Gauss2D (FILE:LINENO)
+    Unallowable operation: psVector params or its data is NULL.
+<HOST>|E|pmMinLM_Gauss2D (FILE:LINENO)
+    Unallowable operation: psVector x or its data is NULL.
+<HOST>|E|pmMinLM_PsuedoGauss2D (FILE:LINENO)
+    Unallowable operation: psVector params or its data is NULL.
+<HOST>|E|pmMinLM_PsuedoGauss2D (FILE:LINENO)
+    Unallowable operation: psVector x or its data is NULL.
+<HOST>|E|pmMinLM_Wauss2D (FILE:LINENO)
+    Unallowable operation: psVector params or its data is NULL.
+<HOST>|E|pmMinLM_Wauss2D (FILE:LINENO)
+    Unallowable operation: psVector x or its data is NULL.
+<HOST>|E|pmMinLM_TwistGauss2D (FILE:LINENO)
+    Unallowable operation: psVector params or its data is NULL.
+<HOST>|E|pmMinLM_TwistGauss2D (FILE:LINENO)
+    Unallowable operation: psVector x or its data is NULL.
+<HOST>|E|pmMinLM_Sersic (FILE:LINENO)
     This function is not implemented yet.
-<DATE><TIME>|<HOST>|E|pmMinLM_Sersic (FILE:LINENO)
-    Unallowable operation: psVector params or its data is NULL.
-<DATE><TIME>|<HOST>|E|pmMinLM_Sersic (FILE:LINENO)
-    Unallowable operation: psVector x or its data is NULL.
-<DATE><TIME>|<HOST>|E|pmMinLM_SersicCore (FILE:LINENO)
+<HOST>|E|pmMinLM_Sersic (FILE:LINENO)
+    Unallowable operation: psVector params or its data is NULL.
+<HOST>|E|pmMinLM_Sersic (FILE:LINENO)
+    Unallowable operation: psVector x or its data is NULL.
+<HOST>|E|pmMinLM_SersicCore (FILE:LINENO)
     This function is not implemented yet.
-<DATE><TIME>|<HOST>|E|pmMinLM_SersicCore (FILE:LINENO)
-    Unallowable operation: psVector params or its data is NULL.
-<DATE><TIME>|<HOST>|E|pmMinLM_SersicCore (FILE:LINENO)
+<HOST>|E|pmMinLM_SersicCore (FILE:LINENO)
+    Unallowable operation: psVector params or its data is NULL.
+<HOST>|E|pmMinLM_SersicCore (FILE:LINENO)
     Unallowable operation: psVector x or its data is NULL.
 
@@ -141,20 +141,20 @@
 \**********************************************************************************/
 
-<DATE><TIME>|<HOST>|E|pmSourceModelGuess (FILE:LINENO)
-    Unallowable operation: source is NULL.
-<DATE><TIME>|<HOST>|E|pmSourceModelGuess (FILE:LINENO)
-    Unallowable operation: psImage image or its data is NULL.
-<DATE><TIME>|<HOST>|E|pmSourceModelGuess (FILE:LINENO)
+<HOST>|E|pmSourceModelGuess (FILE:LINENO)
+    Unallowable operation: source is NULL.
+<HOST>|E|pmSourceModelGuess (FILE:LINENO)
+    Unallowable operation: psImage image or its data is NULL.
+<HOST>|E|pmSourceModelGuess (FILE:LINENO)
     Undefined psModelType
-<DATE><TIME>|<HOST>|W|pmSourceModelGuess
-    WARNING: source->models was non-NULL; calling psFree(source->models).
-<DATE><TIME>|<HOST>|W|pmSourceModelGuess
-    WARNING: source->models was non-NULL; calling psFree(source->models).
-<DATE><TIME>|<HOST>|W|pmSourceModelGuess
-    WARNING: source->models was non-NULL; calling psFree(source->models).
-<DATE><TIME>|<HOST>|W|pmSourceModelGuess
-    WARNING: source->models was non-NULL; calling psFree(source->models).
-<DATE><TIME>|<HOST>|W|pmSourceModelGuess
-    WARNING: source->models was non-NULL; calling psFree(source->models).
+<HOST>|W|pmSourceModelGuess
+    WARNING: source->modelPSF was non-NULL; calling psFree(source->modelPSF).
+<HOST>|W|pmSourceModelGuess
+    WARNING: source->modelPSF was non-NULL; calling psFree(source->modelPSF).
+<HOST>|W|pmSourceModelGuess
+    WARNING: source->modelPSF was non-NULL; calling psFree(source->modelPSF).
+<HOST>|W|pmSourceModelGuess
+    WARNING: source->modelPSF was non-NULL; calling psFree(source->modelPSF).
+<HOST>|W|pmSourceModelGuess
+    WARNING: source->modelPSF was non-NULL; calling psFree(source->modelPSF).
 
 ---> TESTPOINT PASSED (Test Point Driver{pmObjects: pmSourceModelGuess()} | tst_pmObjects01.c)
@@ -166,7 +166,7 @@
 \**********************************************************************************/
 
-<DATE><TIME>|<HOST>|E|pmSourceContour (FILE:LINENO)
-    Unallowable operation: source is NULL.
-<DATE><TIME>|<HOST>|E|pmSourceContour (FILE:LINENO)
+<HOST>|E|pmSourceContour (FILE:LINENO)
+    Unallowable operation: source is NULL.
+<HOST>|E|pmSourceContour (FILE:LINENO)
     Unallowable operation: image is NULL.
 
@@ -179,7 +179,7 @@
 \**********************************************************************************/
 
-<DATE><TIME>|<HOST>|E|sourceAddOrSubModel (FILE:LINENO)
-    Unallowable operation: psImage image or its data is NULL.
-<DATE><TIME>|<HOST>|E|sourceAddOrSubModel (FILE:LINENO)
+<HOST>|E|sourceAddOrSubModel (FILE:LINENO)
+    Unallowable operation: psImage image or its data is NULL.
+<HOST>|E|sourceAddOrSubModel (FILE:LINENO)
     Unallowable operation: src is NULL.
 
@@ -192,7 +192,7 @@
 \**********************************************************************************/
 
-<DATE><TIME>|<HOST>|E|sourceAddOrSubModel (FILE:LINENO)
-    Unallowable operation: psImage image or its data is NULL.
-<DATE><TIME>|<HOST>|E|sourceAddOrSubModel (FILE:LINENO)
+<HOST>|E|sourceAddOrSubModel (FILE:LINENO)
+    Unallowable operation: psImage image or its data is NULL.
+<HOST>|E|sourceAddOrSubModel (FILE:LINENO)
     Unallowable operation: src is NULL.
 
@@ -205,7 +205,7 @@
 \**********************************************************************************/
 
-<DATE><TIME>|<HOST>|E|pmSourceFitModel (FILE:LINENO)
-    Unallowable operation: psImage image or its data is NULL.
-<DATE><TIME>|<HOST>|E|pmSourceFitModel (FILE:LINENO)
+<HOST>|E|pmSourceFitModel (FILE:LINENO)
+    Unallowable operation: psImage image or its data is NULL.
+<HOST>|E|pmSourceFitModel (FILE:LINENO)
     Unallowable operation: source is NULL.
 
Index: trunk/psModules/test/verified/tst_pmObjects01.stdout
===================================================================
--- trunk/psModules/test/verified/tst_pmObjects01.stdout	(revision 4579)
+++ trunk/psModules/test/verified/tst_pmObjects01.stdout	(revision 4770)
@@ -81,5 +81,5 @@
 Calling pmSourceLocalSky with wrong-type psImage.  Should generate error and return NULL.
 ----------------------------------------------------------------------------------
-Calling pmSourceLocalSky with NULL psPeak.  Should generate error and return NULL.
+Calling pmSourceLocalSky with NULL pmPeak.  Should generate error and return NULL.
 ----------------------------------------------------------------------------------
 Calling pmSourceLocalSky with innerRadius<0.0.  Should generate error and return NULL.
@@ -90,5 +90,5 @@
 ----------------------------------------------------------------------------------
 ----------------------------------------------------------------------------------
-Calling pmSourceSetPixelsCircle with NULL psSource.  Should generate error and return NULL.
+Calling pmSourceSetPixelsCircle with NULL pmSource.  Should generate error and return NULL.
 ----------------------------------------------------------------------------------
 Calling pmSourceSetPixelsCircle with NULL psImage.  Should generate error and return NULL.
@@ -101,5 +101,5 @@
 ----------------------------------------------------------------------------------
 ----------------------------------------------------------------------------------
-Calling pmSourceMoments with NULL psSource.  Should generate error and return NULL.
+Calling pmSourceMoments with NULL pmSource.  Should generate error and return NULL.
 ----------------------------------------------------------------------------------
 Calling pmSourceMoments with radius < 0.0.  Should generate error and return NULL.
@@ -143,5 +143,5 @@
 Calling pmSourceLocalSky with valid data.
 ----------------------------------------------------------------------------------
-Calling pmSourceModelGuess with NULL psSource.  Should generate error, return FALSE.
+Calling pmSourceModelGuess with NULL pmSource.  Should generate error, return FALSE.
 ----------------------------------------------------------------------------------
 Calling pmSourceModelGuess with NULL psImage.  Should generate error, return FALSE.
@@ -162,5 +162,5 @@
 Calling pmSourceLocalSky with valid data.
 ----------------------------------------------------------------------------------
-Calling pmSourceContour with NULL psSource .  Should generate error, return NULL.
+Calling pmSourceContour with NULL pmSource .  Should generate error, return NULL.
 ----------------------------------------------------------------------------------
 Calling pmSourceContour with NULL psImage .  Should generate error, return NULL.
@@ -183,5 +183,5 @@
 Calling pmSourceFitModel with NULL psImage.  Should generate error, return FALSE.
 ----------------------------------------------------------------------------------
-Calling pmSourceFitModel with NULL psSource.  Should generate error, return FALSE.
+Calling pmSourceFitModel with NULL pmSource.  Should generate error, return FALSE.
 ----------------------------------------------------------------------------------
 Calling pmSourceFitModel with acceptable data.
Index: trunk/psModules/test/verified/tst_pmSubtractSky.stderr
===================================================================
--- trunk/psModules/test/verified/tst_pmSubtractSky.stderr	(revision 4579)
+++ trunk/psModules/test/verified/tst_pmSubtractSky.stderr	(revision 4770)
@@ -5,27 +5,27 @@
 \**********************************************************************************/
 
-<DATE><TIME>|<HOST>|W|p_psVectorSampleStdev
+<HOST>|W|p_psVectorSampleStdev
     WARNING: p_psVectorSampleStdev(): only one valid psVector elements (1).  Setting stats->sampleStdev = 0.0.
-<DATE><TIME>|<HOST>|W|ImageFitPolynomial
+<HOST>|W|ImageFitPolynomial
     WARNING: ImageFitPolynomial(): Reducing polynomial complexity in x-dimension.
-<DATE><TIME>|<HOST>|W|ImageFitPolynomial
+<HOST>|W|ImageFitPolynomial
     WARNING: ImageFitPolynomial(): Reducing polynomial complexity in y-dimension.
-<DATE><TIME>|<HOST>|W|ImageFitPolynomial
+<HOST>|W|ImageFitPolynomial
     WARNING: ImageFitPolynomial(): Reducing polynomial complexity in x-dimension.
-<DATE><TIME>|<HOST>|W|ImageFitPolynomial
+<HOST>|W|ImageFitPolynomial
     WARNING: ImageFitPolynomial(): Reducing polynomial complexity in y-dimension.
-<DATE><TIME>|<HOST>|W|p_psVectorSampleStdev
+<HOST>|W|p_psVectorSampleStdev
     WARNING: p_psVectorSampleStdev(): only one valid psVector elements (1).  Setting stats->sampleStdev = 0.0.
-<DATE><TIME>|<HOST>|W|ImageFitPolynomial
+<HOST>|W|ImageFitPolynomial
     WARNING: ImageFitPolynomial(): Reducing polynomial complexity in x-dimension.
-<DATE><TIME>|<HOST>|W|ImageFitPolynomial
+<HOST>|W|ImageFitPolynomial
     WARNING: ImageFitPolynomial(): Reducing polynomial complexity in y-dimension.
-<DATE><TIME>|<HOST>|W|ImageFitPolynomial
+<HOST>|W|ImageFitPolynomial
     WARNING: ImageFitPolynomial(): Reducing polynomial complexity in x-dimension.
-<DATE><TIME>|<HOST>|W|ImageFitPolynomial
+<HOST>|W|ImageFitPolynomial
     WARNING: ImageFitPolynomial(): Reducing polynomial complexity in y-dimension.
-<DATE><TIME>|<HOST>|W|ImageFitPolynomial
+<HOST>|W|ImageFitPolynomial
     WARNING: ImageFitPolynomial(): Reducing polynomial complexity in x-dimension.
-<DATE><TIME>|<HOST>|W|ImageFitPolynomial
+<HOST>|W|ImageFitPolynomial
     WARNING: ImageFitPolynomial(): Reducing polynomial complexity in y-dimension.
 
@@ -38,23 +38,23 @@
 \**********************************************************************************/
 
-<DATE><TIME>|<HOST>|E|pmSubtractSky (FILE:LINENO)
+<HOST>|E|pmSubtractSky (FILE:LINENO)
     Unallowable operation: psReadout in or its data is NULL.
-<DATE><TIME>|<HOST>|E|pmSubtractSky (FILE:LINENO)
+<HOST>|E|pmSubtractSky (FILE:LINENO)
     Unallowable operation: psReadout in or its data is NULL.
-<DATE><TIME>|<HOST>|E|pmSubtractSky (FILE:LINENO)
+<HOST>|E|pmSubtractSky (FILE:LINENO)
     Unallowable operation: psImage in has incorrect type.
-<DATE><TIME>|<HOST>|W|pmSubtractSky
+<HOST>|W|pmSubtractSky
     WARNING: pmSubtractSky(): input parameter stats is NULL
-<DATE><TIME>|<HOST>|W|pmSubtractSky
+<HOST>|W|pmSubtractSky
     WARNING: pmSubtractSky(): no stats->options was requested
-<DATE><TIME>|<HOST>|W|pmSubtractSky
+<HOST>|W|pmSubtractSky
     WARNING: Multiple statistical options have been requested.
-<DATE><TIME>|<HOST>|W|pmSubtractSky
+<HOST>|W|pmSubtractSky
     WARNING: pmSubtractSky(): binFactor is 0
-<DATE><TIME>|<HOST>|W|pmSubtractSky
+<HOST>|W|pmSubtractSky
     WARNING: pmSubtractSky(): binFactor is -1
-<DATE><TIME>|<HOST>|W|pmSubtractSky
+<HOST>|W|pmSubtractSky
     WARNING: pmSubtractSky(): clipSD is -1.000000
-<DATE><TIME>|<HOST>|E|pmSubtractSky (FILE:LINENO)
+<HOST>|E|pmSubtractSky (FILE:LINENO)
     psFit is unallowable (54321).  Returning in image.
 
Index: trunk/psModules/test/verified/tst_pmSubtractSky.stdout
===================================================================
--- trunk/psModules/test/verified/tst_pmSubtractSky.stdout	(revision 4579)
+++ trunk/psModules/test/verified/tst_pmSubtractSky.stdout	(revision 4770)
@@ -176,11 +176,11 @@
 
 ----------------------------------------------------------------
-Calling pmSubtractSky() with NULL psReadout.  Should error.
-
-----------------------------------------------------------------
-Calling pmSubtractSky() with NULL psReadout->image.  Should error.
-
-----------------------------------------------------------------
-Calling pmSubtractSky() with PS_TYPE_F64 psReadout->image.  Should error.
+Calling pmSubtractSky() with NULL pmReadout.  Should error.
+
+----------------------------------------------------------------
+Calling pmSubtractSky() with NULL pmReadout->image.  Should error.
+
+----------------------------------------------------------------
+Calling pmSubtractSky() with PS_TYPE_F64 pmReadout->image.  Should error.
 
 ----------------------------------------------------------------