Changeset 21474 for trunk/psModules/test/camera/tap_pmFPACopy.c

Timestamp:

Feb 13, 2009, 12:47:32 PM (17 years ago)

Author:

giebink

Message:

Account for weight(s) to variance(s) change

File:

• trunk/psModules/test/camera/tap_pmFPACopy.c (modified) (5 diffs)

trunk/psModules/test/camera/tap_pmFPACopy.c

@@ -51 +51 @@
     readout->image = psImageAlloc(SOURCE_NUM_COLS, SOURCE_NUM_ROWS, PS_TYPE_F32);
     readout->mask = psImageAlloc(SOURCE_NUM_COLS, SOURCE_NUM_ROWS, PS_TYPE_U8);
-    readout->weight = psImageAlloc(SOURCE_NUM_COLS, SOURCE_NUM_ROWS, PS_TYPE_F32);
+    readout->variance = psImageAlloc(SOURCE_NUM_COLS, SOURCE_NUM_ROWS, PS_TYPE_F32);
     for (int i = 0 ; i < SOURCE_NUM_ROWS ; i++) {
         for (int j = 0 ; j < SOURCE_NUM_COLS ; j++) {
             readout->image->data.F32[i][j] = (float) (i + j + SOURCE_BASE);
             readout->mask->data.U8[i][j] = (psU8) (i + j + SOURCE_BASE);
-            readout->weight->data.F32[i][j] = (float) (i + j + SOURCE_BASE);
+            readout->variance->data.F32[i][j] = (float) (i + j + SOURCE_BASE);
         }
     }
@@ -144 +144 @@
     readout->image = psImageAlloc(TARGET_NUM_COLS, TARGET_NUM_ROWS, PS_TYPE_F32);
     readout->mask = psImageAlloc(TARGET_NUM_COLS, TARGET_NUM_ROWS, PS_TYPE_U8);
-    readout->weight = psImageAlloc(TARGET_NUM_COLS, TARGET_NUM_ROWS, PS_TYPE_F32);
+    readout->variance = psImageAlloc(TARGET_NUM_COLS, TARGET_NUM_ROWS, PS_TYPE_F32);
     for (int i = 0 ; i < TARGET_NUM_ROWS ; i++) {
         for (int j = 0 ; j < TARGET_NUM_COLS ; j++) {
             readout->image->data.F32[i][j] = (float) (i + j + TARGET_BASE);
             readout->mask->data.U8[i][j] = (psU8) (i + j + TARGET_BASE);
-            readout->weight->data.F32[i][j] = (float) (i + j + TARGET_BASE);
+            readout->variance->data.F32[i][j] = (float) (i + j + TARGET_BASE);
         }
     }
@@ -260 +260 @@
         }
 
-        psImage *weightTarget = readoutTarget->weight;
-        psImage *weightSource = readoutSource->weight;
+        psImage *varianceTarget = readoutTarget->variance;
+        psImage *varianceSource = readoutSource->variance;
         for (int i = 0 ; i < SOURCE_NUM_ROWS ; i++) {
             for (int j = 0 ; j < SOURCE_NUM_COLS ; j++) {
-                if (weightTarget->data.F32[i][j] != weightSource->data.F32[i][j]) {
-                    diag("ERROR: target readout[%d] weight[%d][%d] is %.2f, should be %.2f",
-                          readoutID, i, j, weightTarget->data.F32[i][j], weightSource->data.F32[i][j]);
+                if (varianceTarget->data.F32[i][j] != varianceSource->data.F32[i][j]) {
+                    diag("ERROR: target readout[%d] variance[%d][%d] is %.2f, should be %.2f",
+                          readoutID, i, j, varianceTarget->data.F32[i][j], varianceSource->data.F32[i][j]);
                     errorFlag = true;
                 }
@@ -272 +272 @@
         }
         if (errorFlag) {
-            diag("ERROR: pmCellCopy() did not set the data for readout %d, weight correctly", readoutID);
+            diag("ERROR: pmCellCopy() did not set the data for readout %d, variance correctly", readoutID);
         }
     }
@@ -317 +317 @@
             errorFlag = true;
         }
-        if (readoutTarget->weight->numRows != SOURCE_NUM_ROWS ||
-            readoutTarget->weight->numCols != SOURCE_NUM_COLS) {
-            diag("ERROR: readoutTarget->weight size is (%d by %d)\n", readoutTarget->weight->numRows, 
-                  readoutTarget->weight    ->numCols);
+        if (readoutTarget->variance->numRows != SOURCE_NUM_ROWS ||
+            readoutTarget->variance->numCols != SOURCE_NUM_COLS) {
+            diag("ERROR: readoutTarget->variance size is (%d by %d)\n", readoutTarget->variance->numRows, 
+                  readoutTarget->variance->numCols);
             errorFlag = true;
         }