Changeset 21365 for trunk/ppSim/src/ppSimMergeReadouts.c

Timestamp:

Feb 5, 2009, 4:47:00 PM (17 years ago)

Author:

Paul Price

Message:

Merging pap_branch_20090128. Resolved a small number of conflicts. Compiles, but not tested in detail.

File:

• trunk/ppSim/src/ppSimMergeReadouts.c (modified) (3 diffs)

trunk/ppSim/src/ppSimMergeReadouts.c

@@ -14 +14 @@
     if (!inReadout) return true;
 
-    if (!inReadout->weight) {
-      if (!pmReadoutGenerateWeight(inReadout, true)) {
-        psError (PS_ERR_UNKNOWN, false, "trouble creating weight");
-        return false;
+    if (!inReadout->variance) {
+      if (!pmReadoutGenerateVariance(inReadout, true)) {
+        psError (PS_ERR_UNKNOWN, false, "trouble creating variance");
+        return false;
       }
     }
@@ -30 +30 @@
 
     psImage *inSignal = inReadout->image;
-    psImage *inVariance = inReadout->weight;
+    psImage *inVariance = inReadout->variance;
 
     psImage *outSignal = outReadout->image;
-    psImage *outVariance = outReadout->weight;
+    psImage *outVariance = outReadout->variance;
 
     assert (inSignal->numRows == outSignal->numRows);
@@ -39 +39 @@
 
     for (int y = 0; y < inSignal->numRows; y++) {
-        for (int x = 0; x < inSignal->numCols; x++) {
-            outSignal->data.F32[y][x] += inSignal->data.F32[y][x];
-            outVariance->data.F32[y][x] += inVariance->data.F32[y][x];
-        }
+        for (int x = 0; x < inSignal->numCols; x++) {
+            outSignal->data.F32[y][x] += inSignal->data.F32[y][x];
+            outVariance->data.F32[y][x] += inVariance->data.F32[y][x];
+        }
     }
     return true;