Skip to content

Commit bad5a08

Browse files
njacazionjacazio
committed
Clean PIDResponse in PWGLF
1 parent f2f04dd commit bad5a08

File tree

178 files changed

+2106
-1921
lines changed

Some content is hidden

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

178 files changed

+2106
-1921
lines changed

‎PWGLF/TableProducer/Common/epvector.cxx‎

Lines changed: 23 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -18,17 +18,6 @@
1818
/// (with or without corrections) and save the results in a dedicated table.
1919
///
2020

21-
// C++/ROOT includes.
22-
#include <TComplex.h>
23-
#include <TH1F.h>
24-
#include <TMath.h>
25-
26-
#include <chrono>
27-
#include <cstdio>
28-
#include <string>
29-
#include <vector>
30-
31-
// o2Physics includes.
3221
#include "PWGLF/DataModel/EPCalibrationTables.h"
3322

3423
#include "Common/Core/TrackSelection.h"
@@ -37,29 +26,31 @@
3726
#include "Common/DataModel/EventSelection.h"
3827
#include "Common/DataModel/FT0Corrected.h"
3928
#include "Common/DataModel/Multiplicity.h"
40-
#include "Common/DataModel/PIDResponse.h"
4129
#include "Common/DataModel/TrackSelectionTables.h"
4230

43-
#include "CommonConstants/PhysicsConstants.h"
44-
#include "FT0Base/Geometry.h"
45-
#include "FV0Base/Geometry.h"
46-
#include "Framework/ASoAHelpers.h"
47-
#include "Framework/AnalysisDataModel.h"
48-
#include "Framework/AnalysisTask.h"
49-
#include "Framework/HistogramRegistry.h"
50-
#include "Framework/StepTHn.h"
51-
#include "Framework/runDataProcessing.h"
52-
#include "ReconstructionDataFormats/Track.h"
53-
54-
#include "TF1.h"
55-
56-
// #include "Common/Core/EventPlaneHelper.h"
57-
// #include "Common/DataModel/Qvectors.h"
58-
59-
// o2 includes.
60-
#include "CCDB/BasicCCDBManager.h"
61-
#include "CCDB/CcdbApi.h"
62-
#include "DetectorsCommonDataFormats/AlignParam.h"
31+
#include <CCDB/BasicCCDBManager.h>
32+
#include <CCDB/CcdbApi.h>
33+
#include <CommonConstants/PhysicsConstants.h>
34+
#include <DetectorsCommonDataFormats/AlignParam.h>
35+
#include <FT0Base/Geometry.h>
36+
#include <FV0Base/Geometry.h>
37+
#include <Framework/ASoAHelpers.h>
38+
#include <Framework/AnalysisDataModel.h>
39+
#include <Framework/AnalysisTask.h>
40+
#include <Framework/HistogramRegistry.h>
41+
#include <Framework/StepTHn.h>
42+
#include <Framework/runDataProcessing.h>
43+
#include <ReconstructionDataFormats/Track.h>
44+
45+
#include <TComplex.h>
46+
#include <TF1.h>
47+
#include <TH1F.h>
48+
#include <TMath.h>
49+
50+
#include <chrono>
51+
#include <cstdio>
52+
#include <string>
53+
#include <vector>
6354

6455
using namespace o2;
6556
using namespace o2::framework;

‎PWGLF/TableProducer/Common/lfTPCPID.cxx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -694,8 +694,8 @@ struct lfTpcPid {
694694
bb = BetheBlochNeg##Particle(trk); \
695695
expSigma = BetheBlochResNeg##Particle(trk, bb); \
696696
} \
697-
aod::pidutils::packInTable<aod::pidtpc_tiny::binning>((trk.tpcSignal() - bb) / expSigma, \
698-
tablePID##Particle); \
697+
aod::pidtpc_tiny::binning::packInTable((trk.tpcSignal() - bb) / expSigma, \
698+
tablePID##Particle); \
699699
} \
700700
} \
701701
} \

‎PWGLF/TableProducer/Common/spvector.cxx‎

Lines changed: 32 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -12,59 +12,50 @@
1212
// \author: prottay das 23/12/2024
1313
// \email: prottay.das@cern.ch
1414

15-
// C++/ROOT includes.
16-
#include "Math/Vector4D.h"
17-
#include "TF1.h"
18-
#include "TRandom3.h"
19-
#include <TComplex.h>
20-
#include <TH1F.h>
21-
#include <TMath.h>
22-
23-
#include <array>
24-
#include <chrono>
25-
#include <cmath>
26-
#include <iostream>
27-
#include <string>
28-
#include <vector>
29-
30-
// o2Physics includes.
3115
#include "PWGLF/DataModel/SPCalibrationTables.h"
3216

