Changeset 32205 for branches/eam_branches/ipp-20110710/psphot/src/psphotExtendedSourceFits.c

Timestamp:

Aug 29, 2011, 2:59:09 AM (15 years ago)

Author:

eugene

Message:

find the footprint saddles; iterative search for kron (in masked); add iterative search for kron (downweighting); add footprint based mask

File:

• branches/eam_branches/ipp-20110710/psphot/src/psphotExtendedSourceFits.c (modified) (3 diffs)

branches/eam_branches/ipp-20110710/psphot/src/psphotExtendedSourceFits.c

@@ -319 +319 @@
         psphotSetRadiusMomentsExact(&fitRadius, &windowRadius, readout, source, markVal);
 
-        // Recalculate the source moments using the larger extended-source moments radius.  At
-        // this stage, skip Gaussian windowing, and do not clip pixels by S/N.  Save the
-        // psf-based moments for output
-        psfMoments = *source->moments;
-        if (!pmSourceMoments (source, windowRadius, 0.0, 0.0, 0.0, maskVal & PS_NOT_IMAGE_MASK(markVal))) {
-            // subtract the best fit from the object, leave local sky
-            fprintf (stderr, "skipping (2) %f, %f\n", source->peak->xf, source->peak->yf);
-            *source->moments = psfMoments;
-
-            // probably need to bump up the size for subtraction
-            pmSourceSub (source, PM_MODEL_OP_FULL, maskVal);
-            // XXX raise an error flag of some kind
-            continue;
-        }
+        // UPDATE : we have changed the moments calculation.  There is now an iteration within 
+        // psphotKronMasked to determine moments appropriate for a larger object.  The values
+        // Mrf, KronFlux, and KronFluxErr are calculated for the iterated radius.  The other
+        // values are left at the psf-based values.
 
         // allocate the array to store the model fits
@@ -338 +328 @@
             source->modelFits = psArrayAllocEmpty (models->list->n);
         }
-        // extFitPars are the non-parametric data measured for this model fit (moments, kron, etc)
-        if (source->extFitPars == NULL) {
-            source->extFitPars = psArrayAllocEmpty (models->list->n);
-        }
+
+        // XXX deprecate?
+        // XXX // extFitPars are the non-parametric data measured for this model fit (moments, kron, etc)
+        // XXX if (source->extFitPars == NULL) {
+        // XXX     source->extFitPars = psArrayAllocEmpty (models->list->n);
+        // XXX }
 
         // loop here over the models chosen for each source (exclude by S/N)
@@ -405 +397 @@
           }
 
-          pmSourceExtFitPars *extFitPars = pmSourceExtFitParsAlloc();
-          extFitPars->Mxx = source->moments->Mxx;
-          extFitPars->Mxy = source->moments->Mxy;
-          extFitPars->Myy = source->moments->Myy;
-          extFitPars->Mrf = source->moments->Mrf;
-          extFitPars->Mrh = source->moments->Mrh;
-          extFitPars->peakMag = (source->peak->rawFlux > 0) ? -2.5*log10(source->peak->rawFlux) : NAN;
+          // XXX deprecate?
+          // XXX pmSourceExtFitPars *extFitPars = pmSourceExtFitParsAlloc();
+          // XXX extFitPars->Mxx = source->moments->Mxx;
+          // XXX extFitPars->Mxy = source->moments->Mxy;
+          // XXX extFitPars->Myy = source->moments->Myy;
+          // XXX extFitPars->Mrf = source->moments->Mrf;
+          // XXX extFitPars->Mrh = source->moments->Mrh;
+          // XXX extFitPars->peakMag = (source->peak->rawFlux > 0) ? -2.5*log10(source->peak->rawFlux) : NAN;
           
           // save kron mag, but assign apMag & psfMag on output (not yet calculated)
-          extFitPars->krMag = -2.5*log10(source->moments->KronFlux);
-
-          psArrayAdd (source->extFitPars, 4, extFitPars);
-          psFree (extFitPars);
+          // XXX extFitPars->krMag = -2.5*log10(source->moments->KronFlux);
+
+          // psArrayAdd (source->extFitPars, 4, extFitPars);
+          // psFree (extFitPars);
 
           // test for fit quality / result