Index: /trunk/psModules/test/verified/tst_pmImageSubtract.stderr
===================================================================
--- /trunk/psModules/test/verified/tst_pmImageSubtract.stderr	(revision 4200)
+++ /trunk/psModules/test/verified/tst_pmImageSubtract.stderr	(revision 4200)
@@ -0,0 +1,112 @@
+/***************************** TESTPOINT ******************************************\
+*             TestFile: tst_pmImageSubtract.c                                      *
+*            TestPoint: Test Point Driver{pmSubtractionKernelsAllocPOIS()}         *
+*             TestType: Positive                                                   *
+\**********************************************************************************/
+
+
+---> TESTPOINT PASSED (Test Point Driver{pmSubtractionKernelsAllocPOIS()} | tst_pmImageSubtract.c)
+
+/***************************** TESTPOINT ******************************************\
+*             TestFile: tst_pmImageSubtract.c                                      *
+*            TestPoint: Test Point Driver{pmSubtractionKernelsAllocISIS()}         *
+*             TestType: Positive                                                   *
+\**********************************************************************************/
+
+
+---> TESTPOINT PASSED (Test Point Driver{pmSubtractionKernelsAllocISIS()} | tst_pmImageSubtract.c)
+
+/***************************** TESTPOINT ******************************************\
+*             TestFile: tst_pmImageSubtract.c                                      *
+*            TestPoint: Test Point Driver{pmSubtractionFindStamps()}               *
+*             TestType: Positive                                                   *
+\**********************************************************************************/
+
+<DATE><TIME>|<HOST>|E|pmSubtractionFindStamps (FILE:LINENO)
+    Unallowable operation: psImage image or its data is NULL.
+<DATE><TIME>|<HOST>|E|pmSubtractionFindStamps (FILE:LINENO)
+    Error: xNum is 0 or less.
+<DATE><TIME>|<HOST>|E|pmSubtractionFindStamps (FILE:LINENO)
+    Error: yNum is 0 or less.
+<DATE><TIME>|<HOST>|E|pmSubtractionFindStamps (FILE:LINENO)
+    Error: border is 0 or less.
+<DATE><TIME>|<HOST>|E|pmSubtractionFindStamps (FILE:LINENO)
+    Unallowable operation: psImage image or its data is NULL.
+<DATE><TIME>|<HOST>|E|pmSubtractionFindStamps (FILE:LINENO)
+    Error: xNum is 0 or less.
+<DATE><TIME>|<HOST>|E|pmSubtractionFindStamps (FILE:LINENO)
+    Error: yNum is 0 or less.
+<DATE><TIME>|<HOST>|E|pmSubtractionFindStamps (FILE:LINENO)
+    Error: border is 0 or less.
+
+---> TESTPOINT PASSED (Test Point Driver{pmSubtractionFindStamps()} | tst_pmImageSubtract.c)
+
+/***************************** TESTPOINT ******************************************\
+*             TestFile: tst_pmImageSubtract.c                                      *
+*            TestPoint: Test Point Driver{pmSubtractionCalculateEquation()}        *
+*             TestType: Positive                                                   *
+\**********************************************************************************/
+
+<DATE><TIME>|<HOST>|E|pmSubtractionCalculateEquation (FILE:LINENO)
+    Unallowable operation: stamps is NULL.
+<DATE><TIME>|<HOST>|E|pmSubtractionCalculateEquation (FILE:LINENO)
+    Unallowable operation: psImage reference or its data is NULL.
+<DATE><TIME>|<HOST>|E|pmSubtractionCalculateEquation (FILE:LINENO)
+    Unallowable operation: psImage input or its data is NULL.
+<DATE><TIME>|<HOST>|E|pmSubtractionCalculateEquation (FILE:LINENO)
+    Unallowable operation: kernels is NULL.
+<DATE><TIME>|<HOST>|E|pmSubtractionSolveEquation (FILE:LINENO)
+    Unallowable operation: stamps is NULL.
+<DATE><TIME>|<HOST>|W|psVectorStats
+    WARNING: psVectorStats(): p_psVectorSampleMean() returned an error.
+<DATE><TIME>|<HOST>|W|psVectorStats
+    WARNING: psVectorStats(): p_psVectorSampleMean() returned an error.
+<DATE><TIME>|<HOST>|W|psVectorStats
+    WARNING: psVectorStats(): p_psVectorSampleMean() returned an error.
+<DATE><TIME>|<HOST>|W|psVectorStats
+    WARNING: psVectorStats(): p_psVectorSampleMean() returned an error.
+<DATE><TIME>|<HOST>|E|pmSubtractionKernelImage (FILE:LINENO)
+    Unallowable operation: psVector solution or its data is NULL.
+<DATE><TIME>|<HOST>|E|pmSubtractionKernelImage (FILE:LINENO)
+    Unallowable operation: kernels is NULL.
+<DATE><TIME>|<HOST>|E|pmSubtractionKernelImage (FILE:LINENO)
+    Error: x, -2.000000, is out of range.  Must be between -1.000000 and 1.000000.
+<DATE><TIME>|<HOST>|E|pmSubtractionKernelImage (FILE:LINENO)
+    Error: x, 2.000000, is out of range.  Must be between -1.000000 and 1.000000.
+<DATE><TIME>|<HOST>|E|pmSubtractionKernelImage (FILE:LINENO)
+    Error: y, -2.000000, is out of range.  Must be between -1.000000 and 1.000000.
+<DATE><TIME>|<HOST>|E|pmSubtractionKernelImage (FILE:LINENO)
+    Error: y, 2.000000, is out of range.  Must be between -1.000000 and 1.000000.
+<DATE><TIME>|<HOST>|E|pmSubtractionCalculateEquation (FILE:LINENO)
+    Unallowable operation: stamps is NULL.
+<DATE><TIME>|<HOST>|E|pmSubtractionCalculateEquation (FILE:LINENO)
+    Unallowable operation: psImage reference or its data is NULL.
+<DATE><TIME>|<HOST>|E|pmSubtractionCalculateEquation (FILE:LINENO)
+    Unallowable operation: psImage input or its data is NULL.
+<DATE><TIME>|<HOST>|E|pmSubtractionCalculateEquation (FILE:LINENO)
+    Unallowable operation: kernels is NULL.
+<DATE><TIME>|<HOST>|E|pmSubtractionSolveEquation (FILE:LINENO)
+    Unallowable operation: stamps is NULL.
+<DATE><TIME>|<HOST>|W|psVectorStats
+    WARNING: psVectorStats(): p_psVectorSampleMean() returned an error.
+<DATE><TIME>|<HOST>|W|psVectorStats
+    WARNING: psVectorStats(): p_psVectorSampleMean() returned an error.
+<DATE><TIME>|<HOST>|W|psVectorStats
+    WARNING: psVectorStats(): p_psVectorSampleMean() returned an error.
+<DATE><TIME>|<HOST>|W|psVectorStats
+    WARNING: psVectorStats(): p_psVectorSampleMean() returned an error.
+<DATE><TIME>|<HOST>|E|pmSubtractionKernelImage (FILE:LINENO)
+    Unallowable operation: psVector solution or its data is NULL.
+<DATE><TIME>|<HOST>|E|pmSubtractionKernelImage (FILE:LINENO)
+    Unallowable operation: kernels is NULL.
+<DATE><TIME>|<HOST>|E|pmSubtractionKernelImage (FILE:LINENO)
+    Error: x, -2.000000, is out of range.  Must be between -1.000000 and 1.000000.
+<DATE><TIME>|<HOST>|E|pmSubtractionKernelImage (FILE:LINENO)
+    Error: x, 2.000000, is out of range.  Must be between -1.000000 and 1.000000.
+<DATE><TIME>|<HOST>|E|pmSubtractionKernelImage (FILE:LINENO)
+    Error: y, -2.000000, is out of range.  Must be between -1.000000 and 1.000000.
+<DATE><TIME>|<HOST>|E|pmSubtractionKernelImage (FILE:LINENO)
+    Error: y, 2.000000, is out of range.  Must be between -1.000000 and 1.000000.
+
+---> TESTPOINT PASSED (Test Point Driver{pmSubtractionCalculateEquation()} | tst_pmImageSubtract.c)
+
Index: /trunk/psModules/test/verified/tst_pmImageSubtract.stdout
===================================================================
--- /trunk/psModules/test/verified/tst_pmImageSubtract.stdout	(revision 4200)
+++ /trunk/psModules/test/verified/tst_pmImageSubtract.stdout	(revision 4200)
@@ -0,0 +1,63 @@
+Testing pmSubtractionKernelsAllocPOIS(1, 1)
+Testing pmSubtractionKernelsAllocPOIS(2, 3)
+Testing pmSubtractionKernelsAllocPOIS(3, 4)
+Testing pmSubtractionKernelsAllocISIS(1, 1, 1, 1)
+Testing pmSubtractionKernelsAllocISIS(2, 2, 2, 2)
+Testing pmSubtractionKernelsAllocISIS(2, 3, 4, 5)
+Testing pmSubtractionKernelsAllocISIS(3, 4, 5, 6)
+Testing pmSubtractionFindStamps(100, 100, 2, 2, 2)
+Calling with a NULL psImage.  Should generate error, return NULL.
+Calling with a non-positive xNum.  Should generate error, return NULL.
+Calling with a non-positive yNum.  Should generate error, return NULL.
+Calling with a non-positive border.  Should generate error, return NULL.
+Calling with acceptable input parameters, non-NULL mask.
+Calling with acceptable input parameters, NULL mask.
+Testing pmSubtractionFindStamps(100, 100, 10, 10, 2)
+Calling with a NULL psImage.  Should generate error, return NULL.
+Calling with a non-positive xNum.  Should generate error, return NULL.
+Calling with a non-positive yNum.  Should generate error, return NULL.
+Calling with a non-positive border.  Should generate error, return NULL.
+Calling with acceptable input parameters, non-NULL mask.
+Calling with acceptable input parameters, NULL mask.
+Testing pmSubtractionCalculateEquation(): 
+    image size is (100, 100)
+    num stamps is (2, 2).  Border is 3
+   kernel type is PM_SUBTRACTION_KERNEL_POIS.
+Generating stamps...
+Generating kernel basis functions...
+Calling with a NULL psArray stamps.  Should generate error, return FALSE.
+Calling with a NULL reference images.  Should generate error, return FALSE.
+Calling with a NULL input images.  Should generate error, return FALSE.
+Calling with a NULL kernel basis functions.  Should generate error, return FALSE.
+Calling with acceptable input parameters.  Should return TRUE.
+Calling pmSubtractionSolveEquation() with a NULL stamp argument.  Should generate error, return FALSE.
+Calling with pmSubtractionSolveEquation() acceptable input parameters.  Should return non-NULL.
+Calling with pmSubtractionRejectStamps() acceptable input parameters.  Should return TRUE.
+Calling pmSubtractionKernelImage() with NULL solution.  Should generate error, return NULL.
+Calling pmSubtractionKernelImage() with NULL kernels.  Should generate error, return NULL.
+Calling pmSubtractionKernelImage() unallowable x value.  Should generate error, return NULL.
+Calling pmSubtractionKernelImage() unallowable x value.  Should generate error, return NULL.
+Calling pmSubtractionKernelImage() unallowable y value.  Should generate error, return NULL.
+Calling pmSubtractionKernelImage() unallowable y value.  Should generate error, return NULL.
+Calling with pmSubtractionKernelImage() acceptable input parameters.  Should return a psImage.
+Testing pmSubtractionCalculateEquation(): 
+    image size is (100, 100)
+    num stamps is (2, 2).  Border is 3
+   kernel type is PM_SUBTRACTION_KERNEL_ISIS.
+Generating stamps...
+Generating kernel basis functions...
+Calling with a NULL psArray stamps.  Should generate error, return FALSE.
+Calling with a NULL reference images.  Should generate error, return FALSE.
+Calling with a NULL input images.  Should generate error, return FALSE.
+Calling with a NULL kernel basis functions.  Should generate error, return FALSE.
+Calling with acceptable input parameters.  Should return TRUE.
+Calling pmSubtractionSolveEquation() with a NULL stamp argument.  Should generate error, return FALSE.
+Calling with pmSubtractionSolveEquation() acceptable input parameters.  Should return non-NULL.
+Calling with pmSubtractionRejectStamps() acceptable input parameters.  Should return TRUE.
+Calling pmSubtractionKernelImage() with NULL solution.  Should generate error, return NULL.
+Calling pmSubtractionKernelImage() with NULL kernels.  Should generate error, return NULL.
+Calling pmSubtractionKernelImage() unallowable x value.  Should generate error, return NULL.
+Calling pmSubtractionKernelImage() unallowable x value.  Should generate error, return NULL.
+Calling pmSubtractionKernelImage() unallowable y value.  Should generate error, return NULL.
+Calling pmSubtractionKernelImage() unallowable y value.  Should generate error, return NULL.
+Calling with pmSubtractionKernelImage() acceptable input parameters.  Should return a psImage.
Index: /trunk/psModules/test/verified/tst_pmObjects01.stderr
===================================================================
--- /trunk/psModules/test/verified/tst_pmObjects01.stderr	(revision 4199)
+++ /trunk/psModules/test/verified/tst_pmObjects01.stderr	(revision 4200)
@@ -70,18 +70,18 @@
 /***************************** TESTPOINT ******************************************\
 *             TestFile: tst_pmObjects01.c                                          *
-*            TestPoint: Test Point Driver{pmObjects: pmSourceSetPixelCircle()}     *
-*             TestType: Positive                                                   *
-\**********************************************************************************/
-
-<DATE><TIME>|<HOST>|E|pmSourceSetPixelCircle (FILE:LINENO)
-    Unallowable operation: source is NULL.
-<DATE><TIME>|<HOST>|E|pmSourceSetPixelCircle (FILE:LINENO)
-    Unallowable operation: psImage image or its data is NULL.
-<DATE><TIME>|<HOST>|E|pmSourceSetPixelCircle (FILE:LINENO)
+*            TestPoint: Test Point Driver{pmObjects: pmSourceSetPixelsCircle()}    *
+*             TestType: Positive                                                   *
+\**********************************************************************************/
+
+<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)
     Unallowable operation: psImage image has incorrect type.
