From b0e771351ae08e2e722914afff108f6fa02dec89 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicol=C3=B2=20Jacazio?= <nicolo.jacazio@cern.ch>
Date: Sun, 2 Nov 2025 16:57:57 +0100
Subject: [PATCH] Clean PIDResponse in PWGUD

---
 PWGUD/TableProducer/tauEventTableProducer.cxx | 16 +++---
 .../twoTracksEventTableProducer.cxx           |  1 -
 PWGUD/Tasks/dgCandAnalyzer.cxx                | 21 ++++----
 PWGUD/Tasks/exclusivePentaquark.cxx           | 16 +++---
 PWGUD/Tasks/exclusivePhi.cxx                  | 18 ++++---
 PWGUD/Tasks/exclusivePhiLeptons.cxx           | 18 ++++---
 PWGUD/Tasks/exclusivePhiLeptonsTrees.cxx      | 18 ++++---
 PWGUD/Tasks/exclusiveRhoTo4Pi.cxx             |  2 -
 PWGUD/Tasks/exclusiveTwoProtons.cxx           | 16 +++---
 PWGUD/Tasks/exclusiveTwoProtonsSG.cxx         | 16 +++---
 PWGUD/Tasks/sgD0Analyzer.cxx                  | 18 ++++---
 PWGUD/Tasks/sgExcUniverse.cxx                 | 16 +++---
 PWGUD/Tasks/sgExclOmega.cxx                   | 18 ++++---
 PWGUD/Tasks/sgExclusivePhi.cxx                | 24 +++++----
 PWGUD/Tasks/sgExclusivePhiITSselections.cxx   | 22 ++++----
 PWGUD/Tasks/sgFITAnalyzer.cxx                 | 18 ++++---
 PWGUD/Tasks/sgFourPiAnalyzer.cxx              | 21 ++++----
 PWGUD/Tasks/sgInclJpsi.cxx                    | 20 +++----
 PWGUD/Tasks/sgPIDAnalyzer.cxx                 | 16 +++---
 PWGUD/Tasks/sgPIDSpectra.cxx                  | 16 +++---
 PWGUD/Tasks/sgPIDSpectraTable.cxx             | 21 ++++----
 PWGUD/Tasks/sgSixPiAnalyzer.cxx               | 20 +++----
 PWGUD/Tasks/sgSpectraAnalyzer.cxx             | 17 +++---
 PWGUD/Tasks/sgTwoPiAnalyzer.cxx               | 20 +++----
 PWGUD/Tasks/sginclusivePhiKstarSD.cxx         |  2 -
 PWGUD/Tasks/upcJpsiCorr.cxx                   | 14 ++---
 PWGUD/Tasks/upcQuarkoniaCentralBarrel.cxx     | 54 +++++++++----------
 PWGUD/Tasks/upcRhoAnalysis.cxx                |  2 -
 PWGUD/Tasks/upcRhoPrimeAnalysis.cxx           |  2 -
 PWGUD/Tasks/upcTauRl.cxx                      | 14 ++---
 PWGUD/Tasks/upcTauTau13topo.cxx               |  2 +-
 31 files changed, 261 insertions(+), 238 deletions(-)

diff --git a/PWGUD/TableProducer/tauEventTableProducer.cxx b/PWGUD/TableProducer/tauEventTableProducer.cxx
index 548d8701689..ec08a426f35 100644
--- a/PWGUD/TableProducer/tauEventTableProducer.cxx
+++ b/PWGUD/TableProducer/tauEventTableProducer.cxx
@@ -17,31 +17,31 @@
 //
 
 // C++ headers
+#include <algorithm>
+#include <random>
 #include <set>
 #include <utility>
-#include <algorithm>
 #include <vector>
-#include <random>
 
 // O2 headers
-#include "Framework/AnalysisTask.h"
 #include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/O2DatabasePDGPlugin.h"
 #include "Framework/runDataProcessing.h"
 
 // O2Physics headers
+#include "PWGUD/Core/SGSelector.h"
+#include "PWGUD/Core/UPCTauCentralBarrelHelperRL.h"
+#include "PWGUD/DataModel/TauEventTables.h"
+#include "PWGUD/DataModel/UDTables.h"
+
 #include "Common/CCDB/EventSelectionParams.h"
 #include "Common/Core/TrackSelection.h"
 #include "Common/Core/TrackSelectionDefaults.h"
 #include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "PWGUD/Core/UPCTauCentralBarrelHelperRL.h"
