Skip to content

Commit

Permalink
fixing macosarm problems
Browse files Browse the repository at this point in the history
  • Loading branch information
Nima Zardoshti committed Jan 19, 2024
1 parent 4130505 commit 79eee94
Show file tree
Hide file tree
Showing 6 changed files with 20 additions and 20 deletions.
4 changes: 2 additions & 2 deletions PWGJE/Core/JetMatchingUtilities.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -343,7 +343,7 @@ void MatchHF(T const& jetsBasePerCollision, U const& jetsTagPerCollision, std::v
const auto candidateBaseDaughterParticle = candidateBase.template prong1_as<N>().template mcParticle_as<O>();
const auto candidateBaseMcId = candidateBaseDaughterParticle.template mothers_first_as<O>().globalIndex();
const auto candidateTag = jetTag.template hfcandidates_first_as<M>();
const auto candidateTagId = candidateTag.template mcParticleId();
const auto candidateTagId = candidateTag.mcParticleId();
if (candidateBaseMcId == candidateTagId) {
baseToTagMatchingHF[jetBase.globalIndex()].push_back(jetTag.globalIndex());
tagToBaseMatchingHF[jetTag.globalIndex()].push_back(jetBase.globalIndex());
Expand All @@ -366,7 +366,7 @@ auto constexpr getTrackId(T const& track)
if constexpr (isMc) {

if (track.has_mcParticle()) {
return track.template mcParticleId();
return track.mcParticleId();
} else {
return -1;
}
Expand Down
6 changes: 3 additions & 3 deletions PWGJE/Tasks/jetfinderQA.cxx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -368,7 +368,7 @@ struct JetFinderQATask {
return;
}

if (jetBase.template has_matchedJetGeo()) {
if (jetBase.has_matchedJetGeo()) {
for (auto& jetTag : jetBase.template matchedJetGeo_as<std::decay_t<U>>()) {
if (jetTag.pt() > pTHatMaxMCP * pTHat) {
continue;
Expand All @@ -388,7 +388,7 @@ struct JetFinderQATask {
}
}
}
if (jetBase.template has_matchedJetPt()) {
if (jetBase.has_matchedJetPt()) {
for (auto& jetTag : jetBase.template matchedJetPt_as<std::decay_t<U>>()) {
if (jetTag.pt() > pTHatMaxMCP * pTHat) {
continue;
Expand All @@ -409,7 +409,7 @@ struct JetFinderQATask {
}
}

if (jetBase.template has_matchedJetGeo() && jetBase.template has_matchedJetPt()) {
if (jetBase.has_matchedJetGeo() && jetBase.has_matchedJetPt()) {

for (auto& jetTag : jetBase.template matchedJetGeo_as<std::decay_t<U>>()) {
if (jetTag.pt() > pTHatMaxMCP * pTHat) {
Expand Down
6 changes: 3 additions & 3 deletions PWGJE/Tasks/jetfinderfullQA.cxx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -335,7 +335,7 @@ struct JetFinderFullQATask {
return;
}

if (jetBase.template has_matchedJetGeo()) {
if (jetBase.has_matchedJetGeo()) {
for (auto& jetTag : jetBase.template matchedJetGeo_as<std::decay_t<U>>()) {
if (jetTag.pt() > pTHatMaxMCP * pTHat) {
continue;
Expand All @@ -356,7 +356,7 @@ struct JetFinderFullQATask {
}
}

if (jetBase.template has_matchedJetPt()) {
if (jetBase.has_matchedJetPt()) {
for (auto& jetTag : jetBase.template matchedJetPt_as<std::decay_t<U>>()) {
if (jetTag.pt() > pTHatMaxMCP * pTHat) {
continue;
Expand All @@ -377,7 +377,7 @@ struct JetFinderFullQATask {
}
}

if (jetBase.template has_matchedJetGeo() && jetBase.template has_matchedJetPt()) {
if (jetBase.has_matchedJetGeo() && jetBase.has_matchedJetPt()) {
for (auto& jetTag : jetBase.template matchedJetGeo_as<std::decay_t<U>>()) {
if (jetTag.pt() > pTHatMaxMCP * pTHat) {
continue;
Expand Down
14 changes: 7 additions & 7 deletions PWGJE/Tasks/jetfinderhfQA.cxx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -557,7 +557,7 @@ struct JetFinderHFQATask {
candidateBasePhi = candidateBase.phi();
candidateBaseEta = candidateBase.eta();

if (jetBase.template has_matchedJetGeo()) {
if (jetBase.has_matchedJetGeo()) {
for (auto& jetTag : jetBase.template matchedJetGeo_as<std::decay_t<U>>()) {
if (jetTag.pt() > pTHatMaxMCP * pTHat) {
continue;
Expand Down Expand Up @@ -585,7 +585,7 @@ struct JetFinderHFQATask {
}
}
}
if (jetBase.template has_matchedJetPt()) {
if (jetBase.has_matchedJetPt()) {

for (auto& jetTag : jetBase.template matchedJetPt_as<std::decay_t<U>>()) {
if (jetTag.pt() > pTHatMaxMCP * pTHat) {
Expand Down Expand Up @@ -614,7 +614,7 @@ struct JetFinderHFQATask {
}
}
}
if (jetBase.template has_matchedJetCand()) {
if (jetBase.has_matchedJetCand()) {
for (auto& jetTag : jetBase.template matchedJetCand_as<std::decay_t<U>>()) {
if (jetTag.pt() > pTHatMaxMCP * pTHat) {
continue;
Expand Down Expand Up @@ -642,7 +642,7 @@ struct JetFinderHFQATask {
}
}
}
if (jetBase.template has_matchedJetGeo() && jetBase.template has_matchedJetPt()) {
if (jetBase.has_matchedJetGeo() && jetBase.has_matchedJetPt()) {
for (auto& jetTag : jetBase.template matchedJetGeo_as<std::decay_t<U>>()) {
if (jetTag.pt() > pTHatMaxMCP * pTHat) {
continue;
Expand Down Expand Up @@ -673,7 +673,7 @@ struct JetFinderHFQATask {
}
}
}
if (jetBase.template has_matchedJetGeo() && jetBase.template has_matchedJetCand()) {
if (jetBase.has_matchedJetGeo() && jetBase.has_matchedJetCand()) {
for (auto& jetTag : jetBase.template matchedJetGeo_as<std::decay_t<U>>()) {
if (jetTag.pt() > pTHatMaxMCP * pTHat) {
continue;
Expand Down Expand Up @@ -704,7 +704,7 @@ struct JetFinderHFQATask {
}
}
}
if (jetBase.template has_matchedJetPt() && jetBase.template has_matchedJetCand()) {
if (jetBase.has_matchedJetPt() && jetBase.has_matchedJetCand()) {
for (auto& jetTag : jetBase.template matchedJetPt_as<std::decay_t<U>>()) {
if (jetTag.pt() > pTHatMaxMCP * pTHat) {
continue;
Expand Down Expand Up @@ -736,7 +736,7 @@ struct JetFinderHFQATask {
}
}

if (jetBase.template has_matchedJetGeo() && jetBase.template has_matchedJetPt() && jetBase.template has_matchedJetCand()) {
if (jetBase.has_matchedJetGeo() && jetBase.has_matchedJetPt() && jetBase.has_matchedJetCand()) {
for (auto& jetTag : jetBase.template matchedJetGeo_as<std::decay_t<U>>()) {
if (jetTag.pt() > pTHatMaxMCP * pTHat) {
continue;
Expand Down
6 changes: 3 additions & 3 deletions PWGJE/Tasks/jetsubstructurehfoutput.cxx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -105,17 +105,17 @@ struct JetSubstructureHFOutputTask {
std::vector<int> geoMatching;
std::vector<int> ptMatching;
std::vector<int> hfMatching;
if (jet.template has_matchedJetGeo()) {
if (jet.has_matchedJetGeo()) {
for (auto& jetTag : jet.template matchedJetGeo_as<V>()) {
geoMatching.push_back(jetTag.globalIndex());
}
}
if (jet.template has_matchedJetPt()) {
if (jet.has_matchedJetPt()) {
for (auto& jetTag : jet.template matchedJetPt_as<V>()) {
ptMatching.push_back(jetTag.globalIndex());
}
}
if (jet.template has_matchedJetCand()) {
if (jet.has_matchedJetCand()) {
for (auto& jetTag : jet.template matchedJetCand_as<V>()) {
hfMatching.push_back(jetTag.globalIndex());
}
Expand Down
4 changes: 2 additions & 2 deletions PWGJE/Tasks/jetsubstructureoutput.cxx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,12 +91,12 @@ struct JetSubstructureOutputTask {
if (jet.r() == round(jetRadiiValue * 100.0f)) {
std::vector<int> geoMatching;
std::vector<int> ptMatching;
if (jet.template has_matchedJetGeo()) {
if (jet.has_matchedJetGeo()) {
for (auto& jetTag : jet.template matchedJetGeo_as<V>()) {
geoMatching.push_back(jetTag.globalIndex());
}
}
if (jet.template has_matchedJetPt()) {
if (jet.has_matchedJetPt()) {
for (auto& jetTag : jet.template matchedJetPt_as<V>()) {
ptMatching.push_back(jetTag.globalIndex());
}
Expand Down

0 comments on commit 79eee94

Please sign in to comment.