Changeset 36213 for branches/eam_branches/ipp-20130904/psphot/src/psphotSourceStats.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/psphotSourceStats.c (modified) (3 diffs)

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

@@ -58 +58 @@
     pmDetections *detections = psMetadataLookupPtr (&status, readout->analysis, "PSPHOT.DETECTIONS");
     psAssert (detections, "missing detections?");
-
-    // XXX TEST:
-    if (detections->allSources) {
-        psphotMaskCosmicRayFootprintCheck(detections->allSources);
-    }
-    if (detections->newSources) {
-        psphotMaskCosmicRayFootprintCheck(detections->newSources);
-    }
 
     // determine the number of allowed threads
@@ -246 +238 @@
     psphotVisualShowMoments (sources);
 
-    // clear the mark bits
-    // psImageMaskPixels (readout->mask, "AND", PS_NOT_IMAGE_MASK(markVal));
-
-    if (detections->allSources) {
-        psphotMaskCosmicRayFootprintCheck(detections->allSources);
-    }
-    if (detections->newSources) {
-        psphotMaskCosmicRayFootprintCheck(detections->newSources);
-    }
-
     return true;
 }
@@ -572 +554 @@
 
             // measure basic source moments (no S/N clipping on input pixels)
+            // sources with (mode & MODE_EXTERNAL) or (mode2 & MODE2_MATCHED) use the 
+            // supplied Mx,My value for the centroid (not recalculated)
             status = pmSourceMoments (source, 4*sigma[i], sigma[i], 0.0, 0.0, maskVal);
         }