[Python] Apply suggestions by ruff

guitargeek · guitargeek · commit 86379179cc0c · 2025-04-02T13:11:52.000+02:00
diff --git a/bindings/pyroot/pythonizations/python/ROOT/_pythonization/_roofit/_rooglobalfunc.py b/bindings/pyroot/pythonizations/python/ROOT/_pythonization/_roofit/_rooglobalfunc.py
@@ -37,7 +37,7 @@
 */
 """
 
-from ._utils import _kwargs_to_roocmdargs, _dict_to_flat_map, cpp_signature
+from ._utils import _dict_to_flat_map, _kwargs_to_roocmdargs, cpp_signature
 
 
 @cpp_signature(
diff --git a/bindings/pyroot/pythonizations/python/ROOT/_pythonization/_th1.py b/bindings/pyroot/pythonizations/python/ROOT/_pythonization/_th1.py
@@ -166,8 +166,13 @@ def myGaussian(x, pars):
 \endpythondoc
 """
 
+from ROOT._pythonization._memory_utils import (
+    _SetDirectory_SetOwnership,
+    inject_clone_releasing_ownership,
+    inject_constructor_releasing_ownership,
+)
+
 from . import pythonization
-from ROOT._pythonization._memory_utils import inject_constructor_releasing_ownership, inject_clone_releasing_ownership, _SetDirectory_SetOwnership
 
 # Multiplication by constant
 
@@ -204,7 +209,7 @@ def _FillWithNumpyArray(self, *args):
     # If the first argument has no len() method, we don't even need to consider
     # the array code path.
     if not isinstance(args[0], collections.abc.Sized):
-       return self._Fill(*args)
+        return self._Fill(*args)
 
     import numpy as np
 
diff --git a/tutorials/analysis/dataframe/df036_missingBranches.py b/tutorials/analysis/dataframe/df036_missingBranches.py
@@ -24,16 +24,16 @@ class DatasetContext:
     filenames = [
         "df036_missingBranches_py_file_1.root",
         "df036_missingBranches_py_file_2.root",
-        "df036_missingBranches_py_file_3.root"
+        "df036_missingBranches_py_file_3.root",
     ]
     treenames = ["tree_1", "tree_2", "tree_3"]
     nentries = 5
 
     def __init__(self):
-        with ROOT.TFile(self.filenames[0], "RECREATE") as f:
+        with ROOT.TFile(self.filenames[0], "RECREATE"):
             t = ROOT.TTree(self.treenames[0], self.treenames[0])
-            x = array.array('i', [0]) # any array can also be a numpy array
-            y = array.array('i', [0])
+            x = array.array("i", [0])  # any array can also be a numpy array
+            y = array.array("i", [0])
             t.Branch("x", x, "x/I")
             t.Branch("y", y, "y/I")
 
@@ -44,9 +44,9 @@ def __init__(self):
 
             t.Write()
 
-        with ROOT.TFile(self.filenames[1], "RECREATE") as f:
+        with ROOT.TFile(self.filenames[1], "RECREATE"):
             t = ROOT.TTree(self.treenames[1], self.treenames[1])
-            y = array.array('i', [0]) # any array can also be a numpy array
+            y = array.array("i", [0])  # any array can also be a numpy array
             t.Branch("y", y, "y/I")
 
             for i in range(1, self.nentries + 1):
@@ -55,9 +55,9 @@ def __init__(self):
 
             t.Write()
 
-        with ROOT.TFile(self.filenames[2], "RECREATE") as f:
+        with ROOT.TFile(self.filenames[2], "RECREATE"):
             t = ROOT.TTree(self.treenames[2], self.treenames[2])
-            x = array.array('i', [0]) # any array can also be a numpy array
+            x = array.array("i", [0])  # any array can also be a numpy array
             t.Branch("x", x, "x/I")
 
             for i in range(1, self.nentries + 1):
@@ -101,11 +101,7 @@ def df036_missingBranches(dataset: DatasetContext):
 
     # Example 2: provide a default value for branch y, but skip events where
     # branch x is missing
-    display_2 = (
-        df.DefaultValueFor("y", default_value)
-        .FilterAvailable("x")
-        .Display(columnList=("x", "y"), nRows=15)
-    )
+    display_2 = df.DefaultValueFor("y", default_value).FilterAvailable("x").Display(columnList=("x", "y"), nRows=15)
 
     # Example 3: only keep events where branch y is missing and display values for branch x
     display_3 = df.FilterMissing("y").Display(columnList=("x",), nRows=15)
diff --git a/tutorials/analysis/dataframe/df037_TTreeEventMatching.py b/tutorials/analysis/dataframe/df037_TTreeEventMatching.py
@@ -30,10 +30,10 @@ class DatasetContext:
     aux_tree_name_2 = "auxdata_2"
 
     def __init__(self):
-        with ROOT.TFile(self.main_file, "RECREATE") as f:
+        with ROOT.TFile(self.main_file, "RECREATE"):
             main_tree = ROOT.TTree(self.main_tree_name, self.main_tree_name)
-            idx = array.array('i', [0]) # any array can also be a numpy array
-            x = array.array('i', [0])
+            idx = array.array("i", [0])  # any array can also be a numpy array
+            x = array.array("i", [0])
             main_tree.Branch("idx", idx, "idx/I")
             main_tree.Branch("x", x, "x/I")
 
@@ -50,10 +50,10 @@ def __init__(self):
             main_tree.Write()
 
         # The first auxiliary file has matching indices 1 and 2, but not 3
-        with ROOT.TFile(self.aux_file_1, "RECREATE") as f:
+        with ROOT.TFile(self.aux_file_1, "RECREATE"):
             aux_tree_1 = ROOT.TTree(self.aux_tree_name_1, self.aux_tree_name_1)
