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

Timestamp:

Oct 13, 2013, 1:35:03 PM (13 years ago)

Author:

eugene

Message:

set up the rawFlux,smoothFlux,detValue correctly for external sources; remove some deprecated test code

File:

• branches/eam_branches/ipp-20130904/psphot/src/psphotMergeSources.c (modified) (2 diffs)

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

@@ -38 +38 @@
     psArray *newSources = detections->newSources;
     psAssert (newSources, "missing sources?");
-
-    // XXX TEST:
-    if (detections->allSources) {
-        psphotMaskCosmicRayFootprintCheck(detections->allSources);
-    }
-    if (detections->newSources) {
-        psphotMaskCosmicRayFootprintCheck(detections->newSources);
-    }
 
     if (!detections->allSources) {
@@ -139 +131 @@
             for (int i = 0; i < extCFF->allSources->n; i++) {
                 pmSource *source = extCFF->allSources->data[i];
+
+                // setting this bit not only tracks the inputs, it makes pmSourceMoments
+                // keep the Mx,My values for the centroid.  
                 source->mode |= PM_SOURCE_MODE_EXTERNAL;
 
-                // the supplied peak flux needs to be re-normalized
-                source->peak->rawFlux = 1.0;
-                source->peak->smoothFlux = 1.0;
-                source->peak->detValue = 1.0;
+                // source->peak->detValue,rawFlux,smoothFlux all set to input flux value
+                // source->peak->xf,yf, moments->Mx,My all set to input position
 
                 // drop the loaded source modelPSF