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

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

@@ -38 +38 @@
 #include "pmSourceDiffStats.h"
 #include "pmSource.h"
+#include "pmSourcePhotometry.h"
 #include "pmSourceFitModel.h"
 #include "pmPCMdata.h"
@@ -85 +86 @@
 
     // save the resulting chisq, nDOF, nIter
-    pcm->modelConv->chisq = myMin->value;
+    if (fitOptions->poissonErrors) {
+        pcm->modelConv->chisq = myMin->value;
+        pcm->modelConv->nPix = pcm->nPix;
+        pcm->modelConv->nDOF = pcm->nDOF;
+        pcm->modelConv->chisqNorm = pcm->modelConv->chisq / pcm->modelConv->nDOF;
+    } else {
+        pmSourceChisq (pcm->modelConv, source->pixels, source->maskObj, source->variance, maskVal, fitOptions->covarFactor, pcm->nPix - pcm->nDOF - 1);
+    }
     pcm->modelConv->nIter = myMin->iter;
-    pcm->modelConv->nPix = pcm->nPix;
-    pcm->modelConv->nDOF = pcm->nDOF;
-    pcm->modelConv->chisqNorm = pcm->modelConv->chisq / pcm->modelConv->nDOF;
+
+    // set the model success or failure status
     pcm->modelConv->flags |= PM_MODEL_STATUS_FITTED;
     if (!fitStatus) pcm->modelConv->flags |= PM_MODEL_STATUS_NONCONVERGE;