|
20 | 20 | #include "PWGLF/DataModel/mcCentrality.h" |
21 | 21 | #include "PWGLF/Utils/collisionCuts.h" |
22 | 22 |
|
23 | | -#include "Common/CCDB/EventSelectionParams.h" |
24 | 23 | #include "Common/CCDB/RCTSelectionFlags.h" |
25 | | -#include "Common/DataModel/Centrality.h" |
26 | 24 | #include "Common/DataModel/EventSelection.h" |
27 | 25 | #include "Common/DataModel/Multiplicity.h" |
28 | 26 | #include "Common/DataModel/PIDResponseTOF.h" |
|
47 | 45 |
|
48 | 46 | #include <TH1.h> |
49 | 47 | #include <THnSparse.h> |
| 48 | +#include <TPDGCode.h> |
50 | 49 |
|
51 | 50 | #include <algorithm> |
52 | 51 | #include <array> |
@@ -510,6 +509,7 @@ struct ResonanceModuleInitializer { |
510 | 509 |
|
511 | 510 | // Keep this QA-only mapping synchronized with CollisonCuts without exposing |
512 | 511 | // its internal selection registry. |
| 512 | +// NOLINTNEXTLINE(cppcoreguidelines-macro-usage) -- X-macro interface of EventSelectionFlagsMapping.def |
513 | 513 | #define EVSEL_FLAG(enumVal, member, defaultVal, evtSelEnum, setter, getter, label, desc) \ |
514 | 514 | if (colCuts.getSelection(o2::analysis::CollisonCuts::evtSelEnum)) { \ |
515 | 515 | if (!collision.selection_bit(o2::aod::evsel::enumVal)) { \ |
@@ -1044,7 +1044,7 @@ struct ResonanceDaughterInitializer { |
1044 | 1044 | allDaughterIds.erase(std::unique(allDaughterIds.begin(), allDaughterIds.end()), allDaughterIds.end()); |
1045 | 1045 | } |
1046 | 1046 |
|
1047 | | - bool accepts(int64_t trackId) const |
| 1047 | + [[nodiscard]] bool accepts(int64_t trackId) const |
1048 | 1048 | { |
1049 | 1049 | if (!hasSelectedCandidate) { |
1050 | 1050 | return false; |
@@ -1888,7 +1888,7 @@ struct ResonanceDaughterInitializer { |
1888 | 1888 | collectSelectedV0Daughters<isMC>(collision, v0sThisCollision, tracks, selection.useGlobalDaughterVeto); |
1889 | 1889 | } |
1890 | 1890 | if (selection.useCascadeCandidates && |
1891 | | - !(useEitherPairGate && !selection.useGlobalDaughterVeto && selection.v0Candidates.hasSelectedCandidate)) { |
| 1891 | + (!useEitherPairGate || selection.useGlobalDaughterVeto || !selection.v0Candidates.hasSelectedCandidate)) { |
1892 | 1892 | auto cascadesThisCollision = cascades.sliceBy(cascPreslice, collision.collisionId()); |
1893 | 1893 | selection.cascadeCandidates = |
1894 | 1894 | collectSelectedCascadeDaughters<isMC>(collision, cascadesThisCollision, tracks, selection.useGlobalDaughterVeto); |
|
0 commit comments