Index: trunk/psModules/test/tst_pmSubtractSky.c
===================================================================
--- trunk/psModules/test/tst_pmSubtractSky.c	(revision 3595)
+++ 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;
     }