-#include "PWGUD/DataModel/UDTables.h"
-#include "PWGUD/DataModel/TauEventTables.h"
-#include "PWGUD/Core/SGSelector.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/PWGUD/TableProducer/twoTracksEventTableProducer.cxx b/PWGUD/TableProducer/twoTracksEventTableProducer.cxx
index f132315c403..55e5396df12 100644
--- a/PWGUD/TableProducer/twoTracksEventTableProducer.cxx
+++ b/PWGUD/TableProducer/twoTracksEventTableProducer.cxx
@@ -41,7 +41,6 @@
 #include "Common/Core/TrackSelectionDefaults.h"
 #include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
 
 // ROOT
diff --git a/PWGUD/Tasks/dgCandAnalyzer.cxx b/PWGUD/Tasks/dgCandAnalyzer.cxx
index 93c62c567d5..d7283115434 100644
--- a/PWGUD/Tasks/dgCandAnalyzer.cxx
+++ b/PWGUD/Tasks/dgCandAnalyzer.cxx
@@ -13,20 +13,19 @@
 // \author Paul Buehler, paul.buehler@oeaw.ac.at
 // \since  06.06.2022
 
-#include <set>
-#include <string>
-
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
+#include "PWGUD/Core/DGPIDSelector.h"
+#include "PWGUD/Core/UDGoodRunSelector.h"
+#include "PWGUD/Core/UDHelpers.h"
+#include "PWGUD/DataModel/UDTables.h"
 
 #include "CCDB/BasicCCDBManager.h"
-#include "DataFormatsParameters/GRPLHCIFData.h"
 #include "CommonConstants/LHCConstants.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "PWGUD/DataModel/UDTables.h"
-#include "PWGUD/Core/UDHelpers.h"
-#include "PWGUD/Core/DGPIDSelector.h"
-#include "PWGUD/Core/UDGoodRunSelector.h"
+#include "DataFormatsParameters/GRPLHCIFData.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
+#include <set>
+#include <string>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/PWGUD/Tasks/exclusivePentaquark.cxx b/PWGUD/Tasks/exclusivePentaquark.cxx
index c63dc7fce68..eb5170bb400 100644
--- a/PWGUD/Tasks/exclusivePentaquark.cxx
+++ b/PWGUD/Tasks/exclusivePentaquark.cxx
@@ -8,15 +8,17 @@
 // In applying this license CERN does not waive the privileges and immunities
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include <iostream>
+#include "PWGUD/Core/SGSelector.h"
 #include "PWGUD/DataModel/UDTables.h"
-#include <TString.h>
+
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 #include "TLorentzVector.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "PWGUD/Core/SGSelector.h"
+#include <TString.h>
+
+#include <iostream>
 using std::array;
 using namespace std;
 using namespace o2;
diff --git a/PWGUD/Tasks/exclusivePhi.cxx b/PWGUD/Tasks/exclusivePhi.cxx
index 634d17a5d8e..c0850b4b84d 100644
--- a/PWGUD/Tasks/exclusivePhi.cxx
+++ b/PWGUD/Tasks/exclusivePhi.cxx
@@ -9,15 +9,17 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 //
-#include <vector>
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include <iostream>
 #include "PWGUD/DataModel/UDTables.h"
-#include <TString.h>
+
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 #include "TLorentzVector.h"
-#include "Common/DataModel/PIDResponse.h"
+#include <TString.h>
+
+#include <iostream>
+#include <vector>
 
 using std::array;
 using namespace std;
@@ -648,7 +650,7 @@ struct ExclusivePhi {
         }
       }
     } // Kaon Band
-  }   // end of process
+  } // end of process
 
 }; // end of struct
 
diff --git a/PWGUD/Tasks/exclusivePhiLeptons.cxx b/PWGUD/Tasks/exclusivePhiLeptons.cxx
index b212dd21723..cb2d8834862 100644
--- a/PWGUD/Tasks/exclusivePhiLeptons.cxx
+++ b/PWGUD/Tasks/exclusivePhiLeptons.cxx
@@ -8,16 +8,18 @@
 // In applying this license CERN does not waive the privileges and immunities
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
-#include <vector>
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include <iostream>
+#include "PWGUD/Core/SGSelector.h"
 #include "PWGUD/DataModel/UDTables.h"
-#include <TString.h>
+
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 #include "TLorentzVector.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "PWGUD/Core/SGSelector.h"
+#include <TString.h>
+
+#include <iostream>
+#include <vector>
 using std::array;
 using namespace std;
 using namespace o2;
