Changeset 32685 for branches/eam_branches/ipp-20111110/psphot/src/psphotStackReadout.c

Timestamp:

Nov 17, 2011, 5:41:38 AM (15 years ago)

Author:

eugene

Message:

psphotStack is generating duplicate detections because the detection removal before the second pass only occurs on the SRC, not DET image; working on fixing this by modifying the removal process

File:

• branches/eam_branches/ipp-20111110/psphot/src/psphotStackReadout.c (modified) (13 diffs)

branches/eam_branches/ipp-20111110/psphot/src/psphotStackReadout.c

@@ -1 +1 @@
 # include "psphotInternal.h"
+bool psphotDumpTest (pmConfig *config, const pmFPAview *view, const char *filerule);
 
 // we have 3 possible real filesets:
@@ -130 +131 @@
         return psphotReadoutCleanup (config, view, STACK_SRC);
     }
+    psphotDumpTest (config, view, STACK_SRC);
     psMemDump("sourcestats");
 
@@ -170 +172 @@
     psphotFitSourcesLinear (config, view, STACK_SRC, false);
     psphotStackVisualFilerule(config, view, STACK_SRC);
+    psphotDumpTest (config, view, STACK_SRC);
 
     // measure the radial profiles to the sky
@@ -186 +189 @@
     psphotBlendFit (config, view, STACK_SRC); // pass 1 (detections->allSources)
 
-    // replace all sources
-    psphotReplaceAllSources (config, view, STACK_SRC); // pass 1 (detections->allSources)
+    // replace all sources (do NOT ignore subtraction state)
+    psphotReplaceAllSources (config, view, STACK_SRC, false); // pass 1 (detections->allSources)
 
     // if we only do one pass, skip to extended source analysis
@@ -194 +197 @@
     // linear fit to include all sources (subtract again)
     // NOTE : apply to ALL sources (extended + psf)
+    // NOTE 2 : this function subtracts the models from the given filerule (SRC)
     psphotFitSourcesLinear (config, view, STACK_SRC, true); // pass 2 (detections->allSources)
 
@@ -200 +204 @@
     // NOTE: this block performs the 2nd pass low-significance PSF detection stage
     { 
+        //  subtract all sources from DET (this will subtract using the psf model for SRC, which
+        //  will somewhat oversubtract the sources -- this is OK
+        psphotRemoveAllSources (config, view, STACK_DET, true); // ignore subtraction state for sources
+
         // add noise for subtracted objects
         psphotAddNoise (config, view, STACK_DET); // pass 1 (detections->allSources)
@@ -212 +220 @@
 
         // if DET and SRC are different images, copy the detections from DET to SRC 
+        // (this operation just ensures the metadata container has a view on SRC as well
         if (strcmp(STACK_SRC, STACK_DET)) {
-            // XXX how does this handle 1st vs 2nd pass sources?
             if (!psphotCopySources (config, view, STACK_SRC, STACK_DET)) {
                 psError (PSPHOT_ERR_UNKNOWN, false, "failure in peak analysis");
@@ -220 +228 @@
         }
 
+        // replace all sources in DET
+        psphotReplaceAllSources (config, view, STACK_DET, true); // ignore subtraction state for sources
+
         // define new sources based on only the new peaks & measure moments
         // NOTE: new sources are saved on detections->newSources
         psphotSourceStats (config, view, STACK_SRC, false); // pass 2 (detections->newSources)
+        psphotDumpTest (config, view, STACK_SRC);
 
         // set source type
@@ -237 +249 @@
         // replace all sources so fit below applies to all at once
         // NOTE: apply only to OLD sources (which have been subtracted)
-        psphotReplaceAllSources (config, view, STACK_SRC); // pass 2
+        psphotReplaceAllSources (config, view, STACK_SRC, false); // pass 2
 
         // merge the newly selected sources into the existing list
@@ -243 +255 @@
         // XXX check on free of sources...
         psphotMergeSources (config, view, STACK_SRC); // (detections->newSources + detections->allSources -> detections->allSources)
+        psphotDumpTest (config, view, STACK_SRC);
     }
 
@@ -256 +269 @@
 
     psphotStackObjectsSelectForAnalysis (config, view, STACK_SRC, objects);
+    psphotDumpTest (config, view, STACK_SRC);
 
     // NOTE: apply to ALL sources
@@ -295 +309 @@
     int nRadialEntries = psphotStackMatchPSFsEntries(config, view, STACK_OUT);
 
+    psphotDumpTest (config, view, STACK_SRC);
+
     for (int entry = 1; entry < nRadialEntries; entry++) {
         // NOTE: entry 0 is the unmatched image set
@@ -312 +328 @@
 
         // replace the flux in the image so it is returned to its original state
-        psphotReplaceAllSources (config, view, STACK_OUT);
+        psphotReplaceAllSources (config, view, STACK_OUT, false);
 
         // smooth to the next FWHM, or set 'smoothAgain' to false if no more