Changeset 17337

Timestamp:

Apr 6, 2008, 10:12:58 AM (18 years ago)

Author:

eugene

Message:

skip sources which have already been assigned (previous pass)

File:

• branches/eam_branch_20080324/psphot/src/psphotSourceStats.c (modified) (5 diffs)

branches/eam_branch_20080324/psphot/src/psphotSourceStats.c

@@ -37 +37 @@
     for (int i = 0; i < peaks->n; i++) {
 
+        pmPeak *peak = peaks->data[i];
+        if (peak->assigned) continue;
+
         // create a new source, add peak
         pmSource *source = pmSourceAlloc();
-        source->peak = (pmPeak *)psMemIncrRefCounter(peaks->data[i]);
+        source->peak = psMemIncrRefCounter(peak);
 
         // allocate image, weight, mask arrays for each peak (square of radius OUTER)
         pmSourceDefinePixels (source, readout, source->peak->x, source->peak->y, OUTER);
         if (!strcasecmp (breakPt, "PEAKS")) {
+            peak->assigned = true;
             psArrayAdd (sources, 100, source);
             psFree (source);
@@ -49 +53 @@
         }
 
-        // skip faint sources
+        // skip faint sources for moments measurement
         if (source->peak->SN < MIN_SN) {
+            peak->assigned = true;
             psArrayAdd (sources, 100, source);
             psFree (source);
@@ -57 +62 @@
 
         // measure a local sky value
-        // XXX EAM : this should use ROBUST not SAMPLE median, but it is broken
+        // the local sky is now ignored; kept here for reference only
         status = pmSourceLocalSky (source, PS_STAT_SAMPLE_MEDIAN, INNER, maskVal, mark);
         if (!status) {
@@ -80 +85 @@
         if (status) {
             // add to the source array
+            peak->assigned = true;
             psArrayAdd (sources, 100, source);
             psFree (source);
@@ -93 +99 @@
         if (status) {
             // add to the source array
+            peak->assigned = true;
             psArrayAdd (sources, 100, source);
             psFree (source);