Changeset 36198 for branches/eam_branches/ipp-20130904/psphot/src/psphotMergeSources.c

Timestamp:

Oct 9, 2013, 4:14:19 PM (13 years ago)

Author:

eugene

Message:

merge from trunk

Location:

branches/eam_branches/ipp-20130904/psphot

Files:

• . (modified) (1 prop)
• src (modified) (1 prop)
• src/psphotMergeSources.c (modified) (2 diffs)

branches/eam_branches/ipp-20130904/psphot/src/psphotMergeSources.c

@@ -844 +844 @@
 // array containing the child sources.  XXX currently, this is only used by psphotStackReadout
 // (sources go on allSources so that psphotChoosePSF can be called repeatedly)
-psArray *psphotSourceChildrenByObject (pmConfig *config, const pmFPAview *view, const char *filerule, psArray *objectsSrc) {
+psArray *psphotSourceChildrenByObject (pmConfig *config, const pmFPAview *view, const char *filerule, psArray *objectsSrc, bool sourcesSubtracted) {
 
     bool status;
@@ -951 +951 @@
             // child sources have not been subtracted in this image, but this flag may be raised if
             // they were subtracted in the parent's image
-            sourceOut->tmpFlags &= ~PM_SOURCE_TMPF_SUBTRACTED;
+            // XXX NOTE : in the pre-20130914 version of psphotStack, we carried a copy of the pixels 
+            // generated before the subtraction took place (and then we smoothed to match the desired PSF).  
+            // in the new version, we copy the image after subtraction; we need to distinguish these cases
+            if (!sourcesSubtracted) {
+                sourceOut->tmpFlags &= ~PM_SOURCE_TMPF_SUBTRACTED;
+            }
 
             // set the output detections: