Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions PWGHF/TableProducer/candidateCreator2Prong.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -750,7 +750,7 @@

/// bitmask with event. selection info
float centrality{-1.f};
float occupancy = getOccupancyColl(collision, OccupancyEstimator::Its);
float occupancy = getOccupancyColl(collision, hfEvSel.occEstimator);
const auto rejectionMask = hfEvSel.getHfCollisionRejectionMask<true, CentralityEstimator::None, aod::BCsWithTimestamps>(collision, centrality, ccdb, registry);

/// monitor the satisfied event selections
Expand All @@ -768,7 +768,7 @@

/// bitmask with event. selection info
float centrality{-1.f};
float occupancy = getOccupancyColl(collision, OccupancyEstimator::Its);
float occupancy = getOccupancyColl(collision, hfEvSel.occEstimator);
const auto rejectionMask = hfEvSel.getHfCollisionRejectionMask<true, CentralityEstimator::FT0C, aod::BCsWithTimestamps>(collision, centrality, ccdb, registry);

/// monitor the satisfied event selections
Expand All @@ -786,7 +786,7 @@

/// bitmask with event. selection info
float centrality{-1.f};
float occupancy = getOccupancyColl(collision, OccupancyEstimator::Its);
float occupancy = getOccupancyColl(collision, hfEvSel.occEstimator);
const auto rejectionMask = hfEvSel.getHfCollisionRejectionMask<true, CentralityEstimator::FT0M, aod::BCsWithTimestamps>(collision, centrality, ccdb, registry);

/// monitor the satisfied event selections
Expand All @@ -809,7 +809,7 @@

/// bitmask with event. selection info
float centrality{-1.f};
float occupancy = getOccupancyColl(collision, OccupancyEstimator::Its);
float occupancy = getOccupancyColl(collision, hfEvSel.occEstimator);
const auto rejectionMask = hfEvSel.getHfCollisionRejectionMaskWithUpc<true, CentralityEstimator::None, aod::BcFullInfos>(collision, centrality, ccdb, registry, bcs);

