[RF] Avoid warning about duplicate command arguments

Avoid warning about duplicate command arguments by removing old
arguments when overriding them.

(cherry picked from commit d4b150c)

Author: guitargeek

roofit/roofitcore/src/RooAbsPdf.cxx

@@ -210,6 +210,15 @@ inline double getLog(double prob, RooAbsReal const *caller)
    return std::log(prob);
 }
 
+void replaceOrAdd(RooLinkedList &lst, TObject &obj)
+{
+   TObject *old = lst.FindObject(obj.GetName());
+   if (old)
+      lst.Replace(old, &obj);
+   else
+      lst.Add(&obj);
+}
+
 } // namespace
 
 using std::endl, std::string, std::ostream, std::vector, std::pair, std::make_pair;
@@ -2173,7 +2182,7 @@ RooPlot* RooAbsPdf::plotOn(RooPlot* frame, RooLinkedList& cmdList) const
   // Append overriding scale factor command at end of original command list
   RooCmdArg tmp = RooFit::Normalization(scaleFactor,Raw) ;
   tmp.setInt(1,1) ; // Flag this normalization command as created for internal use (so that VisualizeError can strip it)
-  cmdList.Add(&tmp) ;
+  replaceOrAdd(cmdList, tmp);
 
   // Was a component selected requested
   if (haveCompSel) {

roofit/roofitcore/src/RooSimultaneous.cxx

@@ -87,6 +87,15 @@ std::map<std::string, RooAbsPdf *> createPdfMap(const RooArgList &inPdfList, Roo
    return pdfMap;
 }
 
+void replaceOrAdd(RooLinkedList &lst, TObject &obj)
+{
+   TObject *old = lst.FindObject(obj.GetName());
+   if (old)
+      lst.Replace(old, &obj);
+   else
+      lst.Add(&obj);
+}
+
 } // namespace
 
 RooSimultaneous::InitializationOutput::~InitializationOutput() = default;
@@ -774,9 +783,9 @@ RooPlot* RooSimultaneous::plotOn(RooPlot *frame, RooLinkedList& cmdList) const
     // WVE -- do not adjust normalization for asymmetry plots
     RooLinkedList cmdList2(cmdList) ;
     if (!cmdList.find("Asymmetry")) {
-      cmdList2.Add(&tmp1) ;
+      replaceOrAdd(cmdList2, tmp1);
     }
-    cmdList2.Add(&tmp2) ;
+    replaceOrAdd(cmdList2, tmp2);
 
     // Plot single component
     RooPlot* retFrame = getPdf(idxCatClone->getCurrentLabel())->plotOn(frame,cmdList2);
@@ -875,15 +884,15 @@ RooPlot* RooSimultaneous::plotOn(RooPlot *frame, RooLinkedList& cmdList) const
   RooCmdArg tmp2 = RooFit::ProjWData(*projDataSet,*projDataTmp) ;
   // WVE -- do not adjust normalization for asymmetry plots
   if (!cmdList.find("Asymmetry")) {
-    cmdList2.Add(&tmp1) ;
+    replaceOrAdd(cmdList2, tmp1);
   }
-  cmdList2.Add(&tmp2) ;
+  replaceOrAdd(cmdList2, tmp2);
 
   RooPlot* frame2 ;
   if (!projSetTmp.empty()) {
     // Plot temporary function
     RooCmdArg tmp3 = RooFit::Project(projSetTmp) ;
-    cmdList2.Add(&tmp3) ;
+    replaceOrAdd(cmdList2, tmp3);
     frame2 = plotVar.plotOn(frame,cmdList2) ;
   } else {
     // Plot temporary function

tutorials/roofit/roofit/rf501_simultaneouspdf.C

@@ -92,7 +92,7 @@ void rf501_simultaneouspdf()
    // ---------------------------------------------------
 
    // Perform simultaneous fit of model to data and model_ctl to data_ctl
-   std::unique_ptr<RooFitResult> fitResult{simPdf.fitTo(combData, PrintLevel(-1), Save(), PrintLevel(-1))};
+   std::unique_ptr<RooFitResult> fitResult{simPdf.fitTo(combData, Save(), PrintLevel(-1))};
    fitResult->Print();
 
    // P l o t   m o d e l   s l i c e s   o n   d a t a    s l i c e s