diff --git a/PWGUD/Tasks/exclusivePhiLeptonsTrees.cxx b/PWGUD/Tasks/exclusivePhiLeptonsTrees.cxx
index 00abada06d4..ecc65174f26 100644
--- a/PWGUD/Tasks/exclusivePhiLeptonsTrees.cxx
+++ b/PWGUD/Tasks/exclusivePhiLeptonsTrees.cxx
@@ -8,16 +8,18 @@
 // In applying this license CERN does not waive the privileges and immunities
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
-#include <vector>
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include <iostream>
+#include "PWGUD/Core/SGSelector.h"
 #include "PWGUD/DataModel/UDTables.h"
-#include <TString.h>
+
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 #include "TLorentzVector.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "PWGUD/Core/SGSelector.h"
+#include <TString.h>
+
+#include <iostream>
+#include <vector>
 using std::array;
 using namespace std;
 using namespace o2;
diff --git a/PWGUD/Tasks/exclusiveRhoTo4Pi.cxx b/PWGUD/Tasks/exclusiveRhoTo4Pi.cxx
index 3c570a4efa3..9162eda8179 100644
--- a/PWGUD/Tasks/exclusiveRhoTo4Pi.cxx
+++ b/PWGUD/Tasks/exclusiveRhoTo4Pi.cxx
@@ -18,8 +18,6 @@
 #include "PWGUD/Core/UDHelpers.h"
 #include "PWGUD/DataModel/UDTables.h"
 
-#include "Common/DataModel/PIDResponse.h"
-
 #include "CommonConstants/PhysicsConstants.h"
 #include "Framework/ASoA.h"
 #include "Framework/ASoAHelpers.h"
diff --git a/PWGUD/Tasks/exclusiveTwoProtons.cxx b/PWGUD/Tasks/exclusiveTwoProtons.cxx
index b7cf9b84004..d22c92cccbc 100644
--- a/PWGUD/Tasks/exclusiveTwoProtons.cxx
+++ b/PWGUD/Tasks/exclusiveTwoProtons.cxx
@@ -8,15 +8,17 @@
 // In applying this license CERN does not waive the privileges and immunities
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include <iostream>
+#include "PWGUD/Core/SGSelector.h"
 #include "PWGUD/DataModel/UDTables.h"
-#include <TString.h>
+
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 #include "TLorentzVector.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "PWGUD/Core/SGSelector.h"
+#include <TString.h>
+
+#include <iostream>
 using std::array;
 using namespace std;
 using namespace o2;
diff --git a/PWGUD/Tasks/exclusiveTwoProtonsSG.cxx b/PWGUD/Tasks/exclusiveTwoProtonsSG.cxx
index 0ac54805c69..521096634e9 100644
--- a/PWGUD/Tasks/exclusiveTwoProtonsSG.cxx
+++ b/PWGUD/Tasks/exclusiveTwoProtonsSG.cxx
@@ -8,15 +8,17 @@
 // In applying this license CERN does not waive the privileges and immunities
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include <iostream>
+#include "PWGUD/Core/SGSelector.h"
 #include "PWGUD/DataModel/UDTables.h"
-#include <TString.h>
+
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 #include "TLorentzVector.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "PWGUD/Core/SGSelector.h"
+#include <TString.h>
+
+#include <iostream>
 using std::array;
 using namespace std;
 using namespace o2;
diff --git a/PWGUD/Tasks/sgD0Analyzer.cxx b/PWGUD/Tasks/sgD0Analyzer.cxx
index 58b01cbe281..7e4c2019434 100644
--- a/PWGUD/Tasks/sgD0Analyzer.cxx
+++ b/PWGUD/Tasks/sgD0Analyzer.cxx
@@ -13,17 +13,19 @@
 // \author Sasha Bylinkin, alexander.bylinkin@gmail.com
 // \since  April 2023
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/O2DatabasePDGPlugin.h"
-#include <iostream>
-#include "PWGUD/DataModel/UDTables.h"
 #include "PWGUD/Core/SGSelector.h"
-#include "Common/DataModel/PIDResponse.h"
 #include "PWGUD/Core/SGTrackSelector.h"
-#include <TString.h>
+#include "PWGUD/DataModel/UDTables.h"
+
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/runDataProcessing.h"
+
 #include "TLorentzVector.h"
+#include <TString.h>
+
+#include <iostream>
 using namespace std;
 using namespace o2;
 using namespace o2::aod;
diff --git a/PWGUD/Tasks/sgExcUniverse.cxx b/PWGUD/Tasks/sgExcUniverse.cxx
index f7dd3691c25..6178d4cb0b0 100644
--- a/PWGUD/Tasks/sgExcUniverse.cxx
+++ b/PWGUD/Tasks/sgExcUniverse.cxx
@@ -13,17 +13,17 @@
 // \author Sasha Bylinkin, alexander.bylinkin@gmail.com
 // \since  April 2023
 
