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

XY*Data: dog is now a double

Browse Source
This commit is contained in:
Antonin Portelli
2014-09-18 17:15:56 +01:00
parent 05f5223d31
commit c0bfb12bd7
4 changed files with 22 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
lib/XYSampleData.cpp
View File

@@ -38,13 +38,19 @@ const DSample & SampleFitResult::getChi2(const PlaceHolder ph __unused) const
double SampleFitResult::getChi2PerDof(const Index s) const
{
return chi2_[s]/static_cast<double>(nDof_);
return chi2_[s]/getNDof();
}
DSample SampleFitResult::getChi2PerDof(const PlaceHolder ph __unused) const
{
return chi2_/static_cast<double>(nDof_);
return chi2_/getNDof();
}
double SampleFitResult::getNDof(void) const
{
return static_cast<double>(nDof_);
}
const DoubleFunction & SampleFitResult::getModel(const Index s,
const Index j) const
{
@@ -210,6 +216,7 @@ SampleFitResult XYSampleData::fit(Minimizer &minimizer, const DVec &init,
FitResult sampleResult;
SampleFitResult result;
bool initChi2;
DVec initBuf = init;
result.resize(nSample);
result.chi2_.resize(nSample);
@@ -232,7 +239,11 @@ SampleFitResult XYSampleData::fit(Minimizer &minimizer, const DVec &init,
initChi2 = (s == central);
// fit
sampleResult = data_.fit(minimizer, init, modelVector);
sampleResult = data_.fit(minimizer, initBuf, modelVector);
if (s == central)
{
initBuf = sampleResult;
}
// store result
result[s] = sampleResult;