Skip to content

Commit 49d4c47

Browse files
njacazionjacazio
committed
Clean PIDResponse in PWGDQ
1 parent 9314ade commit 49d4c47

File tree

10 files changed

+128
-113
lines changed

10 files changed

+128
-113
lines changed

‎PWGDQ/TableProducer/generatedQuarkoniaMC.cxx‎

Lines changed: 28 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -16,40 +16,41 @@
1616
// It is meant to help with providing auxiliary information
1717
// when dealing with derived data.
1818

19-
#include <cmath>
20-
#include <array>
21-
#include <cstdlib>
22-
#include <map>
23-
#include <iterator>
24-
#include <utility>
19+
#include "PWGDQ/DataModel/ReducedInfoTables.h"
20+
#include "PWGLF/DataModel/EPCalibrationTables.h"
21+
#include "PWGLF/DataModel/LFParticleIdentification.h"
22+
#include "PWGLF/DataModel/LFStrangenessPIDTables.h"
23+
#include "PWGLF/DataModel/LFStrangenessTables.h"
2524

26-
#include "Framework/runDataProcessing.h"
27-
#include "Framework/RunningWorkflowInfo.h"
28-
#include "Framework/AnalysisTask.h"
29-
#include "Framework/AnalysisDataModel.h"
30-
#include "Framework/ASoAHelpers.h"
31-
#include "DCAFitter/DCAFitterN.h"
32-
#include "ReconstructionDataFormats/Track.h"
3325
#include "Common/Core/RecoDecay.h"
34-
#include "Common/Core/trackUtilities.h"
35-
#include "PWGLF/DataModel/LFStrangenessTables.h"
36-
#include "PWGLF/DataModel/LFStrangenessPIDTables.h"
37-
#include "PWGLF/DataModel/LFParticleIdentification.h"
38-
#include "PWGDQ/DataModel/ReducedInfoTables.h"
3926
#include "Common/Core/TrackSelection.h"
27+
#include "Common/Core/trackUtilities.h"
28+
#include "Common/DataModel/McCollisionExtra.h"
29+
#include "Common/DataModel/Qvectors.h"
4030
#include "Common/DataModel/TrackSelectionTables.h"
41-
#include "DetectorsBase/Propagator.h"
42-
#include "DetectorsBase/GeometryManager.h"
43-
#include "DataFormatsParameters/GRPObject.h"
44-
#include "DataFormatsParameters/GRPMagField.h"
31+
#include "Common/TableProducer/PID/pidTOFBase.h"
32+
4533
#include "CCDB/BasicCCDBManager.h"
4634
#include "CommonConstants/PhysicsConstants.h"
47-
#include "Common/TableProducer/PID/pidTOFBase.h"
48-
#include "Common/DataModel/PIDResponse.h"
49-
#include "Common/DataModel/Qvectors.h"
35+
#include "DCAFitter/DCAFitterN.h"
36+
#include "DataFormatsParameters/GRPMagField.h"
37+
#include "DataFormatsParameters/GRPObject.h"
38+
#include "DetectorsBase/GeometryManager.h"
39+
#include "DetectorsBase/Propagator.h"
40+
#include "Framework/ASoAHelpers.h"
41+
#include "Framework/AnalysisDataModel.h"
42+
#include "Framework/AnalysisTask.h"
43+
#include "Framework/RunningWorkflowInfo.h"
5044
#include "Framework/StaticFor.h"
51-
#include "Common/DataModel/McCollisionExtra.h"
52-
#include "PWGLF/DataModel/EPCalibrationTables.h"
45+
#include "Framework/runDataProcessing.h"
46+
#include "ReconstructionDataFormats/Track.h"
47+
48+
#include <array>
49+
#include <cmath>
50+
#include <cstdlib>
51+
#include <iterator>
52+
#include <map>
53+
#include <utility>
5354

5455
using namespace o2;
5556
using namespace o2::framework;