-#include "Framework/runDataProcessing.h"
+#include "PWGUD/Core/SGSelector.h"
+#include "PWGUD/Core/SGTrackSelector.h"
+#include "PWGUD/Core/UDHelpers.h"
+#include "PWGUD/DataModel/UDTables.h"
+
 #include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
-#include "TVector3.h"
-#include "TTree.h"
 #include "TFile.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "PWGUD/DataModel/UDTables.h"
-#include "PWGUD/Core/UDHelpers.h"
-#include "PWGUD/Core/SGSelector.h"
-#include "PWGUD/Core/SGTrackSelector.h"
+#include "TTree.h"
+#include "TVector3.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/PWGUD/Tasks/sgExclOmega.cxx b/PWGUD/Tasks/sgExclOmega.cxx
index 0a816e1dc0e..858b0499caa 100644
--- a/PWGUD/Tasks/sgExclOmega.cxx
+++ b/PWGUD/Tasks/sgExclOmega.cxx
@@ -13,17 +13,19 @@
 // \author Sasha Bylinkin, alexander.bylinkin@gmail.com
 // \since  April 2023
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/O2DatabasePDGPlugin.h"
-#include <iostream>
-#include "PWGUD/DataModel/UDTables.h"
 #include "PWGUD/Core/SGSelector.h"
-#include "Common/DataModel/PIDResponse.h"
 #include "PWGUD/Core/SGTrackSelector.h"
-#include <TString.h>
+#include "PWGUD/DataModel/UDTables.h"
+
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/runDataProcessing.h"
+
 #include "TLorentzVector.h"
+#include <TString.h>
+
+#include <iostream>
 using namespace std;
 using namespace o2;
 using namespace o2::aod;
diff --git a/PWGUD/Tasks/sgExclusivePhi.cxx b/PWGUD/Tasks/sgExclusivePhi.cxx
index df10373e571..c4bed3d1456 100644
--- a/PWGUD/Tasks/sgExclusivePhi.cxx
+++ b/PWGUD/Tasks/sgExclusivePhi.cxx
@@ -9,16 +9,18 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 //
-#include <vector>
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include <iostream>
+#include "PWGUD/Core/SGSelector.h"
 #include "PWGUD/DataModel/UDTables.h"
-#include <TString.h>
+
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 #include "TLorentzVector.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "PWGUD/Core/SGSelector.h"
+#include <TString.h>
+
+#include <iostream>
+#include <vector>
 
 using std::array;
 using namespace std;
@@ -655,7 +657,7 @@ struct sgExclusivePhi {
             }
           }
         } // end of two tracks only loop
-      }   // vertex cut
+      } // vertex cut
 
       if (allTracksAreKaonsBandPID.size() == 2) {
 
@@ -731,8 +733,8 @@ struct sgExclusivePhi {
           }
         }
       } // Kaon Band
-    }   // double gap
-  }     // end of process
+    } // double gap
+  } // end of process
 
 }; // end of struct
 
diff --git a/PWGUD/Tasks/sgExclusivePhiITSselections.cxx b/PWGUD/Tasks/sgExclusivePhiITSselections.cxx
index 2d8bc72c0f6..1e3fe149e59 100644
--- a/PWGUD/Tasks/sgExclusivePhiITSselections.cxx
+++ b/PWGUD/Tasks/sgExclusivePhiITSselections.cxx
@@ -9,16 +9,18 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 //
-#include <vector>
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include <iostream>
+#include "PWGUD/Core/SGSelector.h"
 #include "PWGUD/DataModel/UDTables.h"
-#include <TString.h>
+
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 #include "TLorentzVector.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "PWGUD/Core/SGSelector.h"
+#include <TString.h>
+
+#include <iostream>
+#include <vector>
 
 using std::array;
 using namespace std;
@@ -298,7 +300,7 @@ struct sgExclusivePhiITSselections {
             }
           }
         } // Mass cut
-      }   // end of two tracks only loop
+      } // end of two tracks only loop
 
       if (allTracksAreKaonsBandPID.size() == 2) {
         registry.fill(HIST("hTracksKaons"), allTracksAreKaonsBandPID.size() + 10);
@@ -357,7 +359,7 @@ struct sgExclusivePhiITSselections {
       } // Kaon Band
 
     } // double gap
-  }   // end of process
+  } // end of process
 
   void processSG(UDCollisionsFull::iterator const& collision, udtracksfull const& tracks)
   // process function subscribing to SG data
