Changeset 30763 for branches/eam_branches/ipp-20110213/psModules/src/objects/pmSourceFitSet.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/pmSourceFitSet.c (modified) (5 diffs)

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

@@ -39 +39 @@
 #include "pmSourceDiffStats.h"
 #include "pmSource.h"
+#include "pmSourcePhotometry.h"
 
 #include "pmSourceFitModel.h"
@@ -299 +300 @@
                            const psVector *dparam, const psVector *param, const psImage *covar, 
                            pmSource *source, psMinimization *myMin, int nPix, 
-                           bool fitStatus, bool saveCovariance)
+                           bool fitStatus, pmSourceFitOptions *options, psImageMaskType maskVal)
 {
     PS_ASSERT_PTR_NON_NULL(set, false);
@@ -322 +323 @@
             psTrace ("psModules.objects", 4, "%f +/- %f", param->data.F32[n], dparam->data.F32[n]);
         }
-        if (saveCovariance) {
+        if (options->saveCovariance) {
             // we only save the covar matrix for this object with itself (ignore cross terms between objects)
             model->covar = psImageAlloc(model->params->n, model->params->n, PS_TYPE_F32);
@@ -336 +337 @@
         // save the resulting chisq, nDOF, nIter
         // these are not unique for any one source
-        model->chisq = myMin->value;
-        model->nIter = myMin->iter;
-        model->nDOF  = nPix - model->params->n;
+        if (options->poissonErrors) {
+            model->chisq = myMin->value;
+            model->nPix  = nPix;
+            model->nDOF  = nPix - model->params->n;
+            model->chisqNorm = model->chisq / model->nDOF;
+        } else {
+            pmSourceChisq (model, source->pixels, source->maskObj, source->variance, maskVal, options->covarFactor, model->params->n);
+        }
+        model->nIter = myMin->iter;
 
         // set the model success or failure status
@@ -592 +599 @@
     }
 
-    pmSourceFitSetValues (thisSet, dparams, params, covar, source, myMin, y->n, fitStatus, options->saveCovariance);
+    pmSourceFitSetValues (thisSet, dparams, params, covar, source, myMin, y->n, fitStatus, options, maskVal);
     psTrace ("psModules.objects", 5, "onPic: %d, fitStatus: %d, nIter: %d, chisq: %f, nPix: %ld\n", onPic, fitStatus, myMin->iter, myMin->value, y->n);