Changeset 18241

Timestamp:

Jun 20, 2008, 10:09:33 AM (18 years ago)

Author:

Paul Price

Message:

Trap case where !peaks.

File:

• trunk/psphot/src/psphotSourceStats.c (modified) (7 diffs)

trunk/psphot/src/psphotSourceStats.c

@@ -30 +30 @@
 
     psArray *peaks = detections->peaks;
+    if (!peaks) {
+        psError(PS_ERR_UNEXPECTED_NULL, false, "No peaks found!");
+        return NULL;
+    }
 
     sources = psArrayAllocEmpty (peaks->n);
@@ -37 +41 @@
     for (int i = 0; i < peaks->n; i++) {
 
-        pmPeak *peak = peaks->data[i];
-        if (peak->assigned) continue;
+        pmPeak *peak = peaks->data[i];
+        if (peak->assigned) continue;
 
         // create a new source, add peak
@@ -47 +51 @@
         pmSourceDefinePixels (source, readout, source->peak->x, source->peak->y, OUTER);
         if (!strcasecmp (breakPt, "PEAKS")) {
-            peak->assigned = true;
+            peak->assigned = true;
             psArrayAdd (sources, 100, source);
             psFree (source);
@@ -55 +59 @@
         // skip faint sources for moments measurement
         if (source->peak->SN < MIN_SN) {
-            peak->assigned = true;
+            peak->assigned = true;
             psArrayAdd (sources, 100, source);
             psFree (source);
@@ -62 +66 @@
 
         // measure a local sky value
-        // the local sky is now ignored; kept here for reference only
+        // the local sky is now ignored; kept here for reference only
         status = pmSourceLocalSky (source, PS_STAT_SAMPLE_MEDIAN, INNER, maskVal, mark);
         if (!status) {
@@ -85 +89 @@
         if (status) {
             // add to the source array
-            peak->assigned = true;
+            peak->assigned = true;
             psArrayAdd (sources, 100, source);
             psFree (source);
@@ -99 +103 @@
         if (status) {
             // add to the source array
-            peak->assigned = true;
+            peak->assigned = true;
             psArrayAdd (sources, 100, source);
             psFree (source);