-<DATE><TIME>|<HOST>|E|pmSourceSetPixelCircle (FILE:LINENO)
+<DATE><TIME>|<HOST>|E|pmSourceSetPixelsCircle (FILE:LINENO)
     Error: (0.0 > radius) (0.000000 -10.000000)
 
----> TESTPOINT PASSED (Test Point Driver{pmObjects: pmSourceSetPixelCircle()} | tst_pmObjects01.c)
+---> TESTPOINT PASSED (Test Point Driver{pmObjects: pmSourceSetPixelsCircle()} | tst_pmObjects01.c)
 
 /***************************** TESTPOINT ******************************************\
Index: /trunk/psModules/test/verified/tst_pmObjects01.stdout
===================================================================
--- /trunk/psModules/test/verified/tst_pmObjects01.stdout	(revision 4199)
+++ /trunk/psModules/test/verified/tst_pmObjects01.stdout	(revision 4200)
@@ -90,13 +90,13 @@
 ----------------------------------------------------------------------------------
 ----------------------------------------------------------------------------------
-Calling pmSourceSetPixelCircle with NULL psSource.  Should generate error and return NULL.
+Calling pmSourceSetPixelsCircle with NULL psSource.  Should generate error and return NULL.
 ----------------------------------------------------------------------------------
-Calling pmSourceSetPixelCircle with NULL psImage.  Should generate error and return NULL.
+Calling pmSourceSetPixelsCircle with NULL psImage.  Should generate error and return NULL.
 ----------------------------------------------------------------------------------
-Calling pmSourceSetPixelCircle with wrong type psImage.  Should generate error and return NULL.
+Calling pmSourceSetPixelsCircle with wrong type psImage.  Should generate error and return NULL.
 ----------------------------------------------------------------------------------
-Calling pmSourceSetPixelCircle with radius < 0.0.  Should generate error and return NULL.
+Calling pmSourceSetPixelsCircle with radius < 0.0.  Should generate error and return NULL.
 ----------------------------------------------------------------------------------
-Calling pmSourceSetPixelCircle with valid data.
+Calling pmSourceSetPixelsCircle with valid data.
 ----------------------------------------------------------------------------------
 ----------------------------------------------------------------------------------
Index: /trunk/psModules/test/verified/tst_pmSubtractBias.stderr
===================================================================
--- /trunk/psModules/test/verified/tst_pmSubtractBias.stderr	(revision 4199)
+++ /trunk/psModules/test/verified/tst_pmSubtractBias.stderr	(revision 4200)
@@ -75,7 +75,7 @@
 <DATE><TIME>|<HOST>|E|pmSubtractBias (FILE:LINENO)
     Don't know how to scale the overscan vector.  Set fit to PM_FIT_SPLINE or PM_FIT_POLYNOMIAL.  Returning in image.
-<DATE><TIME>|<HOST>|E|psSubtractFrame (FILE:LINENO)
+<DATE><TIME>|<HOST>|E|SubtractFrame (FILE:LINENO)
     bias image does not have enough rows.  Returning in image
-<DATE><TIME>|<HOST>|E|psSubtractFrame (FILE:LINENO)
+<DATE><TIME>|<HOST>|E|SubtractFrame (FILE:LINENO)
     bias image does not have enough columns.  Returning in image
 <DATE><TIME>|<HOST>|E|pmSubtractBias (FILE:LINENO)