Index: trunk/psModules/test/Makefile.am
===================================================================
--- trunk/psModules/test/Makefile.am	(revision 4998)
+++ trunk/psModules/test/Makefile.am	(revision 4999)
@@ -13,6 +13,5 @@
 	tst_pmImageCombine \
 	tst_pmObjects01 \
-	tst_psAstrometry \
-	tst_psAstrometry01
+	tst_psAstrometry
 
 check_PROGRAMS = $(TESTS)
@@ -36,5 +35,4 @@
 tst_pmObjects01_SOURCES = tst_pmObjects01.c
 tst_psAstrometry_SOURCES = tst_psAstrometry.c
-tst_psAstrometry01_SOURCES = tst_psAstrometry01.c
 
 test: check
Index: trunk/psModules/test/tst_pmImageSubtract.c
===================================================================
--- trunk/psModules/test/tst_pmImageSubtract.c	(revision 4998)
+++ trunk/psModules/test/tst_pmImageSubtract.c	(revision 4999)
@@ -10,6 +10,6 @@
  *  data.  More work need to be done to verify the results.
  *
- *  @version $Revision: 1.5 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-07-19 01:44:48 $
+ *  @version $Revision: 1.6 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-09-12 20:51:10 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -115,11 +115,11 @@
         }
 
-        if (kernels->p_size != size) {
-            printf("TEST ERROR: pmSubtractionKernelsAllocPOIS() generated an incorrect ->p_size member (%d).\n", kernels->p_size);
-            testStatus = true;
-        }
-
-        if (kernels->p_spatialOrder != SpatialOrder) {
-            printf("TEST ERROR: pmSubtractionKernelsAllocPOIS() generated an incorrect ->p_spatialOrder member (%d).\n", kernels->p_spatialOrder);
+        if (kernels->size != size) {
+            printf("TEST ERROR: pmSubtractionKernelsAllocPOIS() generated an incorrect ->size member (%d).\n", kernels->size);
+            testStatus = true;
+        }
+
+        if (kernels->spatialOrder != SpatialOrder) {
+            printf("TEST ERROR: pmSubtractionKernelsAllocPOIS() generated an incorrect ->spatialOrder member (%d).\n", kernels->spatialOrder);
             testStatus = true;
         }
@@ -275,11 +275,11 @@
         }
 
