Skip to content

Commit 7998edf

Browse files
njacazionjacazio
committed
Clean PIDResponse in PWGEM
1 parent 10955de commit 7998edf

File tree

9 files changed

+107
-103
lines changed

9 files changed

+107
-103
lines changed

‎PWGEM/Dilepton/TableProducer/skimmerPrimaryTrack.cxx‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
#include "Common/Core/TableHelper.h"
1919
#include "Common/Core/trackUtilities.h"
2020
#include "Common/DataModel/CollisionAssociationTables.h"
21-
#include "Common/DataModel/PIDResponse.h"
2221
#include "Common/DataModel/PIDResponseITS.h"
2322

2423
#include "CCDB/BasicCCDBManager.h"

‎PWGEM/Dilepton/Tasks/bcCounter.cxx‎

Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -14,29 +14,31 @@
1414
// This code is for bc counter.
1515
// Please write to: daiki.sekihata@cern.ch
1616

17-
#include <string>
18-
#include <vector>
19-
#include <algorithm>
20-
#include <type_traits>
21-
#include <optional>
17+
#include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
18+
#include "PWGLF/DataModel/LFStrangenessTables.h"
2219

23-
#include "TString.h"
24-
#include "Framework/runDataProcessing.h"
25-
#include "Framework/AnalysisTask.h"
26-
#include "Framework/ASoAHelpers.h"
2720
#include "Common/Core/RecoDecay.h"
28-
#include "MathUtils/Utils.h"
29-
#include "Framework/AnalysisDataModel.h"
21+
#include "Common/DataModel/Centrality.h"
3022
#include "Common/DataModel/EventSelection.h"
3123
#include "Common/DataModel/Multiplicity.h"
32-
#include "Common/DataModel/Centrality.h"
33-
#include "Common/DataModel/Qvectors.h"
34-
#include "Common/DataModel/PIDResponse.h"
3524
#include "Common/DataModel/PIDResponseITS.h"
25+
#include "Common/DataModel/Qvectors.h"
3626
#include "Common/DataModel/TrackSelectionTables.h"
27+
3728
#include "CCDB/BasicCCDBManager.h"
38-
#include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
39-
#include "PWGLF/DataModel/LFStrangenessTables.h"
29+
#include "Framework/ASoAHelpers.h"
30+
#include "Framework/AnalysisDataModel.h"
31+
#include "Framework/AnalysisTask.h"
32+
#include "Framework/runDataProcessing.h"
33+
#include "MathUtils/Utils.h"
34+
35+
#include "TString.h"
36+
37+
#include <algorithm>
38+
#include <optional>
39+
#include <string>
40+
#include <type_traits>
41+
#include <vector>
4042

4143
using namespace o2;
4244
using namespace o2::aod;

‎PWGEM/Dilepton/Tasks/evaluateAcceptance.cxx‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
// #include "Common/DataModel/CollisionAssociationTables.h"
2525
// #include "Common/DataModel/EventSelection.h"
2626
// #include "Common/DataModel/Multiplicity.h"
27-
// #include "Common/DataModel/PIDResponse.h"
2827
// #include "Common/DataModel/TrackSelectionTables.h"
2928

3029
#include "CCDB/BasicCCDBManager.h"

‎PWGEM/PhotonMeson/Tasks/MaterialBudget.cxx‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
#include "Common/DataModel/Centrality.h"
3131
#include "Common/DataModel/EventSelection.h"
3232
#include "Common/DataModel/McCollisionExtra.h"
33-
#include "Common/DataModel/PIDResponse.h"
3433
#include "Common/DataModel/TrackSelectionTables.h"
3534

3635
#include <CommonConstants/MathConstants.h>

‎PWGEM/PhotonMeson/Tasks/MaterialBudgetMC.cxx‎

Lines changed: 30 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -14,29 +14,31 @@
1414
// This code loops over v0 photons for studying material budget.
1515
// Please write to: daiki.sekihata@cern.ch
1616

