Changeset 23192

Timestamp:

Mar 5, 2009, 9:29:21 AM (17 years ago)

Author:

Paul Price

Message:

NULL out PSFs belonging to images that have already been masked.

Location:

trunk/ppStack/src

Files:

• ppStack.h (modified) (1 diff)
• ppStackLoop.c (modified) (1 diff)
• ppStackPSF.c (modified) (2 diffs)

trunk/ppStack/src/ppStack.h

@@ -82 +82 @@
 pmPSF *ppStackPSF(const pmConfig *config, // Configuration
                   int numCols, int numRows, // Size of image
-                  const psArray *psfs   // List of input PSFs
+                  const psArray *psfs,  // List of input PSFs
+                  const psVector *inputMask // Mask for inputs
     );
 

trunk/ppStack/src/ppStackLoop.c

@@ -368 +368 @@
 
         // Generate target PSF
-        targetPSF = ppStackPSF(config, numCols, numRows, psfs);
+        targetPSF = ppStackPSF(config, numCols, numRows, psfs, inputMask);
         psFree(psfs);
         if (!targetPSF) {

trunk/ppStack/src/ppStackPSF.c

@@ -9 +9 @@
 #include "ppStack.h"
 
-pmPSF *ppStackPSF(const pmConfig *config, int numCols, int numRows, const psArray *psfs)
+pmPSF *ppStackPSF(const pmConfig *config, int numCols, int numRows,
+                  const psArray *psfs, const psVector *inputMask)
 {
     // Get the recipe values
@@ -19 +20 @@
     const char *psfModel = psMetadataLookupStr(NULL, recipe, "PSF.MODEL"); // Model for PSF
     int psfOrder = psMetadataLookupS32(NULL, recipe, "PSF.ORDER"); // Spatial order for PSF
+
+    for (int i = 0; i < psfs->n; i++) {
+        if (inputMask->data.U8[i]) {
+            psFree(psfs->data[i]);
+            psfs->data[i] = NULL;
+        }
+    }
 
     // Solve for the target PSF