‎PWGDQ/TableProducer/tableMaker.cxx‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,8 @@
3939
#include "Common/DataModel/FwdTrackReAlignTables.h"
4040
#include "Common/DataModel/MftmchMatchingML.h"
4141
#include "Common/DataModel/Multiplicity.h"
42-
#include "Common/DataModel/PIDResponse.h"
42+
#include "Common/DataModel/PIDResponseTOF.h"
43+
#include "Common/DataModel/PIDResponseTPC.h"
4344
#include "Common/DataModel/TrackSelectionTables.h"
4445
#include "EventFiltering/Zorro.h"
4546

‎PWGDQ/TableProducer/tableMakerMC.cxx‎

Lines changed: 38 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -16,41 +16,46 @@
1616
// The skimmed MC stack includes the MC truth particles corresponding to the list of user specified MC signals (see MCsignal.h)
1717
// and the MC truth particles corresponding to the reconstructed tracks selected by the specified track cuts on reconstructed data.
1818

19-
#include <iostream>
20-
#include <string>
21-
#include <map>
22-
#include <memory>
23-
#include <vector>
24-
#include "TList.h"
25-
#include "Framework/AnalysisTask.h"
26-
#include "Framework/AnalysisDataModel.h"
27-
#include "Framework/ASoAHelpers.h"
28-
#include "Framework/ASoA.h"
29-
#include "Framework/DataTypes.h"
30-
#include "Framework/runDataProcessing.h"
31-
#include "Common/DataModel/Multiplicity.h"
32-
#include "Common/DataModel/EventSelection.h"
33-
#include "Common/DataModel/Centrality.h"
34-
#include "Common/CCDB/TriggerAliases.h"
35-
#include "PWGDQ/DataModel/ReducedInfoTables.h"
36-
#include "PWGDQ/Core/VarManager.h"
37-
#include "PWGDQ/Core/HistogramManager.h"
38-
#include "PWGDQ/Core/AnalysisCut.h"
3919
#include "PWGDQ/Core/AnalysisCompositeCut.h"
40-
#include "PWGDQ/Core/HistogramsLibrary.h"
20+
#include "PWGDQ/Core/AnalysisCut.h"
4121
#include "PWGDQ/Core/CutsLibrary.h"
22+
#include "PWGDQ/Core/HistogramManager.h"
23+
#include "PWGDQ/Core/HistogramsLibrary.h"
4224
#include "PWGDQ/Core/MCSignal.h"
4325
#include "PWGDQ/Core/MCSignalLibrary.h"
44-
#include "Common/DataModel/PIDResponse.h"
45-
#include "Common/DataModel/TrackSelectionTables.h"
26+
#include "PWGDQ/Core/VarManager.h"
27+
#include "PWGDQ/DataModel/ReducedInfoTables.h"
28+
29+
#include "Common/CCDB/TriggerAliases.h"
30+
#include "Common/DataModel/Centrality.h"
4631
#include "Common/DataModel/CollisionAssociationTables.h"
32+
#include "Common/DataModel/EventSelection.h"
33+
#include "Common/DataModel/Multiplicity.h"
34+
#include "Common/DataModel/PIDResponseTOF.h"
35+
#include "Common/DataModel/PIDResponseTPC.h"
36+
#include "Common/DataModel/TrackSelectionTables.h"
37+
38+
#include "CCDB/BasicCCDBManager.h"
4739
#include "DataFormatsParameters/GRPMagField.h"
4840
#include "DataFormatsParameters/GRPObject.h"
41+
#include "DetectorsBase/GeometryManager.h"
42+
#include "DetectorsBase/Propagator.h"
4943
#include "Field/MagneticField.h"
44+
#include "Framework/ASoA.h"
45+
#include "Framework/ASoAHelpers.h"
46+
#include "Framework/AnalysisDataModel.h"
47+
#include "Framework/AnalysisTask.h"
48+
#include "Framework/DataTypes.h"
49+
#include "Framework/runDataProcessing.h"
50+
5051
#include "TGeoGlobalMagField.h"
51-
#include "DetectorsBase/Propagator.h"
52-
#include "DetectorsBase/GeometryManager.h"
53-
#include "CCDB/BasicCCDBManager.h"
52+
#include "TList.h"
53+
54+
#include <iostream>
55+
#include <map>
56+
#include <memory>
57+
#include <string>
58+
#include <vector>
5459

