Address code to be removed in 6.44

README/ReleaseNotes/v644/index.md

@@ -17,7 +17,9 @@ The following people have contributed to this new version:
 
 * `TClassEdit::ESTLType`, `TDictionary::ESTLType`, `TStreamerElement::ESTLType` were redundant enums and have been removed. Please use `ROOT::ESTLType` instead.
 * The `ROOT.SetHeuristicMemoryPolicy` method has been removed. This was introduced in 6.40 as a temporary debugging tool to aid users in addressing the changes in memory ownership heuristics.
-* A `RooArgSet` cannot be constructed with an implicit conversion from Python `set` anymore.
+* A `RooArgSet` cannot be constructed with an implicit conversion from Python `set` anymore. The problem is that Python sets are unordered while RooArgSets are ordered, and this mismatch can lead to subtle problems later on. Prefer conversion from Python lists or tuples, which are ordered too.
+* The `RooFit::BatchMode` command argument has been removed, use `RooFit::EvalBackend` instead.
+* The `RooTrace` class was untested and is now removed. For memory debugging, please use general-purpose tools such as AddressSanitizer or Valgrind instead.
 
 ## Python Interface
 

bindings/pyroot/pythonizations/test/roofit.py

@@ -623,7 +623,7 @@ def test_ignoring_out_of_range(self):
             if is_in_range:
                 n_in_range = n_in_range + 1
 
-        dataset_numpy = ROOT.RooDataSet.from_numpy(data, {x, cat}, name="dataSetNumpy")
+        dataset_numpy = ROOT.RooDataSet.from_numpy(data, [x, cat], name="dataSetNumpy")
 
         self.assertEqual(dataset_numpy.numEntries(), n_in_range)
 
@@ -699,12 +699,12 @@ def test_roodataset_link(self):
 
         n_events = 1000
 
-        data = g.generate({x}, NumEvents=n_events)
+        data = g.generate([x], NumEvents=n_events)
 
         sample = ROOT.RooCategory("cat", "cat")
         sample.defineType("cat_0")
 
-        data_2 = ROOT.RooDataSet("data_2", "data_2", {x}, Index=sample, Link={"cat_0": data})
+        data_2 = ROOT.RooDataSet("data_2", "data_2", [x], Index=sample, Link={"cat_0": data})
 
         self.assertEqual(data_2.numEntries(), n_events)
 

bindings/pyroot/pythonizations/test/root_module.py

@@ -60,7 +60,7 @@
         import ROOT
 
         v = ROOT.__version__
         self.assertTrue(type(v) == str)
         # Fix for #14068: we take into account the different way of expressing the version
         # number before and starting with 6.32.00
         self.assertIn("/", v) if ROOT.gROOT.GetVersionInt() < 63200 else self.assertNotIn("/", v)
@@ -97,13 +97,13 @@
         #
 
         if root_module_has("RDF.Experimental.Distributed"):
             import ROOT.RDF.Distributed
 
         if root_module_has("RNTuple"):
             from ROOT import RNTuple
 
         if root_module_has("RooFit.Evaluator"):
             from ROOT.RooFit import Evaluator
 
     def test_deprecated_features(self):
         """
@@ -129,6 +129,10 @@
         if version >= (6, 43, 0) and hasattr(ROOT, "RooArgSet"):
             # Verify that the implicit conversion from Python set to RooArgSet
             # is gone
+            # Currently the test will pass i.e. the Pythonization raises TypeError, but not for the correct reason.
+            # It will print errors coming from trying all overloads of the RooDataSet constructor, while we would expect
+            # the TypeError coming from the _rooargset.py pythonization.
+            # TODO: investigate cause and fix.
             x = ROOT.RooRealVar("x", "x", 1.0)
             y = ROOT.RooRealVar("y", "y", -1.0)
             with self.assertRaises(TypeError):

roofit/roofitcore/CMakeLists.txt

@@ -246,7 +246,6 @@ set(ROOFITCORE_HEADERS
   RooTable.h
   RooTemplateProxy.h
   RooThresholdCategory.h
-  RooTrace.h
   RooTreeDataStore.h
   RooTruthModel.h
   RooUniformBinning.h
@@ -445,7 +444,6 @@ ROOT_STANDARD_LIBRARY_PACKAGE(RooFitCore
     src/RooTFormulaEvaluator.cxx
     src/RooTObjWrap.cxx
     src/RooThresholdCategory.cxx
-    src/RooTrace.cxx
     src/RooTreeDataStore.cxx
     src/RooTruthModel.cxx
     src/RooUniformBinning.cxx

roofit/roofitcore/inc/LinkDef.h

@@ -236,7 +236,6 @@
          }\
          }";
 #pragma link C++ class RooTObjWrap+ ;
-#pragma link C++ class RooTrace+ ;
 #pragma link C++ class RooUniformBinning+ ;
 #pragma link C++ class RooSimultaneous+ ;
 #pragma link C++ class RooRealSumPdf+ ;

roofit/roofitcore/inc/RooGlobalFunc.h

@@ -242,16 +242,6 @@ RooCmdArg Parallelize(int nWorkers) ;
 RooCmdArg ModularL(bool flag=false) ;
 RooCmdArg TimingAnalysis(bool timingAnalysis) ;
 
-RooCmdArg BatchMode(std::string const &batchMode = "cpu")
-   R__DEPRECATED(6, 44, "Use EvalBackend() instead of BatchMode().");
-// The const char * overload is necessary, otherwise the compiler will cast a
-// C-Style string to a bool and choose the BatchMode(bool) overload if one
-// calls for example BatchMode("off").
-RooCmdArg BatchMode(const char *batchMode)
-   R__DEPRECATED(6, 44, "Use EvalBackend() instead of BatchMode().");
-RooCmdArg BatchMode(bool batchModeOn)
-   R__DEPRECATED(6, 44, "Use EvalBackend() instead of BatchMode().");
-
 RooCmdArg IntegrateBins(double precision);
 
 // RooAbsPdf::fitTo arguments