Skip to content

[hist] Honour a Z axis range in TProfile3D::GetStats #23829

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

Draft
Elvand-Lie wants to merge 2 commits into
base: master
Choose a base branch
from
Draft

[hist] Honour a Z axis range in TProfile3D::GetStats #23829

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
05f4881
[hist] Honour a Z axis range in TProfile3D::GetStats
Elvand-Lie Oct 24, 2026
cc5240b
[hist] Count stat overflows in TProfile3D::GetStats
Elvand-Lie Oct 24, 2026
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
36 changes: 32 additions & 4 deletions hist/hist/src/TProfile3D.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -814,7 +814,8 @@ void TProfile3D::GetStats(Double_t *stats) const
if (fBuffer) ((TProfile3D*)this)->BufferEmpty();

// Loop on bins
if ( (fTsumw == 0 /* && fEntries > 0 */) || fXaxis.TestBit(TAxis::kAxisRange) || fYaxis.TestBit(TAxis::kAxisRange)) {
if ((fTsumw == 0 /* && fEntries > 0 */) || fXaxis.TestBit(TAxis::kAxisRange) || fYaxis.TestBit(TAxis::kAxisRange) ||
fZaxis.TestBit(TAxis::kAxisRange)) {

// check for labels axis . In that case corresponding statistics do not make sense and it is set to zero
Bool_t labelXaxis = ((const_cast<TAxis &>(fXaxis)).GetLabels() && fXaxis.CanExtend());
Expand All @@ -826,11 +827,38 @@ void TProfile3D::GetStats(Double_t *stats) const
Double_t x,y,z;
for (bin=0;bin<kNstat;bin++) stats[bin] = 0;
if (!fBinEntries.fArray) return;
for (binz=fZaxis.GetFirst();binz<=fZaxis.GetLast();binz++) {
Int_t firstBinX = fXaxis.GetFirst();
Int_t lastBinX = fXaxis.GetLast();
Int_t firstBinY = fYaxis.GetFirst();
Int_t lastBinY = fYaxis.GetLast();
Int_t firstBinZ = fZaxis.GetFirst();
Int_t lastBinZ = fZaxis.GetLast();
// Include flow bins only on axes without an explicit range.
if (GetStatOverflowsBehaviour()) {
if (!fXaxis.TestBit(TAxis::kAxisRange)) {
if (firstBinX == 1)
firstBinX = 0;
if (lastBinX == fXaxis.GetNbins())
lastBinX += 1;
}
if (!fYaxis.TestBit(TAxis::kAxisRange)) {
if (firstBinY == 1)
firstBinY = 0;
if (lastBinY == fYaxis.GetNbins())
lastBinY += 1;
}
if (!fZaxis.TestBit(TAxis::kAxisRange)) {
if (firstBinZ == 1)
firstBinZ = 0;
if (lastBinZ == fZaxis.GetNbins())
lastBinZ += 1;
}
}
for (binz = firstBinZ; binz <= lastBinZ; binz++) {
z = (!labelZaxis) ? fZaxis.GetBinCenter(binz) : 0;
for (biny=fYaxis.GetFirst();biny<=fYaxis.GetLast();biny++) {
for (biny = firstBinY; biny <= lastBinY; biny++) {
y = (!labelYaxis) ? fYaxis.GetBinCenter(biny) : 0;
for (binx=fXaxis.GetFirst();binx<=fXaxis.GetLast();binx++) {
for (binx = firstBinX; binx <= lastBinX; binx++) {
bin = GetBin(binx,biny,binz);
w = fBinEntries.fArray[bin];
w2 = (fBinSumw2.fN ? fBinSumw2.fArray[bin] : w );
Expand Down
26 changes: 26 additions & 0 deletions hist/hist/test/test_TProfile.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,32 @@ TEST(TProfile2D, Chi2Test)
runTest(reference, sameDistr, differentDistr);
}

TEST(TProfile3D, GetStatsHonoursZRange)
{
TProfile3D profile("profile", "", 4, 0, 4, 5, 0, 10, 3, 0, 30);
profile.Fill(0.5, 1., 5., 1.);
profile.Fill(3.5, 9., 25., 1.);
profile.GetZaxis()->SetRange(1, 1);

EXPECT_DOUBLE_EQ(0.5, profile.GetMean(1));
EXPECT_DOUBLE_EQ(1., profile.GetMean(2));
EXPECT_DOUBLE_EQ(5., profile.GetMean(3));
}

TEST(TProfile3D, GetStatsHonoursStatOverflowsWithZRange)
{
TProfile3D profile("profile", "", 2, 0, 4, 3, 0, 12, 4, 0, 40);
profile.SetStatOverflows(TH1::kConsider);
profile.Fill(-1., 2., 5., 4.);
profile.Fill(1., 2., 5., 8.);
profile.GetZaxis()->SetRange(1, 1);

double stats[13] = {};
profile.GetStats(stats);
EXPECT_DOUBLE_EQ(2., stats[0]);
EXPECT_DOUBLE_EQ(0., profile.GetMean(1));
}

TEST(TProfile3D, Chi2Test)
{
TProfile3D reference("reference", "reference", 10, 0, 10, 11, 0, 11, 12, 0, 12);
Expand Down
Loading