histcmp 0.7.0__py3-none-any.whl → 0.8.1__py3-none-any.whl

histcmp/checks.py

@@ -41,23 +41,16 @@ class Status(Enum):
             return icons.failure
 
 
-ROOT.gInterpreter.Declare(
-    """
-auto MyChi2Test(const TH1* a, const TH1* b, Option_t* option){
-   Double_t chi2 = 0;
-   Int_t ndf = 0, igood = 0;
-   Double_t* res = 0;
-
-   Double_t prob = a->Chi2TestX(b,chi2,ndf,igood,option,res);
-
-   return std::make_tuple(prob, chi2, ndf, igood);
-}
-"""
-)
-
 
 chi2result = collections.namedtuple("chi2result", ["prob", "chi2", "ndf", "igood"])
 
+def chi2TestX(h1, h2, option="UU"):
+    root_chi2 = ctypes.c_double(0)
+    root_ndf = ctypes.c_int(0)
+    root_igood = ctypes.c_int(0)
+    res = ctypes.POINTER(ctypes.c_double)()
+    root_prob = h1.Chi2TestX(h2, root_chi2, root_ndf, root_igood, option, res)
+    return chi2result(root_prob, root_chi2.value, root_ndf.value, root_igood.value)
 
 class CompatCheck(ABC):
     def __init__(self, disabled: bool = False, suffix: Optional[str] = None):
@@ -225,9 +218,7 @@ class Chi2Test(ScoreThresholdCheck):
     @functools.cached_property
     def _result_v(self):
         with push_root_level(ROOT.kWarning):
-
-            t = ROOT.MyChi2Test(self.item_a, self.item_b, "UUOFUF")
-            res = chi2result(get[0](t), get[1](t), get[2](t), get[3](t))
+            res = chi2TestX(self.item_a, self.item_b, "UUOFUF")
             return res
 
     @property

histcmp/cli.py

@@ -1,5 +1,5 @@
 from pathlib import Path
-from typing import Optional
+from typing import Optional, Annotated
 
 import typer
 from rich.panel import Panel
@@ -24,18 +24,78 @@ app = typer.Typer()
 
 @app.command()
 def main(
-    config_path: Path = typer.Option(
-        None, "--config", "-c", dir_okay=False, exists=True
-    ),
-    monitored: Path = typer.Argument(..., exists=True, dir_okay=False),
-    reference: Path = typer.Argument(..., exists=True, dir_okay=False),
-    output: Optional[Path] = typer.Option(None, "-o", "--output", dir_okay=False),
-    plots: Optional[Path] = typer.Option(None, "-p", "--plots", file_okay=False),
-    label_monitored: Optional[str] = "monitored",
-    label_reference: Optional[str] = "reference",
-    title: str = "Histogram comparison",
-    _filter: str = typer.Option(".*", "-f", "--filter"),
-    format: str = "pdf",
+    monitored: Annotated[
+        Path, 
+        typer.Argument(
+            exists=True, 
+            dir_okay=False,
+            help="Path to the monitored histogram file"
+        )
+    ],
+    reference: Annotated[
+        Path, 
+        typer.Argument(
+            exists=True, 
+            dir_okay=False,
+            help="Path to the reference histogram file"
+        )
+    ],
+    config_path: Annotated[
+        Optional[Path],
+        typer.Option(
+            "--config", "-c", 
+            dir_okay=False, 
+            exists=True,
+            help="Path to configuration file"
+        )
+    ] = None,
+    output: Annotated[
+        Optional[Path], 
+        typer.Option(
+            "-o", "--output", 
+            dir_okay=False,
+            help="Path to output report file"
+        )
+    ] = None,
+    plots: Annotated[
+        Optional[Path], 
+        typer.Option(
+            "-p", "--plots", 
+            file_okay=False,
+            help="Directory to save comparison plots"
+        )
+    ] = None,
+    label_monitored: Annotated[
+        str, 
+        typer.Option(
+            help="Label for the monitored dataset in plots and reports"
+        )
+    ] = "monitored",
+    label_reference: Annotated[
+        str, 
+        typer.Option(
+            help="Label for the reference dataset in plots and reports"
+        )
+    ] = "reference",
+    title: Annotated[
+        str, 
+        typer.Option(
+            help="Title for the comparison report"
+        )
+    ] = "Histogram comparison",
+    _filter: Annotated[
+        str, 
+        typer.Option(
+            "-f", "--filter",
+            help="Regex filter pattern for histogram selection or path to a file with filters"
+        )
+    ] = ".*",
+    format: Annotated[
+        str, 
+        typer.Option(
+            help="Output format for plots (pdf, png, etc.)"
+        )
+    ] = "pdf",
 ):
     try:
         import ROOT

