[RF] Use smart pointers for constraints management functions

Author: guitargeek

roofit/roofitcore/inc/RooAbsPdf.h

@@ -26,15 +26,7 @@
 class RooArgSet ;
 class RooAbsGenContext ;
 class RooFitResult ;
-class RooExtendPdf ;
-class RooCategory ;
-class TPaveText;
-class TH1F;
-class TH2F;
-class TList ;
-class RooMinimizer ;
 class RooNumGenConfig ;
-class RooRealIntegral ;
 
 
 class RooAbsPdf : public RooAbsReal {
@@ -165,14 +157,16 @@ class RooAbsPdf : public RooAbsReal {
     return RooFit::makeOwningPtr(createNLLImpl(data, *RooFit::Detail::createCmdList(&cmdArgs...)));
   }
 
-  // Constraint management
-  virtual RooArgSet* getConstraints(const RooArgSet& /*observables*/, RooArgSet const& /*constrainedParams*/, RooArgSet& /*pdfParams*/) const
+  // Constraint management. Interface to retrieve constraint terms on this pdf. Default implementation returns null.
+  virtual std::unique_ptr<RooArgSet> getConstraints(const RooArgSet & /*observables*/,
+                                                    RooArgSet const & /*constrainedParams*/,
+                                                    RooArgSet & /*pdfParams*/) const
   {
-    // Interface to retrieve constraint terms on this pdf. Default implementation returns null
-    return nullptr ;
+     return nullptr;
   }
-  RooArgSet* getAllConstraints(const RooArgSet& observables, RooArgSet& constrainedParams,
-                               bool stripDisconnected=true) const ;
+
+  std::unique_ptr<RooArgSet>
+  getAllConstraints(const RooArgSet &observables, RooArgSet &constrainedParams, bool stripDisconnected = true) const;
 
   // Project p.d.f into lower dimensional p.d.f
   virtual RooAbsPdf* createProjection(const RooArgSet& iset) ;

roofit/roofitcore/inc/RooProdPdf.h

@@ -78,7 +78,8 @@ class RooProdPdf : public RooAbsPdf {
   bool isDirectGenSafe(const RooAbsArg& arg) const override ;
 
   // Constraint management
-  RooArgSet* getConstraints(const RooArgSet& observables, RooArgSet const& constrainedParams, RooArgSet &pdfParams) const override ;
+  std::unique_ptr<RooArgSet> getConstraints(const RooArgSet &observables, RooArgSet const &constrainedParams,
+                                            RooArgSet &pdfParams) const override;
 
   std::list<double>* plotSamplingHint(RooAbsRealLValue& obs, double xlo, double xhi) const override ;
   std::list<double>* binBoundaries(RooAbsRealLValue& /*obs*/, double /*xlo*/, double /*xhi*/) const override ;

roofit/roofitcore/src/RooAbsPdf.cxx

@@ -2564,8 +2564,8 @@ RooFit::OwningPtr<RooAbsReal> RooAbsPdf::createScanCdf(const RooArgSet& iset, co
 /// This helper function finds and collects all constraints terms of all component p.d.f.s
 /// and returns a RooArgSet with all those terms.
 
-RooArgSet* RooAbsPdf::getAllConstraints(const RooArgSet& observables, RooArgSet& constrainedParams,
-                                        bool stripDisconnected) const
+std::unique_ptr<RooArgSet>
+RooAbsPdf::getAllConstraints(const RooArgSet &observables, RooArgSet &constrainedParams, bool stripDisconnected) const
 {
   RooArgSet constraints;
   RooArgSet pdfParams;
@@ -2574,9 +2574,7 @@ RooArgSet* RooAbsPdf::getAllConstraints(const RooArgSet& observables, RooArgSet&
   for (const auto arg : *comps) {
     auto pdf = dynamic_cast<const RooAbsPdf*>(arg) ;
     if (pdf && !constraints.find(pdf->GetName())) {
-      std::unique_ptr<RooArgSet> compRet(
-              pdf->getConstraints(observables,constrainedParams, pdfParams));
-      if (compRet) {
+      if (auto compRet = pdf->getConstraints(observables,constrainedParams, pdfParams)) {
         constraints.add(*compRet,false) ;
       }
     }
@@ -2585,7 +2583,7 @@ RooArgSet* RooAbsPdf::getAllConstraints(const RooArgSet& observables, RooArgSet&
   RooArgSet conParams;
 
   // Strip any constraints that are completely decoupled from the other product terms
-  RooArgSet* finalConstraints = new RooArgSet("AllConstraints") ;
+  auto finalConstraints = std::make_unique<RooArgSet>("AllConstraints");
   for(auto * pdf : static_range_cast<RooAbsPdf*>(constraints)) {
 
     RooArgSet tmp;
@@ -2653,11 +2651,10 @@ RooNumGenConfig* RooAbsPdf::specialGeneratorConfig(bool createOnTheFly)
 /// a specialized configuration was associated with this object, that configuration
 /// is returned, otherwise the default configuration for all RooAbsReals is returned
 
-const RooNumGenConfig* RooAbsPdf::getGeneratorConfig() const
+const RooNumGenConfig *RooAbsPdf::getGeneratorConfig() const
 {
-  const RooNumGenConfig* config = specialGeneratorConfig() ;
-  if (config) return config ;
-  return defaultGeneratorConfig() ;
+   const RooNumGenConfig *config = specialGeneratorConfig();
+   return config ? config : defaultGeneratorConfig();
 }
 
 

roofit/roofitcore/src/RooProdPdf.cxx

@@ -1730,11 +1730,10 @@ bool RooProdPdf::isDirectGenSafe(const RooAbsArg& arg) const
 ////////////////////////////////////////////////////////////////////////////////
 /// Look up user specified normalization set for given input PDF component
 
-RooArgSet* RooProdPdf::findPdfNSet(RooAbsPdf const& pdf) const
+RooArgSet *RooProdPdf::findPdfNSet(RooAbsPdf const &pdf) const
 {
-  Int_t idx = _pdfList.index(&pdf) ;
-  if (idx<0) return nullptr;
-  return _pdfNSetList[idx].get() ;
+   Int_t idx = _pdfList.index(&pdf);
+   return idx < 0 ? nullptr : _pdfNSetList[idx].get();
 }
 
 
@@ -1842,9 +1841,10 @@ bool sortedNamePtrsOverlap(std::vector<TNamed const*> const& ptrsA, std::vector<
 /// The pdfParams output parameter communicates to the caller which parameter
 /// are used in the pdfs that are not constraints.
 
-RooArgSet* RooProdPdf::getConstraints(const RooArgSet& observables, RooArgSet const& constrainedParams, RooArgSet &pdfParams) const
+std::unique_ptr<RooArgSet>
+RooProdPdf::getConstraints(const RooArgSet &observables, RooArgSet const &constrainedParams, RooArgSet &pdfParams) const
 {
-  auto constraints = new RooArgSet{"constraints"};
+  auto constraints = std::make_unique<RooArgSet>("constraints");
 
   // For the optimized implementation of checking if two collections overlap by name.
   auto observablesNamePtrs = sortedNamePtrs(observables);