Skip to content

[PWGHF] Fix includes #12032

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 3 commits into from
Jul 12, 2025
Merged

[PWGHF] Fix includes #12032

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
aa559f5
Fix include style
vkucera Jul 12, 2025
34b4c15
IWYU
vkucera Jul 12, 2025
a55f236
Adjust paths
vkucera Jul 12, 2025
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
2 changes: 2 additions & 0 deletions PWGHF/D2H/Macros/HFInvMassFitter.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2019-2020 CERN and copyright holders of ALICE O2.

Check failure on line 1 in PWGHF/D2H/Macros/HFInvMassFitter.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[name/workflow-file] 

Name of a workflow file must match the name of the main struct in it (without the PWG prefix). (Class implementation files should be in "Core" directories.)
// See https://alice-o2.web.cern.ch/copyright for details of the copyright holders.
// All rights not expressly granted are reserved.
//
Expand Down Expand Up @@ -49,6 +49,8 @@
#include <array>
#include <cmath>
#include <cstring>
#include <stdexcept>
#include <string>

using namespace RooFit;

Expand Down
5 changes: 4 additions & 1 deletion PWGHF/D2H/TableProducer/dataCreatorCharmHadPiReduced.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2019-2020 CERN and copyright holders of ALICE O2.

Check failure on line 1 in PWGHF/D2H/TableProducer/dataCreatorCharmHadPiReduced.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[pwghf/struct-member-order] 

Declare struct members in the conventional order. See the PWGHF coding guidelines.
// See https://alice-o2.web.cern.ch/copyright for details of the copyright holders.
// All rights not expressly granted are reserved.
//
Expand Down Expand Up @@ -38,7 +38,6 @@
#include "Common/DataModel/Qvectors.h"
#include "Common/DataModel/TrackSelectionTables.h"

#include "Framework/RunningWorkflowInfo.h"
#include <CCDB/BasicCCDBManager.h>
#include <CommonConstants/PhysicsConstants.h>
#include <DCAFitter/DCAFitterN.h>
Expand All @@ -50,11 +49,13 @@
#include <Framework/AnalysisTask.h>
#include <Framework/Array2D.h>
#include <Framework/Configurable.h>
#include <Framework/DeviceSpec.h>
#include <Framework/HistogramRegistry.h>
#include <Framework/HistogramSpec.h>
#include <Framework/InitContext.h>
#include <Framework/Logger.h>
#include <Framework/O2DatabasePDGPlugin.h>
#include <Framework/RunningWorkflowInfo.h>
#include <Framework/runDataProcessing.h>
#include <ReconstructionDataFormats/DCA.h>
#include <ReconstructionDataFormats/Track.h>
Expand All @@ -63,6 +64,8 @@
#include <TPDGCode.h>
#include <TString.h>

#include <Rtypes.h>

#include <algorithm>
#include <array>
#include <cstddef>
Expand Down Expand Up @@ -244,7 +247,7 @@
Preslice<CandsLcFiltered> candsLcPerCollision = aod::track_association::collisionId;
Preslice<CandsLcFilteredWithMl> candsLcPerCollisionWithMl = aod::track_association::collisionId;
Preslice<aod::TrackAssoc> trackIndicesPerCollision = aod::track_association::collisionId;
PresliceUnsorted<CollisionsWCentAndMcLabels> colPerMcCollision = aod::mccollisionlabel::mcCollisionId;

Check failure on line 250 in PWGHF/D2H/TableProducer/dataCreatorCharmHadPiReduced.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[pwghf/struct-member-order] 

HfDataCreatorCharmHadPiReduced: PresliceUnsorted< appears too early (before end of Preslice<).
Preslice<aod::McParticles> mcParticlesPerMcCollision = aod::mcparticle::mcCollisionId;

std::shared_ptr<TH1> hCandidatesD0, hCandidatesDPlus, hCandidatesDs, hCandidatesLc;
Expand Down
1 change: 1 addition & 0 deletions PWGHF/D2H/TableProducer/dataCreatorCharmResoReduced.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@
#include <cstdint>
#include <map>
#include <string>
#include <type_traits>
#include <vector>

using namespace o2;
Expand Down
4 changes: 3 additions & 1 deletion PWGHF/D2H/TableProducer/dataCreatorJpsiHadReduced.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,14 +27,14 @@
#include "PWGHF/Utils/utilsTrkCandHf.h"

