Changeset 26606

Timestamp:

Jan 14, 2010, 11:10:18 AM (16 years ago)

Author:

eugene

Message:

adding mask value to pmPSFEnvelope (for pmSourceMoments)

File:

• branches/eam_branches/20091201/ppStack/src/ppStackPSF.c (modified) (3 diffs)

branches/eam_branches/20091201/ppStack/src/ppStackPSF.c

@@ -14 +14 @@
                   const psArray *psfs, const psVector *inputMask)
 {
+    bool mkdo = false;
+
 #ifndef TESTING
     // Get the recipe values
@@ -24 +26 @@
     int psfOrder = psMetadataLookupS32(NULL, recipe, "PSF.ORDER"); // Spatial order for PSF
 
+    psString maskValStr = psMetadataLookupStr(&mdok, recipe, "MASK.VAL"); // Name of bits to mask going in
+    if (!mdok || !maskValStr) {
+        psError(PS_ERR_UNKNOWN, false, "Unable to find MASK.VAL in recipe");
+        return false;
+    }
+    psImageMaskType maskVal = pmConfigMaskGet(maskValStr, config); // Bits to mask
+
     for (int i = 0; i < psfs->n; i++) {
         if (inputMask->data.U8[i]) {
@@ -32 +41 @@
 
     // Solve for the target PSF
-    pmPSF *psf = pmPSFEnvelope(numCols, numRows, psfs, psfInstances, psfRadius, psfModel,
-                               psfOrder, psfOrder);
+    pmPSF *psf = pmPSFEnvelope(numCols, numRows, psfs, psfInstances, psfRadius, psfModel, psfOrder, psfOrder, maskVal);
     if (!psf) {
         psError(PS_ERR_UNKNOWN, false, "Unable to determine output PSF.");