/// monitor the satisfied event selections
Expand Down Expand Up @@ -919,7 +919,7 @@
// D0(bar) → π+ K−, π+ K− π0, π+ π−, π+ π− π0, K+ K−
for (const auto& [channelMain, finalState] : daughtersD0Main) {
std::array<int, 2> arrPdgDaughtersMain2Prongs = std::array{finalState[0], finalState[1]};
if (finalState.size() == 3) { // o2-linter: disable=magic-number (partially reconstructed 3-prong decays)

Check failure on line 922 in PWGHF/TableProducer/candidateCreator2Prong.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[magic-number]

Avoid magic numbers in expressions. Assign the value to a clearly named variable or constant.
if (matchKinkedDecayTopology && matchInteractionsWithMaterial) {
indexRec = RecoDecay::getMatchedMCRec<false, false, true, true, true>(mcParticles, arrayDaughters, Pdg::kD0, arrPdgDaughtersMain2Prongs, true, &sign, FinalStateDepth, &nKinkedTracks, &nInteractionsWithMaterial);
} else if (matchKinkedDecayTopology && !matchInteractionsWithMaterial) {
Expand All @@ -938,7 +938,7 @@
indexRec = -1; // Reset indexRec if the generated decay does not match the reconstructed one
}
}
} else if (finalState.size() == 2) { // o2-linter: disable=magic-number (fully reconstructed 2-prong decays)

Check failure on line 941 in PWGHF/TableProducer/candidateCreator2Prong.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[magic-number]

Avoid magic numbers in expressions. Assign the value to a clearly named variable or constant.
if (matchKinkedDecayTopology && matchInteractionsWithMaterial) {
indexRec = RecoDecay::getMatchedMCRec<false, false, false, true, true>(mcParticles, arrayDaughters, Pdg::kD0, arrPdgDaughtersMain2Prongs, true, &sign, FinalStateDepth, &nKinkedTracks, &nInteractionsWithMaterial);
} else if (matchKinkedDecayTopology && !matchInteractionsWithMaterial) {
Expand Down
8 changes: 4 additions & 4 deletions PWGHF/TableProducer/candidateCreator3Prong.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -894,7 +894,7 @@

/// bitmask with event. selection info
float centrality{-1.f};
float occupancy = getOccupancyColl(collision, OccupancyEstimator::Its);
float occupancy = getOccupancyColl(collision, hfEvSel.occEstimator);
const auto rejectionMask = hfEvSel.getHfCollisionRejectionMask<true, CentralityEstimator::None, aod::BCsWithTimestamps>(collision, centrality, ccdb, registry);

/// monitor the satisfied event selections
Expand All @@ -912,7 +912,7 @@

/// bitmask with event. selection info
float centrality{-1.f};
float occupancy = getOccupancyColl(collision, OccupancyEstimator::Its);
float occupancy = getOccupancyColl(collision, hfEvSel.occEstimator);
const auto rejectionMask = hfEvSel.getHfCollisionRejectionMask<true, CentralityEstimator::FT0C, aod::BCsWithTimestamps>(collision, centrality, ccdb, registry);

/// monitor the satisfied event selections
Expand All @@ -930,7 +930,7 @@

/// bitmask with event. selection info
float centrality{-1.f};
float occupancy = getOccupancyColl(collision, OccupancyEstimator::Its);
float occupancy = getOccupancyColl(collision, hfEvSel.occEstimator);
const auto rejectionMask = hfEvSel.getHfCollisionRejectionMask<true, CentralityEstimator::FT0M, aod::BCsWithTimestamps>(collision, centrality, ccdb, registry);

/// monitor the satisfied event selections
Expand All @@ -953,7 +953,7 @@

/// bitmask with event. selection info
float centrality{-1.f};
float occupancy = getOccupancyColl(collision, OccupancyEstimator::Its);
float occupancy = getOccupancyColl(collision, hfEvSel.occEstimator);
const auto rejectionMask = hfEvSel.getHfCollisionRejectionMaskWithUpc<true, CentralityEstimator::None, aod::BcFullInfos>(collision, centrality, ccdb, registry, bcs);

/// monitor the satisfied event selections
Expand Down Expand Up @@ -1108,7 +1108,7 @@
}
}
}
} else if (finalState.size() == 3) { // o2-linter: disable=magic-number(fully reconstructed 3-prong decays)

Check failure on line 1111 in PWGHF/TableProducer/candidateCreator3Prong.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[magic-number]

Avoid magic numbers in expressions. Assign the value to a clearly named variable or constant.
if (matchKinkedDecayTopology && matchInteractionsWithMaterial) {
indexRec = RecoDecay::getMatchedMCRec<false, false, false, true, true>(mcParticles, arrayDaughters, pdgMother, arrPdgDaughtersMain3Prongs, true, &sign, depthMainMax, &nKinkedTracks, &nInteractionsWithMaterial);
} else if (matchKinkedDecayTopology && !matchInteractionsWithMaterial) {
Expand Down
6 changes: 3 additions & 3 deletions PWGHF/TableProducer/candidateCreatorXicToXiPiPi.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -798,7 +798,7 @@ struct HfCandidateCreatorXicToXiPiPi {

/// bitmask with event. selection info
float centrality{-1.f};
float occupancy = getOccupancyColl(collision, OccupancyEstimator::Its);
float occupancy = getOccupancyColl(collision, hfEvSel.occEstimator);
const auto rejectionMask = hfEvSel.getHfCollisionRejectionMask<true, CentralityEstimator::None, aod::BCsWithTimestamps>(collision, centrality, ccdb, registry);

/// monitor the satisfied event selections
Expand All @@ -815,7 +815,7 @@ struct HfCandidateCreatorXicToXiPiPi {

/// bitmask with event. selection info
float centrality{-1.f};
float occupancy = getOccupancyColl(collision, OccupancyEstimator::Its);
float occupancy = getOccupancyColl(collision, hfEvSel.occEstimator);
const auto rejectionMask = hfEvSel.getHfCollisionRejectionMask<true, CentralityEstimator::FT0C, aod::BCsWithTimestamps>(collision, centrality, ccdb, registry);

/// monitor the satisfied event selections
Expand All @@ -832,7 +832,7 @@ struct HfCandidateCreatorXicToXiPiPi {

/// bitmask with event. selection info
float centrality{-1.f};
float occupancy = getOccupancyColl(collision, OccupancyEstimator::Its);
float occupancy = getOccupancyColl(collision, hfEvSel.occEstimator);
const auto rejectionMask = hfEvSel.getHfCollisionRejectionMask<true, CentralityEstimator::FT0M, aod::BCsWithTimestamps>(collision, centrality, ccdb, registry);

/// monitor the satisfied event selections
Expand Down
Loading