Changeset 27840 for branches/simtest_nebulous_branches/psphot/src/psphotFindPeaks.c

Timestamp:

May 3, 2010, 8:50:52 AM (16 years ago)

Author:

eugene

Message:

updates from trunk

Location:

branches/simtest_nebulous_branches

Files:

• . (modified) (1 prop)
• psphot (modified) (1 prop)
• psphot/src (modified) (1 prop)
• psphot/src/psphotFindPeaks.c (modified) (2 diffs)

branches/simtest_nebulous_branches/psphot/src

@@ -18 +18 @@
 psphotVersionDefinitions.h
 psphotMomentsStudy
+psphotPetrosianStudy
+psphotForced
+psphotMakePSF
+psphotStack

@@ -18 +18 @@
 psphotVersionDefinitions.h
 psphotMomentsStudy
+psphotPetrosianStudy
+psphotForced
+psphotMakePSF
+psphotStack

branches/simtest_nebulous_branches/psphot/src/psphotFindPeaks.c

@@ -13 +13 @@
     psArray *peaks = pmPeaksInImage (significance, threshold);
     if (peaks == NULL) {
-        // XXX should we be sending back an empty array instead of NULL?
-        // XXX this may also be due to a programming or config error
+        // we only get a NULL peaks array due to a programming or config error. 
+        // this will result in a failure.
+        psError(PSPHOT_ERR_DATA, false, "no peaks found in this image");
+        return NULL;
+    }
+
+    if (peaks->n == 0) {
         // XXX do we need to set something in the readout->analysis to indicate that
         // we tried and failed to find peaks (something in the header data)
-        psError(PSPHOT_ERR_DATA, false, "no peaks found in this image");
-        return false;
+        psLogMsg ("psphot", PS_LOG_INFO, "no peaks found in this image");
+        return peaks;
     }
 
@@ -31 +36 @@
         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)");
+        // }
         if (readout->variance && isfinite (peak->dx)) {
             peak->dx *= sqrt(readout->variance->data.F32[peak->y-row0][peak->x-col0]);

@@ -18 +18 @@
 psphotVersionDefinitions.h
 psphotMomentsStudy
+psphotPetrosianStudy
+psphotForced
+psphotMakePSF
+psphotStack