Skip to content
Snippets Groups Projects
Commit 8680f50d authored by Simon Spies's avatar Simon Spies Committed by Olivier Couet
Browse files

[hist] Formatted the files realted to TGraphMultiErrors (#4777) 

* [hist] Formatted the files realted to TGraphMultiErrors accoding to ROOTs formatting rules

* [hist] Corrected extremly unlikely memory leak Travis-CI warned about.

Corrected extremly unlikely memory leak Travis-CI warned about in the drawing method of TGraphMultiErrors.
parent 9422f10a
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
hist/hist/inc/TGraphMultiErrors.h
+ 72
− 40
View file @ 8680f50d
......@@ -28,33 +28,34 @@ class TArrayD;
class TGraphMultiErrors : public TGraph {
protected:
Int_t fNYErrors; ///< The amount of different y-errors
Int_t fSumErrorsMode; ///< How y errors are summed: kOnlyFirst = Only First; kSquareSum = Squared Sum; kSum = Absolute Addition
Double_t *fExL; ///<[fNpoints] array of X low errors
Double_t *fExH; ///<[fNpoints] array of X high errors
std::vector<TArrayD> fEyL; ///< two dimensional array of Y low errors
std::vector<TArrayD> fEyH; ///< two dimensional array of Y high errors
Int_t fNYErrors; ///< The amount of different y-errors
Int_t fSumErrorsMode; ///< How y errors are summed: kOnlyFirst = Only First; kSquareSum = Squared Sum; kSum =
///< Absolute Addition
Double_t *fExL; ///<[fNpoints] array of X low errors
Double_t *fExH; ///<[fNpoints] array of X high errors
std::vector<TArrayD> fEyL; ///< two dimensional array of Y low errors
std::vector<TArrayD> fEyH; ///< two dimensional array of Y high errors
mutable Double_t *fEyLSum = nullptr; ///<! array of summed Y low errors for fitting
mutable Double_t *fEyHSum = nullptr; ///<! array of summed Y high errors for fitting
std::vector<TAttFill> fAttFill; ///< the AttFill attributes of the different errors
std::vector<TAttLine> fAttLine; ///< the AttLine attributes of the different errors
std::vector<TAttFill> fAttFill; ///< the AttFill attributes of the different errors
std::vector<TAttLine> fAttLine; ///< the AttLine attributes of the different errors
virtual Double_t **Allocate(Int_t size);
Bool_t CtorAllocate();
Bool_t CtorAllocate();
virtual void CopyAndRelease(Double_t **newarrays, Int_t ibegin, Int_t iend, Int_t obegin);
virtual Bool_t CopyPoints(Double_t **arrays, Int_t ibegin, Int_t iend, Int_t obegin);
virtual void FillZero(Int_t begin, Int_t end, Bool_t from_ctor = kTRUE);
virtual void CopyAndRelease(Double_t **newarrays, Int_t ibegin, Int_t iend, Int_t obegin);
virtual Bool_t CopyPoints(Double_t **arrays, Int_t ibegin, Int_t iend, Int_t obegin);
virtual void FillZero(Int_t begin, Int_t end, Bool_t from_ctor = kTRUE);
void CalcYErrorsSum() const;
virtual Bool_t DoMerge(const TGraph *tg);
virtual void SwapPoints(Int_t pos1, Int_t pos2);
void CalcYErrorsSum() const;
virtual Bool_t DoMerge(const TGraph *tg);
virtual void SwapPoints(Int_t pos1, Int_t pos2);
public:
enum ESummationModes {
kOnlyFirst = 0, ///< Only take errors from first dimension
kSquareSum = 1, ///< Calculate the square sum of all errors
kAbsSum = 2 ///< Calculate the absolute sum of all errors
kAbsSum = 2 ///< Calculate the absolute sum of all errors
};
TGraphMultiErrors();
......@@ -62,29 +63,55 @@ public:
TGraphMultiErrors(Int_t np, Int_t ne = 1);
TGraphMultiErrors(const Char_t *name, const Char_t *title, Int_t np, Int_t ne = 1);
TGraphMultiErrors(Int_t np, const Float_t *x, const Float_t *y, const Float_t *exL = nullptr, const Float_t *exH = nullptr, const Float_t *eyL = nullptr, const Float_t *eyH = nullptr, Int_t m = kOnlyFirst);
TGraphMultiErrors(const Char_t *name, const Char_t *title, Int_t np, const Float_t *x, const Float_t *y, const Float_t *exL = nullptr, const Float_t *exH = nullptr, const Float_t *eyL = nullptr, const Float_t *eyH = nullptr, Int_t m = kOnlyFirst);
TGraphMultiErrors(Int_t np, const Double_t *x, const Double_t *y, const Double_t *exL = nullptr, const Double_t *exH = nullptr, const Double_t *eyL = nullptr, const Double_t *eyH = nullptr, Int_t m = kOnlyFirst);
TGraphMultiErrors(const Char_t *name, const Char_t *title, Int_t np, const Double_t *x, const Double_t *y, const Double_t *exL = nullptr, const Double_t *exH = nullptr, const Double_t *eyL = nullptr, const Double_t *eyH = nullptr, Int_t m = kOnlyFirst);
TGraphMultiErrors(Int_t np, Int_t ne, const Float_t *x, const Float_t *y, const Float_t *exL, const Float_t *exH, std::vector<std::vector<Float_t>> eyL, std::vector<std::vector<Float_t>> eyH, Int_t m = kOnlyFirst);
TGraphMultiErrors(const Char_t *name, const Char_t *title, Int_t np, Int_t ne, const Float_t *x, const Float_t *y, const Float_t *exL, const Float_t *exH, std::vector<std::vector<Float_t>> eyL, std::vector<std::vector<Float_t>> eyH, Int_t m = kOnlyFirst);
TGraphMultiErrors(Int_t np, Int_t ne, const Double_t *x, const Double_t *y, const Double_t *exL, const Double_t *exH, std::vector<std::vector<Double_t>> eyL, std::vector<std::vector<Double_t>> eyH, Int_t m = kOnlyFirst);
TGraphMultiErrors(const Char_t *name, const Char_t *title, Int_t np, Int_t ne, const Double_t *x, const Double_t *y, const Double_t *exL, const Double_t *exH, std::vector<std::vector<Double_t>> eyL, std::vector<std::vector<Double_t>> eyH, Int_t m = kOnlyFirst);
TGraphMultiErrors(Int_t np, Int_t ne, const Float_t *x, const Float_t *y, const Float_t *exL, const Float_t *exH, std::vector<TArrayF> eyL, std::vector<TArrayF> eyH, Int_t m = kOnlyFirst);
TGraphMultiErrors(const Char_t *name, const Char_t *title, Int_t np, Int_t ne, const Float_t *x, const Float_t *y, const Float_t *exL, const Float_t *exH, std::vector<TArrayF> eyL, std::vector<TArrayF> eyH, Int_t m = kOnlyFirst);
TGraphMultiErrors(Int_t np, Int_t ne, const Double_t *x, const Double_t *y, const Double_t *exL, const Double_t *exH, std::vector<TArrayD> eyL, std::vector<TArrayD> eyH, Int_t m = kOnlyFirst);
TGraphMultiErrors(const Char_t *name, const Char_t *title, Int_t np, Int_t ne, const Double_t *x, const Double_t *y, const Double_t *exL, const Double_t *exH, std::vector<TArrayD> eyL, std::vector<TArrayD> eyH, Int_t m = kOnlyFirst);
TGraphMultiErrors(const TVectorF &tvX, const TVectorF &tvY, const TVectorF &tvExL, const TVectorF &tvExH, const TVectorF &tvEyL, const TVectorF &tvEyH, Int_t m = kOnlyFirst);
TGraphMultiErrors(const TVectorD &tvX, const TVectorD &tvY, const TVectorD &tvExL, const TVectorD &tvExH, const TVectorD &tvEyL, const TVectorD &tvEyH, Int_t m = kOnlyFirst);
TGraphMultiErrors(Int_t ne, const TVectorF &tvX, const TVectorF &tvY, const TVectorF &tvExL, const TVectorF &tvExH, const TVectorF *tvEyL, const TVectorF *tvEyH, Int_t m = kOnlyFirst);
TGraphMultiErrors(Int_t ne, const TVectorD &tvX, const TVectorD &tvY, const TVectorD &tvExL, const TVectorD &tvExH, const TVectorD *tvEyL, const TVectorD *tvEyH, Int_t m = kOnlyFirst);
TGraphMultiErrors(Int_t np, const Float_t *x, const Float_t *y, const Float_t *exL = nullptr,
const Float_t *exH = nullptr, const Float_t *eyL = nullptr, const Float_t *eyH = nullptr,
Int_t m = kOnlyFirst);
TGraphMultiErrors(const Char_t *name, const Char_t *title, Int_t np, const Float_t *x, const Float_t *y,
const Float_t *exL = nullptr, const Float_t *exH = nullptr, const Float_t *eyL = nullptr,
const Float_t *eyH = nullptr, Int_t m = kOnlyFirst);
TGraphMultiErrors(Int_t np, const Double_t *x, const Double_t *y, const Double_t *exL = nullptr,
const Double_t *exH = nullptr, const Double_t *eyL = nullptr, const Double_t *eyH = nullptr,
Int_t m = kOnlyFirst);
TGraphMultiErrors(const Char_t *name, const Char_t *title, Int_t np, const Double_t *x, const Double_t *y,
const Double_t *exL = nullptr, const Double_t *exH = nullptr, const Double_t *eyL = nullptr,
const Double_t *eyH = nullptr, Int_t m = kOnlyFirst);
TGraphMultiErrors(Int_t np, Int_t ne, const Float_t *x, const Float_t *y, const Float_t *exL, const Float_t *exH,
std::vector<std::vector<Float_t>> eyL, std::vector<std::vector<Float_t>> eyH,
Int_t m = kOnlyFirst);
TGraphMultiErrors(const Char_t *name, const Char_t *title, Int_t np, Int_t ne, const Float_t *x, const Float_t *y,
const Float_t *exL, const Float_t *exH, std::vector<std::vector<Float_t>> eyL,
std::vector<std::vector<Float_t>> eyH, Int_t m = kOnlyFirst);
TGraphMultiErrors(Int_t np, Int_t ne, const Double_t *x, const Double_t *y, const Double_t *exL, const Double_t *exH,
std::vector<std::vector<Double_t>> eyL, std::vector<std::vector<Double_t>> eyH,
Int_t m = kOnlyFirst);
TGraphMultiErrors(const Char_t *name, const Char_t *title, Int_t np, Int_t ne, const Double_t *x, const Double_t *y,
const Double_t *exL, const Double_t *exH, std::vector<std::vector<Double_t>> eyL,
std::vector<std::vector<Double_t>> eyH, Int_t m = kOnlyFirst);
TGraphMultiErrors(Int_t np, Int_t ne, const Float_t *x, const Float_t *y, const Float_t *exL, const Float_t *exH,
std::vector<TArrayF> eyL, std::vector<TArrayF> eyH, Int_t m = kOnlyFirst);
TGraphMultiErrors(const Char_t *name, const Char_t *title, Int_t np, Int_t ne, const Float_t *x, const Float_t *y,
const Float_t *exL, const Float_t *exH, std::vector<TArrayF> eyL, std::vector<TArrayF> eyH,
Int_t m = kOnlyFirst);
TGraphMultiErrors(Int_t np, Int_t ne, const Double_t *x, const Double_t *y, const Double_t *exL, const Double_t *exH,
std::vector<TArrayD> eyL, std::vector<TArrayD> eyH, Int_t m = kOnlyFirst);
TGraphMultiErrors(const Char_t *name, const Char_t *title, Int_t np, Int_t ne, const Double_t *x, const Double_t *y,
const Double_t *exL, const Double_t *exH, std::vector<TArrayD> eyL, std::vector<TArrayD> eyH,
Int_t m = kOnlyFirst);
TGraphMultiErrors(const TVectorF &tvX, const TVectorF &tvY, const TVectorF &tvExL, const TVectorF &tvExH,
const TVectorF &tvEyL, const TVectorF &tvEyH, Int_t m = kOnlyFirst);
TGraphMultiErrors(const TVectorD &tvX, const TVectorD &tvY, const TVectorD &tvExL, const TVectorD &tvExH,
const TVectorD &tvEyL, const TVectorD &tvEyH, Int_t m = kOnlyFirst);
TGraphMultiErrors(Int_t ne, const TVectorF &tvX, const TVectorF &tvY, const TVectorF &tvExL, const TVectorF &tvExH,
const TVectorF *tvEyL, const TVectorF *tvEyH, Int_t m = kOnlyFirst);
TGraphMultiErrors(Int_t ne, const TVectorD &tvX, const TVectorD &tvY, const TVectorD &tvExL, const TVectorD &tvExH,
const TVectorD *tvEyL, const TVectorD *tvEyH, Int_t m = kOnlyFirst);
TGraphMultiErrors(const TGraphMultiErrors &tgme);
TGraphMultiErrors& operator=(const TGraphMultiErrors &tgme);
TGraphMultiErrors &operator=(const TGraphMultiErrors &tgme);
TGraphMultiErrors(const TH1 *th, Int_t ne = 1);
TGraphMultiErrors(const TH1 *pass, const TH1 *total, Int_t ne = 1, Option_t *option = "");
......@@ -94,7 +121,7 @@ public:
virtual void AddYError(Int_t np, const Double_t *eyL = nullptr, const Double_t *eyH = nullptr);
virtual void Apply(TF1 *f);
virtual void BayesDivide(const TH1 *pass, const TH1 *total, Option_t *opt = "");
void Divide(const TH1 *pass, const TH1 *total, Option_t *opt = "cp");
void Divide(const TH1 *pass, const TH1 *total, Option_t *opt = "cp");
virtual void ComputeRange(Double_t &xmin, Double_t &ymin, Double_t &xmax, Double_t &ymax) const;
virtual void DeleteYError(Int_t e);
......@@ -139,7 +166,8 @@ public:
virtual void Print(Option_t *chopt = "") const;
virtual void SavePrimitive(std::ostream &out, Option_t *option = "");
virtual void SetPointError(Double_t exL, Double_t exH, Double_t eyL1, Double_t eyH1, Double_t eyL2 = 0., Double_t eyH2 = 0., Double_t eyL3 = 0., Double_t eyH3 = 0.); // *MENU*
virtual void SetPointError(Double_t exL, Double_t exH, Double_t eyL1, Double_t eyH1, Double_t eyL2 = 0.,
Double_t eyH2 = 0., Double_t eyL3 = 0., Double_t eyH3 = 0.); // *MENU*
virtual void SetPointError(Int_t i, Int_t ne, Double_t exL, Double_t exH, const Double_t *eyL, const Double_t *eyH);
virtual void SetPointEX(Int_t i, Double_t exL, Double_t exH);
......@@ -156,7 +184,11 @@ public:
virtual void SetEYlow(Int_t e, Int_t np, const Double_t *eyL);
virtual void SetEYhigh(Int_t e, Int_t np, const Double_t *eyH);
virtual void SetSumErrorsMode(Int_t m) { fSumErrorsMode = m; CalcYErrorsSum(); }
virtual void SetSumErrorsMode(Int_t m)
{
fSumErrorsMode = m;
CalcYErrorsSum();
}
virtual void SetAttFill(Int_t e, TAttFill *taf);
virtual void SetAttLine(Int_t e, TAttLine *tal);
......
hist/hist/src/TGraphMultiErrors.cxx
+ 225
− 122
View file @ 8680f50d
This diff is collapsed.
hist/histpainter/src/TGraphPainter.cxx
+ 270
− 246
View file @ 8680f50d
This diff is collapsed.
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment