Skip to content

[Python][UHI] Fix histogram kind assignment #20431

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
wants to merge 1 commit into
base: master
Choose a base branch
from
+21 −1
Open

[Python][UHI] Fix histogram kind assignment #20431

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
5 changes: 4 additions & 1 deletion bindings/pyroot/pythonizations/python/ROOT/_pythonization/_uhi.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -483,7 +483,10 @@ def _axes(self) -> Tuple[Union[PlottableAxisContinuous, PlottableAxisDiscrete],


def _kind(self) -> Kind:
return Kind.COUNT if not _hasWeights(self) else Kind.MEAN
# TProfile -> MEAN, everything else -> COUNT
if self.__class__.__name__.startswith("TProfile"):
return Kind.MEAN
return Kind.COUNT


def _values_default(self) -> np.typing.NDArray[Any]: # noqa: F821
Expand Down
17 changes: 17 additions & 0 deletions bindings/pyroot/pythonizations/test/uhi_indexing.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -357,5 +357,22 @@ def test_uhi_projection_preserves_content(self):
assert np.allclose(uhi_values, ref_values)


class TestHistogramKind:
def test_histogram_kind_no_weights(self):
h = ROOT.TH1D("h", "h", 100, -10, 10)
h.Fill(5)
assert h.kind == "COUNT"

def test_histogram_kind_with_weights(self):
h_weighted = ROOT.TH1D("h_weighted", "h_weighted", 100, -10, 10)
h_weighted.Fill(5, 2.0)
assert h_weighted.kind == "COUNT"

def test_profile_histogram_kind(self):
h_profile = ROOT.TProfile("h_profile", "h_profile", 100, -10, 10)
h_profile.Fill(5, 3.0)
assert h_profile.kind == "MEAN"


if __name__ == "__main__":
raise SystemExit(pytest.main(args=[__file__]))
Loading