Changeset 2956

Timestamp:

Jan 11, 2005, 10:47:39 AM (22 years ago)

Author:

evanalst

Message:

Add addition test case to check for pixel above max and image value checks.

Location:

trunk/psModules/test

Files:

• tst_pmNonLinear.c (modified) (9 diffs)
• verified/tst_pmNonLinear.stderr (modified) (1 diff)
• verified/tst_pmNonLinear.stdout (modified) (1 diff)

trunk/psModules/test/tst_pmNonLinear.c

@@ -16 +16 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.12 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-01-11 19:38:24 $
+ *  @version $Revision: 1.13 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-01-11 20:47:39 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -243 +243 @@
         outBig->data.F32[i] = (float) (2 * i);
         if (i < tableSize-1) {
-            inSmall->data.F32[i] = (float) (2 * i);
+            inSmall->data.F32[i] = (float) i;
             outSmall->data.F32[i] = (float) (2 * i);
         }
@@ -315 +315 @@
         testStatus = false;
     }
+    for (i=0;i<NUM_ROWS;i++) {
+        for (j=0;j<NUM_COLS;j++) {
+            psF32 expect = (float) (2 * (i + j));
+            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 = false;
+            }
+        }
+    }
 
     test03Init(myReadout);
@@ -324 +334 @@
         testStatus = false;
     }
+    for (i=0;i<NUM_ROWS;i++) {
+        for (j=0;j<NUM_COLS;j++) {
+            psF32 expect = (float) (2 * (i + j));
+            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 = false;
+            }
+        }
+    }
 
     test03Init(myReadout);
@@ -333 +353 @@
         testStatus = false;
     }
+    for (i=0;i<NUM_ROWS;i++) {
+        for (j=0;j<NUM_COLS;j++) {
+            psF32 expect = (float) (2 * (i + j));
+            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 = false;
+            }
+        }
+    }
 
     test03Init(myReadout);
@@ -342 +372 @@
         testStatus = false;
     }
+    for (i=0;i<NUM_ROWS;i++) {
+        for (j=0;j<NUM_COLS;j++) {
+            psF32 expect = (float) (2 * (i + j));
+            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 = false;
+            }
+        }
+    }
 
     test03Init(myReadout);
@@ -350 +390 @@
         printf("TEST ERROR: pmNonLinearityPolynomial() returned a NULL psReadout\n");
         testStatus = false;
+    }
+    for (i=0;i<NUM_ROWS;i++) {
+        for (j=0;j<NUM_COLS;j++) {
+            psF32 expect = (float) (2 * (i + j));
+            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 = false;
+            }
+        }
     }
 
@@ -360 +410 @@
         testStatus = false;
     }
+    for (i=0;i<NUM_ROWS;i++) {
+        for (j=0;j<NUM_COLS;j++) {
+            psF32 expect = (float) ((i + j));
+            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 = false;
+            }
+        }
+    }
 
     printf("------------------------------------------------------------\n");
@@ -370 +430 @@
         testStatus = false;
     }
-
+    for (i=0;i<NUM_ROWS;i++) {
+        for (j=0;j<NUM_COLS;j++) {
+            psF32 expect = (float) (2 * (i + j));
+            psF32 actual = rc->image->data.F32[i][j];
+            if(i==0 && j==0) {
+                if(actual != 0.0) {
+                    printf("TEST ERROR: image[%d][%d] is %f, should be %f\n",i,j,actual,0.0);
+                }
+            } else {
+                if (FLT_EPSILON < fabs(expect - actual)) {
+                    printf("TEST ERROR: image[%d][%d] is %f, should be %f\n", i, j, actual, expect);
+                    testStatus = false;
+                }
+            }
+        }
+    }
+
+    printf("------------------------------------------------------------\n");
+    printf("Calling pmNonLinearityLookup() with one pixels outside inFlux range.  Should generate warnings.\n");
+    test03Init(myReadout);
+    myReadout->image->data.F32[NUM_ROWS-1][NUM_COLS-1] = 100;
+    rc = pmNonLinearityLookup(myReadout, in, out);
+    if (rc == NULL) {
+        printf("TEST ERROR: pmNonLinearityPolynomial() returned a NULL psReadout\n");
+        testStatus = false;
+    }
+    for (i=0;i<NUM_ROWS;i++) {
+        for (j=0;j<NUM_COLS;j++) {
+            psF32 expect = (float) (2 * (i + j));
+            psF32 actual = rc->image->data.F32[i][j];
+            if(i==(NUM_ROWS-1) && j==(NUM_COLS-1)) {
+                if(actual != (tableSize-1)*2) {
+                    printf("TEST ERROR: image[%d][%d] is %f, should be %f\n",i,j,actual,(tableSize-1)*2);
+                }
+            } else {
+                if (FLT_EPSILON < fabs(expect - actual)) {
+                    printf("TEST ERROR: image[%d][%d] is %f, should be %f\n", i, j, actual, expect);
+                    testStatus = false;
+                }
+            }
+        }
+    }
 
     psFree(myReadout);

trunk/psModules/test/verified/tst_pmNonLinear.stderr

@@ -64 +64 @@
 <DATE><TIME>|<HOST>|W|pmNonLinearityLookup
     WARNING: pmNonLinear.c: pmNonLinearityLookup(): 1 pixels outside table.
+<DATE><TIME>|<HOST>|W|vectorBinDisectF32
+    vectorBinDisectF32(): ordinate 100.000000 is outside vector range (0.000000 - 23.000000).
+<DATE><TIME>|<HOST>|W|pmNonLinearityLookup
+    WARNING: pmNonLinear.c: pmNonLinearityLookup(): 1 pixels outside table.
 
 ---> TESTPOINT PASSED (Test Point Driver{pmNonLinearityLookup(): error/warning conditions} | tst_pmNonLinear.c)

trunk/psModules/test/verified/tst_pmNonLinear.stdout

@@ -107 +107 @@
 ------------------------------------------------------------
 Calling pmNonLinearityLookup() with one pixels outside inFlux range.  Should generate warnings.
+------------------------------------------------------------
+Calling pmNonLinearityLookup() with one pixels outside inFlux range.  Should generate warnings.
 
 ---> TESTPOINT PASSED (pmNonLinear{Testing bad input parameter conditions.} | tst_pmNonLinear.c)