Changeset 2928 for trunk/psModules/test/tst_pmSubtractBias.c

Timestamp:

Jan 7, 2005, 10:00:34 AM (22 years ago)

Author:

gusciora

Message:

Fixed a few error conditions.

File:

• trunk/psModules/test/tst_pmSubtractBias.c (modified) (4 diffs)

trunk/psModules/test/tst_pmSubtractBias.c

@@ -13 +13 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.13 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-01-05 23:25:25 $
+ *  @version $Revision: 1.14 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-01-07 20:00:34 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -654 +654 @@
     }
 
-    printf("------------------------------------------------------------------\n");
-    printf("Calling pmSubtractBias() with NULL overscan list and PM_OVERSCAN_NONE.  Should generate warning.\n");
-    rc = pmSubtractBias(myReadout, NULL, NULL, PM_OVERSCAN_NONE, stat,
-                        0, PM_FIT_NONE, myBias);
-
-    for (i=0;i<numRows;i++) {
-        for (j=0;j<numCols;j++) {
-            psF32 expect = ((float) (i + j)) - 1.0;
-            psF32 actual = rc->image->data.F32[i][j];
-            if (FLT_EPSILON < fabs(expect - actual)) {
-                printf("TEST ERROR: image[%d][%d] is %f, should be %f\n", i, j, actual, expect);
-                testStatus = 1;
-            }
-
-            // Restore myReadout for next test.
-            myReadout->image->data.F32[i][j] = (float) (i + j);
-        }
-    }
+    /* XXX: This does not seem to be a requirement.
+        printf("------------------------------------------------------------------\n");
+        printf("Calling pmSubtractBias() with NULL overscan list and PM_OVERSCAN_NONE.  Should generate warning.\n");
+        rc = pmSubtractBias(myReadout, NULL, NULL, PM_OVERSCAN_NONE, stat,
+                            0, PM_FIT_NONE, myBias);
+     
+        for (i=0;i<numRows;i++) {
+            for (j=0;j<numCols;j++) {
+                psF32 expect = ((float) (i + j)) - 1.0;
+                psF32 actual = rc->image->data.F32[i][j];
+                if (FLT_EPSILON < fabs(expect - actual)) {
+                    printf("TEST ERROR: image[%d][%d] is %f, should be %f\n", i, j, actual, expect);
+                    testStatus = 1;
+                }
+     
+                // Restore myReadout for next test.
+                myReadout->image->data.F32[i][j] = (float) (i + j);
+            }
+        }
+    */
 
     printf("------------------------------------------------------------------\n");
@@ -767 +769 @@
 
     printf("------------------------------------------------------------------\n");
-    printf("Calling pmSubtractBias() undersize bias image (short rows).  Should generate Warning.\n");
+    printf("Calling pmSubtractBias() undersize bias image (short rows).  Should generate Error.\n");
     myReadout = pmSubtractBias(myReadout, NULL, NULL, PM_OVERSCAN_NONE, NULL,
                                0, PM_FIT_NONE, myBiasShortRows);
@@ -778 +780 @@
 
     printf("------------------------------------------------------------------\n");
-    printf("Calling pmSubtractBias() undersize bias image (short columns).  Should generate Warning.\n");
+    printf("Calling pmSubtractBias() undersize bias image (short columns).  Should generate Error.\n");
     myReadout = pmSubtractBias(myReadout, NULL, NULL, PM_OVERSCAN_NONE, NULL,
                                0, PM_FIT_NONE, myBiasShortCols);