Changeset 28643 for branches/eam_branches/ipp-20100621/psphot/src/psphotSourceStats.c

Timestamp:

Jul 9, 2010, 10:56:32 AM (16 years ago)

Author:

eugene

Message:

changed pmSourceFitModel and related APIs to pass a structure of fit options; this lets us change the options between soruces within the multithreaded context; also re-organized the include orders to avoid conflicts

File:

• branches/eam_branches/ipp-20100621/psphot/src/psphotSourceStats.c (modified) (3 diffs)

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

@@ -1 +1 @@
 # include "psphotInternal.h"
+void pmSourceMomentsSetVerbose(bool state);
 
 // convert detections to sources and measure their basic properties (moments, local sky, sky
@@ -369 +370 @@
     maskVal |= markVal;
 
+    // XXX test : pmSourceMomentsSetVerbose(true);
+
     // threaded measurement of the sources moments
     int Nfail = 0;
@@ -408 +411 @@
         // measure basic source moments (no S/N clipping on input pixels)
         status = pmSourceMoments (source, RADIUS, SIGMA, 0.0, maskVal);
+        // XXX moments / aperture test:
+        if (0) {
+            // clear the mask bit and set the circular mask pixels
+            psImageMaskPixels (source->maskObj, "AND", PS_NOT_IMAGE_MASK(markVal));
+            psImageKeepCircle (source->maskObj, source->peak->x, source->peak->y, 4.0*source->moments->Mrf, "OR", markVal);
+            
+            float apMag = NAN;
+            pmSourcePhotometryAper (&apMag, NULL, source->pixels, source->maskObj, maskVal);
+            fprintf (stderr, "apMag: %f, kronMag: %f\n", apMag, -2.5*log10(source->moments->KronFlux));
+
+            // clear the mask bit
+            psImageMaskPixels (source->maskObj, "AND", PS_NOT_IMAGE_MASK(markVal));
+        }           
         if (status) {
             Nmoments ++;