portelli/LatAnalyze
1
0
Fork 0
mirror of https://github.com/aportelli/LatAnalyze.git synced 2025-12-30 08:34:43 +00:00
Code Releases Activity

various critical fixes and improvements to the new fit interface

Browse Source
This commit is contained in:
Antonin Portelli
2016-03-23 17:07:31 +00:00
parent 3793aca27c
commit ee8ed05b81
5 changed files with 31 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/XYSampleData.cpp
View File

@@ -207,7 +207,7 @@ void XYSampleData::setDataToSample(const Index s)
{
data_.x(r, i) = xData_[i][r][s];
}
for (Index j = 0; j < getNXDim(); ++j)
for (Index j = 0; j < getNYDim(); ++j)
for (auto &p: yData_[j])
{
data_.y(p.first, j) = p.second[s];
@@ -234,13 +234,15 @@ SampleFitResult XYSampleData::fit(Minimizer &minimizer, const DVec &init,
SampleFitResult result;
FitResult sampleResult;
DVec initCopy = init;
result.resize(nSample_);
result.chi2_.resize(nSample_);
FOR_STAT_ARRAY(result, s)
{
setDataToSample(s);
sampleResult = data_.fit(minimizer, init, v);
sampleResult = data_.fit(minimizer, initCopy, v);
initCopy = sampleResult.segment(0, initCopy.size());
result[s] = sampleResult;
result.chi2_[s] = sampleResult.getChi2();
result.nDof_ = sampleResult.getNDof();