Changeset 34246 for branches/eam_branches/ipp-20120627/psModules/src/objects/pmFootprintCullPeaks.c

Timestamp:

Jul 31, 2012, 11:47:07 AM (14 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ipp-20120627/psModules

Files:

• . (modified) (1 prop)
• src/objects/pmFootprintCullPeaks.c (modified) (2 diffs)

branches/eam_branches/ipp-20120627/psModules/src/objects/pmFootprintCullPeaks.c

@@ -118 +118 @@
             threshbounds->data.F32[i] = 0.25*beta2*PS_SQR(i) + min_threshold;       
         }
+#if (0)
         if (threshbounds->data.F32[threshbounds->n-1] > maxFlux) {
             psWarning ("upper limit: %f does not include max flux: %f",
                     threshbounds->data.F32[threshbounds->n-1], maxFlux);
         }
+#endif
         psHistogram *threshist = psHistogramAllocGeneric(threshbounds);
 
@@ -195 +197 @@
             psImageInit(idImg, 0);
             pmSetFootprintArrayIDsForImage(idImg, myFP, true);
-        
+
             // check which footprints contain already-accepted (brighter) peaks 
             // (we can give up if/when we found a peak for all footprints)