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

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

@@ -335 +335 @@
         psTrace ("psModules.objects", 4, " src %d", i);
 
+        model->nIter = myMin->iter;
+        // model->nPar is set by pmSourceFitSetMasks
+
         // save the resulting chisq, nDOF, nIter
         // these are not unique for any one source
@@ -340 +343 @@
             model->chisq = myMin->value;
             model->nPix  = nPix;
-            model->nDOF  = nPix - model->params->n;
+            model->nDOF  = nPix - model->nPar;
             model->chisqNorm = model->chisq / model->nDOF;
         } else {
-            pmSourceChisq (model, source->pixels, source->maskObj, source->variance, maskVal, options->covarFactor, model->params->n);
+            pmSourceChisqUnsubtracted (source, model, maskVal);
         }
-        model->nIter = myMin->iter;
 
         // set the model success or failure status
@@ -399 +401 @@
     for (int i = 0; i < set->paramSet->n; i++) {
         psVector *paramOne = set->paramSet->data[i];
+        pmModel  *modelOne = set->modelSet->data[i];
 
         switch (mode) {
@@ -406 +409 @@
                 if (j == PM_PAR_I0) continue;
                 constraint->paramMask->data.PS_TYPE_VECTOR_MASK_DATA[n + j] = 1;
+                modelOne->nPar = 1;
             }
             break;
@@ -415 +419 @@
                 if (j == PM_PAR_I0) continue;
                 constraint->paramMask->data.PS_TYPE_VECTOR_MASK_DATA[n + j] = 1;
+                modelOne->nPar = 3;
             }
             break;
@@ -420 +425 @@
             // EXT model fits all params (except sky)
             constraint->paramMask->data.PS_TYPE_VECTOR_MASK_DATA[n + PM_PAR_SKY] = 1;
+            modelOne->nPar = paramOne->n - 1;
             break;
           default: