[RF] Replace some usage of Form with standard C++

Author: guitargeek

roofit/roofitcore/src/RooDouble.cxx

@@ -23,6 +23,8 @@ Minimal implementation of a TObject holding a double value.
 **/
 
 #include "RooDouble.h"
+
+#include <sstream>
 #include <string>
 
 
@@ -31,7 +33,9 @@ Minimal implementation of a TObject holding a double value.
 
 RooDouble::RooDouble(double value) : _value(value)
 {
-  SetName(Form("%f",value)) ;
+   std::stringstream ss;
+   ss << value;
+   SetName(ss.str().c_str());
 }
 
 

roofit/roofitcore/src/RooMinimizer.cxx

@@ -536,9 +536,9 @@ RooFit::OwningPtr<RooFitResult> RooMinimizer::save(const char *userName, const c
       return nullptr;
    }
 
-   TString name = userName ? userName : Form("%s", _fcn->getFunctionName().c_str());
-   TString title = userTitle ? userTitle : Form("%s", _fcn->getFunctionTitle().c_str());
-   auto fitRes = std::make_unique<RooFitResult>(name, title);
+   std::string name = userName ? std::string{userName} : _fcn->getFunctionName();
+   std::string title = userTitle ? std::string{userTitle} : _fcn->getFunctionTitle();
+   auto fitRes = std::make_unique<RooFitResult>(name.c_str(), title.c_str());
 
    fitRes->setConstParList(_fcn->constParams());
 
