rootfig 0.4.0__tar.gz → 0.5.0__tar.gz

{rootfig-0.4.0 → rootfig-0.5.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: rootfig
-Version: 0.4.0
+Version: 0.5.0
 Summary: Publication-quality figures straight from ROOT trees, without ROOT: uproot + Awkward + hist + mplhep with a TTree::Draw-like API.
 Project-URL: Homepage, https://github.com/jbeirer/rootfig
 Project-URL: Documentation, https://jbeirer.github.io/rootfig/

{rootfig-0.4.0 → rootfig-0.5.0}/docs/composable.md

@@ -56,7 +56,7 @@ mem = rf.Sample({"x": awkward_array, "w": weights}, label="in memory")
   ([`Systematic.samples`][rootfig.Systematic]). Sources with
   the same name are correlated across samples; see
   [Systematic uncertainties](plotting.md#systematic-uncertainties).
-- `sample.with_(label="...")` returns a modified copy; replacement values are
+- `sample.replace(label="...")` returns a copy with the given fields changed; new values are
   validated like constructor arguments.
 
 Passing a list of files to `plot()` creates one sample per file. To merge

{rootfig-0.4.0 → rootfig-0.5.0}/docs/plotting.md

@@ -113,7 +113,8 @@ Pre-filled histograms take variations directly and are drawn the same way:
 [`sum_histograms`][rootfig.histograms.sum_histograms] work on them too.
 
 Use `(h_up, None)` for a mirrored variation. `Sample.systematics` and
-`Histogram.variations` are read-only; change them with `with_(...)`.
+`Histogram.variations` are read-only; `sample.replace(systematics=...)` and
+`histogram.replace(variations=...)` return copies with other ones.
 
 ## Luminosity
 

{rootfig-0.4.0 → rootfig-0.5.0}/examples/gallery/__init__.py

@@ -231,7 +231,7 @@ def stack_data(mc: list[rf.Sample], data: rf.Sample, pt: rf.Variable, style: rf.
     "Systematic uncertainties in a stack and its ratio panel",
     section=SIMULATION_AND_DATA,
 )
-def systematics(mc: list[rf.Sample], data: rf.Sample, met: rf.Variable, style: rf.Style) -> rf.Plot:
+def systematics(signal: rf.Sample, data: rf.Sample, met: rf.Variable, style: rf.Style) -> rf.Plot:
     """A sample lists its sources of systematic uncertainty by name: a pair of weight
     expressions, a relative normalisation uncertainty, or a mapping of shifted branches,
     which also move the selection. ``systematics=`` on the plot adds a
@@ -239,15 +239,24 @@ def systematics(mc: list[rf.Sample], data: rf.Sample, met: rf.Variable, style: r
     statistical and systematic uncertainties; a source with the same name in several
     samples is correlated, different sources add in quadrature. ``p.uncertainty()``
     returns every component."""
-    zjets, diboson, signal = mc
     jes = {"MET": ("MET_jesUp", "MET_jesDown")}
-    varied = [
-        zjets.with_(systematics={"pileup": ("weight_pu_up", "weight_pu_down"), "jes": jes}),
-        diboson.with_(systematics={"jes": jes, "xsec": 0.10}),
-        signal,
-    ]
+    zjets = rf.Sample(
+        "background.root",
+        tree="events",
+        label="Z + jets",
+        weight="weight",
+        systematics={"pileup": ("weight_pu_up", "weight_pu_down"), "jes": jes},
+    )
+    diboson = rf.Sample(
+        "diboson.root",
+        tree="events",
+        label="Diboson",
+        weight="weight",
+        scale=0.15,
+        systematics={"jes": jes, "xsec": 0.10},
+    )
     return rf.plot(
-        varied,
+        [zjets, diboson, signal],
         met,
         observed=data,
         stack=True,
@@ -272,9 +281,9 @@ def ratio_reference(
     stays visible on light and dark pages."""
     return rf.plot(
         [
-            zjets.with_(color=plt.rcParams["text.color"], histtype="errorbar"),
-            diboson.with_(color="#d95f02"),
-            signal.with_(color="#1b9e77", histtype="fill"),
+            zjets.replace(color=plt.rcParams["text.color"], histtype="errorbar"),
+            diboson.replace(color="#d95f02"),
+            signal.replace(color="#1b9e77", histtype="fill"),
         ],
         rf.Variable("nJet", bins=(9, -0.5, 8.5), label="Jet multiplicity"),
         normalize=True,
@@ -413,12 +422,12 @@ def density_flow(
 def object_vs_event(signal: rf.Sample, pt: rf.Variable, style: rf.Style) -> rf.Plot:
     """``Muon_pt`` is a list per event. A per-object cut such as ``Muon_pt > 100`` masks
     individual muons, while ``any(Muon_pt > 100)`` is per event: it keeps whole events, with all
-    their muons, soft ones included. ``Sample.with_`` derives variants of a sample."""
+    their muons, soft ones included. ``Sample.replace`` derives variants of a sample."""
     return rf.plot(
         [
-            signal.with_(label="All muons"),
-            signal.with_(label="Muon_pt > 100", selection="Muon_pt > 100"),
-            signal.with_(label="any(Muon_pt > 100)", selection="any(Muon_pt > 100)"),
+            signal.replace(label="All muons"),
+            signal.replace(label="Muon_pt > 100", selection="Muon_pt > 100"),
+            signal.replace(label="any(Muon_pt > 100)", selection="any(Muon_pt > 100)"),
         ],
         pt,
         logy=True,
@@ -433,12 +442,12 @@ def expressions(signal: rf.Sample, pt: rf.Variable, style: rf.Style) -> rf.Plot:
     ``rf.histogram`` returns a plain ``hist.Hist``; ``rf.plot_histograms`` draws any collection
     of them with the usual options."""
     all_muons = rf.histogram(signal, pt)
-    leading = rf.histogram(signal, pt.with_(expression="first(Muon_pt)"))
-    momentum = rf.histogram(signal, pt.with_(expression="Muon_pt * cosh(Muon_eta)"))
+    leading = rf.histogram(signal, pt.replace(expression="first(Muon_pt)"))
+    momentum = rf.histogram(signal, pt.replace(expression="Muon_pt * cosh(Muon_eta)"))
     return rf.plot_histograms(
         [all_muons, leading, momentum],
         labels=["All muons", "Leading muon", r"Muon $|\vec{p}|$"],
-        variable=pt.with_(label=r"$p_T^{\mu}$ or $|\vec{p}^{\,\mu}|$"),
+        variable=pt.replace(label=r"$p_T^{\mu}$ or $|\vec{p}^{\,\mu}|$"),
         logy=True,
         style=style,
     )

{rootfig-0.4.0 → rootfig-0.5.0}/src/rootfig/__init__.py

@@ -54,7 +54,7 @@ from rootfig.histograms import (
 from rootfig.model import Cut, Sample, Style, Systematic, Variable, log_bins
 from rootfig.plotting import Plot, dark_theme, use_style
 
-__version__ = "0.4.0"
+__version__ = "0.5.0"
 
 __all__ = [
     "BinningError",

{rootfig-0.4.0 → rootfig-0.5.0}/src/rootfig/api/_common.py

@@ -40,12 +40,12 @@ def style_for(
     """Resolve ``style`` and add free text lines and the luminosity used for scaling."""
     resolved = as_style(style)
     if lumi is not None and resolved.lumi is None:
-        resolved = resolved.with_(lumi=lumi)
+        resolved = resolved.replace(lumi=lumi)
     if text is None:
         return resolved
     existing = list(resolved.text_lines)
     extra = [text] if isinstance(text, str) else list(text)
-    return resolved.with_(text=[*existing, *extra])
+    return resolved.replace(text=[*existing, *extra])
 
 
 def normalize_for_plot(histogram_: Histogram, spec: NormalizeSpec) -> Histogram:

{rootfig-0.4.0 → rootfig-0.5.0}/src/rootfig/api/data.py

@@ -167,7 +167,7 @@ def histogram(
     ... )  # doctest: +SKIP
     >>> h.values().sum()  # doctest: +SKIP
     """
-    samples = [sample.with_(systematics={}) for sample in as_samples(data, tree=tree)]
+    samples = [sample.replace(systematics={}) for sample in as_samples(data, tree=tree)]
     results = histograms(
         samples,
         variable,

{rootfig-0.4.0 → rootfig-0.5.0}/src/rootfig/api/measures.py

@@ -95,13 +95,13 @@ def efficiency(
     ... )  # doctest: +SKIP
     """
     # efficiencies are statistical only: systematics are neither evaluated nor needed
-    samples = [s.with_(systematics={}) for s in as_samples(data, tree=tree, labels=label)]
+    samples = [s.replace(systematics={}) for s in as_samples(data, tree=tree, labels=label)]
     var = as_variable(variable, bins=bins, range=range, label=xlabel, unit=unit)
     logx = var.log if logx is None else logx
     totals = build_histograms(
         samples, var, selection=selection, weight=weight, lumi=lumi, nonfinite=nonfinite
     )
-    fixed = var.with_(bins=totals[0].axis)  # same binning for the numerators
+    fixed = var.replace(bins=totals[0].axis)  # same binning for the numerators
     pass_cut = as_cut(passed)
     if pass_cut is None:
         msg = "efficiency() needs a 'passed' selection"
@@ -117,7 +117,7 @@ def efficiency(
     ]
     resolved_style = style_for(style, text, lumi)
     if legend is not None:
-        resolved_style = resolved_style.with_(legend=legend)
+        resolved_style = resolved_style.replace(legend=legend)
     with style_context(resolved_style) as st:
         layout = make_figure(st, ratio=False, ax=ax, figsize=figsize)
         cycle = iter(color_cycle(len(samples), st))
@@ -249,7 +249,7 @@ def profile(
     ]
     resolved_style = style_for(style, text, lumi)
     if legend is not None:
-        resolved_style = resolved_style.with_(legend=legend)
+        resolved_style = resolved_style.replace(legend=legend)
     if ylabel is None:
         ylabel = var_y.axis_label if statistic == "mean" else f"Std. dev. of {var_y.axis_label}"
     with style_context(resolved_style) as st:
@@ -260,7 +260,7 @@ def profile(
         finish_axes(
             layout.main,
             data_range=(low, high),
-            xlabel=var_x.with_(bins=axis).axis_label,
+            xlabel=var_x.replace(bins=axis).axis_label,
             ylabel=ylabel,
             xlim=xlim or (float(edges[0]), float(edges[-1])),
             ylim=ylim,

{rootfig-0.4.0 → rootfig-0.5.0}/src/rootfig/api/plots1d.py

@@ -231,7 +231,7 @@ def plot(
     samples = as_samples(data, tree=tree, labels=label)
     if observed is not None:
         observed_samples = [
-            s if s.is_data else s.with_(is_data=True) for s in as_samples(observed, tree=tree)
+            s if s.is_data else s.replace(is_data=True) for s in as_samples(observed, tree=tree)
         ]
         samples = [*samples, *observed_samples]
     var = as_variable(variable, bins=bins, range=range, label=xlabel, unit=unit)
@@ -335,7 +335,7 @@ def plot_histograms(
         histograms_ = [normalize_for_plot(h, normalize) for h in histograms_]
     resolved_style = as_style(style)
     if legend is not None:
-        resolved_style = resolved_style.with_(legend=legend)
+        resolved_style = resolved_style.replace(legend=legend)
 
     # The y label quotes the bin width of the histogram as filled, before flow bins are added.
     label_widths = histograms_[0].widths
@@ -559,7 +559,7 @@ def _wrap_hists(
     wrapped: list[Histogram] = []
     for index, item in enumerate(hists):
         if isinstance(item, Histogram):
-            wrapped.append(item if labels is None else item.with_(label=labels[index]))
+            wrapped.append(item if labels is None else item.replace(label=labels[index]))
             continue
         if labels is not None:
             label = labels[index]

{rootfig-0.4.0 → rootfig-0.5.0}/src/rootfig/histograms/build.py

@@ -147,7 +147,7 @@ class Histogram:
         up shift around the nominal contents. Summarised by
         :func:`~rootfig.histograms.uncertainty`. The mapping is copied and made
         read-only; every stored pair contains two histograms. Use
-        ``histogram.with_(variations=...)`` to replace it. The underlying
+        ``histogram.replace(variations=...)`` to replace it. The underlying
         ``hist.Hist`` objects remain mutable. Observed data (``is_data``) cannot
         carry variations, as for :class:`~rootfig.model.Sample`.
     """
@@ -307,8 +307,8 @@ class Histogram:
         """
         return None if self.stats is None else self.stats.entries
 
-    def with_(self, **changes: Any) -> Histogram:
-        """Return a copy with the given fields replaced."""
+    def replace(self, **changes: Any) -> Histogram:
+        """Return a copy with the given fields changed, e.g. ``h.replace(label="B")``."""
         return replace(self, **changes)
 
     def map_hists(self, transform: Callable[[Hist], Hist]) -> Histogram:

{rootfig-0.4.0 → rootfig-0.5.0}/src/rootfig/histograms/normalize.py

@@ -154,7 +154,7 @@ def normalize(histogram: Histogram, spec: NormalizeSpec) -> Histogram:
         return histogram
     result, applied = _normalize_hist(histogram.hist, spec)
     if not applied:
-        return histogram.with_(hist=result, normalization=None)
+        return histogram.replace(hist=result, normalization=None)
     label = normalization_label(spec)
     variations = {}
     for name, pair in histogram.variations.items():
@@ -169,7 +169,7 @@ def normalize(histogram: Histogram, spec: NormalizeSpec) -> Histogram:
                 raise SystematicError(msg)
             normalized.append(shifted)
         variations[name] = (normalized[0], normalized[1])
-    return histogram.with_(hist=result, normalization=label, variations=variations)
+    return histogram.replace(hist=result, normalization=label, variations=variations)
 
 
 def normalization_label(spec: NormalizeSpec) -> str | None:

{rootfig-0.4.0 → rootfig-0.5.0}/src/rootfig/histograms/pipeline.py

@@ -384,7 +384,7 @@ def _variant_sample(sample: Sample, spec: Any, context: str) -> Sample:
     nominal sample's resolved number of generated events; files read their own.
     """
     if isinstance(spec, Sample):
-        return spec.with_(label=context)
+        return spec.replace(label=context)
     nominal = sample.source
     try:
         if isinstance(nominal, FileSource | ArraySource) and (
@@ -413,7 +413,7 @@ def _variant_sample(sample: Sample, spec: Any, context: str) -> Sample:
         and not callable(getattr(source, "read_scalar", None))
     ):
         changes["ngen"] = sample.generated_events()
-    return sample.with_(**changes)
+    return sample.replace(**changes)
 
 
 def _is_file_spec(spec: Any) -> bool:

{rootfig-0.4.0 → rootfig-0.5.0}/src/rootfig/model/samples.py

@@ -77,7 +77,7 @@ class Sample:
         ``Systematic.samples(...)`` for varied files. Sources
         with the same name in several samples are fully correlated; different
         names are independent. Not allowed together with ``is_data=True``. The mapping is copied and
-        made read-only; use ``sample.with_(systematics=...)`` to change it.
+        made read-only; use ``sample.replace(systematics=...)`` to change it.
 
     Examples
     --------
@@ -198,10 +198,10 @@ class Sample:
         """The resolved input files, or an empty tuple for in-memory sources."""
         return self.source.files if isinstance(self.source, FileSource) else ()
 
-    def with_(self, **changes: Any) -> Sample:
-        """Return a copy with the given fields replaced, e.g. ``sample.with_(label="B")``.
+    def replace(self, **changes: Any) -> Sample:
+        """Return a copy with the given fields changed, e.g. ``sample.replace(label="B")``.
 
-        Replacement values are validated and normalised exactly as by the
+        New values are validated and normalised exactly as by the
         constructor (``selection`` accepts a string, ``source`` anything
         :func:`~rootfig.io.as_source` accepts, ``scale`` must be finite, ...).
         """
@@ -222,7 +222,7 @@ class Sample:
         return clone
 
 
-# -- field validation shared by the constructor and with_() ---------------------------------
+# -- field validation shared by the constructor and replace() ---------------------------------
 
 
 def _normalise_weight(weight: str | None, label: str) -> str | None:
@@ -319,7 +319,7 @@ def as_samples(
         samples = [data]
     elif isinstance(data, Mapping) and _looks_like_label_map(data):
         samples = [
-            value.with_(label=key)
+            value.replace(label=key)
             if isinstance(value, Sample)
             else Sample(value, tree=tree, label=key, entry_start=entry_start, entry_stop=entry_stop)
             for key, value in data.items()
@@ -342,7 +342,7 @@ def as_samples(
         if len(label_list) != len(samples):
             msg = f"got {len(label_list)} labels for {len(samples)} samples"
             raise SourceError(msg)
-        samples = [s.with_(label=lab) for s, lab in zip(samples, label_list, strict=True)]
+        samples = [s.replace(label=lab) for s, lab in zip(samples, label_list, strict=True)]
     return samples
 
 

{rootfig-0.4.0 → rootfig-0.5.0}/src/rootfig/model/style.py

@@ -115,8 +115,8 @@ class Style:
             return tuple(self.text.split("\n"))
         return tuple(self.text)
 
-    def with_(self, **changes: Any) -> Style:
-        """Return a copy with the given fields replaced (``dataclasses.replace``)."""
+    def replace(self, **changes: Any) -> Style:
+        """Return a copy with the given fields changed, e.g. ``style.replace(lumi=140)``."""
         return replace(self, **changes)
 
 

{rootfig-0.4.0 → rootfig-0.5.0}/src/rootfig/model/variables.py

@@ -91,8 +91,8 @@ class Variable:
         base = self.label if self.label is not None else self.expression
         return f"{base} [{self.unit}]" if self.unit else base
 
-    def with_(self, **changes: Any) -> Variable:
-        """Return a copy with the given fields replaced (``dataclasses.replace``)."""
+    def replace(self, **changes: Any) -> Variable:
+        """Return a copy with the given fields changed, e.g. ``var.replace(bins=20)``."""
         return replace(self, **changes)
 
 

{rootfig-0.4.0 → rootfig-0.5.0}/tests/test_api.py

@@ -975,7 +975,9 @@ class TestFigureShape:
         [narrow_name] = [t for t in narrow.ax.texts if isinstance(t, hep.label.ExpLabel)]
         assert narrow_name.get_fontsize() < wide_name.get_fontsize()
         # an explicit position inside the frame is kept for 2D plots too
-        inside = rf.plot2d(signal_file, "MET", "nMuon", tree="events", style=cms.with_(label_loc=1))
+        inside = rf.plot2d(
+            signal_file, "MET", "nMuon", tree="events", style=cms.replace(label_loc=1)
+        )
         inside.fig.canvas.draw()
         renderer = inside.fig.canvas.get_renderer()  # type: ignore[attr-defined]
         [name] = [t for t in inside.ax.texts if isinstance(t, hep.label.ExpLabel)]

{rootfig-0.4.0 → rootfig-0.5.0}/tests/test_histograms.py

@@ -98,7 +98,7 @@ class TestHistogram:
         scaled = histogram.scaled(2.0)
         assert scaled.values().tolist() == [4.0, 4.0, 2.0]
         assert scaled.variances().tolist() == [8.0, 16.0, 4.0]
-        assert histogram.with_(label="x").label == "x"
+        assert histogram.replace(label="x").label == "x"
 
     def test_scaled_keeps_statistics_consistent(self, histogram: Histogram) -> None:
         assert histogram.stats is not None
@@ -1026,13 +1026,13 @@ class TestVariations:
             del histogram.variations["shape"]  # type: ignore[attr-defined]
         with pytest.raises(TypeError):
             Histogram(nominal, "MC").variations["new"] = (up, up)  # type: ignore[index]
-        changed = histogram.with_(variations={"norm": (nominal * 1.1, None)})
+        changed = histogram.replace(variations={"norm": (nominal * 1.1, None)})
         assert list(changed.variations) == ["norm"]
         assert list(histogram.variations) == ["shape"]
         with pytest.raises(TypeError):
             changed.variations["new"] = (up, up)  # type: ignore[index]
         with pytest.raises(SystematicError, match="binning"):
-            histogram.with_(variations={"bad": (contents([1.0]), None)})
+            histogram.replace(variations={"bad": (contents([1.0]), None)})
 
     @pytest.mark.parametrize("operation", ["copy", "deepcopy", "pickle"])
     def test_variations_support_copy_and_pickle(self, operation: str) -> None:
@@ -1057,7 +1057,7 @@ class TestVariations:
         histogram = Histogram(
             nominal, "MC", sample, stats, False, "red", "step", "unity", {"s": (nominal, None)}
         )
-        changed = histogram.with_(label="renamed")
+        changed = histogram.replace(label="renamed")
         assert changed.label == "renamed"
         assert changed.sample is sample
         assert changed.stats is stats
@@ -1095,8 +1095,8 @@ class TestVariations:
             Histogram(nominal, "Data", is_data=True, variations={"s": (nominal, None)})
         simulated = Histogram(nominal, "MC", variations={"s": (nominal, None)})
         with pytest.raises(SystematicError, match="observed data"):
-            simulated.with_(is_data=True)
-        assert simulated.with_(is_data=True, variations={}).is_data
+            simulated.replace(is_data=True)
+        assert simulated.replace(is_data=True, variations={}).is_data
 
     def test_down_is_mirrored_and_binning_checked(self) -> None:
         nominal = contents([10.0, 20.0])
@@ -1264,7 +1264,7 @@ class TestSystematicsPipeline:
         np.testing.assert_allclose(hists[0].variations["lumi"][0].values(), 1.5 * hists[0].values())
         assert hists[1].variations == {}
         with pytest.raises(SystematicError, match="observed data"):
-            build_histograms([data.with_(systematics={"s": 0.1})], "x")
+            build_histograms([data.replace(systematics={"s": 0.1})], "x")
 
     def test_binning_from_nominal_and_single_read(self, arrays: dict[str, Any]) -> None:
         sample = Sample(
@@ -1471,7 +1471,7 @@ class TestSystematicsRegressions:
         with pytest.raises(MissingBranchError, match="pi"):
             build_histograms([sample], Variable("x", bins=(2, 0, 2)))
         # A name resolving to a mathematical constant is not a branch to replace.
-        sample = sample.with_(systematics={"s": {"pi": "missing"}})
+        sample = sample.replace(systematics={"s": {"pi": "missing"}})
         (h,) = build_histograms([sample], Variable("pi", bins=(4, 0, 4)))
         np.testing.assert_allclose(h.variations["s"][0].values(), h.values())
 

{rootfig-0.4.0 → rootfig-0.5.0}/tests/test_model.py

@@ -82,7 +82,7 @@ class TestVariable:
         var = Variable("Muon_pt / 1000", label=r"$p_T$", unit="GeV")
         assert var.axis_label == r"$p_T$ [GeV]"
         assert var.safe_name == "Muon_pt_1000"
-        assert var.with_(name="pt").safe_name == "pt"
+        assert var.replace(name="pt").safe_name == "pt"
 
     def test_invalid_expression(self) -> None:
         with pytest.raises(ExpressionError):
@@ -117,7 +117,7 @@ class TestVariable:
         with pytest.raises(ValueError, match="path separators"):
             Variable("x", name=name)
         with pytest.raises(ValueError, match="path separators"):
-            Variable("x").with_(name=name)
+            Variable("x").replace(name=name)
 
     def test_name_keeps_plain_stems(self) -> None:
         assert Variable("x", name="pt-lead.window").safe_name == "pt-lead.window"
@@ -442,7 +442,7 @@ class TestSample:
 
     def test_with(self, signal_file: Path) -> None:
         sample = Sample(signal_file, tree="events")
-        other = sample.with_(label="new", selection="MET > 1")
+        other = sample.replace(label="new", selection="MET > 1")
         assert other.label == "new"
         assert other.selection == Cut("MET > 1")
         assert other.source is sample.source
@@ -450,21 +450,21 @@ class TestSample:
     def test_with_validates_like_init(self) -> None:
         sample = Sample({"x": np.arange(2.0)})
         with pytest.raises(ValueError, match="scale must be"):
-            sample.with_(scale=np.nan)
+            sample.replace(scale=np.nan)
         with pytest.raises(LuminosityError, match="finite"):
-            sample.with_(ngen=np.inf)
+            sample.replace(ngen=np.inf)
         with pytest.raises(LuminosityError):
-            sample.with_(xsec="bad")
+            sample.replace(xsec="bad")
         with pytest.raises(SourceError, match="cannot interpret"):
-            sample.with_(source=42)
+            sample.replace(source=42)
         with pytest.raises(TypeError, match="weight must be"):
-            sample.with_(weight=42)
+            sample.replace(weight=42)
         with pytest.raises(TypeError, match="label must be"):
-            sample.with_(label=3)
-        assert sample.with_(weight="  ").weight is None
-        assert sample.with_(scale=2).scale == 2.0
-        assert sample.with_(source=sample.source).source is sample.source
-        assert sample.with_(xsec="1.2 fb").xsec == "1.2 fb"
+            sample.replace(label=3)
+        assert sample.replace(weight="  ").weight is None
+        assert sample.replace(scale=2).scale == 2.0
+        assert sample.replace(source=sample.source).source is sample.source
+        assert sample.replace(xsec="1.2 fb").xsec == "1.2 fb"
 
     def test_existing_source_rejects_entry_range(self, signal_file: Path) -> None:
         source = FileSource(signal_file, tree="events")
@@ -531,7 +531,7 @@ class TestStyle:
         assert as_style("ggplot") == Style(base="ggplot")
         style = Style(lumi=140)
         assert as_style(style) is style
-        assert style.with_(com=13.6).com == 13.6
+        assert style.replace(com=13.6).com == 13.6
         with pytest.raises(TypeError):
             as_style(3)  # type: ignore[arg-type]
 
@@ -742,10 +742,12 @@ class TestSystematic:
         sample = Sample({"x": [1.0, 2.0]}, label="S", systematics={"n": 0.1})
         assert sample.systematics == {"n": Systematic("norm", 1.1, 0.9)}
         assert "systematics=['n']" in repr(sample)
-        assert sample.with_(systematics={"w": "x"}).systematics == {"w": Systematic("weight", "x")}
+        assert sample.replace(systematics={"w": "x"}).systematics == {
+            "w": Systematic("weight", "x")
+        }
         assert Sample({"x": [1.0]}).systematics == {}
         with pytest.raises(SystematicError, match="sample 'S': systematic 'bad'"):
-            sample.with_(systematics={"bad": object()})
+            sample.replace(systematics={"bad": object()})
 
     @pytest.mark.parametrize(
         ("kind", "up", "down"),
@@ -787,12 +789,12 @@ class TestSystematic:
             Sample(columns, is_data=True, systematics={"s": 0.1})
         data = Sample(columns, is_data=True, systematics={})  # an empty mapping is fine
         with pytest.raises(SystematicError, match="observed data"):
-            data.with_(systematics={"s": 0.1})
+            data.replace(systematics={"s": 0.1})
         mc = Sample(columns, systematics={"s": 0.1})
         with pytest.raises(SystematicError, match="observed data"):
-            mc.with_(is_data=True)
-        assert mc.with_(is_data=True, systematics={}).is_data
-        assert data.with_(is_data=False, systematics={"s": 0.1}).systematics
+            mc.replace(is_data=True)
+        assert mc.replace(is_data=True, systematics={}).is_data
+        assert data.replace(is_data=False, systematics={"s": 0.1}).systematics
 
     def test_systematic_mappings_are_read_only_snapshots(self) -> None:
         branches = {"x": ("x_up", "x_down")}
@@ -812,7 +814,7 @@ class TestSystematic:
         with pytest.raises(TypeError):
             Sample({"x": [1.0]}).systematics["extra"] = systematic  # type: ignore[index]
 
-        updated = sample.with_(systematics={"norm": 0.1})
+        updated = sample.replace(systematics={"norm": 0.1})
         assert list(updated.systematics) == ["norm"]
         assert list(sample.systematics) == ["shape"]
         with pytest.raises(TypeError):

{rootfig-0.4.0 → rootfig-0.5.0}/tests/test_plotting.py

@@ -1220,7 +1220,7 @@ class TestHist2DMask:
 
 
 def with_variation(histogram: Histogram, factor: float) -> Histogram:
-    return histogram.with_(variations={"s": (histogram.hist * factor, None)})
+    return histogram.replace(variations={"s": (histogram.hist * factor, None)})
 
 
 class TestSystematicDrawing:
@@ -1251,7 +1251,7 @@ class TestSystematicDrawing:
     def test_flow_bins_carry_variations(self) -> None:
         nominal = make_hist([1.5, 5.0], label="A")  # 5.0 is overflow
         up = make_hist([-1.0, 1.5], label="up")  # underflow only in the variation
-        varied = nominal.with_(variations={"s": (up.hist, None)})
+        varied = nominal.replace(variations={"s": (up.hist, None)})
         (shown,), (under, over) = show_flow_bins([varied])
         assert (under, over) == (True, True)
         np.testing.assert_allclose(shown.variations["s"][0].values(), [1, 0, 1, 0, 0, 0])