17-
#include <cstring>
18-
#include <iterator>
17+
#include "PWGEM/Dilepton/Utils/MCUtilities.h"
18+
#include "PWGEM/PhotonMeson/Core/CutsLibrary.h"
19+
#include "PWGEM/PhotonMeson/Core/HistogramsLibrary.h"
20+
#include "PWGEM/PhotonMeson/Core/PairCut.h"
21+
#include "PWGEM/PhotonMeson/Core/V0PhotonCut.h"
22+
#include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
23+
#include "PWGEM/PhotonMeson/Utils/MCUtilities.h"
24+
#include "PWGEM/PhotonMeson/Utils/PairUtilities.h"
25+
26+
#include "Common/Core/RecoDecay.h"
27+
#include "Common/DataModel/Centrality.h"
28+
#include "Common/DataModel/EventSelection.h"
29+
#include "Common/DataModel/TrackSelectionTables.h"
1930

20-
#include "TString.h"
21-
#include "Math/Vector4D.h"
22-
#include "Framework/runDataProcessing.h"
23-
#include "Framework/AnalysisTask.h"
24-
#include "Framework/AnalysisDataModel.h"
2531
#include "Framework/ASoAHelpers.h"
32+
#include "Framework/AnalysisDataModel.h"
33+
#include "Framework/AnalysisTask.h"
34+
#include "Framework/runDataProcessing.h"
2635
#include "ReconstructionDataFormats/Track.h"
27-
#include "Common/DataModel/TrackSelectionTables.h"
28-
#include "Common/DataModel/EventSelection.h"
29-
#include "Common/DataModel/Centrality.h"
30-
#include "Common/DataModel/PIDResponse.h"
31-
#include "Common/Core/RecoDecay.h"
32-
#include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
33-
#include "PWGEM/PhotonMeson/Utils/PairUtilities.h"
34-
#include "PWGEM/PhotonMeson/Utils/MCUtilities.h"
35-
#include "PWGEM/PhotonMeson/Core/V0PhotonCut.h"
36-
#include "PWGEM/PhotonMeson/Core/PairCut.h"
37-
#include "PWGEM/PhotonMeson/Core/CutsLibrary.h"
38-
#include "PWGEM/PhotonMeson/Core/HistogramsLibrary.h"
39-
#include "PWGEM/Dilepton/Utils/MCUtilities.h"
36+
37+
#include "Math/Vector4D.h"
38+
#include "TString.h"
39+
40+
#include <cstring>
41+
#include <iterator>
4042

4143
using namespace o2;
4244
using namespace o2::aod;
@@ -127,8 +129,8 @@ struct MaterialBudgetMC {
127129
THashList* list_pair_subsys_paircut = reinterpret_cast<THashList*>(list_pair_subsys_photoncut->FindObject(pair_cut_name.data()));
128130
o2::aod::pwgem::photon::histogram::DefineHistograms(list_pair_subsys_paircut, "material_budget_study", "Pair");
129131
} // end of cut3 loop pair cut
130-
} // end of probecut loop
131-
} // end of tagcut loop
132+
} // end of probecut loop
133+
} // end of tagcut loop
132134
}
133135

134136
static constexpr std::string_view pairnames[9] = {"PCMPCM", "PHOSPHOS", "EMCEMC", "PCMPHOS", "PCMEMC", "PCMDalitzEE", "PCMDalitzMuMu", "PHOSEMC", "DalitzEEDalitzEE"};
@@ -280,7 +282,7 @@ struct MaterialBudgetMC {
280282
reinterpret_cast<THnSparseF*>(list_v0->FindObject(cut.GetName())->FindObject("hs_conv_point"))->Fill(value);
281283

282284
} // end of photon loop
283-
} // end of cut loop
285+
} // end of cut loop
284286

285287
} // end of collision loop
286288
}
@@ -372,11 +374,11 @@ struct MaterialBudgetMC {
372374
value[5] = eta_cp2;
373375
reinterpret_cast<THnSparseF*>(list_pair_ss->FindObject(Form("%s_%s", tagcut.GetName(), probecut.GetName()))->FindObject(paircut.GetName())->FindObject("hs_conv_point_same"))->Fill(value);
374376
} // end of pair cut loop
375-
} // end of g2 loop
376-
} // end of g1 loop
377-
} // end of probecut loop
378-
} // end of tagcut loop
379-
} // end of collision loop
377+
} // end of g2 loop
378+
} // end of g1 loop
379+
} // end of probecut loop
380+
} // end of tagcut loop
381+
} // end of collision loop
380382
}
381383

