Merge branch 'develop' into rebins

scikit-hep · Jan 31, 2025 · da3578b · da3578b
2 parents dad5352 + a6876bb
commit da3578b
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/src/boost_histogram/histogram.py b/src/boost_histogram/histogram.py
@@ -252,7 +252,7 @@ def __init__(
         if len(axes) == 1 and isinstance(axes[0], tuple(_histograms)):
             cpp_hist: CppHistogram = axes[0]  # type: ignore[assignment]
             self._from_histogram_cpp(cpp_hist)
-            if metadata:
+            if metadata is not None:
                 self.metadata = metadata
             return
 
@@ -261,7 +261,7 @@ def __init__(
         if len(axes) == 1 and isinstance(axes[0], Histogram):
             normal_hist: Histogram = axes[0]
             self._from_histogram_object(normal_hist)
-            if metadata:
+            if metadata is not None:
                 self.metadata = metadata
             return
 
@@ -959,7 +959,7 @@ def __getitem__(self: H, index: IndexingExpr) -> H | float | Accumulator:
                         j += group
 
                     variable_axis = Variable(
-                        new_axes_indices, metadata=axes[i].metadata
+                        new_axes_indices, __dict__=axes[i].metadata
                     )
                     axes[i] = variable_axis._ax
 

diff --git a/tests/test_histogram.py b/tests/test_histogram.py
@@ -630,19 +630,25 @@ def test_shrink_1d():
     assert_array_equal(hs.view(), [1, 0, 0, 0, 0])
 
 
-def test_rebin_1d():
-    h = bh.Histogram(bh.axis.Regular(20, 1, 5))
+@pytest.mark.parametrize(
+    "metadata", [None, {}, {"a": "1"}], ids=["None", "empty", "dict"]
+)
+def test_rebin_1d(metadata):
+    h = bh.Histogram(bh.axis.Regular(20, 1, 5, metadata=metadata))
     h.fill([1.1, 2.2, 3.3, 4.4])
 
     hs = h[{0: slice(None, None, bh.rebin(4))}]
     assert_array_equal(hs.view(), [1, 1, 1, 0, 1])
+    assert h.axes[0].metadata is hs.axes[0].metadata
 
     hs = h[{0: bh.rebin(4)}]
     assert_array_equal(hs.view(), [1, 1, 1, 0, 1])
+    assert h.axes[0].metadata is hs.axes[0].metadata
 
     hs = h[{0: bh.rebin(groups=[1, 2, 3, 14])}]
     assert_array_equal(hs.view(), [1, 0, 0, 3])
     assert_array_equal(hs.axes.edges[0], [1.0, 1.2, 1.6, 2.2, 5.0])
+    assert h.axes[0].metadata is hs.axes[0].metadata
 
     hs = h[bh.rebin(edges=[1.0, 1.2, 1.6, 2.2, 5.0])]
     assert_array_equal(hs.view(), [1, 0, 0, 3])