histcmp 0.6.6__py3-none-any.whl → 0.6.8__py3-none-any.whl

histcmp/checks.py

@@ -8,6 +8,7 @@ import functools
 from enum import Enum
 from typing import Tuple, Optional, List
 import warnings
+from cppyy.gbl.std import get
 
 import ROOT
 
@@ -49,15 +50,13 @@ auto MyChi2Test(const TH1* a, const TH1* b, Option_t* option){
 
    Double_t prob = a->Chi2TestX(b,chi2,ndf,igood,option,res);
 
-   return std::make_tuple(prob, chi2, ndf, igood, res);
+   return std::make_tuple(prob, chi2, ndf, igood);
 }
 """
 )
 
 
-chi2result = collections.namedtuple(
-    "chi2result", ["prob", "chi2", "ndf", "igood", "res"]
-)
+chi2result = collections.namedtuple("chi2result", ["prob", "chi2", "ndf", "igood"])
 
 
 class CompatCheck(ABC):
@@ -197,7 +196,7 @@ class KolmogorovTest(ScoreThresholdCheck):
         int_a, err_a = integralAndError(self.item_a)
         int_b, err_b = integralAndError(self.item_b)
         values = numpy.array([int_a, int_b, err_a, err_b])
-        if numpy.any(numpy.isnan(values)) or numpy.any(values==0):
+        if numpy.any(numpy.isnan(values)) or numpy.any(values == 0):
             return False
 
         if self.score == 0.0:
@@ -226,9 +225,10 @@ class Chi2Test(ScoreThresholdCheck):
     @functools.cached_property
     def _result_v(self):
         with push_root_level(ROOT.kWarning):
-            self._result_v = chi2result(*ROOT.MyChi2Test(self.item_a, self.item_b, "UUOFUF"))
 
-        return self._result_v
+            t = ROOT.MyChi2Test(self.item_a, self.item_b, "UUOFUF")
+            res = chi2result(get[0](t), get[1](t), get[2](t), get[3](t))
+            return res
 
     @property
     def score(self) -> float:
@@ -285,7 +285,7 @@ class IntegralCheck(ScoreThresholdCheck):
 
         if self.err_a > 0.0:
             self.sigma = numpy.abs(self.int_a - self.int_b) / numpy.sqrt(
-                self.err_a ** 2 + self.err_b ** 2
+                self.err_a**2 + self.err_b**2
             )
 
     @property
@@ -418,7 +418,7 @@ class ResidualCheck(CompatCheck):
         val, _ = get_bin_content_error(self.residual)
         _, err_a = get_bin_content_error(self.item_a)
         _, err_b = get_bin_content_error(self.item_b)
-        err = numpy.sqrt(err_a ** 2 + err_b ** 2)
+        err = numpy.sqrt(err_a**2 + err_b**2)
         m = err > 0
         pull = numpy.zeros_like(val)
         pull[m] = numpy.abs(val[m]) / err[m]

histcmp/plot.py

@@ -42,6 +42,9 @@ def plot_ratio_eff(a, a_err, b, b_err, label_a, label_b):
             2, 1, gridspec_kw=dict(height_ratios=[2, 0.5], hspace=0.05)
         )
 
+        a_err = numpy.maximum(0, a_err)
+        b_err = numpy.maximum(0, b_err)
+
         mplhep.histplot(a.values(), a.axes[0].edges, yerr=a_err, ax=ax, label=label_a)
         mplhep.histplot(b.values(), b.axes[0].edges, yerr=b_err, ax=ax, label=label_b)
 

{histcmp-0.6.6.dist-info → histcmp-0.6.8.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: histcmp
-Version: 0.6.6
+Version: 0.6.8
 Summary: 
 License: MIT
 Author: Paul Gessinger
@@ -11,6 +11,7 @@ Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
 Requires-Dist: Jinja2 (>=3.0.3,<4.0.0)
 Requires-Dist: PyYAML (>=6.0,<7.0)
 Requires-Dist: click (>=8.1.4,<9.0.0)
@@ -19,7 +20,7 @@ Requires-Dist: matplotlib (>=3.5.1,<4.0.0)
 Requires-Dist: mplhep (>=0.3.26,<0.4.0)
 Requires-Dist: numpy (>=1.25.0,<2.0.0)
 Requires-Dist: pandas (>=2.0.3,<3.0.0)
-Requires-Dist: pydantic (>=1.9.0,<2.0.0)
+Requires-Dist: pydantic (>=2.0.0,<3.0.0)
 Requires-Dist: requests (>=2.27.1,<3.0.0)
 Requires-Dist: rich (>=13.4.2,<14.0.0)
 Requires-Dist: scipy (>=1.9.1,<2.0.0)

{histcmp-0.6.6.dist-info → histcmp-0.6.8.dist-info}/RECORD

@@ -1,12 +1,12 @@
 histcmp/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-histcmp/checks.py,sha256=DalWSd1PsXJRYTIZ2eUY9oY4zdVqFDu0Lh33GOAQZ0g,13656
+histcmp/checks.py,sha256=YspaeDDgX-Bij5C-OTks9OXeLkiEW0loA1XVyDjQMQo,13702
 histcmp/cli.py,sha256=cxLAfxEYe_6_StPgEU0X8BmplDyGYNf27mBzJNHY-LE,6167
 histcmp/compare.py,sha256=hRGyNAyENqDGYtPZ0Iq8o4uGNW7m_29ovscP8_wxfqI,10662
 histcmp/config.py,sha256=50_qpBba9WdINF7wVH4WnXuPW1b_q02f89b2J9Pu_Zk,500
 histcmp/console.py,sha256=fmJMQEAiRTUD5TkjaDH4ZkInnILl1MPqVPtN_SjCr_M,726
 histcmp/github.py,sha256=RyVGvH11FEzFyEFTZMfqqP-5YQb7OrNQmgQ0nJPIapQ,186
 histcmp/icons.py,sha256=EAPco9IQJgYXfdDW9eoqySnrnqXJAcyrk3XrQowfZMU,117
-histcmp/plot.py,sha256=2QEUAKgzesYVaUwFHAvVWxK4RSomajd5teb5X8avlu4,4949
+histcmp/plot.py,sha256=13mP_vx-TNPKlTRZWEl8PZpPwtDQ5P-6xfHYkmrcMd4,5030
 histcmp/report.py,sha256=lTPylmzvda0y_NSZlESQiZPFpOgt8-sKiTYlwuQe2eQ,3773
 histcmp/root_helpers.py,sha256=9SWKW9gJIXUGRqJwjSMaLw5fgz_0eRtdqDpyt-z1wRQ,5794
 histcmp/static/alpinejs.intersect.min.js,sha256=VO1OjUyzsV_A9We8L7z25QSZtNou6pqwQdxv60zx0a8,878
@@ -20,7 +20,7 @@ histcmp/static/css/bulma/bulma.min.css,sha256=UDtbUHqpVVfXmdJcQVU_bfDEr9xldf3Dbd
 histcmp/static/css/main.css,sha256=1ZDflGFMNvsFkf4pSDFYFQ-Ob90i4ahOV0YNXvJUL40,315
 histcmp/templates/base.html.j2,sha256=wz23ttE1NG4zshuC-aYp8DUsVUkHjkwRzfJHC3A0rkg,2088
 histcmp/templates/main.html.j2,sha256=1if-d2iZs7pZJz2NJzpSjh4jZY1v_PGz3gvA0i4ccxI,2399
-histcmp-0.6.6.dist-info/METADATA,sha256=kuGE-ICGwaKJKgMenB_ByzvStMt2dTVS1swy4Ae0D_Y,964
-histcmp-0.6.6.dist-info/WHEEL,sha256=Zb28QaM1gQi8f4VCBhsUklF61CTlNYfs9YAZn-TOGFk,88
-histcmp-0.6.6.dist-info/entry_points.txt,sha256=zK4mzX2VpqdjZVEDpOJJ3Na2ePGRBz-9x5knQx_EaoI,43
-histcmp-0.6.6.dist-info/RECORD,,
+histcmp-0.6.8.dist-info/METADATA,sha256=k5a9mk6PPA_B8WnSP-eqG6JcmnjzhyGPc6X4eBYwa8Q,1015
+histcmp-0.6.8.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+histcmp-0.6.8.dist-info/entry_points.txt,sha256=zK4mzX2VpqdjZVEDpOJJ3Na2ePGRBz-9x5knQx_EaoI,43
+histcmp-0.6.8.dist-info/RECORD,,

{histcmp-0.6.6.dist-info → histcmp-0.6.8.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: poetry-core 1.6.1
+Generator: poetry-core 1.9.0
 Root-Is-Purelib: true
 Tag: py3-none-any