Changeset 26006

Timestamp:

Nov 2, 2009, 3:44:50 PM (17 years ago)

Author:

Paul Price

Message:

The unconvolved image should be created using the *convolved* mask,
since that defines the area that has been tested for outliers. A
satellite streak could reside in the area that's masked on the
convolved mask but unmasked on the unconvolved mask.

File:

• branches/pap/ppStack/src/ppStackSetup.c (modified) (2 diffs)

branches/pap/ppStack/src/ppStackSetup.c

@@ -46 +46 @@
     }
 
-    // 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);
-            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);
-
     // Generate temporary names for convolved images
     const char *tempDir = psMetadataLookupStr(NULL, recipe, "TEMP.DIR"); // Directory for temporary images
@@ -108 +87 @@
     psFree(outputName);
 
+    // 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);
+            options->origImages->data[i] = pmFPAfileName(file, view, config);
+        }
+        {
+            // We want the convolved mask, since that defines the area that has been tested for outliers
+            options->origMasks->data[i] = psMemIncrRefCounter(options->convMasks->data[i]);
+        }
+        {
+            pmFPAfile *file = pmFPAfileSelectSingle(config->files, "PPSTACK.INPUT.VARIANCE", i);
+            options->origVariances->data[i] = pmFPAfileName(file, view, config);
+        }
+    }
+    psFree(view);
+
     if (!pmConfigMaskSetBits(NULL, NULL, config)) {
         psError(PS_ERR_UNKNOWN, false, "Unable to determine mask value.");