Changeset 30784 for branches/eam_branches/ipp-20110213/psphot/src/psphotSourceFits.c

Timestamp:

Mar 3, 2011, 3:11:09 PM (15 years ago)

Author:

eugene

Message:

fix the calculation of chisq values for constant errors (re-calculated, do not attempt to correct raw value)

File:

• branches/eam_branches/ipp-20110213/psphot/src/psphotSourceFits.c (modified) (8 diffs)

branches/eam_branches/ipp-20110213/psphot/src/psphotSourceFits.c

@@ -101 +101 @@
     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
     for (int i = 1; i < modelSet->n; i++) {
@@ -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?
@@ -225 +212 @@
     bool okEXT, okDBL;
     float chiEXT, chiDBL;
-    double chiTrend;
     pmModel *ONE = NULL;
     pmSource *tmpSrc = NULL;
@@ -271 +257 @@
 
         // 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 +268 @@
         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 +279 @@
 
         okEXT = psphotEvalEXT (tmpSrc, EXT);
-        chiEXT = EXT ? EXT->chisq / EXT->nDOF : NAN;
+        chiEXT = EXT ? EXT->chisqNorm : NAN;
     }