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) {