Changeset 23731

Timestamp:

Apr 7, 2009, 3:45:46 PM (17 years ago)

Author:

Paul Price

Message:

Set data_exists appropriately once data exists.

Location:

branches/pap/psModules/src/imcombine

Files:

• pmSubtraction.c (modified) (1 diff)
• pmSubtractionMatch.c (modified) (1 diff)

branches/pap/psModules/src/imcombine/pmSubtraction.c

@@ -1385 +1385 @@
     }
 
+    // Data exists on the outputs now
+    if (out1) {
+        out1->data_exists = true;
+        if (out1->parent) {
+            out1->parent->data_exists = out1->parent->parent->data_exists = true;
+        }
+    }
+    if (out2) {
+        out2->data_exists = true;
+        if (out2->parent) {
+            out2->parent->data_exists = out2->parent->parent->data_exists = true;
+        }
+    }
+
+
     psLogMsg("psModules.imcombine", PS_LOG_INFO, "Convolve image: %f sec",
              psTimerClear("pmSubtractionConvolve"));

branches/pap/psModules/src/imcombine/pmSubtractionMatch.c

@@ -567 +567 @@
             psFree(kernels);
             kernels = NULL;
-
-            // There is data in the readout now
-            if (subMode == PM_SUBTRACTION_MODE_1 || subMode == PM_SUBTRACTION_MODE_DUAL) {
-                conv1->data_exists = true;
-                if (conv1->parent) {
-                    conv1->parent->data_exists = true;
-                    conv1->parent->parent->data_exists = true;
-                }
-            }
-            if (subMode == PM_SUBTRACTION_MODE_2 || subMode == PM_SUBTRACTION_MODE_DUAL) {
-                conv2->data_exists = true;
-                if (conv2->parent) {
-                    conv2->parent->data_exists = true;
-                    conv2->parent->parent->data_exists = true;
-                }
-            }
         }
     }