From 03008c961900137388df99269dc9e8b56ecdafbe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicol=C3=B2=20Jacazio?= <nicolo.jacazio@cern.ch>
Date: Fri, 23 Jan 2026 08:26:38 +0100
Subject: [PATCH] Remove PIDResponse from CF

---
 PWGCF/DataModel/FemtoDerived.h                  |  3 ++-
 PWGCF/DataModel/SPTableZDC.h                    |  1 -
 PWGCF/Femto3D/Core/femto3dPairTask.h            | 12 ++++++------
 PWGCF/Femto3D/DataModel/PIDutils.h              |  4 +++-
 PWGCF/Femto3D/DataModel/singletrackselector.h   | 13 +++++++------
 .../FemtoDream/Core/femtoDreamTrackSelection.h  |  1 -
 .../Core/FemtoUniverseTrackSelection.h          |  2 ++
 PWGCF/FemtoUniverse/DataModel/FemtoDerived.h    |  3 ++-
 .../FemtoWorld/Core/FemtoWorldTrackSelection.h  | 12 ++++++++----
 PWGCF/FemtoWorld/DataModel/FemtoWorldDerived.h  | 17 ++++++++++-------
 10 files changed, 40 insertions(+), 28 deletions(-)
 mode change 100755 => 100644 PWGCF/Femto3D/Core/femto3dPairTask.h

diff --git a/PWGCF/DataModel/FemtoDerived.h b/PWGCF/DataModel/FemtoDerived.h
index 2c6999853d4..16e52a2e262 100644
--- a/PWGCF/DataModel/FemtoDerived.h
+++ b/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"
diff --git a/PWGCF/DataModel/SPTableZDC.h b/PWGCF/DataModel/SPTableZDC.h
index 6e732ee562e..1410b038e4f 100644
--- a/PWGCF/DataModel/SPTableZDC.h
+++ b/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"
diff --git a/PWGCF/Femto3D/Core/femto3dPairTask.h b/PWGCF/Femto3D/Core/femto3dPairTask.h
old mode 100755
new mode 100644
index db5949f4ae0..1fd450ac28b
--- a/PWGCF/Femto3D/Core/femto3dPairTask.h
+++ b/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)
 {
diff --git a/PWGCF/Femto3D/DataModel/PIDutils.h b/PWGCF/Femto3D/DataModel/PIDutils.h
index 9e28f7b5863..74a3b7ef15a 100644
--- a/PWGCF/Femto3D/DataModel/PIDutils.h
+++ b/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
 {
diff --git a/PWGCF/Femto3D/DataModel/singletrackselector.h b/PWGCF/Femto3D/DataModel/singletrackselector.h
index d7f4f0822d3..cce33ef19aa 100644
--- a/PWGCF/Femto3D/DataModel/singletrackselector.h
+++ b/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
 {
diff --git a/PWGCF/FemtoDream/Core/femtoDreamTrackSelection.h b/PWGCF/FemtoDream/Core/femtoDreamTrackSelection.h
index b0041a2e12d..5c9780d2e82 100644
--- a/PWGCF/FemtoDream/Core/femtoDreamTrackSelection.h
+++ b/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"
 
diff --git a/PWGCF/FemtoUniverse/Core/FemtoUniverseTrackSelection.h b/PWGCF/FemtoUniverse/Core/FemtoUniverseTrackSelection.h
index 51c711c8165..3aee759b29b 100644
--- a/PWGCF/FemtoUniverse/Core/FemtoUniverseTrackSelection.h
+++ b/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"
diff --git a/PWGCF/FemtoUniverse/DataModel/FemtoDerived.h b/PWGCF/FemtoUniverse/DataModel/FemtoDerived.h
index 4fe562d7fef..c9b158ce1b5 100644
--- a/PWGCF/FemtoUniverse/DataModel/FemtoDerived.h
+++ b/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"
diff --git a/PWGCF/FemtoWorld/Core/FemtoWorldTrackSelection.h b/PWGCF/FemtoWorld/Core/FemtoWorldTrackSelection.h
index 1853be4bd3c..22869bde36f 100644
--- a/PWGCF/FemtoWorld/Core/FemtoWorldTrackSelection.h
+++ b/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)
diff --git a/PWGCF/FemtoWorld/DataModel/FemtoWorldDerived.h b/PWGCF/FemtoWorld/DataModel/FemtoWorldDerived.h
index d112f11c2ab..923729d7e84 100644
--- a/PWGCF/FemtoWorld/DataModel/FemtoWorldDerived.h
+++ b/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
 {