#include "Common/Core/RecoDecay.h"
#include "Common/Core/TrackSelectorPID.h"
#include "Common/Core/trackUtilities.h"
#include "Common/DataModel/CollisionAssociationTables.h"
#include "Common/DataModel/EventSelection.h"
#include "Common/DataModel/PIDResponseTOF.h"
#include "Common/DataModel/PIDResponseTPC.h"
#include "Common/DataModel/TrackSelectionTables.h"

#include "Framework/RunningWorkflowInfo.h"
#include <CCDB/BasicCCDBManager.h>
#include <CommonConstants/PhysicsConstants.h>
#include <DCAFitter/DCAFitterN.h>
Expand All @@ -46,11 +46,13 @@
#include <Framework/AnalysisTask.h>
#include <Framework/Array2D.h>
#include <Framework/Configurable.h>
#include <Framework/DeviceSpec.h>
#include <Framework/HistogramRegistry.h>
#include <Framework/HistogramSpec.h>
#include <Framework/InitContext.h>
#include <Framework/Logger.h>
#include <Framework/O2DatabasePDGPlugin.h>
#include <Framework/RunningWorkflowInfo.h>
#include <Framework/WorkflowSpec.h>
#include <Framework/runDataProcessing.h>
#include <ReconstructionDataFormats/DCA.h>
Expand Down
2 changes: 2 additions & 0 deletions PWGHF/D2H/Tasks/taskBplusToJpsiKReduced.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
#include "Common/Core/TrackSelectorPID.h"

#include <CCDB/CcdbApi.h>
#include <CommonConstants/MathConstants.h>
#include <CommonConstants/PhysicsConstants.h>
#include <Framework/ASoA.h>
#include <Framework/AnalysisHelpers.h>
Expand All @@ -45,6 +46,7 @@
#include <Rtypes.h>

#include <array>
#include <cmath>
#include <cstdint>
#include <numeric>
#include <string>
Expand Down
2 changes: 2 additions & 0 deletions PWGHF/D2H/Tasks/taskBsToJpsiPhiReduced.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
#include "Common/Core/TrackSelectorPID.h"

#include <CCDB/CcdbApi.h>
#include <CommonConstants/MathConstants.h>
#include <CommonConstants/PhysicsConstants.h>
#include <Framework/ASoA.h>
#include <Framework/AnalysisHelpers.h>
Expand All @@ -46,6 +47,7 @@
#include <Rtypes.h>

#include <array>
#include <cmath>
#include <cstdint>
#include <numeric>
#include <string>
Expand Down
11 changes: 7 additions & 4 deletions PWGHF/D2H/Tasks/taskCharmPolarisation.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@

#include "Common/Core/EventPlaneHelper.h"
#include "Common/Core/RecoDecay.h"
#include "Common/DataModel/Centrality.h"
#include "Common/DataModel/EventSelection.h"
#include "Common/DataModel/Qvectors.h"

#include <CommonConstants/MathConstants.h>
Expand All @@ -49,6 +51,7 @@
#include <TRandom3.h>

#include <array>
#include <cassert>
#include <cmath>
#include <cstdint>
#include <cstdlib>
Expand Down Expand Up @@ -655,10 +658,10 @@ struct HfTaskCharmPolarisation {
if (activateTrackingSys) {
hEPaxes.insert(hEPaxes.end(), {thnAxisAbsEtaTrackMin, thnAxisNumItsClsMin, thnAxisNumTpcClsMin});
}
if (nBkgRotations > 0) {
hEPaxes.push_back(thnAxisIsRotatedCandidate);
}
registry.add("hEP", "THn for polarisation studies with cosThStar w.r.t. event plane axis and BDT scores", HistType::kTHnSparseF, hEPaxes);
if (nBkgRotations > 0) {
hEPaxes.push_back(thnAxisIsRotatedCandidate);
}
registry.add("hEP", "THn for polarisation studies with cosThStar w.r.t. event plane axis and BDT scores", HistType::kTHnSparseF, hEPaxes);
}
}

Expand Down
1 change: 1 addition & 0 deletions PWGHF/D2H/Tasks/taskOmegac0ToOmegapi.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@

#include <Framework/ASoA.h>
#include <Framework/AnalysisDataModel.h>
#include <Framework/AnalysisHelpers.h>
#include <Framework/AnalysisTask.h>
#include <Framework/Configurable.h>
#include <Framework/HistogramRegistry.h>
Expand Down
19 changes: 18 additions & 1 deletion PWGHF/D2H/Tasks/taskXic0ToXiPi.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,31 @@