@@ -682,7 +682,9 @@ RooPlot *RooMinimizer::contour(RooRealVar &var1, RooRealVar &var2, double n1, do
             ycoor[npoints] = ycoor[0];
             TGraph *graph = new TGraph(npoints + 1, xcoor.data(), ycoor.data());
 
-            graph->SetName(Form("contour_%s_n%f", _fcn->getFunctionName().c_str(), n[ic]));
+            std::stringstream name;
+            name << "contour_" << _fcn->getFunctionName() << "_n" << n[ic];
+            graph->SetName(name.str().c_str());
             graph->SetLineStyle(ic + 1);
             graph->SetLineWidth(2);
             graph->SetLineColor(kBlue);

roofit/roofitcore/src/RooSecondMoment.cxx

@@ -57,16 +57,18 @@ RooSecondMoment::RooSecondMoment(const char* name, const char* title, RooAbsReal
   std::unique_ptr<RooAbsReal> XF;
   if (centr) {
 
-    string m1name=Form("%s_moment1",GetName()) ;
+    std::string m1name = std::string{GetName()} + "_moment1";
     _mean.putOwnedArg(std::unique_ptr<RooAbsMoment>{func.mean(x)}) ;
 
-    string pname=Form("%s_product",name) ;
+    std::string pname = std::string{name} + "_product";
     _xfOffset = _mean->getVal() ;
-    XF = std::make_unique<RooFormulaVar>(pname.c_str(),Form("pow((@0-%f),2)*@1",_xfOffset),RooArgList(x,func)) ;
+    std::stringstream formula;
+    formula << "std::pow((@0-" << _xfOffset << "),2) * @1";
+    XF = std::make_unique<RooFormulaVar>(pname.c_str(),formula.str().c_str(),RooArgList(x,func)) ;
 
   } else {
 
-    string pname=Form("%s_product",name) ;
+    std::string pname = std::string{name} + "_product";
     XF = std::make_unique<RooProduct>(pname.c_str(),pname.c_str(),RooArgList(x,x,func)) ;
   }
 
@@ -106,17 +108,19 @@ RooSecondMoment::RooSecondMoment(const char* name, const char* title, RooAbsReal
   std::unique_ptr<RooAbsReal> XF;
   if (centr) {
 
-    string m1name=Form("%s_moment1",GetName()) ;
+    std::string m1name = std::string{GetName()} + "_moment1";
     _mean.putOwnedArg(std::unique_ptr<RooAbsMoment>{func.mean(x,nset)}) ;
 
-    string pname=Form("%s_product",name) ;
+    std::string pname = std::string{name} + "_product";
     _xfOffset = _mean->getVal() ;
-    XF = std::make_unique<RooFormulaVar>(pname.c_str(),Form("pow((@0-%f),2)*@1",_xfOffset),RooArgList(x,func)) ;
+    std::stringstream formula;
+    formula << "std::pow((@0-" << _xfOffset << "),2) * @1";
+    XF = std::make_unique<RooFormulaVar>(pname.c_str(),formula.str().c_str(),RooArgList(x,func)) ;
 
 
   } else {
 
-    string pname=Form("%s_product",name) ;
+    std::string pname = std::string{name} + "_product";
     XF = std::make_unique<RooProduct>(pname.c_str(),pname.c_str(),RooArgList(x,x,func)) ;
 
   }

roofit/roofitcore/test/testRooDataSet.cxx

@@ -169,12 +169,15 @@ TEST(RooDataSet, ReducingData)
 
    for (int i = 0; i < 3; ++i) {
       // Check with root:
-      TH1F test_hist(Form("h%i", i), "histo", 10, massmin, massmax);
+      TH1F test_hist(("h" + std::to_string(i)).c_str(), "histo", 10, massmin, massmax);
       chi2cutval += 0.5;
 
-      TCut chi2_test_cut = Form("max(track0_chi2,track1_chi2)<%f", chi2cutval);
+      std::stringstream cutString;
+      cutString << "max(track0_chi2,track1_chi2)<" << chi2cutval;
+      TCut chi2_test_cut = cutString.str().c_str();
 
-      Long64_t drawnEvents = mytree.Draw(Form("mass>>h%i", i), chi2_test_cut /*&& mass_cut*/);
+      std::string drawString = std::string{"mass>>"} + test_hist.GetName();
+      Long64_t drawnEvents = mytree.Draw(drawString.c_str(), chi2_test_cut /*&& mass_cut*/);
       ASSERT_NE(drawnEvents, 0l);
       ASSERT_EQ(test_hist.Integral(), drawnEvents);
 

roofit/roostats/src/BayesianCalculator.cxx

@@ -861,10 +861,10 @@ RooAbsReal* BayesianCalculator::GetPosteriorFunction() const
 
 #ifdef DOLATER // (not clear why this does not work)
       // need to make in this case a likelihood from the nll and make the product with the prior
-      TString likeName = TString("likelihood_times_prior_") + TString(fPriorPdf->GetName());
-      TString formula;
-      formula.Form("exp(-@0+%f+log(@1))",fNLLMin);
-      fLikelihood = new RooFormulaVar(likeName,formula,RooArgList(*fLogLike,*fPriorPdf));
+      std::string likeName = std::string{"likelihood_times_prior_"} + fPriorPdf->GetName();
+      std::stringstream formula;
+      formula << "std::exp(-@0+" << fNllMin << "+log(@1))";
+      fLikelihood = new RooFormulaVar(likeName.c_str(),formula,RooArgList(*fLogLike,*fPriorPdf));
 #else
       // here use RooProdPdf (not very nice) but working
 
@@ -877,9 +877,9 @@ RooAbsReal* BayesianCalculator::GetPosteriorFunction() const
       // // create a unique name for the product pdf
       RooAbsPdf *  pdfAndPrior = fPdf;
       if (fPriorPdf) {
-         TString prodName = TString("product_") + TString(fPdf->GetName()) + TString("_") + TString(fPriorPdf->GetName() );
+         std::string prodName = std::string{"product_"} + fPdf->GetName() + "_" + fPriorPdf->GetName();
          // save this as data member since it needs to be deleted afterwards
-         fProductPdf = new RooProdPdf(prodName,"",RooArgList(*fPdf,*fPriorPdf));
+         fProductPdf = new RooProdPdf(prodName.c_str(),"",RooArgList(*fPdf,*fPriorPdf));
          pdfAndPrior = fProductPdf;
       }
 
@@ -888,10 +888,10 @@ RooAbsReal* BayesianCalculator::GetPosteriorFunction() const
       RemoveConstantParameters(&*constrParams);
       fLogLike = std::unique_ptr<RooAbsReal>{pdfAndPrior->createNLL(*fData, RooFit::Constrain(*constrParams),RooFit::ConditionalObservables(fConditionalObs),RooFit::GlobalObservables(fGlobalObs) )};
 
-      TString likeName = TString("likelihood_times_prior_") + TString(pdfAndPrior->GetName());
-      TString formula;
-      formula.Form("exp(-@0+%f)",fNLLMin);
-      fLikelihood = new RooFormulaVar(likeName,formula,RooArgList(*fLogLike));
+      std::string likeName = std::string{"likelihood_times_prior_"} + pdfAndPrior->GetName();
+      std::stringstream formula;
+      formula << "exp(-@0+" << fNLLMin << ")";
+      fLikelihood = new RooFormulaVar(likeName.c_str(),formula.str().c_str(),RooArgList(*fLogLike));
 #endif