diff --git a/PWGCF/Femto/Core/charmHadronBuilder.h b/PWGCF/Femto/Core/charmHadronBuilder.h index fbf059754f8..6d3c0ffb137 100644 --- a/PWGCF/Femto/Core/charmHadronBuilder.h +++ b/PWGCF/Femto/Core/charmHadronBuilder.h @@ -139,8 +139,8 @@ using ConfLcSelection2 = ConfLcSelection; /// registered is decided per species in CharmHadronSelection::configure. enum CharmHadronSels { // topological selections - kCpaMin, ///< Min. CPA (cosine pointing angle) - kDecayLengthMin, ///< Min. decay length + kCpaMin, ///< Min. CPA (cosine pointing angle) + kDecayLengthMin, ///< Min. decay length // topological selections, 2-prong only (D0) kImpactParameterProductMax, ///< Max. product of prong impact parameters (d0*d0) @@ -472,12 +472,12 @@ class CharmHadronBuilder { if (mProduceD0s) { charmHadronProducts.producedD0s(collisionProducts.producedCollision.lastIndex(), - signedPt, - candidate.eta(), - candidate.phi(), - mass, - posDauIndex, - negDauIndex); + signedPt, + candidate.eta(), + candidate.phi(), + mass, + posDauIndex, + negDauIndex); } if (mProduceD0Masks) { charmHadronProducts.producedD0Masks(mCharmHadronSelection.getBitmask()); @@ -608,7 +608,7 @@ class CharmHadronBuilder template void fillCharmHadrons(T1 const& col, T2& collisionBuilder, T3& collisionProducts, T4& trackProducts, - T5& charmHadronProducts, T6 const& candidates, T7 const& /*tracks*/, T8& trackBuilder) + T5& charmHadronProducts, T6 const& candidates, T7 const& /*tracks*/, T8& trackBuilder) { if (!mFillAnyTable) { return; @@ -656,7 +656,7 @@ class CharmHadronBuilder template void fillMcCharmHadrons(T1 const& col, T2& collisionBuilder, T3& collisionProducts, T4 const& mcCols, T5& trackProducts, - T6& charmHadronProducts, T7 const& candidates, T8 const& tracks, T9& trackBuilder, T10 const& mcParticles, T11& mcBuilder, T12& mcProducts) + T6& charmHadronProducts, T7 const& candidates, T8 const& tracks, T9& trackBuilder, T10 const& mcParticles, T11& mcBuilder, T12& mcProducts) { if (!mFillAnyTable) { return; diff --git a/PWGCF/Femto/Core/charmHadronHistManager.h b/PWGCF/Femto/Core/charmHadronHistManager.h index 5ea73c65d67..6e783b11c6b 100644 --- a/PWGCF/Femto/Core/charmHadronHistManager.h +++ b/PWGCF/Femto/Core/charmHadronHistManager.h @@ -256,17 +256,17 @@ auto makeD0McQaHistSpecMap(const T1& confBinningAnalysis, const T2& confBinningQ } // NOLINTNEXTLINE(cppcoreguidelines-macro-usage) -#define LC_HIST_QA_MAP(conf) \ - {kMassLcToPKPi, {(conf).massLcToPKPi}}, \ - {kMassLcToPiKP, {(conf).massLcToPiKP}}, \ - {kMlBkg, {(conf).mlScore}}, \ - {kMlPrompt, {(conf).mlScore}}, \ - {kMlNonPrompt, {(conf).mlScore}}, \ - {kCpa, {(conf).cpa}}, \ - {kCpaXY, {(conf).cpa}}, \ - {kDecayLength, {(conf).decayLength}}, \ - {kDecayLengthXY, {(conf).decayLength}}, \ - {kChi2Pca, {(conf).chi2Pca}}, \ +#define LC_HIST_QA_MAP(conf) \ + {kMassLcToPKPi, {(conf).massLcToPKPi}}, \ + {kMassLcToPiKP, {(conf).massLcToPiKP}}, \ + {kMlBkg, {(conf).mlScore}}, \ + {kMlPrompt, {(conf).mlScore}}, \ + {kMlNonPrompt, {(conf).mlScore}}, \ + {kCpa, {(conf).cpa}}, \ + {kCpaXY, {(conf).cpa}}, \ + {kDecayLength, {(conf).decayLength}}, \ + {kDecayLengthXY, {(conf).decayLength}}, \ + {kChi2Pca, {(conf).chi2Pca}}, \ {kImpactParameterProngSqSum, {(conf).impactParameterProngSqSum}}, template @@ -285,7 +285,6 @@ auto makeLcMcQaHistSpecMap(const T1& confBinningAnalysis, const T2& confBinningQ CHARMHADRON_HIST_MC_MAP(confBinningAnalysis)}; } - #undef CHARMHADRON_HIST_ANALYSIS_MAP #undef CHARMHADRON_HIST_MC_MAP #undef CHARMHADRON_HIST_QA_MAP @@ -538,7 +537,6 @@ class CharmHadronHistManager } } - void initMc(std::map> const& CharmHadronSpecs) { std::string mcDir = std::string(charmHadronPrefix) + std::string(McDir); diff --git a/PWGCF/Femto/Core/closePairRejection.h b/PWGCF/Femto/Core/closePairRejection.h index b56214fcc2d..2dd8e07abf5 100644 --- a/PWGCF/Femto/Core/closePairRejection.h +++ b/PWGCF/Femto/Core/closePairRejection.h @@ -588,7 +588,7 @@ class ClosePairRejectionTrackLc mCtrPion.compute(track, prong2); } - [[nodiscard]] bool isClosePair() const { return mCtrProton.isClosePair() || mCtrKaon.isClosePair() || mCtrPion.isClosePair(); } + [[nodiscard]] bool isClosePair() const { return mCtrProton.isClosePair() || mCtrKaon.isClosePair() || mCtrPion.isClosePair(); } void fill(float kstar) { diff --git a/PWGCF/Femto/Core/mcBuilder.h b/PWGCF/Femto/Core/mcBuilder.h index 877248ccee1..187fa5dce33 100644 --- a/PWGCF/Femto/Core/mcBuilder.h +++ b/PWGCF/Femto/Core/mcBuilder.h @@ -277,7 +277,7 @@ class McBuilder if (!RecoDecay::isMatchedMCGen(mcParticles, mcParticle, o2::constants::physics::Pdg::kLambdaCPlus, std::array{+kProton, -kKPlus, +kPiPlus}, true, &sign, 2)) { return; } - if(std::abs(mcParticle.y()) > mCharmYGenMax) { + if (std::abs(mcParticle.y()) > mCharmYGenMax) { return; } } diff --git a/PWGCF/Femto/Core/pairBuilder.h b/PWGCF/Femto/Core/pairBuilder.h index fb4d2834986..199f051a86f 100644 --- a/PWGCF/Femto/Core/pairBuilder.h +++ b/PWGCF/Femto/Core/pairBuilder.h @@ -1085,7 +1085,7 @@ class PairTrackLcBuilder mMixingDepth = confMixing.depth.value; } - template + template void processSameEvent(T1 const& col, T2& trackTable, T3& trackPartition, T4& /*lcTable*/, T5& lcPartition, T6& cache) { auto trackSlice = trackPartition->sliceByCached(o2::aod::femtobase::stored::fColId, col.globalIndex(), cache); diff --git a/PWGCF/Femto/Core/pairHistManager.h b/PWGCF/Femto/Core/pairHistManager.h index 79acf0d7336..1dfed31ef7f 100644 --- a/PWGCF/Femto/Core/pairHistManager.h +++ b/PWGCF/Femto/Core/pairHistManager.h @@ -711,9 +711,7 @@ class PairHistManager } if (mPlotDalitz) { - if constexpr (modes::isEqual(particleType1, modes::Particle::kTrack) && (modes::isEqual(particleType2, modes::Particle::kV0) || - modes::isEqual(particleType2, modes::Particle::kTwoTrackResonance) || - modes::isEqual(particleType2, modes::Particle::kCharmHadron)) && + if constexpr (modes::isEqual(particleType1, modes::Particle::kTrack) && (modes::isEqual(particleType2, modes::Particle::kV0) || modes::isEqual(particleType2, modes::Particle::kTwoTrackResonance) || modes::isEqual(particleType2, modes::Particle::kCharmHadron)) && requires(T2 p) { p.posDauId(); p.negDauId(); }) { auto posDaughter = trackTable.rawIteratorAt(particle2.posDauId() - trackTable.offset()); auto negDaughter = trackTable.rawIteratorAt(particle2.negDauId() - trackTable.offset()); diff --git a/PWGCF/Femto/Core/partitions.h b/PWGCF/Femto/Core/partitions.h index 5706bb9e639..ed849b52048 100644 --- a/PWGCF/Femto/Core/partitions.h +++ b/PWGCF/Femto/Core/partitions.h @@ -195,7 +195,6 @@ (o2::aod::femtobase::stored::mass < (selection).massMax) && \ ncheckbit(o2::aod::femtocharmhadrons::mask, (selection).mask) - // macros for mc collisions (mc only) // NOLINTNEXTLINE(cppcoreguidelines-macro-usage) #define MAKE_MC_COLLISION_FILTER(selection) \ diff --git a/PWGCF/Femto/TableProducer/femtoProducer.cxx b/PWGCF/Femto/TableProducer/femtoProducer.cxx index 9296f75c1cb..6a4cd41d469 100644 --- a/PWGCF/Femto/TableProducer/femtoProducer.cxx +++ b/PWGCF/Femto/TableProducer/femtoProducer.cxx @@ -967,7 +967,7 @@ struct FemtoProducer { } PROCESS_SWITCH(FemtoProducer, processTracksLcsRun3PbPb, "Provide tracks and Lcs in PbPb collisions", false); - void processTracksLcsRun3ppMc(rawinputs::Run3PpMcGenCollisions const& mcCols, + void processTracksLcsRun3ppMc(rawinputs::Run3PpMcGenCollisions const& mcCols, rawinputs::Run3PpMcRecoCollisions const& cols, o2::aod::BCsWithTimestamps const& bcs, rawinputs::Run3McRecoTracks const& tracks, diff --git a/PWGCF/Femto/Tasks/femtoCharmHadronQa.cxx b/PWGCF/Femto/Tasks/femtoCharmHadronQa.cxx index adc25ce7f02..8a3ce875e97 100644 --- a/PWGCF/Femto/Tasks/femtoCharmHadronQa.cxx +++ b/PWGCF/Femto/Tasks/femtoCharmHadronQa.cxx @@ -109,8 +109,6 @@ struct FemtoCharmHadronQa { modes::CharmHadron::kLc> lcHistManager; - - // setup for daughters trackhistmanager::ConfD01PosDauBinning confD01PosDaughterBinning; trackhistmanager::ConfD01PosDauQaBinning confD01PosDaughterQaBinning; @@ -127,7 +125,6 @@ struct FemtoCharmHadronQa { trackhistmanager::ConfLc1PionDauBinning confLc1PionDaughterBinning; trackhistmanager::ConfLc1PionDauQaBinning confLc1PionDaughterQaBinning; - o2::framework::HistogramRegistry hRegistry{"FemtoCharmHadronQa", {}, o2::framework::OutputObjHandlingPolicy::AnalysisObject}; void init(o2::framework::InitContext&)