[RF] Fix various memory leaks caused by not deleting return values

Fix various memory leaks from cases where functions that return an owned
return value were used without deleting the return value.

This is addressed by using `std::unique_ptr`.

Author: guitargeek

roofit/histfactory/src/HistFactoryModelUtils.cxx

@@ -56,7 +56,7 @@ namespace HistFactory{
     if( ! FoundSumPdf ) {
       if(verbose) {
    std::cout << "Failed to find RooRealSumPdf for channel: " << sim_channel->GetName() << std::endl;
-   sim_channel->getComponents()->Print("V");
+   components->Print("V");
       }
       sum_pdf=nullptr;
       //throw std::runtime_error("Failed to find RooRealSumPdf for channel");

roofit/roofit/test/testFitPerf.cxx

@@ -549,7 +549,7 @@ int FitUsingRooFit(TTree *tree, TF1 *func)
       int level = 3;
       std::cout << "num entries = " << data.numEntries() << std::endl;
       bool save = true;
-      (pdf.getVariables())->Print("v"); // print the parameters
+      std::unique_ptr<RooArgSet>{pdf.getVariables()}->Print("v"); // print the parameters
 #else
       int level = -1;
       bool save = false;
@@ -630,7 +630,7 @@ int FitUsingRooFit2(TTree *tree)
       int level = 3;
       std::cout << "num entries = " << data.numEntries() << std::endl;
       bool save = true;
-      (pdf[N - 1]->getVariables())->Print("v"); // print the parameters
+      std::unique_ptr<RooArgSet>{pdf[N - 1]->getVariables()}->Print("v"); // print the parameters
       std::cout << "\n\nDo the fit now \n\n";
 #else
       int level = -1;

roofit/roofit/test/vectorisedPDFs/VectorisedPDFTests.cxx

@@ -457,7 +457,7 @@ std::unique_ptr<RooFitResult> PDFTest::runBatchFit(RooAbsPdf *pdf)
    kickParameters();
    makePlots(::testing::UnitTest::GetInstance()->current_test_info()->name() + std::string("_batch_prefit"));
 
-   auto pars = pdf->getParameters(*_dataFit);
+   std::unique_ptr<RooArgSet> pars{pdf->getParameters(*_dataFit)};
    *pars = _parameters;
 
    for (unsigned int index = 0; index < pars->size(); ++index) {

roofit/roofitcore/src/RooAbsReal.cxx

@@ -2247,10 +2247,10 @@ RooPlot* RooAbsReal::plotAsymOn(RooPlot *frame, const RooAbsCategoryLValue& asym
 
 
   // Take out data-projected dependents from projectedVars
-  RooArgSet* projDataNeededVars = nullptr ;
+  std::unique_ptr<RooArgSet> projDataNeededVars;
   if (o.projData) {
-    projDataNeededVars = projectedVars.selectCommon(projDataVars);
-    projectedVars.remove(projDataVars,true,true) ;
+     projDataNeededVars.reset(projectedVars.selectCommon(projDataVars));
+     projectedVars.remove(projDataVars, true, true);
   }
 
   // Take out plotted asymmetry from projection

roofit/roofitcore/src/RooRealMPFE.cxx

@@ -53,6 +53,7 @@ For general multiprocessing in ROOT, please refer to the TProcessExecutor class.
 #endif
 
 #include <cstdlib>
+#include <memory>
 #include <sstream>
 #include "RooRealMPFE.h"
 #include "RooArgSet.h"
@@ -170,7 +171,7 @@ void RooRealMPFE::initVars()
   _saveVars.removeAll() ;
 
   // Retrieve non-constant parameters
-  auto vars = _arg->getParameters(RooArgSet());
+  std::unique_ptr<RooArgSet> vars{_arg->getParameters(RooArgSet())};
   // RooArgSet *ncVars = vars->selectByAttrib("Constant", false);
   RooArgList varList(*vars) ;
 

roofit/roofitcore/src/RooVectorDataStore.cxx

@@ -829,6 +829,7 @@ void RooVectorDataStore::cacheArgs(const RooAbsArg* owner, RooArgSet& newVarSet,
 
   std::vector<RooArgSet*> nsetList ;
   std::vector<std::unique_ptr<RooArgSet>> argObsList ;
+  std::vector<std::unique_ptr<RooArgSet>> ownedNsets;
 
   // Now need to attach branch buffers of clones
   for (const auto arg : cloneSet) {
@@ -844,8 +845,8 @@ void RooVectorDataStore::cacheArgs(const RooAbsArg* owner, RooArgSet& newVarSet,
 //       std::cout << "RooVectorDataStore::cacheArgs() cached node " << arg->GetName() << " has a normalization set specification CATNormSet = " << catNset << std::endl ;
 
       RooArgSet anset = RooHelpers::selectFromArgSet(nset ? *nset : RooArgSet{}, catNset);
-      normSet = anset.selectCommon(*argObs);
-
+      ownedNsets.emplace_back(anset.selectCommon(*argObs));
+      normSet = ownedNsets.back().get();
     }
     const char* catCset = arg->getStringAttribute("CATCondSet") ;
     if (catCset) {

roofit/roofitcore/src/TestStatistics/RooAbsL.cxx

@@ -129,7 +129,7 @@ void RooAbsL::initClones(RooAbsPdf &inpdf, RooAbsData &indata)
    // ******************************************************************
 
    // Attach FUNC to data set
-   auto _funcObsSet = pdf_->getObservables(indata);
+   std::unique_ptr<RooArgSet> _funcObsSet{pdf_->getObservables(indata)};
 
    if (pdf_->getAttribute("BinnedLikelihood")) {
       pdf_->setAttribute("BinnedLikelihoodActive");

roofit/roostats/src/AsymptoticCalculator.cxx

@@ -245,8 +245,8 @@ bool AsymptoticCalculator::Initialize() const {
    if (!fNominalAsimov) {
       if (verbose >= 0)
          oocoutI(nullptr,InputArguments) << "AsymptoticCalculator: Asimov data will be generated using fitted nuisance parameter values" << std::endl;
-      RooArgSet * tmp = (RooArgSet*) poiAlt.snapshot();
-      fAsimovData = MakeAsimovData( data, *GetNullModel(), poiAlt, fAsimovGlobObs,tmp);
+      std::unique_ptr<RooArgSet> tmp{static_cast<RooArgSet *>(poiAlt.snapshot())};
+      fAsimovData = MakeAsimovData(data, *GetNullModel(), poiAlt, fAsimovGlobObs, tmp.get());
    }
 
    else {

roofit/roostats/src/HypoTestInverter.cxx

@@ -1237,7 +1237,8 @@ SamplingDistribution * HypoTestInverter::RebuildDistributions(bool isUpper, int
       inverter.SetData(*bkgdata);
 
       // print global observables
-      auto gobs = bModel->GetPdf()->getVariables()->selectCommon(* sbModel->GetGlobalObservables() );
+      std::unique_ptr<RooArgSet> bModelVars{bModel->GetPdf()->getVariables()};
+      std::unique_ptr<RooAbsCollection> gobs{bModelVars->selectCommon(*sbModel->GetGlobalObservables())};
       gobs->Print("v");
 
       HypoTestInverterResult * r  = inverter.GetInterval();

roofit/roostats/src/LikelihoodIntervalPlot.cxx

@@ -194,7 +194,8 @@ void LikelihoodIntervalPlot::Draw(const Option_t *options)
       const double xcont_min = fInterval->LowerLimit(*myparam);
       const double xcont_max = fInterval->UpperLimit(*myparam);
 
-      RooRealVar* myarg = static_cast<RooRealVar *>(newProfile->getVariables()->find(myparam->GetName()));
+      std::unique_ptr<RooArgSet> vars{newProfile->getVariables()};
+      RooRealVar *myarg = static_cast<RooRealVar *>(vars->find(myparam->GetName()));
       double x1 = myarg->getMin();
       double x2 = myarg->getMax();
 
@@ -336,7 +337,8 @@ void LikelihoodIntervalPlot::Draw(const Option_t *options)
       double cont_level = ROOT::Math::chisquared_quantile(fInterval->ConfidenceLevel(),fNdimPlot); // level for -2log LR
       cont_level = cont_level/2; // since we are plotting -log LR
 
-      RooArgList params(*newProfile->getVariables());
+      std::unique_ptr<RooArgSet> vars{newProfile->getVariables()};
+      RooArgList params(*vars);
       // set values and error for the POI to the best fit values
       for (std::size_t i = 0; i < params.size(); ++i) {
          RooRealVar & par =  static_cast<RooRealVar &>( params[i]);