umami-preprocessing 0.2.4__tar.gz → 0.2.5__tar.gz

{umami_preprocessing-0.2.4 → umami_preprocessing-0.2.5}/PKG-INFO

@@ -1,25 +1,25 @@
 Metadata-Version: 2.4
 Name: umami-preprocessing
-Version: 0.2.4
+Version: 0.2.5
 Summary: Preprocessing for jet tagging
 License: MIT
 Project-URL: Homepage, https://github.com/umami-hep/umami-preprocessing
 Requires-Python: <3.12,>=3.8
 Description-Content-Type: text/markdown
+Requires-Dist: atlas-ftag-tools==0.2.14
+Requires-Dist: dotmap==1.3.30
+Requires-Dist: puma-hep==0.4.9
 Requires-Dist: pyyaml-include==1.3
 Requires-Dist: PyYAML>=6.0.1
 Requires-Dist: rich==12.6.0
 Requires-Dist: scipy>=1.15.2
-Requires-Dist: puma-hep==0.4.5
-Requires-Dist: atlas-ftag-tools==0.2.10
-Requires-Dist: dotmap==1.3.30
 Provides-Extra: dev
-Requires-Dist: ruff==0.6.2; extra == "dev"
 Requires-Dist: mypy==1.11.2; extra == "dev"
 Requires-Dist: pre-commit==3.5.0; extra == "dev"
-Requires-Dist: pytest>=7.2.2; extra == "dev"
 Requires-Dist: pytest-cov>=4.0.0; extra == "dev"
 Requires-Dist: pytest-mock==3.11.1; extra == "dev"
