[RF] Some code modernization of RooFit result

  * smart pointers for transient members

  * more `std::string` instead of TString

Author: guitargeek

roofit/roofitcore/inc/RooFitResult.h

@@ -33,9 +33,7 @@
 class RooArgSet ;
 class RooAbsPdf ;
 class RooPlot;
-class TObject ;
 class TH2 ;
-typedef RooArgSet* pRooArgSet ;
 
 class RooFitResult : public TNamed, public RooPrintable, public RooDirItem {
 public:
@@ -185,11 +183,11 @@ class RooFitResult : public TNamed, public RooPrintable, public RooDirItem {
   RooArgList* _initPars = nullptr;     ///< List of floating parameters with initial values
   RooArgList* _finalPars = nullptr;    ///< List of floating parameters with final values
 
-  mutable RooArgList* _globalCorr = nullptr;   ///<! List of global correlation coefficients
+  mutable std::unique_ptr<RooArgList> _globalCorr;   ///<! List of global correlation coefficients
   mutable TList       _corrMatrix ;   ///<! Correlation matrix (list of RooArgLists)
 
-  mutable RooArgList *_randomPars = nullptr; ///<! List of floating parameters with most recent random perturbation applied
-  mutable TMatrixF* _Lt = nullptr;           ///<! triangular matrix used for generate random perturbations
+  mutable std::unique_ptr<RooArgList> _randomPars; ///<! List of floating parameters with most recent random perturbation applied
+  mutable std::unique_ptr<TMatrixF> _Lt;           ///<! triangular matrix used for generate random perturbations
 
   TMatrixDSym* _CM = nullptr;  ///< Correlation matrix
   TMatrixDSym* _VM = nullptr;  ///< Covariance matrix

roofit/roofitcore/src/RooFitResult.cxx

@@ -92,10 +92,10 @@ RooFitResult::RooFitResult(const RooFitResult &other)
 
   other._finalPars->snapshot(*_finalPars);
   if (other._randomPars) {
-    _randomPars = new RooArgList;
+    _randomPars = std::make_unique<RooArgList>();
     other._randomPars->snapshot(*_randomPars);
   }
-  if (other._Lt) _Lt = new TMatrix(*other._Lt);
+  if (other._Lt) _Lt = std::make_unique<TMatrix>(*other._Lt);
   if (other._VM) _VM = new TMatrixDSym(*other._VM) ;
   if (other._CM) _CM = new TMatrixDSym(*other._CM) ;
   if (other._GC) _GC = new TVectorD(*other._GC) ;
@@ -114,9 +114,6 @@ RooFitResult::~RooFitResult()
   if (_constPars) delete _constPars ;
   if (_initPars)  delete _initPars ;
   if (_finalPars) delete _finalPars ;
-  if (_globalCorr) delete _globalCorr;
-  if (_randomPars) delete _randomPars;
-  if (_Lt) delete _Lt;
   if (_CM) delete _CM ;
   if (_VM) delete _VM ;
   if (_GC) delete _GC ;
@@ -334,10 +331,10 @@ RooPlot *RooFitResult::plotOn(RooPlot *frame, const char *parName1, const char *
 const RooArgList& RooFitResult::randomizePars() const
 {
   Int_t nPar= _finalPars->size();
-  if(nullptr == _randomPars) { // first-time initialization
+  if(!_randomPars) { // first-time initialization
     assert(nullptr != _finalPars);
     // create the list of random values to fill
-    _randomPars = new RooArgList;
+    _randomPars = std::make_unique<RooArgList>();
     _finalPars->snapshot(*_randomPars);
     // calculate the elements of the upper-triangular matrix L that gives Lt*L = C
     // where Lt is the transpose of L (the "square-root method")
@@ -360,7 +357,7 @@ const RooArgList& RooFitResult::randomizePars() const
       }
     }
     // remember Lt
-    _Lt= new TMatrix(TMatrix::kTransposed,L);
+    _Lt= std::make_unique<TMatrix>(TMatrix::kTransposed,L);
   }
   else {
     // reset to the final fit values
@@ -455,7 +452,7 @@ const RooArgList* RooFitResult::globalCorr()
     fillLegacyCorrMatrix() ;
   }
 
-  return _globalCorr ;
+  return _globalCorr.get();
 }
 
 
@@ -622,39 +619,28 @@ void RooFitResult::fillLegacyCorrMatrix() const
   if (!_CM) return ;
 
   // Delete eventual previous correlation data holders
-  if (_globalCorr) delete _globalCorr ;
   _corrMatrix.Delete();
 
   // Build holding arrays for correlation coefficients
-  _globalCorr = new RooArgList("globalCorrelations") ;
+  _globalCorr = std::make_unique<RooArgList>("globalCorrelations") ;
 
   for(RooAbsArg* arg : *_initPars) {
     // Create global correlation value holder
-    TString gcName("GC[") ;
-    gcName.Append(arg->GetName()) ;
-    gcName.Append("]") ;
-    TString gcTitle(arg->GetTitle()) ;
-    gcTitle.Append(" Global Correlation") ;
-    _globalCorr->addOwned(std::make_unique<RooRealVar>(gcName.Data(),gcTitle.Data(),0.));
+    std::string argName = arg->GetName();
+    std::string argTitle = arg->GetTitle();
+    std::string gcName = "GC[" + argName + "]";
+    std::string gcTitle = argTitle + " Global Correlation";
+    _globalCorr->addOwned(std::make_unique<RooRealVar>(gcName.c_str(),gcTitle.c_str(),0.));
 
     // Create array with correlation holders for this parameter
-    TString name("C[") ;
-    name.Append(arg->GetName()) ;
-    name.Append(",*]") ;
-    RooArgList* corrMatrixRow = new RooArgList(name.Data()) ;
+    RooArgList* corrMatrixRow = new RooArgList(("C[" + argName + ",*]").c_str()) ;
     _corrMatrix.Add(corrMatrixRow) ;
     for(RooAbsArg* arg2 : *_initPars) {
 
-      TString cName("C[") ;
-      cName.Append(arg->GetName()) ;
-      cName.Append(",") ;
-      cName.Append(arg2->GetName()) ;
-      cName.Append("]") ;
-      TString cTitle("Correlation between ") ;
-      cTitle.Append(arg->GetName()) ;
-      cTitle.Append(" and ") ;
-      cTitle.Append(arg2->GetName()) ;
-      corrMatrixRow->addOwned(std::make_unique<RooRealVar>(cName.Data(),cTitle.Data(),0.));
+      std::string arg2Name = arg2->GetName();
+      std::string cName = "C[" + argName + "," + arg2Name + "]";
+      std::string cTitle = "Correlation between " + argName + " and " + arg2Name;
+      corrMatrixRow->addOwned(std::make_unique<RooRealVar>(cName.c_str(),cTitle.c_str(),0.));
     }
   }
 
@@ -1315,7 +1301,9 @@ void RooFitResult::Streamer(TBuffer &R__b)
       R__b >> _constPars;
       R__b >> _initPars;
       R__b >> _finalPars;
-      R__b >> _globalCorr;
+      RooArgList* globalCorr;
+      R__b >> globalCorr;
+      _globalCorr.reset(globalCorr);
       _corrMatrix.Streamer(R__b);
       R__b.CheckByteCount(R__s, R__c, RooFitResult::IsA());