[PWGHF] Cleanup and bug fixes using cppcheck and clang-tidy

PWGHF/D2H/Macros/runMassFitter.C

@@ -237,14 +237,14 @@ int runMassFitter(const TString& configFileName)
       hMass[iSliceVar] = inputFile->Get<TH1>(inputHistoName[iSliceVar].data());
       if (enableRefl) {
         hMassRefl[iSliceVar] = inputFileRefl->Get<TH1>(reflHistoName[iSliceVar].data());
-        hMassSgn[iSliceVar] = inputFileRefl->Get<TH1>(fdHistoName[iSliceVar].data());
-        hMassSgn[iSliceVar]->Add(inputFileRefl->Get<TH1>(promptHistoName[iSliceVar].data()));
         if (hMassRefl[iSliceVar] == nullptr) {
           throw std::runtime_error("ERROR: MC reflection histogram not found! Exit!");
         }
+        hMassSgn[iSliceVar] = inputFileRefl->Get<TH1>(fdHistoName[iSliceVar].data());
         if (hMassSgn[iSliceVar] == nullptr) {
           throw std::runtime_error("ERROR: MC prompt or FD histogram not found! Exit!");
         }
+        hMassSgn[iSliceVar]->Add(inputFileRefl->Get<TH1>(promptHistoName[iSliceVar].data()));
       }
     } else {
       hMass[iSliceVar] = inputFile->Get<TH1>(promptHistoName[iSliceVar].data());
@@ -505,9 +505,6 @@ int runMassFitter(const TString& configFileName)
       hRawYieldsChiSquareTotal->SetBinError(iSliceVar + 1, 1.e-20);
       if (enableRefl) {
         hReflectionOverSignal->SetBinContent(iSliceVar + 1, reflOverSgn);
-      }
-
-      if (enableRefl) {
         if (nSliceVarBins > 1) {
           canvasRefl[iCanvas]->cd(iSliceVar - nCanvasesMax * iCanvas + 1);
         } else {
@@ -625,7 +622,7 @@ void divideCanvas(TCanvas* canvas, int nSliceVarBins)
   }
 }
 
-int main(int argc, char* argv[])
+int main(int argc, const char* argv[])
 {
   if (argc == 1) {
     throw std::runtime_error("Not enough arguments. Please use\n./runMassFitter configFileName");

PWGHF/D2H/Tasks/taskCharmPolarisation.cxx

@@ -1393,8 +1393,8 @@ struct HfTaskCharmPolarisation {
   template <charm_polarisation::DecayChannel Channel>
   bool isInSignalRegion(float invMass)
   {
-    float invMassMin = 0.f;
-    float invMassMax = 100.f;
+    float invMassMin;
+    float invMassMax;
     if constexpr (Channel == charm_polarisation::DecayChannel::DstarToDzeroPi) { // D*+
       invMassMin = 0.142f;
       invMassMax = 0.15f;
@@ -1576,7 +1576,7 @@ struct HfTaskCharmPolarisation {
       // variable definition
       float pxDau{-1000.f}, pyDau{-1000.f}, pzDau{-1000.f};
       float pxCharmHad{-1000.f}, pyCharmHad{-1000.f}, pzCharmHad{-1000.f};
-      float massDau{0.f}, invMassCharmHad{0.f}, invMassCharmHadForSparse{0.f}, invMassD0{0.f}, invMassKPiLc{0.f}, invMassPKLc{0.f}, invMassPPiLc{0.f};
+      double massDau{0.}, invMassCharmHad{0.}, invMassCharmHadForSparse{0.}, invMassD0{0.}, invMassKPiLc{0.}, invMassPKLc{0.}, invMassPPiLc{0.};
       float rapidity{-999.f};
       std::array<float, 3> outputMl{-1.f, -1.f, -1.f};
       int isRotatedCandidate = 0; // currently meaningful only for Lc->pKpi
@@ -1834,12 +1834,11 @@ struct HfTaskCharmPolarisation {
         float const xQvec = (*qVecs).at(0);
         float const yQvec = (*qVecs).at(1);
         ROOT::Math::XYZVector const qVecNorm = ROOT::Math::XYZVector(yQvec, -xQvec, 0.f);
-        float cosThetaStarEP = -10.f;
         float const phiEP = -99.f;
 
         if (activateTHnSparseCosThStarEP) {
           // EP
-          cosThetaStarEP = qVecNorm.Dot(threeVecDauCM) / std::sqrt(threeVecDauCM.Mag2()) / std::sqrt(qVecNorm.Mag2());
+          float cosThetaStarEP = qVecNorm.Dot(threeVecDauCM) / std::sqrt(threeVecDauCM.Mag2()) / std::sqrt(qVecNorm.Mag2());
           fillRecoHistos<Channel, WithMl, DoMc, charm_polarisation::CosThetaStarType::EP>(invMassCharmHadForSparse, ptCharmHad, numPvContributors, rapidity, invMassD0, invMassKPiLc, cosThetaStarEP, phiEP, outputMl, isRotatedCandidate, origin, ptBhadMother, resoChannelLc, absEtaTrackMin, numItsClsMin, numTpcClsMin, charge, nMuons, partRecoDstar);
         }
       }
@@ -2310,8 +2309,7 @@ struct HfTaskCharmPolarisation {
                           TracksWithExtra const& tracks)
   {
     for (const auto& collision : collisions) {
-      float centrality = {-1.f};
-      centrality = o2::hf_centrality::getCentralityColl(collision, centEstimator);
+      const auto centrality = o2::hf_centrality::getCentralityColl(collision, centEstimator);
       if (centrality < centralityMin || centrality > centralityMax) {
         continue; // skip this collision if outside of the centrality range
       }
@@ -2340,8 +2338,7 @@ struct HfTaskCharmPolarisation {
                                 TracksWithExtra const& tracks)
   {
     for (const auto& collision : collisions) {
-      float centrality = {-1.f};
-      centrality = o2::hf_centrality::getCentralityColl(collision, centEstimator);
+      const auto centrality = o2::hf_centrality::getCentralityColl(collision, centEstimator);
       if (centrality < centralityMin || centrality > centralityMax) {
         continue; // skip this collision if outside of the centrality range
       }
@@ -2371,11 +2368,10 @@ struct HfTaskCharmPolarisation {
                             FilteredCandDstarWSelFlagAndMc const& dstarCandidates,
                             TracksWithExtra const& tracks)
   {
-    float centrality = {-1.f};
     int numPvContributorsGen{0};
 
     for (const auto& collision : collisions) { // loop over reco collisions associated to this gen collision
-      centrality = o2::hf_centrality::getCentralityColl(collision, centEstimator);
+      const auto centrality = o2::hf_centrality::getCentralityColl(collision, centEstimator);
       if (centrality < centralityMin || centrality > centralityMax) {
         continue; // skip this collision if outside of the centrality range
       }
@@ -2400,7 +2396,7 @@ struct HfTaskCharmPolarisation {
     }
     for (const auto& mcParticle : mcParticles) {
       const auto& recoCollsPerMcColl = collisions.sliceBy(colPerMcCollision, mcParticle.mcCollision().globalIndex());
-      float const cent = o2::hf_centrality::getCentralityGenColl(recoCollsPerMcColl, centEstimator);
+      const auto cent = o2::hf_centrality::getCentralityGenColl(recoCollsPerMcColl, centEstimator);
       runMcGenPolarisationAnalysis<charm_polarisation::DecayChannel::DstarToDzeroPi, true>(mcParticle, mcParticles, numPvContributorsGen, &cent);
     }
   }
@@ -2412,11 +2408,10 @@ struct HfTaskCharmPolarisation {
                                   FilteredCandDstarWSelFlagAndMcAndMl const& dstarCandidates,
                                   TracksWithExtra const& tracks)
   {
-    float centrality = {-1.f};
     int numPvContributorsGen{0};
 
     for (const auto& collision : collisions) { // loop over reco collisions associated to this gen collision
-      centrality = o2::hf_centrality::getCentralityColl(collision, centEstimator);
+      const auto centrality = o2::hf_centrality::getCentralityColl(collision, centEstimator);
       if (centrality < centralityMin || centrality > centralityMax) {
         continue; // skip this collision if outside of the centrality range
       }
@@ -2441,7 +2436,7 @@ struct HfTaskCharmPolarisation {
     }
     for (const auto& mcParticle : mcParticles) {
       const auto& recoCollsPerMcColl = collisions.sliceBy(colPerMcCollision, mcParticle.mcCollision().globalIndex());
-      float const cent = o2::hf_centrality::getCentralityGenColl(recoCollsPerMcColl, centEstimator);
+      const auto cent = o2::hf_centrality::getCentralityGenColl(recoCollsPerMcColl, centEstimator);
       runMcGenPolarisationAnalysis<charm_polarisation::DecayChannel::DstarToDzeroPi, true>(mcParticle, mcParticles, numPvContributorsGen, &cent);
     }
   }

PWGHF/D2H/Tasks/taskSigmacToCascade.cxx

@@ -1,4 +1,4 @@
 // Copyright 2019-2020 CERN and copyright holders of ALICE O2.
 // See https://alice-o2.web.cern.ch/copyright for details of the copyright holders.
 // All rights not expressly granted are reserved.
 //
@@ -45,21 +45,21 @@
   Configurable<int> selectionFlagLcbarToK0sP{"selectionFlagLcbarToK0sP", 1, "Selection Flag for Lcbar"};
   Configurable<float> etaCandMax{"etaCandMax", -1., "max. cand. pseudorapidity"};
   Configurable<std::vector<double>> binsPt{"binsPt", std::vector<double>{hf_cuts_lc_to_k0s_p::vecBinsPt}, "pT bin limits"};
   ConfigurableAxis thnConfigAxisPt{"thnConfigAxisPt", {16, 0, 16}, ""};
   ConfigurableAxis thnConfigAxisDecLength{"thnConfigAxisDecLength", {10, 0, 0.05}, ""};
   ConfigurableAxis thnConfigAxisDecLengthXY{"thnConfigAxisDecLengthXY", {10, 0, 0.05}, ""};
   ConfigurableAxis thnConfigAxisCPA{"thnConfigAxisCPA", {20, 0.8, 1}, ""};
   ConfigurableAxis thnConfigAxisCPAXY{"thnConfigAxisCPAXY", {20, 0.8, 1}, ""};
   ConfigurableAxis configAxisMassLambdaC{"configAxisMassLambdaC", {600, 1.98, 2.58}, ""};
   ConfigurableAxis configAxisDeltaMassSigmaC{"configAxisDeltaMassSigmaC", {200, 0.13, 0.23}, ""};
   Configurable<float> nSigmaSoftPi{"pionNSigma", 3., "NSigma TPC selection"};
   ConfigurableAxis configAxisChargeSigmaC{"configAxisChargeSigmaC", {3, 0, 3}, "charge of SigmaC"};
 
   /// Filter the candidate Λc+ used for the Σc0,++ creation
   Filter filterSelectCandidateLc = (aod::hf_sel_candidate_lc_to_k0s_p::isSelLcToK0sP >= selectionFlagLcToK0sP ||
                                     aod::hf_sel_candidate_lc_to_k0s_p::isSelLcToK0sP >= selectionFlagLcbarToK0sP);
 
   using RecoLc = soa::Filtered<soa::Join<aod::HfCandCascExt, aod::HfSelLcToK0sP>>;
 
   HistogramRegistry registry{"registry"};
   HfHelper hfHelper;
@@ -140,7 +140,6 @@
   {
     for (const auto& candSc : candScs) {
       const auto& candidateLc = candSc.prongLc_as<RecoLc>();
-      float massSc(-1.), massLc(-1.), deltaMass(-1.);
       float ptSc(candSc.pt()), ptLc(candidateLc.pt());
       float const etaSc(candSc.eta()) /*, etaLc(candidateLc.eta())*/;
       float const phiSc(candSc.phi()) /*, phiLc(candidateLc.phi())*/;
@@ -149,12 +148,12 @@
       float cpaLc(candidateLc.cpa()), cpaXYLc(candidateLc.cpaXY());
       float y(-1.);
 
-      massLc = hfHelper.invMassLcToK0sP(candidateLc);
-      massSc = hfHelper.invMassScRecoLcToK0sP(candSc, candidateLc);
-      deltaMass = massSc - massLc;
+      auto massLc = hfHelper.invMassLcToK0sP(candidateLc);
+      auto massSc = hfHelper.invMassScRecoLcToK0sP(candSc, candidateLc);
+      auto deltaMass = massSc - massLc;
       if (candSc.charge() == 0) {
         y = hfHelper.ySc0(candSc);
       } else if (candSc.charge() == 2) {
         y = hfHelper.yScPlusPlus(candSc);
       }
       registry.fill(HIST("Data/hDeltaMassSc0PlusPlus"), deltaMass);           /// Σc(0,++) for both charges
@@ -184,7 +183,7 @@
           registry.get<THnSparse>(HIST("hnSigmaC0PlusPlus"))->Fill(candSc.charge(), massLc, ptLc, deltaMass, decLengthLc, decLengthXYLc, cpaLc, cpaXYLc, ptSc);
         }
         /// Σc0
       } else if (candSc.charge() == 2) {
         registry.fill(HIST("Data/hDeltaMassScPlusPlus"), deltaMass);           /// Σc++
         registry.fill(HIST("Data/hDeltaMassScPlusPlusVsPt"), deltaMass, ptSc); /// Σc++
         registry.fill(HIST("Data/hEtaScPlusPlus"), etaSc);                     /// Σc++

PWGHF/HFC/Macros/DhCorrelationExtraction.cxx

@@ -34,7 +34,7 @@
 
 #include <cstdio>
 #include <cstdlib>
 #include <iostream>
 
 DhCorrelationExtraction::DhCorrelationExtraction() : // default constructor
                                                      fFileMass(nullptr),
@@ -116,6 +116,8 @@
                                                                                           fFilePromptMc(source.fFilePromptMc),
                                                                                           fFileNonPromptMc(source.fFileNonPromptMc),
                                                                                           fDirMass(source.fDirMass),
+                                                                                          fDirSE(source.fDirSE),
+                                                                                          fDirME(source.fDirME),
                                                                                           fDirSecPart(source.fDirSecPart),
                                                                                           fCorrectedCorrHisto(source.fCorrectedCorrHisto),
                                                                                           fCorrectedCorrHistoBaselineSubtr(source.fCorrectedCorrHistoBaselineSubtr),
@@ -181,7 +183,7 @@
 Bool_t DhCorrelationExtraction::setDmesonSpecie(DmesonSpecie k)
 {
 
   if (k < 0 || k > 3) {
     printf("[ERROR] D meson specie not correctly set!\n");
     return kFALSE;
   }
@@ -942,16 +944,15 @@
 TH1D* DhCorrelationExtraction::evaluateMcClosModulations(Double_t ptCandMin, Double_t ptCandMax, Double_t ptHadMin, Double_t ptHadMax)
 {
 
-  TH1D* hModul = new TH1D();
+  TH1D* hModul = nullptr;
 
   fFilePromptMc = TFile::Open(fFilePromptMcRecName.Data());
-  fFileNonPromptMc = TFile::Open(fFileNonPromptMcRecName.Data());
-
   if (fFilePromptMc == nullptr) {
-    std::cout << "[ERROR] File prompt MC rec cannot be opened! check your file path!" << std::endl;
+    throw std::runtime_error("[ERROR] File prompt MC rec cannot be opened! check your file path!");
   }
+  fFileNonPromptMc = TFile::Open(fFileNonPromptMcRecName.Data());
   if (fFileNonPromptMc == nullptr) {
-    std::cout << "[ERROR] File non-prompt MC rec cannot be opened! check your file path!" << std::endl;
+    throw std::runtime_error("[ERROR] File non-prompt MC rec cannot be opened! check your file path!");
   }
 
   // TODO: generalise this part
@@ -1019,15 +1020,15 @@
 TH2D* DhCorrelationExtraction::getCorrelHisto(Int_t sEorMe, Int_t sorSb, Int_t pool, Double_t ptCandMin, Double_t ptCandMax, Double_t ptHadMin, Double_t ptHadMax)
 {
   // TODO: Subtraction of softpion
-  TH2D* h2D = new TH2D(); // pointer to be returned
+  TH2D* h2D = nullptr; // pointer to be returned
 
   THnSparseD* hSparse = nullptr;
   if (sEorMe == kSE) { // Same Event
     if (sorSb == kSign) {
       hSparse = reinterpret_cast<THnSparseD*>(fDirSE->Get(fSECorrelSignalRegionName.Data()));
     } else if (!fSidebandDivided) {
       hSparse = reinterpret_cast<THnSparseD*>(fDirSE->Get(fSECorrelSidebandsName.Data()));
-    } else if (fSidebandDivided) {
+    } else {
       if (fUseSidebLeft && !fUseSidebRight) {
         hSparse = reinterpret_cast<THnSparseD*>(fDirSE->Get(fSECorrelSidebandLeftName.Data()));
       } else if (!fUseSidebLeft && fUseSidebRight) {
@@ -1044,7 +1045,7 @@
       hSparse = reinterpret_cast<THnSparseD*>(fDirME->Get(fMECorrelSignalRegionName.Data()));
     } else if (!fSidebandDivided) {
       hSparse = reinterpret_cast<THnSparseD*>(fDirME->Get(fMECorrelSidebandsName.Data()));
-    } else if (fSidebandDivided) {
+    } else {
       if (fUseSidebLeft && !fUseSidebRight) {
         hSparse = reinterpret_cast<THnSparseD*>(fDirME->Get(fMECorrelSidebandLeftName.Data()));
       } else if (!fUseSidebLeft && fUseSidebRight) {
@@ -1183,7 +1184,7 @@
 TH2D* DhCorrelationExtraction::getFdTemplateHisto(Int_t promptOrFd, Double_t ptCandMin, Double_t ptCandMax, Double_t ptHadMin, Double_t ptHadMax)
 {
 
-  TH2D* h2D = new TH2D(); // pointer to be returned
+  TH2D* h2D = nullptr; // pointer to be returned
 
   if (promptOrFd == kPrompt) {
     h2D = reinterpret_cast<TH2D*>(fFileFDTemplate->Get(Form("%s%.0f_%.0f_ptassoc%.0f_%.0f", fHistoFDTemplatePromptName.Data(), ptCandMin, ptCandMax, ptHadMin, ptHadMax)));
@@ -1215,7 +1216,7 @@
 TH1D* DhCorrelationExtraction::getCorrelHistoSecondaryPart(Int_t partType, Double_t ptCandMin, Double_t ptCandMax, Double_t ptHadMin, Double_t ptHadMax)
 {
 
-  TH1D* h1D = new TH1D(); // pointer to be returned
+  TH1D* h1D = nullptr; // pointer to be returned
 
   THnSparseD* hSparse = nullptr;
 
@@ -1311,7 +1312,7 @@
     } else if (x < 0) {
       j2 = h2->FindBin(-1. * x);
     } else if (x > TMath::Pi()) {
       j2 = h2->FindBin(2. * TMath::Pi() - x);
     } else {
       printf("Point %d excluded \n", j);
       continue;
@@ -1329,8 +1330,7 @@
 Double_t DhCorrelationExtraction::getFdPromptFrac(Double_t ptCandMin, Double_t ptCandMax, Double_t /*ptHadMin*/, Double_t /*ptHadMax*/)
 {
 
-  TH1D* h1D = new TH1D();
-  h1D = reinterpret_cast<TH1D*>(fFileFDPromptFrac->Get(fHistoFDPromptFracName.Data()));
+  TH1D* h1D = reinterpret_cast<TH1D*>(fFileFDPromptFrac->Get(fHistoFDPromptFracName.Data()));
 
   Int_t const binPtCandMin = h1D->GetXaxis()->FindBin(ptCandMin + 0.01);
   Int_t const binPtCandMax = h1D->GetXaxis()->FindBin(ptCandMax - 0.01);
@@ -1380,7 +1380,7 @@
   // total range = 2*Pi
   // half range = Pi , for histogram reflected under symmetric assumption
 
-  Double_t baseline, errBaseline;
+  Double_t baseline;
   Int_t const nBinsPhi = histo->GetNbinsX();
   Int_t const binPhiHalf = nBinsPhi / 2;
   Int_t const binPhiHalfMinus1 = nBinsPhi / 2 - 1;