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

Timestamp:

Nov 17, 2011, 1:09:10 PM (15 years ago)

Author:

eugene

Message:

correctly handle the second pass in the detection image: the code was creating duplicate detections in 2 ways: 1) the source subtraction before the second pass was only being applied to the SRC, not the DET image, thus all 1st pass detections were also found as 2nd pass detections; 2) the DBL star fitting function was causing trouble, with the two positions merging to a single object -- this was considered a success, but left behind flux in the subtracted image (and garbage detections in general); Ive turned off the DBL fitting for now as I am not convinced that code is ready

File:

• branches/eam_branches/ipp-20111110/psphot/src/psphotStackReadout.c (modified) (11 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:
@@ -83 +82 @@
     }
 
-    // XXX I think this is not defined correctly for an array of images.
-    // XXX I probably need to subtract the model (same model?) for both RAW and OUT.
-    // XXX But, probably not a problem in practice since the stacks are constructed with 0.0 mean level.
-
     // generate a background model (median, smoothed image)
     if (!psphotModelBackground (config, view, STACK_DET)) {
@@ -92 +87 @@
     }
     if (!psphotSubtractBackground (config, view, STACK_DET)) {
+        return psphotReadoutCleanup (config, view, STACK_SRC);
+    }
+    if (!psphotSubtractBackground (config, view, STACK_SRC)) {
         return psphotReadoutCleanup (config, view, STACK_SRC);
     }
@@ -133 +131 @@
         return psphotReadoutCleanup (config, view, STACK_SRC);
     }
-    psphotDumpTest (config, view, STACK_SRC);
+    // psphotDumpTest (config, view, STACK_SRC);
     psMemDump("sourcestats");
 
@@ -170 +168 @@
 
     // linear PSF fit to source peaks, subtract the models from the image (in PSF mask)
-    // XXX why do this as a stack operation?
-    // psphotFitSourcesLinearStack (config, objects, false);
     psphotFitSourcesLinear (config, view, STACK_SRC, false);
     psphotStackVisualFilerule(config, view, STACK_SRC);
-    psphotDumpTest (config, view, STACK_SRC);
 
     // measure the radial profiles to the sky
@@ -206 +201 @@
     // NOTE: this block performs the 2nd pass low-significance PSF detection stage
     { 
-        // XXX the steps below to subtract the sources from DET should be skipped if SRC == DET!
-
-        // generate children sources for all sources in the SRC image
-        // XXX (DROP existing detections list) 
-        psphotSourceChildren (config, view, STACK_DET, STACK_SRC);
-
-        //  subtract all sources from DET (this will subtract using the psf model for SRC, which
-        //  will somewhat oversubtract the sources -- this is OK
-        // *** this fails because the source->pixels are still pointing at SRC, not DET
-        psphotRemoveAllSources (config, view, STACK_DET, true); // ignore subtraction state for sources
+        // if DET and SRC are different images, generate children sources for all sources in
+        // the SRC image.  This operation replaces the existing DETECTION container on DET
+        // which is currently a view to the one on SRC).  children sources go to
+        // det->allSources
+        if (strcmp(STACK_SRC, STACK_DET)) {
+            psphotSourceChildren (config, view, STACK_DET, STACK_SRC); 
+
+            //  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, false); // ignore subtraction state for sources
+        }
 
         // add noise for subtracted objects
@@ -231 +227 @@
         // (this operation just ensures the metadata container has a view on SRC as well
         if (strcmp(STACK_SRC, STACK_DET)) {
-            // XXX this operation now needs to create source parents for the new detections
-            // XXX if (!psphotCopySources (config, view, STACK_SRC, STACK_DET)) {
-            // XXX      psError (PSPHOT_ERR_UNKNOWN, false, "failure in peak analysis");
-            // XXX      return psphotReadoutCleanup (config, view, STACK_SRC);
-            // XXX }
-            
-            // the old detection here are children of SRC; generate parents for the new detections
-            if (!psphotSourceParents (config, view, STACK_SRC, STACK_DET)) {
+            // replace all sources in DET
+            psphotReplaceAllSources (config, view, STACK_DET, false); // ignore subtraction state for sources
+
+            // copy the newly detected peaks from DET to SRC so SourceStats below can operate on them
+            if (!psphotCopyPeaks (config, view, STACK_SRC, STACK_DET)) {
                 psError (PSPHOT_ERR_UNKNOWN, false, "failure in peak analysis");
                 return psphotReadoutCleanup (config, view, STACK_SRC);
@@ -244 +237 @@
         }
 
-        // 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
@@ -271 +260 @@
         // XXX check on free of sources...
         psphotMergeSources (config, view, STACK_SRC); // (detections->newSources + detections->allSources -> detections->allSources)
-        psphotDumpTest (config, view, STACK_SRC);
     }
 
@@ -285 +273 @@
 
     psphotStackObjectsSelectForAnalysis (config, view, STACK_SRC, objects);
-    psphotDumpTest (config, view, STACK_SRC);
 
     // NOTE: apply to ALL sources
@@ -324 +311 @@
 
     int nRadialEntries = psphotStackMatchPSFsEntries(config, view, STACK_OUT);
-
-    psphotDumpTest (config, view, STACK_SRC);
 
     for (int entry = 1; entry < nRadialEntries; entry++) {