Changeset 33762

Timestamp:

Apr 11, 2012, 11:58:36 AM (14 years ago)

Author:

bills

Message:

From trunk. Fail psphotFindDetections if the number of peaks exceeds the
value given by the recipe value PEAKNS_NMAX_TOTAL

Location:

tags/ipp-20120404

Files:

• ippconfig/recipes/psphot.config (modified) (2 diffs, 1 prop)
• psphot/src/psphot.h (modified) (1 diff, 1 prop)
• psphot/src/psphotFindDetections.c (modified) (2 diffs, 1 prop)
• psphot/src/psphotFindPeaks.c (modified) (2 diffs, 1 prop)

tags/ipp-20120404/ippconfig/recipes/psphot.config

@@ -57 +57 @@
 PEAKS_POS2_NSIGMA_LIMIT             F32   25.0            # peak signficance threshold for POS2 sources. (ppSub)
                                                           # input pixels contribute less than this fraction of the flux
+PEAKS_NMAX_TOTAL                    S32   0               # maximum allowed number of peaks 0 == unlimited
+
 # parameters which adjust the footprint analysis
 USE_FOOTPRINTS                      BOOL  TRUE            # use new pmFootprint peak packaging
@@ -368 +370 @@
   PSF_MODEL                           STR   PS_MODEL_GAUSS 
   EXT_MODEL                           STR   PS_MODEL_QGAUSS
+  PEAKS_NMAX_TOTAL                    S32   50000 # maximum allowed number of peaks - To avoid memory explosion
 END
 

tags/ipp-20120404/psphot/src/psphot.h

@@ -189 +189 @@
 // used by psphotFindDetections
 pmReadout      *psphotSignificanceImage (pmReadout *readout, psMetadata *recipe, psImageMaskType maskVal);
-psArray        *psphotFindPeaks (pmReadout *significance, pmReadout *readout, psMetadata *recipe, const float threshold, const int nMax);
+psArray        *psphotFindPeaks (pmReadout *significance, pmReadout *readout, psMetadata *recipe, const float threshold, const int nMax, int *totalPeaks);
 bool            psphotFindFootprints (pmDetections *detections, pmReadout *significance, pmReadout *readout, psMetadata *recipe, const float threshold, const int pass, psImageMaskType maskVal);
 psErrorCode     psphotCullPeaks(const pmReadout *readout, const pmReadout *signifRO, const psMetadata *recipe, psArray *footprints);

tags/ipp-20120404/psphot/src/psphotFindDetections.c

@@ -96 +96 @@
 
     // detect the peaks in the significance image
-    detections->peaks = psphotFindPeaks (significance, readout, recipe, threshold, NMAX);
+    int totalPeaks = 0;
+    detections->peaks = psphotFindPeaks (significance, readout, recipe, threshold, NMAX, &totalPeaks);
     psMetadataAddF32  (readout->analysis, PS_LIST_TAIL, "PEAK_THRESHOLD", PS_META_REPLACE, "Peak Detection Threshold", threshold);
     if (!detections->peaks) {
@@ -103 +104 @@
         psFree (detections);
         psError (PSPHOT_ERR_CONFIG, false, "failed on peak search");
+        return false;
+    }
+    // hard limit on number of peaks we will accept. (To avoid memory overload in psphotStack)
+    int maxPeaks = psMetadataLookupS32 (&status, recipe, "PEAKS_NMAX_TOTAL"); PS_ASSERT (status, NULL);
+    if (maxPeaks && (totalPeaks > maxPeaks)) {
+        psFree (detections);
+        psError (PSPHOT_ERR_DATA, true, "Too many peaks %d found PEAKS_NMAX_TOTAL: %d", totalPeaks, maxPeaks);
         return false;
     }

tags/ipp-20120404/psphot/src/psphotFindPeaks.c

@@ -4 +4 @@
 // image must be constructed to represent (S/N)^2.  If nMax is non-zero, only return a maximum
 // of nMax peaks
-psArray *psphotFindPeaks (pmReadout *significance, pmReadout *readout, psMetadata *recipe, const float threshold, const int nMax) {
+psArray *psphotFindPeaks (pmReadout *significance, pmReadout *readout, psMetadata *recipe, const float threshold, const int nMax, int *totalPeaks) {
 
     bool status = false;
@@ -18 +18 @@
         psError(PSPHOT_ERR_DATA, false, "no peaks found in this image");
         return NULL;
+    }
+    // return the total number of peaks found before the nMax limit is applied
+    if (totalPeaks) {
+        *totalPeaks = peaks->n;
     }