Changeset 26784 for branches/eam_branches/20091201/ppSub/src/ppSubMakePSF.c

Timestamp:

Feb 5, 2010, 1:31:49 PM (16 years ago)

Author:

eugene

Message:

updates to psphot APIs to enable stack photometry

File:

• branches/eam_branches/20091201/ppSub/src/ppSubMakePSF.c (modified) (2 diffs)

branches/eam_branches/20091201/ppSub/src/ppSubMakePSF.c

@@ -66 +66 @@
     pmReadout *photRO = pmFPAviewThisReadout(view, photFile->fpa); // Readout to photometer
 
-    // we need to remove any existing PSPHOT.SOURCES (why not do this in psphot?)
-    if (psMetadataLookup(photRO->analysis, "PSPHOT.SOURCES")) {
-        psMetadataRemoveKey(photRO->analysis, "PSPHOT.SOURCES");
+    // we need to remove any existing PSPHOT.DETECTIONS (why not do this in psphot?)
+    if (psMetadataLookup(photRO->analysis, "PSPHOT.DETECTIONS")) {
+        psMetadataRemoveKey(photRO->analysis, "PSPHOT.DETECTIONS");
     }
     if (psMetadataLookup(photRO->parent->parent->analysis, "PSPHOT.PSF")) {
@@ -83 +83 @@
     // Extract the loaded sources from the associated readout, and generate PSF
     // Here, we assume the image is background-subtracted
-    psArray *sources = psMetadataLookupPtr(&mdok, minuend->analysis, "PSPHOT.SOURCES");
+    pmDetections *detections = psMetadataLookupPtr(&mdok, minuend->analysis, "PSPHOT.DETECTIONS");
+    psAssert(detections, "missing detections?");
+    psArray *sources = detections->allSources;
+    psAssert(sources, "missing sources?");
     
     // XXX filter sources?  limit the total number and return only brighter objects?