Skip to content

[hist] THn rm cint-workaround for using statement #21042

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
guitargeek merged 1 commit into from
Jan 28, 2026
Merged

[hist] THn rm cint-workaround for using statement #21042

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 6 additions & 34 deletions hist/hist/inc/THn.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,34 +92,22 @@ class THn: public THnBase {
FillBinBase(w);
}

/// Forwards to THnBase::SetBinContent().
/// Non-virtual, CINT-compatible replacement of a using declaration.
void SetBinContent(const Int_t* idx, Double_t v) {
THnBase::SetBinContent(idx, v);
}
using THnBase::SetBinContent; // non-virtual void SetBinContent(const Int_t* idx, Double_t v)
void SetBinContent(Long64_t bin, Double_t v) override {
GetArray().SetAsDouble(bin, v);
}
void SetBinError2(Long64_t bin, Double_t e2) override {
if (!GetCalculateErrors()) Sumw2();
fSumw2.At(bin) = e2;
}
/// Forwards to THnBase::SetBinContent().
/// Non-virtual, CINT-compatible replacement of a using declaration.
void AddBinContent(const Int_t* idx, Double_t v = 1.) {
THnBase::AddBinContent(idx, v);
}
using THnBase::AddBinContent; // non-virtual void AddBinContent(const Int_t* idx, Double_t v = 1.)
void AddBinContent(Long64_t bin, Double_t v = 1.) override {
GetArray().AddAt(bin, v);
}
void AddBinError2(Long64_t bin, Double_t e2) override {
fSumw2.At(bin) += e2;
}
/// Forwards to THnBase::GetBinContent() overload.
/// Non-virtual, CINT-compatible replacement of a using declaration.
Double_t GetBinContent(const Int_t *idx) const {
return THnBase::GetBinContent(idx);
}
using THnBase::GetBinContent; // non-virtual Double_t GetBinContent(const Int_t *idx) const
/// Get the content of bin, and set its index if idx is != 0.
Double_t GetBinContent(Long64_t bin, Int_t* idx = nullptr) const override {
if (idx) {
Expand All @@ -142,25 +130,9 @@ class THn: public THnBase {

void Sumw2() override;

/// Forwards to THnBase::Projection().
/// Non-virtual, as a CINT-compatible replacement of a using declaration.
TH1D* Projection(Int_t xDim, Option_t* option = "") const {
return THnBase::Projection(xDim, option);
}

/// Forwards to THnBase::Projection().
/// Non-virtual, as a CINT-compatible replacement of a using declaration.
TH2D* Projection(Int_t yDim, Int_t xDim,
Option_t* option = "") const {
return THnBase::Projection(yDim, xDim, option);
}

/// Forwards to THnBase::Projection().
/// Non-virtual, as a CINT-compatible replacement of a using declaration.
TH3D* Projection(Int_t xDim, Int_t yDim, Int_t zDim,
Option_t* option = "") const {
return THnBase::Projection(xDim, yDim, zDim, option);
}
using THnBase::Projection; // non-virtual TH1D* Projection(Int_t xDim, Option_t* option = "") const
// TH2D* Projection(Int_t yDim, Int_t xDim, Option_t* option = "") const
// TH3D* Projection(Int_t xDim, Int_t yDim, Int_t zDim, Option_t* option = "") const

THn* Projection(Int_t ndim, const Int_t* dim,
Option_t* option = "") const {
Expand Down
Loading