[Common,DPG,Tutorial,PWGCF,PWGDQ,PWGEM,PWGLF,PWGUD] Clean remaining usage of PIDResponse.h

Common/DataModel/CMakeLists.txt

@@ -15,7 +15,6 @@ o2physics_add_header_only_library(DataModel
                                           EventSelection.h
                                           FT0Corrected.h
                                           Multiplicity.h
-                                          PIDResponse.h
                                           PIDResponseITS.h
                                           PIDResponseTOF.h
                                           PIDResponseTPC.h

DPG/Tasks/AOTTrack/qaEventTrack.h

@@ -17,10 +17,10 @@
 /// \brief  Header file for QA tasks for the track and the event properties.
 ///
 
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/PIDResponse.h"
+
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
 
 // Output table declaration
 namespace o2::aod
@@ -28,7 +28,7 @@
 
 namespace dpgcollision
 {
 DECLARE_SOA_INDEX_COLUMN(BC, bc);
 DECLARE_SOA_COLUMN(IsEventReject, isEventReject, int);
 DECLARE_SOA_COLUMN(IsEventSelected, isEventSelected, int);
 DECLARE_SOA_COLUMN(RunNumber, runNumber, int);
@@ -46,8 +46,8 @@
 DECLARE_SOA_COLUMN(PosYMC, posYMC, float);
 DECLARE_SOA_COLUMN(PosZMC, posZMC, float);
 DECLARE_SOA_COLUMN(CollisionTimeMC, collisionTimeMC, float);
 DECLARE_SOA_COLUMN(RecoPVsPerMcColl, recoPVsPerMcColls, int);                       // from LF MCcollisionExtra
 DECLARE_SOA_COLUMN(IsPvHighestContribForMcColl, IsPvHighestContribForMcColls, int); // from LF MCcollisionExtra
 DECLARE_SOA_COLUMN(DpgCounterCollision, dpgCounterCollision, int);
 DECLARE_SOA_COLUMN(DpgCounterDF, dpgCounterDF, int);
 DECLARE_SOA_COLUMN(IsFakeCollision, isFakeCollision, int);
@@ -97,7 +97,7 @@
 
 namespace dpgtrack
 {
 DECLARE_SOA_INDEX_COLUMN(DPGCollision, dpgCollision);                                    //! Index to move from track to collision
 DECLARE_SOA_COLUMN(Pt, pt, float);                                                       //! Pt
 DECLARE_SOA_COLUMN(Eta, eta, float);                                                     //! Eta
 DECLARE_SOA_COLUMN(Phi, phi, float);                                                     //! Phi
@@ -107,11 +107,11 @@
 DECLARE_SOA_COLUMN(HasTPC, hasTPC, bool);                                                //! Track has the TPC
 DECLARE_SOA_COLUMN(HasTRD, hasTRD, bool);                                                //! Track has the TRD
 DECLARE_SOA_COLUMN(HasTOF, hasTOF, bool);                                                //! Track has the TOF
 DECLARE_SOA_COLUMN(TPCNClsFound, tpcNClsFound, int16_t);                                 //! Clusters found in TPC
 DECLARE_SOA_COLUMN(TPCNClsCrossedRows, tpcNClsCrossedRows, int16_t);                     //! Crossed rows found in TPC
 DECLARE_SOA_COLUMN(TPCCrossedRowsOverFindableCls, tpcCrossedRowsOverFindableCls, float); //! Crossed rows over findable clusters in TPC
 DECLARE_SOA_COLUMN(TPCFoundOverFindableCls, tpcFoundOverFindableCls, float);             //! Found over findable clusters in TPC
 DECLARE_SOA_COLUMN(TPCFractionSharedCls, tpcFractionSharedCls, float);                   //! Fraction of shared clusters in TPC
 DECLARE_SOA_COLUMN(ITSNCls, itsNCls, uint8_t);                                           //! Clusters found in ITS
 DECLARE_SOA_COLUMN(ITSNClsInnerBarrel, itsNClsInnerBarrel, uint8_t);                     //! Clusters found in the inner barrel of the ITS
 DECLARE_SOA_COLUMN(TOFSignal, tofSignal, float);                                         //! TOF Signal (Ev. Time subtracted)
@@ -143,7 +143,7 @@
 DECLARE_SOA_DYNAMIC_COLUMN(IsFromWeakDecay, isFromWeakDecay, //! True if particle is considered from a weak decay
                            [](int mode) -> bool { return mode == 1; });
 DECLARE_SOA_DYNAMIC_COLUMN(IsFromMaterial, isFromMaterial, //! True if particle is considered from a weak decay
                            [](int mode) -> bool { return mode == 2; });
 
 } // namespace dpgparticles
 

DPG/Tasks/AOTTrack/qaEventTrackLiteProducer.cxx

@@ -19,22 +19,24 @@
 
 #include "qaEventTrack.h"
 
-#include <vector>
+#include "Common/Core/TrackSelection.h"
+#include "Common/Core/TrackSelectionDefaults.h"
+#include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/McCollisionExtra.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponseTOF.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 
-#include "TRandom.h"
+#include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisDataModel.h"
 #include "ReconstructionDataFormats/DCA.h"
-#include "Common/Core/trackUtilities.h"
-#include "Common/DataModel/McCollisionExtra.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/Core/TrackSelection.h"
-#include "Common/Core/TrackSelectionDefaults.h"
-#include "Common/TableProducer/PID/pidTOFBase.h"
+
+#include "TRandom.h"
+
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;

DPG/Tasks/TOF/tofSkimsTableCreator.h

@@ -19,9 +19,10 @@
 #ifndef DPG_TASKS_TOF_TOFSKIMSTABLECREATOR_H_
 #define DPG_TASKS_TOF_TOFSKIMSTABLECREATOR_H_
 
-#include "Common/TableProducer/PID/pidTOFBase.h"
-#include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/FT0Corrected.h"
+#include "Common/DataModel/PIDResponseTOF.h"
+#include "Common/TableProducer/PID/pidTOFBase.h"
+
 #include "Framework/AnalysisDataModel.h"
 
 namespace o2::aod

DPG/Tasks/TPC/tpcSkimsTableCreator.h

@@ -20,6 +20,7 @@
 #ifndef DPG_TASKS_TPC_TPCSKIMSTABLECREATOR_H_
 #define DPG_TASKS_TPC_TPCSKIMSTABLECREATOR_H_
 
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/OccupancyTables.h"
 
 #include <Framework/AnalysisDataModel.h>

DPG/Tasks/TPC/tpcTreeCreatorLight.h

@@ -17,10 +17,10 @@
 #ifndef DPG_TASKS_TPC_TPCTREECREATORLIGHT_H_
 #define DPG_TASKS_TPC_TPCTREECREATORLIGHT_H_
 
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
 #include "Common/Core/trackUtilities.h"
-#include "Common/DataModel/PIDResponse.h"
+
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 
 enum ParticleSpecies {
   kPionTrack = BIT(0),

PWGCF/DataModel/FemtoDerived.h

@@ -16,7 +16,8 @@
 #include "PWGHF/DataModel/CandidateSelectionTables.h"
 
 #include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/PIDResponseTOF.h"
+#include "Common/DataModel/PIDResponseTPC.h"
 #include "Common/DataModel/TrackSelectionTables.h"
 
 #include "Framework/ASoA.h"

PWGCF/DataModel/SPTableZDC.h

@@ -18,7 +18,6 @@
 #define PWGCF_DATAMODEL_SPTABLEZDC_H_
 
 #include "Common/Core/RecoDecay.h"
-#include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
 
 #include "Framework/AnalysisDataModel.h"

PWGCF/Femto3D/Core/femto3dPairTask.h

@@ -20,18 +20,18 @@
 // #include "Framework/ASoA.h"
 // #include "Framework/DataTypes.h"
 // #include "Framework/AnalysisDataModel.h"
-// #include "Common/DataModel/PIDResponse.h"
 // #include "Framework/Logger.h"
 // #include "Common/DataModel/Multiplicity.h"
 
-#include <vector>
-#include <memory>
+#include "CommonConstants/MathConstants.h"
+#include "CommonConstants/PhysicsConstants.h"
+
+#include "TDatabasePDG.h"
 #include "TLorentzVector.h"
 #include "TVector3.h"
-#include "TDatabasePDG.h"
 
-#include "CommonConstants/PhysicsConstants.h"
-#include "CommonConstants/MathConstants.h"
+#include <memory>
+#include <vector>
 
 double particle_mass(const int PDGcode)
 {

PWGCF/Femto3D/DataModel/PIDutils.h

@@ -19,10 +19,12 @@
 #ifndef PWGCF_FEMTO3D_DATAMODEL_PIDUTILS_H_
 #define PWGCF_FEMTO3D_DATAMODEL_PIDUTILS_H_
 
+#include "Common/DataModel/PIDResponseTOF.h"
+#include "Common/DataModel/PIDResponseTPC.h"
+
 #include <type_traits>
 #include <utility>
 #include <vector>
-#include "Common/DataModel/PIDResponse.h"
 
 namespace o2::aod::singletrackselector
 {

PWGCF/Femto3D/DataModel/singletrackselector.h

@@ -17,16 +17,17 @@
 #define PWGCF_FEMTO3D_DATAMODEL_SINGLETRACKSELECTOR_H_
 
 // #include <experimental/type_traits>
-#include <utility>
-#include <vector>
+#include "PWGCF/Femto3D/DataModel/PIDutils.h"
+
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponseITS.h"
 
 #include "Framework/ASoA.h"
 #include "Framework/AnalysisDataModel.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/DataModel/PIDResponseITS.h"
 #include "Framework/Logger.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "PWGCF/Femto3D/DataModel/PIDutils.h"
+
+#include <utility>
+#include <vector>
 
 namespace o2::aod
 {

PWGCF/FemtoDream/Core/femtoDreamTrackSelection.h

@@ -22,7 +22,6 @@
 
 #include "Common/Core/TrackSelection.h"
 #include "Common/Core/TrackSelectionDefaults.h"
-#include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/PIDResponseITS.h"
 #include "Common/DataModel/TrackSelectionTables.h"
 

PWGCF/FemtoUniverse/Core/FemtoUniverseTrackSelection.h

@@ -23,6 +23,8 @@
 
 #include "Common/Core/TrackSelection.h"
 #include "Common/Core/TrackSelectionDefaults.h"
+#include "Common/DataModel/PIDResponseTOF.h"
+#include "Common/DataModel/PIDResponseTPC.h"
 #include "Common/DataModel/TrackSelectionTables.h"
 
 #include "Framework/HistogramRegistry.h"

PWGCF/FemtoUniverse/DataModel/FemtoDerived.h

@@ -17,7 +17,8 @@
 #define PWGCF_FEMTOUNIVERSE_DATAMODEL_FEMTODERIVED_H_
 
 #include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/PIDResponseTOF.h"
+#include "Common/DataModel/PIDResponseTPC.h"
 #include "Common/DataModel/TrackSelectionTables.h"
 
 #include "Framework/ASoA.h"

PWGCF/FemtoWorld/Core/FemtoWorldTrackSelection.h

@@ -18,14 +18,18 @@
 #ifndef FEMTOWORLDTRACKSELECTION_H_
 #define FEMTOWORLDTRACKSELECTION_H_
 
+#include "PWGCF/FemtoWorld/Core/FemtoWorldObjectSelection.h"
 #include "PWGCF/FemtoWorld/DataModel/FemtoWorldDerived.h"
-#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "Common/Core/TrackSelection.h"
 #include "Common/Core/TrackSelectionDefaults.h"
-#include "PWGCF/FemtoWorld/Core/FemtoWorldObjectSelection.h"
+#include "Common/DataModel/PIDResponseTOF.h"
+#include "Common/DataModel/PIDResponseTPC.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 
-#include "ReconstructionDataFormats/PID.h"
 #include "Framework/HistogramRegistry.h"
+#include "ReconstructionDataFormats/PID.h"
+
 #include <cmath>
 #include <iostream>
 
@@ -278,7 +282,7 @@ class FemtoWorldTrackSelection : public FemtoWorldObjectSelection<float, femtoWo
                                                                           "Maximal DCA_z (cm)",
                                                                           "Minimal DCA (cm)",
                                                                           "Maximal PID (nSigma)"}; ///< Helper information for the different selections
-};                                                                                                 // namespace femtoWorld
+}; // namespace femtoWorld
 
 template <o2::aod::femtoworldparticle::ParticleType part, o2::aod::femtoworldparticle::TrackType tracktype, typename cutContainerType>
 void FemtoWorldTrackSelection::init(HistogramRegistry* registry)

PWGCF/FemtoWorld/DataModel/FemtoWorldDerived.h

@@ -12,16 +12,19 @@
 #ifndef PWGCF_FEMTOWORLD_DATAMODEL_FEMTOWORLDDERIVED_H_
 #define PWGCF_FEMTOWORLD_DATAMODEL_FEMTOWORLDDERIVED_H_
 
-#include <cmath>
-#include "Framework/ASoA.h"
-#include "MathUtils/Utils.h"
-#include "Framework/DataTypes.h"
+#include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponseTOF.h"
+#include "Common/DataModel/PIDResponseTPC.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "Framework/ASoA.h"
 #include "Framework/AnalysisDataModel.h"
+#include "Framework/DataTypes.h"
 #include "Framework/Expressions.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/DataModel/Centrality.h"
+#include "MathUtils/Utils.h"
+
+#include <cmath>
 
 namespace o2::aod
 {

PWGDQ/DataModel/ReducedInfoTables.h

@@ -20,7 +20,6 @@
 #include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/Qvectors.h"
 
 #include "Framework/ASoA.h"

PWGLF/DataModel/EPCalibrationTables.h

@@ -16,13 +16,13 @@
 #ifndef PWGLF_DATAMODEL_EPCALIBRATIONTABLES_H_
 #define PWGLF_DATAMODEL_EPCALIBRATIONTABLES_H_
 
-#include <cmath>
-
-#include "Common/DataModel/PIDResponse.h"
 #include "Common/Core/RecoDecay.h"
 #include "Common/DataModel/TrackSelectionTables.h"
+
 #include "Framework/AnalysisDataModel.h"
 
+#include <cmath>
+
 namespace o2::aod
 {
 namespace epcalibrationtable

PWGLF/DataModel/FilterF1ProtonTables.h

@@ -16,13 +16,13 @@
 #ifndef PWGLF_DATAMODEL_FILTERF1PROTONTABLES_H_
 #define PWGLF_DATAMODEL_FILTERF1PROTONTABLES_H_
 
-#include <cmath>
-
-#include "Common/DataModel/PIDResponse.h"
 #include "Common/Core/RecoDecay.h"
 #include "Common/DataModel/TrackSelectionTables.h"
+
 #include "Framework/AnalysisDataModel.h"
 
+#include <cmath>
+
 namespace o2::aod
 {
 namespace filtering

PWGLF/DataModel/LFCKSSpinalignmentTables.h

@@ -20,7 +20,6 @@
 #include "Common/Core/RecoDecay.h"
 #include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
 
 #include "Framework/ASoA.h"

PWGLF/DataModel/LFF1Tables.h

@@ -16,13 +16,13 @@
 #ifndef PWGLF_DATAMODEL_LFF1TABLES_H_
 #define PWGLF_DATAMODEL_LFF1TABLES_H_
 
-#include <cmath>
-
-#include "Common/DataModel/PIDResponse.h"
 #include "Common/Core/RecoDecay.h"
 #include "Common/DataModel/TrackSelectionTables.h"
+
 #include "Framework/AnalysisDataModel.h"
 
+#include <cmath>
+
 namespace o2::aod
 {
 /// F1 Collisions

PWGLF/DataModel/LFParticleIdentification.h

@@ -19,12 +19,7 @@
 #ifndef PWGLF_DATAMODEL_LFPARTICLEIDENTIFICATION_H_
 #define PWGLF_DATAMODEL_LFPARTICLEIDENTIFICATION_H_
 
-// O2 includes
-#include "Framework/ASoA.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "ReconstructionDataFormats/PID.h"
-#include "Framework/Logger.h"
+#include "Common/DataModel/PIDResponseTPC.h"
 
 namespace o2::aod
 {