From e20326143f402c520ca1a938d0d7f587c8ca565a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=20Ku=C4=8Dera?= <26327373+vkucera@users.noreply.github.com> Date: Wed, 12 Aug 2026 16:25:05 +0200 Subject: [PATCH] Fix PID include paths --- Common/Core/PID/PIDTOFParamService.cxx | 4 ++-- Common/Core/PID/ParamBase.cxx | 3 ++- Common/TableProducer/PID/pidTOF.cxx | 4 ++-- Common/TableProducer/PID/pidTOFBase.cxx | 10 +++++----- Common/TableProducer/PID/pidTOFFull.cxx | 12 ++++++------ Common/TableProducer/PID/pidTOFMerge.cxx | 16 ++++++++-------- Common/TableProducer/PID/pidTOFbeta.cxx | 2 +- DPG/Tasks/AOTTrack/PID/TOF/qaPIDTOFDynamic.cxx | 2 +- DPG/Tasks/AOTTrack/PID/TOF/qaPIDTOFEvTime.cxx | 2 +- DPG/Tasks/TOF/tofOfflineCalib.cxx | 2 +- .../TableProducer/skimmerPrimaryElectron.cxx | 2 +- .../TableProducer/skimmerPrimaryElectronSV.cxx | 2 +- .../TableProducer/treeCreatorElectronMLDDA.cxx | 2 +- PWGEM/Dilepton/Tasks/taggingHFE.cxx | 2 +- PWGEM/Dilepton/Utils/ElectronModule.h | 2 +- .../skimmerPrimaryElectronFromDalitzEE.cxx | 2 +- PWGHF/TableProducer/mcPidTof.cxx | 2 +- PWGLF/TableProducer/Nuspex/hyperkinkRecoTask.cxx | 2 +- PWGLF/TableProducer/Nuspex/pidTOFGeneric.cxx | 2 +- .../Strangeness/strangenesstofpid.cxx | 2 +- PWGLF/Tasks/QC/hypertriton3bodyQa.cxx | 2 +- PWGLF/Utils/nucleiUtils.h | 2 +- 22 files changed, 41 insertions(+), 40 deletions(-) diff --git a/Common/Core/PID/PIDTOFParamService.cxx b/Common/Core/PID/PIDTOFParamService.cxx index 95f9f1d7d55..eae721fddc7 100644 --- a/Common/Core/PID/PIDTOFParamService.cxx +++ b/Common/Core/PID/PIDTOFParamService.cxx @@ -20,6 +20,7 @@ #include "Common/Core/CollisionTypeHelper.h" #include "Common/Core/MetadataHelper.h" +#include "Common/Core/PID/PIDTOF.h" #include #include @@ -30,7 +31,6 @@ #include #include #include -#include #include @@ -80,7 +80,7 @@ void o2::pid::tof::TOFResponseImpl::initSetup(o2::ccdb::BasicCCDBManager* ccdb, LOG(fatal) << "CCDB manager is not set, cannot initialize TOFResponseImpl"; } inheritFromBaseTask(initContext, task); // Gets the configuration parameters from the base task (tof-signal) - mCcdb = ccdb; // Set the CCDB manager + mCcdb = ccdb; // Set the CCDB manager mCcdb->setURL(mUrl); mCcdb->setTimestamp(mTimestamp); mCcdb->setCaching(true); diff --git a/Common/Core/PID/ParamBase.cxx b/Common/Core/PID/ParamBase.cxx index e1375b3916c..afd87ebff53 100644 --- a/Common/Core/PID/ParamBase.cxx +++ b/Common/Core/PID/ParamBase.cxx @@ -17,8 +17,9 @@ /// These are the basic storage elements to be kept in the CCDB /// +#include "ParamBase.h" + #include -#include #include #include diff --git a/Common/TableProducer/PID/pidTOF.cxx b/Common/TableProducer/PID/pidTOF.cxx index 8fe33443239..2ce49d32369 100644 --- a/Common/TableProducer/PID/pidTOF.cxx +++ b/Common/TableProducer/PID/pidTOF.cxx @@ -17,7 +17,8 @@ /// #include "pidTOFBase.h" - +// +#include "Common/Core/PID/PIDTOF.h" #include "Common/Core/TableHelper.h" #include "Common/DataModel/PIDResponseTOF.h" @@ -31,7 +32,6 @@ #include #include #include -#include #include #include diff --git a/Common/TableProducer/PID/pidTOFBase.cxx b/Common/TableProducer/PID/pidTOFBase.cxx index 7097883b0e7..2ef09079f5e 100644 --- a/Common/TableProducer/PID/pidTOFBase.cxx +++ b/Common/TableProducer/PID/pidTOFBase.cxx @@ -17,6 +17,7 @@ #include "pidTOFBase.h" +#include "Common/Core/PID/PIDTOF.h" #include "Common/Core/TableHelper.h" #include "Common/DataModel/EventSelection.h" #include "Common/DataModel/FT0Corrected.h" @@ -35,7 +36,6 @@ #include #include #include -#include #include #include @@ -370,8 +370,8 @@ struct tofEventTime { tableEvTimeTOFOnly.reserve(tracks.size()); } - int lastCollisionId = -1; // Last collision ID analysed - for (auto const& t : tracks) { // Loop on collisions + int lastCollisionId = -1; // Last collision ID analysed + for (auto const& t : tracks) { // Loop on collisions if (!t.has_collision() || collisions.size() == 0 || ((sel8TOFEvTime.value == true) && !t.collision_as().sel8())) { // Track was not assigned, cannot compute event time or event did not pass the event selection tableFlags(0); tableEvTime(0.f, 999.f); @@ -432,8 +432,8 @@ struct tofEventTime { tableEvTimeTOFOnly.reserve(tracks.size()); } - int lastCollisionId = -1; // Last collision ID analysed - for (auto const& t : tracks) { // Loop on collisions + int lastCollisionId = -1; // Last collision ID analysed + for (auto const& t : tracks) { // Loop on collisions if (!t.has_collision() || collisions.size() == 0 || ((sel8TOFEvTime.value == true) && !t.collision_as().sel8())) { // Track was not assigned, cannot compute event time or event did not pass the event selection tableFlags(0); tableEvTime(0.f, 999.f); diff --git a/Common/TableProducer/PID/pidTOFFull.cxx b/Common/TableProducer/PID/pidTOFFull.cxx index ff351bd5c4f..d76cbf3f91e 100644 --- a/Common/TableProducer/PID/pidTOFFull.cxx +++ b/Common/TableProducer/PID/pidTOFFull.cxx @@ -18,6 +18,7 @@ #include "pidTOFBase.h" +#include "Common/Core/PID/PIDTOF.h" #include "Common/Core/TableHelper.h" #include "Common/DataModel/PIDResponseTOF.h" @@ -31,7 +32,6 @@ #include #include #include -#include #include #include @@ -302,9 +302,9 @@ struct tofPidFull { reserveTable(pidId, tracks.size()); } - int lastCollisionId = -1; // Last collision ID analysed - float resolution = 1.f; // Last resolution assigned - for (auto const& track : tracks) { // Loop on all tracks + int lastCollisionId = -1; // Last collision ID analysed + float resolution = 1.f; // Last resolution assigned + for (auto const& track : tracks) { // Loop on all tracks if (!track.has_collision() || collisions.size() == 0) { // Track was not assigned, cannot compute NSigma (no event time) -> filling with empty table for (auto const& pidId : mEnabledParticles) { makeTableEmpty(pidId); @@ -407,8 +407,8 @@ struct tofPidFull { for (auto const& pidId : mEnabledParticles) { reserveTable(pidId, tracks.size()); } - float resolution = 1.f; // Last resolution assigned - for (auto const& track : tracks) { // Loop on all tracks + float resolution = 1.f; // Last resolution assigned + for (auto const& track : tracks) { // Loop on all tracks if (!track.has_collision() || collisions.size() == 0) { // Track was not assigned, cannot compute NSigma (no event time) -> filling with empty table for (auto const& pidId : mEnabledParticles) { makeTableEmpty(pidId); diff --git a/Common/TableProducer/PID/pidTOFMerge.cxx b/Common/TableProducer/PID/pidTOFMerge.cxx index db1c7391ac1..f5ec6e68a6f 100644 --- a/Common/TableProducer/PID/pidTOFMerge.cxx +++ b/Common/TableProducer/PID/pidTOFMerge.cxx @@ -21,6 +21,7 @@ #include "Common/Core/CollisionTypeHelper.h" #include "Common/Core/MetadataHelper.h" +#include "Common/Core/PID/PIDTOF.h" #include "Common/Core/PID/PIDTOFParamService.h" #include "Common/Core/TableHelper.h" #include "Common/DataModel/EventSelection.h" @@ -40,7 +41,6 @@ #include #include #include -#include #include #include @@ -345,7 +345,7 @@ struct tofEventTime { tableEvTime.reserve(tracks.size()); tableFlags.reserve(tracks.size()); - for (auto const& t : tracks) { // Loop on collisions + for (auto const& t : tracks) { // Loop on collisions if (!t.has_collision() || collisions.size() == 0) { // Track was not assigned, cannot compute event time tableFlags(0); tableEvTime(0.f, 999.f); @@ -399,8 +399,8 @@ struct tofEventTime { LOG(debug) << "Running on " << CollisionSystemType::getCollisionSystemName(tofResponse->cfgCollisionType()) << " mComputeEvTimeWithTOF " << mComputeEvTimeWithTOF.value << " mComputeEvTimeWithFT0 " << mComputeEvTimeWithFT0.value; if (mComputeEvTimeWithTOF == 1 && mComputeEvTimeWithFT0 == 1) { - int lastCollisionId = -1; // Last collision ID analysed - for (auto const& t : tracks) { // Loop on collisions + int lastCollisionId = -1; // Last collision ID analysed + for (auto const& t : tracks) { // Loop on collisions if (!t.has_collision() || collisions.size() == 0 || ((sel8TOFEvTime.value == true) && !t.collision_as().sel8())) { // Track was not assigned, cannot compute event time or event did not pass the event selection tableFlags(0); tableEvTime(0.f, 999.f); @@ -475,8 +475,8 @@ struct tofEventTime { } } } else if (mComputeEvTimeWithTOF == 1 && mComputeEvTimeWithFT0 == 0) { - int lastCollisionId = -1; // Last collision ID analysed - for (auto const& t : tracks) { // Loop on collisions + int lastCollisionId = -1; // Last collision ID analysed + for (auto const& t : tracks) { // Loop on collisions if (!t.has_collision() || collisions.size() == 0 || ((sel8TOFEvTime.value == true) && !t.collision_as().sel8())) { // Track was not assigned, cannot compute event time or event did not pass the event selection tableFlags(0); tableEvTime(0.f, 999.f); @@ -906,7 +906,7 @@ struct tofPidMerge { float resolution = 1.f; // Last resolution assigned float nsigma = 0; - for (auto const& trk : tracks) { // Loop on all tracks + for (auto const& trk : tracks) { // Loop on all tracks if (!trk.has_collision() || collisions.size() == 0) { // Track was not assigned, cannot compute NSigma (no event time) -> filling with empty table for (auto const& pidId : mEnabledParticles) { makeTableEmpty(pidId, false); @@ -1068,7 +1068,7 @@ struct tofPidMerge { float resolution = 1.f; // Last resolution assigned float nsigma = 0; - for (auto const& trk : tracks) { // Loop on all tracks + for (auto const& trk : tracks) { // Loop on all tracks if (!trk.has_collision() || collisions.size() == 0) { // Track was not assigned, cannot compute NSigma (no event time) -> filling with empty table for (auto const& pidId : mEnabledParticles) { makeTableEmpty(pidId, false); diff --git a/Common/TableProducer/PID/pidTOFbeta.cxx b/Common/TableProducer/PID/pidTOFbeta.cxx index 1079532fe6a..bbd20541015 100644 --- a/Common/TableProducer/PID/pidTOFbeta.cxx +++ b/Common/TableProducer/PID/pidTOFbeta.cxx @@ -15,6 +15,7 @@ /// \brief Task to produce TOF beta and TOF mass tables /// +#include "Common/Core/PID/PIDTOF.h" #include "Common/Core/TableHelper.h" #include "Common/DataModel/PIDResponseTOF.h" @@ -27,7 +28,6 @@ #include #include #include -#include #include #include diff --git a/DPG/Tasks/AOTTrack/PID/TOF/qaPIDTOFDynamic.cxx b/DPG/Tasks/AOTTrack/PID/TOF/qaPIDTOFDynamic.cxx index 67695354168..e526840e19f 100644 --- a/DPG/Tasks/AOTTrack/PID/TOF/qaPIDTOFDynamic.cxx +++ b/DPG/Tasks/AOTTrack/PID/TOF/qaPIDTOFDynamic.cxx @@ -15,6 +15,7 @@ /// \brief Implementation for QA tasks of the TOF PID quantities /// +#include "Common/Core/PID/PIDTOFParamService.h" #include "Common/DataModel/EventSelection.h" #include "Common/DataModel/PIDResponseTOF.h" #include "Common/DataModel/TrackSelectionTables.h" @@ -32,7 +33,6 @@ #include #include #include -#include #include #include diff --git a/DPG/Tasks/AOTTrack/PID/TOF/qaPIDTOFEvTime.cxx b/DPG/Tasks/AOTTrack/PID/TOF/qaPIDTOFEvTime.cxx index c0b4e628fe2..35c33cb64fa 100644 --- a/DPG/Tasks/AOTTrack/PID/TOF/qaPIDTOFEvTime.cxx +++ b/DPG/Tasks/AOTTrack/PID/TOF/qaPIDTOFEvTime.cxx @@ -15,6 +15,7 @@ /// \brief Tasks of the TOF PID quantities for the event times /// +#include "Common/Core/PID/PIDTOF.h" #include "Common/DataModel/EventSelection.h" #include "Common/DataModel/FT0Corrected.h" #include "Common/DataModel/PIDResponseTOF.h" @@ -33,7 +34,6 @@ #include #include #include -#include #include #include diff --git a/DPG/Tasks/TOF/tofOfflineCalib.cxx b/DPG/Tasks/TOF/tofOfflineCalib.cxx index f3b6aed8ab8..1516c438228 100644 --- a/DPG/Tasks/TOF/tofOfflineCalib.cxx +++ b/DPG/Tasks/TOF/tofOfflineCalib.cxx @@ -18,6 +18,7 @@ #include "tofSkimsTableCreator.h" +#include "Common/Core/PID/PIDTOF.h" #include "Common/DataModel/EventSelection.h" #include "Common/DataModel/FT0Corrected.h" #include "Common/DataModel/Multiplicity.h" @@ -37,7 +38,6 @@ #include #include #include -#include #include #include diff --git a/PWGEM/Dilepton/TableProducer/skimmerPrimaryElectron.cxx b/PWGEM/Dilepton/TableProducer/skimmerPrimaryElectron.cxx index 2d96b683fd7..78a104995b3 100644 --- a/PWGEM/Dilepton/TableProducer/skimmerPrimaryElectron.cxx +++ b/PWGEM/Dilepton/TableProducer/skimmerPrimaryElectron.cxx @@ -16,6 +16,7 @@ #include "PWGEM/Dilepton/Utils/MlResponseO2Track.h" #include "PWGEM/Dilepton/Utils/PairUtilities.h" +#include "Common/Core/PID/PIDTOFParamService.h" #include "Common/Core/TableHelper.h" #include "Common/Core/trackUtilities.h" #include "Common/DataModel/CollisionAssociationTables.h" @@ -45,7 +46,6 @@ #include #include #include -#include #include #include diff --git a/PWGEM/Dilepton/TableProducer/skimmerPrimaryElectronSV.cxx b/PWGEM/Dilepton/TableProducer/skimmerPrimaryElectronSV.cxx index d5d1f21543d..49f289588db 100644 --- a/PWGEM/Dilepton/TableProducer/skimmerPrimaryElectronSV.cxx +++ b/PWGEM/Dilepton/TableProducer/skimmerPrimaryElectronSV.cxx @@ -15,6 +15,7 @@ #include "PWGEM/Dilepton/DataModel/dileptonTables.h" #include "PWGEM/Dilepton/Utils/ElectronModule.h" +#include "Common/Core/PID/PIDTOFParamService.h" #include "Common/DataModel/CollisionAssociationTables.h" #include "Common/DataModel/EventSelection.h" #include "Common/DataModel/PIDResponseTOF.h" @@ -33,7 +34,6 @@ #include #include #include -#include #include #include diff --git a/PWGEM/Dilepton/TableProducer/treeCreatorElectronMLDDA.cxx b/PWGEM/Dilepton/TableProducer/treeCreatorElectronMLDDA.cxx index fc0314ea15f..bd787d9846c 100644 --- a/PWGEM/Dilepton/TableProducer/treeCreatorElectronMLDDA.cxx +++ b/PWGEM/Dilepton/TableProducer/treeCreatorElectronMLDDA.cxx @@ -21,6 +21,7 @@ #include "Common/CCDB/RCTSelectionFlags.h" #include "Common/CCDB/ctpRateFetcher.h" #include "Common/Core/CollisionTypeHelper.h" +#include "Common/Core/PID/PIDTOFParamService.h" #include "Common/Core/RecoDecay.h" #include "Common/Core/Zorro.h" #include "Common/Core/trackUtilities.h" @@ -46,7 +47,6 @@ #include #include #include -#include #include #include #include diff --git a/PWGEM/Dilepton/Tasks/taggingHFE.cxx b/PWGEM/Dilepton/Tasks/taggingHFE.cxx index 7ba582fa714..27bf830e4f5 100644 --- a/PWGEM/Dilepton/Tasks/taggingHFE.cxx +++ b/PWGEM/Dilepton/Tasks/taggingHFE.cxx @@ -20,6 +20,7 @@ #include "Common/CCDB/EventSelectionParams.h" #include "Common/CCDB/RCTSelectionFlags.h" +#include "Common/Core/PID/PIDTOFParamService.h" #include "Common/Core/RecoDecay.h" #include "Common/Core/trackUtilities.h" #include "Common/DataModel/Centrality.h" @@ -46,7 +47,6 @@ #include #include #include -#include #include #include #include diff --git a/PWGEM/Dilepton/Utils/ElectronModule.h b/PWGEM/Dilepton/Utils/ElectronModule.h index 75d49877d08..9f9d4a9131e 100644 --- a/PWGEM/Dilepton/Utils/ElectronModule.h +++ b/PWGEM/Dilepton/Utils/ElectronModule.h @@ -22,6 +22,7 @@ #include "PWGEM/Dilepton/Utils/PairUtilities.h" #include "PWGEM/Dilepton/Utils/SemiCharmTag.h" +#include "Common/Core/PID/PIDTOFParamService.h" #include "Common/Core/RecoDecay.h" #include "Common/Core/trackUtilities.h" #include "Tools/ML/MlResponse.h" @@ -37,7 +38,6 @@ #include #include #include -#include #include #include diff --git a/PWGEM/PhotonMeson/TableProducer/skimmerPrimaryElectronFromDalitzEE.cxx b/PWGEM/PhotonMeson/TableProducer/skimmerPrimaryElectronFromDalitzEE.cxx index fb843adc325..57e97892f7c 100644 --- a/PWGEM/PhotonMeson/TableProducer/skimmerPrimaryElectronFromDalitzEE.cxx +++ b/PWGEM/PhotonMeson/TableProducer/skimmerPrimaryElectronFromDalitzEE.cxx @@ -16,6 +16,7 @@ #include "PWGEM/Dilepton/Utils/PairUtilities.h" #include "PWGEM/PhotonMeson/DataModel/gammaTables.h" +#include "Common/Core/PID/PIDTOFParamService.h" #include "Common/DataModel/CollisionAssociationTables.h" #include "Common/DataModel/EventSelection.h" #include "Common/DataModel/PIDResponseTOF.h" @@ -39,7 +40,6 @@ #include #include #include -#include #include #include diff --git a/PWGHF/TableProducer/mcPidTof.cxx b/PWGHF/TableProducer/mcPidTof.cxx index c0c6217607c..2ab5832ff9e 100644 --- a/PWGHF/TableProducer/mcPidTof.cxx +++ b/PWGHF/TableProducer/mcPidTof.cxx @@ -18,6 +18,7 @@ #include "Common/Core/CollisionTypeHelper.h" #include "Common/Core/MetadataHelper.h" +#include "Common/Core/PID/PIDTOF.h" #include "Common/Core/TableHelper.h" #include "Common/DataModel/EventSelection.h" #include "Common/DataModel/FT0Corrected.h" @@ -40,7 +41,6 @@ #include #include #include -#include #include #include diff --git a/PWGLF/TableProducer/Nuspex/hyperkinkRecoTask.cxx b/PWGLF/TableProducer/Nuspex/hyperkinkRecoTask.cxx index cc3be8f90d8..60af4175db1 100644 --- a/PWGLF/TableProducer/Nuspex/hyperkinkRecoTask.cxx +++ b/PWGLF/TableProducer/Nuspex/hyperkinkRecoTask.cxx @@ -20,6 +20,7 @@ #include "Common/CCDB/EventSelectionParams.h" #include "Common/Core/MetadataHelper.h" +#include "Common/Core/PID/PIDTOF.h" #include "Common/Core/RecoDecay.h" #include "Common/Core/trackUtilities.h" #include "Common/DataModel/EventSelection.h" @@ -41,7 +42,6 @@ #include #include #include -#include #include #include diff --git a/PWGLF/TableProducer/Nuspex/pidTOFGeneric.cxx b/PWGLF/TableProducer/Nuspex/pidTOFGeneric.cxx index be61cd4385d..7f9a02892f5 100644 --- a/PWGLF/TableProducer/Nuspex/pidTOFGeneric.cxx +++ b/PWGLF/TableProducer/Nuspex/pidTOFGeneric.cxx @@ -23,6 +23,7 @@ #include "Common/Core/CollisionTypeHelper.h" #include "Common/Core/MetadataHelper.h" +#include "Common/Core/PID/PIDTOF.h" #include "Common/Core/TableHelper.h" #include "Common/DataModel/EventSelection.h" #include "Common/DataModel/FT0Corrected.h" @@ -37,7 +38,6 @@ #include #include #include -#include #include #include diff --git a/PWGLF/TableProducer/Strangeness/strangenesstofpid.cxx b/PWGLF/TableProducer/Strangeness/strangenesstofpid.cxx index 3117a56ced2..83920cfd718 100644 --- a/PWGLF/TableProducer/Strangeness/strangenesstofpid.cxx +++ b/PWGLF/TableProducer/Strangeness/strangenesstofpid.cxx @@ -27,6 +27,7 @@ #include "PWGLF/DataModel/LFStrangenessPIDTables.h" #include "PWGLF/DataModel/LFStrangenessTables.h" +#include "Common/Core/PID/PIDTOFParamService.h" #include "Common/Core/TableHelper.h" #include "Common/DataModel/PIDResponseTOF.h" #include "Common/DataModel/PIDResponseTPC.h" @@ -51,7 +52,6 @@ #include #include #include -#include #include #include #include diff --git a/PWGLF/Tasks/QC/hypertriton3bodyQa.cxx b/PWGLF/Tasks/QC/hypertriton3bodyQa.cxx index e628386ebcb..65ee66c4563 100644 --- a/PWGLF/Tasks/QC/hypertriton3bodyQa.cxx +++ b/PWGLF/Tasks/QC/hypertriton3bodyQa.cxx @@ -18,6 +18,7 @@ #include "Common/CCDB/EventSelectionParams.h" #include "Common/Core/MetadataHelper.h" +#include "Common/Core/PID/PIDTOF.h" #include "Common/Core/RecoDecay.h" #include "Common/DataModel/EventSelection.h" #include "Common/DataModel/PIDResponseTOF.h" @@ -34,7 +35,6 @@ #include #include #include -#include #include #include diff --git a/PWGLF/Utils/nucleiUtils.h b/PWGLF/Utils/nucleiUtils.h index 27b8e3818fc..03dd8cf72f7 100644 --- a/PWGLF/Utils/nucleiUtils.h +++ b/PWGLF/Utils/nucleiUtils.h @@ -13,6 +13,7 @@ #define PWGLF_UTILS_NUCLEIUTILS_H_ #include "Common/CCDB/EventSelectionParams.h" +#include "Common/Core/PID/PIDTOF.h" #include "Common/DataModel/Centrality.h" #include "Common/DataModel/PIDResponseITS.h" @@ -24,7 +25,6 @@ #include #include #include -#include #include #include