Changeset 26785

Timestamp:

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

Author:

eugene

Message:

updates to psphot APIs to enable stack photometry

Location:

branches/eam_branches/20091201/ppStack/src

Files:

• ppStackConvolve.c (modified) (1 diff)
• ppStackPhotometry.c (modified) (1 diff)
• ppStackPrepare.c (modified) (2 diffs)

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

@@ -94 +94 @@
         options->origCovars->data[i] = psMemIncrRefCounter(readout->covariance);
         if (!ppStackMatch(readout, options, i, config)) {
+            // XXX many things can cause a failure of ppStackMatch -- should some be handled differently? 
             psErrorStackPrint(stderr, "Unable to match image %d --- ignoring.", i);
             options->inputMask->data.PS_TYPE_VECTOR_MASK_DATA[i] |= PPSTACK_MASK_MATCH;

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

@@ -90 +90 @@
     if (options->stats) {
         pmReadout *photRO = pmFPAviewThisReadout(photView, photFile->fpa); // Readout with the sources
-        psArray *sources = psMetadataLookupPtr(NULL, photRO->analysis, "PSPHOT.SOURCES"); // Sources
-        psMetadataAddS32(options->stats, PS_LIST_TAIL, "NUM_SOURCES", 0,
-                         "Number of sources detected", sources ? sources->n : 0);
-        psMetadataAddF32(options->stats, PS_LIST_TAIL, "TIME_PHOT", 0,
-                         "Time to do photometry", psTimerMark("PPSTACK_PHOT"));
+        pmDetections *detections = psMetadataLookupPtr(NULL, photRO->analysis, "PSPHOT.DETECTIONS"); // detections
+        if (detections) {
+            psAssert (detections->allSources, "missing sources?");
+            psMetadataAddS32(options->stats, PS_LIST_TAIL, "NUM_SOURCES", 0, "Number of sources detected", detections->allSources->n);
+        } else {
+            psMetadataAddS32(options->stats, PS_LIST_TAIL, "NUM_SOURCES", 0, "Number of sources detected", 0);
+        }
+        psMetadataAddF32(options->stats, PS_LIST_TAIL, "TIME_PHOT", 0, "Time to do photometry", psTimerMark("PPSTACK_PHOT"));
     }
     psFree(photView);

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);