histcmp/config.py

@@ -4,8 +4,7 @@ import pydantic
 
 
 class BaseModel(pydantic.BaseModel):
-    class Config:
-        extra = "forbid"
+    model_config = pydantic.ConfigDict(extra="forbid")
 
 
 #  class CheckList(BaseModel):

{histcmp-0.7.0.dist-info → histcmp-0.8.1.dist-info}/METADATA

@@ -1,9 +1,9 @@
-Metadata-Version: 2.3
+Metadata-Version: 2.4
 Name: histcmp
-Version: 0.7.0
+Version: 0.8.1
 Summary: Compare histograms
 Author-email: Paul Gessinger <hello@paulgessinger.com>
-License: MIT
+License-Expression: MIT
 Requires-Python: >=3.10
 Requires-Dist: hist[plot]>=2.8.0
 Requires-Dist: jinja2>=3.1.4

{histcmp-0.7.0.dist-info → histcmp-0.8.1.dist-info}/RECORD

@@ -1,8 +1,8 @@
 histcmp/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-histcmp/checks.py,sha256=YspaeDDgX-Bij5C-OTks9OXeLkiEW0loA1XVyDjQMQo,13702
-histcmp/cli.py,sha256=cxLAfxEYe_6_StPgEU0X8BmplDyGYNf27mBzJNHY-LE,6167
+histcmp/checks.py,sha256=YImyh_wiXGx8F34Eck3i37TmvhYqt2OaZq8s91460_0,13671
+histcmp/cli.py,sha256=00NS8ko-oS5tpnuKEIFNnlUTL_abLzEEPoLRpp_zEe0,7405
 histcmp/compare.py,sha256=hRGyNAyENqDGYtPZ0Iq8o4uGNW7m_29ovscP8_wxfqI,10662
-histcmp/config.py,sha256=50_qpBba9WdINF7wVH4WnXuPW1b_q02f89b2J9Pu_Zk,500
+histcmp/config.py,sha256=Ml0DkWU_983cdn5k_fXI2J3br1xlmkf2j794R5FlEd0,512
 histcmp/console.py,sha256=fmJMQEAiRTUD5TkjaDH4ZkInnILl1MPqVPtN_SjCr_M,726
 histcmp/github.py,sha256=RyVGvH11FEzFyEFTZMfqqP-5YQb7OrNQmgQ0nJPIapQ,186
 histcmp/icons.py,sha256=EAPco9IQJgYXfdDW9eoqySnrnqXJAcyrk3XrQowfZMU,117
@@ -20,7 +20,7 @@ histcmp/static/css/bulma/bulma.css.map,sha256=039vv4Mje70ZS33gGww4tRQgCnEKI2C87R
 histcmp/static/css/bulma/bulma.min.css,sha256=UDtbUHqpVVfXmdJcQVU_bfDEr9xldf3Dbd0ShD0Uf_Y,206620
 histcmp/templates/base.html.j2,sha256=wz23ttE1NG4zshuC-aYp8DUsVUkHjkwRzfJHC3A0rkg,2088
 histcmp/templates/main.html.j2,sha256=1if-d2iZs7pZJz2NJzpSjh4jZY1v_PGz3gvA0i4ccxI,2399
-histcmp-0.7.0.dist-info/METADATA,sha256=jKoCtjpoU-85rjHTJuaY2JwexFFI25IIZaMUOCOfwUA,471
-histcmp-0.7.0.dist-info/WHEEL,sha256=C2FUgwZgiLbznR-k0b_5k3Ai_1aASOXDss3lzCUsUug,87
-histcmp-0.7.0.dist-info/entry_points.txt,sha256=FWonuHbW2m7wdqkj2ISHGSGzLD59zo-7P0pBsR8yTTc,44
-histcmp-0.7.0.dist-info/RECORD,,
+histcmp-0.8.1.dist-info/METADATA,sha256=wg-cMxbkYDY-0ZnYWCZA8iXzDBalu6cPyctPJi9YqmQ,482
+histcmp-0.8.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+histcmp-0.8.1.dist-info/entry_points.txt,sha256=FWonuHbW2m7wdqkj2ISHGSGzLD59zo-7P0pBsR8yTTc,44
+histcmp-0.8.1.dist-info/RECORD,,

{histcmp-0.7.0.dist-info → histcmp-0.8.1.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: hatchling 1.26.3
+Generator: hatchling 1.27.0
 Root-Is-Purelib: true
 Tag: py3-none-any