Changeset 18347 for trunk/psModules

Timestamp:

Jun 27, 2008, 12:28:53 PM (18 years ago)

Author:

Paul Price

Message:

Don't blow away the kernels before we need them!

File:

• trunk/psModules/src/imcombine/pmSubtractionMatch.c (modified) (2 diffs)

trunk/psModules/src/imcombine/pmSubtractionMatch.c

@@ -537 +537 @@
                 goto MATCH_ERROR;
             }
-            psFree(kernels);
-            kernels = NULL;
-
-            // There is data in the readout now
-            if (mode == PM_SUBTRACTION_MODE_1 || mode == PM_SUBTRACTION_MODE_DUAL) {
-                conv1->data_exists = true;
-                if (conv1->parent) {
-                    conv1->parent->data_exists = true;
-                    conv1->parent->parent->data_exists = true;
-                }
-            }
-            if (mode == PM_SUBTRACTION_MODE_2 || mode == PM_SUBTRACTION_MODE_DUAL) {
-                conv2->data_exists = true;
-                if (conv2->parent) {
-                    conv2->parent->data_exists = true;
-                    conv2->parent->parent->data_exists = true;
-                }
-            }
-
 
             // Set the variance factors
@@ -579 +560 @@
                 psAbort("Should never reach here.");
             }
+
+            psFree(kernels);
+            kernels = NULL;
+
+            // There is data in the readout now
+            if (mode == PM_SUBTRACTION_MODE_1 || mode == PM_SUBTRACTION_MODE_DUAL) {
+                conv1->data_exists = true;
+                if (conv1->parent) {
+                    conv1->parent->data_exists = true;
+                    conv1->parent->parent->data_exists = true;
+                }
+            }
+            if (mode == PM_SUBTRACTION_MODE_2 || mode == PM_SUBTRACTION_MODE_DUAL) {
+                conv2->data_exists = true;
+                if (conv2->parent) {
+                    conv2->parent->data_exists = true;
+                    conv2->parent->parent->data_exists = true;
+                }
+            }
         }
     }