#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 "Common/Core/RecoDecay.h"
#include "Common/DataModel/Centrality.h"
#include "Common/DataModel/EventSelection.h"

#include <Framework/ASoA.h>
#include <Framework/AnalysisDataModel.h>
#include <Framework/AnalysisTask.h>
#include <Framework/Configurable.h>
#include <Framework/Expressions.h>
#include <Framework/HistogramRegistry.h>
#include <Framework/HistogramSpec.h>
#include <Framework/InitContext.h>
#include <Framework/SliceCache.h>
#include <Framework/runDataProcessing.h>

#include <THnSparse.h>

#include <Rtypes.h>

#include <array>
#include <cstdint>
#include <numeric>
#include <vector>

using namespace o2;
Expand Down
2 changes: 1 addition & 1 deletion PWGHF/D2H/Utils/utilsRedDataFormat.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
#include "PWGHF/Core/CentralityEstimation.h"
#include "PWGHF/Utils/utilsEvSelHf.h"

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

#include <Rtypes.h>
Expand Down
2 changes: 1 addition & 1 deletion PWGHF/HFC/TableProducer/correlatorD0D0bar.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,14 @@

#include "Common/Core/RecoDecay.h"

#include "Framework/HistogramRegistry.h"
#include <CommonConstants/MathConstants.h>
#include <CommonConstants/PhysicsConstants.h>
#include <Framework/ASoA.h>
#include <Framework/AnalysisDataModel.h>
#include <Framework/AnalysisHelpers.h>
#include <Framework/AnalysisTask.h>
#include <Framework/Configurable.h>
#include <Framework/HistogramRegistry.h>
#include <Framework/HistogramSpec.h>
#include <Framework/InitContext.h>
#include <Framework/runDataProcessing.h>
Expand Down Expand Up @@ -157,10 +157,10 @@
int nTracks = 0;
if (collision.numContrib() > 1) {
for (const auto& track : tracks) {
if (track.eta() < -4.0 || track.eta() > 4.0) {

Check failure on line 160 in PWGHF/HFC/TableProducer/correlatorD0D0bar.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[magic-number] 

Avoid magic numbers in expressions. Assign the value to a clearly named variable or constant.
continue;
}
if (std::abs(track.dcaXY()) > 0.0025 || std::abs(track.dcaZ()) > 0.0025) {

Check failure on line 163 in PWGHF/HFC/TableProducer/correlatorD0D0bar.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[magic-number] 

Avoid magic numbers in expressions. Assign the value to a clearly named variable or constant.
continue;
}
nTracks++;
Expand Down Expand Up @@ -268,7 +268,7 @@
int nTracks = 0;
if (collision.numContrib() > 1) {
for (const auto& track : tracks) {
if (track.eta() < -4.0 || track.eta() > 4.0) {

Check failure on line 271 in PWGHF/HFC/TableProducer/correlatorD0D0bar.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[magic-number] 

Avoid magic numbers in expressions. Assign the value to a clearly named variable or constant.
continue;
}
if (std::abs(track.dcaXY()) > 0.0025 || std::abs(track.dcaZ()) > 0.0025) {
Expand Down Expand Up @@ -448,8 +448,8 @@
particle2.eta() - particle1.eta(),
particle1.pt(),
particle2.pt());
entryD0D0barRecoInfo(1.864,

Check failure on line 451 in PWGHF/HFC/TableProducer/correlatorD0D0bar.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[pdg/explicit-mass] 

Avoid hard-coded particle masses. Use o2::constants::physics::Mass... instead.
1.864,

Check failure on line 452 in PWGHF/HFC/TableProducer/correlatorD0D0bar.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[pdg/explicit-mass] 

Avoid hard-coded particle masses. Use o2::constants::physics::Mass... instead.
8); // dummy information
double etaCut = 0.;
double ptCut = 0.;
Expand Down Expand Up @@ -551,8 +551,8 @@
particle2.eta() - particle1.eta(),
particle1.pt(),
particle2.pt());
entryD0D0barRecoInfo(1.864,

Check failure on line 554 in PWGHF/HFC/TableProducer/correlatorD0D0bar.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[pdg/explicit-mass] 

Avoid hard-coded particle masses. Use o2::constants::physics::Mass... instead.
1.864,

Check failure on line 555 in PWGHF/HFC/TableProducer/correlatorD0D0bar.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[pdg/explicit-mass] 

Avoid hard-coded particle masses. Use o2::constants::physics::Mass... instead.
8); // dummy information
} // end inner loop
} // end outer loop
Expand Down
2 changes: 1 addition & 1 deletion PWGHF/HFC/Tasks/taskCharmHadronsFemtoDream.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,14 @@
#include "PWGCF/FemtoDream/Core/femtoDreamParticleHisto.h"
#include "PWGCF/FemtoDream/Core/femtoDreamUtils.h"

#include "Framework/Expressions.h"
#include <CommonConstants/PhysicsConstants.h>
#include <Framework/ASoAHelpers.h>
#include <Framework/AnalysisDataModel.h>
#include <Framework/AnalysisHelpers.h>
#include <Framework/AnalysisTask.h>
#include <Framework/BinningPolicy.h>
#include <Framework/Configurable.h>
#include <Framework/Expressions.h>
#include <Framework/HistogramRegistry.h>
#include <Framework/HistogramSpec.h>
#include <Framework/InitContext.h>
Expand Down
1 change: 0 additions & 1 deletion PWGHF/HFC/Tasks/taskCorrelationDsHadrons.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@
#include <Framework/InitContext.h>
#include <Framework/Logger.h>
#include <Framework/OutputObjHeader.h>
#include <Framework/StepTHn.h>
#include <Framework/runDataProcessing.h>

#include <TH1.h>
Expand Down
1 change: 0 additions & 1 deletion PWGHF/HFL/Tasks/taskElectronWeakBoson.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@

#include <array>
#include <cmath>
#include <cstddef>
#include <cstdint>
#include <cstdlib>
#include <string>
Expand Down
2 changes: 1 addition & 1 deletion PWGHF/TableProducer/candidateSelectorLcPidMl.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
#include "Common/DataModel/PIDResponseCombined.h"
#include "Tools/ML/model.h"

#include "CCDB/CcdbApi.h"
#include <CCDB/CcdbApi.h>
#include <CommonConstants/PhysicsConstants.h>
#include <Framework/ASoA.h>
#include <Framework/AnalysisHelpers.h>
Expand Down
27 changes: 20 additions & 7 deletions PWGHF/TableProducer/candidateSelectorOmegac0Xic0ToOmegaKa.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,28 @@
/// \author Federica Zanone <federica.zanone@cern.ch>, Heidelberg University
/// \author Ruiqi Yin <ruiqi.yin@cern.ch>, Fudan University

#include "PWGHF/Core/HfMlResponse.h"

#include "Common/Core/TrackSelection.h"
#include "Common/Core/RecoDecay.h"
#include "Common/Core/TrackSelectorPID.h"

#include "CommonConstants/PhysicsConstants.h"
#include "Framework/AnalysisTask.h"
#include "Framework/runDataProcessing.h"

#include <CommonConstants/PhysicsConstants.h>
#include <Framework/ASoA.h>
#include <Framework/AnalysisDataModel.h>
#include <Framework/AnalysisHelpers.h>
#include <Framework/AnalysisTask.h>
#include <Framework/Array2D.h>
#include <Framework/Configurable.h>
#include <Framework/HistogramRegistry.h>
#include <Framework/HistogramSpec.h>
#include <Framework/InitContext.h>
#include <Framework/runDataProcessing.h>

#include <TH1.h>
#include <THnSparse.h>

#include <Rtypes.h>

#include <cstdint>
#include <cstdlib>
#include <string>
#include <vector>
// #include "PWGHF/Core/HfMlResponseOmegaKaToOmegaKa.h"
Expand Down
1 change: 1 addition & 0 deletions PWGHF/TableProducer/treeCreatorDsToKKPi.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
#include <Framework/runDataProcessing.h>

#include <cstdint>
#include <cstdlib>
#include <unordered_map>

using namespace o2;
Expand Down
2 changes: 2 additions & 0 deletions PWGHF/TableProducer/treeCreatorXic0ToXiPiKf.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@
#include <Framework/AnalysisHelpers.h>
#include <Framework/AnalysisTask.h>
#include <Framework/Configurable.h>
#include <Framework/HistogramRegistry.h>
#include <Framework/HistogramSpec.h>
#include <Framework/InitContext.h>
#include <Framework/runDataProcessing.h>

Expand Down
Loading