[RF] Apply git clang-format to RooFitResult

Author: guitargeek

roofit/roofitcore/inc/RooFitResult.h

@@ -33,7 +33,7 @@
 class RooArgSet ;
 class RooAbsPdf ;
 class RooPlot;
-class TH2 ;
+class TH2;
 
 class RooFitResult : public TNamed, public RooPrintable, public RooDirItem {
 public:
@@ -183,11 +183,12 @@ 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 std::unique_ptr<RooArgList> _globalCorr;   ///<! 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 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
+  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,11 @@ RooFitResult::RooFitResult(const RooFitResult &other)
 
   other._finalPars->snapshot(*_finalPars);
   if (other._randomPars) {
-    _randomPars = std::make_unique<RooArgList>();
-    other._randomPars->snapshot(*_randomPars);
+     _randomPars = std::make_unique<RooArgList>();
+     other._randomPars->snapshot(*_randomPars);
   }
-  if (other._Lt) _Lt = std::make_unique<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) ;
@@ -113,7 +114,8 @@ RooFitResult::~RooFitResult()
 {
   if (_constPars) delete _constPars ;
   if (_initPars)  delete _initPars ;
-  if (_finalPars) delete _finalPars ;
+  if (_finalPars)
+     delete _finalPars;
   if (_CM) delete _CM ;
   if (_VM) delete _VM ;
   if (_GC) delete _GC ;
@@ -331,37 +333,36 @@ RooPlot *RooFitResult::plotOn(RooPlot *frame, const char *parName1, const char *
 const RooArgList& RooFitResult::randomizePars() const
 {
   Int_t nPar= _finalPars->size();
-  if(!_randomPars) { // first-time initialization
-    assert(nullptr != _finalPars);
-    // create the list of random values to fill
-    _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")
-    TMatrix L(nPar,nPar);
-    for(Int_t iPar= 0; iPar < nPar; iPar++) {
-      // calculate the diagonal term first
-      L(iPar,iPar)= covariance(iPar,iPar);
-      for(Int_t k= 0; k < iPar; k++) {
-   double tmp= L(k,iPar);
-   L(iPar,iPar)-= tmp*tmp;
-      }
-      L(iPar,iPar)= sqrt(L(iPar,iPar));
-      // then the off-diagonal terms
-      for(Int_t jPar= iPar+1; jPar < nPar; jPar++) {
-   L(iPar,jPar)= covariance(iPar,jPar);
-   for(Int_t k= 0; k < iPar; k++) {
-     L(iPar,jPar)-= L(k,iPar)*L(k,jPar);
-   }
-   L(iPar,jPar)/= L(iPar,iPar);
-      }
-    }
-    // remember Lt
-    _Lt= std::make_unique<TMatrix>(TMatrix::kTransposed,L);
-  }
-  else {
-    // reset to the final fit values
-    _randomPars->assign(*_finalPars);
+  if (!_randomPars) { // first-time initialization
+     assert(nullptr != _finalPars);
+     // create the list of random values to fill
+     _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")
+     TMatrix L(nPar, nPar);
+     for (Int_t iPar = 0; iPar < nPar; iPar++) {
+        // calculate the diagonal term first
+        L(iPar, iPar) = covariance(iPar, iPar);
+        for (Int_t k = 0; k < iPar; k++) {
+           double tmp = L(k, iPar);
+           L(iPar, iPar) -= tmp * tmp;
+        }
+        L(iPar, iPar) = sqrt(L(iPar, iPar));
+        // then the off-diagonal terms
+        for (Int_t jPar = iPar + 1; jPar < nPar; jPar++) {
+           L(iPar, jPar) = covariance(iPar, jPar);
+           for (Int_t k = 0; k < iPar; k++) {
+              L(iPar, jPar) -= L(k, iPar) * L(k, jPar);
+           }
+           L(iPar, jPar) /= L(iPar, iPar);
+        }
+     }
+     // remember Lt
+     _Lt = std::make_unique<TMatrix>(TMatrix::kTransposed, L);
+  } else {
+     // reset to the final fit values
+     _randomPars->assign(*_finalPars);
   }
 
   // create a vector of unit Gaussian variables
@@ -622,25 +623,25 @@ void RooFitResult::fillLegacyCorrMatrix() const
   _corrMatrix.Delete();
 
   // Build holding arrays for correlation coefficients
-  _globalCorr = std::make_unique<RooArgList>("globalCorrelations") ;
+  _globalCorr = std::make_unique<RooArgList>("globalCorrelations");
 
   for(RooAbsArg* arg : *_initPars) {
     // Create global correlation value holder
     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.));
+    _globalCorr->addOwned(std::make_unique<RooRealVar>(gcName.c_str(), gcTitle.c_str(), 0.));
 
     // Create array with correlation holders for this parameter
-    RooArgList* corrMatrixRow = new RooArgList(("C[" + argName + ",*]").c_str()) ;
+    RooArgList *corrMatrixRow = new RooArgList(("C[" + argName + ",*]").c_str());
     _corrMatrix.Add(corrMatrixRow) ;
     for(RooAbsArg* arg2 : *_initPars) {
 
-      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.));
+       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.));
     }
   }
 
@@ -1301,7 +1302,7 @@ void RooFitResult::Streamer(TBuffer &R__b)
       R__b >> _constPars;
       R__b >> _initPars;
       R__b >> _finalPars;
-      RooArgList* globalCorr;
+      RooArgList *globalCorr;
       R__b >> globalCorr;
       _globalCorr.reset(globalCorr);
       _corrMatrix.Streamer(R__b);