triggercalib 2.0.2__tar.gz → 2.0.4__tar.gz

{triggercalib-2.0.2 → triggercalib-2.0.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: triggercalib
-Version: 2.0.2
+Version: 2.0.4
 Summary: A turnkey package for estimating LHCb trigger efficiencies
 Project-URL: Homepage, https://gitlab.cern.ch/lhcb-rta/triggercalib/
 Project-URL: Documentation, https://triggercalib.docs.cern.ch/

{triggercalib-2.0.2 → triggercalib-2.0.4}/docs/releases.md

@@ -6,6 +6,10 @@ hide:
 # Release notes
 
 --8<--
+releases/v2/r0/v2r0p4.md
+
+releases/v2/r0/v2r0p3.md
+
 releases/v2/r0/v2r0p2.md
 
 releases/v2/r0/v2r0p1.md

triggercalib-2.0.4/releases/v2/r0/v2r0p3.md

@@ -0,0 +1,13 @@
+## TriggerCalib 2.0.3 (12-03-2026)
+
+TriggerCalib 2.0.3 is built from ``master`` and contains the following changes with respect to 2.0.0.
+
+Potentially breaking changes are labelled with :warning:
+
+
+### Bug fixes
+ - Fix LaTeX in docs (!97, contributed by @jherdiec)
+ - Fix spelling mistake in pyproject.toml (!98, contributed by @jherdiec)
+ - Fix handling of friend trees in v2.0 (!99)
+ - Remove print statement of branches (!102)
+ - Fix disabling of implicit MT for friend trees (!103)

triggercalib-2.0.4/releases/v2/r0/v2r0p4.md

@@ -0,0 +1,14 @@
+## TriggerCalib 2.0.4 (18-03-2026)
+
+TriggerCalib 2.0.4 is built from ``master`` and contains the following changes with respect to 2.0.0.
+
+Potentially breaking changes are labelled with :warning:
+
+
+### Bug fixes
+ - Fix LaTeX in docs (!97, contributed by @jherdiec)
+ - Fix spelling mistake in pyproject.toml (!98, contributed by @jherdiec)
+ - Fix handling of friend trees in v2.0 (!99)
+ - Remove print statement of branches (!102)
+ - Fix disabling of implicit MT for friend trees (!103)
+ - Handle finding of RVec weights (!104)

{triggercalib-2.0.2 → triggercalib-2.0.4}/src/triggercalib/commands/fit_and_count.py

@@ -67,7 +67,7 @@ def main(args=None):
         ws_observable = None
         ws_pdf = None
 
-    if args.friend_path is None and args.friend_tree is None:
+    if args.friend_path is not None or args.friend_tree is not None:
         print("INFO: disabling implicit multi-threading")
         R.DisableImplicitMT()
     elif args.threads > 1:

{triggercalib-2.0.2 → triggercalib-2.0.4}/src/triggercalib/commands/sideband.py

@@ -50,7 +50,7 @@ def main(args=None):
         args["weight"] = args.get("weight", None)
         args = SimpleNamespace(**args)
 
-    if args.friend_path is None and args.friend_tree is None:
+    if args.friend_path is not None or args.friend_tree is not None:
         print("INFO: disabling implicit multi-threading")
         R.DisableImplicitMT()
     elif args.threads > 1:

{triggercalib-2.0.2 → triggercalib-2.0.4}/src/triggercalib/commands/sweights.py

@@ -67,7 +67,7 @@ def main(args=None):
         ws_observable = None
         ws_pdf = None
 
-    if args.friend_path is None and args.friend_tree is None:
+    if args.friend_path is not None or args.friend_tree is not None:
         print("INFO: disabling implicit multi-threading")
         R.DisableImplicitMT()
     elif args.threads > 1:

{triggercalib-2.0.2 → triggercalib-2.0.4}/src/triggercalib/core/FitCountEff.py

@@ -137,8 +137,8 @@ class FitCountEff(BaseEff):
                 self.rdf = self.rdf.Define(weight_branch, "*".join(self.weight))
             else:
                 self.rdf = self.rdf.Define(weight_branch, self.weight)
-            observables_list += [weight_branch] + self.weight
-            print("INFO: Applying weight(s) '{self.weight}'")
+            observables_list += [weight_branch]
+            print(f"INFO: Applying weight(s) '{self.weight}'")
         else:
             weight_branch = None
 

{triggercalib-2.0.2 → triggercalib-2.0.4}/src/triggercalib/core/SWeightsEff.py

@@ -148,7 +148,7 @@ class SWeightsEff(BaseEff):
                 self.rdf = self.rdf.Define(weight_branch, "*".join(self.weight))
             else:
                 self.rdf = self.rdf.Define(weight_branch, self.weight)
-            observables_list += [weight_branch]  # + self.weight
+            observables_list += [weight_branch]
         else:
             weight_branch = None
 

{triggercalib-2.0.2 → triggercalib-2.0.4}/src/triggercalib/utils/io.py

@@ -119,11 +119,21 @@ def is_in_rdf(branch: Union[str, List[str]], rdf: R.RDataFrame):
     Returns:
         (bool): True if the branch is in the RDataFrame
     """
-
     rdf_branches = [str(col) for col in rdf.GetColumnNames()]
-    if isinstance(branch, List):
-        return all([b in rdf_branches for b in branch])
-    return branch in rdf_branches
+
+    if not isinstance(branch, List):
+        branch = [branch]
+
+    clean_branches = []
+    for b in branch:
+        if b.endswith(
+            "]"
+        ):  # Handles the possibility of RVec weights, which would be referenced by [i]
+            clean_branches.append(b.rsplit("[", 1)[0])
+        else:
+            clean_branches.append(b)
+
+    return all([b in rdf_branches for b in clean_branches])
 
 
 def write_config(config: dict, path: str):

{triggercalib-2.0.2 → triggercalib-2.0.4}/src/triggercalib/version.py

@@ -1,4 +1,4 @@
 # file generated by setuptools_scm
 # don't change, don't track in version control
-__version__ = version = '2.0.2'
-__version_tuple__ = version_tuple = (2, 0, 2)
+__version__ = version = '2.0.4'
+__version_tuple__ = version_tuple = (2, 0, 4)