Changeset 32619

Timestamp:

Nov 6, 2011, 2:43:27 PM (15 years ago)

Author:

eugene

Message:

do not require a footprint when generating matched sources; copy the footprint for double objects

Location:

branches/eam_branches/ipp-20110906/psphot/src

Files:

• psphotFitSourcesLinear.c (modified) (1 diff)
• psphotGuessModels.c (modified) (1 diff)
• psphotSourceFits.c (modified) (1 diff)
• psphotSourceMatch.c (modified) (1 diff)
• psphotSourceStats.c (modified) (1 diff)

branches/eam_branches/ipp-20110906/psphot/src/psphotFitSourcesLinear.c

@@ -134 +134 @@
     for (int i = 0; i < sources->n; i++) {
         pmSource *source = sources->data[i];
+
+        // psAssert (source->peak, "source without peak??");
+        // psAssert (source->peak->footprint, "peak without footprint??");
 
         // turn this bit off and turn it on again if we pass this test

branches/eam_branches/ipp-20110906/psphot/src/psphotGuessModels.c

@@ -170 +170 @@
         if (!source->peak) continue;
 
+        // psAssert (source->peak->footprint, "peak without footprint??");
+
         nSrc ++;
 

branches/eam_branches/ipp-20110906/psphot/src/psphotSourceFits.c

@@ -357 +357 @@
     pmSource *newSrc = pmSourceCopy (source);
     newSrc->modelPSF = psMemIncrRefCounter (DBL->data[1]);
+    newSrc->peak->footprint = source->peak->footprint; // just a reference; the peak does not own the footprint
+    psArrayAdd(newSrc->peak->footprint->peaks, 1, newSrc->peak); // the footprint owns the peak
 
     // build cached models and subtract

branches/eam_branches/ipp-20110906/psphot/src/psphotSourceMatch.c

@@ -234 +234 @@
             
             // 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);
+            if (footprint) {
+                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

branches/eam_branches/ipp-20110906/psphot/src/psphotSourceStats.c

@@ -124 +124 @@
         // add the peak
         source->peak = psMemIncrRefCounter(peak);
+
+        // psAssert (source->peak->footprint, "peak without footprint??");
 
         // allocate space for moments