[RF] Rename RooAbsData::plotOn() implementation to plotOnImpl()

The `protected` implementation should have a different name from the
public function name. Otherwise, it will also be considered in the cppyy
overload resolution, which will not go well because it uses the internal
`RooAbsData::PlotOpt` type for the second argument, which is also
protected.

This also simplifies the Pythonization a bit, because the user-facing
`plotOn()` method only needs to be available in the RooAbsData base
class, and not be brought into the derived RooDataHist class via `using`
statements because the public interface would be shadowed by the
protected internal overload.

Author: guitargeek

bindings/pyroot/pythonizations/python/ROOT/_pythonization/_roofit/_roodatahist.py

@@ -47,12 +47,6 @@ def __init__(self, *args, **kwargs):
         args, kwargs = _kwargs_to_roocmdargs(*args, **kwargs)
         self._init(*args, **kwargs)
 
-    def plotOn(self, *args, **kwargs):
-        # Redefinition of `RooDataHist.plotOn` for keyword arguments.
-        # The keywords must correspond to the CmdArg of the `plotOn` function.
-        args, kwargs = _kwargs_to_roocmdargs(*args, **kwargs)
-        return self._plotOn(*args, **kwargs)
-
     @property
     def shape(self):
         shape = []

roofit/roofitcore/inc/RooAbsData.h

@@ -330,7 +330,7 @@ class RooAbsData : public TNamed, public RooPrintable {
                                        double scaleFactor);
 
  // PlotOn implementation
-  virtual RooPlot *plotOn(RooPlot *frame, PlotOpt o) const ;
+  virtual RooPlot *plotOnImpl(RooPlot *frame, PlotOpt o) const ;
   virtual RooPlot *plotAsymOn(RooPlot* frame, const RooAbsCategoryLValue& asymCat, PlotOpt o) const ;
   virtual RooPlot *plotEffOn(RooPlot* frame, const RooAbsCategoryLValue& effCat, PlotOpt o) const ;
 

roofit/roofitcore/inc/RooDataHist.h

@@ -131,8 +131,7 @@ class RooDataHist : public RooAbsData, public RooDirItem {
     return (lo+hi)/2 ;
   }
 
-  using RooAbsData::plotOn ;
-  RooPlot *plotOn(RooPlot *frame, PlotOpt o) const override;
+  RooPlot *plotOnImpl(RooPlot *frame, PlotOpt o) const override;
 
   void reset() override;
 

roofit/roofitcore/src/RooAbsData.cxx

@@ -1818,7 +1818,7 @@ RooPlot* RooAbsData::plotOn(RooPlot* frame, const RooLinkedList& argList) const
 
   RooPlot* ret ;
   if (!asymCat && !effCat) {
-    ret = plotOn(frame,o) ;
+    ret = plotOnImpl(frame,o) ;
   } else if (asymCat) {
     ret = plotAsymOn(frame,*asymCat,o) ;
   } else {
@@ -1861,7 +1861,7 @@ RooPlot* RooAbsData::plotOn(RooPlot* frame, const RooLinkedList& argList) const
 ///
 /// The drawOptions are passed to the TH1::Draw() method.
 /// \see RooAbsData::plotOn(RooPlot*,const RooLinkedList&) const
-RooPlot *RooAbsData::plotOn(RooPlot *frame, PlotOpt o) const
+RooPlot *RooAbsData::plotOnImpl(RooPlot *frame, PlotOpt o) const
 {
   if(nullptr == frame) {
     coutE(Plotting) << ClassName() << "::" << GetName() << ":plotOn: frame is null" << std::endl;

roofit/roofitcore/src/RooDataHist.cxx

@@ -1095,11 +1095,11 @@ std::size_t RooDataHist::calcTreeIndex(const RooAbsCollection& coords, bool fast
 /// frame in mode specified by plot options 'o'. The main purpose of
 /// this function is to match the specified binning on 'o' to the
 /// internal binning of the plot observable in this RooDataHist.
-/// \note see RooAbsData::plotOn() for plotting options.
-RooPlot *RooDataHist::plotOn(RooPlot *frame, PlotOpt o) const
+/// \note see RooAbsData::plotOnImpl() for plotting options.
+RooPlot *RooDataHist::plotOnImpl(RooPlot *frame, PlotOpt o) const
 {
   checkInit() ;
-  if (o.bins) return RooAbsData::plotOn(frame,o) ;
+  if (o.bins) return RooAbsData::plotOnImpl(frame,o) ;
 
   if(!frame) {
     coutE(InputArguments) << ClassName() << "::" << GetName() << ":plotOn: frame is null" << std::endl;
@@ -1120,7 +1120,7 @@ RooPlot *RooDataHist::plotOn(RooPlot *frame, PlotOpt o) const
   }
 
   o.bins = &dataVar->getBinning() ;
-  return RooAbsData::plotOn(frame,o) ;
+  return RooAbsData::plotOnImpl(frame,o) ;
 }