3317
#include "Common/CCDB/ctpRateFetcher.h"
3418
#include "Common/Core/EventPlaneHelper.h"
35-
#include "Common/Core/PID/PIDTOF.h"
3619
#include "Common/Core/TrackSelection.h"
3720
#include "Common/Core/trackUtilities.h"
3821
#include "Common/DataModel/Centrality.h"
3922
#include "Common/DataModel/EventSelection.h"
4023
#include "Common/DataModel/FT0Corrected.h"
4124
#include "Common/DataModel/Multiplicity.h"
42-
#include "Common/DataModel/PIDResponse.h"
4325
#include "Common/DataModel/Qvectors.h"
4426
#include "Common/DataModel/TrackSelectionTables.h"
45-
#include "Common/TableProducer/PID/pidTOFBase.h"
46-
47-
#include "CommonConstants/PhysicsConstants.h"
48-
#include "DataFormatsParameters/GRPMagField.h"
49-
#include "DataFormatsParameters/GRPObject.h"
50-
#include "DataFormatsTPC/BetheBlochAleph.h"
51-
#include "DetectorsBase/GeometryManager.h"
52-
#include "DetectorsBase/Propagator.h"
53-
#include "FT0Base/Geometry.h"
54-
#include "FV0Base/Geometry.h"
55-
#include "Framework/ASoAHelpers.h"
56-
#include "Framework/AnalysisDataModel.h"
57-
#include "Framework/AnalysisTask.h"
58-
#include "Framework/HistogramRegistry.h"
59-
#include "Framework/StepTHn.h"
60-
#include "Framework/runDataProcessing.h"
61-
#include "ReconstructionDataFormats/Track.h"
62-
// #include "SPCalibrationTableswrite.h"
63-
64-
// o2 includes.
65-
#include "CCDB/BasicCCDBManager.h"
66-
#include "CCDB/CcdbApi.h"
67-
#include "DetectorsCommonDataFormats/AlignParam.h"
27+
28+
#include <CCDB/BasicCCDBManager.h>
29+
#include <CCDB/CcdbApi.h>
30+
#include <CommonConstants/PhysicsConstants.h>
31+
#include <DataFormatsParameters/GRPMagField.h>
32+
#include <DataFormatsParameters/GRPObject.h>
33+
#include <DetectorsBase/GeometryManager.h>
34+
#include <DetectorsBase/Propagator.h>
35+
#include <DetectorsCommonDataFormats/AlignParam.h>
36+
#include <FT0Base/Geometry.h>
37+
#include <FV0Base/Geometry.h>
38+
#include <Framework/ASoAHelpers.h>
39+
#include <Framework/AnalysisDataModel.h>
40+
#include <Framework/AnalysisTask.h>
41+
#include <Framework/HistogramRegistry.h>
42+
#include <Framework/StepTHn.h>
43+
#include <Framework/runDataProcessing.h>
44+
#include <ReconstructionDataFormats/Track.h>
45+
46+
#include <Math/Vector4D.h>
47+
#include <TComplex.h>
48+
#include <TF1.h>
49+
#include <TH1F.h>
50+
#include <TMath.h>
51+
#include <TRandom3.h>
52+
53+
#include <array>
54+
#include <chrono>
55+
#include <cmath>
56+
#include <iostream>
57+
#include <string>
58+
#include <vector>
6859

6960
using namespace o2;
7061
using namespace o2::framework;

‎PWGLF/TableProducer/Common/zdcSP.cxx‎

Lines changed: 23 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -12,42 +12,37 @@
1212
// Minimal example to run this task:
1313
// o2-analysis-centrality-table -b --configuration json://configuration.json | o2-analysis-timestamp -b --configuration json://configuration.json | o2-analysis-event-selection -b --configuration json://configuration.json | o2-analysis-multiplicity-table -b --configuration json://configuration.json | o2-analysis-lf-zdcsp -b --configuration json://configuration.json --aod-file @input_data.txt --aod-writer-json OutputDirector.json
1414

15-
#include <array>
16-
#include <cmath>
17-
18-
#include "Math/Vector4D.h"
19-
20-
#include "CCDB/BasicCCDBManager.h"
15+
#include "PWGLF/DataModel/LFzdcSPtables.h"
2116

17+
#include "Common/CCDB/ctpRateFetcher.h"
18+
#include "Common/Core/EventPlaneHelper.h"
2219
#include "Common/Core/TrackSelection.h"
2320
#include "Common/Core/trackUtilities.h"
2421
#include "Common/DataModel/Centrality.h"
2522
#include "Common/DataModel/EventSelection.h"
26-
#include "Common/DataModel/PIDResponse.h"
27-
#include "Common/DataModel/TrackSelectionTables.h"
28-
#include "Common/Core/PID/PIDTOF.h"
29-
#include "Common/TableProducer/PID/pidTOFBase.h"
30-
#include "Common/Core/EventPlaneHelper.h"
3123
#include "Common/DataModel/Qvectors.h"
32-
#include "Common/CCDB/ctpRateFetcher.h"
33-
34-
#include "DataFormatsParameters/GRPMagField.h"
35-
#include "DataFormatsParameters/GRPObject.h"
36-
#include "DataFormatsTPC/BetheBlochAleph.h"
37-
#include "DetectorsBase/GeometryManager.h"
38-
#include "DetectorsBase/Propagator.h"
39-
40-
#include "Framework/AnalysisDataModel.h"
41-
#include "Framework/AnalysisTask.h"
42-
#include "Framework/ASoAHelpers.h"
43-
#include "Framework/HistogramRegistry.h"
44-
#include "Framework/runDataProcessing.h"
45-
46-
#include "ReconstructionDataFormats/Track.h"
24+
#include "Common/DataModel/TrackSelectionTables.h"
4725

48-
#include "PWGLF/DataModel/LFzdcSPtables.h"
26+
#include <CCDB/BasicCCDBManager.h>
27+
#include <DataFormatsParameters/GRPMagField.h>
28+
#include <DataFormatsParameters/GRPObject.h>
29+
#include <DataFormatsTPC/BetheBlochAleph.h>
30+
#include <DetectorsBase/GeometryManager.h>
31+
#include <DetectorsBase/Propagator.h>
32+
#include <Framework/ASoAHelpers.h>
33+
#include <Framework/AnalysisDataModel.h>
34+
#include <Framework/AnalysisTask.h>
35+
#include <Framework/HistogramRegistry.h>
36+
#include <Framework/runDataProcessing.h>
37+
#include <ReconstructionDataFormats/Track.h>
38+
39+
#include <Math/Vector4D.h>
40+
#include <TRandom3.h>
4941

50-
#include "TRandom3.h"
42+
#include <array>
43+
#include <cmath>
44+
#include <string>
45+
#include <unordered_map>
5146

5247
using namespace o2;
5348
using namespace o2::framework;

‎PWGLF/TableProducer/Nuspex/LFTreeCreatorClusterStudies.cxx‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,9 @@
2525
#include "Common/DataModel/Centrality.h"
2626
#include "Common/DataModel/EventSelection.h"
2727
#include "Common/DataModel/Multiplicity.h"
28-
#include "Common/DataModel/PIDResponse.h"
2928
#include "Common/DataModel/PIDResponseITS.h"
29+
#include "Common/DataModel/PIDResponseTOF.h"
30+
#include "Common/DataModel/PIDResponseTPC.h"
3031
#include "Common/DataModel/TrackSelectionTables.h"
3132
#include "Common/TableProducer/PID/pidTOFBase.h"
3233

‎PWGLF/TableProducer/Nuspex/LFTreeCreatorNuclei.cxx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
#include "Common/DataModel/Centrality.h"
2929
#include "Common/DataModel/EventSelection.h"
3030
#include "Common/DataModel/Multiplicity.h"
31-
#include "Common/DataModel/PIDResponse.h"
31+
#include "Common/DataModel/PIDResponseTOF.h"
3232
#include "Common/DataModel/TrackSelectionTables.h"
3333

3434
#include "Framework/ASoAHelpers.h"

‎PWGLF/TableProducer/Nuspex/decay3bodybuilder.cxx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
#include "Common/Core/RecoDecay.h"
2828
#include "Common/Core/trackUtilities.h"
2929
#include "Common/DataModel/EventSelection.h"
30-
#include "Common/DataModel/PIDResponse.h"
30+
#include "Common/DataModel/PIDResponseTPC.h"
3131
#include "EventFiltering/Zorro.h"
3232
#include "EventFiltering/ZorroSummary.h"
3333
#include "Tools/KFparticle/KFUtilities.h"

‎PWGLF/TableProducer/Nuspex/ebyeMaker.cxx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
#include "Common/DataModel/Centrality.h"
2424
#include "Common/DataModel/EventSelection.h"
2525
#include "Common/DataModel/Multiplicity.h"
26-
#include "Common/DataModel/PIDResponse.h"
26+
#include "Common/DataModel/PIDResponseTOF.h"
2727
#include "Common/DataModel/TrackSelectionTables.h"
2828
#include "Common/TableProducer/PID/pidTOFBase.h"
2929

