Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 23 additions & 0 deletions news/get_variance_covariance_map.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
**Added:**

* Expose ``lsq.GetVarianceCovarianceMap()`` for covariance between refined parameters

**Changed:**

* <news item>

**Deprecated:**

* <news item>

**Removed:**

* <news item>

**Fixed:**

* <news item>

**Security:**

* <news item>
18 changes: 18 additions & 0 deletions src/extensions/lsq_ext.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@

#include <boost/python/class.hpp>
#include <boost/python/copy_const_reference.hpp>
#include <boost/python/dict.hpp>
#include <boost/python/tuple.hpp>

#include <string>

Expand All @@ -45,6 +47,21 @@ bool _SafeRefine(LSQNumObj & lsq, REAL maxChi2factor, int nbCycle, bool useLeven
callBeginEndOptimization, minChi2var);
}

bp::dict _GetVarianceCovarianceMap(LSQNumObj & lsq)
{
const std::map<std::pair<const RefinablePar*, const RefinablePar*>, REAL> &m =
lsq.GetVarianceCovarianceMap();
bp::dict d;
for (std::map<std::pair<const RefinablePar*, const RefinablePar*>, REAL>::const_iterator it = m.begin();
it != m.end(); ++it)
{
const RefinablePar *pi = it->first.first;
const RefinablePar *pj = it->first.second;
d[bp::make_tuple(pi->GetName(), pj->GetName())] = it->second;
}
return d;
}

} // namespace

void wrap_lsq()
Expand Down Expand Up @@ -102,6 +119,7 @@ void wrap_lsq()
.def("GetLSQDeriv", &LSQNumObj::GetLSQDeriv,
bp::arg("par"),
return_value_policy<copy_const_reference>())
.def("GetVarianceCovarianceMap", &_GetVarianceCovarianceMap)
.def("BeginOptimization", &LSQNumObj::BeginOptimization,
(bp::arg("allowApproximations")=false,
bp::arg("enableRestraints")=false))
Expand Down
Loading