Changeset 26688 for branches/eam_branches/psphot.stack.20100120/src/psphotSourceSize.c

Timestamp:

Jan 26, 2010, 5:10:34 PM (16 years ago)

Author:

eugene

Message:

various API fixes for multi-inputs

File:

• branches/eam_branches/psphot.stack.20100120/src/psphotSourceSize.c (modified) (7 diffs)

branches/eam_branches/psphot.stack.20100120/src/psphotSourceSize.c

@@ -16 +16 @@
 
 // local functions:
-bool psphotSourceSizeReadout(pmConfig *config, const pmFPAview *view, const char *filename, int index);
 bool psphotSourceSizePSF (psphotSourceSizeOptions *options, psArray *sources, pmPSF *psf);
 bool psphotSourceClass (pmReadout *readout, psArray *sources, psMetadata *recipe, pmPSF *psf, psphotSourceSizeOptions *options);
@@ -31 +30 @@
 
 // for now, let's store the detections on the readout->analysis for each readout
-bool psphotSourceSize (pmConfig *config, const pmFPAview *view)
+bool psphotSourceSize (pmConfig *config, const pmFPAview *view, bool getPSFsize)
 {
     bool status = true;
@@ -44 +43 @@
     // loop over the available readouts
     for (int i = 0; i < num; i++) {
-        if (!psphotSourceSizeReadout (config, view, "PSPHOT.INPUT", i, recipe)) {
+        if (!psphotSourceSizeReadout (config, view, "PSPHOT.INPUT", i, recipe, getPSFsize)) {
             psError (PSPHOT_ERR_CONFIG, false, "failed on saturated star deblend analysis for PSPHOT.INPUT entry %d", i);
             return false;
@@ -52 +51 @@
 }
 
-// XXX use an internal flag to mark sources which have already been measured
-bool psphotSourceSizeReadout(pmConfig *config, const pmFPAview *view, const char *filename, int index, psMetadata *recipe)
+// this function use an internal flag to mark sources which have already been measured
+bool psphotSourceSizeReadout(pmConfig *config, const pmFPAview *view, const char *filename, int index, psMetadata *recipe, bool getPSFsize)
 {
     bool status;
@@ -67 +66 @@
     psAssert (readout, "missing readout?");
 
-    psArray *sources = psMetadataLookupPtr (&status, readout->analysis, "PSPHOT.SOURCES");
+    pmDetections *detections = psMetadataLookupPtr (&status, readout->analysis, "PSPHOT.DETECTIONS");
+    psAssert (detections, "missing detections?");
+
+    psArray *sources = detections->allSources;
     psAssert (sources, "missing sources?");
 
@@ -116 +118 @@
     // XXX move this to the code that generates the PSF?
     // XXX store the results on pmPSF?
-    psphotSourceSizePSF (&options, sources, psf);
+
+    // XXX this should only be done on the first pass (ie, if we have newSources or allSources?)
+    if (getPSFsize) {
+        psphotSourceSizePSF (&options, sources, psf);
+    }
 
     // classify the sources based on ApResid and Moments (extended sources)
+    // NOTE: only sources not already measured !(source->tmpFlags & PM_SOURCE_TMPF_SIZE_MEASURED)
     psphotSourceClass(readout, sources, recipe, psf, &options);
 
+    // NOTE: only sources not already measured !(source->tmpFlags & PM_SOURCE_TMPF_SIZE_MEASURED)
     psphotSourceSizeCR (readout, sources, &options);
 
@@ -376 +384 @@
     for (int i = 0; i < sources->n; i++) {
         pmSource *source = sources->data[i];
+
+        // skip source if it was already measured
+        if (source->tmpFlags & PM_SOURCE_TMPF_SIZE_MEASURED) {
+            psTrace("psphot", 7, "Not calculating source size since it has already been measured\n");
+            continue;
+        }
 
         // Integer position of peak