Changeset 30705

Timestamp:

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

Author:

eugene

Message:

optionally save the covariance matrix with model fits

Location:

branches/eam_branches/ipp-20110213/psModules/src/objects

Files:

• pmModel.c (modified) (2 diffs)
• pmModel.h (modified) (1 diff)
• pmSourceExtendedPars.c (modified) (2 diffs)
• pmSourceExtendedPars.h (modified) (2 diffs)
• pmSourceFitModel.c (modified) (2 diffs)
• pmSourceFitModel.h (modified) (1 diff)
• pmSourceFitPCM.c (modified) (1 diff)
• pmSourceFitSet.c (modified) (6 diffs)
• pmSourceFitSet.h (modified) (2 diffs)

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

@@ -41 +41 @@
     psFree(tmp->params);
     psFree(tmp->dparams);
+    psFree(tmp->covar);
     psTrace("psModules.objects", 10, "---- %s() end ----\n", __func__);
 }
@@ -71 +72 @@
     tmp->flags = PM_MODEL_STATUS_NONE;
     tmp->residuals = NULL;              // do not free: the model does not own this memory
+    tmp->covar = NULL;
     tmp->isPCM = false;
 

branches/eam_branches/ipp-20110213/psModules/src/objects/pmModel.h

@@ -33 +33 @@
     psVector *params;                   ///< Paramater values.
     psVector *dparams;                  ///< Parameter errors.
+    psImage *covar;                     ///< Optional covariance matrix
     float chisq;                        ///< Fit chi-squared.
     float chisqNorm;                    ///< re-normalized fit chi-squared.

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

@@ -55 +55 @@
     psFree(radial->flux);
     psFree(radial->fluxErr);
+    psFree(radial->fluxStdev);
     psFree(radial->fill);
 }
@@ -65 +66 @@
     radial->flux = NULL;
     radial->fluxErr = NULL;
+    radial->fluxStdev = NULL;
     radial->fill = NULL;
     return radial;

branches/eam_branches/ipp-20110213/psModules/src/objects/pmSourceExtendedPars.h

@@ -23 +23 @@
 typedef struct {
     psVector *flux;                     // fluxes measured at above radii
+    psVector *fluxStdev;                // scatter (standard deviation) of flux
     psVector *fluxErr;                  // formal error on the fluxes (sqrt\sum(variance))
     psVector *fill;                     // angles corresponding to above radial profiles
@@ -63 +64 @@
     float petrosianR50;
     float petrosianR50Err;
+    float petrosianFill;
 } pmSourceExtendedPars;
 

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

@@ -59 +59 @@
     opt->maxChisqDOF = NAN;
     opt->poissonErrors = true;
+    opt->saveCovariance = false;
 
     return opt;
@@ -231 +232 @@
         psTrace ("psModules.objects", 4, "%f +/- %f", params->data.F32[i], dparams->data.F32[i]);
     }
+    if (options->saveCovariance) {
+        model->covar = psMemIncrRefCounter(covar);
+    }
     psTrace ("psModules.objects", 4, "niter: %d, chisq: %f", myMin->iter, myMin->value);
 

branches/eam_branches/ipp-20110213/psModules/src/objects/pmSourceFitModel.h

@@ -32 +32 @@
     float weight;                       ///< use this weight for constant-weight fits
     bool poissonErrors;                 ///< use poisson errors for fits?
+    bool saveCovariance;
 } pmSourceFitOptions;
 

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

@@ -69 +69 @@
         dparams->data.F32[i] = sqrt(covar->data.F32[i][i]);
         psTrace ("psModules.objects", 4, "%f +/- %f", params->data.F32[i], dparams->data.F32[i]);
+    }
+    if (fitOptions->saveCovariance) {
+        pcm->modelConv->covar = psMemIncrRefCounter(covar);
     }
     psTrace ("psphot", 4, "niter: %d, chisq: %f", myMin->iter, myMin->value);

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);
 

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

@@ -40 +40 @@
 bool pmSourceFitSetJoin (psVector *deriv, psVector *param, pmSourceFitSetData *set);
 bool pmSourceFitSetSplit (pmSourceFitSetData *set, const psVector *deriv, const psVector *param);
-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);
 
 psF32 pmSourceFitSetFunction(psVector *deriv, const psVector *param, const psVector *x);
@@ -57 +61 @@
     psArray *modelSet,                  ///< model to be fitted
     pmSourceFitOptions *options,        ///< define options for fitting process
-    psImageMaskType maskVal             ///< Vale to mask
+    psImageMaskType maskVal             ///< Value to mask
 
 );