From 79eee94b4c22ad0aef1bf97f4c53ac5c63ea9c78 Mon Sep 17 00:00:00 2001 From: Nima Zardoshti Date: Thu, 18 Jan 2024 19:49:04 +0100 Subject: [PATCH] fixing macosarm problems --- PWGJE/Core/JetMatchingUtilities.h | 4 ++-- PWGJE/Tasks/jetfinderQA.cxx | 6 +++--- PWGJE/Tasks/jetfinderfullQA.cxx | 6 +++--- PWGJE/Tasks/jetfinderhfQA.cxx | 14 +++++++------- PWGJE/Tasks/jetsubstructurehfoutput.cxx | 6 +++--- PWGJE/Tasks/jetsubstructureoutput.cxx | 4 ++-- 6 files changed, 20 insertions(+), 20 deletions(-) diff --git a/PWGJE/Core/JetMatchingUtilities.h b/PWGJE/Core/JetMatchingUtilities.h index 228f4e6c550..19cf12f85cf 100644 --- a/PWGJE/Core/JetMatchingUtilities.h +++ b/PWGJE/Core/JetMatchingUtilities.h @@ -343,7 +343,7 @@ void MatchHF(T const& jetsBasePerCollision, U const& jetsTagPerCollision, std::v const auto candidateBaseDaughterParticle = candidateBase.template prong1_as().template mcParticle_as(); const auto candidateBaseMcId = candidateBaseDaughterParticle.template mothers_first_as().globalIndex(); const auto candidateTag = jetTag.template hfcandidates_first_as(); - 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()); @@ -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; } diff --git a/PWGJE/Tasks/jetfinderQA.cxx b/PWGJE/Tasks/jetfinderQA.cxx index d34f79665a7..429fd0b04e7 100644 --- a/PWGJE/Tasks/jetfinderQA.cxx +++ b/PWGJE/Tasks/jetfinderQA.cxx @@ -368,7 +368,7 @@ struct JetFinderQATask { return; } - if (jetBase.template has_matchedJetGeo()) { + if (jetBase.has_matchedJetGeo()) { for (auto& jetTag : jetBase.template matchedJetGeo_as>()) { if (jetTag.pt() > pTHatMaxMCP * pTHat) { continue; @@ -388,7 +388,7 @@ struct JetFinderQATask { } } } - if (jetBase.template has_matchedJetPt()) { + if (jetBase.has_matchedJetPt()) { for (auto& jetTag : jetBase.template matchedJetPt_as>()) { if (jetTag.pt() > pTHatMaxMCP * pTHat) { continue; @@ -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>()) { if (jetTag.pt() > pTHatMaxMCP * pTHat) { diff --git a/PWGJE/Tasks/jetfinderfullQA.cxx b/PWGJE/Tasks/jetfinderfullQA.cxx index b17d38b6970..b8677fdea3f 100644 --- a/PWGJE/Tasks/jetfinderfullQA.cxx +++ b/PWGJE/Tasks/jetfinderfullQA.cxx @@ -335,7 +335,7 @@ struct JetFinderFullQATask { return; } - if (jetBase.template has_matchedJetGeo()) { + if (jetBase.has_matchedJetGeo()) { for (auto& jetTag : jetBase.template matchedJetGeo_as>()) { if (jetTag.pt() > pTHatMaxMCP * pTHat) { continue; @@ -356,7 +356,7 @@ struct JetFinderFullQATask { } } - if (jetBase.template has_matchedJetPt()) { + if (jetBase.has_matchedJetPt()) { for (auto& jetTag : jetBase.template matchedJetPt_as>()) { if (jetTag.pt() > pTHatMaxMCP * pTHat) { continue; @@ -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>()) { if (jetTag.pt() > pTHatMaxMCP * pTHat) { continue; diff --git a/PWGJE/Tasks/jetfinderhfQA.cxx b/PWGJE/Tasks/jetfinderhfQA.cxx index 5c61b0ff317..f577b67cf52 100644 --- a/PWGJE/Tasks/jetfinderhfQA.cxx +++ b/PWGJE/Tasks/jetfinderhfQA.cxx @@ -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>()) { if (jetTag.pt() > pTHatMaxMCP * pTHat) { continue; @@ -585,7 +585,7 @@ struct JetFinderHFQATask { } } } - if (jetBase.template has_matchedJetPt()) { + if (jetBase.has_matchedJetPt()) { for (auto& jetTag : jetBase.template matchedJetPt_as>()) { if (jetTag.pt() > pTHatMaxMCP * pTHat) { @@ -614,7 +614,7 @@ struct JetFinderHFQATask { } } } - if (jetBase.template has_matchedJetCand()) { + if (jetBase.has_matchedJetCand()) { for (auto& jetTag : jetBase.template matchedJetCand_as>()) { if (jetTag.pt() > pTHatMaxMCP * pTHat) { continue; @@ -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>()) { if (jetTag.pt() > pTHatMaxMCP * pTHat) { continue; @@ -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>()) { if (jetTag.pt() > pTHatMaxMCP * pTHat) { continue; @@ -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>()) { if (jetTag.pt() > pTHatMaxMCP * pTHat) { continue; @@ -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>()) { if (jetTag.pt() > pTHatMaxMCP * pTHat) { continue; diff --git a/PWGJE/Tasks/jetsubstructurehfoutput.cxx b/PWGJE/Tasks/jetsubstructurehfoutput.cxx index c5d751cde35..3c9814bead0 100644 --- a/PWGJE/Tasks/jetsubstructurehfoutput.cxx +++ b/PWGJE/Tasks/jetsubstructurehfoutput.cxx @@ -105,17 +105,17 @@ struct JetSubstructureHFOutputTask { std::vector geoMatching; std::vector ptMatching; std::vector hfMatching; - if (jet.template has_matchedJetGeo()) { + if (jet.has_matchedJetGeo()) { for (auto& jetTag : jet.template matchedJetGeo_as()) { geoMatching.push_back(jetTag.globalIndex()); } } - if (jet.template has_matchedJetPt()) { + if (jet.has_matchedJetPt()) { for (auto& jetTag : jet.template matchedJetPt_as()) { ptMatching.push_back(jetTag.globalIndex()); } } - if (jet.template has_matchedJetCand()) { + if (jet.has_matchedJetCand()) { for (auto& jetTag : jet.template matchedJetCand_as()) { hfMatching.push_back(jetTag.globalIndex()); } diff --git a/PWGJE/Tasks/jetsubstructureoutput.cxx b/PWGJE/Tasks/jetsubstructureoutput.cxx index a70386db48f..01842acda41 100644 --- a/PWGJE/Tasks/jetsubstructureoutput.cxx +++ b/PWGJE/Tasks/jetsubstructureoutput.cxx @@ -91,12 +91,12 @@ struct JetSubstructureOutputTask { if (jet.r() == round(jetRadiiValue * 100.0f)) { std::vector geoMatching; std::vector ptMatching; - if (jet.template has_matchedJetGeo()) { + if (jet.has_matchedJetGeo()) { for (auto& jetTag : jet.template matchedJetGeo_as()) { geoMatching.push_back(jetTag.globalIndex()); } } - if (jet.template has_matchedJetPt()) { + if (jet.has_matchedJetPt()) { for (auto& jetTag : jet.template matchedJetPt_as()) { ptMatching.push_back(jetTag.globalIndex()); }