‎PWGLF/TableProducer/Nuspex/he3HadronFemto.cxx‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,9 @@
2727
#include "Common/DataModel/Centrality.h"
2828
#include "Common/DataModel/EventSelection.h"
2929
#include "Common/DataModel/Multiplicity.h"
30-
#include "Common/DataModel/PIDResponse.h"
3130
#include "Common/DataModel/PIDResponseITS.h"
31+
#include "Common/DataModel/PIDResponseTOF.h"
32+
#include "Common/DataModel/PIDResponseTPC.h"
3233
#include "Common/DataModel/TrackSelectionTables.h"
3334
#include "Common/TableProducer/PID/pidTOFBase.h"
3435
#include "EventFiltering/Zorro.h"

‎PWGLF/TableProducer/Nuspex/hypKfRecoTask.cxx‎

Lines changed: 30 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -13,45 +13,50 @@
1313
/// \brief Hypernuclei rconstruction using KFParticle package
1414
/// \author Janik Ditzel <jditzel@cern.ch> and Michael Hartung <mhartung@cern.ch>
1515

16-
#include <limits>
17-
#include <vector>
18-
#include <string>
19-
#include <map>
20-
#include "Framework/runDataProcessing.h"
21-
#include "Framework/AnalysisTask.h"
22-
#include "Framework/AnalysisDataModel.h"
23-
#include "Framework/ASoAHelpers.h"
24-
#include "ReconstructionDataFormats/Track.h"
16+
#include "MetadataHelper.h"
17+
18+
#include "PWGLF/DataModel/LFHypernucleiKfTables.h"
19+
20+
#include "Common/Core/PID/TPCPIDResponse.h"
2521
#include "Common/Core/RecoDecay.h"
2622
#include "Common/Core/trackUtilities.h"
27-
#include "Common/DataModel/TrackSelectionTables.h"
28-
#include "Common/DataModel/EventSelection.h"
2923
#include "Common/DataModel/Centrality.h"
30-
#include "DetectorsBase/Propagator.h"
31-
#include "DetectorsBase/GeometryManager.h"
32-
#include "DataFormatsParameters/GRPObject.h"
33-
#include "DataFormatsParameters/GRPMagField.h"
24+
#include "Common/DataModel/CollisionAssociationTables.h"
25+
#include "Common/DataModel/EventSelection.h"
26+
#include "Common/DataModel/PIDResponseTOF.h"
27+
#include "Common/DataModel/PIDResponseTPC.h"
28+
#include "Common/DataModel/TrackSelectionTables.h"
29+
#include "Common/TableProducer/PID/pidTPCBase.h"
30+
3431
#include "CCDB/BasicCCDBManager.h"
3532
#include "CommonConstants/PhysicsConstants.h"
36-
#include "Common/Core/PID/TPCPIDResponse.h"
37-
#include "DataFormatsTPC/BetheBlochAleph.h"
3833
#include "DCAFitter/DCAFitterN.h"
39-
#include "Common/DataModel/PIDResponse.h"
40-
#include "PWGLF/DataModel/LFHypernucleiKfTables.h"
41-
#include "TRandom3.h"
42-
#include "Common/DataModel/CollisionAssociationTables.h"
43-
#include "Common/TableProducer/PID/pidTPCBase.h"
44-
#include "Common/DataModel/PIDResponseTPC.h"
34+
#include "DataFormatsParameters/GRPMagField.h"
35+
#include "DataFormatsParameters/GRPObject.h"
36+
#include "DataFormatsTPC/BetheBlochAleph.h"
37+
#include "DetectorsBase/GeometryManager.h"
38+
#include "DetectorsBase/Propagator.h"
39+
#include "Framework/ASoAHelpers.h"
40+
#include "Framework/AnalysisDataModel.h"
41+
#include "Framework/AnalysisTask.h"
42+
#include "Framework/runDataProcessing.h"
4543
#include "ReconstructionDataFormats/PID.h"
46-
#include "MetadataHelper.h"
44+
#include "ReconstructionDataFormats/Track.h"
45+
46+
#include "TRandom3.h"
47+
48+
#include <limits>
49+
#include <map>
50+
#include <string>
51+
#include <vector>
4752

4853
// KFParticle
4954
#ifndef HomogeneousField
5055
#define HomogeneousField // o2-linter: disable=name/macro (Name is defined in KFParticle package)
5156
#endif
52-
#include "KFParticle.h"
5357
#include "KFPTrack.h"
5458
#include "KFPVertex.h"
59+
#include "KFParticle.h"
5560
#include "KFParticleBase.h"
5661
#include "KFVertex.h"
5762

0 commit comments

Comments
 (0)