Skip to content

Commit b8954b6

Browse files
njacazionjacazio
authored
[PWGCF,PWGLF,Trigger] Clean PIDResponse in EventFiltering (#13673)
1 parent 073f5e3 commit b8954b6

File tree

5 files changed

+96
-79
lines changed

5 files changed

+96
-79
lines changed

‎EventFiltering/PWGCF/CFFilterAll.cxx‎

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -14,36 +14,37 @@
1414
///
1515
/// \author Laura Serksnyte, TU München, laura.serksnyte@cern.ch; Anton Riedel, TU München, anton.riedel@cern.ch; Maximilian Korwieser, TU Munich, maximilian.korwieser@cern.ch
1616

17-
#include <string>
18-
#include <vector>
19-
2017
#include "../filterTables.h"
2118

22-
#include "CCDB/BasicCCDBManager.h"
23-
#include "DataFormatsParameters/GRPMagField.h"
24-
#include "DCAFitter/DCAFitterN.h"
25-
#include "DetectorsBase/Propagator.h"
19+
#include "PWGLF/Utils/strangenessBuilderHelper.h"
2620

27-
#include "fairlogger/Logger.h"
21+
#include "Common/Core/RecoDecay.h"
2822
#include "Common/DataModel/EventSelection.h"
2923
#include "Common/DataModel/Multiplicity.h"
30-
#include "Common/DataModel/PIDResponse.h"
3124
#include "Common/DataModel/PIDResponseITS.h"
25+
#include "Common/DataModel/PIDResponseTOF.h"
26+
#include "Common/DataModel/PIDResponseTPC.h"
3227
#include "Common/DataModel/TrackSelectionTables.h"
33-
#include "Common/Core/RecoDecay.h"
3428

29+
#include "CCDB/BasicCCDBManager.h"
30+
#include "DCAFitter/DCAFitterN.h"
31+
#include "DataFormatsParameters/GRPMagField.h"
32+
#include "DetectorsBase/Propagator.h"
3533
#include "Framework/AnalysisDataModel.h"
3634
#include "Framework/AnalysisTask.h"
3735
#include "Framework/Configurable.h"
3836
#include "Framework/HistogramRegistry.h"
3937
#include "Framework/runDataProcessing.h"
4038

41-
#include "PWGLF/Utils/strangenessBuilderHelper.h"
42-
4339
#include "Math/GenVector/Boost.h"
4440
#include "Math/Vector4D.h"
4541
#include "TMath.h"
4642

43+
#include "fairlogger/Logger.h"
44+
45+
#include <string>
46+
#include <vector>
47+
4748
using namespace o2;
4849
using namespace o2::aod;
4950
using namespace o2::framework;

‎EventFiltering/PWGLF/filterdoublephi.cxx‎

Lines changed: 25 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -14,37 +14,42 @@
1414
///
1515
/// \author Sourav Kundu, sourav.kundu@cern.ch
1616

17+
#include "../filterTables.h"
18+
19+
#include "PWGLF/DataModel/ReducedDoublePhiTables.h"
20+
21+
#include "Common/Core/TrackSelection.h"
22+
#include "Common/DataModel/EventSelection.h"
23+
#include "Common/DataModel/Multiplicity.h"
24+
#include "Common/DataModel/PIDResponseITS.h"
25+
#include "Common/DataModel/PIDResponseTOF.h"
26+
#include "Common/DataModel/PIDResponseTPC.h"
27+
#include "Common/DataModel/TrackSelectionTables.h"
28+
29+
#include "CCDB/BasicCCDBManager.h"
30+
#include "CCDB/CcdbApi.h"
31+
#include "CommonConstants/MathConstants.h"
32+
#include "DataFormatsTPC/BetheBlochAleph.h"
33+
#include "Framework/ASoAHelpers.h"
34+
#include "Framework/AnalysisDataModel.h"
35+
#include "Framework/AnalysisTask.h"
36+
#include "Framework/HistogramRegistry.h"
37+
#include "Framework/runDataProcessing.h"
1738
#include <Framework/Configurable.h>
39+
1840
#include <Math/GenVector/Boost.h>
1941
#include <Math/Vector4D.h>
42+
#include <TDatabasePDG.h> // FIXME
2043
#include <TMath.h>
44+
#include <TPDGCode.h> // FIXME
45+
2146
#include <fairlogger/Logger.h>
22-
#include <TDatabasePDG.h> // FIXME
23-
#include <TPDGCode.h> // FIXME
2447

2548
#include <iostream>
2649
#include <iterator>
2750
#include <string>
2851
#include <vector>
2952

30-
#include "../filterTables.h"
31-
#include "PWGLF/DataModel/ReducedDoublePhiTables.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 "CommonConstants/MathConstants.h"
38-
#include "Common/Core/TrackSelection.h"
39-
#include "Common/DataModel/TrackSelectionTables.h"
40-
#include "Common/DataModel/EventSelection.h"
41-
#include "Common/DataModel/Multiplicity.h"
42-
#include "Common/DataModel/PIDResponse.h"
43-
#include "DataFormatsTPC/BetheBlochAleph.h"
44-
#include "CCDB/BasicCCDBManager.h"
45-
#include "CCDB/CcdbApi.h"
46-
#include "Common/DataModel/PIDResponseITS.h"
47-
4853
using namespace o2;
4954
using namespace o2::framework;
5055
using namespace o2::framework::expressions;

‎EventFiltering/PWGLF/filterf1proton.cxx‎

Lines changed: 32 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -14,43 +14,49 @@
1414
///
1515
/// \author Sourav Kundu, sourav.kundu@cern.ch
1616

17+
#include "../filterTables.h"
18+
19+
#include "PWGLF/DataModel/LFParticleIdentification.h"
20+
#include "PWGLF/DataModel/LFStrangenessTables.h"
21+
#include "PWGLF/Utils/strangenessBuilderHelper.h"
22+
23+
#include "Common/Core/RecoDecay.h"
24+
#include "Common/Core/TrackSelection.h"
25+
#include "Common/Core/trackUtilities.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"
33+
#include "CCDB/CcdbApi.h"
34+
#include "CommonConstants/MathConstants.h"
35+
#include "CommonConstants/PhysicsConstants.h"
36+
#include "DataFormatsParameters/GRPMagField.h"
37+
#include "DataFormatsParameters/GRPObject.h"
38+
#include "DataFormatsTPC/BetheBlochAleph.h"
39+
#include "Framework/ASoAHelpers.h"
40+
#include "Framework/AnalysisDataModel.h"
41+
#include "Framework/AnalysisTask.h"
42+
#include "Framework/HistogramRegistry.h"
43+
#include "Framework/runDataProcessing.h"
44+
#include "ReconstructionDataFormats/Track.h"
45+
#include "ReconstructionDataFormats/TrackParametrization.h"
1746
#include <Framework/Configurable.h>
47+
1848
#include <Math/GenVector/Boost.h>
1949
#include <Math/Vector4D.h>
2050
#include <TLorentzVector.h>
2151
#include <TMath.h>
52+
2253
#include <fairlogger/Logger.h>
54+
2355
#include <iostream>
2456
#include <iterator>
2557
#include <string>
2658
#include <vector>
2759

28-
#include "DataFormatsParameters/GRPMagField.h"
29-
#include "DataFormatsParameters/GRPObject.h"
30-
#include "ReconstructionDataFormats/Track.h"
31-
#include "ReconstructionDataFormats/TrackParametrization.h"
32-
#include "Common/Core/RecoDecay.h"
33-
#include "Common/Core/trackUtilities.h"
34-
#include "../filterTables.h"
35-
#include "Framework/ASoAHelpers.h"
36-
#include "Framework/AnalysisDataModel.h"
37-
#include "Framework/AnalysisTask.h"
38-
#include "Framework/HistogramRegistry.h"
39-
#include "Framework/runDataProcessing.h"
40-
#include "CommonConstants/MathConstants.h"
41-
#include "Common/Core/TrackSelection.h"
42-
#include "Common/DataModel/TrackSelectionTables.h"
43-
#include "Common/DataModel/EventSelection.h"
44-
#include "Common/DataModel/Multiplicity.h"
45-
#include "Common/DataModel/PIDResponse.h"
46-
#include "PWGLF/DataModel/LFStrangenessTables.h"
47-
#include "PWGLF/Utils/strangenessBuilderHelper.h"
48-
#include "PWGLF/DataModel/LFParticleIdentification.h"
49-
#include "CommonConstants/PhysicsConstants.h"
50-
#include "DataFormatsTPC/BetheBlochAleph.h"
51-
#include "CCDB/BasicCCDBManager.h"
52-
#include "CCDB/CcdbApi.h"
53-
5460
using namespace o2;
5561
using namespace o2::framework;
5662
using namespace o2::framework::expressions;

‎EventFiltering/PWGLF/nucleiFilter.cxx‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,8 @@
2020
#include "Common/Core/PID/PIDTOF.h"
2121
#include "Common/Core/trackUtilities.h"
2222
#include "Common/DataModel/EventSelection.h"
23-
#include "Common/DataModel/PIDResponse.h"
23+
#include "Common/DataModel/PIDResponseTOF.h"
24+
#include "Common/DataModel/PIDResponseTPC.h"
2425
#include "Common/DataModel/TrackSelectionTables.h"
2526

2627
#include "CCDB/BasicCCDBManager.h"

‎EventFiltering/PWGLF/strangenessFilter.cxx‎

Lines changed: 24 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -14,32 +14,36 @@
1414
/// \author Francesca Ercolessi (francesca.ercolessi@cern.ch)
1515
/// \since June 1, 2021
1616

17-
#include <cmath>
18-
#include "TVector3.h"
17+
#include "../filterTables.h"
18+
19+
#include "PWGLF/DataModel/LFParticleIdentification.h"
20+
#include "PWGLF/DataModel/LFStrangenessTables.h"
21+
#include "PWGLF/Utils/strangenessBuilderHelper.h"
22+
23+
#include "Common/Core/RecoDecay.h"
24+
#include "Common/Core/TrackSelection.h"
25+
#include "Common/Core/trackUtilities.h"
26+
#include "Common/DataModel/Centrality.h"
27+
#include "Common/DataModel/EventSelection.h"
28+
#include "Common/DataModel/Multiplicity.h"
29+
#include "Common/DataModel/TrackSelectionTables.h"
30+
1931
#include "CCDB/BasicCCDBManager.h"
32+
#include "CommonConstants/PhysicsConstants.h"
33+
#include "DCAFitter/DCAFitterN.h"
2034
#include "DataFormatsParameters/GRPMagField.h"
2135
#include "DataFormatsParameters/GRPObject.h"
22-
#include "DCAFitter/DCAFitterN.h"
2336
#include "DetectorsBase/Propagator.h"
24-
#include "Framework/runDataProcessing.h"
25-
#include "Framework/AnalysisTask.h"
26-
#include "Framework/AnalysisDataModel.h"
2737
#include "Framework/ASoAHelpers.h"
38+
#include "Framework/AnalysisDataModel.h"
39+
#include "Framework/AnalysisTask.h"
40+
#include "Framework/runDataProcessing.h"
2841
#include "ReconstructionDataFormats/Track.h"
2942
#include "ReconstructionDataFormats/TrackParametrization.h"
30-
#include "Common/Core/RecoDecay.h"
31-
#include "Common/Core/trackUtilities.h"
32-
#include "PWGLF/DataModel/LFStrangenessTables.h"
33-
#include "PWGLF/DataModel/LFParticleIdentification.h"
34-
#include "Common/DataModel/EventSelection.h"
35-
#include "Common/DataModel/Centrality.h"
36-
#include "Common/DataModel/PIDResponse.h"
37-
#include "Common/Core/TrackSelection.h"
38-
#include "Common/DataModel/TrackSelectionTables.h"
39-
#include "Common/DataModel/Multiplicity.h"
40-
#include "CommonConstants/PhysicsConstants.h"
41-
#include "../filterTables.h"
42-
#include "PWGLF/Utils/strangenessBuilderHelper.h"
43+
44+
#include "TVector3.h"
45+
46+
#include <cmath>
4347

4448
using namespace o2;
4549
using namespace o2::framework;
@@ -778,7 +782,7 @@ struct strangenessFilter {
778782
}
779783

780784
for (auto& casc : cascadesBase) { // loop over cascades
781-
hCandidate->Fill(0.5); // All candidates
785+
hCandidate->Fill(0.5); // All candidates
782786

783787
const auto bachTrack = casc.bachelor_as<TrackCandidates>();
784788
const auto v0Dau = casc.v0_as<o2::aod::V0s>();

0 commit comments

Comments
 (0)