From 7d2e8b8b9ac6e4292764266c08183facd962fcb5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=20Ku=C4=8Dera?= Date: Tue, 11 Jun 2024 13:42:22 +0200 Subject: [PATCH 1/2] PWGJE: Fix compilation warnings --- PWGJE/Core/JetMatchingUtilities.h | 2 +- PWGJE/TableProducer/secondaryVertexReconstruction.cxx | 10 +++++----- PWGJE/Tasks/hffragmentationfunction.cxx | 8 ++++---- PWGJE/Tasks/jetHadronRecoil.cxx | 2 +- PWGJE/Tasks/jetfragmentation.cxx | 2 +- PWGJE/Tasks/jetsubstructurehfoutput.cxx | 2 +- PWGJE/Tasks/phiInJets.cxx | 4 ++-- 7 files changed, 15 insertions(+), 15 deletions(-) diff --git a/PWGJE/Core/JetMatchingUtilities.h b/PWGJE/Core/JetMatchingUtilities.h index 5c6e4355b86..9e815e773dc 100644 --- a/PWGJE/Core/JetMatchingUtilities.h +++ b/PWGJE/Core/JetMatchingUtilities.h @@ -471,7 +471,7 @@ float getPtSum(T const& tracksBase, U const& clustersBase, V const& tracksTag, O } template -auto getConstituents(T const& jet, U const& constituents) +auto getConstituents(T const& jet, U const& /*constituents*/) { if constexpr (jetfindingutilities::isEMCALTable()) { return jet.template clusters_as(); diff --git a/PWGJE/TableProducer/secondaryVertexReconstruction.cxx b/PWGJE/TableProducer/secondaryVertexReconstruction.cxx index 18db1278722..3bacfde545f 100644 --- a/PWGJE/TableProducer/secondaryVertexReconstruction.cxx +++ b/PWGJE/TableProducer/secondaryVertexReconstruction.cxx @@ -267,12 +267,12 @@ struct SecondaryVertexReconstruction { } } - void processDummy(JetCollisionwPIs::iterator const& collision) + void processDummy(JetCollisionwPIs::iterator const& /*collision*/) { } PROCESS_SWITCH(SecondaryVertexReconstruction, processDummy, "Dummy process", true); - void processData3Prongs(JetCollisionwPIs::iterator const& collision, aod::Collisions const& realColl, soa::Join const& jets, JetTracksData const& jtracks, OriginalTracks const& tracks, aod::BCsWithTimestamps const& bcWithTimeStamps) + void processData3Prongs(JetCollisionwPIs::iterator const& collision, aod::Collisions const& /*realColl*/, soa::Join const& jets, JetTracksData const& jtracks, OriginalTracks const& /*tracks*/, aod::BCsWithTimestamps const& /*bcWithTimeStamps*/) { for (auto& jet : jets) { std::vector svIndices; @@ -282,7 +282,7 @@ struct SecondaryVertexReconstruction { } PROCESS_SWITCH(SecondaryVertexReconstruction, processData3Prongs, "Reconstruct the data 3-prong secondary vertex", false); - void processData2Prongs(JetCollisionwPIs::iterator const& collision, aod::Collisions const& realColl, soa::Join const& jets, JetTracksData const& jtracks, OriginalTracks const& tracks, aod::BCsWithTimestamps const& bcWithTimeStamps) + void processData2Prongs(JetCollisionwPIs::iterator const& collision, aod::Collisions const& /*realColl*/, soa::Join const& jets, JetTracksData const& jtracks, OriginalTracks const& /*tracks*/, aod::BCsWithTimestamps const& /*bcWithTimeStamps*/) { for (auto& jet : jets) { std::vector svIndices; @@ -292,7 +292,7 @@ struct SecondaryVertexReconstruction { } PROCESS_SWITCH(SecondaryVertexReconstruction, processData2Prongs, "Reconstruct the data 2-prong secondary vertex", false); - void processMCD3Prongs(JetCollisionwPIs::iterator const& collision, aod::Collisions const& realColl, soa::Join const& mcdjets, JetTracksMCDwPIs const& jtracks, OriginalTracks const& tracks, aod::BCsWithTimestamps const& bcWithTimeStamps) + void processMCD3Prongs(JetCollisionwPIs::iterator const& collision, aod::Collisions const& /*realColl*/, soa::Join const& mcdjets, JetTracksMCDwPIs const& jtracks, OriginalTracks const& /*tracks*/, aod::BCsWithTimestamps const& /*bcWithTimeStamps*/) { for (auto& jet : mcdjets) { std::vector svIndices; @@ -302,7 +302,7 @@ struct SecondaryVertexReconstruction { } PROCESS_SWITCH(SecondaryVertexReconstruction, processMCD3Prongs, "Reconstruct the MCD 3-prong secondary vertex", false); - void processMCD2Prongs(JetCollisionwPIs::iterator const& collision, aod::Collisions const& realColl, soa::Join const& mcdjets, JetTracksMCDwPIs const& jtracks, OriginalTracks const& tracks, aod::BCsWithTimestamps const& bcWithTimeStamps) + void processMCD2Prongs(JetCollisionwPIs::iterator const& collision, aod::Collisions const& /*realColl*/, soa::Join const& mcdjets, JetTracksMCDwPIs const& jtracks, OriginalTracks const& /*tracks*/, aod::BCsWithTimestamps const& /*bcWithTimeStamps*/) { for (auto& jet : mcdjets) { std::vector svIndices; diff --git a/PWGJE/Tasks/hffragmentationfunction.cxx b/PWGJE/Tasks/hffragmentationfunction.cxx index 86164fa68ff..dd64f45ee93 100644 --- a/PWGJE/Tasks/hffragmentationfunction.cxx +++ b/PWGJE/Tasks/hffragmentationfunction.cxx @@ -199,10 +199,10 @@ struct HfFragmentationFunctionTask { JetCollisionsMCD const& collisions, JetMCDTable const& mcdjets, JetMCPTable const& mcpjets, - CandidatesD0MCD const& mcdd0cands, - CandidatesD0MCP const& mcpd0cands, - JetTracks const& tracks, - JetParticles const& particles) + CandidatesD0MCD const& /*mcdd0cands*/, + CandidatesD0MCP const& /*mcpd0cands*/, + JetTracks const& /*tracks*/, + JetParticles const& /*particles*/) { double axisDistance = 0; diff --git a/PWGJE/Tasks/jetHadronRecoil.cxx b/PWGJE/Tasks/jetHadronRecoil.cxx index 87dc5ddfc3f..0eada57c6ce 100644 --- a/PWGJE/Tasks/jetHadronRecoil.cxx +++ b/PWGJE/Tasks/jetHadronRecoil.cxx @@ -122,7 +122,7 @@ struct hJetAnalysis { } template - void fillHistograms(T const& jets, W const& jetsWTA, U const& tracks) + void fillHistograms(T const& jets, W const& /*jetsWTA*/, U const& tracks) { bool is_sig_col; std::vector phi_TT_ar; diff --git a/PWGJE/Tasks/jetfragmentation.cxx b/PWGJE/Tasks/jetfragmentation.cxx index 46a3474488f..83ff0ffe2c1 100644 --- a/PWGJE/Tasks/jetfragmentation.cxx +++ b/PWGJE/Tasks/jetfragmentation.cxx @@ -1346,7 +1346,7 @@ struct JetFragmentation { } template - void fillMatchingV0DauHistograms(V0Type const& v0, ParticleType const& particle, double weight = 1.) + void fillMatchingV0DauHistograms(V0Type const& v0, ParticleType const& /*particle*/, double weight = 1.) { auto negTrack = v0.template negTrack_as(); auto posTrack = v0.template posTrack_as(); diff --git a/PWGJE/Tasks/jetsubstructurehfoutput.cxx b/PWGJE/Tasks/jetsubstructurehfoutput.cxx index a6e8a96bb2a..6c59bf9c016 100644 --- a/PWGJE/Tasks/jetsubstructurehfoutput.cxx +++ b/PWGJE/Tasks/jetsubstructurehfoutput.cxx @@ -169,7 +169,7 @@ struct JetSubstructureHFOutputTask { } template - void analyseCandidates(T const& jets, U const& candidates, std::map& candidateMap, float jetPtMin) + void analyseCandidates(T const& jets, U const& /*candidates*/, std::map& candidateMap, float jetPtMin) { for (const auto& jet : jets) { if (jet.pt() < jetPtMin) { diff --git a/PWGJE/Tasks/phiInJets.cxx b/PWGJE/Tasks/phiInJets.cxx index 6707fdbac05..1f466d9f893 100644 --- a/PWGJE/Tasks/phiInJets.cxx +++ b/PWGJE/Tasks/phiInJets.cxx @@ -486,7 +486,7 @@ struct phiInJets { using myCompleteJetTracks = soa::Join; int nJEEvents = 0; int nprocessRecEvents = 0; - void processRec(o2::aod::JCollision const& collision, myCompleteJetTracks const& tracks, soa::Filtered const& mcdjets, aod::McParticles const&, myCompleteTracks const& originalTracks) + void processRec(o2::aod::JCollision const& collision, myCompleteJetTracks const& tracks, soa::Filtered const& mcdjets, aod::McParticles const&, myCompleteTracks const& /*originalTracks*/) { if (cDebugLevel > 0) { nprocessRecEvents++; @@ -789,7 +789,7 @@ struct phiInJets { int nprocessSimJEEvents = 0; void processMatchedGen(aod::JMcCollision const& collision, soa::SmallGroups> const& recocolls, - JetMCDTable const& mcdjets, + JetMCDTable const& /*mcdjets*/, JetMCPTable const& mcpjets, aod::JMcParticles const& mcParticles) From f6c90981d030a052b1f1d890729cf0a678e237b4 Mon Sep 17 00:00:00 2001 From: ALICE Builder Date: Tue, 11 Jun 2024 13:56:23 +0200 Subject: [PATCH 2/2] Please consider the following formatting changes (#85) --- PWGJE/TableProducer/secondaryVertexReconstruction.cxx | 8 ++++---- PWGJE/Tasks/hffragmentationfunction.cxx | 8 ++++---- PWGJE/Tasks/jetHadronRecoil.cxx | 2 +- PWGJE/Tasks/jetfragmentation.cxx | 2 +- PWGJE/Tasks/jetsubstructurehfoutput.cxx | 2 +- PWGJE/Tasks/phiInJets.cxx | 4 ++-- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/PWGJE/TableProducer/secondaryVertexReconstruction.cxx b/PWGJE/TableProducer/secondaryVertexReconstruction.cxx index 3bacfde545f..87ffc344003 100644 --- a/PWGJE/TableProducer/secondaryVertexReconstruction.cxx +++ b/PWGJE/TableProducer/secondaryVertexReconstruction.cxx @@ -272,7 +272,7 @@ struct SecondaryVertexReconstruction { } PROCESS_SWITCH(SecondaryVertexReconstruction, processDummy, "Dummy process", true); - void processData3Prongs(JetCollisionwPIs::iterator const& collision, aod::Collisions const& /*realColl*/, soa::Join const& jets, JetTracksData const& jtracks, OriginalTracks const& /*tracks*/, aod::BCsWithTimestamps const& /*bcWithTimeStamps*/) + void processData3Prongs(JetCollisionwPIs::iterator const& collision, aod::Collisions const& /*realColl*/, soa::Join const& jets, JetTracksData const& jtracks, OriginalTracks const& /*tracks*/, aod::BCsWithTimestamps const& /*bcWithTimeStamps*/) { for (auto& jet : jets) { std::vector svIndices; @@ -282,7 +282,7 @@ struct SecondaryVertexReconstruction { } PROCESS_SWITCH(SecondaryVertexReconstruction, processData3Prongs, "Reconstruct the data 3-prong secondary vertex", false); - void processData2Prongs(JetCollisionwPIs::iterator const& collision, aod::Collisions const& /*realColl*/, soa::Join const& jets, JetTracksData const& jtracks, OriginalTracks const& /*tracks*/, aod::BCsWithTimestamps const& /*bcWithTimeStamps*/) + void processData2Prongs(JetCollisionwPIs::iterator const& collision, aod::Collisions const& /*realColl*/, soa::Join const& jets, JetTracksData const& jtracks, OriginalTracks const& /*tracks*/, aod::BCsWithTimestamps const& /*bcWithTimeStamps*/) { for (auto& jet : jets) { std::vector svIndices; @@ -292,7 +292,7 @@ struct SecondaryVertexReconstruction { } PROCESS_SWITCH(SecondaryVertexReconstruction, processData2Prongs, "Reconstruct the data 2-prong secondary vertex", false); - void processMCD3Prongs(JetCollisionwPIs::iterator const& collision, aod::Collisions const& /*realColl*/, soa::Join const& mcdjets, JetTracksMCDwPIs const& jtracks, OriginalTracks const& /*tracks*/, aod::BCsWithTimestamps const& /*bcWithTimeStamps*/) + void processMCD3Prongs(JetCollisionwPIs::iterator const& collision, aod::Collisions const& /*realColl*/, soa::Join const& mcdjets, JetTracksMCDwPIs const& jtracks, OriginalTracks const& /*tracks*/, aod::BCsWithTimestamps const& /*bcWithTimeStamps*/) { for (auto& jet : mcdjets) { std::vector svIndices; @@ -302,7 +302,7 @@ struct SecondaryVertexReconstruction { } PROCESS_SWITCH(SecondaryVertexReconstruction, processMCD3Prongs, "Reconstruct the MCD 3-prong secondary vertex", false); - void processMCD2Prongs(JetCollisionwPIs::iterator const& collision, aod::Collisions const& /*realColl*/, soa::Join const& mcdjets, JetTracksMCDwPIs const& jtracks, OriginalTracks const& /*tracks*/, aod::BCsWithTimestamps const& /*bcWithTimeStamps*/) + void processMCD2Prongs(JetCollisionwPIs::iterator const& collision, aod::Collisions const& /*realColl*/, soa::Join const& mcdjets, JetTracksMCDwPIs const& jtracks, OriginalTracks const& /*tracks*/, aod::BCsWithTimestamps const& /*bcWithTimeStamps*/) { for (auto& jet : mcdjets) { std::vector svIndices; diff --git a/PWGJE/Tasks/hffragmentationfunction.cxx b/PWGJE/Tasks/hffragmentationfunction.cxx index dd64f45ee93..b790d40aaed 100644 --- a/PWGJE/Tasks/hffragmentationfunction.cxx +++ b/PWGJE/Tasks/hffragmentationfunction.cxx @@ -199,10 +199,10 @@ struct HfFragmentationFunctionTask { JetCollisionsMCD const& collisions, JetMCDTable const& mcdjets, JetMCPTable const& mcpjets, - CandidatesD0MCD const& /*mcdd0cands*/, - CandidatesD0MCP const& /*mcpd0cands*/, - JetTracks const& /*tracks*/, - JetParticles const& /*particles*/) + CandidatesD0MCD const& /*mcdd0cands*/, + CandidatesD0MCP const& /*mcpd0cands*/, + JetTracks const& /*tracks*/, + JetParticles const& /*particles*/) { double axisDistance = 0; diff --git a/PWGJE/Tasks/jetHadronRecoil.cxx b/PWGJE/Tasks/jetHadronRecoil.cxx index 0eada57c6ce..e33aa89dd5a 100644 --- a/PWGJE/Tasks/jetHadronRecoil.cxx +++ b/PWGJE/Tasks/jetHadronRecoil.cxx @@ -122,7 +122,7 @@ struct hJetAnalysis { } template - void fillHistograms(T const& jets, W const& /*jetsWTA*/, U const& tracks) + void fillHistograms(T const& jets, W const& /*jetsWTA*/, U const& tracks) { bool is_sig_col; std::vector phi_TT_ar; diff --git a/PWGJE/Tasks/jetfragmentation.cxx b/PWGJE/Tasks/jetfragmentation.cxx index 83ff0ffe2c1..710c9220267 100644 --- a/PWGJE/Tasks/jetfragmentation.cxx +++ b/PWGJE/Tasks/jetfragmentation.cxx @@ -1346,7 +1346,7 @@ struct JetFragmentation { } template - void fillMatchingV0DauHistograms(V0Type const& v0, ParticleType const& /*particle*/, double weight = 1.) + void fillMatchingV0DauHistograms(V0Type const& v0, ParticleType const& /*particle*/, double weight = 1.) { auto negTrack = v0.template negTrack_as(); auto posTrack = v0.template posTrack_as(); diff --git a/PWGJE/Tasks/jetsubstructurehfoutput.cxx b/PWGJE/Tasks/jetsubstructurehfoutput.cxx index 6c59bf9c016..ead87e38e72 100644 --- a/PWGJE/Tasks/jetsubstructurehfoutput.cxx +++ b/PWGJE/Tasks/jetsubstructurehfoutput.cxx @@ -169,7 +169,7 @@ struct JetSubstructureHFOutputTask { } template - void analyseCandidates(T const& jets, U const& /*candidates*/, std::map& candidateMap, float jetPtMin) + void analyseCandidates(T const& jets, U const& /*candidates*/, std::map& candidateMap, float jetPtMin) { for (const auto& jet : jets) { if (jet.pt() < jetPtMin) { diff --git a/PWGJE/Tasks/phiInJets.cxx b/PWGJE/Tasks/phiInJets.cxx index 1f466d9f893..a3d6b0a8085 100644 --- a/PWGJE/Tasks/phiInJets.cxx +++ b/PWGJE/Tasks/phiInJets.cxx @@ -486,7 +486,7 @@ struct phiInJets { using myCompleteJetTracks = soa::Join; int nJEEvents = 0; int nprocessRecEvents = 0; - void processRec(o2::aod::JCollision const& collision, myCompleteJetTracks const& tracks, soa::Filtered const& mcdjets, aod::McParticles const&, myCompleteTracks const& /*originalTracks*/) + void processRec(o2::aod::JCollision const& collision, myCompleteJetTracks const& tracks, soa::Filtered const& mcdjets, aod::McParticles const&, myCompleteTracks const& /*originalTracks*/) { if (cDebugLevel > 0) { nprocessRecEvents++; @@ -789,7 +789,7 @@ struct phiInJets { int nprocessSimJEEvents = 0; void processMatchedGen(aod::JMcCollision const& collision, soa::SmallGroups> const& recocolls, - JetMCDTable const& /*mcdjets*/, + JetMCDTable const& /*mcdjets*/, JetMCPTable const& mcpjets, aod::JMcParticles const& mcParticles)