Fix readability in macros

Author: vkucera

PWGHF/HFC/Macros/DhCorrelationFitter.cxx

@@ -158,20 +158,20 @@ DhCorrelationFitter::~DhCorrelationFitter()
 {
   Info("DhCorrelationFitter.cxx", "Destructor is calling");
 
-  if (fHist) {
+  if (fHist != nullptr) {
     delete fHist;
     fHist = 0;
   }
-  if (fFit) {
+  if (fFit != nullptr) {
     delete fFit;
     fFit = 0;
   }
-  if (fGausNS) {
+  if (fGausNS != nullptr) {
     delete fGausNS;
     fGausNS = 0;
   }
   // if (fGausNS2) {delete fGausNS2; fGausNS2 = 0;}
-  if (fPed) {
+  if (fPed != nullptr) {
     delete fPed;
     fPed = 0;
   }
@@ -180,8 +180,9 @@ DhCorrelationFitter::~DhCorrelationFitter()
 DhCorrelationFitter& DhCorrelationFitter::operator=(const DhCorrelationFitter& cfit)
 // assignment operator
 {
-  if (&cfit == this)
+  if (&cfit == this) {
     return *this;
+  }
 
   fIsReflected = cfit.fIsReflected;
   fTypeOfFitFunc = cfit.fTypeOfFitFunc;
@@ -215,7 +216,7 @@ DhCorrelationFitter& DhCorrelationFitter::operator=(const DhCorrelationFitter& c
   return *this;
 }
 
-void DhCorrelationFitter::setExternalValsAndBounds(Int_t nPars, Double_t* vals, Double_t* lowBounds, Double_t* uppBounds)
+void DhCorrelationFitter::setExternalValsAndBounds(Int_t nPars, const Double_t* vals, const Double_t* lowBounds, const Double_t* uppBounds)
 {
 
   fNpars = nPars;
@@ -229,8 +230,6 @@ void DhCorrelationFitter::setExternalValsAndBounds(Int_t nPars, Double_t* vals,
     fExtParsLowBounds[i] = lowBounds[i];
     fExtParsUppBounds[i] = uppBounds[i];
   }
-
-  return;
 }
 
 void DhCorrelationFitter::fitting(Bool_t drawSplitTerm, Bool_t useExternalPars)
@@ -247,8 +246,9 @@ void DhCorrelationFitter::fitting(Bool_t drawSplitTerm, Bool_t useExternalPars)
   //             = 2 : AS mean fixed to pi, NS mean free
   //             = 3 : NS mean fixed to 0, AS mean to pi
 
-  if (useExternalPars)
+  if (useExternalPars) {
     fUseExternalPars = kTRUE;
+  }
 
   if (fFixBase != 0 && fFixBase != 6) {
     Printf("[INFO] DhCorrelationFitter::Fitting, Finding baseline");
@@ -272,10 +272,12 @@ void DhCorrelationFitter::fitting(Bool_t drawSplitTerm, Bool_t useExternalPars)
     fFit->FixParameter(2, 0.);
   }
   if (fFixMean == 2 || fFixMean == 3) {
-    if (fTypeOfFitFunc != 0 && fTypeOfFitFunc != 3)
+    if (fTypeOfFitFunc != 0 && fTypeOfFitFunc != 3) {
       fFit->FixParameter(5, TMath::Pi());
-    if (fTypeOfFitFunc == 3 || fTypeOfFitFunc == 6)
+    }
+    if (fTypeOfFitFunc == 3 || fTypeOfFitFunc == 6) {
       fFit->FixParameter(2, TMath::Pi());
+    }
   }
 
   Printf("[INFO] DhCorrelationFitter::Fitting, Fitting");
@@ -331,7 +333,7 @@ void DhCorrelationFitter::setFitFunction()
   //            = 6: const + VonMises AS
   //            = 7: baseline w v2 modulation + G NS + G AS  (w/ periodicity)
 
-  if (fFit) {
+  if (fFit != nullptr) {
     delete fFit;
     delete fGausNS;
     // delete fGausNS2;
@@ -596,7 +598,7 @@ void DhCorrelationFitter::setFitFunction()
   }
 }
 
-void DhCorrelationFitter::setPointsForBaseline(Int_t nBaselinePoints, Int_t* binsBaseline)
+void DhCorrelationFitter::setPointsForBaseline(Int_t nBaselinePoints, const Int_t* binsBaseline)
 {
 
   fNbasleinePoints = nBaselinePoints;
@@ -606,8 +608,6 @@ void DhCorrelationFitter::setPointsForBaseline(Int_t nBaselinePoints, Int_t* bin
   for (int i = 0; i < fNbasleinePoints; i++) {
     fBinsBaseline[i] = binsBaseline[i];
   }
-
-  return;
 }
 
 Double_t DhCorrelationFitter::findBaseline()
@@ -694,8 +694,9 @@ Double_t DhCorrelationFitter::findBaseline()
     errAv += 1. / (fHist->GetBinError(binPhi) * fHist->GetBinError(binPhi));
     if (!fIsReflected) {
       binPhi = fHist->FindBin(-TMath::Pi() / 2.);
-      if (binPhi < 1)
+      if (binPhi < 1) {
         binPhi = 1;
+      }
       av += fHist->GetBinContent(binPhi) / (fHist->GetBinError(binPhi) * fHist->GetBinError(binPhi));
       errAv += 1. / (fHist->GetBinError(binPhi) * fHist->GetBinError(binPhi));
     } else {
@@ -774,7 +775,7 @@ Double_t DhCorrelationFitter::findBaseline()
 void DhCorrelationFitter::fitBaselineWv2()
 {
 
-  fBaseTransvReg = new TF1("fBaseTransvReg", [](double* x, double* p) {
+  fBaseTransvReg = new TF1("fBaseTransvReg", [](const double* x, const double* p) {
     double xx = x[0]; // x value
     if ((xx >= -TMath::Pi()/2 && xx <= -3*TMath::Pi()/8) || (xx >= 3*TMath::Pi()/8 && xx <= 5*TMath::Pi()/8) || (xx >= 11*TMath::Pi()/8 && xx <= 3*TMath::Pi()/2)) {
         // Gaussian example: p[0] = amplitude, p[1] = mean, p[2] = sigma
@@ -787,8 +788,6 @@ void DhCorrelationFitter::fitBaselineWv2()
 
   TFitResultPtr rFit = fHist->Fit(fBaseTransvReg, "RIMES", "", fMinCorr, fMaxCorr);
   fBaseline = fBaseTransvReg->GetParameter(0);
-
-  return;
 }
 
 void DhCorrelationFitter::calculateYieldsAboveBaseline()
@@ -800,13 +799,15 @@ void DhCorrelationFitter::calculateYieldsAboveBaseline()
   fErrASyieldBinCount = 0;
   std::cout << "[RESULT] Baseline: " << fBaseline << " +- " << fErrBaseline << std::endl;
   Int_t binMinNS = fHist->FindBin(-1.5); // slightly more than -pi/2
-  if (binMinNS < 1)
-    binMinNS = 1;      // with this, it is ok even in the case of a reflected fHist (range 0 - pi)
+  if (binMinNS < 1) {
+    binMinNS = 1; // with this, it is ok even in the case of a reflected fHist (range 0 - pi)
+  }
   Int_t binMaxNS = 6;  // fHist -> FindBin(1.5); // slightly less than +pi/2
   Int_t binMinAS = 11; // fHist -> FindBin(1.6); // slightly more than +pi/2
   Int_t binMaxAS = 16; // fHist -> FindBin(3.14+1.5); // slightly less than +3pi/2
-  if (binMaxAS > fHist->GetNbinsX())
+  if (binMaxAS > fHist->GetNbinsX()) {
     binMaxAS = fHist->GetNbinsX(); // with this, it is ok even in the case of a reflected fHist (range 0 - pi)
+  }
   std::cout << "N bins : " << fHist->GetNbinsX() << std::endl;
   std::cout << "binMinNS : " << binMinNS << std::endl;
   std::cout << "binMaxNS : " << binMaxNS << std::endl;
@@ -827,8 +828,6 @@ void DhCorrelationFitter::calculateYieldsAboveBaseline()
   fErrASyieldBinCount = TMath::Sqrt(fErrASyieldBinCount);
 
   printf("[RESULT] Bin counting results: NS Yield = %.3f +- %.3f \n[RESULT] Bin counting results: AS Yield: %.3f +- %.3f \n", fNSyieldBinCount, fErrNSyieldBinCount, fASyieldBinCount, fErrASyieldBinCount);
-
-  return;
 }
 
 Double_t DhCorrelationFitter::calculateBaseline(TH1F*& histo, Bool_t totalRange)

PWGHF/HFC/Macros/DhCorrelationFitter.h

@@ -55,8 +55,8 @@ class DhCorrelationFitter
     fMinAssoPt = ptAssocMin;
     fMaxAssoPt = ptAssocMax;
   }
-  void setExternalValsAndBounds(Int_t nPars, Double_t* vals, Double_t* lowBounds, Double_t* uppBounds);
-  void setPointsForBaseline(Int_t nBaselinePoints, Int_t* binsBaseline);
+  void setExternalValsAndBounds(Int_t nPars, const Double_t* vals, const Double_t* lowBounds, const Double_t* uppBounds);
+  void setPointsForBaseline(Int_t nBaselinePoints, const Int_t* binsBaseline);
   void setReflectedCorrHisto(Bool_t isReflected) { fIsTotal = !isReflected; }
   void setBaselineUpOrDown(Bool_t baseUp, Bool_t baseDown)
   {

PWGHF/HFC/Macros/ExtractOutputCorrel.C

@@ -37,7 +37,7 @@ using namespace rapidjson;
 template <typename ValueType>
 void readArray(const Value& jsonArray, std::vector<ValueType>& output)
 {
-  for (auto it = jsonArray.Begin(); it != jsonArray.End(); it++) {
+  for (const auto* it = jsonArray.Begin(); it != jsonArray.End(); it++) {
     auto value = it->template Get<ValueType>();
     output.emplace_back(value);
   }
@@ -180,33 +180,41 @@ void extractOutputCorrelDs(const TString cfgFileName = "config_CorrAnalysis.json
   plotter->setCorrBiasBtoD(applyBiasBtoDCorr);
   plotter->setDebugLevel(1);
 
-  if (!flagSpecie)
+  if (!flagSpecie) {
     std::cout << "[ERROR] Wrong D meson flag" << std::endl;
+  }
 
   // Set the input file config
   setInputCorrelNames(plotter, pathFileSE, pathFileME, dirSE, dirME, histoNameCorrSignal, histoNameCorrSideba, histoNameCorrSidebaLeft, histoNameCorrSidebaRight);
   setInputHistoInvMassNames(plotter, pathFileMass, inputHistoMassName);
-  if (applyFDCorr)
+  if (applyFDCorr) {
     setInputHistoFdSubtraction(plotter, pathFileFDTemplate, pathFileFDPromptFrac, histoNameFDTemplatePrompt, histoNameFDTemplateNonPrompt, histoNameRawFracPrompt);
-  if (applySecPartCorr)
+  }
+  if (applySecPartCorr) {
     setInputHistoSecPart(plotter, pathFileSecPart, dirSecPart, histoNamePrimaryPart, histoNameAllPart);
-  if (applyBiasBtoDCorr)
+  }
+  if (applyBiasBtoDCorr) {
     setInputHistoBiasBtoD(plotter, pathfFilePromptMcRec, pathfFileNonPromptMcRec);
+  }
   Bool_t readSEandME = plotter->readInputSeAndMe();
-  if (readSEandME)
+  if (readSEandME) {
     std::cout << "Files SE and ME read correctly" << std::endl;
+  }
   Bool_t readInvMass = plotter->readInputInvMass();
-  if (readInvMass)
+  if (readInvMass) {
     std::cout << "Files inv. mass read correctly" << std::endl;
+  }
   if (applyFDCorr) {
     Bool_t readFDSubtr = plotter->readInputFdSubtr();
-    if (readFDSubtr)
+    if (readFDSubtr) {
       std::cout << "Files for FD subtr. read correctly" << std::endl;
+    }
   }
   if (applySecPartCorr) {
     Bool_t readSecPart = plotter->readInputSecondaryPartContamination();
-    if (readSecPart)
+    if (readSecPart) {
       std::cout << "Files for secondary part. contamination read correctly" << std::endl;
+    }
   }
 
   // Loop over candidate pt and assoc. particle pt
@@ -216,10 +224,10 @@ void extractOutputCorrelDs(const TString cfgFileName = "config_CorrAnalysis.json
     for (int iBinPtHad = 0; iBinPtHad < nBinsPtHad; iBinPtHad++) {
       plotter->setBinCandAndHad(iBinPtCand + 1, iBinPtHad + 1);
       plotter->extractCorrelations(binsPtCandIntervals[iBinPtCand], binsPtCandIntervals[iBinPtCand + 1], binsPtHadIntervals[iBinPtHad], binsPtHadIntervals[iBinPtHad + 1], codeNameAnalysis);
-      hCorrectedCorrel[iBinPtCand][iBinPtHad] = (TH1D*)plotter->getCorrectedCorrHisto();
-      hCorrectedCorrelBaselineSubtr[iBinPtCand][iBinPtHad] = (TH1D*)plotter->getCorrectedCorrHistoBaselineSubtr();
-      hCorrectedCorrelReflected[iBinPtCand][iBinPtHad] = (TH1D*)plotter->getCorrectedCorrHistoReflected();
-      hCorrectedCorrelReflectedBaselineSubtr[iBinPtCand][iBinPtHad] = (TH1D*)plotter->getCorrectedCorrHistoReflectedBaselineSubtr();
+      hCorrectedCorrel[iBinPtCand][iBinPtHad] = plotter->getCorrectedCorrHisto();
+      hCorrectedCorrelBaselineSubtr[iBinPtCand][iBinPtHad] = plotter->getCorrectedCorrHistoBaselineSubtr();
+      hCorrectedCorrelReflected[iBinPtCand][iBinPtHad] = plotter->getCorrectedCorrHistoReflected();
+      hCorrectedCorrelReflectedBaselineSubtr[iBinPtCand][iBinPtHad] = plotter->getCorrectedCorrHistoReflectedBaselineSubtr();
     }
   }
 
@@ -262,8 +270,6 @@ void extractOutputCorrelDs(const TString cfgFileName = "config_CorrAnalysis.json
     }
   }
   outFileReflectedBaselineSubtr->Close();
-
-  return;
 }
 
 void setInputCorrelNames(DhCorrelationExtraction* plotter, TString pathFileSE, TString pathFileME, TString dirSE, TString dirME, TString histoNameCorrSignal, TString histoNameCorrSideba, TString histoNameCorrSidebaLeft, TString histoNameCorrSidebaRight)
@@ -282,8 +288,6 @@ void setInputCorrelNames(DhCorrelationExtraction* plotter, TString pathFileSE, T
   plotter->setMeCorrelHistoSidebandLeftName(histoNameCorrSidebaLeft.Data());
   plotter->setSeCorrelHistoSidebandRightName(histoNameCorrSidebaRight.Data());
   plotter->setMeCorrelHistoSidebandRightName(histoNameCorrSidebaRight.Data());
-
-  return;
 }
 
 void setInputHistoInvMassNames(DhCorrelationExtraction* plotter, TString pathFileMass, std::vector<std::string> inputMassNames)
@@ -293,8 +297,6 @@ void setInputHistoInvMassNames(DhCorrelationExtraction* plotter, TString pathFil
   plotter->setMassHistoNameSgn(inputMassNames[0].data());
   plotter->setMassHistoNameBkg(inputMassNames[1].data());
   plotter->setMassHistoNameSBs(inputMassNames[2].data());
-
-  return;
 }
 
 void setInputHistoFdSubtraction(DhCorrelationExtraction* plotter, TString pathFileFDTemplate, TString pathFileFDPromptFrac, TString histoNameFDTemplatePrompt, TString histoNameFDTemplateNonPrompt, TString histoNameRawFracPrompt)
@@ -305,8 +307,6 @@ void setInputHistoFdSubtraction(DhCorrelationExtraction* plotter, TString pathFi
   plotter->setInputHistoNameFdTemplatePrompt(histoNameFDTemplatePrompt.Data());
   plotter->setInputHistoNameFdTemplateNonPrompt(histoNameFDTemplateNonPrompt.Data());
   plotter->setInputHistoNameFdPromptFrac(histoNameRawFracPrompt.Data());
-
-  return;
 }
 
 void setInputHistoSecPart(DhCorrelationExtraction* plotter, TString pathFileSecPart, TString dirSecPartName, TString histoNamePrimaryPart, TString histoNameAllPart)
@@ -315,14 +315,10 @@ void setInputHistoSecPart(DhCorrelationExtraction* plotter, TString pathFileSecP
   plotter->setInputFilenameSecPart(pathFileSecPart.Data());
   plotter->setDirNameSecPart(dirSecPartName.Data());
   plotter->setHistoSecPartName(histoNamePrimaryPart.Data(), histoNameAllPart.Data());
-
-  return;
 }
 
 void setInputHistoBiasBtoD(DhCorrelationExtraction* plotter, TString pathfFilePromptMcRec, TString pathfFileNonPromptMcRec)
 {
 
   plotter->setInputFilenameBiasBtoD(pathfFilePromptMcRec.Data(), pathfFileNonPromptMcRec.Data());
-
-  return;
 }

PWGHF/HFC/Macros/FitCorrel.C

@@ -44,7 +44,7 @@ bool removeNSPeakLowPt = false;
 template <typename ValueType>
 void readArray(const Value& jsonArray, vector<ValueType>& output)
 {
-  for (auto it = jsonArray.Begin(); it != jsonArray.End(); it++) {
+  for (const auto* it = jsonArray.Begin(); it != jsonArray.End(); it++) {
     auto value = it->template Get<ValueType>();
     output.emplace_back(value);
   }
@@ -234,7 +234,7 @@ void fitCorrelDs(const TString cfgFileName = "config_CorrAnalysis.json")
       canvasCorrPhi[iBinPtHad]->cd(iBinPtCand + 1);
       canvasCorrPhi[iBinPtHad]->SetTickx();
       canvasCorrPhi[iBinPtHad]->SetTicky();
-      hCorrPhi[iBinPtCand][iBinPtHad]->SetStats(0);
+      hCorrPhi[iBinPtCand][iBinPtHad]->SetStats(false);
       hCorrPhi[iBinPtCand][iBinPtHad]->SetMinimum(0);
       // hCorrPhi[iBinPtCand][iBinPtHad] -> Draw();
 
@@ -336,14 +336,17 @@ void fitCorrelDs(const TString cfgFileName = "config_CorrAnalysis.json")
       tScaleUnc->SetTextColor(kBlack);
       tScaleUnc->AddText(0., 0., "corr. unc.");
 
-      if (drawSystematicErrors)
+      if (drawSystematicErrors) {
         hSystematicErrorsPlot[iBinPtCand][iBinPtHad]->Draw("E2same");
+      }
       hCorrPhi[iBinPtCand][iBinPtHad]->Draw("same");
       pttext->Draw("same");
-      if (drawSystematicErrors)
+      if (drawSystematicErrors) {
         tCorrUncDs->Draw("same");
-      if (drawSystematicErrors)
+      }
+      if (drawSystematicErrors) {
         tScaleUnc->Draw("same");
+      }
     }
     canvasCorrPhi[iBinPtHad]->SaveAs(Form("Output_CorrelationFitting_%s_png/CorrPhiDs_PtBinAssoc%d.png", codeNameAnalysis.data(), iBinPtHad + 1));
     canvasCorrPhi[iBinPtHad]->SaveAs(Form("Output_CorrelationFitting_%s_Root/CorrPhiDs_PtBinAssoc%d.root", codeNameAnalysis.data(), iBinPtHad + 1));
@@ -456,8 +459,6 @@ void fitCorrelDs(const TString cfgFileName = "config_CorrAnalysis.json")
     c4->SaveAs(Form("Output_CorrelationFitting_%s_Root/AwaySideSigma_PtBinAssoc%d.root", codeNameAnalysis.data(), iBinPtHad + 1));
     c5->SaveAs(Form("Output_CorrelationFitting_%s_Root/Baseline_PtBinAssoc%d.root", codeNameAnalysis.data(), iBinPtHad + 1));
   }
-
-  return;
 }
 
 void setTH1HistoStyle(TH1D*& histo, TString hTitle, TString hXaxisTitle, TString hYaxisTitle,
@@ -483,8 +484,6 @@ void setTH1HistoStyle(TH1D*& histo, TString hTitle, TString hXaxisTitle, TString
   histo->GetYaxis()->SetLabelSize(hLabelYaxisSize);
   histo->GetXaxis()->CenterTitle(centerXaxisTitle);
   histo->GetYaxis()->CenterTitle(centerYaxisTitle);
-
-  return;
 }
 
 void setTH1HistoStyle(TH1F*& histo, TString hTitle, TString hXaxisTitle, TString hYaxisTitle,
@@ -510,6 +509,4 @@ void setTH1HistoStyle(TH1F*& histo, TString hTitle, TString hXaxisTitle, TString
   histo->GetYaxis()->SetLabelSize(hLabelYaxisSize);
   histo->GetXaxis()->CenterTitle(centerXaxisTitle);
   histo->GetYaxis()->CenterTitle(centerYaxisTitle);
-
-  return;
 }