histcmp 0.6.6__tar.gz → 0.6.7__tar.gz

{histcmp-0.6.6 → histcmp-0.6.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: histcmp
-Version: 0.6.6
+Version: 0.6.7
 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)

{histcmp-0.6.6 → histcmp-0.6.7}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "histcmp"
-version = "0.6.6"
+version = "0.6.7"
 description = ""
 authors = ["Paul Gessinger <hello@paulgessinger.com>"]
 license = "MIT"

{histcmp-0.6.6 → histcmp-0.6.7}/src/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-0.6.6 → histcmp-0.6.7}/src/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)