Changeset 26596 for branches/eam_branches/20091201/psphot/src/psphotFindPeaks.c

Timestamp:

Jan 14, 2010, 10:21:12 AM (17 years ago)

Author:

eugene

Message:

pmSourceMoments now takes the image mask; it is not not an error to find no peaks in an image

File:

• branches/eam_branches/20091201/psphot/src/psphotFindPeaks.c (modified) (1 diff)

branches/eam_branches/20091201/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;
     }