More fixes

Author: vkucera

PWGHF/D2H/TableProducer/dataCreatorCharmResoReduced.cxx

@@ -830,8 +830,8 @@ struct HfDataCreatorCharmResoReduced {
                             CCand const& candCharmBach,
                             BBachTr const& bachelorTrack,
                             Tr const& tracks,
-                            int& indexHfCandCharm,
-                            int64_t& indexCandTrBach)
+                            const int64_t indexHfCandCharm,
+                            const int64_t indexCandTrBach)
   {
     std::vector<typename Tr::iterator> vecDaughtersReso{};
     int8_t sign{0}, nKinkedTracks{0}, origin{0}, flagCharmBach{0}, flagCharmBachInterm{0}, flagTrack{0}, flagReso{0};

PWGHF/D2H/TableProducer/dataCreatorJpsiHadReduced.cxx

@@ -511,10 +511,10 @@ struct HfDataCreatorJpsiHadReduced {
   /// \param indexHfCandJpsi is the index of the Jpsi candidate
   /// \param selectedTracksBach is the map with the indices of selected bachelor pion tracks
   template <uint8_t decChannel, typename CColl, typename PParticles, typename TTrack>
-  void fillMcRecoInfo(const CColl& collision,
-                      const PParticles& particlesMc,
-                      const std::vector<TTrack>& vecDaughtersB,
-                      int& indexHfCandJpsi,
+  void fillMcRecoInfo(CColl const& collision,
+                      PParticles const& particlesMc,
+                      std::vector<TTrack> const& vecDaughtersB,
+                      const int64_t indexHfCandJpsi,
                       std::array<std::map<int64_t, int64_t>, 2> selectedTracksBach,
                       const int64_t indexCollisionMaxNumContrib)
   {
@@ -734,7 +734,7 @@ struct HfDataCreatorJpsiHadReduced {
     }
 
     // helpers for ReducedTables filling
-    int indexHfReducedCollision = hfReducedCollision.lastIndex() + 1;
+    int const indexHfReducedCollision = hfReducedCollision.lastIndex() + 1;
     // std::map where the key is the track.globalIndex() and
     // the value is the track index in the table of the selected tracks
     std::map<int64_t, int64_t> selectedTracksBach;
@@ -797,8 +797,8 @@ struct HfDataCreatorJpsiHadReduced {
 
       // ---------------------------------
       // reconstruct J/Psi candidate secondary vertex
-      o2::track::TrackParCov trackParCovJpsi{};
-      std::array<float, 3> pVecJpsi{};
+      o2::track::TrackParCov trackParCovJpsi{}; // FIXME: unused
+      std::array<float, 3> pVecJpsi{};          // FIXME: unused
       registry.fill(HIST("hFitCandidatesJpsi"), SVFitting::BeforeFit);
       try {
         if (df2.process(trackPosParCov, trackNegParCov) == 0) {
@@ -823,8 +823,8 @@ struct HfDataCreatorJpsiHadReduced {
       }
       registry.fill(HIST("hSelectionsJpsi"), 2 + aod::SelectionStep::RecoPID, candidate.pt());
 
-      int indexHfCandJpsi = hfJpsi.lastIndex() + 1;
-      float invMassJpsi = runJpsiToee ? hfHelper.invMassJpsiToEE(candidate) : hfHelper.invMassJpsiToMuMu(candidate);
+      int const indexHfCandJpsi = hfJpsi.lastIndex() + 1;
+      float const invMassJpsi = runJpsiToee ? hfHelper.invMassJpsiToEE(candidate) : hfHelper.invMassJpsiToMuMu(candidate);
       registry.fill(HIST("hMassJpsi"), invMassJpsi);
       registry.fill(HIST("hPtJpsi"), candidate.pt());
       registry.fill(HIST("hCpaJpsi"), candidate.cpa());
@@ -1189,7 +1189,7 @@ struct HfDataCreatorJpsiHadReduced {
       auto candsJpsiThisColl = candsJpsi.sliceBy(candsJpsiPerCollision, thisCollId);
       auto trackIdsThisCollision = trackIndices.sliceBy(trackIndicesPerCollision, thisCollId);
       auto collsSameMcCollision = collisions.sliceBy(colPerMcCollision, collision.mcCollisionId());
-      int64_t indexCollisionMaxNumContrib = getIndexCollisionMaxNumContrib(collsSameMcCollision);
+      int64_t const indexCollisionMaxNumContrib = getIndexCollisionMaxNumContrib(collsSameMcCollision);
       runDataCreation<true, DecayChannel::BplusToJpsiK>(collision, candsJpsiThisColl, trackIdsThisCollision, tracks, particlesMc, indexCollisionMaxNumContrib, bcs);
     }
     // handle normalization by the right number of collisions
@@ -1226,7 +1226,7 @@ struct HfDataCreatorJpsiHadReduced {
       auto candsJpsiThisColl = candsJpsi.sliceBy(candsJpsiPerCollision, thisCollId);
       auto trackIdsThisCollision = trackIndices.sliceBy(trackIndicesPerCollision, thisCollId);
       auto collsSameMcCollision = collisions.sliceBy(colPerMcCollision, collision.mcCollisionId());
-      int64_t indexCollisionMaxNumContrib = getIndexCollisionMaxNumContrib(collsSameMcCollision);
+      int64_t const indexCollisionMaxNumContrib = getIndexCollisionMaxNumContrib(collsSameMcCollision);
       runDataCreation<true, DecayChannel::BsToJpsiPhi>(collision, candsJpsiThisColl, trackIdsThisCollision, tracks, particlesMc, indexCollisionMaxNumContrib, bcs);
     }
     // handle normalization by the right number of collisions

PWGHF/D2H/Tasks/taskFlowCharmHadrons.cxx

@@ -317,10 +317,10 @@ struct HfTaskFlowCharmHadrons {
   /// \param tracksQy is the Y component of the Q vector for the tracks
   /// \param channel is the decay channel
   template <DecayChannel channel, typename T1>
-  void getQvecDtracks(const T1& cand,
+  void getQvecDtracks(T1 const& cand,
                       std::vector<float>& tracksQx,
                       std::vector<float>& tracksQy,
-                      float& ampl)
+                      const float ampl)
   {
     // TODO: add possibility to consider different weights for the tracks, at the moment only pT is considered;
     float pXTrack0 = cand.pxProng0();
@@ -668,7 +668,7 @@ struct HfTaskFlowCharmHadrons {
 
       // If TPC is used for the SP estimation, the tracks of the hadron candidate must be removed from the TPC Q vector to avoid double counting
       if (qvecDetector == QvecEstimator::TPCNeg || qvecDetector == QvecEstimator::TPCPos) {
-        float ampl = amplQVec - static_cast<float>(nProngs);
+        float const ampl = amplQVec - static_cast<float>(nProngs);
         std::vector<float> tracksQx = {};
         std::vector<float> tracksQy = {};
         if constexpr (std::is_same_v<T1, CandXic0Data> || std::is_same_v<T1, CandXic0DataWMl>) {

PWGHF/TableProducer/candidateCreator2Prong.cxx

@@ -340,7 +340,7 @@ struct HfCandidateCreator2Prong {
       if (indexCollision == track1.collisionId() && track1.isPVContributor()) {
         SETBIT(bitmapProngsContributorsPV, 1);
       }
-      uint8_t nProngsContributorsPV = hf_trkcandsel::countOnesInBinary(bitmapProngsContributorsPV);
+      const auto nProngsContributorsPV = hf_trkcandsel::countOnesInBinary(bitmapProngsContributorsPV);
 
       // fill candidate table rows
       rowCandidateBase(indexCollision,
@@ -501,7 +501,7 @@ struct HfCandidateCreator2Prong {
       if (indexCollision == track1.collisionId() && track1.isPVContributor()) {
         SETBIT(bitmapProngsContributorsPV, 1);
       }
-      uint8_t nProngsContributorsPV = hf_trkcandsel::countOnesInBinary(bitmapProngsContributorsPV);
+      const auto nProngsContributorsPV = hf_trkcandsel::countOnesInBinary(bitmapProngsContributorsPV);
 
       // fill candidate table rows
       rowCandidateBase(indexCollision,

PWGHF/TableProducer/candidateCreator3Prong.cxx

@@ -394,7 +394,7 @@ struct HfCandidateCreator3Prong {
       if (indexCollision == track2.collisionId() && track2.isPVContributor()) {
         SETBIT(bitmapProngsContributorsPV, 2);
       }
-      uint8_t nProngsContributorsPV = hf_trkcandsel::countOnesInBinary(bitmapProngsContributorsPV);
+      const auto nProngsContributorsPV = hf_trkcandsel::countOnesInBinary(bitmapProngsContributorsPV);
 
       // fill candidate table rows
       rowCandidateBase(indexCollision,
@@ -635,7 +635,7 @@ struct HfCandidateCreator3Prong {
       if (indexCollision == track2.collisionId() && track2.isPVContributor()) {
         SETBIT(bitmapProngsContributorsPV, 2);
       }
-      uint8_t nProngsContributorsPV = hf_trkcandsel::countOnesInBinary(bitmapProngsContributorsPV);
+      const auto nProngsContributorsPV = hf_trkcandsel::countOnesInBinary(bitmapProngsContributorsPV);
 
       // fill candidate table rows
       rowCandidateBase(indexCollision,