Skip to content

Commit 5acb1fe

Browse files
authored
Refactor collision key calculations with constants to fix O2 linter issues
1 parent e1cb5cf commit 5acb1fe

File tree

1 file changed

+7
-3
lines changed

1 file changed

+7
-3
lines changed

PWGJE/Tasks/jetLundPlane.cxx

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,8 @@ DECLARE_SOA_TABLE(MiniJetMatches, "AOD", "MINIMCH",
9696
namespace
9797
{
9898
constexpr float kTiny = 1e-12f;
99+
constexpr uint64_t collisionKeyShift = 1ULL;
100+
constexpr uint64_t partCollisionKeyTag = 1ULL;
99101

100102
struct JetLevel {
101103
enum Type : uint8_t {
@@ -583,7 +585,8 @@ struct JetLundPlaneUnfolding {
583585
fillSplittingQAHists(spl, /*isTruth*/ true, partJet.pt());
584586

585587
if (writeMiniAOD.value) {
586-
const uint64_t partCollKey = (static_cast<uint64_t>(partJet.mcCollisionId()) << 1U) | 1ULL;
588+
const uint64_t partCollKey =
589+
(static_cast<uint64_t>(partJet.mcCollisionId()) << collisionKeyShift) | partCollisionKeyTag;
587590
int partMiniCollIdx = -1;
588591
auto collIt = partMiniCollByKey.find(partCollKey);
589592
if (collIt == partMiniCollByKey.end()) {
@@ -650,7 +653,8 @@ struct JetLundPlaneUnfolding {
650653
fillSplittingQAHists(detSpl, /*isTruth*/ false, detJet.pt());
651654

652655
if (writeMiniAOD.value) {
653-
const uint64_t detCollKey = (static_cast<uint64_t>(detJet.collisionId()) << 1U);
656+
const uint64_t detCollKey =
657+
(static_cast<uint64_t>(detJet.collisionId()) << collisionKeyShift);
654658
int detMiniCollIdx = -1;
655659
auto collIt = detMiniCollByKey.find(detCollKey);
656660
if (collIt == detMiniCollByKey.end()) {
@@ -795,5 +799,5 @@ struct JetLundPlaneUnfolding {
795799
WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
796800
{
797801
return WorkflowSpec{
798-
adaptAnalysisTask<JetLundPlaneUnfolding>(cfgc, TaskName{"jet-lund-plane"})};
802+
adaptAnalysisTask<JetLundPlaneUnfolding>(cfgc)};
799803
}

0 commit comments

Comments
 (0)