[PWGCF] Remove PIDResponse from CF

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"
@@ -49,9 +50,9 @@
 
 using BitMaskType = uint32_t; //! Definition of the data type for the collision masks
 
 DECLARE_SOA_COLUMN(BitMaskTrackOne, bitmaskTrackOne, BitMaskType);     //! Bit for track one
 DECLARE_SOA_COLUMN(BitMaskTrackTwo, bitmaskTrackTwo, BitMaskType);     //! Bit for track two
 DECLARE_SOA_COLUMN(BitMaskTrackThree, bitmaskTrackThree, BitMaskType); //! Bit for track three
 
 DECLARE_SOA_COLUMN(Downsample, downsample, bool); //! Flag for downsampling
 
@@ -96,7 +97,7 @@
 
 namespace mcfdcolllabel
 {
 DECLARE_SOA_INDEX_COLUMN(FDMCCollision, fdMCCollision); //! MC collision for femtodreamcollision
 }
 DECLARE_SOA_TABLE_STAGED(FDMCCollLabels, "FDMCCollLabel", mcfdcolllabel::FDMCCollisionId);
 
@@ -158,13 +159,13 @@
 
 static constexpr std::string_view TrackTypeName[kNTrackTypes] = {"Trk", "Pos", "Neg", "Bach"}; //! Naming of the different particle types
 
 DECLARE_SOA_INDEX_COLUMN(FDCollision, fdCollision);
 DECLARE_SOA_COLUMN(Pt, pt, float);                       //! p_T (GeV/c)
 DECLARE_SOA_COLUMN(Eta, eta, float);                     //! Eta
 DECLARE_SOA_COLUMN(Phi, phi, float);                     //! Phi
 DECLARE_SOA_COLUMN(PartType, partType, uint8_t);         //! Type of the particle, according to femtodreamparticle::ParticleType
 DECLARE_SOA_COLUMN(Cut, cut, cutContainerType);          //! Bit-wise container for the different selection criteria
 DECLARE_SOA_COLUMN(PIDCut, pidcut, cutContainerType);    //! Bit-wise container for the different PID selection criteria \todo since bit-masking cannot be done yet with filters we use a second field for the PID
 DECLARE_SOA_COLUMN(TempFitVar, tempFitVar, float);       //! Observable for the template fitting (Track: DCA_xy, V0: CPA)
 DECLARE_SOA_SELF_ARRAY_INDEX_COLUMN(Children, children); //! Field for the track indices to remove auto-correlations
 DECLARE_SOA_COLUMN(MLambda, mLambda, float);             //! The invariant mass of V0 candidate, assuming lambda
@@ -192,10 +193,10 @@
                            });
 // debug variables
 DECLARE_SOA_COLUMN(Sign, sign, int8_t);                                                  //! Sign of the track charge
 DECLARE_SOA_COLUMN(TPCNClsFound, tpcNClsFound, uint8_t);                                 //! Number of TPC clusters
 DECLARE_SOA_COLUMN(TPCNClsCrossedRows, tpcNClsCrossedRows, uint8_t);                     //! Number of TPC crossed rows
 DECLARE_SOA_COLUMN(ITSNCls, itsNCls, uint8_t);                                           //! Number of ITS clusters
 DECLARE_SOA_COLUMN(ITSNClsInnerBarrel, itsNClsInnerBarrel, uint8_t);                     //! Number of ITS clusters in the inner barrel                             //! TPC signal
 DECLARE_SOA_DYNAMIC_COLUMN(TPCCrossedRowsOverFindableCls, tpcCrossedRowsOverFindableCls, //! Compute the number of crossed rows over findable TPC clusters
                            [](uint8_t tpcNClsFindable, uint8_t tpcNClsCrossedRows) -> float {
                              return (float)tpcNClsCrossedRows / (float)tpcNClsFindable;

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
 {