Changeset 30975 for branches/eam_branches/ipp-20110213/psphot/src/psphotCullPeaks.c

Timestamp:

Mar 18, 2011, 2:10:35 PM (15 years ago)

Author:

eugene

Message:

we had 3 items conceptually equivalent to the brightness of a peak: "value", "flux", and "SN"; Ive modified pmPeak to carry explicitly named elements "rawFlux", "smoothFlux", and "detValue". Ive also added the corresponding variance values for rawFlux and smoothFlux. This lets us choose independently of the peak detection process whether flux comparisons are done relative to the smoothed or unsmoothed image. It also simplifies tests of the peak flux compared to something else

File:

• branches/eam_branches/ipp-20110213/psphot/src/psphotCullPeaks.c (modified) (3 diffs)

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

@@ -1 +1 @@
 # include "psphotInternal.h"
-
-# define CULL_WITH_SMOOTHED_IMAGE 1
 
 /*
@@ -63 +61 @@
     float SAT_THRESHOLD  = 0.05*SATURATION;
 
-# if (CULL_WITH_SMOOTHED_IMAGE)
+# if (PM_PEAKS_CULL_WITH_SMOOTHED_IMAGE)
     psLogMsg ("psphot", PS_LOG_INFO, "Culling peaks from footprints using the smoothed image");
 # else
@@ -81 +79 @@
         pmPeak *brightPeak = fp->peaks->data[0];
         float max_threshold = SAT_TEST_LEVEL;
-        if (brightPeak->flux > SAT_TEST_LEVEL) {
+        if (brightPeak->rawFlux > SAT_TEST_LEVEL) {
             max_threshold = SAT_THRESHOLD;
             brightPeak->type = PM_PEAK_SUSPECT_SATURATION;
         }
 
-# if (CULL_WITH_SMOOTHED_IMAGE)
+# if (PM_PEAKS_CULL_WITH_SMOOTHED_IMAGE)
         // New (post r30869) style of culling using the smoothed image and variance (S/N)
         // if we cull using the significance image, then the definition of variance is different (thus the bool in arg 8)
-        if (pmFootprintCullPeaks(signifR->image, signifR->variance, fp, nsigma_delta, fPadding, MIN_THRESHOLD, max_threshold, false) != PS_ERR_NONE) {
+        if (pmFootprintCullPeaks(signifR->image, signifR->variance, fp, nsigma_delta, fPadding, MIN_THRESHOLD, max_threshold, true) != PS_ERR_NONE) {
             return psError(PS_ERR_UNKNOWN, false, "Culling pmFootprint %d", fp->id);
         }
 # else 
         // Old (pre r30869) style of culling using the raw image and variance
-        if (pmFootprintCullPeaks(readout->image, readout->variance, fp, nsigma_delta, fPadding, MIN_THRESHOLD, max_threshold, true) != PS_ERR_NONE) {
+        if (pmFootprintCullPeaks(readout->image, readout->variance, fp, nsigma_delta, fPadding, MIN_THRESHOLD, max_threshold, false) != PS_ERR_NONE) {
              return psError(PS_ERR_UNKNOWN, false, "Culling pmFootprint %d", fp->id);
-        }
-# endif
-
-// Alternate style of culling using the smoothed image and raw variance (probably a bad idea)
-# if (0)
-        if (pmFootprintCullPeaks(signifR->image, readout->variance, fp, nsigma_delta, fPadding, MIN_THRESHOLD, max_threshold, true) != PS_ERR_NONE) {
-            return psError(PS_ERR_UNKNOWN, false, "Culling pmFootprint %d", fp->id);
         }
 # endif