From d4fa07cac3db6d8afb6610a1a2e485935031afe2 Mon Sep 17 00:00:00 2001 From: Marvin Hemmer Date: Tue, 4 Aug 2026 07:45:14 +0200 Subject: [PATCH 1/2] [PWGEM] Clean up of clang-tidy errors and warnings --- .../TableProducer/photonconversionbuilder.cxx | 12 ++++++++++-- PWGEM/PhotonMeson/Utils/PCMUtilities.h | 6 ++++-- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/PWGEM/PhotonMeson/TableProducer/photonconversionbuilder.cxx b/PWGEM/PhotonMeson/TableProducer/photonconversionbuilder.cxx index 5cb6f07889c..b7fb7bc7457 100644 --- a/PWGEM/PhotonMeson/TableProducer/photonconversionbuilder.cxx +++ b/PWGEM/PhotonMeson/TableProducer/photonconversionbuilder.cxx @@ -18,6 +18,7 @@ #define HomogeneousField // o2-linter: disable=name/macro (name coming from KFParticle, not us, needed for KFParticle::SetField) #endif +// PWGEM #include "PWGEM/Dilepton/Utils/PairUtilities.h" #include "PWGEM/PhotonMeson/Core/EmMlResponsePCM.h" #include "PWGEM/PhotonMeson/Core/V0PhotonCandidate.h" @@ -26,6 +27,7 @@ #include "PWGEM/PhotonMeson/Utils/PCMUtilities.h" #include "PWGEM/PhotonMeson/Utils/TrackSelection.h" +// Other O2Physics #include "Common/Core/RecoDecay.h" #include "Common/Core/TPCVDriftManager.h" #include "Common/Core/trackUtilities.h" @@ -34,6 +36,7 @@ #include "Common/DataModel/PIDResponseTPC.h" #include "Tools/KFparticle/KFUtilities.h" +// O2 #include #include #include @@ -52,16 +55,22 @@ #include #include #include +#include #include +#include + +// ROOT #include // IWYU pragma: keep (do not replace with Math/Vector4Dfwd.h) #include #include +// KFParticle #include #include #include +// C++ #include #include #include @@ -681,9 +690,8 @@ struct PhotonConversionBuilder { phiv = o2::aod::pwgem::dilepton::utils::pairutil::getPhivPair(kfp_track_posProp.GetPx(), kfp_track_posProp.GetPy(), kfp_track_posProp.GetPz(), kfp_track_eleProp.GetPx(), kfp_track_eleProp.GetPy(), kfp_track_eleProp.GetPz(), pos.sign(), ele.sign(), d_bz); psipair = o2::aod::pwgem::dilepton::utils::pairutil::getPsiPair(kfp_track_posProp.GetPx(), kfp_track_posProp.GetPy(), kfp_track_posProp.GetPz(), kfp_track_eleProp.GetPx(), kfp_track_eleProp.GetPy(), kfp_track_eleProp.GetPz()); break; - } else { - LOG(debug) << "Propagation to offset" << offsetR << " cm failed for " << (pPropagatedSuccess ? "negative" : "positive") << " track. Trying smaller offset."; } + LOG(debug) << "Propagation to offset" << offsetR << " cm failed for " << (pPropagatedSuccess ? "negative" : "positive") << " track. Trying smaller offset."; } if (modeTrackPropagation == TrackPropMode::kBoth) { registry.fill(HIST("V0/hPhivPropagationCompare"), phiv, phivFast); diff --git a/PWGEM/PhotonMeson/Utils/PCMUtilities.h b/PWGEM/PhotonMeson/Utils/PCMUtilities.h index b2134c297f6..326a1b2a79a 100644 --- a/PWGEM/PhotonMeson/Utils/PCMUtilities.h +++ b/PWGEM/PhotonMeson/Utils/PCMUtilities.h @@ -30,6 +30,8 @@ #include // IWYU pragma: keep (do not replace with Math/Vector2Dfwd.h) #include +#include + #include #include @@ -113,7 +115,7 @@ template std::array CalculateDCAFast(const o2::track::TrackParametrizationWithError& trk, const o2::math_utils::Point3D& vtx, const float magField) { - std::array dca; + std::array dca{}; // obtain circle from track in x-y plane const o2::track::TrackAuxPar helixPos(trk, magField); @@ -175,7 +177,7 @@ inline std::array getPropMomentumFromTrackHelix(const float s, const T const auto phi = RecoDecay::constrainAngle(track.phi() + dphi + addPhi); // Calculate px,y,z at the new propagated vertex - std::array trackP; + std::array trackP{}; trackP[0] = std::cos(phi) * track.pt(); trackP[1] = std::sin(phi) * track.pt(); trackP[2] = track.tgl() * track.pt(); From 393dfa572cde8d0da0f13d42d3e81df9321f7505 Mon Sep 17 00:00:00 2001 From: Marvin Hemmer Date: Tue, 4 Aug 2026 13:34:03 +0200 Subject: [PATCH 2/2] remove include comments --- .../TableProducer/photonconversionbuilder.cxx | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/PWGEM/PhotonMeson/TableProducer/photonconversionbuilder.cxx b/PWGEM/PhotonMeson/TableProducer/photonconversionbuilder.cxx index b7fb7bc7457..ccc59bc755f 100644 --- a/PWGEM/PhotonMeson/TableProducer/photonconversionbuilder.cxx +++ b/PWGEM/PhotonMeson/TableProducer/photonconversionbuilder.cxx @@ -18,7 +18,6 @@ #define HomogeneousField // o2-linter: disable=name/macro (name coming from KFParticle, not us, needed for KFParticle::SetField) #endif -// PWGEM #include "PWGEM/Dilepton/Utils/PairUtilities.h" #include "PWGEM/PhotonMeson/Core/EmMlResponsePCM.h" #include "PWGEM/PhotonMeson/Core/V0PhotonCandidate.h" @@ -27,7 +26,6 @@ #include "PWGEM/PhotonMeson/Utils/PCMUtilities.h" #include "PWGEM/PhotonMeson/Utils/TrackSelection.h" -// Other O2Physics #include "Common/Core/RecoDecay.h" #include "Common/Core/TPCVDriftManager.h" #include "Common/Core/trackUtilities.h" @@ -36,7 +34,6 @@ #include "Common/DataModel/PIDResponseTPC.h" #include "Tools/KFparticle/KFUtilities.h" -// O2 #include #include #include @@ -58,19 +55,16 @@ #include #include -#include - -// ROOT #include // IWYU pragma: keep (do not replace with Math/Vector4Dfwd.h) #include #include -// KFParticle #include #include #include -// C++ +#include + #include #include #include