382384
Partition<MyCollisions> grouped_collisions = cfgCentMin < o2::aod::cent::centFT0M && o2::aod::cent::centFT0M < cfgCentMax; // this goes to same event.

‎PWGEM/PhotonMeson/Tasks/OmegaMesonEMC.cxx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
#include "Common/Core/TrackSelection.h"
2323
#include "Common/DataModel/EventSelection.h"
2424
#include "Common/DataModel/Multiplicity.h"
25-
#include "Common/DataModel/PIDResponse.h"
25+
#include "Common/DataModel/PIDResponseTPC.h"
2626
#include "Common/DataModel/TrackSelectionTables.h"
2727

2828
#include "CommonConstants/MathConstants.h"

‎PWGEM/PhotonMeson/Tasks/phosQC.cxx‎

Lines changed: 22 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -14,25 +14,28 @@
1414
// This code runs loop over PHOS clusters for PHOS QC.
1515
// Please write to: daiki.sekihata@cern.ch
1616

17-
#include <array>
18-
#include "TString.h"
19-
#include "THashList.h"
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"
25-
#include "Common/Core/trackUtilities.h"
26-
#include "Common/Core/TrackSelection.h"
27-
#include "Common/DataModel/TrackSelectionTables.h"
28-
#include "Common/DataModel/EventSelection.h"
29-
#include "Common/DataModel/Centrality.h"
30-
#include "Common/DataModel/PIDResponse.h"
31-
#include "Common/Core/RecoDecay.h"
32-
#include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
33-
#include "PWGEM/PhotonMeson/Core/PHOSPhotonCut.h"
3417
#include "PWGEM/PhotonMeson/Core/CutsLibrary.h"
3518
#include "PWGEM/PhotonMeson/Core/HistogramsLibrary.h"
19+
#include "PWGEM/PhotonMeson/Core/PHOSPhotonCut.h"
20+
#include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
21+
22+
#include "Common/Core/RecoDecay.h"
23+
#include "Common/Core/TrackSelection.h"
24+
#include "Common/Core/trackUtilities.h"
25+
#include "Common/DataModel/Centrality.h"
26+
#include "Common/DataModel/EventSelection.h"
27+
#include "Common/DataModel/TrackSelectionTables.h"
28+
29+
#include "Framework/ASoAHelpers.h"
30+
#include "Framework/AnalysisDataModel.h"
31+
#include "Framework/AnalysisTask.h"
32+
#include "Framework/runDataProcessing.h"
33+
#include "ReconstructionDataFormats/Track.h"
34+
35+
#include "THashList.h"
36+
#include "TString.h"
37+
38+
#include <array>
3639

3740
using namespace o2;
3841
using namespace o2::aod;
@@ -148,8 +151,8 @@ struct phosQC {
148151
} // end of v0 loop
149152
reinterpret_cast<TH1F*>(fMainList->FindObject("Cluster")->FindObject(cut.GetName())->FindObject("hNgamma"))->Fill(ng);
150153
} // end of cut loop
151-
} // end of collision loop
152-
} // end of process
154+
} // end of collision loop
155+
} // end of process
153156

154157
void processDummy(MyCollisions const&) {}
155158

‎PWGEM/Tasks/phosAlign.cxx‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -9,35 +9,35 @@
99
// granted to it by virtue of its status as an Intergovernmental Organization
1010
// or submit itself to any jurisdiction.
1111

12-
#include <climits>
13-
#include <cstdlib>
14-
#include <map>
15-
#include <memory>
16-
#include <vector>
17-
#include "Common/Core/trackUtilities.h"
1812
#include "Common/Core/TrackSelection.h"
1913
#include "Common/Core/TrackSelectionDefaults.h"
14+
#include "Common/Core/trackUtilities.h"
2015
#include "Common/DataModel/CaloClusters.h"
21-
#include "Common/DataModel/EventSelection.h"
2216
#include "Common/DataModel/Centrality.h"
23-
#include "Common/DataModel/PIDResponse.h"
17+
#include "Common/DataModel/EventSelection.h"
18+
#include "Common/DataModel/PIDResponseTPC.h"
2419
#include "Common/DataModel/TrackSelectionTables.h"
25-
#include "ReconstructionDataFormats/TrackParametrization.h"
2620

