Changeset 31154 for trunk/psphot/src/psphotSourceFits.c

Timestamp:

Apr 4, 2011, 1:12:39 PM (15 years ago)

Author:

eugene

Message:

use the smoothed image for footprint culling; use a more stringent culling for saturated stars; more tweaks to get sat stars to be fitted; various updates to psphotStack; unify psphotImageLoop varients; be a bit careful about number of stars in a PSF clump

Location:

trunk/psphot

Files:

• . (modified) (2 props)
• src/psphotSourceFits.c (modified) (12 diffs)

trunk/psphot

@@ -19 +19 @@
 psphot-config
 Doxyfile
+a.out.dSYM

@@ -19 +19 @@
 psphot-config
 Doxyfile
+a.out.dSYM

trunk/psphot/src/psphotSourceFits.c

@@ -51 +51 @@
     psArrayAdd (sourceSet, 16, source);
 
-    psTrace ("psphot", 4, "fitting blended source at %f %f : %f\n", source->peak->xf, source->peak->yf, source->peak->flux);
+    psTrace ("psphot", 4, "fitting blended source at %f %f : %f\n", source->peak->xf, source->peak->yf, source->peak->rawFlux);
 
     // we need to include all blends in the fit (unless primary is saturated?)
@@ -69 +69 @@
 
         // XXX assume local sky is 0.0?
-        model->params->data.F32[PM_PAR_I0] = blend->peak->flux;
+        model->params->data.F32[PM_PAR_I0] = blend->peak->rawFlux;
         model->params->data.F32[PM_PAR_XPOS] = blend->peak->xf;
         model->params->data.F32[PM_PAR_YPOS] = blend->peak->yf;
@@ -83 +83 @@
         psArrayAdd (sourceSet, 16, blend);
 
-        psTrace ("psphot", 5, "adding source at %f %f : %f\n", blend->peak->xf, blend->peak->yf, blend->peak->flux);
+        psTrace ("psphot", 5, "adding source at %f %f : %f\n", blend->peak->xf, blend->peak->yf, blend->peak->rawFlux);
 
         // free to avoid double counting model
@@ -100 +100 @@
 
     if (!isfinite(PSF->params->data.F32[PM_PAR_I0])) psAbort("nan in fit");
-
-    // correct model chisq for flux trend
-    double chiTrend = psPolynomial1DEval (psf->ChiTrend, PSF->params->data.F32[PM_PAR_I0]);
-    PSF->chisqNorm = PSF->chisq / chiTrend;
 
     // evaluate the blend objects, subtract if good, free otherwise
@@ -111 +107 @@
 
         if (!isfinite(model->params->data.F32[PM_PAR_I0])) psAbort("nan in fit");
-
-        // correct model chisq for flux trend
-        chiTrend = psPolynomial1DEval (psf->ChiTrend, model->params->data.F32[PM_PAR_I0]);
-        model->chisqNorm = model->chisq / chiTrend;
 
         // if this one failed, skip it
@@ -159 +151 @@
 bool psphotFitPSF (pmReadout *readout, pmSource *source, pmPSF *psf, pmSourceFitOptions *fitOptions, psImageMaskType maskVal, psImageMaskType markVal) {
 
-    double chiTrend;
     pmSourceFitOptions options = *fitOptions;
 
@@ -182 +173 @@
     // clear the circular mask
     psImageMaskPixels (source->maskObj, "AND", PS_NOT_IMAGE_MASK(markVal)); 
-
-    // correct model chisq for flux trend
-    chiTrend = psPolynomial1DEval (psf->ChiTrend, PSF->params->data.F32[PM_PAR_I0]);
-    PSF->chisqNorm = PSF->chisq / chiTrend;
 
     // does the PSF model succeed?
@@ -224 +211 @@
     float radius;
     bool okEXT, okDBL;
-    float chiEXT, chiDBL;
-    double chiTrend;
     pmModel *ONE = NULL;
     pmSource *tmpSrc = NULL;
@@ -258 +243 @@
     maskVal |= markVal;
 
+    float chiEXT = NAN;
+    float chiDBL = NAN;
+
     // this temporary source is used as a place-holder by the psphotEval functions below
     tmpSrc = pmSourceAlloc ();
@@ -271 +259 @@
 
         // correct first model chisqs for flux trend
-        chiDBL = NAN;
         ONE = DBL->data[0];
         if (ONE) {
             if (!isfinite(ONE->params->data.F32[PM_PAR_I0])) psAbort("nan in fit");
-            chiTrend = psPolynomial1DEval (psf->ChiTrend, ONE->params->data.F32[1]);
-            ONE->chisqNorm = ONE->chisq / chiTrend;
-            chiDBL = ONE->chisq / ONE->nDOF; // save chisq for double-star/galaxy comparison
+            chiDBL = ONE->chisqNorm; // save chisq for double-star/galaxy comparison
             ONE->fitRadius = radius;
         }
@@ -285 +270 @@
         if (ONE) {
             if (!isfinite(ONE->params->data.F32[PM_PAR_I0])) psAbort("nan in fit");
-            chiTrend = psPolynomial1DEval (psf->ChiTrend, ONE->params->data.F32[1]);
-            ONE->chisqNorm = ONE->chisq / chiTrend;
             ONE->fitRadius = radius;
         }
@@ -298 +281 @@
 
         okEXT = psphotEvalEXT (tmpSrc, EXT);
-        chiEXT = EXT ? EXT->chisq / EXT->nDOF : NAN;
+        chiEXT = EXT ? EXT->chisqNorm : NAN;
     }
 

@@ -19 +19 @@
 psphot-config
 Doxyfile
+a.out.dSYM