Changeset 26785 for branches/eam_branches/20091201/ppStack/src/ppStackPrepare.c

Timestamp:

Feb 5, 2010, 1:32:17 PM (16 years ago)

Author:

eugene

Message:

updates to psphot APIs to enable stack photometry

File:

• branches/eam_branches/20091201/ppStack/src/ppStackPrepare.c (modified) (2 diffs)

branches/eam_branches/20091201/ppStack/src/ppStackPrepare.c

@@ -177 +177 @@
 
         bool redoPhot = psMetadataLookupBool(NULL, recipe, "PHOT");
-        psArray *sources = NULL;
-
+
+        pmDetections *detections = NULL;
         if (options->convolve || options->matchZPs || options->photometry || redoPhot) {
             pmReadout *ro = pmFPAviewThisReadout(view, inputFile->fpa); // Readout with sources
-            sources = psMetadataLookupPtr(NULL, ro->analysis, "PSPHOT.SOURCES"); // Sources
-            if (!sources) {
-                psError(PS_ERR_UNEXPECTED_NULL, false, "Unable to find sources in readout.");
+            detections = psMetadataLookupPtr(NULL, ro->analysis, "PSPHOT.DETECTIONS"); // Sources
+            if (!detections) {
+                psError(PS_ERR_UNEXPECTED_NULL, false, "Unable to find source detections in readout.");
                 return NULL;
             }
-            options->sourceLists->data[index] = psMemIncrRefCounter(sources);
+            psAssert (detections->allSources, "missing sources?");
+            
+            options->sourceLists->data[index] = psMemIncrRefCounter(detections->allSources);
         }
 
@@ -206 +208 @@
             pmReadout *ro = pmFPAviewThisReadout(view, file->fpa); // Readout of interest
 
-            if (!ppStackInputPhotometer(ro, sources, config)) {
+            if (!ppStackInputPhotometer(ro, detections->allSources, config)) {
                 psError(PS_ERR_UNKNOWN, false, "Unable to do photometry on input sources");
                 psFree(view);