From f81d5fc13dedcbf6b0c2fe7dbecea2ae06a77f21 Mon Sep 17 00:00:00 2001 From: jokonig Date: Thu, 8 Oct 2026 17:32:52 +0200 Subject: [PATCH 1/2] [PWGEM] Fix code check errors - Fix missing includes or remove unnecessary includes - Add safeguard to still use global using declaration (since its not a real header file, its okay to define using globally) - partially introduced in https://github.com/AliceO2Group/O2Physics/pull/17787 --- .../PhotonMeson/TableProducer/photonconversionbuilder.cxx | 4 ++++ PWGEM/PhotonMeson/TableProducer/photonconversionbuilder.h | 2 ++ .../TableProducer/photonconversionbuilderTmpTable.cxx | 4 ++++ .../TableProducer/skimmerPrimaryElectronFromDalitzEE.h | 8 ++------ .../skimmerPrimaryElectronFromDalitzEETmpTable.cxx | 4 ++++ 5 files changed, 16 insertions(+), 6 deletions(-) diff --git a/PWGEM/PhotonMeson/TableProducer/photonconversionbuilder.cxx b/PWGEM/PhotonMeson/TableProducer/photonconversionbuilder.cxx index 6ee033f2817..c05a3a8ae29 100644 --- a/PWGEM/PhotonMeson/TableProducer/photonconversionbuilder.cxx +++ b/PWGEM/PhotonMeson/TableProducer/photonconversionbuilder.cxx @@ -14,6 +14,10 @@ /// \brief this task produces photon data table with KFParticle. /// \author Daiki Sekihata , Tokyo +#include +#include +#include + #include "PWGEM/PhotonMeson/TableProducer/photonconversionbuilder.h" #include diff --git a/PWGEM/PhotonMeson/TableProducer/photonconversionbuilder.h b/PWGEM/PhotonMeson/TableProducer/photonconversionbuilder.h index 95f181e49fd..483f38098b7 100644 --- a/PWGEM/PhotonMeson/TableProducer/photonconversionbuilder.h +++ b/PWGEM/PhotonMeson/TableProducer/photonconversionbuilder.h @@ -82,6 +82,7 @@ #include #include +// NOLINTBEGIN(google-global-names-in-headers) using o2::framework::AxisSpec; using o2::framework::Configurable; using o2::framework::ConfigurableGroup; @@ -92,6 +93,7 @@ using o2::framework::kTH2F; using o2::framework::kTHnSparseF; using o2::framework::Preslice; using o2::framework::Produces; +// NOLINTEND(google-global-names-in-headers) using MyCollisions = o2::soa::Join; // using MyCollisionsWithSWT = soa::Join; diff --git a/PWGEM/PhotonMeson/TableProducer/photonconversionbuilderTmpTable.cxx b/PWGEM/PhotonMeson/TableProducer/photonconversionbuilderTmpTable.cxx index 0346617358c..75a76d960c9 100644 --- a/PWGEM/PhotonMeson/TableProducer/photonconversionbuilderTmpTable.cxx +++ b/PWGEM/PhotonMeson/TableProducer/photonconversionbuilderTmpTable.cxx @@ -14,6 +14,10 @@ /// \brief this task produces photon data table with KFParticle. /// \author Daiki Sekihata , Tokyo +#include +#include +#include + #include "PWGEM/PhotonMeson/TableProducer/photonconversionbuilder.h" #include diff --git a/PWGEM/PhotonMeson/TableProducer/skimmerPrimaryElectronFromDalitzEE.h b/PWGEM/PhotonMeson/TableProducer/skimmerPrimaryElectronFromDalitzEE.h index d89f3b002a1..559da2e0d8d 100644 --- a/PWGEM/PhotonMeson/TableProducer/skimmerPrimaryElectronFromDalitzEE.h +++ b/PWGEM/PhotonMeson/TableProducer/skimmerPrimaryElectronFromDalitzEE.h @@ -60,12 +60,7 @@ #include #include -// using namespace o2; -// using namespace o2::soa; -// using namespace o2::framework; -// using namespace o2::framework::expressions; -// using namespace o2::constants::physics; - +// NOLINTBEGIN(google-global-names-in-headers) using o2::framework::AxisSpec; using o2::framework::Configurable; using o2::framework::ConfigurableGroup; @@ -76,6 +71,7 @@ using o2::framework::kTH2F; using o2::framework::kTHnSparseF; using o2::framework::Preslice; using o2::framework::Produces; +// NOLINTEND(google-global-names-in-headers) using MyCollisions = o2::soa::Join; using MyCollisionsWithSWT = o2::soa::Join; diff --git a/PWGEM/PhotonMeson/TableProducer/skimmerPrimaryElectronFromDalitzEETmpTable.cxx b/PWGEM/PhotonMeson/TableProducer/skimmerPrimaryElectronFromDalitzEETmpTable.cxx index 32ba2e5f287..51f5b5ffd95 100644 --- a/PWGEM/PhotonMeson/TableProducer/skimmerPrimaryElectronFromDalitzEETmpTable.cxx +++ b/PWGEM/PhotonMeson/TableProducer/skimmerPrimaryElectronFromDalitzEETmpTable.cxx @@ -13,6 +13,10 @@ /// \brief write electrons for Dalitz into a temporary table that is then used for event skimming /// \author joshua.konig@cern.ch +#include +#include +#include + #include "PWGEM/PhotonMeson/TableProducer/skimmerPrimaryElectronFromDalitzEE.h" #include "PID/PIDTOFParamService.h" From eb4f21d2bb1c7c6b3019e1a294a54391bb585df5 Mon Sep 17 00:00:00 2001 From: ALICE Action Bot Date: Thu, 8 Oct 2026 15:40:39 +0000 Subject: [PATCH 2/2] Please consider the following formatting changes --- PWGEM/PhotonMeson/TableProducer/photonconversionbuilder.cxx | 4 ---- .../TableProducer/photonconversionbuilderTmpTable.cxx | 4 ---- .../skimmerPrimaryElectronFromDalitzEETmpTable.cxx | 4 ---- 3 files changed, 12 deletions(-) diff --git a/PWGEM/PhotonMeson/TableProducer/photonconversionbuilder.cxx b/PWGEM/PhotonMeson/TableProducer/photonconversionbuilder.cxx index c05a3a8ae29..6ee033f2817 100644 --- a/PWGEM/PhotonMeson/TableProducer/photonconversionbuilder.cxx +++ b/PWGEM/PhotonMeson/TableProducer/photonconversionbuilder.cxx @@ -14,10 +14,6 @@ /// \brief this task produces photon data table with KFParticle. /// \author Daiki Sekihata , Tokyo -#include -#include -#include - #include "PWGEM/PhotonMeson/TableProducer/photonconversionbuilder.h" #include diff --git a/PWGEM/PhotonMeson/TableProducer/photonconversionbuilderTmpTable.cxx b/PWGEM/PhotonMeson/TableProducer/photonconversionbuilderTmpTable.cxx index 75a76d960c9..0346617358c 100644 --- a/PWGEM/PhotonMeson/TableProducer/photonconversionbuilderTmpTable.cxx +++ b/PWGEM/PhotonMeson/TableProducer/photonconversionbuilderTmpTable.cxx @@ -14,10 +14,6 @@ /// \brief this task produces photon data table with KFParticle. /// \author Daiki Sekihata , Tokyo -#include -#include -#include - #include "PWGEM/PhotonMeson/TableProducer/photonconversionbuilder.h" #include diff --git a/PWGEM/PhotonMeson/TableProducer/skimmerPrimaryElectronFromDalitzEETmpTable.cxx b/PWGEM/PhotonMeson/TableProducer/skimmerPrimaryElectronFromDalitzEETmpTable.cxx index 51f5b5ffd95..32ba2e5f287 100644 --- a/PWGEM/PhotonMeson/TableProducer/skimmerPrimaryElectronFromDalitzEETmpTable.cxx +++ b/PWGEM/PhotonMeson/TableProducer/skimmerPrimaryElectronFromDalitzEETmpTable.cxx @@ -13,10 +13,6 @@ /// \brief write electrons for Dalitz into a temporary table that is then used for event skimming /// \author joshua.konig@cern.ch -#include -#include -#include - #include "PWGEM/PhotonMeson/TableProducer/skimmerPrimaryElectronFromDalitzEE.h" #include "PID/PIDTOFParamService.h"