Changeset 30784 for branches/eam_branches/ipp-20110213/psModules/src/objects/pmSourceFitModel.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/psModules/src/objects/pmSourceFitModel.c (modified) (1 diff)

branches/eam_branches/ipp-20110213/psModules/src/objects/pmSourceFitModel.c

@@ -236 +236 @@
         model->covar = psMemIncrRefCounter(covar);
     }
+    model->nIter = myMin->iter;
+    model->nPar = nParams;
+
     psTrace ("psModules.objects", 4, "niter: %d, chisq: %f", myMin->iter, myMin->value);
 
     // save the resulting chisq, nDOF, nIter
+    // NOTE: if (!options->poissonErrors) chisq will be wrong : recalculate
     if (options->poissonErrors) {
         model->chisq = myMin->value;
         model->nPix  = y->n;
-        model->nDOF  = y->n - nParams;
+        model->nDOF  = y->n - model->nPar;
         model->chisqNorm = model->chisq / model->nDOF;
     } else {
-        pmSourceChisq (model, source->pixels, source->maskObj, source->variance, maskVal, options->covarFactor, nParams);
-    }
-    model->nIter = myMin->iter;
+        pmSourceChisqUnsubtracted (source, model, maskVal);
+    }
 
     // set the model success or failure status