[PWGLF] Remove PIDResponse from LF

PWGLF/DataModel/EPCalibrationTables.h

@@ -16,18 +16,18 @@
 #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
 {
 DECLARE_SOA_COLUMN(TriggerEventEP, triggereventep, bool);
 DECLARE_SOA_COLUMN(Cent, cent, float);
 DECLARE_SOA_COLUMN(PsiFT0C, psiFT0C, float);
 DECLARE_SOA_COLUMN(PsiFT0A, psiFT0A, float);

PWGLF/DataModel/FilterF1ProtonTables.h

@@ -16,18 +16,18 @@
 #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
 {
 DECLARE_SOA_COLUMN(TriggerEventF1Proton, triggereventf1proton, bool); //! F1 - proton femto trigger event
 }
 DECLARE_SOA_TABLE(F1ProtonFilters, "AOD", "F1ProtonFilters",
                   filtering::TriggerEventF1Proton);

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"
@@ -52,7 +51,7 @@
 
 namespace kshortpionpair
 {
 DECLARE_SOA_INDEX_COLUMN(KShortpionEvent, kshortpionevent);
 DECLARE_SOA_COLUMN(V0Cospa, v0Cospa, float);                       //! V0 Cospa
 DECLARE_SOA_COLUMN(V0Radius, v0Radius, float);                     //! V0 Radius
 DECLARE_SOA_COLUMN(DcaPositive, dcaPositive, float);               //! DCA Positive

PWGLF/DataModel/LFF1Tables.h

@@ -16,21 +16,21 @@
 #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
 namespace f1collision
 {
 DECLARE_SOA_COLUMN(TriggerEventF1, triggereventf1, bool);             //! F1 trigger event
 DECLARE_SOA_COLUMN(TriggerEventF1P, triggereventf1p, bool);           //! F1 - proton trigger event
 DECLARE_SOA_COLUMN(TriggerEventF1PFemto, triggereventf1pfemto, bool); //! F1 - proton femto trigger event
 } // namespace f1collision
 DECLARE_SOA_TABLE(F1Collisions, "AOD", "F1COL",
                   f1collision::TriggerEventF1,

PWGLF/DataModel/LFParticleIdentification.h

@@ -19,25 +19,20 @@
 #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
 {
 DECLARE_SOA_TABLE(pidTPCLfFullEl, "AOD", "pidTPCLfFullEl", //! Table of the TPC (full) response with expected signal, expected resolution and Nsigma for electron
                   o2::soa::Marker<1>,
                   pidtpc::TPCExpSignalEl<pidtpc::TPCNSigmaEl, pidtpc::TPCExpSigmaEl>, pidtpc::TPCExpSignalDiffEl<pidtpc::TPCNSigmaEl, pidtpc::TPCExpSigmaEl>, pidtpc::TPCExpSigmaEl, pidtpc::TPCNSigmaEl);
 DECLARE_SOA_TABLE(pidTPCLfFullMu, "AOD", "pidTPCLfFullMu", //! Table of the TPC (full) response with expected signal, expected resolution and Nsigma for muon
                   o2::soa::Marker<2>,
                   pidtpc::TPCExpSignalMu<pidtpc::TPCNSigmaMu, pidtpc::TPCExpSigmaMu>, pidtpc::TPCExpSignalDiffMu<pidtpc::TPCNSigmaMu, pidtpc::TPCExpSigmaMu>, pidtpc::TPCExpSigmaMu, pidtpc::TPCNSigmaMu);
 DECLARE_SOA_TABLE(pidTPCLfFullPi, "AOD", "pidTPCLfFullPi", //! Table of the TPC (full) response with expected signal, expected resolution and Nsigma for pion
                   o2::soa::Marker<3>,
                   pidtpc::TPCExpSignalPi<pidtpc::TPCNSigmaPi, pidtpc::TPCExpSigmaPi>, pidtpc::TPCExpSignalDiffPi<pidtpc::TPCNSigmaPi, pidtpc::TPCExpSigmaPi>, pidtpc::TPCExpSigmaPi, pidtpc::TPCNSigmaPi);
 DECLARE_SOA_TABLE(pidTPCLfFullKa, "AOD", "pidTPCLfFullKa", //! Table of the TPC (full) response with expected signal, expected resolution and Nsigma for kaon
                   o2::soa::Marker<4>,
                   pidtpc::TPCExpSignalKa<pidtpc::TPCNSigmaKa, pidtpc::TPCExpSigmaKa>, pidtpc::TPCExpSignalDiffKa<pidtpc::TPCNSigmaKa, pidtpc::TPCExpSigmaKa>, pidtpc::TPCExpSigmaKa, pidtpc::TPCNSigmaKa);
 DECLARE_SOA_TABLE(pidTPCLfFullPr, "AOD", "pidTPCLfFullPr", //! Table of the TPC (full) response with expected signal, expected resolution and Nsigma for proton

PWGLF/DataModel/LFResonanceTables.h

@@ -22,15 +22,18 @@
 #ifndef PWGLF_DATAMODEL_LFRESONANCETABLES_H_
 #define PWGLF_DATAMODEL_LFRESONANCETABLES_H_
 
-#include <cmath>
-#include <algorithm>
+#include "PWGLF/DataModel/LFStrangenessTables.h"
 
-#include "Common/DataModel/PIDResponse.h"
 #include "Common/Core/RecoDecay.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponseTOF.h"
+#include "Common/DataModel/PIDResponseTPC.h"
 #include "Common/DataModel/TrackSelectionTables.h"
+
 #include "Framework/AnalysisDataModel.h"
-#include "Common/DataModel/Multiplicity.h"
+
+#include <algorithm>
+#include <cmath>
 
 namespace o2::aod
 {

PWGLF/DataModel/LFSpincorrelationTables.h

@@ -18,7 +18,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/ReducedDoublePhiTables.h

@@ -15,15 +15,15 @@
 #ifndef PWGLF_DATAMODEL_REDUCEDDOUBLEPHITABLES_H_
 #define PWGLF_DATAMODEL_REDUCEDDOUBLEPHITABLES_H_
 
-#include <cmath>
-
+#include "Common/Core/RecoDecay.h"
 #include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/Core/RecoDecay.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "Framework/AnalysisDataModel.h"
+
 #include "Framework/ASoA.h"
+#include "Framework/AnalysisDataModel.h"
+
+#include <cmath>
 
 namespace o2::aod
 {

PWGLF/DataModel/ReducedF1ProtonTables.h

@@ -16,15 +16,15 @@
 #ifndef PWGLF_DATAMODEL_REDUCEDF1PROTONTABLES_H_
 #define PWGLF_DATAMODEL_REDUCEDF1PROTONTABLES_H_
 
-#include <cmath>
-
+#include "Common/Core/RecoDecay.h"
 #include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/Core/RecoDecay.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "Framework/AnalysisDataModel.h"
+
 #include "Framework/ASoA.h"
+#include "Framework/AnalysisDataModel.h"
+
+#include <cmath>
 
 namespace o2::aod
 {

PWGLF/DataModel/ReducedHeptaQuarkTables.h

@@ -15,22 +15,22 @@
 #ifndef PWGLF_DATAMODEL_REDUCEDHEPTAQUARKTABLES_H_
 #define PWGLF_DATAMODEL_REDUCEDHEPTAQUARKTABLES_H_
 
-#include <cmath>
-
+#include "Common/Core/RecoDecay.h"
 #include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/Core/RecoDecay.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "Framework/AnalysisDataModel.h"
+
 #include "Framework/ASoA.h"
+#include "Framework/AnalysisDataModel.h"
+
+#include <cmath>
 
 namespace o2::aod
 {
 namespace redhqevent
 {
-DECLARE_SOA_COLUMN(NumPhi, numPhi, int);       //! Number of negative K
-DECLARE_SOA_COLUMN(NumLambda, numLambda, int); //! Number of lambda
+DECLARE_SOA_COLUMN(NumPhi, numPhi, int);           //! Number of negative K
+DECLARE_SOA_COLUMN(NumLambda, numLambda, int);     //! Number of lambda
 DECLARE_SOA_COLUMN(Centrality, centrality, float); //!
 } // namespace redhqevent
 DECLARE_SOA_TABLE(RedHQEvents, "AOD", "REDHQEVENT",

PWGLF/DataModel/ReducedLambdaLambdaTables.h

@@ -15,15 +15,15 @@
 #ifndef PWGLF_DATAMODEL_REDUCEDLAMBDALAMBDATABLES_H_
 #define PWGLF_DATAMODEL_REDUCEDLAMBDALAMBDATABLES_H_
 
-#include <cmath>
-
+#include "Common/Core/RecoDecay.h"
 #include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/Core/RecoDecay.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "Framework/AnalysisDataModel.h"
+
 #include "Framework/ASoA.h"
+#include "Framework/AnalysisDataModel.h"
+
+#include <cmath>
 
 namespace o2::aod
 {

PWGLF/DataModel/SPCalibrationTables.h

@@ -17,13 +17,13 @@
 #ifndef PWGLF_DATAMODEL_SPCALIBRATIONTABLES_H_
 #define PWGLF_DATAMODEL_SPCALIBRATIONTABLES_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 spcalibrationtable

PWGLF/DataModel/ZDCCalTables.h

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

PWGLF/DataModel/cascqaanalysis.h

@@ -16,17 +16,19 @@
 #ifndef PWGLF_DATAMODEL_CASCQAANALYSIS_H_
 #define PWGLF_DATAMODEL_CASCQAANALYSIS_H_
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Common/DataModel/TrackSelectionTables.h"
 #include "PWGLF/DataModel/LFStrangenessTables.h"
+
+#include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/Centrality.h"
-#include "TRandom.h"
-#include "Math/Vector4D.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 #include "Math/Boost.h"
+#include "Math/Vector4D.h"
+#include "TRandom.h"
 
 namespace o2::aod
 {

PWGLF/DataModel/lambdaJetpolarization.h

@@ -16,17 +16,19 @@
 #ifndef PWGLF_DATAMODEL_LAMBDAJETPOLARIZATION_H_
 #define PWGLF_DATAMODEL_LAMBDAJETPOLARIZATION_H_
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Common/DataModel/TrackSelectionTables.h"
 #include "PWGLF/DataModel/LFStrangenessTables.h"
+
+#include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/Centrality.h"
-#include "TRandom.h"
-#include "Math/Vector4D.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 #include "Math/Boost.h"
+#include "Math/Vector4D.h"
+#include "TRandom.h"
 
 namespace o2::aod
 {

PWGLF/DataModel/spectraTOF.h

@@ -19,27 +19,29 @@
 #ifndef PWGLF_DATAMODEL_SPECTRATOF_H_
 #define PWGLF_DATAMODEL_SPECTRATOF_H_
 
-#include <memory>
+#include "PWGLF/DataModel/LFParticleIdentification.h"
 
-// O2 includes
-#include "ReconstructionDataFormats/Track.h"
-#include "Framework/runDataProcessing.h"
+#include "Common/Core/TrackSelection.h"
+#include "Common/Core/TrackSelectionDefaults.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/FT0Corrected.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponseTOF.h"
+#include "Common/DataModel/PIDResponseTPC.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
-#include "Framework/AnalysisDataModel.h"
 #include "Framework/StaticFor.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/Core/TrackSelection.h"
-#include "Common/DataModel/FT0Corrected.h"
-#include "Common/Core/TrackSelectionDefaults.h"
-#include "PWGLF/DataModel/LFParticleIdentification.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
 
 #include "TPDGCode.h"
 
+#include <memory>
+
 static constexpr o2::track::PID::ID Np = 9;
 static constexpr int NCharges = 2;
 static constexpr o2::track::PID::ID NpCharge = Np * NCharges;

PWGLF/TableProducer/Common/spvector.cxx

@@ -22,6 +22,7 @@
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/FT0Corrected.h"
 #include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponseTPC.h"
 #include "Common/DataModel/Qvectors.h"
 #include "Common/DataModel/TrackSelectionTables.h"
 

PWGLF/TableProducer/Common/zdcvector.cxx

@@ -22,6 +22,7 @@
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/FT0Corrected.h"
 #include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponseTPC.h"
 #include "Common/DataModel/Qvectors.h"
 #include "Common/DataModel/TrackSelectionTables.h"
 

PWGLF/TableProducer/Nuspex/hyperRecoTask.cxx

@@ -24,19 +24,20 @@
 #include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponseTOF.h"
 #include "Common/TableProducer/PID/pidTOFBase.h"
 
 #include "CCDB/BasicCCDBManager.h"
 #include "DCAFitter/DCAFitterN.h"
 #include "DataFormatsParameters/GRPMagField.h"
 #include "DataFormatsParameters/GRPObject.h"
-#include "MathUtils/BetheBlochAleph.h"
 #include "DetectorsBase/GeometryManager.h"
 #include "DetectorsBase/Propagator.h"
 #include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
+#include "MathUtils/BetheBlochAleph.h"
 #include "ReconstructionDataFormats/Track.h"
 
 #include <algorithm>

PWGLF/TableProducer/Strangeness/sigma0builder.cxx

@@ -31,7 +31,6 @@
 #include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
 
 #include "CCDB/BasicCCDBManager.h"
@@ -790,8 +789,8 @@ struct sigma0builder {
     auto const& MCMothersList_v02 = MCParticle_v02.template mothers_as<aod::McParticles>();
 
     if (!MCMothersList_v01.empty() && !MCMothersList_v02.empty()) { // Are there mothers?
-      auto const& MCMother_v01 = MCMothersList_v01.front(); // First mother
-      auto const& MCMother_v02 = MCMothersList_v02.front(); // First mother
+      auto const& MCMother_v01 = MCMothersList_v01.front();         // First mother
+      auto const& MCMother_v02 = MCMothersList_v02.front();         // First mother
 
       if (MCMother_v01.globalIndex() == MCMother_v02.globalIndex()) { // Is it the same mother?
 
@@ -1382,7 +1381,7 @@ struct sigma0builder {
       // Pi0
       if (fillPi0Tables && MCGenInfo.IsPi0) {
         pi0Gens(MCGenInfo.IsProducedByGenerator, MCGenInfo.MCPt, mcParticle.y()); // optional table to store generated pi0 candidates. Be careful, this is a large table!
-        pi0GenCollRefs(MCGenInfo.MCCollId);                       // link to stramccollision table
+        pi0GenCollRefs(MCGenInfo.MCCollId);                                       // link to stramccollision table
       }
 
       // Sigma0/ASigma0