From 09b6d82e4ab36751126e058b770c789a9d64fcfb Mon Sep 17 00:00:00 2001 From: Alicja Plachta Date: Fri, 10 Jul 2026 10:25:39 +0200 Subject: [PATCH] Fix linter and code check issues --- ...iversePairTaskTrackTrackMultKtExtended.cxx | 224 +++++++++--------- 1 file changed, 108 insertions(+), 116 deletions(-) diff --git a/PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackTrackMultKtExtended.cxx b/PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackTrackMultKtExtended.cxx index 9d9fd844ba3..9b72720cdeb 100644 --- a/PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackTrackMultKtExtended.cxx +++ b/PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackTrackMultKtExtended.cxx @@ -33,7 +33,6 @@ #include #include #include -#include #include #include #include @@ -46,6 +45,7 @@ #include #include +#include #include #include @@ -60,18 +60,11 @@ using namespace o2::framework; using namespace o2::framework::expressions; using namespace o2::soa; -namespace -{ -static constexpr int Npart = 2; -static constexpr int Ncuts = 5; -static const std::vector partNames{"PartOne", "PartTwo"}; -static const std::vector cutNames{"MaxPt", "PIDthr", "nSigmaTPC", "nSigmaTPCTOF", "MaxP"}; -static const float cutsTable[Npart][Ncuts]{{4.05f, 1.f, 3.f, 3.f, 100.f}, {4.05f, 1.f, 3.f, 3.f, 100.f}}; -} // namespace - struct FemtoUniversePairTaskTrackTrackMultKtExtended { - Service pdg; + Service pdg{}; + double randCompareValue = 0.5; + TRandom2* randgen = new TRandom2(); /// Particle selection part @@ -83,8 +76,6 @@ struct FemtoUniversePairTaskTrackTrackMultKtExtended { Configurable confTOFpMin{"confTOFpMin", 0.5f, "Min. momentum for which TOF is required for PID."}; Configurable confEtaMax{"confEtaMax", 0.8f, "Higher limit for |Eta| (the same for both particles)"}; - Configurable> confCutTable{"confCutTable", {cutsTable[0], Npart, Ncuts, partNames, cutNames}, "Particle selections"}; - Configurable confNspecies{"confNspecies", 2, "Number of particle spieces with PID info"}; Configurable confIsMC{"confIsMC", false, "Enable additional Histogramms in the case of a MonteCarlo Run"}; Configurable> confTrkPIDnSigmaMax{"confTrkPIDnSigmaMax", std::vector{4.f, 3.f, 2.f}, "This configurable needs to be the same as the one used in the producer task"}; Configurable confUse3D{"confUse3D", false, "Enable three dimensional histogramms (to be used only for analysis with high statistics): k* vs mT vs multiplicity"}; @@ -110,8 +101,6 @@ struct FemtoUniversePairTaskTrackTrackMultKtExtended { /// Particle 1 struct : o2::framework::ConfigurableGroup { Configurable confPDGCodePartOne{"confPDGCodePartOne", 211, "Particle 1 -- PDG code"}; - // Configurable confCutPartOne{"confCutPartOne", 5542474, "Particle 1 -- Selection bit from cutCulator"}; - Configurable confPIDPartOne{"confPIDPartOne", 2, "Particle 1 -- Read from cutCulator"}; // we also need the possibility to specify whether the bit is true/false ->std>>vector>int>> Configurable confpLowPart1{"confpLowPart1", 0.14, "Lower limit for Pt for the first particle"}; Configurable confPtHighPart1{"confPtHighPart1", 1.5, "Higher limit for Pt for the first particle"}; Configurable confChargePart1{"confChargePart1", 1, "Particle 1 sign"}; @@ -132,7 +121,6 @@ struct FemtoUniversePairTaskTrackTrackMultKtExtended { struct : o2::framework::ConfigurableGroup { Configurable confPDGCodePartTwo{"confPDGCodePartTwo", 211, "Particle 2 -- PDG code"}; // Configurable confCutPartTwo{"confCutPartTwo", 5542474, "Particle 2 -- Selection bit"}; - Configurable confPIDPartTwo{"confPIDPartTwo", 2, "Particle 2 -- Read from cutCulator"}; // we also need the possibility to specify whether the bit is true/false ->std>>vector> Configurable confpLowPart2{"confpLowPart2", 0.14, "Lower limit for Pt for the second particle"}; Configurable confPtHighPart2{"confPtHighPart2", 1.5, "Higher limit for Pt for the second particle"}; Configurable confChargePart2{"confChargePart2", -1, "Particle 2 sign"}; @@ -151,10 +139,6 @@ struct FemtoUniversePairTaskTrackTrackMultKtExtended { /// Histogramming for Event FemtoUniverseEventHisto eventHisto; - /// The configurables need to be passed to an std::vector - int vPIDPartOne, vPIDPartTwo; - std::vector kNsigma; - /// Event part struct : o2::framework::ConfigurableGroup { Configurable confV0MLow{"confV0MLow", 0.0, "Lower limit for V0M multiplicity"}; @@ -258,8 +242,6 @@ struct FemtoUniversePairTaskTrackTrackMultKtExtended { HistogramRegistry sphericityRegistry{"SphericityHisto", {}, OutputObjHandlingPolicy::AnalysisObject, true, true}; - TRandom2* randgen; - /// TPC Pion/Kaon/Proton Sigma selection (general) bool isNSigma(float mom, float nsigmaTPC, float nsigmaTOF) { @@ -273,33 +255,33 @@ struct FemtoUniversePairTaskTrackTrackMultKtExtended { if (mom < twotracksconfigs.confTOFpMin) { return std::abs(nsigmaTPC) < twotracksconfigs.confNsigmaTPC; - } else { - return std::hypot(nsigmaTOF, nsigmaTPC) < twotracksconfigs.confNsigmaCombined; } + return std::hypot(nsigmaTOF, nsigmaTPC) < twotracksconfigs.confNsigmaCombined; } /// TPC Kaon Sigma selection (stricter cuts for K+ and K-) -- based on Run2 results bool isKaonNsigma(float mom, float nsigmaTPCK, float nsigmaTOFK) { - double nSigmaTPCRanges[3] = {1, 2, 3}; - double nSigmaTOFRanges[2] = {1.5, 2}; - double momRanges[4] = {0.4, 0.45, 0.8, 1.5}; + std::array nSigmaTPCRanges = {{1, 2, 3}}; + std::array nSigmaTOFRanges = {{1.5, 2}}; + std::array momRanges = {{0.4, 0.45, 0.8, 1.5}}; - if (twotracksconfigs.isKaonNsigma == true) { + if (twotracksconfigs.isKaonNsigma) { if (mom < momRanges[0]) { return std::abs(nsigmaTPCK) < nSigmaTPCRanges[1]; - } else if (mom > momRanges[0] && mom < momRanges[1]) { + } + if (mom > momRanges[0] && mom < momRanges[1]) { return std::abs(nsigmaTPCK) < nSigmaTPCRanges[0]; - } else if (mom > momRanges[1] && mom < momRanges[2]) { + } + if (mom > momRanges[1] && mom < momRanges[2]) { return (std::abs(nsigmaTPCK) < nSigmaTPCRanges[2] && std::abs(nsigmaTOFK) < nSigmaTOFRanges[1]); - } else if (mom > momRanges[2] && mom < momRanges[3]) { + } + if (mom > momRanges[2] && mom < momRanges[3]) { return (std::abs(nsigmaTPCK) < nSigmaTPCRanges[2] && std::abs(nsigmaTOFK) < nSigmaTOFRanges[0]); - } else { - return false; } - } else { - return isNSigma(mom, nsigmaTPCK, nsigmaTOFK); + return false; } + return isNSigma(mom, nsigmaTPCK, nsigmaTOFK); } bool isParticleNSigma(int8_t particle_number, float mom, float nsigmaTPCPr, float nsigmaTOFPr, float nsigmaTPCPi, float nsigmaTOFPi, float nsigmaTPCK, float nsigmaTOFK) @@ -308,49 +290,40 @@ struct FemtoUniversePairTaskTrackTrackMultKtExtended { partTwo = 2 }; if (particle_number == partOne) { switch (trackonefilter.confPDGCodePartOne) { - case 2212: // Proton+ - case -2212: // Proton- + case kProton: + case kProtonBar: return isNSigma(mom, nsigmaTPCPr, nsigmaTOFPr); - break; - case 211: // Pion+ - case -211: // Pion- - case 111: // Pion 0 + case kPiPlus: + case kPiMinus: + case kPi0: return isNSigma(mom, nsigmaTPCPi, nsigmaTOFPi); - break; - case 321: // Kaon+ - case -321: // Kaon- + case kKPlus: + case kKMinus: return isKaonNsigma(mom, nsigmaTPCK, nsigmaTOFK); - break; - case 130: // Kaon 0 LONG - case 310: // Kaon 0 SHORT + case kK0Long: + case kK0Short: return isNSigma(mom, nsigmaTPCK, nsigmaTOFK); - break; default: return false; } - return false; } else if (particle_number == partTwo) { switch (tracktwofilter.confPDGCodePartTwo) { - case 2212: // Proton+ - case -2212: // Proton- + case kProton: + case kProtonBar: return isNSigma(mom, nsigmaTPCPr, nsigmaTOFPr); - break; - case 211: // Pion+ - case -211: // Pion- - case 111: // Pion 0 + case kPiPlus: + case kPiMinus: + case kPi0: return isNSigma(mom, nsigmaTPCPi, nsigmaTOFPi); - break; - case 321: // Kaon+ - case -321: // Kaon- + case kKPlus: + case kKMinus: return isKaonNsigma(mom, nsigmaTPCK, nsigmaTOFK); - break; - case 130: // Kaon 0 LONG - case 310: // Kaon 0 SHORT + case kK0Long: + case kK0Short: return isNSigma(mom, nsigmaTPCK, nsigmaTOFK); - break; + default: return false; } - return false; } else { LOGF(fatal, "Wrong number of particle chosen! It should be 1 or 2. It is -> %d", particle_number); } @@ -358,20 +331,20 @@ struct FemtoUniversePairTaskTrackTrackMultKtExtended { } template - float whichTOFNSigma(int PDGcode, PartType part) + float whichTOFNSigma(int PDGcode, PartType const& part) { switch (PDGcode) { - case 2212: // Proton+ - case -2212: // Proton- + case kProton: + case kProtonBar: return trackCuts.getNsigmaTOF(part, o2::track::PID::Proton); - case 211: // Pion+ - case -211: // Pion- - case 111: // Pion 0 + case kPiPlus: + case kPiMinus: + case kPi0: return trackCuts.getNsigmaTOF(part, o2::track::PID::Pion); - case 321: // Kaon+ - case -321: // Kaon- - case 130: // Kaon 0 LONG - case 310: // Kaon 0 SHORT + case kKPlus: + case kKMinus: + case kK0Long: + case kK0Short: return trackCuts.getNsigmaTOF(part, o2::track::PID::Kaon); default: return 0; @@ -464,14 +437,10 @@ struct FemtoUniversePairTaskTrackTrackMultKtExtended { if (confIsCPR.value) { pairCloseRejection.init(&resultRegistry, &qaRegistry, confDeltaEtaAxis, confDeltaPhiStarAxis, confCPRdeltaPhiCutMin.value, confCPRdeltaPhiCutMax.value, confCPRdeltaEtaCutMin.value, confCPRdeltaEtaCutMax.value, confCPRChosenRadii.value, confCPRPlotPerRadii.value); } - - vPIDPartOne = trackonefilter.confPIDPartOne.value; - vPIDPartTwo = tracktwofilter.confPIDPartTwo.value; - kNsigma = twotracksconfigs.confTrkPIDnSigmaMax.value; } template - void fillCollision(CollisionType col) + void fillCollision(CollisionType const& col) { if (confFillDebug) { mixQaRegistry.fill(HIST("MixingQA/hSECollisionBins"), colBinning.getBin({col.posZ(), col.multV0M()})); @@ -492,7 +461,7 @@ struct FemtoUniversePairTaskTrackTrackMultKtExtended { /// \param pairType describes charge of correlation pair (plus-minus (1), plus-plus (2), minus-minus (3)) /// \param fillQA enables filling of QA histograms template - void doSameEvent(PartitionType groupPartsOne, PartitionType groupPartsTwo, PartType parts, float magFieldTesla, int multCol, int pairType, bool fillQA) + void doSameEvent(PartitionType const& groupPartsOne, PartitionType const& groupPartsTwo, PartType const& parts, float magFieldTesla, float multCol, int pairType, bool fillQA) { enum PairTypes { type1 = 1, @@ -542,7 +511,7 @@ struct FemtoUniversePairTaskTrackTrackMultKtExtended { } if (confIsCPR.value) { - double rand; + double rand = 0; auto part1 = p1; auto part2 = p2; @@ -550,7 +519,7 @@ struct FemtoUniversePairTaskTrackTrackMultKtExtended { randgen = new TRandom2(0); rand = randgen->Rndm(); - if (rand > 0.5) { + if (rand > randCompareValue) { part1 = p2; part2 = p1; } @@ -565,8 +534,9 @@ struct FemtoUniversePairTaskTrackTrackMultKtExtended { float kT = FemtoUniverseMath::getkT(p1, mass1, p2, mass2); sameEventCont.setPair(p1, p2, multCol, twotracksconfigs.confUse3D, twotracksconfigs.confOnlyPrimaryMCPair); - if (cfgProcessMultBins) + if (cfgProcessMultBins) { sameEventMultCont.fill(kstar, multCol, kT); + } } } else { /// Now build the combinations for identical particles pairs @@ -581,7 +551,7 @@ struct FemtoUniversePairTaskTrackTrackMultKtExtended { } if (confIsCPR.value) { - double rand; + double rand = 0; auto part1 = p1; auto part2 = p2; @@ -589,7 +559,7 @@ struct FemtoUniversePairTaskTrackTrackMultKtExtended { randgen = new TRandom2(0); rand = randgen->Rndm(); - if (rand > 0.5) { + if (rand > randCompareValue) { part1 = p2; part2 = p1; } @@ -607,40 +577,44 @@ struct FemtoUniversePairTaskTrackTrackMultKtExtended { switch (pairType) { case 2: { - if (isPairIdentical == true) { + if (isPairIdentical) { float kstar = FemtoUniverseMath::getkstar(p1, mass1, p2, mass1); float kT = FemtoUniverseMath::getkT(p1, mass1, p2, mass1); sameEventContPP.setPair(p1, p2, multCol, twotracksconfigs.confUse3D, twotracksconfigs.confOnlyPrimaryMCPair); - if (cfgProcessMultBins) + if (cfgProcessMultBins) { sameEventMultContPP.fill(kstar, multCol, kT); + } } else { float kstar = FemtoUniverseMath::getkstar(p1, mass1, p2, mass2); float kT = FemtoUniverseMath::getkT(p1, mass1, p2, mass2); sameEventContPP.setPair(p1, p2, multCol, twotracksconfigs.confUse3D, twotracksconfigs.confOnlyPrimaryMCPair); - if (cfgProcessMultBins) + if (cfgProcessMultBins) { sameEventMultContPP.fill(kstar, multCol, kT); + } } break; } case 3: { - if (isPairIdentical == true) { + if (isPairIdentical) { float kstar = FemtoUniverseMath::getkstar(p1, mass2, p2, mass2); float kT = FemtoUniverseMath::getkT(p1, mass2, p2, mass2); sameEventContMM.setPair(p1, p2, multCol, twotracksconfigs.confUse3D, twotracksconfigs.confOnlyPrimaryMCPair); - if (cfgProcessMultBins) + if (cfgProcessMultBins) { sameEventMultContMM.fill(kstar, multCol, kT); + } } else { float kstar = FemtoUniverseMath::getkstar(p1, mass1, p2, mass2); float kT = FemtoUniverseMath::getkT(p1, mass1, p2, mass2); sameEventContMM.setPair(p1, p2, multCol, twotracksconfigs.confUse3D, twotracksconfigs.confOnlyPrimaryMCPair); - if (cfgProcessMultBins) + if (cfgProcessMultBins) { sameEventMultContMM.fill(kstar, multCol, kT); + } } break; @@ -672,10 +646,12 @@ struct FemtoUniversePairTaskTrackTrackMultKtExtended { doSameEvent(thegroupPartsOne, thegroupPartsTwo, parts, col.magField(), col.multV0M(), 1, fillQA); fillQA = false; } - if (processPair.cfgProcessPP) + if (processPair.cfgProcessPP) { doSameEvent(thegroupPartsOne, thegroupPartsOne, parts, col.magField(), col.multV0M(), 2, fillQA); - if (processPair.cfgProcessMM) + } + if (processPair.cfgProcessMM) { doSameEvent(thegroupPartsTwo, thegroupPartsTwo, parts, col.magField(), col.multV0M(), 3, fillQA); + } } PROCESS_SWITCH(FemtoUniversePairTaskTrackTrackMultKtExtended, processSameEvent, "Enable processing same event", true); @@ -697,10 +673,12 @@ struct FemtoUniversePairTaskTrackTrackMultKtExtended { doSameEvent(thegroupPartsOne, thegroupPartsTwo, parts, col.magField(), col.multV0M(), 1, fillQA); fillQA = false; } - if (processPair.cfgProcessPP) + if (processPair.cfgProcessPP) { doSameEvent(thegroupPartsOne, thegroupPartsOne, parts, col.magField(), col.multV0M(), 2, fillQA); - if (processPair.cfgProcessMM) + } + if (processPair.cfgProcessMM) { doSameEvent(thegroupPartsTwo, thegroupPartsTwo, parts, col.magField(), col.multV0M(), 3, fillQA); + } } PROCESS_SWITCH(FemtoUniversePairTaskTrackTrackMultKtExtended, processSameEventMC, "Enable processing same event for Monte Carlo", false); @@ -716,7 +694,7 @@ struct FemtoUniversePairTaskTrackTrackMultKtExtended { /// \param multCol multiplicity of the collision /// \param pairType describes charge of correlation pair (plus-minus (1), plus-plus (2), minus-minus (3)) template - void doMixedEvent(PartitionType groupPartsOne, PartitionType groupPartsTwo, PartType parts, float magFieldTesla, int multCol, int pairType) + void doMixedEvent(PartitionType const& groupPartsOne, PartitionType const& groupPartsTwo, PartType const& parts, float magFieldTesla, float multCol, int pairType) { for (const auto& [p1, p2] : combinations(CombinationsFullIndexPolicy(groupPartsOne, groupPartsTwo))) { @@ -734,7 +712,7 @@ struct FemtoUniversePairTaskTrackTrackMultKtExtended { } if (confIsCPR.value) { - double rand; + double rand = 0; auto part1 = p1; auto part2 = p2; @@ -742,7 +720,7 @@ struct FemtoUniversePairTaskTrackTrackMultKtExtended { randgen = new TRandom2(0); rand = randgen->Rndm(); - if (rand > 0.5) { + if (rand > randCompareValue) { part1 = p2; part2 = p1; } @@ -759,46 +737,51 @@ struct FemtoUniversePairTaskTrackTrackMultKtExtended { float kT = FemtoUniverseMath::getkT(p1, mass1, p2, mass2); mixedEventCont.setPair(p1, p2, multCol, twotracksconfigs.confUse3D, twotracksconfigs.confOnlyPrimaryMCPair); - if (cfgProcessMultBins) + if (cfgProcessMultBins) { mixedEventMultCont.fill(kstar, multCol, kT); + } break; } case 2: { - if (isPairIdentical == true) { + if (isPairIdentical) { float kstar = FemtoUniverseMath::getkstar(p1, mass1, p2, mass1); float kT = FemtoUniverseMath::getkT(p1, mass1, p2, mass1); mixedEventContPP.setPair(p1, p2, multCol, twotracksconfigs.confUse3D, twotracksconfigs.confOnlyPrimaryMCPair); - if (cfgProcessMultBins) + if (cfgProcessMultBins) { mixedEventMultContPP.fill(kstar, multCol, kT); + } } else { float kstar = FemtoUniverseMath::getkstar(p1, mass1, p2, mass2); float kT = FemtoUniverseMath::getkT(p1, mass1, p2, mass2); mixedEventContPP.setPair(p1, p2, multCol, twotracksconfigs.confUse3D, twotracksconfigs.confOnlyPrimaryMCPair); - if (cfgProcessMultBins) + if (cfgProcessMultBins) { mixedEventMultContPP.fill(kstar, multCol, kT); + } } break; } case 3: { - if (isPairIdentical == true) { + if (isPairIdentical) { float kstar = FemtoUniverseMath::getkstar(p1, mass2, p2, mass2); float kT = FemtoUniverseMath::getkT(p1, mass2, p2, mass2); mixedEventContMM.setPair(p1, p2, multCol, twotracksconfigs.confUse3D, twotracksconfigs.confOnlyPrimaryMCPair); - if (cfgProcessMultBins) + if (cfgProcessMultBins) { mixedEventMultContMM.fill(kstar, multCol, kT); + } } else { float kstar = FemtoUniverseMath::getkstar(p1, mass1, p2, mass2); float kT = FemtoUniverseMath::getkT(p1, mass1, p2, mass2); mixedEventContMM.setPair(p1, p2, multCol, twotracksconfigs.confUse3D, twotracksconfigs.confOnlyPrimaryMCPair); - if (cfgProcessMultBins) + if (cfgProcessMultBins) { mixedEventMultContMM.fill(kstar, multCol, kT); + } } break; @@ -817,7 +800,7 @@ struct FemtoUniversePairTaskTrackTrackMultKtExtended { { for (const auto& [collision1, collision2] : soa::selfCombinations(colBinning, confNEventsMix, -1, cols, cols)) { - const int multiplicityCol = collision1.multV0M(); + const float multiplicityCol = collision1.multV0M(); if (confFillDebug) { mixQaRegistry.fill(HIST("MixingQA/hMECollisionBins"), colBinning.getBin({collision1.posZ(), multiplicityCol})); } @@ -858,7 +841,7 @@ struct FemtoUniversePairTaskTrackTrackMultKtExtended { { for (const auto& [collision1, collision2] : soa::selfCombinations(colBinning, confNEventsMix, -1, cols, cols)) { - const int multiplicityCol = collision1.multV0M(); + const float multiplicityCol = collision1.multV0M(); if (confFillDebug) { mixQaRegistry.fill(HIST("MixingQA/hMECollisionBins"), colBinning.getBin({collision1.posZ(), multiplicityCol})); } @@ -909,7 +892,7 @@ struct FemtoUniversePairTaskTrackTrackMultKtExtended { } if (confIsCPR.value) { - double rand; + double rand = 0; auto part1 = p1; auto part2 = p2; @@ -917,7 +900,7 @@ struct FemtoUniversePairTaskTrackTrackMultKtExtended { randgen = new TRandom2(0); rand = randgen->Rndm(); - if (rand > 0.5) { + if (rand > randCompareValue) { part1 = p2; part2 = p1; } @@ -937,36 +920,45 @@ struct FemtoUniversePairTaskTrackTrackMultKtExtended { case 3: mixedMultRegistryMM.fill(HIST("MCreco/motherParticle"), p1.motherPDG(), p2.motherPDG()); break; + default: + break; } auto mcPartId1 = p1.fdMCParticleId(); - if (mcPartId1 == -1) + if (mcPartId1 == -1) { return; + } auto mcPartId2 = p2.fdMCParticleId(); - if (mcPartId2 == -1) + if (mcPartId2 == -1) { return; + } const auto& mcParticle1 = mparts.iteratorAt(mcPartId1); const auto& mcParticle2 = mparts.iteratorAt(mcPartId2); switch (partType) { case 1: - if ((trackonefilter.confPDGCodePartOne != mcParticle1.pdgMCTruth()) || (tracktwofilter.confPDGCodePartTwo != mcParticle2.pdgMCTruth())) + if ((trackonefilter.confPDGCodePartOne != mcParticle1.pdgMCTruth()) || (tracktwofilter.confPDGCodePartTwo != mcParticle2.pdgMCTruth())) { return; + } mixedMultRegistryPM.fill(HIST("MCreco/motherParticlePDGCheck"), p1.motherPDG(), p2.motherPDG()); break; case 2: - if ((trackonefilter.confPDGCodePartOne != mcParticle1.pdgMCTruth()) || (trackonefilter.confPDGCodePartOne != mcParticle2.pdgMCTruth())) + if ((trackonefilter.confPDGCodePartOne != mcParticle1.pdgMCTruth()) || (trackonefilter.confPDGCodePartOne != mcParticle2.pdgMCTruth())) { return; + } mixedMultRegistryPP.fill(HIST("MCreco/motherParticlePDGCheck"), p1.motherPDG(), p2.motherPDG()); break; case 3: - if ((tracktwofilter.confPDGCodePartTwo != mcParticle1.pdgMCTruth()) || (tracktwofilter.confPDGCodePartTwo != mcParticle2.pdgMCTruth())) + if ((tracktwofilter.confPDGCodePartTwo != mcParticle1.pdgMCTruth()) || (tracktwofilter.confPDGCodePartTwo != mcParticle2.pdgMCTruth())) { return; + } mixedMultRegistryMM.fill(HIST("MCreco/motherParticlePDGCheck"), p1.motherPDG(), p2.motherPDG()); break; + default: + break; } }; for (const auto& [collision1, collision2] : soa::selfCombinations(colBinning, confNEventsMix, -1, cols, cols)) { - const int multiplicityCol = collision1.multV0M(); + const float multiplicityCol = collision1.multV0M(); if (confFillDebug) { mixQaRegistry.fill(HIST("MixingQA/hMECollisionBins"), colBinning.getBin({collision1.posZ(), multiplicityCol})); } @@ -1007,7 +999,7 @@ struct FemtoUniversePairTaskTrackTrackMultKtExtended { /// \param groupPartsOne partition for the first particle passed by the process function /// \param groupPartsTwo partition for the second particle passed by the process function template - void doFractionsMCTruth(PartitionType groupPartsOne, PartitionType groupPartsTwo, int ContType) + void doFractionsMCTruth(PartitionType const& groupPartsOne, PartitionType const& groupPartsTwo, int ContType) { switch (ContType) { case 1: { @@ -1062,7 +1054,7 @@ struct FemtoUniversePairTaskTrackTrackMultKtExtended { { for (const auto& [collision1, collision2] : soa::selfCombinations(colBinning, confNEventsMix, -1, cols, cols)) { - const int multiplicityCol = collision1.multV0M(); + const float multiplicityCol = collision1.multV0M(); if (confFillDebug) { mixQaRegistry.fill(HIST("MixingQA/hMECollisionBins"), colBinning.getBin({collision1.posZ(), multiplicityCol})); }