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

Timestamp:

Nov 17, 2011, 6:47:47 AM (15 years ago)

Author:

eugene

Message:

fixing source subtraction for DET image

File:

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

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

@@ -115 +115 @@
     }
 
-    // if DET and SRC are different images, copy the detections from DET to SRC 
+    // If DET and SRC are different images, copy the detections from DET to SRC.  This 'copy'
+    // is just a copy of the container pointer; the sources on both DET and SRC are the same
+    // memory objects
     if (strcmp(STACK_SRC, STACK_DET)) {
         if (!psphotCopySources (config, view, STACK_SRC, STACK_DET)) {
@@ -197 +199 @@
     // 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)
+    // NOTE 2 : this function subtracts the models from the given filerule (SRC), not DET
     psphotFitSourcesLinear (config, view, STACK_SRC, true); // pass 2 (detections->allSources)
 
@@ -204 +206 @@
     // 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
 
@@ -222 +231 @@
         // (this operation just ensures the metadata container has a view on SRC as well
         if (strcmp(STACK_SRC, STACK_DET)) {
-            if (!psphotCopySources (config, view, 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)) {
                 psError (PSPHOT_ERR_UNKNOWN, false, "failure in peak analysis");
                 return psphotReadoutCleanup (config, view, STACK_SRC);