diff --git a/PWGUD/Tasks/sgFITAnalyzer.cxx b/PWGUD/Tasks/sgFITAnalyzer.cxx
index 73d42421b87..60464ed6cf4 100644
--- a/PWGUD/Tasks/sgFITAnalyzer.cxx
+++ b/PWGUD/Tasks/sgFITAnalyzer.cxx
@@ -13,18 +13,20 @@
 // \author Sasha Bylinkin, alexander.bylinkin@gmail.com
 // \since  April 2023
 
-#include "Framework/runDataProcessing.h"
+#include "PWGUD/Core/SGSelector.h"
+#include "PWGUD/Core/SGTrackSelector.h"
+#include "PWGUD/Core/UDHelpers.h"
+#include "PWGUD/DataModel/UDTables.h"
+
+#include "Common/DataModel/PIDResponseTOF.h"
+
 #include "Framework/AnalysisTask.h"
 #include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/runDataProcessing.h"
 
-#include "TVector3.h"
-#include "TTree.h"
 #include "TFile.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "PWGUD/DataModel/UDTables.h"
-#include "PWGUD/Core/UDHelpers.h"
-#include "PWGUD/Core/SGSelector.h"
-#include "PWGUD/Core/SGTrackSelector.h"
+#include "TTree.h"
+#include "TVector3.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/PWGUD/Tasks/sgFourPiAnalyzer.cxx b/PWGUD/Tasks/sgFourPiAnalyzer.cxx
index 6a6abfc4628..13979d87c38 100644
--- a/PWGUD/Tasks/sgFourPiAnalyzer.cxx
+++ b/PWGUD/Tasks/sgFourPiAnalyzer.cxx
@@ -13,21 +13,24 @@
 // \author Sasha Bylinkin, alexander.bylinkin@gmail.com
 // \since  April 2023
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/O2DatabasePDGPlugin.h"
-#include <iostream>
-#include "PWGUD/DataModel/UDTables.h"
 #include "PWGUD/Core/SGSelector.h"
 #include "PWGUD/Core/SGTrackSelector.h"
-#include "Common/DataModel/PIDResponse.h"
+#include "PWGUD/DataModel/UDTables.h"
+
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "Framework/ASoA.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/DataTypes.h"
+#include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/runDataProcessing.h"
 #include "MathUtils/Utils.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include <TString.h>
+
 #include "TLorentzVector.h"
+#include <TString.h>
+
+#include <iostream>
 using namespace std;
 using namespace o2;
 using namespace o2::aod;
diff --git a/PWGUD/Tasks/sgInclJpsi.cxx b/PWGUD/Tasks/sgInclJpsi.cxx
index f5001af7c10..eba36e3845c 100644
--- a/PWGUD/Tasks/sgInclJpsi.cxx
+++ b/PWGUD/Tasks/sgInclJpsi.cxx
@@ -13,17 +13,19 @@
 // \author Sasha Bylinkin, alexander.bylinkin@gmail.com
 // \since  April 2023
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/O2DatabasePDGPlugin.h"
-#include <iostream>
-#include "PWGUD/DataModel/UDTables.h"
 #include "PWGUD/Core/SGSelector.h"
-#include "Common/DataModel/PIDResponse.h"
 #include "PWGUD/Core/SGTrackSelector.h"
-#include <TString.h>
+#include "PWGUD/DataModel/UDTables.h"
+
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/runDataProcessing.h"
+
 #include "TLorentzVector.h"
+#include <TString.h>
+
+#include <iostream>
 using namespace std;
 using namespace o2;
 using namespace o2::aod;
@@ -297,7 +299,7 @@ struct SGInclJpsi {
             registry.fill(HIST("sss_Ntr_mm_invm_3"), tracks.size(), v01.M(), -1);
             registry.fill(HIST("sss_mm_pt_invm_3"), v01.Pt(), v01.M(), -1);
           }
