Changeset 17870 for trunk/psphot/src/psphotFindDetections.c

Timestamp:

May 30, 2008, 4:09:46 PM (18 years ago)

Author:

eugene

Message:

fix errors in calculation of sig image; API change: sig image is now actual S/N²

File:

• trunk/psphot/src/psphotFindDetections.c (modified) (4 diffs)

trunk/psphot/src/psphotFindDetections.c

@@ -6 +6 @@
     bool status;
     int pass;
+    float NSIGMA_PEAK = 25.0;
+    int NMAX = 0;
 
     psTimerStart ("psphot");
@@ -20 +22 @@
         detections = pmDetectionsAlloc();
         pass = 1;
+        NSIGMA_PEAK = psMetadataLookupF32 (&status, recipe, "PEAKS_NSIGMA_LIMIT"); PS_ASSERT (status, NULL);
+        NMAX = psMetadataLookupS32 (&status, recipe, "PEAKS_NMAX"); PS_ASSERT (status, NULL);
     } else {
         pass = 2;
+        NSIGMA_PEAK = psMetadataLookupF32 (&status, recipe, "PEAKS_NSIGMA_LIMIT_2"); PS_ASSERT (status, NULL);
+        NMAX = 0; // unlimited number of peaks in final pass: allow a limit (PEAKS_NMAX_2) ?
     }
+
+    float threshold = PS_SQR(NSIGMA_PEAK);
 
     // move the old peaks array (if it exists) to oldPeaks 
@@ -34 +42 @@
 
     // detect the peaks in the significance image
-    detections->peaks = psphotFindPeaks (significance, readout, recipe, pass, maskVal);
+    detections->peaks = psphotFindPeaks (significance, readout, recipe, threshold, NMAX);
+    psMetadataAddF32  (recipe, PS_LIST_TAIL, "PEAK_THRESHOLD", PS_META_REPLACE, "Peak Detection Threshold", threshold);
 
     // optionally merge peaks into footprints
@@ -47 +56 @@
 // if we use the footprints, the output peaks list contains both old and new peaks,
 // otherwise it only contains the new peaks.
-
-// if psf is defined, we should treat this as pass "2", not "1".  re-define this boolean to
-// be "have PSF"