Changeset 25824

Timestamp:

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

Author:

Paul Price

Message:

Using original mask in combination of unconvolved images.

Location:

branches/pap/ppStack/src

Files:

• ppStackOptions.c (modified) (2 diffs)
• ppStackOptions.h (modified) (2 diffs)
• ppStackSetup.c (modified) (1 diff)
• ppStackThread.c (modified) (3 diffs)

branches/pap/ppStack/src/ppStackOptions.c

@@ -13 +13 @@
     }
     psFree(options->origImages);
+    psFree(options->origMasks);
+    psFree(options->origVariances);
     psFree(options->convImages);
     psFree(options->convMasks);
@@ -42 +44 @@
     options->statsFile = NULL;
     options->origImages = NULL;
+    options->origMasks = NULL;
+    options->origVariances = NULL;
     options->convImages = NULL;
     options->convMasks = NULL;

branches/pap/ppStack/src/ppStackOptions.h

@@ -11 +11 @@
     psMetadata *stats;                  // Statistics for output
     FILE *statsFile;                    // File to which to write statistics
-    psArray *origImages;                // Filenames of the original images
+    psArray *origImages, *origMasks, *origVariances; // Filenames of the original images
     psArray *convImages, *convMasks, *convVariances; // Filenames for the temporary convolved images
     int num;                            // Number of inputs
@@ -27 +27 @@
     psVector *matchChi2;                // chi^2 for stamps from matching
     psVector *weightings;               // Combination weightings for images (1/noise^2)
-    psArray *covariances;               // Covariance matrices
+    psArray *covariances;                 // Convolved covariance matrices
     // Combine initial
     pmReadout *outRO;                   // Output readout

branches/pap/ppStack/src/ppStackSetup.c

@@ -48 +48 @@
     // Original images
     options->origImages = psArrayAlloc(num);
+    options->origMasks = psArrayAlloc(num);
+    options->origVariances = psArrayAlloc(num);
     pmFPAview *view = pmFPAviewAlloc(0);
     for (int i = 0; i < num; i++) {
-        pmFPAfile *file = pmFPAfileSelectSingle(config->files, "PPSTACK.INPUT", i); // File of interest
-        options->origImages->data[i] = pmFPAfileName(file, view, config);
+        {
+            pmFPAfile *file = pmFPAfileSelectSingle(config->files, "PPSTACK.INPUT", i);
+            options->origImages->data[i] = pmFPAfileName(file, view, config);
+        }
+        {
+            pmFPAfile *file = pmFPAfileSelectSingle(config->files, "PPSTACK.INPUT.MASK", i);
+            options->origMasks->data[i] = pmFPAfileName(file, view, config);
+        }
+        {
+            pmFPAfile *file = pmFPAfileSelectSingle(config->files, "PPSTACK.INPUT.VARIANCE", i);
+            options->origVariances->data[i] = pmFPAfileName(file, view, config);
+        }
     }
     psFree(view);

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;