-      }
+        }
       }
       if (selectionPIDElec(t0, use_tof, nsigmatpc_cut, nsigmatof_cut) && selectionPIDElec(t1, use_tof, nsigmatpc_cut, nsigmatof_cut)) {
         // Apply pion hypothesis and create pairs
diff --git a/PWGUD/Tasks/sgPIDAnalyzer.cxx b/PWGUD/Tasks/sgPIDAnalyzer.cxx
index e4015417971..c3038cee058 100644
--- a/PWGUD/Tasks/sgPIDAnalyzer.cxx
+++ b/PWGUD/Tasks/sgPIDAnalyzer.cxx
@@ -13,19 +13,19 @@
 // \author Sasha Bylinkin, alexander.bylinkin@gmail.com
 // \since  April 2023
 
-#include "Framework/runDataProcessing.h"
+#include "PWGUD/Core/SGSelector.h"
+#include "PWGUD/Core/SGTrackSelector.h"
+#include "PWGUD/Core/UDHelpers.h"
+#include "PWGUD/DataModel/SGTables.h"
+
 #include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
-#include "TVector3.h"
-#include "TTree.h"
 #include "TFile.h"
+#include "TTree.h"
+#include "TVector3.h"
 #include <TH1F.h>
 #include <TH2F.h>
-#include "Common/DataModel/PIDResponse.h"
-#include "PWGUD/DataModel/SGTables.h"
-#include "PWGUD/Core/UDHelpers.h"
-#include "PWGUD/Core/SGSelector.h"
-#include "PWGUD/Core/SGTrackSelector.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/PWGUD/Tasks/sgPIDSpectra.cxx b/PWGUD/Tasks/sgPIDSpectra.cxx
index 7ecea94c66d..2792dee4be2 100644
--- a/PWGUD/Tasks/sgPIDSpectra.cxx
+++ b/PWGUD/Tasks/sgPIDSpectra.cxx
@@ -13,17 +13,17 @@
 // \author Sasha Bylinkin, alexander.bylinkin@gmail.com
 // \since  April 2023
 
-#include "Framework/runDataProcessing.h"
+#include "PWGUD/Core/SGSelector.h"
+#include "PWGUD/Core/SGTrackSelector.h"
+#include "PWGUD/Core/UDHelpers.h"
+#include "PWGUD/DataModel/UDTables.h"
+
 #include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
-#include "TVector3.h"
-#include "TTree.h"
 #include "TFile.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "PWGUD/DataModel/UDTables.h"
-#include "PWGUD/Core/UDHelpers.h"
-#include "PWGUD/Core/SGSelector.h"
-#include "PWGUD/Core/SGTrackSelector.h"
+#include "TTree.h"
+#include "TVector3.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/PWGUD/Tasks/sgPIDSpectraTable.cxx b/PWGUD/Tasks/sgPIDSpectraTable.cxx
index 9a370403a6b..bd781969afc 100644
--- a/PWGUD/Tasks/sgPIDSpectraTable.cxx
+++ b/PWGUD/Tasks/sgPIDSpectraTable.cxx
@@ -12,19 +12,20 @@
 // \Single Gap Event Analyzer
 // \author Sasha Bylinkin, alexander.bylinkin@gmail.com
 // \since  April 2023
-#include <vector>
-#include "Framework/runDataProcessing.h"
+#include "PWGUD/Core/SGSelector.h"
+#include "PWGUD/Core/SGTrackSelector.h"
+#include "PWGUD/Core/UDHelpers.h"
+#include "PWGUD/DataModel/SGTables.h"
+#include "PWGUD/DataModel/UDTables.h"
+
 #include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
-#include "TVector3.h"
-#include "TTree.h"
 #include "TFile.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "PWGUD/DataModel/UDTables.h"
-#include "PWGUD/DataModel/SGTables.h"
-#include "PWGUD/Core/UDHelpers.h"
-#include "PWGUD/Core/SGSelector.h"
-#include "PWGUD/Core/SGTrackSelector.h"
+#include "TTree.h"
+#include "TVector3.h"
+
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/PWGUD/Tasks/sgSixPiAnalyzer.cxx b/PWGUD/Tasks/sgSixPiAnalyzer.cxx
index c3561ad7026..1a3ed6604e2 100644
--- a/PWGUD/Tasks/sgSixPiAnalyzer.cxx
+++ b/PWGUD/Tasks/sgSixPiAnalyzer.cxx
@@ -13,22 +13,24 @@
 // \author Sasha Bylinkin, alexander.bylinkin@gmail.com
 // \since  April 2023
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/O2DatabasePDGPlugin.h"
-#include <iostream>
-#include "PWGUD/DataModel/UDTables.h"
 #include "PWGUD/Core/SGSelector.h"
 #include "PWGUD/Core/SGTrackSelector.h"
-#include "Common/DataModel/PIDResponse.h"
+#include "PWGUD/DataModel/UDTables.h"
+
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "Framework/ASoA.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/DataTypes.h"
+#include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/runDataProcessing.h"
 #include "MathUtils/Utils.h"
-#include "Common/DataModel/TrackSelectionTables.h"
 
-#include <TString.h>
 #include "TLorentzVector.h"
+#include <TString.h>
+
+#include <iostream>
 using namespace std;
 using namespace o2;
 using namespace o2::aod;
diff --git a/PWGUD/Tasks/sgSpectraAnalyzer.cxx b/PWGUD/Tasks/sgSpectraAnalyzer.cxx
index afd766e0992..1d73df42642 100644
--- a/PWGUD/Tasks/sgSpectraAnalyzer.cxx
+++ b/PWGUD/Tasks/sgSpectraAnalyzer.cxx
@@ -13,18 +13,19 @@
 // \author Sasha Bylinkin, alexander.bylinkin@gmail.com
 // \since  April 2023
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
+#include "PWGUD/Core/SGSelector.h"
+#include "PWGUD/Core/SGTrackSelector.h"
+#include "PWGUD/DataModel/UDTables.h"
+
 #include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/runDataProcessing.h"
+
 #include <iostream>
-#include "PWGUD/DataModel/UDTables.h"
-#include "PWGUD/Core/SGSelector.h"
-#include "PWGUD/Core/SGTrackSelector.h"
-//#include "Common/DataModel/PIDResponse.h"
-//#include "PWGUD/Core/RLhelper.h"
-#include <TString.h>
+// #include "PWGUD/Core/RLhelper.h"
 #include "TLorentzVector.h"
+#include <TString.h>
 using namespace std;
 using namespace o2;
 using namespace o2::aod;
diff --git a/PWGUD/Tasks/sgTwoPiAnalyzer.cxx b/PWGUD/Tasks/sgTwoPiAnalyzer.cxx
index e1568bb1838..7a2c8aefc3c 100644
--- a/PWGUD/Tasks/sgTwoPiAnalyzer.cxx
+++ b/PWGUD/Tasks/sgTwoPiAnalyzer.cxx
@@ -13,22 +13,24 @@
 // \author Sasha Bylinkin, alexander.bylinkin@gmail.com
 // \since  April 2023
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/O2DatabasePDGPlugin.h"
-#include <iostream>
-#include "PWGUD/DataModel/UDTables.h"
 #include "PWGUD/Core/SGSelector.h"
 #include "PWGUD/Core/SGTrackSelector.h"
-#include "Common/DataModel/PIDResponse.h"
+#include "PWGUD/DataModel/UDTables.h"
+
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "Framework/ASoA.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/DataTypes.h"
+#include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/runDataProcessing.h"
 #include "MathUtils/Utils.h"
-#include "Common/DataModel/TrackSelectionTables.h"
 
-#include <TString.h>
 #include "TLorentzVector.h"
+#include <TString.h>
+
+#include <iostream>
 using namespace std;
 using namespace o2;
 using namespace o2::aod;
diff --git a/PWGUD/Tasks/sginclusivePhiKstarSD.cxx b/PWGUD/Tasks/sginclusivePhiKstarSD.cxx
index b55dffe4ed3..1800150c1a3 100644
--- a/PWGUD/Tasks/sginclusivePhiKstarSD.cxx
+++ b/PWGUD/Tasks/sginclusivePhiKstarSD.cxx
@@ -19,8 +19,6 @@
 #include "PWGUD/Core/UPCHelpers.h"
 #include "PWGUD/DataModel/UDTables.h"
 
-#include "Common/DataModel/PIDResponse.h"
-
 #include "Framework/ASoA.h"
 #include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
diff --git a/PWGUD/Tasks/upcJpsiCorr.cxx b/PWGUD/Tasks/upcJpsiCorr.cxx
index 8db8746b99d..ad0145dae34 100644
--- a/PWGUD/Tasks/upcJpsiCorr.cxx
+++ b/PWGUD/Tasks/upcJpsiCorr.cxx
@@ -15,22 +15,22 @@
 /// \author Sara Haidlova, sara.haidlova@cern.ch
 /// \since March 2024
 
-#include <vector>
 #include <utility>
+#include <vector>
 
 // O2 headers
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
 #include "CommonConstants/MathConstants.h"
 #include "CommonConstants/PhysicsConstants.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 // O2Physics headers
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/Core/RecoDecay.h"
-#include "PWGUD/DataModel/UDTables.h"
+#include "PWGUD/Core/SGSelector.h"
 #include "PWGUD/Core/UDHelpers.h"
 #include "PWGUD/Core/UPCJpsiCentralBarrelCorrHelper.h"
-#include "PWGUD/Core/SGSelector.h"
+#include "PWGUD/DataModel/UDTables.h"
+
+#include "Common/Core/RecoDecay.h"
 
 // ROOT headers
 #include "TLorentzVector.h"
diff --git a/PWGUD/Tasks/upcQuarkoniaCentralBarrel.cxx b/PWGUD/Tasks/upcQuarkoniaCentralBarrel.cxx
index f195a750fa4..d8ff375d31d 100644
--- a/PWGUD/Tasks/upcQuarkoniaCentralBarrel.cxx
+++ b/PWGUD/Tasks/upcQuarkoniaCentralBarrel.cxx
@@ -30,40 +30,40 @@
 //    david.dobrigkeit.chinellato@cern.ch
 //
 
-#include <Math/Vector4D.h>
-#include <cmath>
-#include <array>
-#include <cstdlib>
-#include <map>
-#include <string>
-#include <vector>
-
-#include <TFile.h>
-#include <TH2F.h>
-#include <TProfile.h>
-#include <TLorentzVector.h>
-#include <TPDGCode.h>
+#include "PWGUD/Core/SGSelector.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/O2DatabasePDGPlugin.h"
-#include "ReconstructionDataFormats/Track.h"
-#include "CCDB/BasicCCDBManager.h"
-#include "CommonConstants/PhysicsConstants.h"
-#include "Common/Core/trackUtilities.h"
 #include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
+#include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "PWGUD/Core/SGSelector.h"
-
+#include "Common/DataModel/TrackSelectionTables.h"
 #include "EventFiltering/Zorro.h"
 #include "EventFiltering/ZorroSummary.h"
 
+#include "CCDB/BasicCCDBManager.h"
+#include "CommonConstants/PhysicsConstants.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
+
+#include <Math/Vector4D.h>
+#include <TFile.h>
+#include <TH2F.h>
+#include <TLorentzVector.h>
+#include <TPDGCode.h>
+#include <TProfile.h>
+
+#include <array>
+#include <cmath>
+#include <cstdlib>
+#include <map>
+#include <string>
+#include <vector>
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/PWGUD/Tasks/upcRhoAnalysis.cxx b/PWGUD/Tasks/upcRhoAnalysis.cxx
index 247cdc27d2e..c4a1db399cc 100644
--- a/PWGUD/Tasks/upcRhoAnalysis.cxx
+++ b/PWGUD/Tasks/upcRhoAnalysis.cxx
@@ -19,8 +19,6 @@
 #include "PWGUD/Core/UPCTauCentralBarrelHelperRL.h"
 #include "PWGUD/DataModel/UDTables.h"
 
-#include "Common/DataModel/PIDResponse.h"
-
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
diff --git a/PWGUD/Tasks/upcRhoPrimeAnalysis.cxx b/PWGUD/Tasks/upcRhoPrimeAnalysis.cxx
index c1ebc114efa..f8f03970ff0 100644
--- a/PWGUD/Tasks/upcRhoPrimeAnalysis.cxx
+++ b/PWGUD/Tasks/upcRhoPrimeAnalysis.cxx
@@ -15,8 +15,6 @@
 #include "PWGUD/Core/UPCTauCentralBarrelHelperRL.h"
 #include "PWGUD/DataModel/UDTables.h"
 
-#include "Common/DataModel/PIDResponse.h"
-
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
diff --git a/PWGUD/Tasks/upcTauRl.cxx b/PWGUD/Tasks/upcTauRl.cxx
index c0684cec14b..78e9f7b48ae 100644
--- a/PWGUD/Tasks/upcTauRl.cxx
+++ b/PWGUD/Tasks/upcTauRl.cxx
@@ -17,30 +17,30 @@
 //
 
 // C++ headers
+#include <algorithm>
+#include <random>
 #include <set>
 #include <utility>
-#include <algorithm>
 #include <vector>
-#include <random>
 
 // O2 headers
-#include "Framework/AnalysisTask.h"
 #include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/O2DatabasePDGPlugin.h"
 #include "Framework/runDataProcessing.h"
 
 // O2Physics headers
+#include "PWGUD/Core/SGSelector.h"
+#include "PWGUD/Core/UPCTauCentralBarrelHelperRL.h"
+#include "PWGUD/DataModel/UDTables.h"
+
 #include "Common/CCDB/EventSelectionParams.h"
 #include "Common/Core/TrackSelection.h"
 #include "Common/Core/TrackSelectionDefaults.h"
 #include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "PWGUD/Core/UPCTauCentralBarrelHelperRL.h"
-#include "PWGUD/DataModel/UDTables.h"
-#include "PWGUD/Core/SGSelector.h"
 
 // ROOT headers
 #include "Math/Vector4D.h"
diff --git a/PWGUD/Tasks/upcTauTau13topo.cxx b/PWGUD/Tasks/upcTauTau13topo.cxx
index 676181f8de0..d2dd61ade0c 100644
--- a/PWGUD/Tasks/upcTauTau13topo.cxx
+++ b/PWGUD/Tasks/upcTauTau13topo.cxx
@@ -35,7 +35,7 @@
 #include "PWGUD/DataModel/UDTables.h"
 
 #include "Common/Core/RecoDecay.h"
-#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/PIDResponseTPC.h"
 // #include <CommonUtils/EnumFlags.h>
 #include "TPDGCode.h"