27-
#include "Framework/ConfigParamSpec.h"
28-
#include "Framework/runDataProcessing.h"
29-
#include "Framework/AnalysisTask.h"
30-
#include "Framework/AnalysisDataModel.h"
21+
#include "CCDB/BasicCCDBManager.h"
22+
#include "CommonDataFormat/InteractionRecord.h"
23+
#include "DataFormatsParameters/GRPLHCIFData.h"
24+
#include "DataFormatsParameters/GRPMagField.h"
25+
#include "DetectorsBase/Propagator.h"
3126
#include "Framework/ASoA.h"
3227
#include "Framework/ASoAHelpers.h"
28+
#include "Framework/AnalysisDataModel.h"
29+
#include "Framework/AnalysisTask.h"
30+
#include "Framework/ConfigParamSpec.h"
3331
#include "Framework/HistogramRegistry.h"
34-
32+
#include "Framework/runDataProcessing.h"
3533
#include "PHOSBase/Geometry.h"
36-
#include "DataFormatsParameters/GRPMagField.h"
37-
#include "CommonDataFormat/InteractionRecord.h"
38-
#include "CCDB/BasicCCDBManager.h"
39-
#include "DataFormatsParameters/GRPLHCIFData.h"
40-
#include "DetectorsBase/Propagator.h"
34+
#include "ReconstructionDataFormats/TrackParametrization.h"
35+
36+
#include <climits>
37+
#include <cstdlib>
38+
#include <map>
39+
#include <memory>
40+
#include <vector>
4141

4242
/// \struct PHOS pi0 analysis
4343
/// \brief Monitoring task for PHOS related quantities

‎PWGEM/Tasks/phosNbar.cxx‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -8,30 +8,30 @@
88
// In applying this license CERN does not waive the privileges and immunities
99
// granted to it by virtue of its status as an Intergovernmental Organization
1010
// or submit itself to any jurisdiction.
11-
#include <queue>
12-
#include "TRandom.h"
13-
1411
#include "Common/Core/trackUtilities.h"
15-
#include "Framework/ConfigParamSpec.h"
16-
#include "Framework/runDataProcessing.h"
17-
#include "Framework/AnalysisTask.h"
18-
#include "Framework/AnalysisDataModel.h"
19-
#include "Framework/ASoA.h"
20-
#include "Framework/HistogramRegistry.h"
21-
#include "CommonUtils/NameConf.h"
12+
#include "Common/DataModel/CaloClusters.h"
13+
#include "Common/DataModel/EventSelection.h"
14+
#include "Common/DataModel/PIDResponseTPC.h"
15+
#include "Common/DataModel/TrackSelectionTables.h"
16+
2217
#include "CCDB/BasicCCDBManager.h"
18+
#include "CommonDataFormat/InteractionRecord.h"
19+
#include "CommonUtils/NameConf.h"
2320
#include "DataFormatsParameters/GRPLHCIFData.h"
2421
#include "DataFormatsParameters/GRPMagField.h"
2522
#include "DetectorsBase/Propagator.h"
26-
23+
#include "Framework/ASoA.h"
24+
#include "Framework/AnalysisDataModel.h"
25+
#include "Framework/AnalysisTask.h"
26+
#include "Framework/ConfigParamSpec.h"
27+
#include "Framework/HistogramRegistry.h"
28+
#include "Framework/runDataProcessing.h"
29+
#include "PHOSBase/Geometry.h"
2730
#include "ReconstructionDataFormats/Track.h"
28-
#include "Common/DataModel/EventSelection.h"
29-
#include "Common/DataModel/PIDResponse.h"
30-
#include "Common/DataModel/TrackSelectionTables.h"
31-
#include "Common/DataModel/CaloClusters.h"
3231

33-
#include "PHOSBase/Geometry.h"
34-
#include "CommonDataFormat/InteractionRecord.h"
32+
#include "TRandom.h"
33+
34+
#include <queue>
3535

3636
/// \struct phosNbar
3737
/// \brief account Nbar who's clusters appeared within PHOS

0 commit comments

Comments
 (0)