Skip to content

Commit 32139ad

Browse files
vkuceraalibuild
vkucera
and
alibuild
authored
[PWGJE] Include What You Use (#11550)
Co-authored-by: ALICE Builder <alibuild@users.noreply.github.com>
1 parent 2942a58 commit 32139ad

File tree

192 files changed

+2636
-1705
lines changed

Some content is hidden

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

192 files changed

+2636
-1705
lines changed

‎PWGJE/Core/FastJetUtilities.cxx‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,10 @@
1111

1212
#include "FastJetUtilities.h"
1313

14+
#include <fastjet/PseudoJet.hh>
15+
16+
#include <vector>
17+
1418
void fastjetutilities::setFastJetUserInfo(std::vector<fastjet::PseudoJet>& constituents, int index, int status)
1519
{
1620
fastjet_user_info* user_info = new fastjet_user_info(status, index); // FIXME: can setting this as a pointer be avoided?

‎PWGJE/Core/FastJetUtilities.h‎

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

20+
#include <fastjet/PseudoJet.hh>
21+
2022
#include <cmath>
21-
#include <limits>
22-
#include <numeric>
23-
#include <tuple>
2423
#include <vector>
25-
#include <string>
26-
27-
#include "fastjet/PseudoJet.hh"
28-
#include "fastjet/Selector.hh"
2924

3025
enum class JetConstituentStatus {
3126
track = 0,

‎PWGJE/Core/JetBkgSubUtils.cxx‎

Lines changed: 19 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,26 @@
1212
// jet finder task
1313
//
1414
// Author: Hadi Hassan, Universiy of Jväskylä, hadi.hassan@cern.ch
15-
#include <memory>
16-
#include <tuple>
17-
#include "Framework/Logger.h"
18-
#include "Common/Core/RecoDecay.h"
19-
#include "PWGJE/Core/JetUtilities.h"
15+
2016
#include "PWGJE/Core/JetBkgSubUtils.h"
21-
#include "PWGJE/Core/FastJetUtilities.h"
17+
18+
#include "Common/Core/RecoDecay.h"
19+
20+
#include <TMath.h>
21+
22+
#include <fastjet/AreaDefinition.hh>
23+
#include <fastjet/ClusterSequenceArea.hh>
24+
#include <fastjet/GhostedAreaSpec.hh>
25+
#include <fastjet/JetDefinition.hh>
26+
#include <fastjet/PseudoJet.hh>
27+
#include <fastjet/Selector.hh>
28+
#include <fastjet/contrib/ConstituentSubtractor.hh>
29+
#include <fastjet/tools/Subtractor.hh>
30+
31+
#include <tuple>
32+
#include <vector>
33+
34+
#include <math.h>
2235

2336
JetBkgSubUtils::JetBkgSubUtils(float jetBkgR_out, float bkgEtaMin_out, float bkgEtaMax_out, float bkgPhiMin_out, float bkgPhiMax_out, float constSubAlpha_out, float constSubRMax_out, int nHardReject_out, fastjet::GhostedAreaSpec ghostAreaSpec_out) : jetBkgR(jetBkgR_out),
2437
bkgEtaMin(bkgEtaMin_out),

‎PWGJE/Core/JetBkgSubUtils.h‎

Lines changed: 7 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -17,23 +17,16 @@
1717
#ifndef PWGJE_CORE_JETBKGSUBUTILS_H_
1818
#define PWGJE_CORE_JETBKGSUBUTILS_H_
1919

20-
#include <string>
21-
#include <memory>
20+
#include <fastjet/AreaDefinition.hh>
21+
#include <fastjet/GhostedAreaSpec.hh>
22+
#include <fastjet/JetDefinition.hh>
23+
#include <fastjet/PseudoJet.hh>
24+
#include <fastjet/Selector.hh>
25+
2226
#include <tuple>
2327
#include <vector>
24-
#include <TMath.h>
25-
26-
#include "PWGJE/Core/FastJetUtilities.h"
27-
28-
#include "fastjet/PseudoJet.hh"
29-
#include "fastjet/ClusterSequenceArea.hh"
30-
#include "fastjet/AreaDefinition.hh"
31-
#include "fastjet/JetDefinition.hh"
32-
#include "fastjet/tools/JetMedianBackgroundEstimator.hh"
33-
#include "fastjet/tools/Subtractor.hh"
34-
#include "fastjet/contrib/ConstituentSubtractor.hh"
3528

36-
#include "Framework/Logger.h"
29+
#include <math.h>
3730

3831
enum class BkgSubEstimator { none = 0,
3932
medianRho = 1,

‎PWGJE/Core/JetCandidateUtilities.h‎

Lines changed: 4 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -17,35 +17,12 @@
1717
#ifndef PWGJE_CORE_JETCANDIDATEUTILITIES_H_
1818
#define PWGJE_CORE_JETCANDIDATEUTILITIES_H_
1919

20-
#include <array>
21-
#include <vector>
22-
#include <string>
23-
#include <optional>
24-
#include <algorithm>
25-
26-
#include "Framework/AnalysisTask.h"
27-
#include "Framework/AnalysisDataModel.h"
28-
#include "Framework/ASoA.h"
29-
#include "Framework/O2DatabasePDGPlugin.h"
30-
31-
#include "Framework/Logger.h"
32-
#include "Common/Core/TrackSelection.h"
33-
#include "Common/Core/TrackSelectionDefaults.h"
34-
#include "Common/DataModel/EventSelection.h"
35-
#include "Common/DataModel/TrackSelectionTables.h"
36-
#include "PWGJE/DataModel/EMCALClusters.h"
37-
38-
#include "PWGHF/DataModel/CandidateReconstructionTables.h"
39-
#include "PWGHF/DataModel/CandidateSelectionTables.h"
40-
#include "PWGHF/DataModel/DerivedTables.h"
41-
42-
#include "PWGJE/Core/FastJetUtilities.h"
43-
#include "PWGJE/Core/JetDerivedDataUtilities.h"
44-
#include "PWGJE/Core/JetHFUtilities.h"
4520
#include "PWGJE/Core/JetDQUtilities.h"
21+
#include "PWGJE/Core/JetHFUtilities.h"
4622
#include "PWGJE/Core/JetV0Utilities.h"
47-
#include "PWGJE/Core/JetFinder.h"
48-
#include "PWGJE/DataModel/Jet.h"
23+
24+
#include <cstdint>
25+
#include <type_traits>
4926

5027
namespace jetcandidateutilities
5128
{

‎PWGJE/Core/JetDQUtilities.h‎

Lines changed: 10 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -17,31 +17,21 @@
1717
#ifndef PWGJE_CORE_JETDQUTILITIES_H_
1818
#define PWGJE_CORE_JETDQUTILITIES_H_
1919

20-
#include <array>
21-
#include <vector>
22-
#include <string>
23-
#include <optional>
20+
#include "PWGJE/DataModel/Jet.h"
2421

25-
#include <TPDGCode.h>
22+
#include "Common/Core/RecoDecay.h"
2623

27-
#include "CommonConstants/PhysicsConstants.h"
28-
#include "Framework/AnalysisTask.h"
29-
#include "Framework/AnalysisDataModel.h"
30-
#include "Framework/ASoA.h"
31-
#include "Framework/O2DatabasePDGPlugin.h"
24+
#include <CommonConstants/PhysicsConstants.h>
25+
#include <Framework/ASoA.h>
3226

33-
#include "Framework/Logger.h"
34-
#include "Common/Core/TrackSelection.h"
35-
#include "Common/Core/TrackSelectionDefaults.h"
36-
#include "Common/DataModel/EventSelection.h"
37-
#include "Common/DataModel/TrackSelectionTables.h"
27+
#include <TPDGCode.h>
3828

39-
#include "PWGDQ/DataModel/ReducedInfoTables.h"
29+
#include <Rtypes.h>
4030

41-
#include "PWGJE/Core/FastJetUtilities.h"
42-
#include "PWGJE/Core/JetDerivedDataUtilities.h"
43-
#include "PWGJE/Core/JetFinder.h"
44-
#include "PWGJE/DataModel/Jet.h"
31+
#include <array>
32+
#include <cstdint>
33+
#include <string>
34+
#include <type_traits>
4535

4636
namespace jetdqutilities
4737
{

‎PWGJE/Core/JetDerivedDataUtilities.h‎

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,17 @@
1717
#ifndef PWGJE_CORE_JETDERIVEDDATAUTILITIES_H_
1818
#define PWGJE_CORE_JETDERIVEDDATAUTILITIES_H_
1919

20-
#include <vector>
21-
#include <string>
22-
#include "Common/CCDB/TriggerAliases.h"
2320
#include "Common/CCDB/EventSelectionParams.h"
21+
#include "Common/CCDB/TriggerAliases.h"
22+
23+
#include <Rtypes.h>
24+
25+
#include <array>
26+
#include <cstddef>
27+
#include <cstdint>
28+
#include <cstdlib>
29+
#include <string>
30+
#include <vector>
2431

2532
namespace jetderiveddatautilities
2633
{
@@ -153,9 +160,9 @@ uint16_t setEventSelectionBit(T const& collision)
153160
if (collision.sel7()) {
154161
SETBIT(bit, JCollisionSel::sel7);
155162
}
156-
if (collision.alias_bit(kINT7)) {
157-
SETBIT(bit, JCollisionSel::selKINT7);
158-
}
163+
if (collision.alias_bit(kINT7)) {
164+
SETBIT(bit, JCollisionSel::selKINT7);
165+
}
159166
if (collision.selection_bit(o2::aod::evsel::kIsTriggerTVX)) {
160167
SETBIT(bit, JCollisionSel::selTVX);
161168
}

‎PWGJE/Core/JetFinder.cxx‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,13 @@
1515
/// \author Jochen Klein <jochen.klein@cern.ch>
1616

1717
#include "PWGJE/Core/JetFinder.h"
18-
#include "Framework/Logger.h"
18+
19+
#include <fastjet/ClusterSequenceArea.hh>
20+
#include <fastjet/JetDefinition.hh>
21+
#include <fastjet/PseudoJet.hh>
22+
#include <fastjet/Selector.hh>
23+
24+
#include <vector>
1925

2026
/// Sets the jet finding parameters
2127
void JetFinder::setParams()

‎PWGJE/Core/JetFinder.h‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -18,18 +18,18 @@
1818
#ifndef PWGJE_CORE_JETFINDER_H_
1919
#define PWGJE_CORE_JETFINDER_H_
2020

21-
#include <memory>
22-
#include <vector>
21+
#include <fastjet/AreaDefinition.hh>
22+
#include <fastjet/ClusterSequenceArea.hh>
23+
#include <fastjet/GhostedAreaSpec.hh>
24+
#include <fastjet/JetDefinition.hh>
25+
#include <fastjet/PseudoJet.hh>
26+
#include <fastjet/Selector.hh>
27+
28+
#include <Rtypes.h>
2329

24-
#include <TDatabasePDG.h>
25-
#include <TPDGCode.h>
26-
#include <TMath.h>
30+
#include <vector>
2731

28-
#include "fastjet/PseudoJet.hh"
29-
#include "fastjet/ClusterSequenceArea.hh"
30-
#include "fastjet/AreaDefinition.hh"
31-
#include "fastjet/JetDefinition.hh"
32-
#include "fastjet/tools/Subtractor.hh"
32+
#include <math.h>
3333

3434
enum class JetType {
3535
full = 0,

‎PWGJE/Core/JetFindingUtilities.h‎

Lines changed: 20 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -17,37 +17,31 @@
1717
#ifndef PWGJE_CORE_JETFINDINGUTILITIES_H_
1818
#define PWGJE_CORE_JETFINDINGUTILITIES_H_
1919

20-
#include <array>
21-
#include <vector>
22-
#include <string>
23-
#include <cmath>
24-
#include <memory>
25-
#include <TRandom3.h>
26-
27-
#include "Framework/AnalysisTask.h"
28-
#include "Framework/AnalysisDataModel.h"
29-
#include "Framework/ASoA.h"
30-
#include "Framework/O2DatabasePDGPlugin.h"
31-
#include "Framework/HistogramRegistry.h"
32-
33-
#include "Framework/Logger.h"
34-
#include "Common/Core/TrackSelection.h"
35-
#include "Common/Core/TrackSelectionDefaults.h"
36-
#include "Common/DataModel/EventSelection.h"
37-
#include "Common/DataModel/TrackSelectionTables.h"
38-
#include "PWGJE/DataModel/EMCALClusters.h"
39-
40-
#include "PWGHF/DataModel/CandidateReconstructionTables.h"
41-
#include "PWGHF/DataModel/CandidateSelectionTables.h"
42-
43-
// #include "PWGJE/Core/JetBkgSubUtils.h"
4420
#include "PWGJE/Core/FastJetUtilities.h"
21+
#include "PWGJE/Core/JetCandidateUtilities.h"
4522
#include "PWGJE/Core/JetDerivedDataUtilities.h"
4623
#include "PWGJE/Core/JetFinder.h"
4724
#include "PWGJE/DataModel/Jet.h"
25+
#include "PWGJE/DataModel/JetReducedData.h"
4826

49-
#include "PWGJE/Core/JetCandidateUtilities.h"
50-
#include "PWGJE/Core/JetHFUtilities.h"
27+
#include <CommonConstants/PhysicsConstants.h>
28+
#include <Framework/ASoA.h>
29+
#include <Framework/AnalysisHelpers.h>
30+
#include <Framework/O2DatabasePDGPlugin.h>
31+
32+
#include <THn.h>
33+
#include <TRandom3.h>
34+
35+
#include <fastjet/ClusterSequenceArea.hh>
36+
#include <fastjet/PseudoJet.hh>
37+
38+
#include <cmath>
39+
#include <memory>
40+
#include <string>
41+
#include <type_traits>
42+
#include <vector>
43+
44+
#include <math.h>
5145

5246
namespace jetfindingutilities
5347
{

0 commit comments

Comments
 (0)