Changeset 34722

Timestamp:

Nov 27, 2012, 3:21:06 PM (14 years ago)

Author:

bills

Message:

In psphotStack if an input fails psf matching skip it completely for the radial aperture measurements since the convovled stack is likely no good and the measurements will be suspect.
Fix memory leak when empty extensions are found in cmf

Location:

tags/ipp-20121026

Files:

• psModules (modified) (1 prop)
• psModules/src/objects/pmSourceIO.c (modified) (4 diffs)
• psphot (modified) (1 prop)
• psphot/src (modified) (1 prop)
• psphot/src/psphotStackImageLoop.c (modified) (1 prop)
• psphot/src/psphotStackMatchPSFs.c (modified) (1 diff)
• psphot/src/psphotStackMatchPSFsUtils.c (modified) (2 diffs)
• psphot/src/psphotStackReadout.c (modified) (2 diffs)

tags/ipp-20121026/psModules/src/objects/pmSourceIO.c

@@ -1028 +1028 @@
         if (strcmp (xtension, "BINTABLE")) {
             psWarning ("no binary table in extension %s, skipping\n", dataname);
+            psFree(tableHeader);
             return false;
         }
@@ -1242 +1243 @@
     if (!xtension) psAbort("cannot read table type");
     if (strcmp (xtension, "BINTABLE")) {
+        psFree(tableHeader);
         psWarning ("no binary table in extension %s, skipping\n", xsrcname);
         return false;
@@ -1281 +1283 @@
     if (strcmp (xtension, "BINTABLE")) {
         psWarning ("no binary table in extension %s, skipping\n", extname);
+        psFree(tableHeader);
         return false;
     }
@@ -1318 +1321 @@
     if (strcmp (xtension, "BINTABLE")) {
         psWarning ("no binary table in extension %s, skipping\n", extname);
+        psFree(tableHeader);
         return false;
     }

tags/ipp-20121026/psphot/src/psphotStackMatchPSFs.c

@@ -108 +108 @@
     bool notMatched = psMetadataLookupBool(NULL, readoutOut->analysis, "NOT.PSF.MATCHED");
     if (notMatched) {
-        if (!readoutOut->image) {
-            // our images got freed in the matching process. Recreate them so that they
-            // are available when sources are copied to this readout.
-            readoutOut->image = psImageCopy(NULL, readoutSrc->image, PS_TYPE_F32);
-            if (readoutSrc->variance) {
-                psFree(readoutOut->variance);
-                readoutOut->variance = psImageCopy(NULL, readoutSrc->variance, PS_TYPE_F32);
-            }
-            if (readoutSrc->mask) {
-                psFree(readoutOut->mask);
-                readoutOut->mask = psImageCopy(NULL, readoutSrc->mask, PS_TYPE_IMAGE_MASK);
-            }
+        psFree(readoutOut->image);
+        readoutOut->image = psImageCopy(NULL, readoutSrc->image, PS_TYPE_F32);
+        psFree(readoutOut->variance);
+        if (readoutSrc->variance) {
+            readoutOut->variance = psImageCopy(NULL, readoutSrc->variance, PS_TYPE_F32);
+        }
+        psFree(readoutOut->mask);
+        if (readoutSrc->mask) {
+            readoutOut->mask = psImageCopy(NULL, readoutSrc->mask, PS_TYPE_IMAGE_MASK);
         }
     }

tags/ipp-20121026/psphot/src/psphotStackMatchPSFsUtils.c

@@ -303 +303 @@
         if (!pmSubtractionMatch(NULL, readoutOut, fake, readoutSrc, footprint, stride, regionSize, spacing, threshold, stampSources, stampsName, type, size, order, widthsCopy, orders, inner, ringsOrder, binning, penalty, optimum, optWidths, optOrder, optThresh, iter, rej, normFrac, sysError, skyErr, kernelError, covarFrac, maskVal, maskBad, maskPoor, poorFrac, badFrac, PM_SUBTRACTION_MODE_2)) {
             int errorCode = psErrorCodeLast();
-            if (errorCode == PM_ERR_SMALL_AREA) {
+            if (errorCode == PM_ERR_SMALL_AREA || errorCode == PM_ERR_STAMPS) {
                 // failed to match but, don't fault. Just drop this input from measurements that need the
                 // matched readout.
+                psErrorClear();
                 rejectReadout = true;
-                psLogMsg("psphot", PS_LOG_WARN, "PSF match failed for input %d. Too few pixels.", index);
+                if (errorCode == PM_ERR_SMALL_AREA) {
+                    psLogMsg("psphot", PS_LOG_WARN, "PSF match failed for input %d. Too few pixels.", index);
+                } else if (errorCode == PM_ERR_STAMPS) {
+                    psLogMsg("psphot", PS_LOG_WARN, "PSF match failed for input %d. Failed to find stamps.", index);
+                }
             } else {
                 psError(psErrorCodeLast(), false, "Unable to match images.");
@@ -324 +329 @@
     
     if (rejectReadout) {
+        psMetadataAddBool(readoutSrc->analysis, PS_LIST_TAIL, "NOT.PSF.MATCHED", PS_META_REPLACE, "", true);
         psMetadataAddBool(readoutOut->analysis, PS_LIST_TAIL, "NOT.PSF.MATCHED", PS_META_REPLACE, "", true);
     } else {
+        psMetadataAddBool(readoutSrc->analysis, PS_LIST_TAIL, "NOT.PSF.MATCHED", PS_META_REPLACE, "", false);
         psMetadataAddBool(readoutOut->analysis, PS_LIST_TAIL, "NOT.PSF.MATCHED", PS_META_REPLACE, "", false);
     }

tags/ipp-20121026/psphot/src/psphotStackReadout.c

@@ -409 +409 @@
             }
         }
+        // mark any inputs that we want to skip the matched apertures for
+        psphotStackSetInputsToSkip(config, view, STACK_CNV, true);
+        psphotStackSetInputsToSkip(config, view, STACK_OUT, true);
         psphotRadialApertures (config, view, STACK_CNV, 0); // entry 0 == unmatched
         psMemDump("extmeas");
 
-        // mark any inputs that we want to skip the matched apertures for
-        psphotStackSetInputsToSkip(config, view, STACK_OUT, true);
 
         int nRadialEntries = psphotStackMatchPSFsEntries(config, view, STACK_OUT);
@@ -439 +440 @@
         }
     }
+    psphotStackSetInputsToSkip(config, view, STACK_CNV, false);
     psphotStackSetInputsToSkip(config, view, STACK_OUT, false);