+Requires-Dist: pytest>=7.2.2; extra == "dev"
+Requires-Dist: ruff==0.6.2; extra == "dev"
 
 [![Code style: black](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/psf/black)
 [![codecov](https://codecov.io/gh/umami-hep/umami-preprocessing/graph/badge.svg?token=K8MJI20UZO)](https://codecov.io/gh/umami-hep/umami-preprocessing)

{umami_preprocessing-0.2.4 → umami_preprocessing-0.2.5}/pyproject.toml

@@ -7,23 +7,23 @@ readme = "README.md"
 requires-python = "<3.12,>=3.8"
 
 dependencies = [
-    "pyyaml-include==1.3",
-    "PyYAML>=6.0.1",
-    "rich==12.6.0",
-    "scipy>=1.15.2",
-    "puma-hep==0.4.5",
-    "atlas-ftag-tools==0.2.10",
-    "dotmap==1.3.30"
+  "atlas-ftag-tools==0.2.14",
+  "dotmap==1.3.30",
+  "puma-hep==0.4.9",
+  "pyyaml-include==1.3",
+  "PyYAML>=6.0.1",
+  "rich==12.6.0",
+  "scipy>=1.15.2",
 ]
 
 [project.optional-dependencies]
 dev = [
-  "ruff==0.6.2",
   "mypy==1.11.2",
   "pre-commit==3.5.0",
-  "pytest>=7.2.2",
   "pytest-cov>=4.0.0",
   "pytest-mock==3.11.1",
+  "pytest>=7.2.2",
+  "ruff==0.6.2",
 ]
 
 [project.urls]

{umami_preprocessing-0.2.4 → umami_preprocessing-0.2.5}/umami_preprocessing.egg-info/PKG-INFO

@@ -1,25 +1,25 @@
 Metadata-Version: 2.4
 Name: umami-preprocessing
-Version: 0.2.4
+Version: 0.2.5
 Summary: Preprocessing for jet tagging
 License: MIT
 Project-URL: Homepage, https://github.com/umami-hep/umami-preprocessing
 Requires-Python: <3.12,>=3.8
 Description-Content-Type: text/markdown
+Requires-Dist: atlas-ftag-tools==0.2.14
+Requires-Dist: dotmap==1.3.30
+Requires-Dist: puma-hep==0.4.9
 Requires-Dist: pyyaml-include==1.3
 Requires-Dist: PyYAML>=6.0.1
 Requires-Dist: rich==12.6.0
 Requires-Dist: scipy>=1.15.2
-Requires-Dist: puma-hep==0.4.5
-Requires-Dist: atlas-ftag-tools==0.2.10
-Requires-Dist: dotmap==1.3.30
 Provides-Extra: dev
-Requires-Dist: ruff==0.6.2; extra == "dev"
 Requires-Dist: mypy==1.11.2; extra == "dev"
 Requires-Dist: pre-commit==3.5.0; extra == "dev"
-Requires-Dist: pytest>=7.2.2; extra == "dev"
 Requires-Dist: pytest-cov>=4.0.0; extra == "dev"
 Requires-Dist: pytest-mock==3.11.1; extra == "dev"
+Requires-Dist: pytest>=7.2.2; extra == "dev"
+Requires-Dist: ruff==0.6.2; extra == "dev"
 
 [![Code style: black](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/psf/black)
 [![codecov](https://codecov.io/gh/umami-hep/umami-preprocessing/graph/badge.svg?token=K8MJI20UZO)](https://codecov.io/gh/umami-hep/umami-preprocessing)

{umami_preprocessing-0.2.4 → umami_preprocessing-0.2.5}/umami_preprocessing.egg-info/requires.txt

@@ -1,15 +1,15 @@
+atlas-ftag-tools==0.2.14
+dotmap==1.3.30
+puma-hep==0.4.9
 pyyaml-include==1.3
 PyYAML>=6.0.1
 rich==12.6.0
 scipy>=1.15.2
-puma-hep==0.4.5
-atlas-ftag-tools==0.2.10
-dotmap==1.3.30
 
 [dev]
-ruff==0.6.2
 mypy==1.11.2
 pre-commit==3.5.0
-pytest>=7.2.2
 pytest-cov>=4.0.0
 pytest-mock==3.11.1
+pytest>=7.2.2
+ruff==0.6.2

{umami_preprocessing-0.2.4 → umami_preprocessing-0.2.5}/upp/__init__.py

@@ -2,4 +2,4 @@
 
 from __future__ import annotations
 
-__version__ = "v0.2.4"
+__version__ = "v0.2.5"

{umami_preprocessing-0.2.4 → umami_preprocessing-0.2.5}/upp/stages/merging.py

@@ -103,6 +103,7 @@ class Merging:
             shapes,
             add_flavour_label=self.jets_name,
             jets_name=self.jets_name,
+            num_jets=jets_in_file,
         )
 
         # Copy the metadata attributes

{umami_preprocessing-0.2.4 → umami_preprocessing-0.2.5}/upp/stages/plot.py

@@ -68,12 +68,8 @@ def make_hist(
     plot = HistogramPlot(
         ylabel=f"Normalised Number of {jets_name}",
         xlabel=xlabel,
-        bins=50,
         y_scale=1.5,
         logy=True,
-        norm=True,
-        bins_range=bins_range,
-        underoverflow=False,
     )
 
     # Define different linestyles for the different samples
@@ -89,20 +85,29 @@ def make_hist(
             else:
                 cuts = Cuts.from_list([f"flavour_label == {label_value}"])
 
-            # Add to histogram
-            plot.add(
-                Histogram(
-                    values=(
-                        cuts(values).values[variable] / 1e3
-                        if "pt" in variable
-                        else cuts(values).values[variable]
-                    ),
-                    label=flavour.label + " " + values_key,
-                    colour=flavour.colour,
-                    linestyle=linestiles[counter],
-                )
+            # Get the histogram object
+            histo = Histogram(
+                values=(
+                    cuts(values).values[variable] / 1e3
+                    if "pt" in variable
+                    else cuts(values).values[variable]
+                ),
+                bins=50,
+                bins_range=bins_range,
+                norm=True,
+                label=flavour.label + " " + values_key,
+                colour=flavour.colour,
+                linestyle=linestiles[counter],
+                underoverflow=True,
             )
 
+            # Add to histogram
+            plot.add(histogram=histo)
+
+            # Set bin_edges
+            if bins_range is None:
+                bins_range = (histo.bin_edges[0], histo.bin_edges[-1])
+
     # Draw plot
     plot.draw()