Changeset 31154 for trunk/psphot/src/psphotFindPeaks.c

Timestamp:

Apr 4, 2011, 1:12:39 PM (15 years ago)

Author:

eugene

Message:

use the smoothed image for footprint culling; use a more stringent culling for saturated stars; more tweaks to get sat stars to be fitted; various updates to psphotStack; unify psphotImageLoop varients; be a bit careful about number of stars in a PSF clump

Location:

trunk/psphot

Files:

• . (modified) (2 props)
• src/psphotFindPeaks.c (modified) (4 diffs)

trunk/psphot

@@ -19 +19 @@
 psphot-config
 Doxyfile
+a.out.dSYM

@@ -19 +19 @@
 psphot-config
 Doxyfile
+a.out.dSYM

trunk/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 (psImage *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) {
 
     bool status = false;
@@ -11 +11 @@
 
     // find the peaks in the smoothed image
-    psArray *peaks = pmPeaksInImage (significance, threshold);
+    // NOTE : significance->variance actually carries the detection S/N image
+    psArray *peaks = pmPeaksInImage (significance->variance, threshold);
     if (peaks == NULL) {
         // we only get a NULL peaks array due to a programming or config error. 
@@ -34 +35 @@
     for (int i = 0; i < peaks->n; i++) {
         pmPeak *peak = peaks->data[i];
-        peak->SN = sqrt(peak->value);
-        peak->flux = readout->image->data.F32[peak->y-row0][peak->x-col0];
-        // if (peak->flux / peak->value > 5.0/12.0) {
-        //     psWarning ("odd peak levels (1)");
-        // }
-        // if (peak->value / peak->flux > 5*12.0) {
-        //     psWarning ("odd peak levels (2)");
-        // }
+        peak->rawFlux = readout->image->data.F32[peak->y-row0][peak->x-col0];
+        peak->rawFluxStdev = sqrt(readout->variance->data.F32[peak->y-row0][peak->x-col0]);
+        peak->smoothFlux = significance->image->data.F32[peak->y-row0][peak->x-col0];
+        peak->smoothFluxStdev = peak->smoothFlux / sqrt(significance->variance->data.F32[peak->y-row0][peak->x-col0]);
+        // NOTE smoothFluxStdev is actually (sqrt(variance) / covar_factor)
+
+        // do we need this or not?
+        // peak->SN = sqrt(peak->detValue);
+
         if (readout->variance && isfinite (peak->dx)) {
             peak->dx *= sqrt(readout->variance->data.F32[peak->y-row0][peak->x-col0]);
@@ -51 +53 @@
 
     // limit the total number of returned peaks as specified
-    psArraySort (peaks, pmPeakSortBySN);
+    psArraySort (peaks, pmPeaksSortByRawFluxDescend);
     if (nMax && (peaks->n > nMax)) {
         psArray *tmpPeaks = psArrayAllocEmpty (nMax);

@@ -19 +19 @@
 psphot-config
 Doxyfile
+a.out.dSYM