Skip to content

Commit e4745f9

Browse files
committed
Clean remaining usage of PIDResponse.h
- Using PIDResponseTOF and PIDResponseTPC
1 parent 0b29a89 commit e4745f9

File tree

72 files changed

+306
-309
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

72 files changed

+306
-309
lines changed

Common/DataModel/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ o2physics_add_header_only_library(DataModel
1515
EventSelection.h
1616
FT0Corrected.h
1717
Multiplicity.h
18-
PIDResponse.h
1918
PIDResponseITS.h
2019
PIDResponseTOF.h
2120
PIDResponseTPC.h

Common/DataModel/PIDResponse.h

Lines changed: 0 additions & 45 deletions
This file was deleted.

DPG/Tasks/AOTTrack/qaEventTrack.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@
1717
/// \brief Header file for QA tasks for the track and the event properties.
1818
///
1919

20-
#include "Framework/AnalysisDataModel.h"
21-
#include "Framework/ASoAHelpers.h"
2220
#include "Common/DataModel/TrackSelectionTables.h"
23-
#include "Common/DataModel/PIDResponse.h"
21+
22+
#include "Framework/ASoAHelpers.h"
23+
#include "Framework/AnalysisDataModel.h"
2424

2525
// Output table declaration
2626
namespace o2::aod

DPG/Tasks/AOTTrack/qaEventTrackLiteProducer.cxx

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -19,22 +19,24 @@
1919

2020
#include "qaEventTrack.h"
2121

22-
#include <vector>
22+
#include "Common/Core/TrackSelection.h"
23+
#include "Common/Core/TrackSelectionDefaults.h"
24+
#include "Common/Core/trackUtilities.h"
25+
#include "Common/DataModel/EventSelection.h"
26+
#include "Common/DataModel/McCollisionExtra.h"
27+
#include "Common/DataModel/Multiplicity.h"
28+
#include "Common/DataModel/PIDResponseTOF.h"
29+
#include "Common/DataModel/TrackSelectionTables.h"
2330

24-
#include "TRandom.h"
31+
#include "Framework/AnalysisDataModel.h"
2532
#include "Framework/AnalysisTask.h"
2633
#include "Framework/HistogramRegistry.h"
2734
#include "Framework/runDataProcessing.h"
28-
#include "Framework/AnalysisDataModel.h"
2935
#include "ReconstructionDataFormats/DCA.h"
30-
#include "Common/Core/trackUtilities.h"
31-
#include "Common/DataModel/McCollisionExtra.h"
32-
#include "Common/DataModel/EventSelection.h"
33-
#include "Common/DataModel/TrackSelectionTables.h"
34-
#include "Common/DataModel/Multiplicity.h"
35-
#include "Common/Core/TrackSelection.h"
36-
#include "Common/Core/TrackSelectionDefaults.h"
37-
#include "Common/TableProducer/PID/pidTOFBase.h"
36+
37+
#include "TRandom.h"
38+
39+
#include <vector>
3840

3941
using namespace o2;
4042
using namespace o2::framework;

DPG/Tasks/TOF/tofSkimsTableCreator.h

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,10 @@
1919
#ifndef DPG_TASKS_TOF_TOFSKIMSTABLECREATOR_H_
2020
#define DPG_TASKS_TOF_TOFSKIMSTABLECREATOR_H_
2121

22-
#include "Common/TableProducer/PID/pidTOFBase.h"
23-
#include "Common/DataModel/PIDResponse.h"
2422
#include "Common/DataModel/FT0Corrected.h"
23+
#include "Common/DataModel/PIDResponseTOF.h"
24+
#include "Common/TableProducer/PID/pidTOFBase.h"
25+
2526
#include "Framework/AnalysisDataModel.h"
2627

2728
namespace o2::aod

DPG/Tasks/TPC/tpcSkimsTableCreator.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
#define DPG_TASKS_TPC_TPCSKIMSTABLECREATOR_H_
2222

2323
#include "Common/Core/trackUtilities.h"
24-
#include "Common/DataModel/PIDResponse.h"
2524

2625
#include <Framework/AnalysisDataModel.h>
2726
#include <Framework/AnalysisTask.h>

DPG/Tasks/TPC/tpcTreeCreatorLight.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@
1717
#ifndef DPG_TASKS_TPC_TPCTREECREATORLIGHT_H_
1818
#define DPG_TASKS_TPC_TPCTREECREATORLIGHT_H_
1919

20-
#include "Framework/AnalysisTask.h"
21-
#include "Framework/AnalysisDataModel.h"
2220
#include "Common/Core/trackUtilities.h"
23-
#include "Common/DataModel/PIDResponse.h"
21+
22+
#include "Framework/AnalysisDataModel.h"
23+
#include "Framework/AnalysisTask.h"
2424

2525
enum ParticleSpecies {
2626
kPionTrack = BIT(0),

PWGCF/DataModel/FemtoDerived.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@
1616
#include "PWGHF/DataModel/CandidateSelectionTables.h"
1717

1818
#include "Common/DataModel/Multiplicity.h"
19-
#include "Common/DataModel/PIDResponse.h"
19+
#include "Common/DataModel/PIDResponseTOF.h"
20+
#include "Common/DataModel/PIDResponseTPC.h"
2021
#include "Common/DataModel/TrackSelectionTables.h"
2122

2223
#include "Framework/ASoA.h"

PWGCF/DataModel/SPTableZDC.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
#define PWGCF_DATAMODEL_SPTABLEZDC_H_
1919

2020
#include "Common/Core/RecoDecay.h"
21-
#include "Common/DataModel/PIDResponse.h"
2221
#include "Common/DataModel/TrackSelectionTables.h"
2322

2423
#include "Framework/AnalysisDataModel.h"

PWGCF/Femto3D/Core/femto3dPairTask.h

100755100644
Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,18 +20,18 @@
2020
// #include "Framework/ASoA.h"
2121
// #include "Framework/DataTypes.h"
2222
// #include "Framework/AnalysisDataModel.h"
23-
// #include "Common/DataModel/PIDResponse.h"
2423
// #include "Framework/Logger.h"
2524
// #include "Common/DataModel/Multiplicity.h"
2625

27-
#include <vector>
28-
#include <memory>
26+
#include "CommonConstants/MathConstants.h"
27+
#include "CommonConstants/PhysicsConstants.h"
28+
29+
#include "TDatabasePDG.h"
2930
#include "TLorentzVector.h"
3031
#include "TVector3.h"
31-
#include "TDatabasePDG.h"
3232

33-
#include "CommonConstants/PhysicsConstants.h"
34-
#include "CommonConstants/MathConstants.h"
33+
#include <memory>
34+
#include <vector>
3535

3636
double particle_mass(const int PDGcode)
3737
{

0 commit comments

Comments
 (0)