Changeset 25824 for branches/pap/ppStack/src/ppStackThread.c

Timestamp:

Oct 9, 2009, 2:34:51 PM (17 years ago)

Author:

Paul Price

Message:

Using original mask in combination of unconvolved images.

File:

• branches/pap/ppStack/src/ppStackThread.c (modified) (3 diffs)

branches/pap/ppStack/src/ppStackThread.c

@@ -63 +63 @@
     const psArray *cells = options->cells; // Array of input cells
     const psArray *imageNames = conv ? options->convImages : options->origImages; // Names of images to read
-    const psArray *maskNames = conv ? options->convMasks : NULL; // Names of masks to read
-    const psArray *varianceNames = conv ? options->convVariances : NULL; // Names of variance maps to read
-    const psArray *covariances = conv ? options->covariances : NULL; // Covariance matrices (already read)
+    const psArray *maskNames = conv ? options->convMasks : options->origMasks; // Names of masks to read
+    const psArray *varianceNames = conv ? options->convVariances : NULL; // Variance names
+    const psArray *covariances = conv ? options->covariances : NULL; // Covariance matrices
 
     PS_ASSERT_ARRAY_NON_NULL(cells, NULL);
-    PS_ASSERT_ARRAYS_SIZE_EQUAL(cells, imageNames, NULL);
-    if (conv) {
+    if (imageNames) {
+        PS_ASSERT_ARRAYS_SIZE_EQUAL(cells, imageNames, NULL);
+    }
+    if (maskNames) {
         PS_ASSERT_ARRAYS_SIZE_EQUAL(cells, maskNames, NULL);
+    }
+    if (varianceNames) {
         PS_ASSERT_ARRAYS_SIZE_EQUAL(cells, varianceNames, NULL);
+    }
+    if (covariances) {
         PS_ASSERT_ARRAYS_SIZE_EQUAL(cells, covariances, NULL);
     }
@@ -120 +126 @@
             }
             pmReadout *ro = pmReadoutAlloc(cell); // Readout for thread
-            if (conv) {
+            if (covariances) {
                 ro->covariance = psMemIncrRefCounter(covariances->data[j]);
             }
@@ -191 +197 @@
                 psFits *maskFits   = stack->maskFits->data[i]; // FITS file for mask
                 psFits *varianceFits = stack->varianceFits->data[i]; // FITS file for variance
-
 
                 int zMax = 0;