Changeset 26596

Timestamp:

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

Author:

eugene

Message:

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

Location:

branches/eam_branches/20091201/psphot/src

Files:

• psphotFindDetections.c (modified) (1 diff)
• psphotFindPeaks.c (modified) (1 diff)
• psphotModelTest.c (modified) (1 diff)
• psphotMomentsStudy.c (modified) (1 diff)
• psphotPSFConvModel.c (modified) (1 diff)
• psphotReadout.c (modified) (1 diff)
• psphotReadoutMinimal.c (modified) (1 diff)
• psphotSourceFits.c (modified) (1 diff)
• psphotSourceStats.c (modified) (3 diffs)

branches/eam_branches/20091201/psphot/src/psphotFindDetections.c

@@ -53 +53 @@
     psMetadataAddF32  (recipe, PS_LIST_TAIL, "PEAK_THRESHOLD", PS_META_REPLACE, "Peak Detection Threshold", threshold);
     if (!detections->peaks) {
-        // No peaks found
+        // we only get a NULL peaks array due to a programming or config error. 
+        // this will result in a failure.
+        psFree (detections);
+        psError (PSPHOT_ERR_CONFIG, false, "failed on peak search");
         return NULL;
     }

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;
     }
 

branches/eam_branches/20091201/psphot/src/psphotModelTest.c

@@ -139 +139 @@
 
     // get the source moments
-    status = pmSourceMoments (source, mRADIUS, 0.0, 1.0);
+    status = pmSourceMoments (source, mRADIUS, 0.0, 1.0, maskVal);
     if (!status) psAbort("psSourceMoments error");
     source->peak->value = source->moments->Peak;

branches/eam_branches/20091201/psphot/src/psphotMomentsStudy.c

@@ -148 +148 @@
       pmSourceAdd(source, PM_MODEL_OP_FUNC, 0); 
 
-      pmSourceMoments (source, 32.0, sigWindow, 0.0);
+      pmSourceMoments (source, 32.0, sigWindow, 0.0, 0xffff);
       // fprintf (stderr, "sigOut : %f\n", sqrt(source->moments->Mxx));
 

branches/eam_branches/20091201/psphot/src/psphotPSFConvModel.c

@@ -39 +39 @@
     // adjust the pixels based on the footprint
     float radius = psphotSetRadiusEXT (readout, source, markVal);
-    if (!pmSourceMoments (source, radius, 0.0, 0.0)) return false;
+    if (!pmSourceMoments (source, radius, 0.0, 0.0, maskVal)) return false;
 
     // XXX test : modify the Io, SXX, SYY terms based on the psf SXX, SYY terms:

branches/eam_branches/20091201/psphot/src/psphotReadout.c

@@ -76 +76 @@
     pmDetections *detections = psphotFindDetections (NULL, readout, recipe);
     if (!detections) {
+        // this only happens if we had an error in psphotFindDetections
+        psError (PSPHOT_ERR_UNKNOWN, false, "failure in peak analysis");
+        return psphotReadoutCleanup (config, readout, recipe, detections, psf, NULL);
+    }
+    if (!detections->peaks->n) {
         psLogMsg ("psphot", 3, "unable to find detections in this image");
         return psphotReadoutCleanup (config, readout, recipe, detections, psf, NULL);

branches/eam_branches/20091201/psphot/src/psphotReadoutMinimal.c

@@ -51 +51 @@
     detections = psphotFindDetections(detections, readout, recipe);
     if (!detections) {
+        psError (PSPHOT_ERR_UNKNOWN, false, "failure in peak analysis");
+        return psphotReadoutCleanup (config, readout, recipe, detections, psf, NULL);
+    }
+    if (!detections->peaks->n) {
         psLogMsg ("psphot", 3, "unable to find detections in this image");
         return psphotReadoutCleanup (config, readout, recipe, detections, psf, NULL);

branches/eam_branches/20091201/psphot/src/psphotSourceFits.c

@@ -235 +235 @@
     // at this stage, skip Gaussian windowing, and do not clip pixels by S/N
     // this uses the footprint to judge both radius and aperture?
-    if (!pmSourceMoments (source, radius, 0.0, 0.0)) return false;
+    if (!pmSourceMoments (source, radius, 0.0, 0.0, maskVal)) return false;
 
     psTrace ("psphot", 5, "trying blob...\n");

branches/eam_branches/20091201/psphot/src/psphotSourceStats.c

@@ -325 +325 @@
 
         // measure basic source moments (no S/N clipping on input pixels)
-        status = pmSourceMoments (source, RADIUS, SIGMA, 0.0);
+        status = pmSourceMoments (source, RADIUS, SIGMA, 0.0, maskVal);
         if (status) {
             Nmoments ++;
@@ -335 +335 @@
         BIG_RADIUS = PS_MIN (INNER, 3*RADIUS);
         psTrace ("psphot", 4, "retrying moments for %d, %d\n", source->peak->x, source->peak->y);
-        status = pmSourceMoments (source, BIG_RADIUS, 3.0*SIGMA, 0.0);
+        status = pmSourceMoments (source, BIG_RADIUS, 3.0*SIGMA, 0.0, maskVal);
         if (status) {
             source->mode |= PM_SOURCE_MODE_BIG_RADIUS;
@@ -394 +394 @@
 
             // measure basic source moments (no S/N clipping on input pixels)
-            status = pmSourceMoments (source, 4*sigma[i], sigma[i], 0.0);
+            status = pmSourceMoments (source, 4*sigma[i], sigma[i], 0.0, 0xffff);
         }