Skip to content

[636][Python][UHI] Remove __eq__ Pythonization for TH1 Derived Classes #19217

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
merged 3 commits into from
Jun 27, 2025
Merged

[636][Python][UHI] Remove __eq__ Pythonization for TH1 Derived Classes #19217

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
411bb8e
[Python][UHI] Remove TH1 equality operator pythonization
siliataider Jun 27, 2025
5d620ea
[Python][UHI] Fix sum of weights squared calculation
siliataider Jun 27, 2025
aea5771
[Python][UHI] Add tests for __eq__
siliataider Jun 27, 2025
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
16 changes: 3 additions & 13 deletions 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 @@ -379,20 +379,9 @@ def _setitem(self, index, value):
_slice_set(self, uhi_index, index, value)


def _eq(self, other):
import numpy as np

return (
isinstance(other, type(self))
and _shape(self) == _shape(other)
and np.array_equal(_values_default(self), _values_default(other))
)


def _add_indexing_features(klass: Any) -> None:
klass.__getitem__ = _getitem
klass.__setitem__ = _setitem
klass.__eq__ = _eq


"""
Expand Down Expand Up @@ -559,11 +548,12 @@ def _get_sum_of_weights_squared(self) -> np.typing.NDArray[Any]: # noqa: F821
import numpy as np

shape = _shape(self, include_flow_bins=False)
return np.frombuffer(
sumw2_arr = np.frombuffer(
self.GetSumw2().GetArray(),
dtype=self.GetSumw2().GetArray().typecode,
count=self.GetSumw2().GetSize(),
).reshape(shape, order="F")[tuple([slice(1, -1)] * len(shape))]
)
return sumw2_arr[tuple([slice(1, -1)] * len(shape))].reshape(shape, order="F") if sumw2_arr.size > 0 else sumw2_arr


values_func_dict: dict[str, Callable] = {
Expand Down
13 changes: 13 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 @@ -315,6 +315,19 @@ def test_statistics_slice(self, hist_setup):
assert hist_setup.GetStdDev() == pytest.approx(sliced_hist.GetStdDev(), rel=10e-5)
assert hist_setup.GetMean() == pytest.approx(sliced_hist.GetMean(), rel=10e-5)

def test_equality(self, hist_setup):
if _special_setting(hist_setup):
pytest.skip("Setting cannot be tested here")

hist_copy_ptr = hist_setup
assert hist_setup == hist_copy_ptr

hist_copy = hist_setup.Clone()
assert hist_setup != hist_copy

hist_full_slice = hist_setup[...]
assert hist_setup != hist_full_slice


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