Changeset 30631 for branches/czw_branch/20101203/psphot/src/psphotSourceMatch.c

Timestamp:

Feb 14, 2011, 1:05:28 PM (15 years ago)

Author:

watersc1

Message:

Merge of trunk back into branch.

Location:

branches/czw_branch/20101203

Files:

• . (modified) (1 prop)
• psphot (modified) (1 prop)
• psphot/src/psphotSourceMatch.c (modified) (5 diffs)

branches/czw_branch/20101203/psphot/src/psphotSourceMatch.c

@@ -187 +187 @@
         pmPhotObj *obj = objects->data[i]; 
 
+        // we will find the input source with the max number of spans and reproduce that footprint
+        int nSpansMax = 0;
+        int iSpansMax = -1;
+
         // mark the images for which sources have been found
         psVectorInit (found, 0);
@@ -196 +200 @@
             psAssert (index < found->n, "invalid index");
 
+            if (src->peak && src->peak->footprint && src->peak->footprint->nspans > nSpansMax) {
+                nSpansMax = src->peak->footprint->nspans;
+                iSpansMax = j;
+            }
+
             found->data.U8[index] = 1;
+        }
+
+        // we make a copy of the largest footprint; this will be used for all new sources associated with this object
+        pmFootprint *footprint = NULL;
+        if (iSpansMax != -1) { // copy the footprint info
+            pmSource *src = obj->sources->data[iSpansMax]; 
+            psAssert(src->peak, "source does not exist?");
+            psAssert(src->peak->footprint, "footprint does not exist");
+            psAssert(src->peak->footprint->nspans == nSpansMax, "wrong footprint?");
+            
+            // we only care about the spans, do not worry about the image of this footprint
+            footprint = pmFootprintCopyData(src->peak->footprint, NULL);
         }
 
@@ -219 +240 @@
             peak->dy = NAN;
             
-            // XXX assign to a footprint?
-
+            // assign to a footprint on this readout->image
+            peak->footprint = pmFootprintCopyData(footprint, readout->image);
+
+            // the peak does not claim ownership of the footprint (it does not free it). save a copy of this 
+            // footprint on detections->footprints so we can free it later
+            psArrayAdd(detections->footprints, 100, peak->footprint); 
+            psFree (peak->footprint);
+            
             // create a new source
             pmSource *source = pmSourceAlloc();
@@ -227 +254 @@
 
             // add the peak
-            source->peak = psMemIncrRefCounter(peak);
+            source->peak = peak;
 
             // allocate space for moments
@@ -239 +266 @@
             psArrayAdd (detections->newSources, 100, source);
             psFree (source);
-            psFree (peak);
-        }
+        }
+        psFree (footprint);
     }