Skip to content

[hist] Recalculate statistics for width-weighted projections #23863

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

Open
Elvand-Lie wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[hist] Recalculate statistics for width-weighted projections #23863

Show file tree
Hide file tree
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
3 changes: 2 additions & 1 deletion hist/hist/src/TH2.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2313,7 +2313,8 @@ TH1D *TH2::DoProjection(bool onX, const char *name, Int_t firstbin, Int_t lastbi
if (fTsumw != 0 && TMath::Abs( fTsumw - totcont) < TMath::Abs(fTsumw) * eps)
reuseStats = true;
}
if (ncuts) reuseStats = false;
if (ncuts || useWidth)
reuseStats = false;
// retrieve the statistics and set in projected histogram if we can re-use it
bool reuseEntries = reuseStats;
// can re-use entries if underflow/overflow are included
Expand Down
6 changes: 4 additions & 2 deletions hist/hist/src/TH3.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2106,7 +2106,8 @@ TH1D *TH3::DoProject1D(const char* name, const char * title, const TAxis* projX,
bool resetStats = true;
double eps = 1.E-12;
if (IsA() == TH3F::Class() ) eps = 1.E-6;
if (fTsumw != 0 && TMath::Abs( fTsumw - totcont) < TMath::Abs(fTsumw) * eps) resetStats = false;
if (!useWidth && fTsumw != 0 && TMath::Abs(fTsumw - totcont) < TMath::Abs(fTsumw) * eps)
resetStats = false;

bool resetEntries = resetStats;
// entries are calculated using underflow/overflow. If excluded entries must be reset
Expand Down Expand Up @@ -2337,7 +2338,8 @@ TH2D *TH3::DoProject2D(const char* name, const char * title, const TAxis* projX,
bool resetStats = true;
double eps = 1.E-12;
if (IsA() == TH3F::Class() ) eps = 1.E-6;
if (fTsumw != 0 && TMath::Abs( fTsumw - totcont) < TMath::Abs(fTsumw) * eps) resetStats = false;
if (!useWidth && fTsumw != 0 && TMath::Abs(fTsumw - totcont) < TMath::Abs(fTsumw) * eps)
resetStats = false;

bool resetEntries = resetStats;
// entries are calculated using underflow/overflow. If excluded entries must be reset
Expand Down
35 changes: 35 additions & 0 deletions hist/hist/test/test_projections.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,3 +85,38 @@ TEST(Projections, Issue_6658_Profile2D)
EXPECT_EQ(xaxis_2d_nbins, xaxis_pxy_nbins);
expect_list_eq_names(*labels_2d, *labels_pxy);
}

TEST(Projections, WidthWeightedTH2Statistics)
{
double edges[] = {0., 1., 4.};
TH2D x("width_x", "", 2, 0., 2., 2, edges);
x.Fill(0.5, 0.5);
x.Fill(1.5, 2.);
auto px = x.ProjectionX("width_px", 1, 2, "width");
EXPECT_DOUBLE_EQ(px->GetBinContent(1), 1.);
EXPECT_DOUBLE_EQ(px->GetBinContent(2), 3.);
EXPECT_DOUBLE_EQ(px->GetMean(), 1.25);
TH2D y("width_y", "", 2, edges, 2, 0., 2.);
y.Fill(0.5, 0.5);
y.Fill(2., 1.5);
auto py = y.ProjectionY("width_py", 1, 2, "width");
EXPECT_DOUBLE_EQ(py->GetMean(), 1.25);
delete px;
delete py;
}

TEST(Projections, WidthWeightedTH3Statistics)
{
double x[] = {0., 1., 2.}, y[] = {0., 0.5, 2.}, z[] = {0., 1.};
TH3D h("width_h3", "", 2, x, 2, y, 1, z);
h.Fill(0.5, 0.25, 0.5);
h.Fill(1.5, 1., 0.5);
auto px = h.ProjectionX("width_px3", 1, 2, 1, 1, "width");
auto p2 = static_cast<TH2D *>(h.Project3D("zxwidth"));
EXPECT_DOUBLE_EQ(px->GetBinContent(1), 0.5);
EXPECT_DOUBLE_EQ(px->GetBinContent(2), 1.5);
EXPECT_DOUBLE_EQ(px->GetMean(), 1.25);
EXPECT_DOUBLE_EQ(p2->GetMean(1), 1.25);
delete px;
delete p2;
}