Skip to content

Please consider the following formatting changes to #15387 #143

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

Closed
alibuild wants to merge 2 commits into from
Closed

Please consider the following formatting changes to #15387 #143

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4b64f8e
Fix includes and using statements
vkucera Mar 13, 2026
3825c47
Please consider the following formatting changes
alibuild Mar 13, 2026
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
3 changes: 1 addition & 2 deletions PWGJE/Core/JetBkgSubUtils.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,6 @@

#include "PWGJE/Core/JetBkgSubUtils.h"

#include "Common/Core/RecoDecay.h"

#include <TMath.h>

#include <fastjet/AreaDefinition.hh>
Expand All @@ -29,6 +27,7 @@
#include <fastjet/tools/Subtractor.hh>

#include <algorithm>
#include <cstdlib>
#include <tuple>
#include <vector>

Expand Down
11 changes: 5 additions & 6 deletions PWGJE/Core/JetFindingUtilities.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@
#include <Framework/O2DatabasePDGPlugin.h>

#include <THn.h>
#include <TRandom3.h>

#include <fastjet/ClusterSequenceArea.hh>
#include <fastjet/PseudoJet.hh>
Expand Down Expand Up @@ -97,12 +96,12 @@ bool isTrackSelected(T const& track, int trackSelection, const U* candidate = nu
if (!jetderiveddatautilities::selectTrack(track, trackSelection)) {
return false;
}
if (candidate != nullptr) {
if (jetcandidateutilities::isDaughterTrack(track, *candidate)) {
return false;
}
if (candidate != nullptr) {
if (jetcandidateutilities::isDaughterTrack(track, *candidate)) {
return false;
}
return true;
}
return true;
}

/**
Expand Down
2 changes: 2 additions & 0 deletions PWGJE/Core/JetMatchingUtilities.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@
#include "PWGJE/Core/JetFindingUtilities.h"
#include "PWGJE/DataModel/JetReducedData.h"

#include "Common/Core/RecoDecay.h"

#include <Framework/Logger.h>

#include <TKDTree.h>
Expand Down
7 changes: 1 addition & 6 deletions PWGJE/Core/JetUtilities.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,10 @@

#include "Common/Core/RecoDecay.h"

#include <TKDTree.h>
#include <TMath.h>

#include <algorithm>
#include <cmath>
#include <cstddef>
#include <limits>
#include <stdexcept>
#include <tuple>
#include <vector>

#include <math.h>

Expand Down
1 change: 1 addition & 0 deletions PWGJE/Core/MlResponseHfTagging.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
#include <cmath>
#include <cstddef>
#include <cstdint>
#include <functional>
#include <string>
#include <utility>
#include <vector>
Expand Down
12 changes: 4 additions & 8 deletions PWGJE/Core/emcalCrossTalkEmulation.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,15 @@
#include <DataFormatsEMCAL/Constants.h>
#include <EMCALBase/Geometry.h>
#include <Framework/Array2D.h>
#include <Framework/HistogramRegistry.h>
#include <Framework/HistogramSpec.h>
#include <Framework/Logger.h>

#include <TRandom3.h>

#include <algorithm> // std::find_if
#include <array>
#include <cstddef> // size_t
#include <cstdint>
#include <cstdlib> // std::abs
#include <iomanip> // setw
#include <ios> // left and right
Expand All @@ -34,13 +37,6 @@
#include <sstream>
#include <string>
#include <vector>
// #include "Framework/OutputObjHeader.h"

// #include "Common/CCDB/EventSelectionParams.h"
#include <TH1.h>
#include <TRandom3.h>

#include <fairlogger/Logger.h>

using namespace o2;
using namespace o2::emccrosstalk;
Expand Down
3 changes: 1 addition & 2 deletions PWGJE/Core/emcalCrossTalkEmulation.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,8 @@
#include <EMCALBase/Geometry.h>
#include <Framework/Array2D.h>
#include <Framework/Configurable.h>
#include <Framework/HistogramRegistry.h>
#include <Framework/Logger.h>

#include <TH1.h>
#include <TRandom3.h>

#include <array>
Expand Down
9 changes: 5 additions & 4 deletions PWGJE/DataModel/GammaJetAnalysisTree.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,12 @@
#ifndef PWGJE_DATAMODEL_GAMMAJETANALYSISTREE_H_
#define PWGJE_DATAMODEL_GAMMAJETANALYSISTREE_H_

#include "PWGJE/Core/JetDerivedDataUtilities.h"
#include "PWGJE/DataModel/EMCALClusters.h"
#include "PWGJE/DataModel/Jet.h"
#include <Framework/AnalysisDataModel.h>

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

#include <cstdint>
#include <vector>

namespace o2::aod::gjanalysis
{
Expand Down
2 changes: 2 additions & 0 deletions PWGJE/DataModel/JetReducedData.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@

#include <Framework/ASoA.h>
#include <Framework/AnalysisDataModel.h> // IWYU pragma: keep
#include <Framework/DataTypes.h>
#include <SimulationDataFormat/MCGenProperties.h>

#include <cmath>
#include <cstdint>
Expand Down
2 changes: 2 additions & 0 deletions PWGJE/DataModel/JetReducedDataDQ.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@

#include <Framework/ASoA.h>
#include <Framework/AnalysisDataModel.h> // IWYU pragma: keep
#include <Framework/DataTypes.h>
#include <SimulationDataFormat/MCGenProperties.h>

#include <cmath>
#include <cstdint>
Expand Down
2 changes: 2 additions & 0 deletions PWGJE/DataModel/JetReducedDataV0.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@

#include <Framework/ASoA.h>
#include <Framework/AnalysisDataModel.h> // IWYU pragma: keep
#include <Framework/DataTypes.h>
#include <SimulationDataFormat/MCGenProperties.h>

#include <cmath>
#include <cstdint>
Expand Down
5 changes: 2 additions & 3 deletions PWGJE/DataModel/PhotonChargedTriggerCorrelation.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,10 @@
#define PWGJE_DATAMODEL_PHOTONCHARGEDTRIGGERCORRELATION_H_

#include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
#include "PWGEM/PhotonMeson/Utils/PCMUtilities.h"
#include "PWGJE/Core/JetDerivedDataUtilities.h"
#include "PWGJE/DataModel/Jet.h"
#include "PWGJE/DataModel/JetReducedData.h"

#include "Framework/AnalysisDataModel.h"
#include <Framework/AnalysisDataModel.h>

namespace o2::aod
{
Expand Down
5 changes: 2 additions & 3 deletions PWGJE/JetFinders/jetFinder.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,6 @@
#include "PWGJE/Core/JetDerivedDataUtilities.h"
#include "PWGJE/Core/JetFinder.h"
#include "PWGJE/Core/JetFindingUtilities.h"
#include "PWGJE/DataModel/EMCALClusterDefinition.h"
#include "PWGJE/DataModel/EMCALClusters.h"
#include "PWGJE/DataModel/Jet.h"
#include "PWGJE/DataModel/JetReducedData.h"

Expand All @@ -32,7 +30,6 @@
#include <Framework/HistogramRegistry.h>
#include <Framework/HistogramSpec.h>
#include <Framework/InitContext.h>
#include <Framework/Logger.h>
#include <Framework/O2DatabasePDGPlugin.h>
#include <Framework/runDataProcessing.h> // IWYU pragma: export

Expand All @@ -46,6 +43,8 @@
#include <string>
#include <vector>

#include <math.h>

template <typename JetTable, typename ConstituentTable, typename JetEvtWiseSubTable, typename ConstituentEvtWiseSubTable>
struct JetFinderTask {
o2::framework::Produces<JetTable> jetsTable;
Expand Down
3 changes: 2 additions & 1 deletion PWGJE/JetFinders/jetFinderHF.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@
#include <Framework/HistogramRegistry.h>
#include <Framework/HistogramSpec.h>
#include <Framework/InitContext.h>
#include <Framework/Logger.h>
#include <Framework/O2DatabasePDGPlugin.h>
#include <Framework/runDataProcessing.h> // IWYU pragma: export

Expand All @@ -45,6 +44,8 @@
#include <string>
#include <vector>

#include <math.h>

template <typename CandidateTableData, typename CandidateTableMCD, typename CandidateTableMCP, typename JetTracksSubTable, typename JetParticlesSubTable, typename JetTable, typename ConstituentTable, typename JetEvtWiseSubTable, typename ConstituentEvtWiseSubTable>
struct JetFinderHFTask {
o2::framework::Produces<JetTable> jetsTable;
Expand Down
3 changes: 2 additions & 1 deletion PWGJE/JetFinders/jetFinderHFHFBar.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@
#include <Framework/HistogramRegistry.h>
#include <Framework/HistogramSpec.h>
#include <Framework/InitContext.h>
#include <Framework/Logger.h>
#include <Framework/O2DatabasePDGPlugin.h>
#include <Framework/runDataProcessing.h> // IWYU pragma: export

Expand All @@ -45,6 +44,8 @@
#include <string>
#include <vector>

#include <math.h>

template <typename CandidateTableData, typename CandidateTableMCD, typename CandidateTableMCP, typename JetTracksSubTable, typename JetParticlesSubTable, typename JetTable, typename ConstituentTable, typename JetEvtWiseSubTable, typename ConstituentEvtWiseSubTable>
struct JetFinderHFHFBarTask {
o2::framework::Produces<JetTable> jetsTable;
Expand Down
3 changes: 2 additions & 1 deletion PWGJE/JetFinders/jetFinderV0.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@
#include <Framework/HistogramRegistry.h>
#include <Framework/HistogramSpec.h>
#include <Framework/InitContext.h>
#include <Framework/Logger.h>
#include <Framework/O2DatabasePDGPlugin.h>
#include <Framework/runDataProcessing.h> // IWYU pragma: export

Expand All @@ -41,6 +40,8 @@
#include <string>
#include <vector>

#include <math.h>

template <typename CandidateTableData, typename CandidateTableMCD, typename CandidateTableMCP, typename JetTable, typename ConstituentTable>
struct JetFinderV0Task {

Expand Down
1 change: 1 addition & 0 deletions PWGJE/TableProducer/Matching/jetMatchingMC.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
#include <Framework/AnalysisHelpers.h>
#include <Framework/Configurable.h>
#include <Framework/InitContext.h>
#include <Framework/Logger.h>

#include <vector>

Expand Down
17 changes: 10 additions & 7 deletions PWGJE/TableProducer/derivedDataProducer.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@
//
/// \author Nima Zardoshti <nima.zardoshti@cern.ch>

#include "UDHelpers.h"

#include "PWGDQ/DataModel/ReducedInfoTables.h"
#include "PWGHF/DataModel/DerivedTables.h"
#include "PWGHF/Utils/utilsBfieldCCDB.h"
Expand Down Expand Up @@ -40,25 +42,26 @@
#include "Common/DataModel/Multiplicity.h"
#include "Common/DataModel/TrackSelectionTables.h"

#include "CCDB/BasicCCDBManager.h"
#include "DetectorsBase/Propagator.h"
#include "Framework/ASoA.h"
#include "Framework/AnalysisDataModel.h"
#include "Framework/AnalysisTask.h"
#include "Framework/O2DatabasePDGPlugin.h"
#include "ReconstructionDataFormats/Vertex.h"
#include <CCDB/BasicCCDBManager.h>
#include <CommonConstants/MathConstants.h>
#include <DetectorsBase/MatLayerCylSet.h>
#include <DetectorsBase/Propagator.h>
#include <Framework/ASoA.h>
#include <Framework/AnalysisDataModel.h>
#include <Framework/AnalysisHelpers.h>
#include <Framework/AnalysisTask.h>
#include <Framework/Configurable.h>
#include <Framework/InitContext.h>
#include <Framework/O2DatabasePDGPlugin.h>
#include <Framework/runDataProcessing.h>
#include <ReconstructionDataFormats/DCA.h>
#include <ReconstructionDataFormats/Vertex.h>

#include <TRandom3.h>

#include <algorithm>
#include <cmath>
#include <cstddef>
#include <cstdint>
#include <iterator>
#include <map>
Expand Down
4 changes: 2 additions & 2 deletions PWGJE/TableProducer/derivedDataSelector.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@
#include "PWGJE/DataModel/JetReducedData.h"
#include "PWGJE/DataModel/JetReducedDataSelector.h"

#include "Framework/ASoA.h"
#include "Framework/AnalysisTask.h"
#include <Framework/ASoA.h>
#include <Framework/AnalysisHelpers.h>
#include <Framework/AnalysisTask.h>
#include <Framework/Configurable.h>
#include <Framework/DataProcessorSpec.h>
#include <Framework/InitContext.h>
Expand Down
6 changes: 3 additions & 3 deletions PWGJE/TableProducer/derivedDataTriggerProducer.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@

#include "EventFiltering/filterTables.h"

#include "Framework/ASoA.h"
#include "Framework/AnalysisDataModel.h"
#include "Framework/AnalysisTask.h"
#include <Framework/ASoA.h>
#include <Framework/AnalysisDataModel.h>
#include <Framework/AnalysisHelpers.h>
#include <Framework/AnalysisTask.h>
#include <Framework/Configurable.h>
#include <Framework/InitContext.h>
#include <Framework/runDataProcessing.h>
Expand Down
4 changes: 2 additions & 2 deletions PWGJE/TableProducer/derivedDataWriter.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@
#include "PWGJE/DataModel/JetReducedDataHF.h"
#include "PWGJE/DataModel/JetReducedDataSelector.h"

#include "Framework/ASoA.h"
#include "Framework/AnalysisTask.h"
#include <Framework/ASoA.h>
#include <Framework/AnalysisHelpers.h>
#include <Framework/AnalysisTask.h>
#include <Framework/Configurable.h>
#include <Framework/DataProcessorSpec.h>
#include <Framework/InitContext.h>
Expand Down
9 changes: 3 additions & 6 deletions PWGJE/TableProducer/emcalClusterHadronicCorrectionTask.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,21 +12,18 @@
// **Hadronic Correction in the EMCAL framework: to avoid the double counting of the charged particles' contribution in jets**
/// \author Archita Rani Dash <archita.rani.dash@cern.ch>

#include "PWGJE/DataModel/EMCALClusterDefinition.h"
#include "PWGJE/DataModel/EMCALClusters.h"
#include "PWGJE/DataModel/Jet.h"
#include "PWGJE/DataModel/JetReducedData.h"

#include "Framework/ASoA.h"
#include "Framework/AnalysisTask.h"
#include "Framework/HistogramRegistry.h"
#include <Framework/ASoA.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>

#include "TVector2.h"
#include <TF1.h>

#include <cmath>
Expand Down
3 changes: 1 addition & 2 deletions PWGJE/TableProducer/emcalCorrectionTask.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,13 +50,12 @@
#include <Framework/HistogramRegistry.h>
#include <Framework/HistogramSpec.h>
#include <Framework/InitContext.h>
#include <Framework/Logger.h>
#include <Framework/WorkflowSpec.h>
#include <Framework/runDataProcessing.h>

#include <TH1.h>

#include <fairlogger/Logger.h>

#include <GPUROOTCartesianFwd.h>

#include <cmath>
Expand Down
Loading
Loading