Changeset 34041 for branches/meh_branches/ppstack_test/psphot/src/psphotReadout.c

Timestamp:

Jun 19, 2012, 5:24:19 PM (14 years ago)

Author:

mhuber

Message:

merging latest r34040 trunk changes to branch

Location:

branches/meh_branches/ppstack_test

Files:

• . (modified) (1 prop)
• psphot (modified) (1 prop)
• psphot/src (modified) (1 prop)
• psphot/src/psphotReadout.c (modified) (1 diff)

branches/meh_branches/ppstack_test/psphot/src/psphotReadout.c

@@ -185 +185 @@
         // remove noise for subtracted objects (ie, return to normal noise level)
         // NOTE: this needs to operate only on the OLD sources
-        psphotSubNoise (config, view, filerule); // pass 1 (detections->allSources)
+        bool footprintUseUnsubtracted = psMetadataLookupBool(NULL, recipe, "FOOTPRINT_USE_UNSUBTRACTED");
+        // Note: if footprintUseUnsubtracted is true the noise was already subtracted in psphotFindDetections()
+        if (!footprintUseUnsubtracted) {
+            psphotSubNoise (config, view, filerule); // pass 1 (detections->allSources)
+        }
 
         // define new sources based on only the new peaks & measure moments