diff --git a/lib/Statistics/XYSampleData.cpp b/lib/Statistics/XYSampleData.cpp index b2aa4bd..0676564 100644 --- a/lib/Statistics/XYSampleData.cpp +++ b/lib/Statistics/XYSampleData.cpp @@ -62,9 +62,9 @@ double SampleFitResult::getPValue(const Index s) const return Math::chi2PValue(getChi2(s), getNDof()); } -double SampleFitResult::getSvdRangeDb(void) const +double SampleFitResult::getCorrRangeDb(void) const { - return svdRangeDb_; + return corrRangeDb_; } double SampleFitResult::getCcdf(const Index s) const @@ -112,7 +112,7 @@ void SampleFitResult::print(const bool printXsi, ostream &out) const getChi2(), static_cast(getNDof()), getChi2PerDof(), getCcdf(), getPValue()); out << buf << endl; - sprintf(buf, "correlation dynamic range= %.1f dB", getSvdRangeDb()); + sprintf(buf, "correlation dynamic range= %.1f dB", getCorrRangeDb()); out << buf << endl; for (Index p = 0; p < pMax; ++p) { @@ -343,7 +343,7 @@ SampleFitResult XYSampleData::fit(std::vector &minimizer, result.nPar_ = sampleResult.getNPar(); result.nDof_ = sampleResult.nDof_; result.parName_ = sampleResult.parName_; - result.svdRangeDb_ = Math::svdDynamicRangeDb(getFitCorrMat()); + result.corrRangeDb_ = Math::svdDynamicRangeDb(getFitCorrMat()); return result; } diff --git a/lib/Statistics/XYSampleData.hpp b/lib/Statistics/XYSampleData.hpp index b5c7a45..bb82748 100644 --- a/lib/Statistics/XYSampleData.hpp +++ b/lib/Statistics/XYSampleData.hpp @@ -49,7 +49,7 @@ public: double getNDof(void) const; Index getNPar(void) const; double getPValue(const Index s = central) const; - double getSvdRangeDb(void) const; + double getCorrRangeDb(void) const; double getCcdf(const Index s = central) const; const DoubleFunction & getModel(const Index s = central, const Index j = 0) const; @@ -61,7 +61,7 @@ public: std::ostream &out = std::cout) const; private: DSample chi2_; - double svdRangeDb_{0.}; + double corrRangeDb_{0.}; Index nDof_{0}, nPar_{0}; std::vector model_; std::vector parName_; diff --git a/lib/Statistics/XYStatData.cpp b/lib/Statistics/XYStatData.cpp index 2052be8..690a3a6 100644 --- a/lib/Statistics/XYStatData.cpp +++ b/lib/Statistics/XYStatData.cpp @@ -60,9 +60,9 @@ double FitResult::getCcdf(void) const return Math::chi2Ccdf(getChi2(), getNDof());; } -double FitResult::getSvdRangeDb(void) const +double FitResult::getCorrRangeDb(void) const { - return svdRangeDb_; + return corrRangeDb_; } const DoubleFunction & FitResult::getModel(const Index j) const @@ -80,7 +80,7 @@ void FitResult::print(const bool printXsi, ostream &out) const getChi2(), static_cast(getNDof()), getChi2PerDof(), getCcdf(), getPValue()); out << buf << endl; - sprintf(buf, "correlation dynamic range= %.1f dB", getSvdRangeDb()); + sprintf(buf, "correlation dynamic range= %.1f dB", getCorrRangeDb()); out << buf << endl; for (Index p = 0; p < pMax; ++p) { @@ -358,7 +358,7 @@ FitResult XYStatData::fit(vector &minimizer, const DVec &init, result = (*m)(chi2); totalInit = result; } - result.svdRangeDb_ = Math::svdDynamicRangeDb(getFitCorrMat()); + result.corrRangeDb_ = Math::svdDynamicRangeDb(getFitCorrMat()); result.chi2_ = chi2(result); result.nPar_ = nPar; result.nDof_ = layout.totalYSize - nPar; diff --git a/lib/Statistics/XYStatData.hpp b/lib/Statistics/XYStatData.hpp index 45cd2be..49cbd28 100644 --- a/lib/Statistics/XYStatData.hpp +++ b/lib/Statistics/XYStatData.hpp @@ -48,13 +48,13 @@ public: Index getNPar(void) const; double getPValue(void) const; double getCcdf(void) const; - double getSvdRangeDb(void) const; + double getCorrRangeDb(void) const; const DoubleFunction & getModel(const Index j = 0) const; // IO void print(const bool printXsi = false, std::ostream &out = std::cout) const; private: - double chi2_{0.}, svdRangeDb_{0.}; + double chi2_{0.}, corrRangeDb_{0.}; Index nDof_{0}, nPar_{0}; std::vector model_; std::vector parName_;