Index: trunk/psModules/test/tst_pmFlatField.c
===================================================================
--- trunk/psModules/test/tst_pmFlatField.c	(revision 2160)
+++ trunk/psModules/test/tst_pmFlatField.c	(revision 2296)
@@ -18,6 +18,6 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.2 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-10-15 21:16:14 $
+ *  @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-11-06 02:10:58 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -61,5 +61,5 @@
 
 testDescription tests[] = {
-                              {testFlatField, 884, "pmFlatField", 0, false},
+                              {testFlatField, 753, "pmFlatField", 0, false},
                               {NULL}
                           };
@@ -82,5 +82,8 @@
     psReadout *flatReadout  = psReadoutAlloc(0, 0, flatImage1);
     PRINT_MATRIX(flatImage1,F64,"Flat image:");
-    pmFlatField(inReadout, flatReadout);
+    if ( !pmFlatField(inReadout, flatReadout) ) {
+        psError(PS_ERR_UNKNOWN,true,"Test A - Returned false should be true");
+        return 1;
+    }
     PRINT_MATRIX(inImage,F64, "Resulting image:");
     printFooter(stdout, "pmFlatField", "Test A - Divide input image by flat image", true);
@@ -94,6 +97,10 @@
     PRINT_MATRIX(flatImage2, F64, "Flat image:");
     flatReadout->image = flatImage2;
-    pmFlatField(inReadout, flatReadout);
+    if ( !pmFlatField(inReadout, flatReadout) ) {
+        psError(PS_ERR_UNKNOWN,true,"Test B - Returned false should be true");
+        return 2;
+    }
     PRINT_MATRIX(inReadout->mask, PS_TYPE_MASK_DATA, "Resulting mask:");
+    PRINT_MATRIX(inImage,F64,"Resulting image:");
     printFooter(stdout, "pmFlatField", "Test B - Mask flat image data", true);
     printf("\n\n\n");
@@ -103,11 +110,15 @@
     printPositiveTestHeader(stdout, "pmFlatField", "Test C - Mask flat image data starting with non-null mask");
     PRINT_MATRIX(inImage, F64, "Input image:");
-    flatImage2->data.F64[0][0] = 1.0;
+    flatImage2->data.F64[0][0] = 3.0;
     PRINT_MATRIX(flatImage2, F64, "Flat image:");
     CREATE_AND_SET_IMAGE(mask1,U8,0,3,3);
     psFree(inReadout->mask);
     inReadout->mask = mask1;
-    pmFlatField(inReadout, flatReadout);
+    if ( !pmFlatField(inReadout, flatReadout) ) {
+        psError(PS_ERR_UNKNOWN,true,"Test C - Returned false should be true");
+        return 3;
+    }
     PRINT_MATRIX(inReadout->mask, PS_TYPE_MASK_DATA,"Resulting mask:");
+    PRINT_MATRIX(inImage,F64,"Resulting image:");
     printFooter(stdout, "pmFlatField", "Test C - Mask flat image data starting with non-null mask", true);
     printf("\n\n\n");
@@ -117,5 +128,8 @@
     printNegativeTestHeader(stdout,"pmFlatField", "Test D - Attempt to use null flat readout",
                             "Null not allowed for flat readout", 0);
-    pmFlatField(inReadout, NULL);
+    if( pmFlatField(inReadout, NULL) ) {
+        psError(PS_ERR_UNKNOWN,true,"Test D - Returned true should be false");
+        return 4;
+    }
     printFooter(stdout, "pmFlatField", "Test D - Attempt to use null flat readout", true);
     printf("\n\n\n");
@@ -127,5 +141,8 @@
     psImage *temp = inReadout->image;
     inReadout->image = NULL;
-    pmFlatField(inReadout, flatReadout);
+    if ( pmFlatField(inReadout, flatReadout) ) {
+        psError(PS_ERR_UNKNOWN,true,"Test E - Returned true should be false" );
+        return 5;
+    }
     inReadout->image = temp;
     printFooter(stdout, "pmFlatField", "Test E - Attempt to use null input image", true);
@@ -138,5 +155,8 @@
     temp = flatReadout->image;
     flatReadout->image = NULL;
