Changeset 34247 for branches/eam_branches/ipp-20120627/psphot/src/psphotCullPeaks.c

Timestamp:

Jul 31, 2012, 11:50:18 AM (14 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ipp-20120627/psphot

Files:

• . (modified) (1 prop)
• src (modified) (1 prop)
• src/psphotCullPeaks.c (modified) (3 diffs)

branches/eam_branches/ipp-20120627/psphot/src/psphotCullPeaks.c

@@ -63 +63 @@
 # if (PM_PEAKS_CULL_WITH_SMOOTHED_IMAGE)
     psLogMsg ("psphot", PS_LOG_INFO, "Culling peaks from footprints using the smoothed image");
+    bool setNaNsToZero = psMetadataLookupF32 (&status, recipe, "FOOTPRINT_SET_NANS_TO_ZERO");
+    if (setNaNsToZero) {
+        // Set NaN pixels to zero so that they do not considered in the footprint analysis
+        // XXX: Currently the caller does nothing further with the significance readout so
+        // modifiying the image does no harm
+        // XXX: Note: signifR->weight is not used by pmFootprintCullPeaks so we don't
+        // need to touch it
+        psImageClipNaN(signifR->image, 0);
+    }
+        
+
 # else
     psLogMsg ("psphot", PS_LOG_INFO, "Culling peaks from footprints using the raw (unsmoothed) image");
@@ -73 +84 @@
 
         if (fp->npix > 30000) {
-            fprintf (stderr, "big footprint: %f %f to %f %f (%d pix)\n", fp->bbox.x0, fp->bbox.y0, fp->bbox.x1, fp->bbox.y1, fp->npix);
+            psLogMsg("psphot.cull.footprints", PS_LOG_WARN, "big footprint: %f %f to %f %f (%d pix)\n", fp->bbox.x0, fp->bbox.y0, fp->bbox.x1, fp->bbox.y1, fp->npix);
         }
         psTimerStart ("psphot.cull.footprints");
@@ -97 +108 @@
 # endif
 
+
         float dtime = psTimerMark ("psphot.cull.footprints");
         if (dtime > 1.0) {
-            fprintf (stderr, "slow cull for %d (%f sec)\n", i, dtime);
+            psLogMsg("psphot.cull.footprints", PS_LOG_WARN, "slow cull for %d (%f sec)\n", i, dtime);
         }
     }