Changeset 2816

Timestamp:

Dec 23, 2004, 2:58:08 PM (22 years ago)

Author:

gusciora

Message:

...

Location:

trunk/psModules

Files:

• src/pmReadoutCombine.c (modified) (2 diffs)
• test/tst_pmReadoutCombine.c (modified) (9 diffs)

trunk/psModules/src/pmReadoutCombine.c

@@ -5 +5 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.12 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-12-23 23:42:25 $
+ *  @version $Revision: 1.13 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-12-24 00:58:08 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -277 +277 @@
             // XXX: Is this correct?
             // We add the zero vector, if non-NULL.
-
             if (zero != NULL) {
                 for (int r = 0; r < numInputs ; r++) {

trunk/psModules/test/tst_pmReadoutCombine.c

@@ -5 +5 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.4 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-12-23 23:57:32 $
+ *  @version $Revision: 1.5 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-12-24 00:58:08 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -23 +23 @@
 
 #define NUM_READOUTS  10
+#define INPUT_NUM_ROWS 10
+#define INPUT_NUM_COLS 10
+#define VEC_ZERO 1.0
+#define VEC_SCALE 2.0
+
+psS32 VerifyTheOutput(psImage *output, psF32 expect)
+{
+    bool testStatus = true;
+
+    for (psS32 i = 0 ; i < output->numRows ; i++) {
+        for (psS32 j = 0 ; j < output->numCols ; j++) {
+            if (output->data.F32[i][j] != expect) {
+                printf("ERROR: output[%d][%d] is %.2f, should be %f\n", i, j, output->data.F32[i][j], expect);
+                testStatus = false;
+            }
+        }
+    }
+    return(testStatus);
+}
+
+
 
 int main(int argc, char* argv[])
@@ -49 +70 @@
     psVector *scale = psVectorAlloc(NUM_READOUTS, PS_TYPE_F32);
     for (i=0;i<NUM_READOUTS;i++) {
-        zero->data.F32[i] = 1.0;
+        zero->data.F32[i] = VEC_ZERO;
     }
     for (i=0;i<NUM_READOUTS;i++) {
-        scale->data.F32[i] = 2.0;
+        scale->data.F32[i] = VEC_SCALE;
     }
 
@@ -73 +94 @@
         baseRows[r] = 0;
         baseCols[r] = 0;
-        numRows[r] = 10;
-        numCols[r] = 10;
+        numRows[r] = INPUT_NUM_ROWS;
+        numCols[r] = INPUT_NUM_COLS;
 
         psImage *tmpImage = psImageAlloc(numCols[r], numRows[r], PS_TYPE_F32);
         PS_IMAGE_SET_F32(tmpImage, ((float) r));
-
         *(int *) (& (tmpImage->row0)) = baseRows[r];
         *(int *) (& (tmpImage->col0)) = baseCols[r];
@@ -99 +119 @@
 
     output = pmReadoutCombine(output, list, params, zero, scale, true, 1.0, 0.0);
-
-    for (int i=output->row0; i < (output->row0 + output->numRows) ; i++) {
-        for (int j=output->col0; j < (output->col0 + output->numCols) ; j++) {
-            printf("%.1f ", output->data.F32[i-output->row0][j-output->col0]);
-        }
-        printf("\n");
-    }
+    psF32 NR = (psF32) NUM_READOUTS;
+    psF32 expectedPixel = ((((NR-1.0) * (NR/2.0)) / NR) + VEC_ZERO) * VEC_SCALE;
+    VerifyTheOutput(output, expectedPixel);
 
     psFree(params->stats);
@@ -132 +148 @@
     return(testStatus);
 }
-
-psS32 VerifyTheOutput(psImage *output)
-{
-    bool testStatus = true;
-
-    for (psS32 i = 0 ; i < output->numRows ; i++) {
-        for (psS32 j = 0 ; j < output->numCols ; j++) {
-            if (output->data.F32[i][j] != 45.0) {
-                printf("ERROR: output[%d][%d] is %.2f, should be 45.0\n", i, j, output->data.F32[i][j]);
-                testStatus = false;
-            }
-        }
-    }
-    return(testStatus);
-}
-
 
 int test01()
@@ -196 +196 @@
         baseRows[r] = 0;
         baseCols[r] = 0;
-        numRows[r] = 10;
-        numCols[r] = 10;
+        numRows[r] = INPUT_NUM_ROWS;
+        numCols[r] = INPUT_NUM_COLS;
 
         psImage *tmpImage = psImageAlloc(numCols[r], numRows[r], PS_TYPE_F32);
@@ -252 +252 @@
     rc = pmReadoutCombine(output, list, params, zeroBig, scale, true, 1.0, 0.0);
     if (rc != NULL) {
-        if (false == VerifyTheOutput(rc)) {
+        if (false == VerifyTheOutput(rc, 45.0)) {
             testStatus = false;
         }
@@ -292 +292 @@
     rc = pmReadoutCombine(output, list, params, zero, scaleBig, true, 1.0, 0.0);
     if (rc != NULL) {
-        if (false == VerifyTheOutput(rc)) {
+        if (false == VerifyTheOutput(rc, 45.0)) {
             testStatus = false;
         }