From 2c081197a6968abac384d301c9706fb55dfc83fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=20Ku=C4=8Dera?= Date: Tue, 9 Jul 2024 12:39:15 +0200 Subject: [PATCH 1/2] PWGJE: Fix compilation warnings --- PWGJE/Core/JetDQUtilities.h | 2 +- PWGJE/Tasks/PhotonIsolationQA.cxx | 4 ++-- PWGJE/Tasks/bjetTreeCreator.cxx | 12 ++++++------ PWGJE/Tasks/jetHadronRecoil.cxx | 2 +- PWGJE/Tasks/jetsubstructure.cxx | 2 +- PWGJE/Tasks/jetsubstructurehf.cxx | 2 +- PWGJE/Tasks/jettaggerhfQA.cxx | 8 ++++---- 7 files changed, 16 insertions(+), 16 deletions(-) diff --git a/PWGJE/Core/JetDQUtilities.h b/PWGJE/Core/JetDQUtilities.h index 7d7dceb82af..fdd5ca9cbcd 100644 --- a/PWGJE/Core/JetDQUtilities.h +++ b/PWGJE/Core/JetDQUtilities.h @@ -87,7 +87,7 @@ constexpr bool isDielectronMcTable() * * @param candidate candidate that is being checked */ template -constexpr bool isMatchedDielectronCandidate(T const& candidate) +constexpr bool isMatchedDielectronCandidate(T const& /*candidate*/) { if constexpr (isDielectronCandidate()) { // For now the decision to select signals is done in the DQ framework diff --git a/PWGJE/Tasks/PhotonIsolationQA.cxx b/PWGJE/Tasks/PhotonIsolationQA.cxx index 7915d231dc1..766145124a0 100644 --- a/PWGJE/Tasks/PhotonIsolationQA.cxx +++ b/PWGJE/Tasks/PhotonIsolationQA.cxx @@ -278,7 +278,7 @@ struct PhotonIsolationQA { } // process monte carlo data - void processMC(selectedCollisions::iterator const& theCollision, selectedMCClusters const& mcclusters, aod::StoredMcParticles_001 const&, myGlobTracks const& tracks, o2::aod::EMCALClusterCells const& emccluscells, o2::aod::EMCALMatchedTracks const& matchedtracks) + void processMC(selectedCollisions::iterator const& theCollision, selectedMCClusters const& mcclusters, aod::StoredMcParticles_001 const&, myGlobTracks const& tracks, o2::aod::EMCALClusterCells const& /*emccluscells*/, o2::aod::EMCALMatchedTracks const& matchedtracks) { MC_Info.fill(HIST("hPosZ"), theCollision.posZ()); @@ -327,7 +327,7 @@ struct PhotonIsolationQA { PROCESS_SWITCH(PhotonIsolationQA, processMC, "proces MC data", true); - void processData(selectedCollisions::iterator const& theCollision, selectedClusters const& clusters, o2::aod::EMCALClusterCells const& emccluscells, o2::aod::EMCALMatchedTracks const& matchedtracks, myGlobTracks const& alltracks) + void processData(selectedCollisions::iterator const& theCollision, selectedClusters const& clusters, o2::aod::EMCALClusterCells const& /*emccluscells*/, o2::aod::EMCALMatchedTracks const& matchedtracks, myGlobTracks const& alltracks) { Data_Info.fill(HIST("hPosZ"), theCollision.posZ()); diff --git a/PWGJE/Tasks/bjetTreeCreator.cxx b/PWGJE/Tasks/bjetTreeCreator.cxx index a717c84ae9d..7b24f7b746f 100644 --- a/PWGJE/Tasks/bjetTreeCreator.cxx +++ b/PWGJE/Tasks/bjetTreeCreator.cxx @@ -259,7 +259,7 @@ struct BJetTreeCreator { // Looping over the SV info and writing them to a table template - void analyzeJetSVInfo(AnalysisJet const& myJet, AnyTracks const& allTracks, SecondaryVertices const& allSVs, std::vector& svIndices, int jetFlavor = 0, double eventweight = 1.0) + void analyzeJetSVInfo(AnalysisJet const& myJet, AnyTracks const& /*allTracks*/, SecondaryVertices const& /*allSVs*/, std::vector& svIndices, int jetFlavor = 0, double eventweight = 1.0) { using SVType = typename SecondaryVertices::iterator; @@ -314,7 +314,7 @@ struct BJetTreeCreator { } template - void analyzeJetTrackInfo(AnyCollision const& collision, AnalysisJet const& analysisJet, AnyTracks const& allTracks, SecondaryVertices const& allSVs, std::vector& trackIndices, int jetFlavor = 0, double eventweight = 1.0) + void analyzeJetTrackInfo(AnyCollision const& collision, AnalysisJet const& analysisJet, AnyTracks const& /*allTracks*/, SecondaryVertices const& /*allSVs*/, std::vector& trackIndices, int jetFlavor = 0, double eventweight = 1.0) { for (auto& jconstituent : analysisJet.template tracks_as()) { @@ -363,12 +363,12 @@ struct BJetTreeCreator { } } - void processDummy(FilteredCollision::iterator const& collision) + void processDummy(FilteredCollision::iterator const& /*collision*/) { } PROCESS_SWITCH(BJetTreeCreator, processDummy, "Dummy process function turned on by default", true); - void processDataJets(FilteredCollision::iterator const& collision, DataJets const& alljets, JetTrackswID const& allTracks, OriginalTracks const& allOrigTracks, aod::DataSecondaryVertex3Prongs const& allSVs) + void processDataJets(FilteredCollision::iterator const& collision, DataJets const& alljets, JetTrackswID const& allTracks, OriginalTracks const& /*allOrigTracks*/, aod::DataSecondaryVertex3Prongs const& allSVs) { if (!jetderiveddatautilities::selectCollision(collision, eventSelection) || (static_cast(std::rand()) / RAND_MAX < eventReductionFactor)) { return; @@ -416,7 +416,7 @@ struct BJetTreeCreator { Preslice McParticlesPerCollision = aod::jmcparticle::mcCollisionId; Preslice McPJetsPerCollision = aod::jet::mcCollisionId; - void processMCJets(FilteredCollisionMCD::iterator const& collision, MCDJetTable const& MCDjets, MCPJetTable const& MCPjets, JetTracksMCDwID const& allTracks, JetParticles const& MCParticles, aod::MCDSecondaryVertex3Prongs const& allSVs, OriginalTracks const& origTracks) + void processMCJets(FilteredCollisionMCD::iterator const& collision, MCDJetTable const& MCDjets, MCPJetTable const& MCPjets, JetTracksMCDwID const& allTracks, JetParticles const& MCParticles, aod::MCDSecondaryVertex3Prongs const& allSVs, OriginalTracks const& /*origTracks*/) { if (!jetderiveddatautilities::selectCollision(collision, eventSelection) || (static_cast(std::rand()) / RAND_MAX < eventReductionFactor)) { return; @@ -495,7 +495,7 @@ struct BJetTreeCreator { Filter mccollisionFilter = nabs(aod::jmccollision::posZ) < vertexZCut; using FilteredCollisionMCP = soa::Filtered; - void processMCTruthJets(FilteredCollisionMCP::iterator const& collision, MCPJetTable const& MCPjets, JetParticles const& MCParticles) + void processMCTruthJets(FilteredCollisionMCP::iterator const& /*collision*/, MCPJetTable const& MCPjets, JetParticles const& MCParticles) { for (const auto& mcpjet : MCPjets) { diff --git a/PWGJE/Tasks/jetHadronRecoil.cxx b/PWGJE/Tasks/jetHadronRecoil.cxx index afdb81c3422..909fb502c7b 100644 --- a/PWGJE/Tasks/jetHadronRecoil.cxx +++ b/PWGJE/Tasks/jetHadronRecoil.cxx @@ -382,7 +382,7 @@ struct hJetAnalysis { } PROCESS_SWITCH(hJetAnalysis, processMCD, "process MC detector level", false); - void processMCP(JetMcCollision const& collision, + void processMCP(JetMcCollision const& /*collision*/, soa::Filtered> const& jets, JetParticles const& particles) { diff --git a/PWGJE/Tasks/jetsubstructure.cxx b/PWGJE/Tasks/jetsubstructure.cxx index a7aa7ad3eed..c4398703437 100644 --- a/PWGJE/Tasks/jetsubstructure.cxx +++ b/PWGJE/Tasks/jetsubstructure.cxx @@ -147,7 +147,7 @@ struct JetSubstructureTask { } template - void jetPairing(T const& jet, U const& tracks) + void jetPairing(T const& jet, U const& /*tracks*/) { pairPtVec.clear(); pairEnergyVec.clear(); diff --git a/PWGJE/Tasks/jetsubstructurehf.cxx b/PWGJE/Tasks/jetsubstructurehf.cxx index 2c68199d77f..9cdb933c20a 100644 --- a/PWGJE/Tasks/jetsubstructurehf.cxx +++ b/PWGJE/Tasks/jetsubstructurehf.cxx @@ -160,7 +160,7 @@ struct JetSubstructureHFTask { } template - void jetPairing(T const& jet, U const& tracks, V const& candidates) + void jetPairing(T const& jet, U const& /*tracks*/, V const& /*candidates*/) { pairPtVec.clear(); pairEnergyVec.clear(); diff --git a/PWGJE/Tasks/jettaggerhfQA.cxx b/PWGJE/Tasks/jettaggerhfQA.cxx index 159b78258f5..4afecbc0923 100644 --- a/PWGJE/Tasks/jettaggerhfQA.cxx +++ b/PWGJE/Tasks/jettaggerhfQA.cxx @@ -671,7 +671,7 @@ struct JetTaggerHFQA { } template - void fillHistogramSV2ProngData(T const& collision, U const& jets, V const& prongs) + void fillHistogramSV2ProngData(T const& /*collision*/, U const& jets, V const& /*prongs*/) { for (const auto& jet : jets) { if (!jetfindingutilities::isInEtaAcceptance(jet, jetEtaMin, jetEtaMax, trackEtaMin, trackEtaMax)) { @@ -712,7 +712,7 @@ struct JetTaggerHFQA { } template - void fillHistogramSV3ProngData(T const& collision, U const& jets, V const& prongs) + void fillHistogramSV3ProngData(T const& /*collision*/, U const& jets, V const& /*prongs*/) { for (const auto& jet : jets) { if (!jetfindingutilities::isInEtaAcceptance(jet, jetEtaMin, jetEtaMax, trackEtaMin, trackEtaMax)) { @@ -753,7 +753,7 @@ struct JetTaggerHFQA { } template - void fillHistogramSV2ProngMCD(T const& collision, U const& mcdjets, V const& prongs) + void fillHistogramSV2ProngMCD(T const& /*collision*/, U const& mcdjets, V const& /*prongs*/) { for (const auto& mcdjet : mcdjets) { if (!jetfindingutilities::isInEtaAcceptance(mcdjet, jetEtaMin, jetEtaMax, trackEtaMin, trackEtaMax)) { @@ -795,7 +795,7 @@ struct JetTaggerHFQA { } template - void fillHistogramSV3ProngMCD(T const& collision, U const& mcdjets, V const& prongs) + void fillHistogramSV3ProngMCD(T const& /*collision*/, U const& mcdjets, V const& /*prongs*/) { for (const auto& mcdjet : mcdjets) { if (!jetfindingutilities::isInEtaAcceptance(mcdjet, jetEtaMin, jetEtaMax, trackEtaMin, trackEtaMax)) { From 0ac16c3c65570149cd0bf89480421b60a6efc54d Mon Sep 17 00:00:00 2001 From: ALICE Builder Date: Tue, 9 Jul 2024 12:48:05 +0200 Subject: [PATCH 2/2] Please consider the following formatting changes (#94) --- PWGJE/Tasks/PhotonIsolationQA.cxx | 4 ++-- PWGJE/Tasks/bjetTreeCreator.cxx | 10 +++++----- PWGJE/Tasks/jetHadronRecoil.cxx | 2 +- PWGJE/Tasks/jettaggerhfQA.cxx | 8 ++++---- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/PWGJE/Tasks/PhotonIsolationQA.cxx b/PWGJE/Tasks/PhotonIsolationQA.cxx index 766145124a0..0f3ced89696 100644 --- a/PWGJE/Tasks/PhotonIsolationQA.cxx +++ b/PWGJE/Tasks/PhotonIsolationQA.cxx @@ -278,7 +278,7 @@ struct PhotonIsolationQA { } // process monte carlo data - void processMC(selectedCollisions::iterator const& theCollision, selectedMCClusters const& mcclusters, aod::StoredMcParticles_001 const&, myGlobTracks const& tracks, o2::aod::EMCALClusterCells const& /*emccluscells*/, o2::aod::EMCALMatchedTracks const& matchedtracks) + void processMC(selectedCollisions::iterator const& theCollision, selectedMCClusters const& mcclusters, aod::StoredMcParticles_001 const&, myGlobTracks const& tracks, o2::aod::EMCALClusterCells const& /*emccluscells*/, o2::aod::EMCALMatchedTracks const& matchedtracks) { MC_Info.fill(HIST("hPosZ"), theCollision.posZ()); @@ -327,7 +327,7 @@ struct PhotonIsolationQA { PROCESS_SWITCH(PhotonIsolationQA, processMC, "proces MC data", true); - void processData(selectedCollisions::iterator const& theCollision, selectedClusters const& clusters, o2::aod::EMCALClusterCells const& /*emccluscells*/, o2::aod::EMCALMatchedTracks const& matchedtracks, myGlobTracks const& alltracks) + void processData(selectedCollisions::iterator const& theCollision, selectedClusters const& clusters, o2::aod::EMCALClusterCells const& /*emccluscells*/, o2::aod::EMCALMatchedTracks const& matchedtracks, myGlobTracks const& alltracks) { Data_Info.fill(HIST("hPosZ"), theCollision.posZ()); diff --git a/PWGJE/Tasks/bjetTreeCreator.cxx b/PWGJE/Tasks/bjetTreeCreator.cxx index 7b24f7b746f..edeb6c3bdde 100644 --- a/PWGJE/Tasks/bjetTreeCreator.cxx +++ b/PWGJE/Tasks/bjetTreeCreator.cxx @@ -259,7 +259,7 @@ struct BJetTreeCreator { // Looping over the SV info and writing them to a table template - void analyzeJetSVInfo(AnalysisJet const& myJet, AnyTracks const& /*allTracks*/, SecondaryVertices const& /*allSVs*/, std::vector& svIndices, int jetFlavor = 0, double eventweight = 1.0) + void analyzeJetSVInfo(AnalysisJet const& myJet, AnyTracks const& /*allTracks*/, SecondaryVertices const& /*allSVs*/, std::vector& svIndices, int jetFlavor = 0, double eventweight = 1.0) { using SVType = typename SecondaryVertices::iterator; @@ -314,7 +314,7 @@ struct BJetTreeCreator { } template - void analyzeJetTrackInfo(AnyCollision const& collision, AnalysisJet const& analysisJet, AnyTracks const& /*allTracks*/, SecondaryVertices const& /*allSVs*/, std::vector& trackIndices, int jetFlavor = 0, double eventweight = 1.0) + void analyzeJetTrackInfo(AnyCollision const& collision, AnalysisJet const& analysisJet, AnyTracks const& /*allTracks*/, SecondaryVertices const& /*allSVs*/, std::vector& trackIndices, int jetFlavor = 0, double eventweight = 1.0) { for (auto& jconstituent : analysisJet.template tracks_as()) { @@ -368,7 +368,7 @@ struct BJetTreeCreator { } PROCESS_SWITCH(BJetTreeCreator, processDummy, "Dummy process function turned on by default", true); - void processDataJets(FilteredCollision::iterator const& collision, DataJets const& alljets, JetTrackswID const& allTracks, OriginalTracks const& /*allOrigTracks*/, aod::DataSecondaryVertex3Prongs const& allSVs) + void processDataJets(FilteredCollision::iterator const& collision, DataJets const& alljets, JetTrackswID const& allTracks, OriginalTracks const& /*allOrigTracks*/, aod::DataSecondaryVertex3Prongs const& allSVs) { if (!jetderiveddatautilities::selectCollision(collision, eventSelection) || (static_cast(std::rand()) / RAND_MAX < eventReductionFactor)) { return; @@ -416,7 +416,7 @@ struct BJetTreeCreator { Preslice McParticlesPerCollision = aod::jmcparticle::mcCollisionId; Preslice McPJetsPerCollision = aod::jet::mcCollisionId; - void processMCJets(FilteredCollisionMCD::iterator const& collision, MCDJetTable const& MCDjets, MCPJetTable const& MCPjets, JetTracksMCDwID const& allTracks, JetParticles const& MCParticles, aod::MCDSecondaryVertex3Prongs const& allSVs, OriginalTracks const& /*origTracks*/) + void processMCJets(FilteredCollisionMCD::iterator const& collision, MCDJetTable const& MCDjets, MCPJetTable const& MCPjets, JetTracksMCDwID const& allTracks, JetParticles const& MCParticles, aod::MCDSecondaryVertex3Prongs const& allSVs, OriginalTracks const& /*origTracks*/) { if (!jetderiveddatautilities::selectCollision(collision, eventSelection) || (static_cast(std::rand()) / RAND_MAX < eventReductionFactor)) { return; @@ -495,7 +495,7 @@ struct BJetTreeCreator { Filter mccollisionFilter = nabs(aod::jmccollision::posZ) < vertexZCut; using FilteredCollisionMCP = soa::Filtered; - void processMCTruthJets(FilteredCollisionMCP::iterator const& /*collision*/, MCPJetTable const& MCPjets, JetParticles const& MCParticles) + void processMCTruthJets(FilteredCollisionMCP::iterator const& /*collision*/, MCPJetTable const& MCPjets, JetParticles const& MCParticles) { for (const auto& mcpjet : MCPjets) { diff --git a/PWGJE/Tasks/jetHadronRecoil.cxx b/PWGJE/Tasks/jetHadronRecoil.cxx index 909fb502c7b..6a933316873 100644 --- a/PWGJE/Tasks/jetHadronRecoil.cxx +++ b/PWGJE/Tasks/jetHadronRecoil.cxx @@ -382,7 +382,7 @@ struct hJetAnalysis { } PROCESS_SWITCH(hJetAnalysis, processMCD, "process MC detector level", false); - void processMCP(JetMcCollision const& /*collision*/, + void processMCP(JetMcCollision const& /*collision*/, soa::Filtered> const& jets, JetParticles const& particles) { diff --git a/PWGJE/Tasks/jettaggerhfQA.cxx b/PWGJE/Tasks/jettaggerhfQA.cxx index 4afecbc0923..6e1e620938b 100644 --- a/PWGJE/Tasks/jettaggerhfQA.cxx +++ b/PWGJE/Tasks/jettaggerhfQA.cxx @@ -671,7 +671,7 @@ struct JetTaggerHFQA { } template - void fillHistogramSV2ProngData(T const& /*collision*/, U const& jets, V const& /*prongs*/) + void fillHistogramSV2ProngData(T const& /*collision*/, U const& jets, V const& /*prongs*/) { for (const auto& jet : jets) { if (!jetfindingutilities::isInEtaAcceptance(jet, jetEtaMin, jetEtaMax, trackEtaMin, trackEtaMax)) { @@ -712,7 +712,7 @@ struct JetTaggerHFQA { } template - void fillHistogramSV3ProngData(T const& /*collision*/, U const& jets, V const& /*prongs*/) + void fillHistogramSV3ProngData(T const& /*collision*/, U const& jets, V const& /*prongs*/) { for (const auto& jet : jets) { if (!jetfindingutilities::isInEtaAcceptance(jet, jetEtaMin, jetEtaMax, trackEtaMin, trackEtaMax)) { @@ -753,7 +753,7 @@ struct JetTaggerHFQA { } template - void fillHistogramSV2ProngMCD(T const& /*collision*/, U const& mcdjets, V const& /*prongs*/) + void fillHistogramSV2ProngMCD(T const& /*collision*/, U const& mcdjets, V const& /*prongs*/) { for (const auto& mcdjet : mcdjets) { if (!jetfindingutilities::isInEtaAcceptance(mcdjet, jetEtaMin, jetEtaMax, trackEtaMin, trackEtaMax)) { @@ -795,7 +795,7 @@ struct JetTaggerHFQA { } template - void fillHistogramSV3ProngMCD(T const& /*collision*/, U const& mcdjets, V const& /*prongs*/) + void fillHistogramSV3ProngMCD(T const& /*collision*/, U const& mcdjets, V const& /*prongs*/) { for (const auto& mcdjet : mcdjets) { if (!jetfindingutilities::isInEtaAcceptance(mcdjet, jetEtaMin, jetEtaMax, trackEtaMin, trackEtaMax)) {