-    pmFlatField(inReadout, flatReadout);
+    if ( pmFlatField(inReadout, flatReadout) ) {
+        psError(PS_ERR_UNKNOWN,true,"Test F - Returned true should be false" );
+        return 6;
+    }
     flatReadout->image = temp;
     printFooter(stdout, "pmFlatField", "Test F - Attempt tp use null flat image", true);
@@ -150,5 +170,8 @@
     temp = flatReadout->image;
     flatReadout->image = smallFlat;
-    pmFlatField(inReadout, flatReadout);
+    if ( pmFlatField(inReadout, flatReadout) ) {
+        psError(PS_ERR_UNKNOWN,true,"Test G - Returned true should be false");
+        return 7;
+    }
     flatReadout->image = temp;
     printFooter(stdout, "pmFlatField", "Test G - Attempt to use input image bigger than flat image", true);
@@ -162,5 +185,8 @@
     temp = inReadout->mask;
     inReadout->mask = largeMask;
-    pmFlatField(inReadout, flatReadout);
+    if ( pmFlatField(inReadout, flatReadout) ) {
+        psError(PS_ERR_UNKNOWN,true,"Test H - Returned true should be false");
+        return 8;
+    }
     inReadout->mask = temp;
     printFooter(stdout, "pmFlatField", "Test H - Attempt to use input image mask bigger than flat image", true);
@@ -173,5 +199,8 @@
     *(int*)&inReadout->col0 = 50;
     *(int*)&inReadout->row0 = 50;
-    pmFlatField(inReadout, flatReadout);
+    if ( pmFlatField(inReadout, flatReadout) ) {
+        psError(PS_ERR_UNKNOWN,true,"Test I - Returned true should be false");
+        return 9;
+    }
     *(int*)&inReadout->col0 = 0;
     *(int*)&inReadout->row0 = 0;
@@ -184,5 +213,8 @@
                             "Complex types not allowed for input image", 0);
     *(psElemType* ) & inReadout->image->type.type = PS_TYPE_C64;
-    pmFlatField(inReadout, flatReadout);
+    if ( pmFlatField(inReadout, flatReadout) ) {
+        psError(PS_ERR_UNKNOWN,true,"Test J - Returned true should be false");
+        return 10;
+    }
     *(psElemType* ) & inReadout->image->type.type = PS_TYPE_F64;
     printFooter(stdout, "pmFlatField", "Test J - Attempt to use complex input image", true);
@@ -194,5 +226,8 @@
                             "Complex types not allowed for flat image", 0);
     *(psElemType* ) & flatReadout->image->type.type = PS_TYPE_C64;
-    pmFlatField(inReadout, flatReadout);
+    if ( pmFlatField(inReadout, flatReadout) ) {
+        psError(PS_ERR_UNKNOWN,true,"Test K - Returned ture should be false");
+        return 11;
+    }
     *(psElemType* ) & flatReadout->image->type.type = PS_TYPE_F64;
     printFooter(stdout, "pmFlatField", "Test K - Attempt to use complex flat image", true);
@@ -204,5 +239,8 @@
                             "Input and flat image types differ", 0);
     *(psElemType* ) & flatReadout->image->type.type = PS_TYPE_F32;
-    pmFlatField(inReadout, flatReadout);
+    if ( pmFlatField(inReadout, flatReadout) ) {
+        psError(PS_ERR_UNKNOWN,true,"Test L - Returned true should be false");
+        return 12;
+    }
     *(psElemType* ) & flatReadout->image->type.type = PS_TYPE_F64;
     printFooter(stdout, "pmFlatField", "Test L - Attempt to use non-equal input and flat image types", true);
@@ -214,5 +252,8 @@
                             "Mask must be PS_TYPE_MASK type", 0);
     *(psElemType* ) & inReadout->mask->type.type = PS_TYPE_F32;
-    pmFlatField(inReadout, flatReadout);
+    if ( pmFlatField(inReadout, flatReadout) ) {
+        psError(PS_ERR_UNKNOWN,true,"Test M - Returned true should be false");
+        return 13;
+    }
     *(psElemType* ) & inReadout->mask->type.type = PS_TYPE_MASK;
     printFooter(stdout, "pmFlatField", "Test M - Attempt to use non-mask type mask image", true);