5560
using std::cout;
5661
using std::endl;
@@ -653,7 +658,7 @@ struct TableMakerMC {
653658
track.c1PtY(), track.c1PtZ(), track.c1PtSnp(), track.c1PtTgl(), track.c1Pt21Pt2());
654659
}
655660
} // end loop over reconstructed tracks
656-
} // end if constexpr (static_cast<bool>(TTrackFillMap))
661+
} // end if constexpr (static_cast<bool>(TTrackFillMap))
657662

658663
// Maps for the MFT-muon matching index
659664
std::map<int, int> newMFTTableSize; // key : oldMFTIndex, value: size of the table-1 at step key
@@ -864,9 +869,9 @@ struct TableMakerMC {
864869
newMatchIndex[muon.index()] = newEntryNb[matchIdx]; // update the match for this muon to the updated entry of the match
865870
newMatchIndex[muon.index()] += muonBasic.lastIndex() + 1 - newEntryNb[muon.index()]; // adding the offset of muons, muonBasic.lastIndex() start at -1
866871

867-
if (static_cast<int>(muon.trackType()) == 0) { // for now only do this to global tracks
868-
newMatchIndex[matchIdx] = newEntryNb[muon.index()]; // add the updated index of this muon as a match to mch track
869-
newMatchIndex[matchIdx] += muonBasic.lastIndex() + 1 - newEntryNb[muon.index()]; // adding the offset, muonBasic.lastIndex() start at -1
872+
if (static_cast<int>(muon.trackType()) == 0) { // for now only do this to global tracks
873+
newMatchIndex[matchIdx] = newEntryNb[muon.index()]; // add the updated index of this muon as a match to mch track
874+
newMatchIndex[matchIdx] += muonBasic.lastIndex() + 1 - newEntryNb[muon.index()]; // adding the offset, muonBasic.lastIndex() start at -1
870875
}
871876
} else {
872877
newMatchIndex[muon.index()] = -1;
@@ -915,7 +920,7 @@ struct TableMakerMC {
915920
muonLabels(fNewLabels.find(mctrack.index())->second, muon.mcMask(), mcflags);
916921
}
917922
} // end if constexpr (static_cast<bool>(TMuonFillMap))
918-
} // end loop over collisions
923+
} // end loop over collisions
919924

920925
// Loop over the label map, create the mother/daughter relationships if these exist and write the skimmed MC stack
921926
for (const auto& [newLabel, oldLabel] : fNewLabelsReversed) {
@@ -1276,7 +1281,7 @@ struct TableMakerMC {
12761281
track.c1PtY(), track.c1PtZ(), track.c1PtSnp(), track.c1PtTgl(), track.c1Pt21Pt2());
12771282
}
12781283
} // end loop over reconstructed tracks
1279-
} // end if constexpr (static_cast<bool>(TTrackFillMap))
1284+
} // end if constexpr (static_cast<bool>(TTrackFillMap))
12801285

12811286
if constexpr (static_cast<bool>(TMuonFillMap)) {
12821287
// build the muon tables
@@ -1454,7 +1459,7 @@ struct TableMakerMC {
14541459
muonLabels(fNewLabels.find(mctrack.index())->second, muon.mcMask(), mcflags);
14551460
}
14561461
} // end if constexpr (static_cast<bool>(TMuonFillMap))
1457-
} // end loop over collisions
1462+
} // end loop over collisions
14581463

