Skip to content

Commit

Permalink
style: pre-commit fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
pre-commit-ci[bot] committed Jan 31, 2025
1 parent bac117a commit a98e060
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 14 deletions.
26 changes: 17 additions & 9 deletions src/boost_histogram/histogram.py
Original file line number Diff line number Diff line change
Expand Up @@ -913,14 +913,22 @@ def __getitem__(self: H, index: IndexingExpr) -> H | float | Accumulator:
if ind.step is not None:
if getattr(ind.step, "factor", None) is not None:
merge = ind.step.factor

elif (getattr(ind.step, "edges", None) is not None
or getattr(ind.step, "axis", None) is not None

elif (
getattr(ind.step, "edges", None) is not None
or getattr(ind.step, "axis", None) is not None
):
edges = ind.step.edges if getattr(ind.step, "edges", None) is not None else ind.step.axis.edges
assert all([edge in self.axes[i].edges for edge in edges])
edges = (
ind.step.edges
if getattr(ind.step, "edges", None) is not None
else ind.step.axis.edges
)
assert all([edge in self.axes[i].edges for edge in edges])
matched_ixes = np.where(np.isin(self.axes[i].edges, edges))[0]
groups = [int(ix-matched_ixes[i]) for i, ix in enumerate(matched_ixes[1:])]
groups = [
int(ix - matched_ixes[i])
for i, ix in enumerate(matched_ixes[1:])
]
elif (
hasattr(ind.step, "group_mapping")
and (tmp_groups := ind.step.group_mapping(self.axes[i]))
Expand Down Expand Up @@ -982,9 +990,9 @@ def __getitem__(self: H, index: IndexingExpr) -> H | float | Accumulator:
pos = [slice(None)] * (i)
if new_view.dtype.names:
for field in new_view.dtype.names:
new_view[(*pos, new_j, ...)][field] += (
reduced_view[(*pos, j, ...)][field]
)
new_view[(*pos, new_j, ...)][field] += reduced_view[
(*pos, j, ...)
][field]
else:
new_view[(*pos, new_j, ...)] += reduced_view[
(*pos, j, ...)
Expand Down
11 changes: 6 additions & 5 deletions src/boost_histogram/tag.py
Original file line number Diff line number Diff line change
Expand Up @@ -112,10 +112,10 @@ def __call__(self, axis: AxisLike) -> int: # noqa: ARG002

class rebin:
__slots__ = (
"axis",
"edges",
"factor",
"groups",
"edges",
"axis",
)

def __init__(
Expand All @@ -127,16 +127,17 @@ def __init__(
axis: PlottableAxis | None = None,
) -> None:
if not sum(i is not None for i in [factor, groups, edges, axis]) == 1:
raise ValueError("Exactly one, a factor, groups, or axis should be provided")
raise ValueError(
"Exactly one, a factor, groups, or axis should be provided"
)
self.groups = groups
self.edges = edges
self.axis = axis
if isinstance(factor, int):
self.factor = factor
elif axis is None and factor is not None:
self.factor = None
self.axis = factor

self.axis = factor

def __repr__(self) -> str:
repr_str = f"{self.__class__.__name__}"
Expand Down

0 comments on commit a98e060

Please sign in to comment.