wums 0.1.4__tar.gz → 0.1.6__tar.gz

{wums-0.1.4 → wums-0.1.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: wums
-Version: 0.1.4
+Version: 0.1.6
 Summary: .
 Author-email: David Walter <david.walter@cern.ch>, Josh Bendavid <josh.bendavid@cern.ch>, Kenneth Long <kenneth.long@cern.ch>
 License: MIT

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

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "wums"
-version = "0.1.4"
+version = "0.1.6"
 description = "."
 readme = { file = "README.md", content-type = "text/markdown" }
 license = { text = "MIT" }
@@ -38,4 +38,4 @@ dependencies = [
 where = ["."]
 
 [tool.setuptools.package-data]
-"wums" = ["Templates/index.php"]
+"wums" = ["Templates/index.php"]

{wums-0.1.4 → wums-0.1.6}/wums/ioutils.py

@@ -1,5 +1,9 @@
 import copyreg
 import pickle
+import sys
+
+import wums
+sys.modules['narf.ioutils'] = sys.modules['wums.ioutils'] # backwards compatibility to use old files
 
 import boost_histogram as bh
 import h5py

{wums-0.1.4 → wums-0.1.6}/wums/plot_tools.py

@@ -6,6 +6,7 @@ import shutil
 import socket
 import sys
 import textwrap
+import importlib
 
 import hist
 import matplotlib as mpl
@@ -600,14 +601,48 @@ def wrap_text(
     )
 
 
-def add_cms_decor(
-    ax, label=None, lumi=None, loc=2, data=True, text_size=None, no_energy=False
+def add_cms_decor(ax, *args, **kwargs):
+    add_decor(ax, "CMS", *args, **kwargs)
+
+
+def add_decor(
+    ax, title, label=None, lumi=None, loc=2, data=True, text_size=None, no_energy=False
 ):
     text_size = get_textsize(ax, text_size)
+
+    if title in ["CMS", "ATLAS", "LHCb", "ALICE"]:
+        module = getattr(hep, title.lower())
+        make_text = module.text
+        make_label = module.label
+    else:
+        def make_text(text=None, **kwargs):
+            for key, value in dict(hep.rcParams.text._get_kwargs()).items():
+                if (
+                    value is not None
+                    and key not in kwargs
+                    and key in inspect.getfullargspec(label_base.exp_text).kwonlyargs
+                ):
+                    kwargs.setdefault(key, value)
+            kwargs.setdefault("italic", (False, True, False))
+            kwargs.setdefault("exp", title)
+            return hep.label.exp_text(text=text, **kwargs)
+
+        def make_label(**kwargs):
+            for key, value in dict(hep.rcParams.text._get_kwargs()).items():
+                if (
+                    value is not None
+                    and key not in kwargs
+                    and key in inspect.getfullargspec(label_base.exp_text).kwonlyargs
+                ):
+                    kwargs.setdefault(key, value)
+            kwargs.setdefault("italic", (False, True, False))
+            kwargs.setdefault("exp", title)
+            return hep.label.exp_label(**kwargs)
+
     if no_energy:
-        hep.cms.text(ax=ax, text=label, loc=loc, fontsize=text_size)
+        make_text(ax=ax, text=label, loc=loc, fontsize=text_size)
     else:
-        hep.cms.label(
+        make_label(
             ax=ax,
             lumi=lumi,
             lumi_format="{0:.3g}",
@@ -616,7 +651,32 @@ def add_cms_decor(
             data=data,
             loc=loc,
         )
-
+    
+    # else:
+    #     if loc==0:
+    #         # above frame
+    #         x = 0.0
+    #         y = 1.0
+    #     elif loc==1:
+    #         # in frame
+    #         x = 0.05
+    #         y = 0.88
+    #     elif loc==2:
+    #         # upper left, label below title
+    #         x = 0.05
+    #         y = 0.88
+    #     elif loc==2:
+    #         #     
+    #     ax.text(
+    #         x,
+    #         y,
+    #         args.title,
+    #         transform=ax1.transAxes,
+    #         fontweight="bold",
+    #         fontsize=1.2 * text_size,
+    #     )
+    #     if label is not None:
+    #         ax.text(0.05, 0.80, label, transform=ax.transAxes, fontstyle="italic")
 
 def makeStackPlotWithRatio(
     histInfo,
@@ -825,11 +885,11 @@ def makeStackPlotWithRatio(
             for x in (data_hist.sum(), hh.sumHists(stack).sum())
         ]
         varis = [
-            x.variance if hasattr(x, "variance") else x ** 0.5
+            x.variance if hasattr(x, "variance") else x**0.5
             for x in (data_hist.sum(), hh.sumHists(stack).sum())
         ]
         scale = vals[0] / vals[1]
-        unc = scale * (varis[0] / vals[0] ** 2 + varis[1] / vals[1] ** 2) ** 0.5
+        unc = scale * (varis[0] / vals[0] ** 2 + varis[1] / vals[1] ** 2)**0.5
         ndigits = -math.floor(math.log10(abs(unc))) + 1
         logger.info(
             f"Rescaling all processes by {round(scale,ndigits)} +/- {round(unc,ndigits)} to match data norm"
@@ -1780,3 +1840,44 @@ def make_summary_plot(
     ax1.xaxis.set_major_locator(ticker.LinearLocator(numticks=5))
 
     return fig
+
+
+def load_config(config_path):
+    if config_path is None:
+        return {}
+    # load a python module
+    spec = importlib.util.spec_from_file_location("config", config_path)
+    config = importlib.util.module_from_spec(spec)
+    spec.loader.exec_module(config)
+    return config
+
+
+def read_axis_label(x, labels, with_unit=True):
+    if x in labels:
+        label = labels[x]
+        if isinstance(label, str):
+            return label
+        elif with_unit:
+            return f'{label["label"]} ({label["unit"]})'
+        else:
+            return label["label"]
+    else:
+        return x
+
+
+def get_axis_label(config, default_keys=None, label=None, is_bin=False):
+    if label is not None:
+        return label
+
+    if default_keys is None:
+        return "Bin index"
+
+    labels = getattr(config, "axis_labels", {})
+
+    if len(default_keys) == 1:        
+        if is_bin:
+            return f"{read_axis_label(default_keys[0], labels, False)} bin"
+        else:
+            return read_axis_label(default_keys[0], labels)
+    else:
+        return f"({', '.join([read_axis_label(a, labels, False) for a in default_keys])}) bin"

{wums-0.1.4 → wums-0.1.6}/wums.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: wums
-Version: 0.1.4
+Version: 0.1.6
 Summary: .
 Author-email: David Walter <david.walter@cern.ch>, Josh Bendavid <josh.bendavid@cern.ch>, Kenneth Long <kenneth.long@cern.ch>
 License: MIT