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

Timestamp:

Feb 28, 2011, 2:44:39 PM (15 years ago)

Author:

eugene

Message:

unified function to generate output parameters for output cmf files; add chisqNorm calculation to pmSourceChisq, pass in nParams; re-calculate the chisq if we use constant weights; make sure we correctly set nDOF = nPoints - nParams

File:

• branches/eam_branches/ipp-20110213/psModules/src/objects/pmSourceFitModel.c (modified) (2 diffs)

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

@@ -40 +40 @@
 #include "pmSourceDiffStats.h"
 #include "pmSource.h"
+#include "pmSourcePhotometry.h"
 #include "pmSourceFitModel.h"
 
@@ -238 +239 @@
 
     // save the resulting chisq, nDOF, nIter
-    model->chisq = myMin->value;
+    if (options->poissonErrors) {
+        model->chisq = myMin->value;
+        model->nPix  = y->n;
+        model->nDOF  = y->n - nParams;
+        model->chisqNorm = model->chisq / model->nDOF;
+    } else {
+        pmSourceChisq (model, source->pixels, source->maskObj, source->variance, maskVal, options->covarFactor, nParams);
+    }
     model->nIter = myMin->iter;
-    model->nPix  = y->n;
-    model->nDOF  = y->n - nParams;
-    model->chisqNorm = model->chisq / model->nDOF;
+
+    // set the model success or failure status
     model->flags |= PM_MODEL_STATUS_FITTED;
     if (!fitStatus) model->flags |= PM_MODEL_STATUS_NONCONVERGE;