Changeset 23576 for trunk/ppStack/src/ppStackReadout.c

Timestamp:

Mar 27, 2009, 1:26:55 PM (17 years ago)

Author:

Paul Price

Message:

Can now combine images without convolving, but it doesn't apply any rejection yet.

File:

• trunk/ppStack/src/ppStackReadout.c (modified) (3 diffs)

trunk/ppStack/src/ppStackReadout.c

@@ -185 +185 @@
     assert(outRO);
     assert(readouts);
-    assert(rejected);
-    assert(readouts->n == rejected->n);
+    assert(!rejected || readouts->n == rejected->n);
     assert(mask && mask->n == readouts->n && mask->type.type == PS_TYPE_VECTOR_MASK);
     assert(weightings && weightings->n == readouts->n && weightings->type.type == PS_TYPE_F32);
@@ -207 +206 @@
     psArray *stack = psArrayAlloc(num); // Array for stacking
 
-    int numGood = num;                  // Number of good inputs: images that haven't been completely rejected
+    bool entire = (rejected ? false : true); // Combine entire image?
     for (int i = 0; i < num; i++) {
         pmReadout *ro = readouts->data[i];
-        if (!ro || !rejected->data[i] || mask->data.PS_TYPE_VECTOR_MASK_DATA[i]) {
-            // Image completely rejected
-            numGood--;
+        if (mask->data.U8[i] & (PPSTACK_MASK_REJECT | PPSTACK_MASK_BAD)) {
+            // Image completely rejected since previous combination
+            entire = true;
+            continue;
+        } else if (mask->data.U8[i]) {
+            // Image completely rejected before original combination
             continue;
         }
@@ -234 +236 @@
         pmStackData *data = pmStackDataAlloc(ro, weightings->data.F32[i],
                                              addVariance ? addVariance->data.F32[i] : NAN);
-        data->reject = psMemIncrRefCounter(rejected->data[i]);
+        data->reject = rejected ? psMemIncrRefCounter(rejected->data[i]) : NULL;
         stack->data[i] = data;
     }
 
     if (!pmStackCombine(outRO, stack, maskVal | maskBad, maskBad, 0, 0, NAN, NAN, NAN,
-                        numGood != num, useVariance, false)) {
+                        entire, useVariance, false)) {
         psError(PS_ERR_UNKNOWN, false, "Unable to combine input readouts.");
         psFree(stack);