[RF] Remove the deprecated RooFit code to be removed in ROOT 6.36

Execute on what was announced in the 6.34 release notes and indicated by deprecation macros and doxygen tags.
root-project · Nov 6, 2024 · 88b2fa1 · 88b2fa1
1 parent a91465f
commit 88b2fa1
Show file tree

Hide file tree

Showing 12 changed files with 6 additions and 503 deletions.
diff --git a/README/ReleaseNotes/v636/index.md b/README/ReleaseNotes/v636/index.md
@@ -14,6 +14,8 @@ The following people have contributed to this new version:
 
 ## Deprecation and Removal
 
+* The RooFit legacy interfaces that were deprecated in ROOT 6.34 and scheduled for removal in ROOT 6.36 are removed. See the RooFit section in the 6.34 release notes for a full list.
+
 ## Python Interface
 
 ## RDataFrame

diff --git a/roofit/histfactory/inc/RooStats/HistFactory/MakeModelAndMeasurementsFast.h b/roofit/histfactory/inc/RooStats/HistFactory/MakeModelAndMeasurementsFast.h
@@ -8,8 +8,6 @@
 #include "RooWorkspace.h"
 #include "RooPlot.h"
 
-#include <ROOT/RConfig.hxx> // for the R__DEPRECATED macro
-
 #include <iostream>
 #include <string>
 #include <vector>
@@ -24,18 +22,6 @@ namespace RooStats{
             HistoToWorkspaceFactoryFast::Configuration const& cfg={}
     );
 
-    void FormatFrameForLikelihood(RooPlot* frame, std::string xTitle=std::string("#sigma / #sigma_{SM}"), std::string yTitle=std::string("-log likelihood"))
-#ifndef ROOFIT_BUILDS_ITSELF
-        R__DEPRECATED(6,36, "Please write your own plotting code inspired by the hf001 tutorial.")
-#endif
-        ;
-    void FitModel(RooWorkspace *, std::string data_name="obsData")
-        R__DEPRECATED(6,36, "Please write your own plotting code inspired by the hf001 tutorial.");
-    void FitModelAndPlot(const std::string& measurementName, const std::string& fileNamePrefix, RooWorkspace &, std::string, std::string, TFile&, std::ostream&)
-#ifndef ROOFIT_BUILDS_ITSELF
-        R__DEPRECATED(6,36, "Please write your own plotting code inspired by the hf001 tutorial.")
-#endif
-        ;
   }
 }
 

diff --git a/roofit/histfactory/inc/RooStats/HistFactory/Measurement.h b/roofit/histfactory/inc/RooStats/HistFactory/Measurement.h
@@ -23,8 +23,6 @@
 #include "RooStats/HistFactory/Channel.h"
 #include "RooStats/HistFactory/Asimov.h"
 
-#include <ROOT/RConfig.hxx> // for the R__DEPRECATED macro
-
 class TFile;
 
 namespace RooStats{
@@ -97,22 +95,6 @@ class Measurement : public TNamed {
   int GetBinLow() { return fBinLow; }
   int GetBinHigh() { return fBinHigh; }
 
-  /// Do not produce any plots or tables, just save the model.
-  ///
-  /// \deprecated Will be removed in ROOT 6.36. ExportOnly() == true is the default since ROOT 6.34 and it can't be disabled anymore in 6.36.
-  void SetExportOnly( bool ExportOnly )
-#ifndef ROOFIT_BUILDS_ITSELF
-  R__DEPRECATED(6,36, "ExportOnly() == true is the default since ROOT 6.34 and it can't be disabled anymore in 6.36.")
-#endif
-  { fExportOnly = ExportOnly; }
-
-  /// \deprecated Will be removed in ROOT 6.36. ExportOnly() == true is the default since ROOT 6.34 and it can't be disabled anymore in 6.36.
-  bool GetExportOnly()
-#ifndef ROOFIT_BUILDS_ITSELF
-  R__DEPRECATED(6,36, "ExportOnly() == true is the default since ROOT 6.34 and it can't be disabled anymore in 6.36.")
-#endif
-  { return fExportOnly; }
-
   void PrintTree( std::ostream& = std::cout ); /// Print to a stream
   void PrintXML( std::string Directory="", std::string NewOutputPrefix="" );
 

diff --git a/roofit/histfactory/src/ConfigParser.cxx b/roofit/histfactory/src/ConfigParser.cxx
@@ -380,7 +380,8 @@ HistFactory::Measurement ConfigParser::CreateMeasurementFromDriverNode(TXMLNode
       } else if (curAttrName == "Mode") {
          cout << "\n INFO: Mode attribute is deprecated and no longer supported, will ignore\n";
       } else if (curAttrName == "ExportOnly") {
-         measurement.SetExportOnly(CheckTrueFalse(curAttrValue, "Measurement"));
+         // ignored
+         cxcoutIHF << "The \"ExportOnly\" attribute is ignored it is always \"true\" for any Measurement." << std::endl;
       } else {
          cxcoutEHF << "Found unknown XML attribute in Measurement: " << curAttrName << "\n";
          throw hf_exc();