-        if (kernels->p_size != size) {
-            printf("TEST ERROR: pmSubtractionKernelsAllocISIS() generated an incorrect ->p_size member (%d).\n", kernels->p_size);
-            testStatus = true;
-        }
-
-        if (kernels->p_spatialOrder != SpatialOrder) {
-            printf("TEST ERROR: pmSubtractionKernelsAllocISIS() generated an incorrect ->p_spatialOrder member (%d).\n", kernels->p_spatialOrder);
+        if (kernels->size != size) {
+            printf("TEST ERROR: pmSubtractionKernelsAllocISIS() generated an incorrect ->size member (%d).\n", kernels->size);
+            testStatus = true;
+        }
+
+        if (kernels->spatialOrder != SpatialOrder) {
+            printf("TEST ERROR: pmSubtractionKernelsAllocISIS() generated an incorrect ->spatialOrder member (%d).\n", kernels->spatialOrder);
             testStatus = true;
         }
Index: trunk/psModules/test/verified/tst_pmFlatField.stderr
===================================================================
--- trunk/psModules/test/verified/tst_pmFlatField.stderr	(revision 4998)
+++ trunk/psModules/test/verified/tst_pmFlatField.stderr	(revision 4999)
@@ -5,24 +5,24 @@
 \**********************************************************************************/
 
-<DATE><TIME>|<HOST>|E|pmFlatField (FILE:LINENO)
+<HOST>|E|pmFlatField (FILE:LINENO)
     Null not allowed for flat readout.
-<DATE><TIME>|<HOST>|E|pmFlatField (FILE:LINENO)
+<HOST>|E|pmFlatField (FILE:LINENO)
     Null not allowed for input image.
-<DATE><TIME>|<HOST>|E|pmFlatField (FILE:LINENO)
+<HOST>|E|pmFlatField (FILE:LINENO)
     Null not allowed for flat image.
-<DATE><TIME>|<HOST>|E|pmFlatField (FILE:LINENO)
+<HOST>|E|pmFlatField (FILE:LINENO)
     Input image size exceeds that of flat image: (3, 3) vs (2, 2)
-<DATE><TIME>|<HOST>|E|pmFlatField (FILE:LINENO)
-    Input image mask size exceeds that of flat image: (4, 4) vs (3, 3)
-<DATE><TIME>|<HOST>|E|pmFlatField (FILE:LINENO)
-    Total offset >= flat image size: (50, 50) vs (3, 3)
-<DATE><TIME>|<HOST>|E|pmFlatField (FILE:LINENO)
-    Complex types not allowed for input image. Type: 2064
-<DATE><TIME>|<HOST>|E|pmFlatField (FILE:LINENO)
-    Complex types not allowed for flat image. Type: 2064
-<DATE><TIME>|<HOST>|E|pmFlatField (FILE:LINENO)
-    Input and flat image types differ: (1032 vs 1028)
-<DATE><TIME>|<HOST>|E|pmFlatField (FILE:LINENO)
-    Mask must be PS_TYPE_MASK type. Type: 1028
+<HOST>|E|pmFlatField (FILE:LINENO)
+    Input image mask size exceeds that of flat image: (5, 5) vs (3, 3)
+<HOST>|E|pmFlatField (FILE:LINENO)
+    Input image mask size exceeds that of flat image: (5, 5) vs (3, 3)
+<HOST>|E|pmFlatField (FILE:LINENO)
+    Input image mask size exceeds that of flat image: (5, 5) vs (3, 3)
+<HOST>|E|pmFlatField (FILE:LINENO)
+    Input image mask size exceeds that of flat image: (5, 5) vs (3, 3)
+<HOST>|E|pmFlatField (FILE:LINENO)
+    Input image mask size exceeds that of flat image: (5, 5) vs (3, 3)
+<HOST>|E|pmFlatField (FILE:LINENO)
+    Input image mask size exceeds that of flat image: (5, 5) vs (3, 3)
 
 ---> TESTPOINT PASSED (Test Point Driver{pmFlatField} | tst_pmFlatField.c)
Index: trunk/psModules/test/verified/tst_pmFlatField.stdout
===================================================================
--- trunk/psModules/test/verified/tst_pmFlatField.stdout	(revision 4998)
+++ trunk/psModules/test/verified/tst_pmFlatField.stdout	(revision 4999)
@@ -10,4 +10,9 @@
 6.000000 6.000000 6.000000 
 
+Input mask:
+0 0 0 
+0 0 0 
+0 0 0 
+
 Flat image:
 2.000000 2.000000 2.000000 
@@ -80,12 +85,12 @@
 
 Resulting mask:
-8 8 8 
-8 8 8 
-0 8 8 
+0 0 0 
+0 0 0 
+0 0 0 
 
 Resulting image:
 3.000000 3.000000 3.000000 
 3.000000 3.000000 3.000000 
-1.000000 3.000000 3.000000 
+3.000000 3.000000 3.000000 
 
 
Index: trunk/psModules/test/verified/tst_pmMaskBadPixels.stderr
===================================================================
--- trunk/psModules/test/verified/tst_pmMaskBadPixels.stderr	(revision 4998)
+++ trunk/psModules/test/verified/tst_pmMaskBadPixels.stderr	(revision 4999)
@@ -41,5 +41,5 @@
 \**********************************************************************************/
 
-<DATE><TIME>|<HOST>|E|pmMaskBadPixels (FILE:LINENO)
+<HOST>|E|pmMaskBadPixels (FILE:LINENO)
     Null not allowed for mask image.
 
@@ -52,5 +52,5 @@
 \**********************************************************************************/
 
-<DATE><TIME>|<HOST>|E|pmMaskBadPixels (FILE:LINENO)
+<HOST>|E|pmMaskBadPixels (FILE:LINENO)
     Null not allowed for input image.
 
@@ -63,5 +63,5 @@
 \**********************************************************************************/
 
-<DATE><TIME>|<HOST>|E|pmMaskBadPixels (FILE:LINENO)
+<HOST>|E|pmMaskBadPixels (FILE:LINENO)
     Input image size exceeds that of mask image: (60, 60) vs (50, 50)
 
@@ -74,5 +74,5 @@
 \**********************************************************************************/
 
-<DATE><TIME>|<HOST>|E|pmMaskBadPixels (FILE:LINENO)
+<HOST>|E|pmMaskBadPixels (FILE:LINENO)
     Input image mask size exceeds that of mask image: (60, 60) vs (50, 50)
 
@@ -85,5 +85,5 @@
 \**********************************************************************************/
 
-<DATE><TIME>|<HOST>|E|pmMaskBadPixels (FILE:LINENO)
+<HOST>|E|pmMaskBadPixels (FILE:LINENO)
     Total offset >= mask image: (150, 150) vs (50, 50)
 
@@ -96,5 +96,5 @@
 \**********************************************************************************/
 
-<DATE><TIME>|<HOST>|E|pmMaskBadPixels (FILE:LINENO)
+<HOST>|E|pmMaskBadPixels (FILE:LINENO)
     Complex types not allowed for input image. Type: 2064
 
@@ -107,5 +107,5 @@
 \**********************************************************************************/
 
-<DATE><TIME>|<HOST>|E|pmMaskBadPixels (FILE:LINENO)
+<HOST>|E|pmMaskBadPixels (FILE:LINENO)
     Mask must be PS_TYPE_MASK type. Type: 1032