From de878e3c1d04ec23760a9e4954d42501a3aba8dc Mon Sep 17 00:00:00 2001 From: Anton Riedel Date: Fri, 6 Nov 2026 09:22:16 +0100 Subject: [PATCH] Feat: fix code-check errors and warnings --- PWGCF/Femto/Core/collisionTagger.h | 82 +++++++++---------- .../femtoProducerCollisionTagger.cxx | 52 ++++++------ PWGCF/Femto/Tasks/femtoPairD0D0.cxx | 1 + PWGCF/Femto/Tasks/femtoPairTrackCascade.cxx | 1 + .../Femto/Tasks/femtoPairTrackCharmHadron.cxx | 1 + PWGCF/Femto/Tasks/femtoPairTrackKink.cxx | 1 + PWGCF/Femto/Tasks/femtoPairTrackTrack.cxx | 1 + .../femtoPairTrackTwoPhotonResonance.cxx | 1 + .../Tasks/femtoPairTrackTwoTrackResonance.cxx | 1 + PWGCF/Femto/Tasks/femtoPairTrackV0.cxx | 1 + .../Tasks/femtoPairV0TwoTrackResonance.cxx | 1 + PWGCF/Femto/Tasks/femtoPairV0V0.cxx | 1 + .../Tasks/femtoTripletTrackTrackCascade.cxx | 1 + .../Tasks/femtoTripletTrackTrackTrack.cxx | 1 + .../Femto/Tasks/femtoTripletTrackTrackV0.cxx | 1 + 15 files changed, 80 insertions(+), 67 deletions(-) diff --git a/PWGCF/Femto/Core/collisionTagger.h b/PWGCF/Femto/Core/collisionTagger.h index 9d2bf28a0c5..931be1a0f02 100644 --- a/PWGCF/Femto/Core/collisionTagger.h +++ b/PWGCF/Femto/Core/collisionTagger.h @@ -467,7 +467,7 @@ inline bool hasEnabledOption(o2::framework::DeviceSpec const& device, std::strin inline bool hasAnyEnabledOptionStartingWith(o2::framework::DeviceSpec const& device, std::string const& prefix) { for (auto const& option : device.options) { - if (option.name.rfind(prefix, 0) == 0 && option.defaultValue.get()) { + if (option.name.starts_with(prefix) && option.defaultValue.get()) { return true; } } @@ -482,7 +482,7 @@ bool trackPasses(T const& track, TrackSelectionValues const& sel) return false; } float absPt = std::fabs(sel.chargeAbs * track.signedPt()); - if (!(absPt > sel.ptMin && absPt < sel.ptMax)) { + if (absPt <= sel.ptMin || absPt >= sel.ptMax) { return false; } if (!(track.eta() > sel.etaMin && track.eta() < sel.etaMax)) { @@ -512,7 +512,7 @@ bool lambdaPasses(T const& v0, V0SelectionValues const& sel) return false; } float absPt = std::fabs(v0.signedPt()); - if (!(absPt > sel.ptMin && absPt < sel.ptMax)) { + if (absPt <= sel.ptMin || absPt >= sel.ptMax) { return false; } if (!(v0.eta() > sel.etaMin && v0.eta() < sel.etaMax)) { @@ -536,7 +536,7 @@ bool kinkPcmPasses(T const& kink, KinkPcmSelectionValues const& sel) return false; } float absPt = std::fabs(kink.signedPt()); - if (!(absPt > sel.ptMin && absPt < sel.ptMax)) { + if (absPt <= sel.ptMin || absPt >= sel.ptMax) { return false; } if (!(kink.eta() > sel.etaMin && kink.eta() < sel.etaMax)) { @@ -606,7 +606,7 @@ bool kstar0Passes(T const& kstar0, Kstar0SelectionValues const& sel) return false; } float absPt = std::fabs(kstar0.signedPt()); - if (!(absPt > sel.ptMin && absPt < sel.ptMax)) { + if (absPt <= sel.ptMin || absPt >= sel.ptMax) { return false; } if (!(kstar0.eta() > sel.etaMin && kstar0.eta() < sel.etaMax)) { @@ -657,7 +657,7 @@ using CollisionTagBitset = std::bitset; // new `passes` function (trackPasses/lambdaPasses/k0shortPasses above are examples), never a new // copy of this loop. template -inline bool hasAtLeast(Range const& range, Selection const& sel, PassesFn&& passes, int needed = 1) +inline bool hasAtLeast(Range const& range, Selection const& sel, PassesFn const& passes, int needed = 1) { int count = 0; for (auto const& entry : range) { @@ -673,7 +673,7 @@ inline bool hasAtLeast(Range const& range, Selection const& sel, PassesFn&& pass // the one shared selection v.sel2). Reusable for any future same-type pair (V0V0, D0D0, ...) -- // just a different `variants`/`range`/`passes` combination, the counting logic doesn't change. template -inline void tagPairVariants(CollisionTagBitset& tag, std::vector const& variants, Range const& range, PassesFn&& passes) +inline void tagPairVariants(CollisionTagBitset& tag, std::vector const& variants, Range const& range, PassesFn const& passes) { for (auto const& v : variants) { bool ok1 = hasAtLeast(range, v.sel1, passes, 1); @@ -689,7 +689,7 @@ inline void tagPairVariants(CollisionTagBitset& tag, std::vector const& // Reusable for any future cross-type pair (track-cascade, track-kink, track-D0, ...) -- just a // different `variants`/ranges/passes combination. template -inline void tagCrossVariants(CollisionTagBitset& tag, std::vector const& variants, Range1 const& range1, PassesFn1&& passes1, Range2 const& range2, PassesFn2&& passes2) +inline void tagCrossVariants(CollisionTagBitset& tag, std::vector const& variants, Range1 const& range1, PassesFn1 const& passes1, Range2 const& range2, PassesFn2 const& passes2) { for (auto const& v : variants) { if (hasAtLeast(range1, v.sel1, passes1, 1) && hasAtLeast(range2, v.sel2, passes2, 1)) { @@ -702,7 +702,7 @@ inline void tagCrossVariants(CollisionTagBitset& tag, std::vector const // followed by producing the tag row -- covers any task type whose process function only ever // needs one same-type-pair check per collision (e.g. processTrackTrack). template -inline void tagAndProduce(Produces& producedTags, std::vector const& variants, Range const& range, PassesFn&& passes) +inline void tagAndProduce(Produces& producedTags, std::vector const& variants, Range const& range, PassesFn const& passes) { CollisionTagBitset tag; tagPairVariants(tag, variants, range, passes); @@ -714,7 +714,7 @@ inline void tagAndProduce(Produces& producedTags, std::vector const& va // distinct passing sel1 plus 1 more passing sel3; otherwise sel1/sel2/sel3 each need their own // independent match. Mirrors TripletTrackTrackTrackBuilder exactly (see TrackTrackTrackVariant). template -inline void tagTripletVariants(CollisionTagBitset& tag, std::vector const& variants, Range const& range, PassesFn&& passes) +inline void tagTripletVariants(CollisionTagBitset& tag, std::vector const& variants, Range const& range, PassesFn const& passes) { for (auto const& v : variants) { bool ok = false; @@ -737,7 +737,7 @@ inline void tagTripletVariants(CollisionTagBitset& tag, std::vector con // and role 2 each need their own independent match in range1. Mirrors // TripletTrackTrackV0Builder/TripletTrackTrackCascadeBuilder exactly (see TrackTrackV0Variant). template -inline void tagCrossTripletVariants(CollisionTagBitset& tag, std::vector const& variants, Range1 const& range1, PassesFn1&& passes1, Range2 const& range2, PassesFn2&& passes2) +inline void tagCrossTripletVariants(CollisionTagBitset& tag, std::vector const& variants, Range1 const& range1, PassesFn1 const& passes1, Range2 const& range2, PassesFn2 const& passes2) { for (auto const& v : variants) { bool ok = v.same12 ? hasAtLeast(range1, v.sel1, passes1, 2) @@ -757,7 +757,7 @@ inline void tagCrossTripletVariants(CollisionTagBitset& tag, std::vector -// below, the std::string construction in discoverTaggedRoles(), etc.). `inline` (not just +// below, the explicit static_cast(...) in discoverTaggedRoles(), etc.). `inline` (not just // `constexpr`) matters too: without it, a namespace-scope variable has internal linkage, so each // translation unit would get its own copy at its own address -- fine for a value, but the same // template instantiation must denote the same entity everywhere it's used. `inline` guarantees @@ -851,7 +851,7 @@ inline std::vector discoverTaggedRoles(o2::framework::RunningWorkflo // assigning it one anyway would just waste a slot out of the hard-capped budget // (MaxTagBits below) for nothing. if (hasAnyEnabledOptionStartingWith(device, "processMixedEventWithTagging")) { - roles.push_back({device.name, role::TrackTrackPair, counter++}); + roles.push_back({device.name, static_cast(role::TrackTrackPair), counter++}); } } else if (device.name.find(devicename::FemtoPairTrackV0) != std::string::npos) { // Each species gates independently on its own *MixedEventWithTagging* switch family -- @@ -860,115 +860,115 @@ inline std::vector discoverTaggedRoles(o2::framework::RunningWorkflo // combination), and, same as TrackTrackPair above, same-event/Mc/WithFitVars-without-tagging // variants are irrelevant here since none of them ever consume a tag bit. if (hasAnyEnabledOptionStartingWith(device, "processLambdaMixedEventWithTagging")) { - roles.push_back({device.name, role::TrackLambdaPair, counter++}); + roles.push_back({device.name, static_cast(role::TrackLambdaPair), counter++}); } if (hasAnyEnabledOptionStartingWith(device, "processK0shortMixedEventWithTagging")) { - roles.push_back({device.name, role::TrackK0shortPair, counter++}); + roles.push_back({device.name, static_cast(role::TrackK0shortPair), counter++}); } } else if (device.name.find(devicename::FemtoPairTrackCascade) != std::string::npos) { // Xi and Omega are mutually exclusive on a single instance (the task itself fatals if // both are enabled), but gating independently costs nothing and needs no special-casing // here. if (hasAnyEnabledOptionStartingWith(device, "processXiMixedEventWithTagging")) { - roles.push_back({device.name, role::TrackXiPair, counter++}); + roles.push_back({device.name, static_cast(role::TrackXiPair), counter++}); } if (hasAnyEnabledOptionStartingWith(device, "processOmegaMixedEventWithTagging")) { - roles.push_back({device.name, role::TrackOmegaPair, counter++}); + roles.push_back({device.name, static_cast(role::TrackOmegaPair), counter++}); } } else if (device.name.find(devicename::FemtoPairTrackKink) != std::string::npos) { if (hasAnyEnabledOptionStartingWith(device, "processSigmaMixedEventWithTagging")) { - roles.push_back({device.name, role::TrackSigmaPair, counter++}); + roles.push_back({device.name, static_cast(role::TrackSigmaPair), counter++}); } if (hasAnyEnabledOptionStartingWith(device, "processSigmaPlusMixedEventWithTagging")) { - roles.push_back({device.name, role::TrackSigmaPlusPair, counter++}); + roles.push_back({device.name, static_cast(role::TrackSigmaPlusPair), counter++}); } if (hasAnyEnabledOptionStartingWith(device, "processSigmaPlusPcmMixedEventWithTagging")) { - roles.push_back({device.name, role::TrackSigmaPlusPcmPair, counter++}); + roles.push_back({device.name, static_cast(role::TrackSigmaPlusPcmPair), counter++}); } } else if (device.name.find(devicename::FemtoPairTrackCharmHadron) != std::string::npos) { if (hasAnyEnabledOptionStartingWith(device, "processD0MixedEventWithTagging")) { - roles.push_back({device.name, role::TrackD0Pair, counter++}); + roles.push_back({device.name, static_cast(role::TrackD0Pair), counter++}); } if (hasAnyEnabledOptionStartingWith(device, "processLcMixedEventWithTagging")) { - roles.push_back({device.name, role::TrackLcPair, counter++}); + roles.push_back({device.name, static_cast(role::TrackLcPair), counter++}); } } else if (device.name.find(devicename::FemtoPairV0V0) != std::string::npos) { // Lambda-lambda, k0short-k0short and lambda-k0short are mutually exclusive on a single // instance (the task itself fatals if more than one is enabled), but gating independently // costs nothing and needs no special-casing here. if (hasAnyEnabledOptionStartingWith(device, "processLambdaLambdaMixedEventWithTagging")) { - roles.push_back({device.name, role::LambdaLambdaPair, counter++}); + roles.push_back({device.name, static_cast(role::LambdaLambdaPair), counter++}); } if (hasAnyEnabledOptionStartingWith(device, "processK0shortK0shortMixedEventWithTagging")) { - roles.push_back({device.name, role::K0shortK0shortPair, counter++}); + roles.push_back({device.name, static_cast(role::K0shortK0shortPair), counter++}); } if (hasAnyEnabledOptionStartingWith(device, "processLambdaK0shortMixedEventWithTagging")) { - roles.push_back({device.name, role::LambdaK0shortPair, counter++}); + roles.push_back({device.name, static_cast(role::LambdaK0shortPair), counter++}); } } else if (device.name.find(devicename::FemtoPairD0D0) != std::string::npos) { // Only one pair type possible per instance (sign on D0Selection1/2 picks the hypothesis), so // this task's WithTagging process function is just "processMixedEventWithTagging", same local // name as femtoPairTrackTrack.cxx's -- fine since option names are scoped per-device. if (hasAnyEnabledOptionStartingWith(device, "processMixedEventWithTagging")) { - roles.push_back({device.name, role::D0D0Pair, counter++}); + roles.push_back({device.name, static_cast(role::D0D0Pair), counter++}); } } else if (device.name.find(devicename::FemtoPairTrackTwoTrackResonance) != std::string::npos) { // Phi, Kstar0 and Rho0 are mutually exclusive on a single instance (the task itself fatals // if more than one is enabled), but gating independently costs nothing here either. if (hasAnyEnabledOptionStartingWith(device, "processPhiMixedEventWithTagging")) { - roles.push_back({device.name, role::TrackPhiPair, counter++}); + roles.push_back({device.name, static_cast(role::TrackPhiPair), counter++}); } if (hasAnyEnabledOptionStartingWith(device, "processKstar0MixedEventWithTagging")) { - roles.push_back({device.name, role::TrackKstar0Pair, counter++}); + roles.push_back({device.name, static_cast(role::TrackKstar0Pair), counter++}); } if (hasAnyEnabledOptionStartingWith(device, "processRho0MixedEventWithTagging")) { - roles.push_back({device.name, role::TrackRho0Pair, counter++}); + roles.push_back({device.name, static_cast(role::TrackRho0Pair), counter++}); } } else if (device.name.find(devicename::FemtoPairTrackTwoPhotonResonance) != std::string::npos) { // Pi0 and Eta are mutually exclusive on a single instance, same as above. if (hasAnyEnabledOptionStartingWith(device, "processPi0MixedEventWithTagging")) { - roles.push_back({device.name, role::TrackPi0Pair, counter++}); + roles.push_back({device.name, static_cast(role::TrackPi0Pair), counter++}); } if (hasAnyEnabledOptionStartingWith(device, "processEtaMixedEventWithTagging")) { - roles.push_back({device.name, role::TrackEtaPair, counter++}); + roles.push_back({device.name, static_cast(role::TrackEtaPair), counter++}); } } else if (device.name.find(devicename::FemtoPairV0TwoTrackResonance) != std::string::npos) { // All six v0 x resonance combinations are mutually exclusive on a single instance (the task // itself fatals if more than one is enabled), same as above. if (hasAnyEnabledOptionStartingWith(device, "processLambdaPhiMixedEventWithTagging")) { - roles.push_back({device.name, role::LambdaPhiPair, counter++}); + roles.push_back({device.name, static_cast(role::LambdaPhiPair), counter++}); } if (hasAnyEnabledOptionStartingWith(device, "processLambdaKstar0MixedEventWithTagging")) { - roles.push_back({device.name, role::LambdaKstar0Pair, counter++}); + roles.push_back({device.name, static_cast(role::LambdaKstar0Pair), counter++}); } if (hasAnyEnabledOptionStartingWith(device, "processLambdaRho0MixedEventWithTagging")) { - roles.push_back({device.name, role::LambdaRho0Pair, counter++}); + roles.push_back({device.name, static_cast(role::LambdaRho0Pair), counter++}); } if (hasAnyEnabledOptionStartingWith(device, "processK0shortPhiMixedEventWithTagging")) { - roles.push_back({device.name, role::K0shortPhiPair, counter++}); + roles.push_back({device.name, static_cast(role::K0shortPhiPair), counter++}); } if (hasAnyEnabledOptionStartingWith(device, "processK0shortKstar0MixedEventWithTagging")) { - roles.push_back({device.name, role::K0shortKstar0Pair, counter++}); + roles.push_back({device.name, static_cast(role::K0shortKstar0Pair), counter++}); } if (hasAnyEnabledOptionStartingWith(device, "processK0shortRho0MixedEventWithTagging")) { - roles.push_back({device.name, role::K0shortRho0Pair, counter++}); + roles.push_back({device.name, static_cast(role::K0shortRho0Pair), counter++}); } } else if (device.name.find(devicename::FemtoTripletTrackTrackTrack) != std::string::npos) { if (hasAnyEnabledOptionStartingWith(device, "processMixedEventWithTagging")) { - roles.push_back({device.name, role::TrackTrackTrackTriplet, counter++}); + roles.push_back({device.name, static_cast(role::TrackTrackTrackTriplet), counter++}); } } else if (device.name.find(devicename::FemtoTripletTrackTrackV0) != std::string::npos) { if (hasAnyEnabledOptionStartingWith(device, "processMixedEventWithTagging")) { - roles.push_back({device.name, role::TrackTrackLambdaTriplet, counter++}); + roles.push_back({device.name, static_cast(role::TrackTrackLambdaTriplet), counter++}); } } else if (device.name.find(devicename::FemtoTripletTrackTrackCascade) != std::string::npos) { // Xi and Omega are mutually exclusive on a single instance (the task itself fatals if both // are enabled), but gating independently costs nothing here either. if (hasAnyEnabledOptionStartingWith(device, "processXiMixedEventWithTagging")) { - roles.push_back({device.name, role::TrackTrackXiTriplet, counter++}); + roles.push_back({device.name, static_cast(role::TrackTrackXiTriplet), counter++}); } if (hasAnyEnabledOptionStartingWith(device, "processOmegaMixedEventWithTagging")) { - roles.push_back({device.name, role::TrackTrackOmegaTriplet, counter++}); + roles.push_back({device.name, static_cast(role::TrackTrackOmegaTriplet), counter++}); } } // TODO: add the remaining triplet task types (mc-particle triplets, ...), following the same diff --git a/PWGCF/Femto/TableProducer/femtoProducerCollisionTagger.cxx b/PWGCF/Femto/TableProducer/femtoProducerCollisionTagger.cxx index 2fca898ea81..dc618f158d7 100644 --- a/PWGCF/Femto/TableProducer/femtoProducerCollisionTagger.cxx +++ b/PWGCF/Femto/TableProducer/femtoProducerCollisionTagger.cxx @@ -155,7 +155,7 @@ struct FemtoProducerCollisionTagger { for (auto const& r : roles) { LOG(info) << " bit " << r.bit << " = " << r.deviceName << " " << r.role; - if (doprocessTrackTrack && r.role == collisiontagger::role::TrackTrackPair && r.deviceName.find(collisiontagger::devicename::FemtoPairTrackTrack) != std::string::npos) { + if (doprocessTrackTrack && r.role == static_cast(collisiontagger::role::TrackTrackPair) && r.deviceName.find(collisiontagger::devicename::FemtoPairTrackTrack) != std::string::npos) { o2::framework::DeviceSpec const& device = findDevice(r.deviceName); collisiontagger::TrackTrackVariant v; v.sel1 = collisiontagger::readTrackSelection(device, "TrackSelection1"); @@ -170,13 +170,13 @@ struct FemtoProducerCollisionTagger { mTrackTrackVariants.push_back(v); } else if (doprocessTrackV0 && r.deviceName.find(collisiontagger::devicename::FemtoPairTrackV0) != std::string::npos) { o2::framework::DeviceSpec const& device = findDevice(r.deviceName); - if (r.role == collisiontagger::role::TrackLambdaPair) { + if (r.role == static_cast(collisiontagger::role::TrackLambdaPair)) { collisiontagger::TrackV0Variant v; v.sel1 = collisiontagger::readTrackSelection(device, "TrackSelection1"); v.sel2 = collisiontagger::readV0Selection(device, "LambdaSelection1"); v.bit = r.bit; mTrackLambdaVariants.push_back(v); - } else if (r.role == collisiontagger::role::TrackK0shortPair) { + } else if (r.role == static_cast(collisiontagger::role::TrackK0shortPair)) { collisiontagger::TrackV0Variant v; v.sel1 = collisiontagger::readTrackSelection(device, "TrackSelection1"); v.sel2 = collisiontagger::readV0Selection(device, "K0shortSelection1"); @@ -185,13 +185,13 @@ struct FemtoProducerCollisionTagger { } } else if (doprocessTrackCascade && r.deviceName.find(collisiontagger::devicename::FemtoPairTrackCascade) != std::string::npos) { o2::framework::DeviceSpec const& device = findDevice(r.deviceName); - if (r.role == collisiontagger::role::TrackXiPair) { + if (r.role == static_cast(collisiontagger::role::TrackXiPair)) { collisiontagger::TrackV0Variant v; v.sel1 = collisiontagger::readTrackSelection(device, "TrackSelection1"); v.sel2 = collisiontagger::readV0Selection(device, "XiSelection"); v.bit = r.bit; mTrackXiVariants.push_back(v); - } else if (r.role == collisiontagger::role::TrackOmegaPair) { + } else if (r.role == static_cast(collisiontagger::role::TrackOmegaPair)) { collisiontagger::TrackV0Variant v; v.sel1 = collisiontagger::readTrackSelection(device, "TrackSelection1"); v.sel2 = collisiontagger::readV0Selection(device, "OmegaSelection"); @@ -200,19 +200,19 @@ struct FemtoProducerCollisionTagger { } } else if ((doprocessTrackKink || doprocessTrackSigmaPlusPcm) && r.deviceName.find(collisiontagger::devicename::FemtoPairTrackKink) != std::string::npos) { o2::framework::DeviceSpec const& device = findDevice(r.deviceName); - if (r.role == collisiontagger::role::TrackSigmaPair) { + if (r.role == static_cast(collisiontagger::role::TrackSigmaPair)) { collisiontagger::TrackV0Variant v; v.sel1 = collisiontagger::readTrackSelection(device, "TrackSelection1"); v.sel2 = collisiontagger::readV0Selection(device, "SigmaSelection1"); v.bit = r.bit; mTrackSigmaVariants.push_back(v); - } else if (r.role == collisiontagger::role::TrackSigmaPlusPair) { + } else if (r.role == static_cast(collisiontagger::role::TrackSigmaPlusPair)) { collisiontagger::TrackV0Variant v; v.sel1 = collisiontagger::readTrackSelection(device, "TrackSelection1"); v.sel2 = collisiontagger::readV0Selection(device, "SigmaPlusSelection1"); v.bit = r.bit; mTrackSigmaPlusVariants.push_back(v); - } else if (r.role == collisiontagger::role::TrackSigmaPlusPcmPair) { + } else if (r.role == static_cast(collisiontagger::role::TrackSigmaPlusPcmPair)) { collisiontagger::TrackKinkPcmVariant v; v.sel1 = collisiontagger::readTrackSelection(device, "TrackSelection1"); v.sel2 = collisiontagger::readKinkPcmSelection(device, "SigmaPlusPcmSelection1"); @@ -221,13 +221,13 @@ struct FemtoProducerCollisionTagger { } } else if ((doprocessTrackD0 || doprocessTrackLc) && r.deviceName.find(collisiontagger::devicename::FemtoPairTrackCharmHadron) != std::string::npos) { o2::framework::DeviceSpec const& device = findDevice(r.deviceName); - if (r.role == collisiontagger::role::TrackD0Pair) { + if (r.role == static_cast(collisiontagger::role::TrackD0Pair)) { collisiontagger::TrackV0Variant v; v.sel1 = collisiontagger::readTrackSelection(device, "TrackSelection1"); v.sel2 = collisiontagger::readV0Selection(device, "D0Selection1"); v.bit = r.bit; mTrackD0Variants.push_back(v); - } else if (r.role == collisiontagger::role::TrackLcPair) { + } else if (r.role == static_cast(collisiontagger::role::TrackLcPair)) { collisiontagger::TrackV0Variant v; v.sel1 = collisiontagger::readTrackSelection(device, "TrackSelection1"); v.sel2 = collisiontagger::readV0Selection(device, "LcSelection1"); @@ -236,7 +236,7 @@ struct FemtoProducerCollisionTagger { } } else if (doprocessV0V0 && r.deviceName.find(collisiontagger::devicename::FemtoPairV0V0) != std::string::npos) { o2::framework::DeviceSpec const& device = findDevice(r.deviceName); - if (r.role == collisiontagger::role::LambdaLambdaPair) { + if (r.role == static_cast(collisiontagger::role::LambdaLambdaPair)) { collisiontagger::V0V0Variant v; v.sel1 = collisiontagger::readV0Selection(device, "LambdaSelection1"); v.sameSpecies = collisiontagger::hasEnabledOption(device, "Mixing.sameSpecies"); @@ -246,14 +246,14 @@ struct FemtoProducerCollisionTagger { v.sel2 = v.sameSpecies ? v.sel1 : collisiontagger::readV0Selection(device, "LambdaSelection2"); v.bit = r.bit; mLambdaLambdaVariants.push_back(v); - } else if (r.role == collisiontagger::role::K0shortK0shortPair) { + } else if (r.role == static_cast(collisiontagger::role::K0shortK0shortPair)) { collisiontagger::V0V0Variant v; v.sel1 = collisiontagger::readV0Selection(device, "K0shortSelection1"); v.sameSpecies = collisiontagger::hasEnabledOption(device, "Mixing.sameSpecies"); v.sel2 = v.sameSpecies ? v.sel1 : collisiontagger::readV0Selection(device, "K0shortSelection2"); v.bit = r.bit; mK0shortK0shortVariants.push_back(v); - } else if (r.role == collisiontagger::role::LambdaK0shortPair) { + } else if (r.role == static_cast(collisiontagger::role::LambdaK0shortPair)) { collisiontagger::V0V0Variant v; v.sel1 = collisiontagger::readV0Selection(device, "LambdaSelection1"); v.sel2 = collisiontagger::readV0Selection(device, "K0shortSelection2"); @@ -275,19 +275,19 @@ struct FemtoProducerCollisionTagger { mD0D0Variants.push_back(v); } else if (doprocessTrackTwoTrackResonance && r.deviceName.find(collisiontagger::devicename::FemtoPairTrackTwoTrackResonance) != std::string::npos) { o2::framework::DeviceSpec const& device = findDevice(r.deviceName); - if (r.role == collisiontagger::role::TrackPhiPair) { + if (r.role == static_cast(collisiontagger::role::TrackPhiPair)) { collisiontagger::TrackTwoTrackResonanceVariant v; v.sel1 = collisiontagger::readTrackSelection(device, "TrackSelection1"); v.sel2 = collisiontagger::readTwoTrackResonanceSelection(device, "PhiSelection"); v.bit = r.bit; mTrackPhiVariants.push_back(v); - } else if (r.role == collisiontagger::role::TrackKstar0Pair) { + } else if (r.role == static_cast(collisiontagger::role::TrackKstar0Pair)) { collisiontagger::TrackKstar0Variant v; v.sel1 = collisiontagger::readTrackSelection(device, "TrackSelection1"); v.sel2 = collisiontagger::readKstar0Selection(device, "Kstar0Selection"); v.bit = r.bit; mTrackKstar0Variants.push_back(v); - } else if (r.role == collisiontagger::role::TrackRho0Pair) { + } else if (r.role == static_cast(collisiontagger::role::TrackRho0Pair)) { collisiontagger::TrackTwoTrackResonanceVariant v; v.sel1 = collisiontagger::readTrackSelection(device, "TrackSelection1"); v.sel2 = collisiontagger::readTwoTrackResonanceSelection(device, "Rho0Selection"); @@ -296,13 +296,13 @@ struct FemtoProducerCollisionTagger { } } else if (doprocessTrackTwoPhotonResonance && r.deviceName.find(collisiontagger::devicename::FemtoPairTrackTwoPhotonResonance) != std::string::npos) { o2::framework::DeviceSpec const& device = findDevice(r.deviceName); - if (r.role == collisiontagger::role::TrackPi0Pair) { + if (r.role == static_cast(collisiontagger::role::TrackPi0Pair)) { collisiontagger::TrackTwoPhotonResonanceVariant v; v.sel1 = collisiontagger::readTrackSelection(device, "TrackSelection1"); v.sel2 = collisiontagger::readTwoPhotonResonanceSelection(device, "Pi0Selection1"); v.bit = r.bit; mTrackPi0Variants.push_back(v); - } else if (r.role == collisiontagger::role::TrackEtaPair) { + } else if (r.role == static_cast(collisiontagger::role::TrackEtaPair)) { collisiontagger::TrackTwoPhotonResonanceVariant v; v.sel1 = collisiontagger::readTrackSelection(device, "TrackSelection1"); v.sel2 = collisiontagger::readTwoPhotonResonanceSelection(device, "EtaSelection1"); @@ -311,37 +311,37 @@ struct FemtoProducerCollisionTagger { } } else if (doprocessV0TwoTrackResonance && r.deviceName.find(collisiontagger::devicename::FemtoPairV0TwoTrackResonance) != std::string::npos) { o2::framework::DeviceSpec const& device = findDevice(r.deviceName); - if (r.role == collisiontagger::role::LambdaPhiPair) { + if (r.role == static_cast(collisiontagger::role::LambdaPhiPair)) { collisiontagger::V0TwoTrackResonanceVariant v; v.sel1 = collisiontagger::readV0Selection(device, "LambdaSelection1"); v.sel2 = collisiontagger::readTwoTrackResonanceSelection(device, "PhiSelection"); v.bit = r.bit; mLambdaPhiVariants.push_back(v); - } else if (r.role == collisiontagger::role::LambdaKstar0Pair) { + } else if (r.role == static_cast(collisiontagger::role::LambdaKstar0Pair)) { collisiontagger::V0Kstar0Variant v; v.sel1 = collisiontagger::readV0Selection(device, "LambdaSelection1"); v.sel2 = collisiontagger::readKstar0Selection(device, "Kstar0Selection"); v.bit = r.bit; mLambdaKstar0Variants.push_back(v); - } else if (r.role == collisiontagger::role::LambdaRho0Pair) { + } else if (r.role == static_cast(collisiontagger::role::LambdaRho0Pair)) { collisiontagger::V0TwoTrackResonanceVariant v; v.sel1 = collisiontagger::readV0Selection(device, "LambdaSelection1"); v.sel2 = collisiontagger::readTwoTrackResonanceSelection(device, "Rho0Selection"); v.bit = r.bit; mLambdaRho0Variants.push_back(v); - } else if (r.role == collisiontagger::role::K0shortPhiPair) { + } else if (r.role == static_cast(collisiontagger::role::K0shortPhiPair)) { collisiontagger::V0TwoTrackResonanceVariant v; v.sel1 = collisiontagger::readV0Selection(device, "K0shortSelection1"); v.sel2 = collisiontagger::readTwoTrackResonanceSelection(device, "PhiSelection"); v.bit = r.bit; mK0shortPhiVariants.push_back(v); - } else if (r.role == collisiontagger::role::K0shortKstar0Pair) { + } else if (r.role == static_cast(collisiontagger::role::K0shortKstar0Pair)) { collisiontagger::V0Kstar0Variant v; v.sel1 = collisiontagger::readV0Selection(device, "K0shortSelection1"); v.sel2 = collisiontagger::readKstar0Selection(device, "Kstar0Selection"); v.bit = r.bit; mK0shortKstar0Variants.push_back(v); - } else if (r.role == collisiontagger::role::K0shortRho0Pair) { + } else if (r.role == static_cast(collisiontagger::role::K0shortRho0Pair)) { collisiontagger::V0TwoTrackResonanceVariant v; v.sel1 = collisiontagger::readV0Selection(device, "K0shortSelection1"); v.sel2 = collisiontagger::readTwoTrackResonanceSelection(device, "Rho0Selection"); @@ -380,7 +380,7 @@ struct FemtoProducerCollisionTagger { collisiontagger::TrackSelectionValues sel2Raw = collisiontagger::readTrackSelection(device, "TrackSelection2"); bool same12 = collisiontagger::hasEnabledOption(device, "Mixing.particle12AreSameSpecies"); collisiontagger::TrackSelectionValues sel2 = same12 ? sel1 : sel2Raw; - if (r.role == collisiontagger::role::TrackTrackXiTriplet) { + if (r.role == static_cast(collisiontagger::role::TrackTrackXiTriplet)) { collisiontagger::TrackTrackV0Variant v; v.sel1 = sel1; v.sel2 = sel2; @@ -388,7 +388,7 @@ struct FemtoProducerCollisionTagger { v.sel3 = collisiontagger::readV0Selection(device, "XiSelection"); v.bit = r.bit; mTrackTrackXiVariants.push_back(v); - } else if (r.role == collisiontagger::role::TrackTrackOmegaTriplet) { + } else if (r.role == static_cast(collisiontagger::role::TrackTrackOmegaTriplet)) { collisiontagger::TrackTrackV0Variant v; v.sel1 = sel1; v.sel2 = sel2; diff --git a/PWGCF/Femto/Tasks/femtoPairD0D0.cxx b/PWGCF/Femto/Tasks/femtoPairD0D0.cxx index 28dada11562..340ace0914e 100644 --- a/PWGCF/Femto/Tasks/femtoPairD0D0.cxx +++ b/PWGCF/Femto/Tasks/femtoPairD0D0.cxx @@ -19,6 +19,7 @@ #include "PWGCF/Femto/Core/collisionBuilder.h" #include "PWGCF/Femto/Core/collisionHistManager.h" #include "PWGCF/Femto/Core/collisionTagger.h" +#include "PWGCF/Femto/Core/dataTypes.h" #include "PWGCF/Femto/Core/modes.h" #include "PWGCF/Femto/Core/pairBuilder.h" #include "PWGCF/Femto/Core/pairCleaner.h" diff --git a/PWGCF/Femto/Tasks/femtoPairTrackCascade.cxx b/PWGCF/Femto/Tasks/femtoPairTrackCascade.cxx index dc27468a21b..290d910e1aa 100644 --- a/PWGCF/Femto/Tasks/femtoPairTrackCascade.cxx +++ b/PWGCF/Femto/Tasks/femtoPairTrackCascade.cxx @@ -19,6 +19,7 @@ #include "PWGCF/Femto/Core/collisionBuilder.h" #include "PWGCF/Femto/Core/collisionHistManager.h" #include "PWGCF/Femto/Core/collisionTagger.h" +#include "PWGCF/Femto/Core/dataTypes.h" #include "PWGCF/Femto/Core/modes.h" #include "PWGCF/Femto/Core/pairBuilder.h" #include "PWGCF/Femto/Core/pairCleaner.h" diff --git a/PWGCF/Femto/Tasks/femtoPairTrackCharmHadron.cxx b/PWGCF/Femto/Tasks/femtoPairTrackCharmHadron.cxx index 2e0370d99f9..69ec4fecb24 100644 --- a/PWGCF/Femto/Tasks/femtoPairTrackCharmHadron.cxx +++ b/PWGCF/Femto/Tasks/femtoPairTrackCharmHadron.cxx @@ -19,6 +19,7 @@ #include "PWGCF/Femto/Core/collisionBuilder.h" #include "PWGCF/Femto/Core/collisionHistManager.h" #include "PWGCF/Femto/Core/collisionTagger.h" +#include "PWGCF/Femto/Core/dataTypes.h" #include "PWGCF/Femto/Core/modes.h" #include "PWGCF/Femto/Core/pairBuilder.h" #include "PWGCF/Femto/Core/pairCleaner.h" diff --git a/PWGCF/Femto/Tasks/femtoPairTrackKink.cxx b/PWGCF/Femto/Tasks/femtoPairTrackKink.cxx index 3c1385d945d..4e760f037d4 100644 --- a/PWGCF/Femto/Tasks/femtoPairTrackKink.cxx +++ b/PWGCF/Femto/Tasks/femtoPairTrackKink.cxx @@ -18,6 +18,7 @@ #include "PWGCF/Femto/Core/collisionBuilder.h" #include "PWGCF/Femto/Core/collisionHistManager.h" #include "PWGCF/Femto/Core/collisionTagger.h" +#include "PWGCF/Femto/Core/dataTypes.h" #include "PWGCF/Femto/Core/kinkBuilder.h" #include "PWGCF/Femto/Core/kinkHistManager.h" #include "PWGCF/Femto/Core/modes.h" diff --git a/PWGCF/Femto/Tasks/femtoPairTrackTrack.cxx b/PWGCF/Femto/Tasks/femtoPairTrackTrack.cxx index 11379064023..3bd8334ab7c 100644 --- a/PWGCF/Femto/Tasks/femtoPairTrackTrack.cxx +++ b/PWGCF/Femto/Tasks/femtoPairTrackTrack.cxx @@ -17,6 +17,7 @@ #include "PWGCF/Femto/Core/collisionBuilder.h" #include "PWGCF/Femto/Core/collisionHistManager.h" #include "PWGCF/Femto/Core/collisionTagger.h" +#include "PWGCF/Femto/Core/dataTypes.h" #include "PWGCF/Femto/Core/modes.h" #include "PWGCF/Femto/Core/pairBuilder.h" #include "PWGCF/Femto/Core/pairCleaner.h" diff --git a/PWGCF/Femto/Tasks/femtoPairTrackTwoPhotonResonance.cxx b/PWGCF/Femto/Tasks/femtoPairTrackTwoPhotonResonance.cxx index 24fa1adee36..b2ee1418fd4 100644 --- a/PWGCF/Femto/Tasks/femtoPairTrackTwoPhotonResonance.cxx +++ b/PWGCF/Femto/Tasks/femtoPairTrackTwoPhotonResonance.cxx @@ -17,6 +17,7 @@ #include "PWGCF/Femto/Core/collisionBuilder.h" #include "PWGCF/Femto/Core/collisionHistManager.h" #include "PWGCF/Femto/Core/collisionTagger.h" +#include "PWGCF/Femto/Core/dataTypes.h" #include "PWGCF/Femto/Core/modes.h" #include "PWGCF/Femto/Core/pairBuilder.h" #include "PWGCF/Femto/Core/pairCleaner.h" diff --git a/PWGCF/Femto/Tasks/femtoPairTrackTwoTrackResonance.cxx b/PWGCF/Femto/Tasks/femtoPairTrackTwoTrackResonance.cxx index bb46e8cbc1a..01c9d41b769 100644 --- a/PWGCF/Femto/Tasks/femtoPairTrackTwoTrackResonance.cxx +++ b/PWGCF/Femto/Tasks/femtoPairTrackTwoTrackResonance.cxx @@ -17,6 +17,7 @@ #include "PWGCF/Femto/Core/collisionBuilder.h" #include "PWGCF/Femto/Core/collisionHistManager.h" #include "PWGCF/Femto/Core/collisionTagger.h" +#include "PWGCF/Femto/Core/dataTypes.h" #include "PWGCF/Femto/Core/modes.h" #include "PWGCF/Femto/Core/pairBuilder.h" #include "PWGCF/Femto/Core/pairCleaner.h" diff --git a/PWGCF/Femto/Tasks/femtoPairTrackV0.cxx b/PWGCF/Femto/Tasks/femtoPairTrackV0.cxx index de4eba27609..d7af5e129dd 100644 --- a/PWGCF/Femto/Tasks/femtoPairTrackV0.cxx +++ b/PWGCF/Femto/Tasks/femtoPairTrackV0.cxx @@ -17,6 +17,7 @@ #include "PWGCF/Femto/Core/collisionBuilder.h" #include "PWGCF/Femto/Core/collisionHistManager.h" #include "PWGCF/Femto/Core/collisionTagger.h" +#include "PWGCF/Femto/Core/dataTypes.h" #include "PWGCF/Femto/Core/modes.h" #include "PWGCF/Femto/Core/pairBuilder.h" #include "PWGCF/Femto/Core/pairCleaner.h" diff --git a/PWGCF/Femto/Tasks/femtoPairV0TwoTrackResonance.cxx b/PWGCF/Femto/Tasks/femtoPairV0TwoTrackResonance.cxx index 6bf172bbb95..b155fabf58b 100644 --- a/PWGCF/Femto/Tasks/femtoPairV0TwoTrackResonance.cxx +++ b/PWGCF/Femto/Tasks/femtoPairV0TwoTrackResonance.cxx @@ -17,6 +17,7 @@ #include "PWGCF/Femto/Core/collisionBuilder.h" #include "PWGCF/Femto/Core/collisionHistManager.h" #include "PWGCF/Femto/Core/collisionTagger.h" +#include "PWGCF/Femto/Core/dataTypes.h" #include "PWGCF/Femto/Core/modes.h" #include "PWGCF/Femto/Core/pairBuilder.h" #include "PWGCF/Femto/Core/pairCleaner.h" diff --git a/PWGCF/Femto/Tasks/femtoPairV0V0.cxx b/PWGCF/Femto/Tasks/femtoPairV0V0.cxx index 9d9f7b8698b..4602b00fff4 100644 --- a/PWGCF/Femto/Tasks/femtoPairV0V0.cxx +++ b/PWGCF/Femto/Tasks/femtoPairV0V0.cxx @@ -17,6 +17,7 @@ #include "PWGCF/Femto/Core/collisionBuilder.h" #include "PWGCF/Femto/Core/collisionHistManager.h" #include "PWGCF/Femto/Core/collisionTagger.h" +#include "PWGCF/Femto/Core/dataTypes.h" #include "PWGCF/Femto/Core/modes.h" #include "PWGCF/Femto/Core/pairBuilder.h" #include "PWGCF/Femto/Core/pairCleaner.h" diff --git a/PWGCF/Femto/Tasks/femtoTripletTrackTrackCascade.cxx b/PWGCF/Femto/Tasks/femtoTripletTrackTrackCascade.cxx index b1ddcf9426c..07a67e9ee76 100644 --- a/PWGCF/Femto/Tasks/femtoTripletTrackTrackCascade.cxx +++ b/PWGCF/Femto/Tasks/femtoTripletTrackTrackCascade.cxx @@ -20,6 +20,7 @@ #include "PWGCF/Femto/Core/collisionBuilder.h" #include "PWGCF/Femto/Core/collisionHistManager.h" #include "PWGCF/Femto/Core/collisionTagger.h" +#include "PWGCF/Femto/Core/dataTypes.h" #include "PWGCF/Femto/Core/modes.h" #include "PWGCF/Femto/Core/pairCleaner.h" #include "PWGCF/Femto/Core/particleCleaner.h" diff --git a/PWGCF/Femto/Tasks/femtoTripletTrackTrackTrack.cxx b/PWGCF/Femto/Tasks/femtoTripletTrackTrackTrack.cxx index 04660e2e342..bbd1bc6e439 100644 --- a/PWGCF/Femto/Tasks/femtoTripletTrackTrackTrack.cxx +++ b/PWGCF/Femto/Tasks/femtoTripletTrackTrackTrack.cxx @@ -18,6 +18,7 @@ #include "PWGCF/Femto/Core/collisionBuilder.h" #include "PWGCF/Femto/Core/collisionHistManager.h" #include "PWGCF/Femto/Core/collisionTagger.h" +#include "PWGCF/Femto/Core/dataTypes.h" #include "PWGCF/Femto/Core/modes.h" #include "PWGCF/Femto/Core/pairCleaner.h" #include "PWGCF/Femto/Core/particleCleaner.h" diff --git a/PWGCF/Femto/Tasks/femtoTripletTrackTrackV0.cxx b/PWGCF/Femto/Tasks/femtoTripletTrackTrackV0.cxx index f2b821e2f26..df29c51daf0 100644 --- a/PWGCF/Femto/Tasks/femtoTripletTrackTrackV0.cxx +++ b/PWGCF/Femto/Tasks/femtoTripletTrackTrackV0.cxx @@ -18,6 +18,7 @@ #include "PWGCF/Femto/Core/collisionBuilder.h" #include "PWGCF/Femto/Core/collisionHistManager.h" #include "PWGCF/Femto/Core/collisionTagger.h" +#include "PWGCF/Femto/Core/dataTypes.h" #include "PWGCF/Femto/Core/modes.h" #include "PWGCF/Femto/Core/pairCleaner.h" #include "PWGCF/Femto/Core/particleCleaner.h"