[RF] Make RooEvaluatorWrapper public in experimental interface

Exposing this class has become useful now, because it allows us to do
more low-level checks when developing AD in CMS Combine.

Author: guitargeek

roofit/roofitcore/src/RooEvaluatorWrapper.h renamed to roofit/roofitcore/inc/RooEvaluatorWrapper.h

@@ -16,22 +16,19 @@
 #define RooFit_RooEvaluatorWrapper_h
 
 #include <RooAbsData.h>
-#include <RooFit/EvalContext.h>
 #include <RooFit/Evaluator.h>
 #include <RooGlobalFunc.h>
-#include <RooHelpers.h>
 #include <RooRealProxy.h>
 #include <RooSetProxy.h>
 
-#include "RooFit/BatchModeDataHelpers.h"
-
-#include <chrono>
-#include <memory>
 #include <stack>
 
 class RooAbsArg;
 class RooAbsCategory;
 class RooAbsPdf;
+
+namespace RooFit::Experimental {
+
 class RooFuncWrapper;
 
 class RooEvaluatorWrapper final : public RooAbsReal {
@@ -93,6 +90,8 @@ class RooEvaluatorWrapper final : public RooAbsReal {
    std::map<RooFit::Detail::DataKey, std::span<const double>> _dataSpans;
 };
 
+} // namespace RooFit::Experimental
+
 #endif
 
 /// \endcond

roofit/roofitcore/res/RooFitImplHelpers.h

@@ -96,17 +96,15 @@ void getSortedComputationGraph(RooAbsArg const &func, RooArgSet &out);
 
 } // namespace RooHelpers
 
-namespace RooFit {
-namespace Detail {
+namespace RooFit::Detail {
 
 std::string makeValidVarName(std::string const &in);
 
 void replaceAll(std::string &inOut, std::string_view what, std::string_view with);
 
 std::string makeSliceCutString(RooArgSet const &sliceDataSet);
 
-} // namespace Detail
-} // namespace RooFit
+} // namespace RooFit::Detail
 
 double toDouble(const char *s);
 double toDouble(const std::string &s);

roofit/roofitcore/src/FitHelpers.cxx

@@ -806,7 +806,7 @@ std::unique_ptr<RooAbsReal> createNLL(RooAbsPdf &pdf, RooAbsData &data, const Ro
          nll = std::move(correctedNLL);
       }
 
-      auto nllWrapper = std::make_unique<RooEvaluatorWrapper>(
+      auto nllWrapper = std::make_unique<RooFit::Experimental::RooEvaluatorWrapper>(
          *nll, &data, evalBackend == RooFit::EvalBackend::Value::Cuda, rangeName ? rangeName : "", pdfClone.get(),
          takeGlobalObservablesFromData);
 

roofit/roofitcore/src/RooEvaluatorWrapper.cxx

@@ -25,16 +25,18 @@ Wraps a RooFit::Evaluator that evaluates a RooAbsReal back into a RooAbsReal.
 
 #include <RooAbsData.h>
 #include <RooAbsPdf.h>
-#include <RooConstVar.h>
-#include <RooHelpers.h>
 #include <RooMsgService.h>
 #include <RooRealVar.h>
 #include <RooSimultaneous.h>
 
+#include "RooFit/BatchModeDataHelpers.h"
+
 #include <TInterpreter.h>
 
 #include <fstream>
 
+namespace RooFit::Experimental {
+
 RooEvaluatorWrapper::RooEvaluatorWrapper(RooAbsReal &topNode, RooAbsData *data, bool useGPU,
                                          std::string const &rangeName, RooAbsPdf const *pdf,
                                          bool takeGlobalObservablesFromData)
@@ -519,4 +521,6 @@ void RooEvaluatorWrapper::writeDebugMacro(std::string const &filename) const
       return _funcWrapper->writeDebugMacro(filename);
 }
 
+} // namespace RooFit::Experimental
+
 /// \endcond

roofit/roofitcore/src/RooFit/BatchModeDataHelpers.h

@@ -18,22 +18,16 @@
 #include <RooFit/EvalContext.h>
 
 #include <ROOT/RSpan.hxx>
-#include <string_view>
 
 #include <functional>
 #include <map>
-#include <memory>
 #include <stack>
 #include <vector>
 
-class RooAbsCategory;
 class RooAbsData;
 class RooSimultaneous;
 
-class TNamed;
-
-namespace RooFit {
-namespace BatchModeDataHelpers {
+namespace RooFit::BatchModeDataHelpers {
 
 std::map<RooFit::Detail::DataKey, std::span<const double>>
 getDataSpans(RooAbsData const &data, std::string const &rangeName, RooSimultaneous const *simPdf, bool skipZeroWeights,
@@ -42,8 +36,7 @@ getDataSpans(RooAbsData const &data, std::string const &rangeName, RooSimultaneo
 std::map<RooFit::Detail::DataKey, std::size_t>
 determineOutputSizes(RooAbsArg const &topNode, std::function<int(RooFit::Detail::DataKey)> const &inputSizeFunc);
 
-} // namespace BatchModeDataHelpers
-} // namespace RooFit
+} // namespace RooFit::BatchModeDataHelpers
 
 #endif
 

roofit/roofitcore/test/testRooFuncWrapper.cxx

@@ -11,17 +11,15 @@
  * listed in LICENSE (http://roofit.sourceforge.net/license.txt)
  */
 
-#include <RooAbsData.h>
-#include <RooAbsPdf.h>
 #include <RooAddPdf.h>
 #include <RooBinWidthFunction.h>
 #include <RooCategory.h>
 #include <RooClassFactory.h>
 #include <RooDataHist.h>
 #include <RooDataSet.h>
+#include <RooEvaluatorWrapper.h>
 #include <RooExponential.h>
 #include <RooFitResult.h>
-#include <../src/RooEvaluatorWrapper.h>
 #include <RooGaussian.h>
 #include <RooHelpers.h>
 #include <RooHistFunc.h>
@@ -161,7 +159,7 @@ TEST_P(FactoryTest, NLLFit)
 
    // We want to use the generated code also for the nominal likelihood. Like
    // this, we make sure to validate also the NLL values of the generated code.
-   static_cast<RooEvaluatorWrapper &>(*nllFunc).setUseGeneratedFunctionCode(true);
+   static_cast<RooFit::Experimental::RooEvaluatorWrapper &>(*nllFunc).setUseGeneratedFunctionCode(true);
 
    double tol = _params._fitResultTolerance;