Skip to content

Commit 7875166

Browse files
vkuceravkucera
authored
[PWGHF] Include What You Use: Make headers self-contained (#11357)
1 parent 1f0c6bd commit 7875166

File tree

69 files changed

+245
-136
lines changed

Some content is hidden

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

69 files changed

+245
-136
lines changed

‎PWGHF/Core/CentralityEstimation.h‎

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@
1616
#ifndef PWGHF_CORE_CENTRALITYESTIMATION_H_
1717
#define PWGHF_CORE_CENTRALITYESTIMATION_H_
1818

19+
#include <fairlogger/Logger.h>
20+
1921
namespace o2::hf_centrality
2022
{
2123
// centrality selection estimators
@@ -30,32 +32,27 @@ enum CentralityEstimator {
3032
};
3133

3234
template <typename T>
33-
concept hasFT0ACent = requires(T collision)
34-
{
35+
concept hasFT0ACent = requires(T collision) {
3536
collision.centFT0A();
3637
};
3738

3839
template <typename T>
39-
concept hasFT0CCent = requires(T collision)
40-
{
40+
concept hasFT0CCent = requires(T collision) {
4141
collision.centFT0C();
4242
};
4343

4444
template <typename T>
45-
concept hasFT0MCent = requires(T collision)
46-
{
45+
concept hasFT0MCent = requires(T collision) {
4746
collision.centFT0M();
4847
};
4948

5049
template <typename T>
51-
concept hasFV0ACent = requires(T collision)
52-
{
50+
concept hasFV0ACent = requires(T collision) {
5351
collision.centFV0A();
5452
};
5553

5654
template <typename T>
57-
concept hasNTracksPVCent = requires(T collision)
58-
{
55+
concept hasNTracksPVCent = requires(T collision) {
5956
collision.centNTPV();
6057
};
6158

‎PWGHF/Core/HfHelper.h‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,15 @@
1717
#ifndef PWGHF_CORE_HFHELPER_H_
1818
#define PWGHF_CORE_HFHELPER_H_
1919

20-
#include <vector>
20+
#include <Math/GenVector/Boost.h>
21+
#include <Math/Vector4D.h> // IWYU pragma: keep (do not replace with Math/Vector4Dfwd.h)
2122

22-
#include "Math/GenVector/Boost.h"
23-
#include "Math/Vector4D.h"
24-
#include <TPDGCode.h>
23+
#include <CommonConstants/MathConstants.h>
24+
#include <CommonConstants/PhysicsConstants.h>
2525

26-
#include "CommonConstants/PhysicsConstants.h"
26+
#include <array>
27+
#include <cmath>
28+
#include <vector>
2729

2830
#include "Common/Core/RecoDecay.h"
2931
#include "Common/Core/TrackSelectorPID.h"

‎PWGHF/D2H/DataModel/ReducedDataModel.h‎

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,19 @@
2323
#ifndef PWGHF_D2H_DATAMODEL_REDUCEDDATAMODEL_H_
2424
#define PWGHF_D2H_DATAMODEL_REDUCEDDATAMODEL_H_
2525

26+
#include <array>
27+
#include <cstdint>
28+
29+
#include "CommonConstants/PhysicsConstants.h"
2630
#include "Framework/AnalysisDataModel.h"
2731
#include "Framework/ASoA.h"
28-
#include "ReconstructionDataFormats/Track.h"
29-
#include "ReconstructionDataFormats/Vertex.h"
3032

3133
#include "Common/Core/RecoDecay.h"
32-
#include "Common/DataModel/PIDResponse.h"
34+
#include "Common/DataModel/Centrality.h"
35+
#include "Common/DataModel/EventSelection.h"
36+
#include "Common/DataModel/PIDResponseTOF.h"
37+
#include "Common/DataModel/PIDResponseTPC.h"
38+
#include "Common/DataModel/Qvectors.h"
3339

3440
#include "PWGHF/DataModel/CandidateReconstructionTables.h"
3541
#include "PWGHF/Utils/utilsPid.h"
@@ -506,11 +512,11 @@ using HfRedCandBs = soa::Join<HfCandBsExt, HfRedBsProngs>;
506512

507513
namespace hf_cand_lb_reduced
508514
{
509-
DECLARE_SOA_INDEX_COLUMN_FULL(Prong0, prong0, int, HfRed3Prongs, "_0"); //! Prong0 index
510-
DECLARE_SOA_INDEX_COLUMN_FULL(Prong1, prong1, int, HfRedTrackBases, "_1"); //! Prong1 index
511-
DECLARE_SOA_COLUMN(Prong0MlScoreBkg, prong0MlScoreBkg, float); //! Bkg ML score of the Lc daughter
512-
DECLARE_SOA_COLUMN(Prong0MlScorePrompt, prong0MlScorePrompt, float); //! Prompt ML score of the Lc daughter
513-
DECLARE_SOA_COLUMN(Prong0MlScoreNonprompt, prong0MlScoreNonprompt, float); //! Nonprompt ML score of the Lc daughter
515+
DECLARE_SOA_INDEX_COLUMN_FULL(Prong0, prong0, int, HfRed3Prongs, "_0"); //! Prong0 index
516+
DECLARE_SOA_INDEX_COLUMN_FULL(Prong1, prong1, int, HfRedTrackBases, "_1"); //! Prong1 index
517+
DECLARE_SOA_COLUMN(Prong0MlScoreBkg, prong0MlScoreBkg, float); //! Bkg ML score of the Lc daughter
518+
DECLARE_SOA_COLUMN(Prong0MlScorePrompt, prong0MlScorePrompt, float); //! Prompt ML score of the Lc daughter
519+
DECLARE_SOA_COLUMN(Prong0MlScoreNonprompt, prong0MlScoreNonprompt, float); //! Nonprompt ML score of the Lc daughter
514520
} // namespace hf_cand_lb_reduced
515521

516522
DECLARE_SOA_TABLE(HfRedLbProngs, "AOD", "HFREDLBPRONG", //! Table with Lb daughter indices

‎PWGHF/D2H/Macros/HFInvMassFitter.cxx‎

Lines changed: 24 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -19,22 +19,35 @@
1919

2020
#include "HFInvMassFitter.h"
2121

22-
#include <TDatabasePDG.h>
23-
#include <TLine.h>
24-
25-
#include <RooRealVar.h>
26-
#include <RooWorkspace.h>
2722
#include <RooAddPdf.h>
28-
#include <RooPlot.h>
29-
#include <RooHist.h>
3023
#include <RooDataHist.h>
3124
#include <RooExponential.h>
25+
#include <RooFitResult.h>
26+
#include <RooFormulaVar.h>
3227
#include <RooGamma.h>
33-
#include <RooPolynomial.h>
34-
#include <RooGenericPdf.h>
3528
#include <RooGaussian.h>
36-
#include <RooFormulaVar.h>
37-
#include <RooFitResult.h>
29+
#include <RooGenericPdf.h>
30+
#include <RooGlobalFunc.h>
31+
#include <RooHist.h>
32+
#include <RooPlot.h>
33+
#include <RooPolynomial.h>
34+
#include <RooRealVar.h>
35+
#include <RooWorkspace.h>
36+
37+
#include <Rtypes.h>
38+
#include <RtypesCore.h>
39+
#include <TColor.h>
40+
#include <TDatabasePDG.h>
41+
#include <TLine.h>
42+
#include <TNamed.h>
43+
#include <TPaveText.h>
44+
#include <TString.h>
45+
#include <TStyle.h>
46+
#include <TVirtualPad.h>
47+
48+
#include <array>
49+
#include <cmath>
50+
#include <cstring>
3851

3952
using namespace RooFit;
4053

‎PWGHF/D2H/Macros/HFInvMassFitter.h‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,20 +20,18 @@
2020
#ifndef PWGHF_D2H_MACROS_HFINVMASSFITTER_H_
2121
#define PWGHF_D2H_MACROS_HFINVMASSFITTER_H_
2222

23-
#include <cstdio>
24-
2523
#include <RooPlot.h>
2624
#include <RooRealVar.h>
2725
#include <RooWorkspace.h>
28-
#include <TCanvas.h>
29-
#include <TDatabasePDG.h>
26+
#include <Rtypes.h>
27+
#include <RtypesCore.h>
28+
3029
#include <TF1.h>
31-
#include <TFitResult.h>
3230
#include <TH1.h>
3331
#include <TNamed.h>
34-
#include <TPaveText.h>
35-
#include <TStyle.h>
36-
#include <TVirtualFitter.h>
32+
#include <TVirtualPad.h>
33+
34+
#include <cstdio>
3735

3836
class HFInvMassFitter : public TNamed
3937
{

‎PWGHF/D2H/TableProducer/candidateCreatorCharmResoReduced.cxx‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424

2525
#include "Common/Core/trackUtilities.h"
2626
#include "Common/DataModel/CollisionAssociationTables.h"
27-
#include "EventFiltering/PWGHF/HFFilterHelpers.h"
2827

2928
#include "PWGHF/D2H/DataModel/ReducedDataModel.h"
3029
#include "PWGHF/D2H/Core/SelectorCutsRedDataFormat.h"

‎PWGHF/D2H/TableProducer/dataCreatorCharmHadPiReduced.cxx‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,13 +37,14 @@
3737
#include "Common/DataModel/Qvectors.h"
3838

3939
#include "PWGHF/Core/HfHelper.h"
40+
#include "PWGHF/Core/SelectorCuts.h"
41+
#include "PWGHF/D2H/DataModel/ReducedDataModel.h"
42+
#include "PWGHF/D2H/Utils/utilsRedDataFormat.h"
4043
#include "PWGHF/DataModel/CandidateReconstructionTables.h"
4144
#include "PWGHF/DataModel/CandidateSelectionTables.h"
4245
#include "PWGHF/Utils/utilsBfieldCCDB.h"
4346
#include "PWGHF/Utils/utilsEvSelHf.h"
44-
#include "PWGHF/D2H/DataModel/ReducedDataModel.h"
4547
#include "PWGHF/Utils/utilsTrkCandHf.h"
46-
#include "PWGHF/D2H/Utils/utilsRedDataFormat.h"
4748

4849
using namespace o2;
4950
using namespace o2::analysis;

‎PWGHF/D2H/Tasks/taskCharmResoReduced.cxx‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
#include "Common/Core/RecoDecay.h"
2323

2424
// #include "PWGHF/Core/HfHelper.h"
25+
#include "PWGHF/Core/SelectorCuts.h"
2526
#include "PWGHF/D2H/DataModel/ReducedDataModel.h"
2627

2728
using namespace o2;

‎PWGHF/D2H/Tasks/taskD0.cxx‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,11 @@
2525

2626
#include "PWGHF/Core/CentralityEstimation.h"
2727
#include "PWGHF/Core/HfHelper.h"
28+
#include "PWGHF/Core/SelectorCuts.h"
2829
#include "PWGHF/DataModel/CandidateReconstructionTables.h"
2930
#include "PWGHF/DataModel/CandidateSelectionTables.h"
30-
#include "PWGHF/Utils/utilsEvSelHf.h"
3131
#include "PWGHF/Utils/utilsAnalysis.h"
32+
#include "PWGHF/Utils/utilsEvSelHf.h"
3233

3334
using namespace o2;
3435
using namespace o2::analysis;

‎PWGHF/D2H/Tasks/taskDplus.cxx‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,11 @@
2626

2727
#include "PWGHF/Core/CentralityEstimation.h"
2828
#include "PWGHF/Core/HfHelper.h"
29+
#include "PWGHF/Core/SelectorCuts.h"
2930
#include "PWGHF/DataModel/CandidateReconstructionTables.h"
3031
#include "PWGHF/DataModel/CandidateSelectionTables.h"
31-
#include "PWGHF/Utils/utilsEvSelHf.h"
3232
#include "PWGHF/Utils/utilsAnalysis.h"
33+
#include "PWGHF/Utils/utilsEvSelHf.h"
3334

3435
using namespace o2;
3536
using namespace o2::analysis;

0 commit comments

Comments
 (0)