14591464
// Loop over the label map, create the mother/daughter relationships if these exist and write the skimmed MC stack
14601465
for (const auto& [newLabel, oldLabel] : fNewLabelsReversed) {

‎PWGDQ/TableProducer/tableMakerMC_withAssoc.cxx‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,8 @@
3434
#include "Common/DataModel/FwdTrackReAlignTables.h"
3535
#include "Common/DataModel/McCollisionExtra.h"
3636
#include "Common/DataModel/Multiplicity.h"
37-
#include "Common/DataModel/PIDResponse.h"
37+
#include "Common/DataModel/PIDResponseTOF.h"
38+
#include "Common/DataModel/PIDResponseTPC.h"
3839
#include "Common/DataModel/TrackSelectionTables.h"
3940

4041
#include "CCDB/BasicCCDBManager.h"

‎PWGDQ/TableProducer/tableMaker_withAssoc.cxx‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,8 @@
4242
#include "Common/DataModel/FwdTrackReAlignTables.h"
4343
#include "Common/DataModel/MftmchMatchingML.h"
4444
#include "Common/DataModel/Multiplicity.h"
45-
#include "Common/DataModel/PIDResponse.h"
45+
#include "Common/DataModel/PIDResponseTOF.h"
46+
#include "Common/DataModel/PIDResponseTPC.h"
4647
#include "Common/DataModel/TrackSelectionTables.h"
4748
#include "EventFiltering/Zorro.h"
4849

‎PWGDQ/Tasks/DalitzSelection.cxx‎

100755100644
Lines changed: 20 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -13,26 +13,29 @@
1313
// It can produce track and pair histograms for selected tracks
1414
// It creates a bitmap with selections to be stored during skimming
1515
//
16-
#include "Framework/runDataProcessing.h"
17-
#include "Framework/AnalysisTask.h"
18-
#include "Framework/AnalysisDataModel.h"
19-
#include "Framework/ASoAHelpers.h"
20-
#include "Framework/DataTypes.h"
21-
#include "CCDB/BasicCCDBManager.h"
22-
#include "Common/DataModel/Multiplicity.h"
23-
#include "Common/DataModel/EventSelection.h"
24-
#include "Common/DataModel/Centrality.h"
25-
#include "Common/CCDB/TriggerAliases.h"
26-
#include "Common/DataModel/PIDResponse.h"
27-
#include "Common/DataModel/TrackSelectionTables.h"
28-
#include "PWGDQ/DataModel/ReducedInfoTables.h"
29-
#include "PWGDQ/Core/VarManager.h"
30-
#include "PWGDQ/Core/HistogramManager.h"
31-
#include "PWGDQ/Core/AnalysisCut.h"
3216
#include "PWGDQ/Core/AnalysisCompositeCut.h"
33-
#include "PWGDQ/Core/HistogramsLibrary.h"
17+
#include "PWGDQ/Core/AnalysisCut.h"
3418
#include "PWGDQ/Core/CutsLibrary.h"
19+
#include "PWGDQ/Core/HistogramManager.h"
20+
#include "PWGDQ/Core/HistogramsLibrary.h"
21+
#include "PWGDQ/Core/VarManager.h"
22+
#include "PWGDQ/DataModel/ReducedInfoTables.h"
23+
24+
#include "Common/CCDB/TriggerAliases.h"
25+
#include "Common/DataModel/Centrality.h"
26+
#include "Common/DataModel/EventSelection.h"
27+
#include "Common/DataModel/Multiplicity.h"
28+
#include "Common/DataModel/PIDResponseTOF.h"
29+
#include "Common/DataModel/PIDResponseTPC.h"
30+
#include "Common/DataModel/TrackSelectionTables.h"
31+
32+
#include "CCDB/BasicCCDBManager.h"
3533
#include "DataFormatsParameters/GRPMagField.h"
34+
#include "Framework/ASoAHelpers.h"
35+
#include "Framework/AnalysisDataModel.h"
36+
#include "Framework/AnalysisTask.h"
37+
#include "Framework/DataTypes.h"
38+
#include "Framework/runDataProcessing.h"
3639

3740
using namespace o2;
3841
using namespace o2::framework;

‎PWGDQ/Tasks/filterPP.cxx‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,8 @@
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"
27+
#include "Common/DataModel/PIDResponseTPC.h"
2728
#include "Common/DataModel/TrackSelectionTables.h"
2829
#include "EventFiltering/filterTables.h"
2930

‎PWGDQ/Tasks/filterPPwithAssociation.cxx‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,8 @@
2525
#include "Common/DataModel/CollisionAssociationTables.h"
2626
#include "Common/DataModel/EventSelection.h"
2727
#include "Common/DataModel/Multiplicity.h"
28-
#include "Common/DataModel/PIDResponse.h"
28+
#include "Common/DataModel/PIDResponseTOF.h"
29+
#include "Common/DataModel/PIDResponseTPC.h"
2930
#include "Common/DataModel/TrackSelectionTables.h"
3031
#include "EventFiltering/filterTables.h"
3132

‎PWGDQ/Tasks/quarkoniaToHyperons.cxx‎

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -29,44 +29,44 @@
2929
// david.dobrigkeit.chinellato@cern.ch
3030
//
3131

32-
#include <Math/Vector4D.h>
33-
#include <cmath>
34-
#include <array>
35-
#include <cstdlib>
36-
#include <map>
37-
#include <string>
38-
#include <vector>
39-
40-
#include <TFile.h>
41-
#include <TH2F.h>
42-
#include <TProfile.h>
43-
#include <TLorentzVector.h>
44-
#include <TPDGCode.h>
45-
46-
#include "Framework/runDataProcessing.h"
47-
#include "Framework/AnalysisTask.h"
48-
#include "Framework/AnalysisDataModel.h"
49-
#include "Framework/ASoAHelpers.h"
50-
#include "Framework/O2DatabasePDGPlugin.h"
51-
#include "ReconstructionDataFormats/Track.h"
52-
#include "CCDB/BasicCCDBManager.h"
53-
#include "CommonConstants/PhysicsConstants.h"
54-
#include "Common/Core/trackUtilities.h"
55-
#include "PWGLF/DataModel/LFStrangenessTables.h"
5632
#include "PWGLF/DataModel/LFStrangenessMLTables.h"
5733
#include "PWGLF/DataModel/LFStrangenessPIDTables.h"
34+
#include "PWGLF/DataModel/LFStrangenessTables.h"
35+
#include "PWGUD/Core/SGSelector.h"
36+
5837
#include "Common/Core/TrackSelection.h"
59-
#include "Common/DataModel/TrackSelectionTables.h"
38+
#include "Common/Core/trackUtilities.h"
39+
#include "Common/DataModel/Centrality.h"
6040
#include "Common/DataModel/EventSelection.h"
6141
#include "Common/DataModel/Multiplicity.h"
62-
#include "Common/DataModel/Centrality.h"
63-
#include "Common/DataModel/PIDResponse.h"
64-
#include "PWGUD/Core/SGSelector.h"
42+
#include "Common/DataModel/TrackSelectionTables.h"
43+
#include "EventFiltering/Zorro.h"
44+
#include "EventFiltering/ZorroSummary.h"
6545
#include "Tools/ML/MlResponse.h"
6646
#include "Tools/ML/model.h"
6747

68-
#include "EventFiltering/Zorro.h"
69-
#include "EventFiltering/ZorroSummary.h"
48+
#include "CCDB/BasicCCDBManager.h"
49+
#include "CommonConstants/PhysicsConstants.h"
50+
#include "Framework/ASoAHelpers.h"
51+
#include "Framework/AnalysisDataModel.h"
52+
#include "Framework/AnalysisTask.h"
53+
#include "Framework/O2DatabasePDGPlugin.h"
54+
#include "Framework/runDataProcessing.h"
55+
#include "ReconstructionDataFormats/Track.h"
56+
57+
#include <Math/Vector4D.h>
58+
#include <TFile.h>
59+
#include <TH2F.h>
60+
#include <TLorentzVector.h>
61+
#include <TPDGCode.h>
62+
#include <TProfile.h>
63+
64+
#include <array>
65+
#include <cmath>
66+
#include <cstdlib>
67+
#include <map>
68+
#include <string>
69+
#include <vector>
7070

7171
// constants
7272
const float ctauXiPDG = 4.91; // Xi PDG lifetime

‎PWGDQ/Tasks/v0selector.cxx‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,8 @@
2828
#include "Common/Core/trackUtilities.h"
2929
#include "Common/DataModel/Centrality.h"
3030
#include "Common/DataModel/EventSelection.h"
31-
#include "Common/DataModel/PIDResponse.h"
31+
#include "Common/DataModel/PIDResponseTOF.h"
32+
#include "Common/DataModel/PIDResponseTPC.h"
3233
#include "Common/DataModel/TrackSelectionTables.h"
3334

3435
#include "CCDB/BasicCCDBManager.h"

0 commit comments

Comments
 (0)