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

Timestamp:

Feb 19, 2011, 10:33:39 AM (15 years ago)

Author:

eugene

Message:

optionally save the covariance matrix with model fits

File:

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

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

@@ -296 +296 @@
 
 // set the model parameters for this fit set
-bool pmSourceFitSetValues (pmSourceFitSetData *set, const psVector *dparam,
-                           const psVector *param, pmSource *source,
-                           psMinimization *myMin, int nPix, bool fitStatus)
+bool pmSourceFitSetValues (pmSourceFitSetData *set, 
+                           const psVector *dparam, const psVector *param, const psImage *covar, 
+                           pmSource *source, psMinimization *myMin, int nPix, 
+                           bool fitStatus, bool saveCovariance)
 {
     PS_ASSERT_PTR_NON_NULL(set, false);
@@ -311 +312 @@
 
     int n = 0;
+    int nStart = 0;
     for (int i = 0; i < set->paramSet->n; i++) {
 
@@ -320 +322 @@
             psTrace ("psModules.objects", 4, "%f +/- %f", param->data.F32[n], dparam->data.F32[n]);
         }
+        if (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);
+            for (int ix = 0; ix < model->params->n; ix++) {
+                for (int iy = 0; iy < model->params->n; iy++) {
+                    model->covar->data.F32[iy][ix] = covar->data.F32[nStart+iy][nStart+ix];
+                }
+            }
+        }
+        nStart += model->params->n;
         psTrace ("psModules.objects", 4, " src %d", i);
 
@@ -550 +562 @@
     }
 
-// parameter errors from the covariance matrix
+    // parameter errors from the covariance matrix
     psVector *dparams = psVectorAlloc (thisSet->nParamSet, PS_TYPE_F32);
     for (int i = 0; i < dparams->n; i++) {
@@ -558 +570 @@
     }
 
-// get the Gauss-Newton distance for fixed model parameters
+    // get the Gauss-Newton distance for fixed model parameters
     if (constraint->paramMask != NULL) {
         psVector *delta = psVectorAlloc (params->n, PS_TYPE_F32);
@@ -580 +592 @@
     }
 
-    pmSourceFitSetValues (thisSet, dparams, params, source, myMin, y->n, fitStatus);
+    pmSourceFitSetValues (thisSet, dparams, params, covar, source, myMin, y->n, fitStatus, options->saveCovariance);
     psTrace ("psModules.objects", 5, "onPic: %d, fitStatus: %d, nIter: %d, chisq: %f, nPix: %ld\n", onPic, fitStatus, myMin->iter, myMin->value, y->n);