Changeset 33415 for branches/meh_branches/ppstack_test/psphot/src/psphotSourceMatch.c

Timestamp:

Mar 5, 2012, 5:19:48 PM (14 years ago)

Author:

mhuber

Message:

merging latest r33407 trunk changes to meh_branches/ppstack_test

Location:

branches/meh_branches/ppstack_test

Files:

• . (modified) (1 prop)
• psphot (modified) (1 prop)
• psphot/src (modified) (2 props)
• psphot/src/psphotSourceMatch.c (modified) (11 diffs)

branches/meh_branches/ppstack_test/psphot/src

@@ -22 +22 @@
 psphotMakePSF
 psphotStack
+psphotModelTest

@@ -22 +22 @@
 psphotMakePSF
 psphotStack
+psphotModelTest

branches/meh_branches/ppstack_test/psphot/src/psphotSourceMatch.c

@@ -48 +48 @@
     pmDetections *detections = psMetadataLookupPtr (&status, readout->analysis, "PSPHOT.DETECTIONS");
     psAssert (detections, "missing detections?");
-    psAssert (detections->newSources, "new sources not defined?");
-    psAssert (!detections->allSources, "all sources already defined?");
-
-    // XXX TEST:
-    if (detections->newSources) {
-        psphotMatchSourcesToObjects(objects, detections->newSources, RADIUS);
-    }
+    psAssert (detections->allSources, "all sources not defined?");
+
+    psphotMatchSourcesToObjects(objects, detections->allSources, RADIUS);
 
     return true;
@@ -71 +67 @@
     objects = psArraySort (objects, pmPhotObjSortByX); 
  
-    psVector *found = psVectorAlloc(sources->n, PS_TYPE_U8);
-    psVectorInit (found, 0);
+    psVector *foundSrc = psVectorAlloc(sources->n, PS_TYPE_U8);
+    psVectorInit (foundSrc, 0);
+
+    psVector *foundObj = psVectorAlloc(objects->n, PS_TYPE_U8);
+    psVectorInit (foundObj, 0);
 
     // match sources to existing objects
@@ -97 +96 @@
         if (dx > +1.02*RADIUS) NEXT2; 
  
+        /* this block will match a given detection to the closest object within range of that detection.
+           XXX note that this matches ALL detections within range of the single object to that same object 
+           this is bad, but I cannot just go in linear order (ie, mark off each object as they are
+           used).  I should make a list of all Nobj * Ndet pairs in range and choose the matches
+           based on their separations.  UGH
+        */
+    
         // we are within match range, look for matches: 
         int Jmin = -1;
@@ -102 +108 @@
         for (int J = j; (dx > -1.02*RADIUS) && (J < objects->n); J++) { 
  
+            // skip objects that are already assigned:
+            if (foundObj->data.U8[J]) continue;
             obj = objects->data[J]; 
             
@@ -121 +129 @@
         }
         obj = objects->data[Jmin]; 
+        foundObj->data.U8[Jmin] = 1;
 
         // add to object
         pmPhotObjAddSource (obj, src);
-        found->data.U8[i] = 1;
+        foundSrc->data.U8[i] = 1;
         i++; 
     } 
@@ -132 +141 @@
     for (i = 0; i < sources->n; i++) {
 
-        if (found->data.U8[i]) continue;
+        if (foundSrc->data.U8[i]) continue;
 
         pmSource *src = sources->data[i]; 
@@ -143 +152 @@
     psLogMsg ("psphot", PS_LOG_DETAIL, "matched sources (%ld vs %ld)", sources->n, objects->n);
 
-    psFree (found);
+    psFree (foundSrc);
+    psFree (foundObj);
     return true;
 } 
@@ -238 +248 @@
             
             // 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
@@ -249 +261 @@
             source->imageID = index;
             source->mode2 |= PM_SOURCE_MODE2_MATCHED; // source is generated based on another image
+            source->type = PM_SOURCE_TYPE_STAR; // until we know more, assume a PSF fit
 
             // add the peak
@@ -261 +274 @@
             peak->assigned = true;
             pmPhotObjAddSource(obj, source);
-            psArrayAdd (detections->newSources, 100, source);
+            psArrayAdd (detections->allSources, 100, source);
             psFree (source);
         }
@@ -272 +285 @@
         pmPhotObj *obj = objects->data[i]; 
         nSources += obj->sources->n;
+        psAssert (obj->sources->n == nImages, "failed to match sources?");
     }
     psLogMsg ("psphot", PS_LOG_DETAIL, "total of %d sources for %d images", nSources, nImages);

@@ -22 +22 @@
 psphotMakePSF
 psphotStack
+psphotModelTest