Changeset 35657 for branches/eam_branches/ipp-20130509/psModules/src/objects/pmSourceFitPCM.c

Timestamp:

Jun 13, 2013, 6:14:28 AM (13 years ago)

Author:

eugene

Message:

update PCM fitting to use the new parameter-based convergence in the LMM code

File:

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

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

@@ -66 +66 @@
     // set up the minimization process
     psMinimization *myMin = psMinimizationAlloc (fitOptions->nIter, fitOptions->minTol, fitOptions->maxTol);
+    myMin->chisqConvergence = fitOptions->chisqConvergence;
+    myMin->gainFactorMode = fitOptions->gainFactorMode;
 
     psImage *covar = psImageAlloc (params->n, params->n, PS_TYPE_F32);
@@ -118 +120 @@
     if (!fitStatus) pcm->modelConv->flags |= PM_MODEL_STATUS_NONCONVERGE;
 
+    if (myMin->chisqConvergence) {
+      if (myMin->lastDelta > myMin->minTol) pcm->modelConv->flags |= PM_MODEL_STATUS_WEAK_FIT;
+    } else {
+      if (myMin->rParSigma > myMin->minTol*pcm->nPar) pcm->modelConv->flags |= PM_MODEL_STATUS_WEAK_FIT;
+    }
+
     // once we have fitted a model, we need to record that this model is a PCM model:
     pcm->modelConv->isPCM = true;