-            idx = array.array('i', [0]) # any array can also be a numpy array
-            y = array.array('i', [0])
+            idx = array.array("i", [0])  # any array can also be a numpy array
+            y = array.array("i", [0])
             aux_tree_1.Branch("idx", idx, "idx/I")
             aux_tree_1.Branch("y", y, "y/I")
 
@@ -67,10 +67,10 @@ def __init__(self):
             aux_tree_1.Write()
 
         # The second auxiliary file has matching indices 1 and 3, but not 2
-        with ROOT.TFile(self.aux_file_2, "RECREATE") as f:
+        with ROOT.TFile(self.aux_file_2, "RECREATE"):
             aux_tree_2 = ROOT.TTree(self.aux_tree_name_2, self.aux_tree_name_2)
-            idx = array.array('i', [0]) # any array can also be a numpy array
-            z = array.array('i', [0])
+            idx = array.array("i", [0])  # any array can also be a numpy array
+            z = array.array("i", [0])
             aux_tree_2.Branch("idx", idx, "idx/I")
             aux_tree_2.Branch("z", z, "z/I")
 
@@ -132,8 +132,7 @@ def df037_TTreeEventMatching(dataset: DatasetContext):
         .DefaultValueFor(aux_tree_1_coly, default_value)
         .DefaultValueFor(aux_tree_2_colidx, default_value)
         .DefaultValueFor(aux_tree_2_colz, default_value)
-        .Display(
-            ("idx", aux_tree_1_colidx, aux_tree_2_colidx, "x", aux_tree_1_coly, aux_tree_2_colz))
+        .Display(("idx", aux_tree_1_colidx, aux_tree_2_colidx, "x", aux_tree_1_coly, aux_tree_2_colz))
     )
 
     # Example 2: skip the entire entry when there was no match for a column
@@ -143,12 +142,11 @@ def df037_TTreeEventMatching(dataset: DatasetContext):
         df.DefaultValueFor(aux_tree_2_colidx, default_value)
         .DefaultValueFor(aux_tree_2_colz, default_value)
         .FilterAvailable(aux_tree_1_coly)
-        .Display(
-                ("idx", aux_tree_1_colidx, aux_tree_2_colidx, "x", aux_tree_1_coly, aux_tree_2_colz))
+        .Display(("idx", aux_tree_1_colidx, aux_tree_2_colidx, "x", aux_tree_1_coly, aux_tree_2_colz))
     )
 
-   # Example 3: Keep entries from the main tree for which there is no
-   # corresponding match in entries of the first auxiliary tree
+    # Example 3: Keep entries from the main tree for which there is no
+    # corresponding match in entries of the first auxiliary tree
     display_3 = df.FilterMissing(aux_tree_1_colidx).Display(("idx", "x"))
 
     print("Example 1: provide default values for all columns")
diff --git a/tutorials/roofit/roostats/StandardHypoTestDemo.py b/tutorials/roofit/roostats/StandardHypoTestDemo.py
@@ -29,8 +29,8 @@
 # \author Lorenzo Moneta (C++ version), and P. P. (Python translation)
 
 import array
-from warnings import warn
 from gc import collect
+from warnings import warn
 
 import ROOT
 
@@ -151,7 +151,7 @@ def StandardHypoTestDemo(
     # get the workspace out of the file
     w = file.Get(workspaceName)
     if not w:
-        print(f"workspace not found")
+        print("workspace not found")
         return
 
     w.Print()
@@ -165,7 +165,7 @@ def StandardHypoTestDemo(
     # make sure ingredients are found
     if not data or not sbModel:
         w.Print()
-        print(f"data or ModelConfig was not found")
+        print("data or ModelConfig was not found")
         return
 
     # make b model
@@ -176,14 +176,14 @@ def StandardHypoTestDemo(
     if noSystematics:
         nuisPar = sbModel.GetNuisanceParameters()
         if nuisPar and nuisPar.getSize() > 0:
-            print(f"StandardHypoTestInvDemo")
+            print("StandardHypoTestInvDemo")
             print("  -  Switch off all systematics by setting them constant to their initial values")
-            RooStats.SetAllConstant(nuisPar)
+            ROOT.RooStats.SetAllConstant(nuisPar)
 
         if bModel:
             bnuisPar = bModel.GetNuisanceParameters()
             if bnuisPar:
-                RooStats.SetAllConstant(bnuisPar)
+                ROOT.RooStats.SetAllConstant(bnuisPar)
 
     if not bModel:
         ROOT.Info("StandardHypoTestInvDemo", "The background model {} does not exist".format(modelBName))
@@ -298,7 +298,7 @@ def StandardHypoTestDemo(
                     nuisPdf.GetName(),
                 )
             else:
-                Error(
+                ROOT.Error(
                     "StandardHypoTestDemo",
                     "Cannot run Hybrid calculator because no prior on the nuisance parameter is "
                     "specified or can be derived",
@@ -396,8 +396,8 @@ def StandardHypoTestDemo(
         htExp = ROOT.RooStats.HypoTestResult("Expected Result")
         htExp.Append(htr)
         # find quantiles in alt (S+B) distribution
-        p = array.array('d', [i for i in range(5)])
-        q = array.array('d', [0.5 for i in range(5)])
+        p = array.array("d", [i for i in range(5)])
+        q = array.array("d", [0.5 for i in range(5)])
         for i in range(5):
             sig = -2 + i
             p[i] = ROOT.Math.normal_cdf(sig, 1)
diff --git a/tutorials/roofit/roostats/rs_numberCountingCombination.py b/tutorials/roofit/roostats/rs_numberCountingCombination.py
