Replace deprecated legacy iterators (#874)

The legacy iterators are deprecated since ROOT 6.18 and they will be removed at some point. This commit also fixes a few memory leaks, and it might also benefit the performance a bit because the legacy iterators had quite some overhead.
cms-analysis · Dec 20, 2023 · 06a73aa · 06a73aa
1 parent 7a408dd
commit 06a73aa
Show file tree

Hide file tree

Showing 60 changed files with 250 additions and 701 deletions.
diff --git a/interface/AtlasPdfs.h b/interface/AtlasPdfs.h
@@ -372,9 +372,6 @@ class RooStarMomentMorph : public RooAbsPdf {
   mutable std::vector<int> _nnuis; 
   mutable std::vector<double> _nref;
 
-  TIterator* _parItr ;  //! do not persist
-  TIterator* _obsItr ;  //! do not persist
-  TIterator* _pdfItr ;  //!
   mutable TMatrixD* _M; //!
 
   Setting _setting;

diff --git a/interface/FastTemplateFunc.h b/interface/FastTemplateFunc.h
@@ -19,15 +19,12 @@ template <typename T> class FastTemplateFunc_t : public RooAbsReal{
   virtual inline ~FastTemplateFunc_t(){}
 
   void setProxyList(RooListProxy& proxyList, RooArgList& varList){
-    TIterator* varIter = varList.createIterator();
-    RooAbsArg* var;
-    while ((var = (RooAbsArg*)varIter->Next())) {
+    for (RooAbsArg *var : varList) {
       if (!dynamic_cast<RooAbsReal*>(var)) {
         assert(0);
       }
       proxyList.add(*var);
     }
-    delete varIter;
   }
 
   virtual TObject* clone(const char* newname) const = 0;

diff --git a/interface/HZZ4L_RooSpinZeroPdf_1D.h b/interface/HZZ4L_RooSpinZeroPdf_1D.h
@@ -28,7 +28,6 @@ class HZZ4L_RooSpinZeroPdf_1D : public RooAbsPdf {
 //  RooRealProxy ksmd ;
   RooRealProxy fai ;
   RooListProxy _coefList ;  //  List of funcficients
-  TIterator* _coefIter ;    //! Iterator over funcficient lis
   Double_t evaluate() const ;
 public:
   HZZ4L_RooSpinZeroPdf_1D() {} ; 

diff --git a/interface/ProcessNormalization.h b/interface/ProcessNormalization.h
@@ -1,7 +1,6 @@
 #ifndef HiggsAnalysis_CombinedLimit_ProcessNormalization_h
 #define HiggsAnalysis_CombinedLimit_ProcessNormalization_h
 
-#include <TIterator.h>
 #include <RooAbsReal.h>
 #include "RooListProxy.h"
 

diff --git a/interface/RooMultiPdf.h b/interface/RooMultiPdf.h
@@ -17,7 +17,6 @@
 #include "RooConstVar.h"
 
 
-#include "TIterator.h"
 #include "RooListProxy.h"
 
 #include <iostream>

diff --git a/interface/SimpleCacheSentry.h b/interface/SimpleCacheSentry.h
@@ -3,7 +3,6 @@
 
 #include "RooRealVar.h"
 #include "RooSetProxy.h"
-#include "TIterator.h"
 
 class SimpleCacheSentry : public RooAbsArg {
     public:

diff --git a/interface/VerticalInterpHistPdf.h b/interface/VerticalInterpHistPdf.h
@@ -41,8 +41,6 @@ class VerticalInterpHistPdf : public RooAbsPdf {
   RooListProxy _coefList ;  //  List of coefficients
   Double_t     _smoothRegion;
   Int_t        _smoothAlgo;
-  TIterator* _funcIter ;     //! Iterator over FUNC list
-  TIterator* _coefIter ;    //! Iterator over coefficient list
 
   // TH1 containing the histogram of this pdf
   mutable SimpleCacheSentry _sentry; // !not to be serialized
@@ -93,8 +91,6 @@ class FastVerticalInterpHistPdfBase : public RooAbsPdf {
   RooListProxy _coefList ;  //  List of coefficients
   Double_t     _smoothRegion;
   Int_t        _smoothAlgo;
-  TIterator* _funcIter ;     //! Iterator over FUNC list
-  TIterator* _coefIter ;    //! Iterator over coefficient list
 
   // TH1 containing the histogram of this pdf
   mutable bool              _init; //! not to be serialized

diff --git a/interface/VerticalInterpPdf.h b/interface/VerticalInterpPdf.h
@@ -46,8 +46,6 @@ class VerticalInterpPdf : public RooAbsPdf {
   RooListProxy _coefList ;  //  List of coefficients
   Double_t     _quadraticRegion;
   Int_t        _quadraticAlgo;
-  TIterator* _funcIter ;     //! Iterator over FUNC list
-  TIterator* _coefIter ;    //! Iterator over coefficient list
 
   Double_t _pdfFloorVal; // PDF floor should be customizable, default is 1e-15
   Double_t _integralFloorVal; // PDF integral floor should be customizable, default is 1e-10

diff --git a/src/AsimovUtils.cc b/src/AsimovUtils.cc
@@ -2,7 +2,6 @@
 
 #include <memory>
 #include <stdexcept>
-#include <TIterator.h>
 #include <RooAbsData.h>
 #include <RooArgSet.h>
 #include <RooProdPdf.h>
@@ -21,8 +20,7 @@ RooAbsData *asimovutils::asimovDatasetNominal(RooStats::ModelConfig *mc, double
 
 	if (verbose>2) {
 	    CombineLogger::instance().log("AsimovUtils.cc",__LINE__,"Parameters after fit for asimov dataset",__func__);
-    	    std::unique_ptr<TIterator> iter(mc->GetPdf()->getParameters((const RooArgSet*) 0)->createIterator());
-    	    for (RooAbsArg *a = (RooAbsArg *) iter->Next(); a != 0; a = (RooAbsArg *) iter->Next()) {
+    	    for (RooAbsArg *a : *std::unique_ptr<RooArgSet>{mc->GetPdf()->getParameters((const RooArgSet*) 0)}) {
 	  	TString varstring = utils::printRooArgAsString(a);
 	  	CombineLogger::instance().log("AsimovUtils.cc",__LINE__,std::string(Form("%s",varstring.Data())),__func__);
 	    }
@@ -45,8 +43,7 @@ RooAbsData *asimovutils::asimovDatasetWithFit(RooStats::ModelConfig *mc, RooAbsD
             } else {
                 // Do we have free parameters anyway that need fitting?
                 std::unique_ptr<RooArgSet> params(mc->GetPdf()->getParameters(realdata));
-                std::unique_ptr<TIterator> iter(params->createIterator());
-                for (RooAbsArg *a = (RooAbsArg *) iter->Next(); a != 0; a = (RooAbsArg *) iter->Next()) {
+                for (RooAbsArg *a : *params) {
                     RooRealVar *rrv = dynamic_cast<RooRealVar *>(a);
                     if ( rrv != 0 && rrv->isConstant() == false ) { needsFit &= true; break; }
                 } 
@@ -67,8 +64,7 @@ RooAbsData *asimovutils::asimovDatasetWithFit(RooStats::ModelConfig *mc, RooAbsD
 
 	if (verbose>2) { 
 	    CombineLogger::instance().log("AsimovUtils.cc",__LINE__,"Parameters after fit for asimov dataset",__func__);
-    	    std::unique_ptr<TIterator> iter(mc->GetPdf()->getParameters(realdata)->createIterator());
-    	    for (RooAbsArg *a = (RooAbsArg *) iter->Next(); a != 0; a = (RooAbsArg *) iter->Next()) {
+            for (RooAbsArg *a : *std::unique_ptr<RooArgSet>{mc->GetPdf()->getParameters(realdata)}) {
 	  	TString varstring = utils::printRooArgAsString(a);
 	  	CombineLogger::instance().log("AsimovUtils.cc",__LINE__,std::string(Form("%s",varstring.Data())),__func__);
 	    }
@@ -92,8 +88,7 @@ RooAbsData *asimovutils::asimovDatasetWithFit(RooStats::ModelConfig *mc, RooAbsD
             std::unique_ptr<RooAbsPdf> nuispdf(utils::makeNuisancePdf(*mc));
             RooProdPdf *prod = dynamic_cast<RooProdPdf *>(nuispdf.get());
             if (prod == 0) throw std::runtime_error("AsimovUtils: the nuisance pdf is not a RooProdPdf!");
-            std::unique_ptr<TIterator> iter(prod->pdfList().createIterator());
-            for (RooAbsArg *a = (RooAbsArg *) iter->Next(); a != 0; a = (RooAbsArg *) iter->Next()) {
+            for (RooAbsArg *a : prod->pdfList()) {
                 RooAbsPdf *cterm = dynamic_cast<RooAbsPdf *>(a); 
                 if (!cterm) throw std::logic_error("AsimovUtils: a factor of the nuisance pdf is not a Pdf!");
                 if (!cterm->dependsOn(nuis)) continue; // dummy constraints
@@ -109,8 +104,7 @@ RooAbsData *asimovutils::asimovDatasetWithFit(RooStats::ModelConfig *mc, RooAbsD
                 if (cpars->getSize() == 1) {
                     match = dynamic_cast<RooAbsReal *>(cpars->first());
                 } else {
-                    std::unique_ptr<TIterator> iter2(cpars->createIterator());
-                    for (RooAbsArg *a2 = (RooAbsArg *) iter2->Next(); a2 != 0; a2 = (RooAbsArg *) iter2->Next()) {
+                    for (RooAbsArg *a2 : *cpars) {
                         RooRealVar *rrv2 = dynamic_cast<RooRealVar *>(a2); 
                         if (rrv2 != 0 && !rrv2->isConstant()) {
                             if (match != 0) throw std::runtime_error(Form("AsimovUtils: constraint term %s has multiple floating params", cterm->GetName()));
@@ -138,10 +132,10 @@ RooAbsData *asimovutils::asimovDatasetWithFit(RooStats::ModelConfig *mc, RooAbsD
                     // we want to set the global obs to a value for which the current value 
                     // of the nuisance is the best fit one.
                     // best fit x = (k-1)*theta    ---->  k = x/theta + 1
-                    RooArgList leaves; cterm->leafNodeServerList(&leaves);
-                    std::unique_ptr<TIterator> iter2(leaves.createIterator());
+                    RooArgList leaves;
+                    cterm->leafNodeServerList(&leaves);
                     RooAbsReal *match2 = 0;
-                    for (RooAbsArg *a2 = (RooAbsArg *) iter2->Next(); a2 != 0; a2 = (RooAbsArg *) iter2->Next()) {
+                    for (RooAbsArg *a2 : leaves) {
                         RooAbsReal *rar = dynamic_cast<RooAbsReal *>(a2);
                         if (rar == 0 || rar == match || rar == &rrv) continue;
                         if (!rar->isConstant()) throw std::runtime_error(Form("AsimovUtils: extra floating parameter %s of RooGamma %s.", rar->GetName(), cterm->GetName()));

diff --git a/src/AsymptoticLimits.cc b/src/AsymptoticLimits.cc
@@ -107,8 +107,7 @@ bool AsymptoticLimits::run(RooWorkspace *w, RooStats::ModelConfig *mc_s, RooStat
     */
     hasDiscreteParams_ = false;  
     if (params_.get() == 0) params_.reset(mc_s->GetPdf()->getParameters(data));
-    std::unique_ptr<TIterator> itparam(params_->createIterator());
-    for (RooAbsArg *a = (RooAbsArg *) itparam->Next(); a != 0; a = (RooAbsArg *) itparam->Next()) {
+    for (RooAbsArg *a : *params_) {
       if (a->IsA()->InheritsFrom(RooCategory::Class())) { hasDiscreteParams_ = true; break; }
     }
 
@@ -164,8 +163,7 @@ bool AsymptoticLimits::runLimit(RooWorkspace *w, RooStats::ModelConfig *mc_s, Ro
   if (params_.get() == 0) params_.reset(mc_s->GetPdf()->getParameters(data));
 
   hasFloatParams_ = false;
-  std::unique_ptr<TIterator> itparam(params_->createIterator());
-  for (RooAbsArg *a = (RooAbsArg *) itparam->Next(); a != 0; a = (RooAbsArg *) itparam->Next()) {
+  for (RooAbsArg *a : *params_) {
       RooRealVar *rrv = dynamic_cast<RooRealVar *>(a);
       if ( rrv != 0 && rrv != r && rrv->isConstant() == false ) { hasFloatParams_ = true; break; }
   }

diff --git a/src/AtlasPdfs.cxx b/src/AtlasPdfs.cxx
@@ -433,10 +433,8 @@ RooBSpline::RooBSpline(const char* name, const char* title,
 
   //bool even = fabs(_n/2-_n/2.) < 0.0000000001;
   bool first=1;
-  TIterator* pointIter = controlPoints.createIterator() ;
-  RooAbsArg* point ;
   RooAbsArg* lastPoint=NULL ;
-  while((point = (RooAbsArg*)pointIter->Next())) {
+  for (RooAbsArg * point : controlPoints) {
     if (!dynamic_cast<RooAbsReal*>(point)) {
       coutE(InputArguments) << "RooBSpline::ctor(" << GetName() << ") ERROR: control point " << point->GetName() 
 			    << " is not of type RooAbsReal" << std::endl ;
@@ -456,19 +454,9 @@ RooBSpline::RooBSpline(const char* name, const char* title,
     lastPoint=point;
   }
   for (int i=0;i<(_n)/2;i++) _controlPoints.add(*lastPoint);
-  delete pointIter ;
 
 
-  TIterator* varItr = vars.createIterator();
-  RooAbsArg* arg;
-  while ((arg=(RooAbsArg*)varItr->Next())) {
-    //std::cout << "======== Adding "<<arg->GetName()<<" to list of _vars of "<<name<<"." << std::endl;
-    _vars.add(*arg);
-  }
-//   std::cout << "all _vars: " << std::endl;
-//   _vars.Print("V");
-  delete varItr;
-  //std::cout << "out Ctor" << std::endl;
+  _vars.add(vars);
 }
 
 //_____________________________________________________________________________
@@ -556,10 +544,8 @@ void RooBSpline::setWeights(const RooArgList& weights)
 {
   _weights.removeAll();
   bool first=1;
-  TIterator* pointIter = weights.createIterator() ;
-  RooAbsArg* point ;
   RooAbsArg* lastPoint=NULL ;
-  while((point = (RooAbsArg*)pointIter->Next())) {
+  for (RooAbsArg *point : weights) {
     if (!dynamic_cast<RooAbsReal*>(point)) {
       coutE(InputArguments) << "RooBSpline::ctor(" << GetName() << ") ERROR: control point " << point->GetName() 
 			    << " is not of type RooAbsReal" << std::endl ;
@@ -577,7 +563,6 @@ void RooBSpline::setWeights(const RooArgList& weights)
     lastPoint=point;
   }
   for (int i=0;i<(_n+1)/2;i++) _weights.add(*lastPoint);
-  delete pointIter;
 }
 
 
@@ -1235,9 +1220,6 @@ RooStarMomentMorph::RooStarMomentMorph() :
 {
 
   // coverity[UNINIT_CTOR]
-  _parItr    = _parList.createIterator() ;
-  _obsItr    = _obsList.createIterator() ;
-  _pdfItr    = _pdfList.createIterator() ; 
 }
 
 
@@ -1269,45 +1251,31 @@ RooStarMomentMorph::RooStarMomentMorph(const char *name, const char *title,
   // CTOR
 
   // fit parameters
-  TIterator* parItr = parList.createIterator() ;
-  RooAbsArg* par ;
-  for (Int_t i=0; (par = (RooAbsArg*)parItr->Next()); ++i) {
+  for (RooAbsArg *par : parList) {
     if (!dynamic_cast<RooAbsReal*>(par)) {
       coutE(InputArguments) << "RooStarMomentMorph::ctor(" << GetName() << ") ERROR: parameter " << par->GetName() << " is not of type RooAbsReal" << endl ;
       throw std::string("RooStarMomentMorh::ctor() ERROR parameter is not of type RooAbsReal") ;
     }
     _parList.add(*par) ;
   }
-  delete parItr ;
 
   // observables
-  TIterator* obsItr = obsList.createIterator() ;
-  RooAbsArg* var ;
-  for (Int_t i=0; (var = (RooAbsArg*)obsItr->Next()); ++i) {
+  for (RooAbsArg *var : obsList) {
     if (!dynamic_cast<RooAbsReal*>(var)) {
       coutE(InputArguments) << "RooStarMomentMorph::ctor(" << GetName() << ") ERROR: variable " << var->GetName() << " is not of type RooAbsReal" << endl ;
       throw std::string("RooStarMomentMorh::ctor() ERROR variable is not of type RooAbsReal") ;
     }
     _obsList.add(*var) ;
   }
-  delete obsItr ;
 
   // reference p.d.f.s
-  TIterator* pdfItr = pdfList.createIterator() ;
-  RooAbsPdf* pdf ;
-  for (Int_t i=0; (pdf = dynamic_cast<RooAbsPdf*>(pdfItr->Next())); ++i) {
-    if (!pdf) {
+  for (RooAbsArg *pdf : pdfList) {
+    if (!dynamic_cast<RooAbsPdf*>(pdf)) {
       coutE(InputArguments) << "RooStarMomentMorph::ctor(" << GetName() << ") ERROR: pdf " << pdf->GetName() << " is not of type RooAbsPdf" << endl ;
       throw std::string("RooStarMomentMorph::ctor() ERROR pdf is not of type RooAbsPdf") ;
     }
     _pdfList.add(*pdf) ;
   }
-  delete pdfItr ;
-
-  _parItr    = _parList.createIterator() ;
-  _obsItr    = _obsList.createIterator() ;
-  _pdfItr    = _pdfList.createIterator() ; 
-
 
   // initialization
   initialize();
@@ -1329,12 +1297,6 @@ RooStarMomentMorph::RooStarMomentMorph(const RooStarMomentMorph& other, const ch
   _nnuisvar(other._nnuisvar),
   _useHorizMorph(other._useHorizMorph)
 { 
-
-
-  _parItr    = _parList.createIterator() ;
-  _obsItr    = _obsList.createIterator() ;
-  _pdfItr    = _pdfList.createIterator() ; 
-
   // nref is resized in initialize, so reduce the size here
   if (_nref.size()>0) {
     _nref.resize( _nref.size()-1 );
@@ -1347,9 +1309,6 @@ RooStarMomentMorph::RooStarMomentMorph(const RooStarMomentMorph& other, const ch
 //_____________________________________________________________________________
 RooStarMomentMorph::~RooStarMomentMorph() 
 {
-  if (_parItr) delete _parItr;
-  if (_obsItr) delete _obsItr;
-  if (_pdfItr) delete _pdfItr;
   if (_M)      delete _M;
 }
 
@@ -1512,15 +1471,11 @@ RooStarMomentMorph::CacheElem* RooStarMomentMorph::getCache(const RooArgSet* /*n
   //}
 
   // construction of unit pdfs
-  _pdfItr->Reset();
-  RooAbsPdf* pdf;
   RooArgList transPdfList;
 
   for (Int_t i=0; i<nPdf; ++i) {
-    _obsItr->Reset() ;
-    RooRealVar* var ;
 
-    pdf = (RooAbsPdf*)_pdfItr->Next();
+    RooAbsPdf* pdf = &(RooAbsPdf&)_pdfList[i];
 
     std::string pdfName = Form("pdf_%d",i);
     RooCustomizer cust(*pdf,pdfName.c_str());
@@ -1545,7 +1500,7 @@ RooStarMomentMorph::CacheElem* RooStarMomentMorph::getCache(const RooArgSet* /*n
       ownedComps.add(RooArgSet(*slope[sij(i,j)],*offsetVar[sij(i,j)])) ;
 
       // linear transformations, so pdf can be renormalized easily
-      var = (RooRealVar*)(_obsItr->Next());
+      RooRealVar *var = (RooRealVar*)(_obsList[j]);
       std::string transVarName = Form("%s_transVar_%d_%d",GetName(),i,j);
       transVar[sij(i,j)] = new RooLinearVar(transVarName.c_str(),transVarName.c_str(),*var,*slope[sij(i,j)],*offsetVar[sij(i,j)]);
 
@@ -1680,7 +1635,6 @@ void RooStarMomentMorph::CacheElem::calculateFractions(const RooStarMomentMorph&
       //int nObs=self._obsList.getSize();
 
       // loop over parList
-      self._parItr->Reset();
       int nnuis=0;
 
       // zero all fractions
@@ -1691,7 +1645,7 @@ void RooStarMomentMorph::CacheElem::calculateFractions(const RooStarMomentMorph&
       }
       for (Int_t j=0; j<self._parList.getSize(); j++) {
 
-	RooRealVar* m = (RooRealVar*)(self._parItr->Next());
+	RooRealVar* m = &(RooRealVar&)self._parList[j];
 	double m0=m->getVal();
 
 	if (m0==0.) continue;