portelli/LatAnalyze
1
0
Fork 0
mirror of https://github.com/aportelli/LatAnalyze.git synced 2025-04-11 03:20:46 +01:00
Code Releases Activity

correlation dynamic range renaming

Browse Source
This commit is contained in:
Antonin Portelli 2022-02-16 19:03:19 +00:00
parent 35f6733292
commit 47d0b3f040
4 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/Statistics/XYSampleData.cpp
View File

@ -62,9 +62,9 @@ double SampleFitResult::getPValue(const Index s) const
return Math::chi2PValue(getChi2(s), getNDof()); 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 double SampleFitResult::getCcdf(const Index s) const
@ -112,7 +112,7 @@ void SampleFitResult::print(const bool printXsi, ostream &out) const
getChi2(), static_cast<int>(getNDof()), getChi2PerDof(), getCcdf(), getChi2(), static_cast<int>(getNDof()), getChi2PerDof(), getCcdf(),
getPValue()); getPValue());
out << buf << endl; out << buf << endl;
sprintf(buf, "correlation dynamic range= %.1f dB", getSvdRangeDb()); sprintf(buf, "correlation dynamic range= %.1f dB", getCorrRangeDb());
out << buf << endl; out << buf << endl;
for (Index p = 0; p < pMax; ++p) for (Index p = 0; p < pMax; ++p)
{ {
@ -343,7 +343,7 @@ SampleFitResult XYSampleData::fit(std::vector<Minimizer *> &minimizer,
result.nPar_ = sampleResult.getNPar(); result.nPar_ = sampleResult.getNPar();
result.nDof_ = sampleResult.nDof_; result.nDof_ = sampleResult.nDof_;
result.parName_ = sampleResult.parName_; result.parName_ = sampleResult.parName_;
result.svdRangeDb_ = Math::svdDynamicRangeDb(getFitCorrMat()); result.corrRangeDb_ = Math::svdDynamicRangeDb(getFitCorrMat());
return result; return result;
} }

4
lib/Statistics/XYSampleData.hpp
View File

@ -49,7 +49,7 @@ public:
double getNDof(void) const; double getNDof(void) const;
Index getNPar(void) const; Index getNPar(void) const;
double getPValue(const Index s = central) const; double getPValue(const Index s = central) const;
double getSvdRangeDb(void) const; double getCorrRangeDb(void) const;
double getCcdf(const Index s = central) const; double getCcdf(const Index s = central) const;
const DoubleFunction & getModel(const Index s = central, const DoubleFunction & getModel(const Index s = central,
const Index j = 0) const; const Index j = 0) const;
@ -61,7 +61,7 @@ public:
std::ostream &out = std::cout) const; std::ostream &out = std::cout) const;
private: private:
DSample chi2_; DSample chi2_;
double svdRangeDb_{0.}; double corrRangeDb_{0.};
Index nDof_{0}, nPar_{0}; Index nDof_{0}, nPar_{0};
std::vector<DoubleFunctionSample> model_; std::vector<DoubleFunctionSample> model_;
std::vector<std::string> parName_; std::vector<std::string> parName_;

8
lib/Statistics/XYStatData.cpp
View File

@ -60,9 +60,9 @@ double FitResult::getCcdf(void) const
return Math::chi2Ccdf(getChi2(), getNDof());; 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 const DoubleFunction & FitResult::getModel(const Index j) const
@ -80,7 +80,7 @@ void FitResult::print(const bool printXsi, ostream &out) const
getChi2(), static_cast<int>(getNDof()), getChi2PerDof(), getCcdf(), getChi2(), static_cast<int>(getNDof()), getChi2PerDof(), getCcdf(),
getPValue()); getPValue());
out << buf << endl; out << buf << endl;
sprintf(buf, "correlation dynamic range= %.1f dB", getSvdRangeDb()); sprintf(buf, "correlation dynamic range= %.1f dB", getCorrRangeDb());
out << buf << endl; out << buf << endl;
for (Index p = 0; p < pMax; ++p) for (Index p = 0; p < pMax; ++p)
{ {
@ -358,7 +358,7 @@ FitResult XYStatData::fit(vector<Minimizer *> &minimizer, const DVec &init,
result = (*m)(chi2); result = (*m)(chi2);
totalInit = result; totalInit = result;
} }
result.svdRangeDb_ = Math::svdDynamicRangeDb(getFitCorrMat()); result.corrRangeDb_ = Math::svdDynamicRangeDb(getFitCorrMat());
result.chi2_ = chi2(result); result.chi2_ = chi2(result);
result.nPar_ = nPar; result.nPar_ = nPar;
result.nDof_ = layout.totalYSize - nPar; result.nDof_ = layout.totalYSize - nPar;

4
lib/Statistics/XYStatData.hpp
View File

@ -48,13 +48,13 @@ public:
Index getNPar(void) const; Index getNPar(void) const;
double getPValue(void) const; double getPValue(void) const;
double getCcdf(void) const; double getCcdf(void) const;
double getSvdRangeDb(void) const; double getCorrRangeDb(void) const;
const DoubleFunction & getModel(const Index j = 0) const; const DoubleFunction & getModel(const Index j = 0) const;
// IO // IO
void print(const bool printXsi = false, void print(const bool printXsi = false,
std::ostream &out = std::cout) const; std::ostream &out = std::cout) const;
private: private:
double chi2_{0.}, svdRangeDb_{0.}; double chi2_{0.}, corrRangeDb_{0.};
Index nDof_{0}, nPar_{0}; Index nDof_{0}, nPar_{0};
std::vector<DoubleFunction> model_; std::vector<DoubleFunction> model_;
std::vector<std::string> parName_; std::vector<std::string> parName_;