Remove CollId index from D0 creator

Author: Marcellocosti

PWGHF/HFC/TableProducer/correlatorFlowCharmHadronsReduced.cxx

@@ -89,42 +89,6 @@ double getPhi(const TTrack& track)
   }
 }
 
-/// Get charm candidate or hadron track pT
-/// \param track is the candidate
-template <typename TTrack>
-double getPt(const TTrack& track)
-{
-  if constexpr (requires { track.ptAssoc(); }) {
-    return track.ptAssoc();
-  } else {
-    return track.ptTrig();
-  }
-}
-
-/// Get charm candidate or hadron track eta
-/// \param track is the candidate
-template <typename TTrack>
-double getEta(const TTrack& track)
-{
-  if constexpr (requires { track.etaAssoc(); }) {
-    return track.etaAssoc();
-  } else {
-    return track.etaTrig();
-  }
-}
-
-/// Get charm candidate or hadron track phi
-/// \param track is the candidate
-template <typename TTrack>
-double getPhi(const TTrack& track)
-{
-  if constexpr (requires { track.phiAssoc(); }) {
-    return track.phiAssoc();
-  } else {
-    return track.phiTrig();
-  }
-}
-
 struct HfCorrelatorFlowCharmHadronsReduced {
   Produces<aod::HfcRedSEChHads> rowPairSECharmHads; //! Correlation pairs information Same Event
   Produces<aod::HfcRedMEChHads> rowPairMECharmHads; //! Correlation pairs information Mixed Event
@@ -164,13 +128,6 @@ struct HfCorrelatorFlowCharmHadronsReduced {
   Preslice<AssocTracks> assocTracksPerCol = aod::hf_correl_charm_had_reduced::hfcRedCorrCollId;
   Preslice<TrigCharmCands> trigCharmCandsPerCol = aod::hf_correl_charm_had_reduced::hfcRedCorrCollId;
 
-  Filter filterAssocTracks = (nabs(aod::hf_correl_charm_had_reduced::dcaXYAssoc) < dcaXYTrackMax) && (nabs(aod::hf_correl_charm_had_reduced::dcaZAssoc) < dcaZTrackMax) && (aod::hf_correl_charm_had_reduced::nTpcCrossedRowsAssoc > tpcCrossedRowsMin) && (aod::hf_correl_charm_had_reduced::itsNClsAssoc > itsNClsMin);
-  Filter filterTrigTracks = (nabs(aod::hf_correl_charm_had_reduced::dcaXYTrig) < dcaXYTrackMax) && (nabs(aod::hf_correl_charm_had_reduced::dcaZTrig) < dcaZTrackMax) && (aod::hf_correl_charm_had_reduced::nTpcCrossedRowsTrig > tpcCrossedRowsMin) && (aod::hf_correl_charm_had_reduced::itsNClsTrig > itsNClsMin);
-  Filter filterSameEvtPairs = (nabs(aod::hf_correl_charm_had_reduced::deltaEta) > deltaEtaAbsMin) && (nabs(aod::hf_correl_charm_had_reduced::deltaEta) < deltaEtaAbsMax);
-
-  Preslice<AssocTracks> assocTracksPerCol = aod::hf_correl_charm_had_reduced::hfcRedCorrCollId;
-  Preslice<TrigCharmCands> trigCharmCandsPerCol = aod::hf_correl_charm_had_reduced::hfcRedCorrCollId;
-
   ConfigurableAxis zPoolBins{"zPoolBins", {VARIABLE_WIDTH, -10.0, -2.5, 2.5, 10.0}, "Z vertex position pools"};
   ConfigurableAxis multPoolBins{"multPoolBins", {VARIABLE_WIDTH, 0., 900., 1800., 6000.}, "Event multiplicity pools (FT0M)"};
   ConfigurableAxis centPoolBins{"centPoolBins", {VARIABLE_WIDTH, 0., 10., 20., 30., 40., 50., 60., 70., 80., 90., 100}, "Event centrality pools"};
@@ -211,12 +168,6 @@ struct HfCorrelatorFlowCharmHadronsReduced {
       poolBins = (multPoolBins->size() - 1) * (zPoolBins->size() - 1);
     }
 
-    if (doprocessSameEventCharmHadWCentMix || doprocessSameEventHadHadWCentMix || doprocessMixedEventCharmHadWCentMix || doprocessMixedEventHadHadWCentMix) {
-      poolBins = (centPoolBins->size() - 1) * (zPoolBins->size() - 1);
-    } else {
-      poolBins = (multPoolBins->size() - 1) * (zPoolBins->size() - 1);
-    }
-
     const AxisSpec axisInvMass{binsInvMass, "Inv. mass (GeV/#it{c}^{2})"};
     const AxisSpec axisCent = {binsCent, "Centrality"};
     const AxisSpec axisMultFT0M = {binsMultFT0M, "MultiplicityFT0M"};

PWGHF/HFC/TableProducer/derivedDataCreatorCorrelationsReduced.cxx

@@ -407,7 +407,6 @@ struct HfDerivedDataCreatorCorrelationsReduced {
       rowAssocBases(rowCollisions.lastIndex(), assTrk.phi(), assTrk.eta(), assTrkPt);
       rowAssocTrkSels(assTrk.tpcNClsCrossedRows(), assTrk.itsClusterMap(), assTrk.itsNCls(), assTrk.dcaXY(), assTrk.dcaZ());
     }
-    return poolBin;
   }
 
   // Dplus with ML selections

PWGHF/TableProducer/treeCreatorD0ToKPi.cxx

@@ -142,7 +142,6 @@ DECLARE_SOA_TABLE(HfCandD0Lites, "AOD", "HFCANDD0LITE",
                   full::OriginMcRec)
 
 DECLARE_SOA_TABLE(HfCandD0Fulls, "AOD", "HFCANDD0FULL",
-                  full::CollisionId,
                   collision::PosX,
                   collision::PosY,
                   collision::PosZ,
@@ -206,7 +205,6 @@ DECLARE_SOA_TABLE(HfCandD0Fulls, "AOD", "HFCANDD0FULL",
                   full::CandidateId);
 
 DECLARE_SOA_TABLE(HfCandD0FullEvs, "AOD", "HFCANDD0FULLEV",
-                  full::CollisionId,
                   collision::NumContrib,
                   collision::PosX,
                   collision::PosY,
@@ -215,7 +213,6 @@ DECLARE_SOA_TABLE(HfCandD0FullEvs, "AOD", "HFCANDD0FULLEV",
                   full::RunNumber);
 
 DECLARE_SOA_TABLE(HfCandD0FullPs, "AOD", "HFCANDD0FULLP",
-                  full::McCollisionId,
                   full::Pt,
                   full::Eta,
                   full::Phi,
@@ -283,7 +280,6 @@ struct HfTreeCreatorD0ToKPi {
   void fillEvent(const T& collision, int isEventReject, int runNumber)
   {
     rowCandidateFullEvents(
-      collision.globalIndex(),
       collision.numContrib(),
       collision.posX(),
       collision.posY(),
@@ -337,7 +333,6 @@ struct HfTreeCreatorD0ToKPi {
     } else {
       double cosThetaStar = candFlag == 0 ? hfHelper.cosThetaStarD0(candidate) : hfHelper.cosThetaStarD0bar(candidate);
       rowCandidateFull(
-        candidate.collisionId(),
         candidate.posX(),
         candidate.posY(),
         candidate.posZ(),
@@ -569,7 +564,6 @@ struct HfTreeCreatorD0ToKPi {
     for (const auto& particle : mcParticles) {
       if ((std::abs(particle.flagMcMatchGen()) == o2::hf_decay::hf_cand_2prong::DecayChannelMain::D0ToPiK) || (fillCorrBkgs && particle.flagMcMatchGen() != 0)) {
         rowCandidateFullParticles(
-          particle.mcCollisionId(),
           particle.pt(),
           particle.eta(),
           particle.phi(),