wums 0.1.6__tar.gz → 0.1.7__tar.gz

wums-0.1.7/PKG-INFO

@@ -0,0 +1,54 @@
+Metadata-Version: 2.2
+Name: wums
+Version: 0.1.7
+Summary: .
+Author-email: David Walter <david.walter@cern.ch>, Josh Bendavid <josh.bendavid@cern.ch>, Kenneth Long <kenneth.long@cern.ch>, Jan Eysermans <jan.eysermans@cern.ch>
+License: MIT
+Project-URL: Homepage, https://github.com/WMass/wums
+Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3.8
+Classifier: License :: OSI Approved :: MIT License
+Classifier: Operating System :: OS Independent
+Requires-Python: >=3.8
+Description-Content-Type: text/markdown
+Requires-Dist: hist
+Requires-Dist: numpy
+Provides-Extra: plotting
+Requires-Dist: matplotlib; extra == "plotting"
+Requires-Dist: mplhep; extra == "plotting"
+Provides-Extra: fitting
+Requires-Dist: tensorflow; extra == "fitting"
+Requires-Dist: jax; extra == "fitting"
+Requires-Dist: scipy; extra == "fitting"
+Provides-Extra: pickling
+Requires-Dist: boost_histogram; extra == "pickling"
+Requires-Dist: h5py; extra == "pickling"
+Requires-Dist: hdf5plugin; extra == "pickling"
+Requires-Dist: lz4; extra == "pickling"
+Provides-Extra: all
+Requires-Dist: plotting; extra == "all"
+Requires-Dist: fitting; extra == "all"
+Requires-Dist: pickling; extra == "all"
+
+# WUMS: Wremnants Utilities, Modules, and other Stuff
+
+As the name suggests, this is a collection of different thins, all python based:
+- Fitting with tensorflow or jax
+- Custom pickling h5py objects 
+- Plotting functionality
+
+## Install
+
+The `wums` package can be pip installed with minimal dependencies:
+```bash
+pip install wums
+```
+Different dependencies can be added with `plotting`, `fitting`, `pickling` to use the corresponding scripts.
+For example, one can install with
+```bash
+pip install wums[plotting,fitting]
+```
+Or all dependencies with
+```bash
+pip install wums[all]
+```

wums-0.1.7/README.md

@@ -0,0 +1,22 @@
+# WUMS: Wremnants Utilities, Modules, and other Stuff
+
+As the name suggests, this is a collection of different thins, all python based:
+- Fitting with tensorflow or jax
+- Custom pickling h5py objects 
+- Plotting functionality
+
+## Install
+
+The `wums` package can be pip installed with minimal dependencies:
+```bash
+pip install wums
+```
+Different dependencies can be added with `plotting`, `fitting`, `pickling` to use the corresponding scripts.
+For example, one can install with
+```bash
+pip install wums[plotting,fitting]
+```
+Or all dependencies with
+```bash
+pip install wums[all]
+```

{wums-0.1.6 → wums-0.1.7}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "wums"
-version = "0.1.6"
+version = "0.1.7"
 description = "."
 readme = { file = "README.md", content-type = "text/markdown" }
 license = { text = "MIT" }
@@ -12,6 +12,7 @@ authors = [
     {name = "David Walter", email = "david.walter@cern.ch"},
     {name = "Josh Bendavid", email = "josh.bendavid@cern.ch"},
     {name = "Kenneth Long", email = "kenneth.long@cern.ch"},
+    {name = "Jan Eysermans", email = "jan.eysermans@cern.ch"},
 ]
 urls = {Homepage = "https://github.com/WMass/wums"}
 classifiers = [
@@ -23,19 +24,18 @@ classifiers = [
 requires-python = ">=3.8"
 
 dependencies = [
-    "boost_histogram",
-    "h5py",
-    "hdf5plugin",
     "hist",
-    "lz4",
-    "matplotlib",
-    "mplhep",
     "numpy",
-    "uproot"
 ]
 
+[project.optional-dependencies]
+plotting = ["matplotlib", "mplhep"]
+fitting = ["tensorflow", "jax", "scipy"]
+pickling = ["boost_histogram", "h5py", "hdf5plugin", "lz4"]
+all = ["plotting", "fitting", "pickling"]
+
 [tool.setuptools.packages.find]
 where = ["."]
 
 [tool.setuptools.package-data]
-"wums" = ["Templates/index.php"]
+"wums" = ["Templates/index.php"]

{wums-0.1.6 → wums-0.1.7}/wums/boostHistHelpers.py

@@ -40,7 +40,7 @@ def broadcastSystHist(h1, h2, flow=True, by_ax_name=True):
             h2.ndim - 1 - i: h2.values(flow=flow).shape[h2.ndim - 1 - i]
             for i in range(h2.ndim - h1.ndim)
         }
-
+    
     broadcast_shape = list(moves.values()) + list(s1)
 
     try:
@@ -53,6 +53,10 @@ def broadcastSystHist(h1, h2, flow=True, by_ax_name=True):
             f"    h2.axes: {h2.axes}"
         )
 
+    if by_ax_name:
+        # We also have to move axes that are in common between h1 and h2 but in different order
+        moves.update({sum([k<i for k in moves.keys()]) + h1.axes.name.index(n2): None for i, n2 in enumerate(h2.axes.name) if n2 in h1.axes.name})
+
     # move back to original order
     new_vals = np.moveaxis(new_vals, np.arange(len(moves)), list(moves.keys()))