Changeset 32322 for branches/eam_branches/ipp-20110710/psphot/src/psphotSourceMatch.c

Timestamp:

Sep 5, 2011, 9:02:13 AM (15 years ago)

Author:

eugene

Message:

major re-work of psphotStackReadout to be more consistent with psphotReadout; psphotRadialApertures now assumes the 0 element is the unconvolved version; for the convolved versions, the vector of target psfs is saved as STACK.PSF.FWHM.VALUES

File:

• branches/eam_branches/ipp-20110710/psphot/src/psphotSourceMatch.c (modified) (2 diffs)

branches/eam_branches/ipp-20110710/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;
@@ -261 +257 @@
             peak->assigned = true;
             pmPhotObjAddSource(obj, source);
-            psArrayAdd (detections->newSources, 100, source);
+            psArrayAdd (detections->allSources, 100, source);
             psFree (source);
         }