Skip to content

Commit f7aba7d

Browse files
njacazionjacazio
committed
Clean PIDResponse
1 parent 0b29a89 commit f7aba7d

File tree

65 files changed

+185
-238
lines changed

Some content is hidden

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

65 files changed

+185
-238
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: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
#include "Framework/AnalysisDataModel.h"
2121
#include "Framework/ASoAHelpers.h"
2222
#include "Common/DataModel/TrackSelectionTables.h"
23-
#include "Common/DataModel/PIDResponse.h"
2423

2524
// Output table declaration
2625
namespace o2::aod
@@ -164,4 +163,4 @@ DECLARE_SOA_TABLE(DPGNonRecoParticles, "AOD", "DPGNonRecoPart", //! Table of the
164163
dpgparticles::IsFromWeakDecay<dpgparticles::ProductionMode>,
165164
dpgparticles::IsFromMaterial<dpgparticles::ProductionMode>,
166165
mcparticle::Vx, mcparticle::Vy, mcparticle::Vz);
167-
} // namespace o2::aod
166+
} // namespace o2::aod

‎DPG/Tasks/TOF/tofSkimsTableCreator.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
#define DPG_TASKS_TOF_TOFSKIMSTABLECREATOR_H_
2121

2222
#include "Common/TableProducer/PID/pidTOFBase.h"
23-
#include "Common/DataModel/PIDResponse.h"
23+
#include "Common/DataModel/PIDResponseTOF.h"
2424
#include "Common/DataModel/FT0Corrected.h"
2525
#include "Framework/AnalysisDataModel.h"
2626

@@ -133,4 +133,4 @@ DECLARE_SOA_TABLE(DeltaTOF, "AOD", "DELTATOF", //! Table of the delta TOF data f
133133

134134
} // namespace o2::aod
135135

136-
#endif // DPG_TASKS_TOF_TOFSKIMSTABLECREATOR_H_
136+
#endif // DPG_TASKS_TOF_TOFSKIMSTABLECREATOR_H_

‎DPG/Tasks/TPC/tpcSkimsTableCreator.h‎

Lines changed: 1 addition & 2 deletions
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>
@@ -133,4 +132,4 @@ DECLARE_SOA_TABLE(SkimmedTPCTOFTreeWithTrkQA, "AOD", "TPCTOFSKIMWQA",
133132
#undef TPCSKIMS_COLUMNS_V0
134133
#undef TPCSKIMS_COLUMNS_BASE
135134
} // namespace o2::aod
136-
#endif // DPG_TASKS_TPC_TPCSKIMSTABLECREATOR_H_
135+
#endif // DPG_TASKS_TPC_TPCSKIMSTABLECREATOR_H_

‎DPG/Tasks/TPC/tpcTreeCreatorLight.h‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
#include "Framework/AnalysisTask.h"
2121
#include "Framework/AnalysisDataModel.h"
2222
#include "Common/Core/trackUtilities.h"
23-
#include "Common/DataModel/PIDResponse.h"
2423

2524
enum ParticleSpecies {
2625
kPionTrack = BIT(0),
@@ -52,4 +51,4 @@ DECLARE_SOA_TABLE(TPCTOFTree, "AOD", "TPCTOFTREE",
5251
tpctree::PIDTrack,
5352
tpctree::RunNumber);
5453
} // namespace o2::aod
55-
#endif // DPG_TASKS_TPC_TPCTREECREATORLIGHT_H_
54+
#endif // DPG_TASKS_TPC_TPCTREECREATORLIGHT_H_

‎PWGCF/DataModel/FemtoDerived.h‎

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

1818
#include "Common/DataModel/Multiplicity.h"
19-
#include "Common/DataModel/PIDResponse.h"
2019
#include "Common/DataModel/TrackSelectionTables.h"
2120

2221
#include "Framework/ASoA.h"
@@ -747,4 +746,4 @@ using MixingHash = MixingHashes::iterator;
747746
} // namespace o2::aod
748747

749748
#endif // PWGCF_DATAMODEL_FEMTODERIVED_H_
750-
//
749+
//

‎PWGCF/DataModel/SPTableZDC.h‎

Lines changed: 1 addition & 2 deletions
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"
@@ -55,4 +54,4 @@ DECLARE_SOA_TABLE(SPTableZDC, "AOD", "SPZDC",
5554
sptablezdc::IsSelected,
5655
sptablezdc::EventSelectionFlags);
5756
} // namespace o2::aod
58-
#endif // PWGCF_DATAMODEL_SPTABLEZDC_H_
57+
#endif // PWGCF_DATAMODEL_SPTABLEZDC_H_

‎PWGCF/Femto3D/Core/femto3dPairTask.h‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
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

@@ -434,4 +433,4 @@ float FemtoPair<TrackType>::GetGammaOut() const
434433
}
435434
} // namespace o2::aod::singletrackselector
436435

437-
#endif // PWGCF_FEMTO3D_CORE_FEMTO3DPAIRTASK_H_
436+
#endif // PWGCF_FEMTO3D_CORE_FEMTO3DPAIRTASK_H_

‎PWGCF/Femto3D/DataModel/PIDutils.h‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
#include <type_traits>
2323
#include <utility>
2424
#include <vector>
25-
#include "Common/DataModel/PIDResponse.h"
2625

2726
namespace o2::aod::singletrackselector
2827
{
@@ -252,4 +251,4 @@ inline bool TOFselection(TrackType const& track, std::pair<int, std::vector<floa
252251
}
253252
} // namespace o2::aod::singletrackselector
254253

255-
#endif // PWGCF_FEMTO3D_DATAMODEL_PIDUTILS_H_
254+
#endif // PWGCF_FEMTO3D_DATAMODEL_PIDUTILS_H_

0 commit comments

Comments
 (0)