From dc10965381be376228fb5b483a69e6583a30d6db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicol=C3=B2=20Jacazio?= Date: Fri, 23 Jan 2026 08:39:49 +0100 Subject: [PATCH] Remove PIDResponse from Tutorials --- Tutorials/OpenData/flowAnalysis.cxx | 19 +++++----- Tutorials/PWGEM/emcclustertutorial.cxx | 36 +++++++++---------- Tutorials/Skimming/DataModel/LFDerived.h | 3 ++ Tutorials/Skimming/spectraNucleiAnalyser.cxx | 14 ++++---- Tutorials/Skimming/spectraNucleiProvider.cxx | 16 +++++---- Tutorials/Skimming/spectraNucleiReference.cxx | 15 ++++---- Tutorials/Skimming/spectraTPCAnalyser.cxx | 15 ++++---- Tutorials/Skimming/spectraTPCProvider.cxx | 16 +++++---- Tutorials/Skimming/spectraTPCReference.cxx | 13 +++---- Tutorials/Skimming/spectraUPCAnalyser.cxx | 15 ++++---- Tutorials/Skimming/spectraUPCProvider.cxx | 16 ++++----- Tutorials/src/pidTpcTof.cxx | 5 +-- 12 files changed, 97 insertions(+), 86 deletions(-) diff --git a/Tutorials/OpenData/flowAnalysis.cxx b/Tutorials/OpenData/flowAnalysis.cxx index dc5e180b300..29190eee67e 100644 --- a/Tutorials/OpenData/flowAnalysis.cxx +++ b/Tutorials/OpenData/flowAnalysis.cxx @@ -15,20 +15,23 @@ /// \author /// \since -#include -#include -#include -#include -#include -#include -#include #include #include +#include #include +#include +#include #include -#include + #include #include +#include +#include +#include +#include + +#include +#include using namespace o2; using namespace o2::framework; diff --git a/Tutorials/PWGEM/emcclustertutorial.cxx b/Tutorials/PWGEM/emcclustertutorial.cxx index a047206e70d..2e2df5912c1 100644 --- a/Tutorials/PWGEM/emcclustertutorial.cxx +++ b/Tutorials/PWGEM/emcclustertutorial.cxx @@ -9,6 +9,23 @@ // granted to it by virtue of its status as an Intergovernmental Organization // or submit itself to any jurisdiction. +#include "PWGJE/DataModel/EMCALClusters.h" + +#include "Common/DataModel/Centrality.h" +#include "Common/DataModel/EventSelection.h" + +#include "CommonDataFormat/InteractionRecord.h" +#include "DataFormatsEMCAL/AnalysisCluster.h" +#include "DataFormatsEMCAL/Cell.h" +#include "DataFormatsEMCAL/Constants.h" +#include "EMCALBase/Geometry.h" +#include "EMCALCalib/BadChannelMap.h" +#include "Framework/ASoA.h" +#include "Framework/AnalysisDataModel.h" +#include "Framework/AnalysisTask.h" +#include "Framework/HistogramRegistry.h" +#include "Framework/runDataProcessing.h" + #include #include #include @@ -17,25 +34,6 @@ #include #include -#include "Framework/runDataProcessing.h" -#include "Framework/AnalysisTask.h" -#include "Framework/AnalysisDataModel.h" -#include "Framework/ASoA.h" -#include "Framework/HistogramRegistry.h" - -#include "Common/DataModel/EventSelection.h" -#include "Common/DataModel/Centrality.h" -#include "Common/DataModel/PIDResponse.h" - -#include "EMCALBase/Geometry.h" -#include "EMCALCalib/BadChannelMap.h" -#include "PWGJE/DataModel/EMCALClusters.h" -#include "DataFormatsEMCAL/Cell.h" -#include "DataFormatsEMCAL/Constants.h" -#include "DataFormatsEMCAL/AnalysisCluster.h" - -#include "CommonDataFormat/InteractionRecord.h" - // \struct ClusterTutorial /// \brief Skeleton task for EMCal cluster tutorial /// \author Florian Jonas , Oak Ridge National Laoratory; Joshua König , Goethe-University Frankfurt; Marvin Hemmer , Goethe-University Frankfurt diff --git a/Tutorials/Skimming/DataModel/LFDerived.h b/Tutorials/Skimming/DataModel/LFDerived.h index c89e0da5323..12d7405a98d 100644 --- a/Tutorials/Skimming/DataModel/LFDerived.h +++ b/Tutorials/Skimming/DataModel/LFDerived.h @@ -13,6 +13,9 @@ #ifndef O2_ANALYSIS_LFDERIVED_H #define O2_ANALYSIS_LFDERIVED_H +#include "Common/DataModel/PIDResponseTOF.h" +#include "Common/DataModel/PIDResponseTPC.h" + #include "Framework/ASoA.h" #include "Framework/AnalysisDataModel.h" diff --git a/Tutorials/Skimming/spectraNucleiAnalyser.cxx b/Tutorials/Skimming/spectraNucleiAnalyser.cxx index f0647db20a9..699905c2f9b 100644 --- a/Tutorials/Skimming/spectraNucleiAnalyser.cxx +++ b/Tutorials/Skimming/spectraNucleiAnalyser.cxx @@ -10,16 +10,16 @@ // or submit itself to any jurisdiction. // O2 includes -#include "ReconstructionDataFormats/Track.h" -#include "Framework/runDataProcessing.h" -#include "Framework/AnalysisTask.h" -#include "Framework/AnalysisDataModel.h" -#include "Framework/ASoAHelpers.h" -#include "Common/DataModel/PIDResponse.h" -#include "Common/DataModel/TrackSelectionTables.h" #include "DataModel/LFDerived.h" +#include "Common/DataModel/TrackSelectionTables.h" + +#include "Framework/ASoAHelpers.h" +#include "Framework/AnalysisDataModel.h" +#include "Framework/AnalysisTask.h" #include "Framework/HistogramRegistry.h" +#include "Framework/runDataProcessing.h" +#include "ReconstructionDataFormats/Track.h" #include diff --git a/Tutorials/Skimming/spectraNucleiProvider.cxx b/Tutorials/Skimming/spectraNucleiProvider.cxx index 7a76882fd7a..76a0bb9dc42 100644 --- a/Tutorials/Skimming/spectraNucleiProvider.cxx +++ b/Tutorials/Skimming/spectraNucleiProvider.cxx @@ -11,16 +11,18 @@ /// \author Nima Zardoshti , CERN // O2 includes -#include "ReconstructionDataFormats/Track.h" -#include "Framework/AnalysisTask.h" -#include "Framework/AnalysisDataModel.h" -#include "Framework/ASoAHelpers.h" -#include "Common/DataModel/PIDResponse.h" -#include "Common/DataModel/TrackSelectionTables.h" -#include "MathUtils/Utils.h" #include "DataModel/LFDerived.h" #include "Common/DataModel/EventSelection.h" +#include "Common/DataModel/PIDResponseTOF.h" +#include "Common/DataModel/PIDResponseTPC.h" +#include "Common/DataModel/TrackSelectionTables.h" + +#include "Framework/ASoAHelpers.h" +#include "Framework/AnalysisDataModel.h" +#include "Framework/AnalysisTask.h" +#include "MathUtils/Utils.h" +#include "ReconstructionDataFormats/Track.h" #include diff --git a/Tutorials/Skimming/spectraNucleiReference.cxx b/Tutorials/Skimming/spectraNucleiReference.cxx index 40535297fef..7d3bf950210 100644 --- a/Tutorials/Skimming/spectraNucleiReference.cxx +++ b/Tutorials/Skimming/spectraNucleiReference.cxx @@ -10,18 +10,17 @@ // or submit itself to any jurisdiction. // O2 includes -#include "ReconstructionDataFormats/Track.h" -#include "Framework/runDataProcessing.h" -#include "Framework/AnalysisTask.h" -#include "Framework/AnalysisDataModel.h" -#include "Framework/ASoAHelpers.h" -#include "Common/DataModel/PIDResponse.h" -#include "Common/DataModel/TrackSelectionTables.h" - #include "Common/DataModel/EventSelection.h" +#include "Common/DataModel/PIDResponseTOF.h" +#include "Common/DataModel/PIDResponseTPC.h" #include "Common/DataModel/TrackSelectionTables.h" +#include "Framework/ASoAHelpers.h" +#include "Framework/AnalysisDataModel.h" +#include "Framework/AnalysisTask.h" #include "Framework/HistogramRegistry.h" +#include "Framework/runDataProcessing.h" +#include "ReconstructionDataFormats/Track.h" #include diff --git a/Tutorials/Skimming/spectraTPCAnalyser.cxx b/Tutorials/Skimming/spectraTPCAnalyser.cxx index 769ad0b885a..348e9d1de7c 100644 --- a/Tutorials/Skimming/spectraTPCAnalyser.cxx +++ b/Tutorials/Skimming/spectraTPCAnalyser.cxx @@ -10,14 +10,15 @@ // or submit itself to any jurisdiction. // O2 includes -#include "ReconstructionDataFormats/Track.h" -#include "Framework/AnalysisTask.h" -#include "Framework/AnalysisDataModel.h" -#include "Framework/ASoAHelpers.h" -#include "Common/DataModel/PIDResponse.h" -#include "Common/DataModel/TrackSelectionTables.h" #include "DataModel/LFDerived.h" +#include "Common/DataModel/TrackSelectionTables.h" + +#include "Framework/ASoAHelpers.h" +#include "Framework/AnalysisDataModel.h" +#include "Framework/AnalysisTask.h" +#include "ReconstructionDataFormats/Track.h" + using namespace o2; using namespace o2::framework; using namespace o2::framework::expressions; @@ -63,7 +64,7 @@ struct TPCSpectraAnalyserTask { histos.fill(HIST(hpt[i]), track.pt()); } - Filter collisionFilter = nabs(aod::collision::posZ) < cfgCutVertex; //collision filters not doing anything now? + Filter collisionFilter = nabs(aod::collision::posZ) < cfgCutVertex; // collision filters not doing anything now? Filter trackFilter = nabs(aod::lftrack::eta) < cfgCutEta; void process(soa::Filtered::iterator const& track) diff --git a/Tutorials/Skimming/spectraTPCProvider.cxx b/Tutorials/Skimming/spectraTPCProvider.cxx index c0bbf087fd3..c79115dd78f 100644 --- a/Tutorials/Skimming/spectraTPCProvider.cxx +++ b/Tutorials/Skimming/spectraTPCProvider.cxx @@ -11,15 +11,17 @@ /// \author Nima Zardoshti , CERN // O2 includes -#include "ReconstructionDataFormats/Track.h" -#include "Framework/AnalysisTask.h" -#include "Framework/AnalysisDataModel.h" -#include "Framework/ASoAHelpers.h" -#include "Common/DataModel/PIDResponse.h" -#include "Common/DataModel/TrackSelectionTables.h" +#include "DataModel/LFDerived.h" + #include "Common/DataModel/EventSelection.h" +#include "Common/DataModel/PIDResponseTPC.h" +#include "Common/DataModel/TrackSelectionTables.h" + +#include "Framework/ASoAHelpers.h" +#include "Framework/AnalysisDataModel.h" +#include "Framework/AnalysisTask.h" #include "MathUtils/Utils.h" -#include "DataModel/LFDerived.h" +#include "ReconstructionDataFormats/Track.h" using namespace o2; using namespace o2::framework; diff --git a/Tutorials/Skimming/spectraTPCReference.cxx b/Tutorials/Skimming/spectraTPCReference.cxx index 5d23fd202dc..6111c5dba92 100644 --- a/Tutorials/Skimming/spectraTPCReference.cxx +++ b/Tutorials/Skimming/spectraTPCReference.cxx @@ -10,13 +10,14 @@ // or submit itself to any jurisdiction. // O2 includes -#include "ReconstructionDataFormats/Track.h" -#include "Framework/AnalysisTask.h" -#include "Framework/AnalysisDataModel.h" -#include "Framework/ASoAHelpers.h" -#include "Common/DataModel/PIDResponse.h" +#include "Common/DataModel/PIDResponseTPC.h" #include "Common/DataModel/TrackSelectionTables.h" +#include "Framework/ASoAHelpers.h" +#include "Framework/AnalysisDataModel.h" +#include "Framework/AnalysisTask.h" +#include "ReconstructionDataFormats/Track.h" + using namespace o2; using namespace o2::framework; using namespace o2::framework::expressions; @@ -47,7 +48,7 @@ struct TPCSpectraReferenceTask { } } - //Defining filters and input + // Defining filters and input Configurable cfgCutVertex{"cfgCutVertex", 10.0f, "Accepted z-vertex range"}; Configurable cfgCutEta{"cfgCutEta", 0.8f, "Eta range for tracks"}; Configurable cfgCutPt{"cfgCutPt", 0.0f, "Pt range for tracks"}; diff --git a/Tutorials/Skimming/spectraUPCAnalyser.cxx b/Tutorials/Skimming/spectraUPCAnalyser.cxx index cdc6c9a0c4b..740a62dc822 100644 --- a/Tutorials/Skimming/spectraUPCAnalyser.cxx +++ b/Tutorials/Skimming/spectraUPCAnalyser.cxx @@ -10,16 +10,17 @@ // or submit itself to any jurisdiction. // O2 includes -#include "ReconstructionDataFormats/Track.h" -#include "Framework/AnalysisTask.h" -#include "Framework/AnalysisDataModel.h" -#include "Framework/ASoAHelpers.h" -#include "Common/DataModel/PIDResponse.h" -#include "Common/DataModel/TrackSelectionTables.h" #include "DataModel/UDDerived.h" -#include "TLorentzVector.h" +#include "Common/DataModel/TrackSelectionTables.h" + +#include "Framework/ASoAHelpers.h" +#include "Framework/AnalysisDataModel.h" +#include "Framework/AnalysisTask.h" #include "Framework/HistogramRegistry.h" +#include "ReconstructionDataFormats/Track.h" + +#include "TLorentzVector.h" using namespace o2; using namespace o2::framework; diff --git a/Tutorials/Skimming/spectraUPCProvider.cxx b/Tutorials/Skimming/spectraUPCProvider.cxx index 053b7437080..8884c09d99b 100644 --- a/Tutorials/Skimming/spectraUPCProvider.cxx +++ b/Tutorials/Skimming/spectraUPCProvider.cxx @@ -10,18 +10,18 @@ // or submit itself to any jurisdiction. /// \author Nima Zardoshti , CERN -#include "Framework/runDataProcessing.h" -#include "Framework/AnalysisTask.h" -#include "Framework/AnalysisDataModel.h" -#include "Framework/ASoAHelpers.h" -#include "Common/DataModel/PIDResponse.h" -#include "ReconstructionDataFormats/Track.h" +#include "DataModel/UDDerived.h" -#include "Common/DataModel/TrackSelectionTables.h" #include "Common/DataModel/EventSelection.h" +#include "Common/DataModel/TrackSelectionTables.h" + +#include "Framework/ASoAHelpers.h" +#include "Framework/AnalysisDataModel.h" +#include "Framework/AnalysisTask.h" +#include "Framework/runDataProcessing.h" +#include "ReconstructionDataFormats/Track.h" #include -#include "DataModel/UDDerived.h" using namespace o2; using namespace o2::aod::evsel; diff --git a/Tutorials/src/pidTpcTof.cxx b/Tutorials/src/pidTpcTof.cxx index 777c09c1920..dab7d9e425c 100644 --- a/Tutorials/src/pidTpcTof.cxx +++ b/Tutorials/src/pidTpcTof.cxx @@ -17,11 +17,12 @@ // O2 includes #include "Framework/AnalysisTask.h" -#include "Framework/runDataProcessing.h" #include "Framework/StaticFor.h" +#include "Framework/runDataProcessing.h" // O2Physics includes -#include "Common/DataModel/PIDResponse.h" +#include "Common/DataModel/PIDResponseTOF.h" +#include "Common/DataModel/PIDResponseTPC.h" using namespace o2; using namespace o2::aod::pidutils;