Skip to content

[PWGHF] Include What You Use: Make headers self-contained #11357

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vkucera merged 1 commit into from
May 30, 2025
Merged

[PWGHF] Include What You Use: Make headers self-contained #11357

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 7 additions & 10 deletions PWGHF/Core/CentralityEstimation.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@
#ifndef PWGHF_CORE_CENTRALITYESTIMATION_H_
#define PWGHF_CORE_CENTRALITYESTIMATION_H_

#include <fairlogger/Logger.h>

namespace o2::hf_centrality
{
// centrality selection estimators
Expand All @@ -30,32 +32,27 @@ enum CentralityEstimator {
};

template <typename T>
concept hasFT0ACent = requires(T collision)
{
concept hasFT0ACent = requires(T collision) {
collision.centFT0A();
};

template <typename T>
concept hasFT0CCent = requires(T collision)
{
concept hasFT0CCent = requires(T collision) {
collision.centFT0C();
};

template <typename T>
concept hasFT0MCent = requires(T collision)
{
concept hasFT0MCent = requires(T collision) {
collision.centFT0M();
};

template <typename T>
concept hasFV0ACent = requires(T collision)
{
concept hasFV0ACent = requires(T collision) {
collision.centFV0A();
};

template <typename T>
concept hasNTracksPVCent = requires(T collision)
{
concept hasNTracksPVCent = requires(T collision) {
collision.centNTPV();
};

Expand Down
12 changes: 7 additions & 5 deletions PWGHF/Core/HfHelper.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,15 @@
#ifndef PWGHF_CORE_HFHELPER_H_
#define PWGHF_CORE_HFHELPER_H_

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

#include "Math/GenVector/Boost.h"
#include "Math/Vector4D.h"
#include <TPDGCode.h>
#include <CommonConstants/MathConstants.h>
#include <CommonConstants/PhysicsConstants.h>

#include "CommonConstants/PhysicsConstants.h"
#include <array>
#include <cmath>
#include <vector>

#include "Common/Core/RecoDecay.h"
#include "Common/Core/TrackSelectorPID.h"
Expand Down
22 changes: 14 additions & 8 deletions PWGHF/D2H/DataModel/ReducedDataModel.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,19 @@
#ifndef PWGHF_D2H_DATAMODEL_REDUCEDDATAMODEL_H_
#define PWGHF_D2H_DATAMODEL_REDUCEDDATAMODEL_H_

#include <array>
#include <cstdint>

#include "CommonConstants/PhysicsConstants.h"
#include "Framework/AnalysisDataModel.h"
#include "Framework/ASoA.h"
#include "ReconstructionDataFormats/Track.h"
#include "ReconstructionDataFormats/Vertex.h"

#include "Common/Core/RecoDecay.h"
#include "Common/DataModel/PIDResponse.h"
#include "Common/DataModel/Centrality.h"
#include "Common/DataModel/EventSelection.h"
#include "Common/DataModel/PIDResponseTOF.h"
#include "Common/DataModel/PIDResponseTPC.h"
#include "Common/DataModel/Qvectors.h"

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

namespace hf_cand_lb_reduced
{
DECLARE_SOA_INDEX_COLUMN_FULL(Prong0, prong0, int, HfRed3Prongs, "_0"); //! Prong0 index
DECLARE_SOA_INDEX_COLUMN_FULL(Prong1, prong1, int, HfRedTrackBases, "_1"); //! Prong1 index
DECLARE_SOA_COLUMN(Prong0MlScoreBkg, prong0MlScoreBkg, float); //! Bkg ML score of the Lc daughter
DECLARE_SOA_COLUMN(Prong0MlScorePrompt, prong0MlScorePrompt, float); //! Prompt ML score of the Lc daughter
DECLARE_SOA_COLUMN(Prong0MlScoreNonprompt, prong0MlScoreNonprompt, float); //! Nonprompt ML score of the Lc daughter
DECLARE_SOA_INDEX_COLUMN_FULL(Prong0, prong0, int, HfRed3Prongs, "_0"); //! Prong0 index
DECLARE_SOA_INDEX_COLUMN_FULL(Prong1, prong1, int, HfRedTrackBases, "_1"); //! Prong1 index
DECLARE_SOA_COLUMN(Prong0MlScoreBkg, prong0MlScoreBkg, float); //! Bkg ML score of the Lc daughter
DECLARE_SOA_COLUMN(Prong0MlScorePrompt, prong0MlScorePrompt, float); //! Prompt ML score of the Lc daughter
DECLARE_SOA_COLUMN(Prong0MlScoreNonprompt, prong0MlScoreNonprompt, float); //! Nonprompt ML score of the Lc daughter
} // namespace hf_cand_lb_reduced

DECLARE_SOA_TABLE(HfRedLbProngs, "AOD", "HFREDLBPRONG", //! Table with Lb daughter indices
Expand Down
35 changes: 24 additions & 11 deletions PWGHF/D2H/Macros/HFInvMassFitter.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,22 +19,35 @@

#include "HFInvMassFitter.h"

#include <TDatabasePDG.h>
#include <TLine.h>

#include <RooRealVar.h>
#include <RooWorkspace.h>
#include <RooAddPdf.h>
#include <RooPlot.h>
#include <RooHist.h>
#include <RooDataHist.h>
#include <RooExponential.h>
#include <RooFitResult.h>
#include <RooFormulaVar.h>
#include <RooGamma.h>
#include <RooPolynomial.h>
#include <RooGenericPdf.h>
#include <RooGaussian.h>
#include <RooFormulaVar.h>
#include <RooFitResult.h>
#include <RooGenericPdf.h>
#include <RooGlobalFunc.h>
#include <RooHist.h>
#include <RooPlot.h>
#include <RooPolynomial.h>
#include <RooRealVar.h>
#include <RooWorkspace.h>

#include <Rtypes.h>
#include <RtypesCore.h>
#include <TColor.h>
#include <TDatabasePDG.h>
#include <TLine.h>
#include <TNamed.h>
#include <TPaveText.h>
#include <TString.h>
#include <TStyle.h>
#include <TVirtualPad.h>

#include <array>
#include <cmath>
#include <cstring>

using namespace RooFit;

Expand Down
14 changes: 6 additions & 8 deletions PWGHF/D2H/Macros/HFInvMassFitter.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,20 +20,18 @@
#ifndef PWGHF_D2H_MACROS_HFINVMASSFITTER_H_
#define PWGHF_D2H_MACROS_HFINVMASSFITTER_H_

#include <cstdio>

#include <RooPlot.h>
#include <RooRealVar.h>
#include <RooWorkspace.h>
#include <TCanvas.h>
#include <TDatabasePDG.h>
#include <Rtypes.h>
#include <RtypesCore.h>

#include <TF1.h>
#include <TFitResult.h>
#include <TH1.h>
#include <TNamed.h>
#include <TPaveText.h>
#include <TStyle.h>
#include <TVirtualFitter.h>
#include <TVirtualPad.h>

#include <cstdio>

class HFInvMassFitter : public TNamed
{
Expand Down
1 change: 0 additions & 1 deletion PWGHF/D2H/TableProducer/candidateCreatorCharmResoReduced.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@

#include "Common/Core/trackUtilities.h"
#include "Common/DataModel/CollisionAssociationTables.h"
#include "EventFiltering/PWGHF/HFFilterHelpers.h"

#include "PWGHF/D2H/DataModel/ReducedDataModel.h"
#include "PWGHF/D2H/Core/SelectorCutsRedDataFormat.h"
Expand Down
5 changes: 3 additions & 2 deletions PWGHF/D2H/TableProducer/dataCreatorCharmHadPiReduced.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,13 +37,14 @@
#include "Common/DataModel/Qvectors.h"

#include "PWGHF/Core/HfHelper.h"
#include "PWGHF/Core/SelectorCuts.h"
#include "PWGHF/D2H/DataModel/ReducedDataModel.h"
#include "PWGHF/D2H/Utils/utilsRedDataFormat.h"
#include "PWGHF/DataModel/CandidateReconstructionTables.h"
#include "PWGHF/DataModel/CandidateSelectionTables.h"
#include "PWGHF/Utils/utilsBfieldCCDB.h"
#include "PWGHF/Utils/utilsEvSelHf.h"
#include "PWGHF/D2H/DataModel/ReducedDataModel.h"
#include "PWGHF/Utils/utilsTrkCandHf.h"
#include "PWGHF/D2H/Utils/utilsRedDataFormat.h"

using namespace o2;
using namespace o2::analysis;
Expand Down
1 change: 1 addition & 0 deletions PWGHF/D2H/Tasks/taskCharmResoReduced.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
#include "Common/Core/RecoDecay.h"

// #include "PWGHF/Core/HfHelper.h"
#include "PWGHF/Core/SelectorCuts.h"
#include "PWGHF/D2H/DataModel/ReducedDataModel.h"

using namespace o2;
Expand Down
3 changes: 2 additions & 1 deletion PWGHF/D2H/Tasks/taskD0.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,11 @@

#include "PWGHF/Core/CentralityEstimation.h"
#include "PWGHF/Core/HfHelper.h"
#include "PWGHF/Core/SelectorCuts.h"
#include "PWGHF/DataModel/CandidateReconstructionTables.h"
#include "PWGHF/DataModel/CandidateSelectionTables.h"
#include "PWGHF/Utils/utilsEvSelHf.h"
#include "PWGHF/Utils/utilsAnalysis.h"
#include "PWGHF/Utils/utilsEvSelHf.h"

using namespace o2;
using namespace o2::analysis;
Expand Down
3 changes: 2 additions & 1 deletion PWGHF/D2H/Tasks/taskDplus.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,11 @@

#include "PWGHF/Core/CentralityEstimation.h"
#include "PWGHF/Core/HfHelper.h"
#include "PWGHF/Core/SelectorCuts.h"
#include "PWGHF/DataModel/CandidateReconstructionTables.h"
#include "PWGHF/DataModel/CandidateSelectionTables.h"
#include "PWGHF/Utils/utilsEvSelHf.h"
#include "PWGHF/Utils/utilsAnalysis.h"
#include "PWGHF/Utils/utilsEvSelHf.h"

using namespace o2;
using namespace o2::analysis;
Expand Down
3 changes: 2 additions & 1 deletion PWGHF/D2H/Tasks/taskLc.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,9 @@
#include "Framework/HistogramRegistry.h"
#include "Framework/runDataProcessing.h"

#include "PWGHF/Core/HfHelper.h"
#include "PWGHF/Core/CentralityEstimation.h"
#include "PWGHF/Core/HfHelper.h"
#include "PWGHF/Core/SelectorCuts.h"
#include "PWGHF/DataModel/CandidateReconstructionTables.h"
#include "PWGHF/DataModel/CandidateSelectionTables.h"
#include "PWGHF/Utils/utilsEvSelHf.h"
Expand Down
1 change: 1 addition & 0 deletions PWGHF/D2H/Tasks/taskLcToK0sP.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
#include "Framework/runDataProcessing.h"

#include "PWGHF/Core/HfHelper.h"
#include "PWGHF/Core/SelectorCuts.h"
#include "PWGHF/DataModel/CandidateReconstructionTables.h"
#include "PWGHF/DataModel/CandidateSelectionTables.h"

Expand Down
1 change: 1 addition & 0 deletions PWGHF/D2H/Tasks/taskSigmacToCascade.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
#include "Common/Core/TrackSelectionDefaults.h"

#include "PWGHF/Core/HfHelper.h"
#include "PWGHF/Core/SelectorCuts.h"
#include "PWGHF/DataModel/CandidateReconstructionTables.h"
#include "PWGHF/DataModel/CandidateSelectionTables.h"

Expand Down
1 change: 1 addition & 0 deletions PWGHF/D2H/Tasks/taskXic.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
#include "Framework/runDataProcessing.h"

#include "PWGHF/Core/HfHelper.h"
#include "PWGHF/Core/SelectorCuts.h"
#include "PWGHF/DataModel/CandidateReconstructionTables.h"
#include "PWGHF/DataModel/CandidateSelectionTables.h"

Expand Down
5 changes: 3 additions & 2 deletions PWGHF/D2H/Tasks/taskXicc.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
#include "Framework/HistogramRegistry.h"

#include "PWGHF/Core/HfHelper.h"
#include "PWGHF/Core/SelectorCuts.h"
#include "PWGHF/DataModel/CandidateReconstructionTables.h"
#include "PWGHF/DataModel/CandidateSelectionTables.h"

Expand Down Expand Up @@ -275,8 +276,8 @@ struct HfTaskXiccMc {
registry.fill(HIST("hPtvsEtavsYGen"), particle.pt(), particle.eta(), RecoDecay::y(particle.pVector(), o2::constants::physics::MassXiCCPlusPlus));
}
} // end of loop of MC particles
} // end of process function
}; // end of struct
} // end of process function
}; // end of struct

WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
{
Expand Down
7 changes: 6 additions & 1 deletion PWGHF/D2H/Utils/utilsRedDataFormat.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,14 @@
#ifndef PWGHF_D2H_UTILS_UTILSREDDATAFORMAT_H_
#define PWGHF_D2H_UTILS_UTILSREDDATAFORMAT_H_

#include "Framework/HistogramRegistry.h"
#include <cmath>

#include <Rtypes.h>

#include "CCDB/BasicCCDBManager.h"
#include "Framework/AnalysisHelpers.h"
#include "Framework/HistogramRegistry.h"

#include "PWGHF/Core/CentralityEstimation.h"
#include "PWGHF/Utils/utilsEvSelHf.h"

Expand Down
16 changes: 8 additions & 8 deletions PWGHF/DataModel/CandidateReconstructionTables.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,22 +18,22 @@
#ifndef PWGHF_DATAMODEL_CANDIDATERECONSTRUCTIONTABLES_H_
#define PWGHF_DATAMODEL_CANDIDATERECONSTRUCTIONTABLES_H_

#include <vector>

#include "Math/GenVector/Boost.h"
#include "Math/Vector4D.h"
#include <CommonConstants/PhysicsConstants.h>
#include <Framework/AnalysisDataModel.h>
#include <Framework/ASoA.h>

#include "CommonConstants/PhysicsConstants.h"
#include "Framework/AnalysisDataModel.h"
#include <array>
#include <cstdint>
#include <vector>

#include "ALICE3/DataModel/ECAL.h"
#include "Common/Core/RecoDecay.h"
#include "Common/DataModel/PIDResponse.h"
#include "Common/DataModel/PIDResponseTOF.h"
#include "Common/DataModel/PIDResponseTPC.h"
#include "Common/DataModel/TrackSelectionTables.h"

#include "PWGLF/DataModel/LFStrangenessTables.h"

#include "PWGHF/Core/SelectorCuts.h"
#include "PWGHF/Utils/utilsPid.h"

namespace o2::aod
Expand Down
8 changes: 2 additions & 6 deletions PWGHF/DataModel/CandidateSelectionTables.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,9 @@
#ifndef PWGHF_DATAMODEL_CANDIDATESELECTIONTABLES_H_
#define PWGHF_DATAMODEL_CANDIDATESELECTIONTABLES_H_

#include <vector>

#include "Common/Core/RecoDecay.h"
#include "Common/Core/TrackSelectorPID.h"
#include <Framework/ASoA.h>

#include "PWGHF/Core/SelectorCuts.h"
#include "PWGHF/DataModel/CandidateReconstructionTables.h"
#include <vector>

namespace o2::aod
{
Expand Down
12 changes: 6 additions & 6 deletions PWGHF/DataModel/DerivedTables.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,17 +16,17 @@
#ifndef PWGHF_DATAMODEL_DERIVEDTABLES_H_
#define PWGHF_DATAMODEL_DERIVEDTABLES_H_

#include <vector>
#include <Framework/AnalysisDataModel.h>
#include <Framework/ASoA.h>

#include "Framework/AnalysisDataModel.h"
#include "Framework/ASoA.h"
#include <sys/types.h>
#include <vector>
#include <cstdint>

#include "Common/Core/RecoDecay.h"

#include "PWGLF/DataModel/mcCentrality.h"
#include "Common/DataModel/Centrality.h"

#include "PWGHF/DataModel/CandidateReconstructionTables.h"
#include "PWGHF/DataModel/CandidateSelectionTables.h"

namespace o2::aod
{
Expand Down
Loading
Loading