Skip to content

Commit 34bfeef

Browse files
vkuceravkucera
committed
Fix includes and using statements
1 parent bca6d9b commit 34bfeef

29 files changed

+505
-286
lines changed

‎EventFiltering/PWGCF/CFFilterAll.cxx‎

Lines changed: 31 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,11 @@
1515
/// \author Laura Serksnyte, TU München, laura.serksnyte@cern.ch; Anton Riedel, TU München, anton.riedel@cern.ch; Maximilian Korwieser, TU Munich, maximilian.korwieser@cern.ch
1616

1717
#include "../filterTables.h"
18+
#include "trackUtilities.h"
1819

1920
#include "PWGLF/Utils/strangenessBuilderHelper.h"
2021

22+
#include "Common/CCDB/EventSelectionParams.h"
2123
#include "Common/Core/RecoDecay.h"
2224
#include "Common/DataModel/EventSelection.h"
2325
#include "Common/DataModel/Multiplicity.h"
@@ -26,22 +28,35 @@
2628
#include "Common/DataModel/PIDResponseTPC.h"
2729
#include "Common/DataModel/TrackSelectionTables.h"
2830

29-
#include "CCDB/BasicCCDBManager.h"
30-
#include "DCAFitter/DCAFitterN.h"
31-
#include "DataFormatsParameters/GRPMagField.h"
32-
#include "DetectorsBase/Propagator.h"
33-
#include "Framework/AnalysisDataModel.h"
34-
#include "Framework/AnalysisTask.h"
35-
#include "Framework/Configurable.h"
36-
#include "Framework/HistogramRegistry.h"
37-
#include "Framework/runDataProcessing.h"
38-
39-
#include "Math/GenVector/Boost.h"
40-
#include "Math/Vector4D.h"
41-
#include "TMath.h"
42-
43-
#include "fairlogger/Logger.h"
44-
31+
#include <CCDB/BasicCCDBManager.h>
32+
#include <CommonConstants/MathConstants.h>
33+
#include <CommonConstants/PhysicsConstants.h>
34+
#include <DCAFitter/DCAFitterN.h>
35+
#include <DataFormatsParameters/GRPMagField.h>
36+
#include <DetectorsBase/MatLayerCylSet.h>
37+
#include <DetectorsBase/Propagator.h>
38+
#include <Framework/AnalysisDataModel.h>
39+
#include <Framework/AnalysisHelpers.h>
40+
#include <Framework/AnalysisTask.h>
41+
#include <Framework/Array2D.h>
42+
#include <Framework/Configurable.h>
43+
#include <Framework/HistogramRegistry.h>
44+
#include <Framework/HistogramSpec.h>
45+
#include <Framework/InitContext.h>
46+
#include <Framework/Logger.h>
47+
#include <Framework/OutputObjHeader.h>
48+
#include <Framework/runDataProcessing.h>
49+
50+
#include <Math/GenVector/Boost.h>
51+
#include <Math/Vector4D.h> // IWYU pragma: keep (do not replace with Math/Vector4Dfwd.h)
52+
#include <Math/Vector4Dfwd.h>
53+
#include <TH1.h>
54+
#include <TH2.h>
55+
56+
#include <array>
57+
#include <cmath>
58+
#include <cstddef>
59+
#include <cstdint>
4560
#include <string>
4661
#include <vector>
4762

‎EventFiltering/PWGEM/EMPhotonFilter.cxx‎

Lines changed: 20 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,17 +14,29 @@
1414

1515
#include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
1616

17+
#include "Common/CCDB/EventSelectionParams.h"
1718
#include "Common/DataModel/CaloClusters.h"
19+
#include "Common/DataModel/EventSelection.h"
1820
#include "EventFiltering/filterTables.h"
1921

20-
#include "DataFormatsPHOS/TriggerRecord.h"
21-
#include "Framework/ASoAHelpers.h"
22-
#include "Framework/AnalysisDataModel.h"
23-
#include "Framework/AnalysisTask.h"
24-
#include "Framework/HistogramRegistry.h"
25-
#include "Framework/runDataProcessing.h"
26-
27-
#include "Math/Vector4D.h"
22+
#include <Framework/ASoAHelpers.h>
23+
#include <Framework/AnalysisDataModel.h>
24+
#include <Framework/AnalysisHelpers.h>
25+
#include <Framework/AnalysisTask.h>
26+
#include <Framework/Configurable.h>
27+
#include <Framework/HistogramRegistry.h>
28+
#include <Framework/HistogramSpec.h>
29+
#include <Framework/InitContext.h>
30+
#include <Framework/OutputObjHeader.h>
31+
#include <Framework/runDataProcessing.h>
32+
33+
#include <Math/Vector4D.h> // IWYU pragma: keep (do not replace with Math/Vector4Dfwd.h)
34+
#include <Math/Vector4Dfwd.h>
35+
#include <TH1.h>
36+
37+
#include <cmath>
38+
#include <cstdint>
39+
#include <memory>
2840

2941
using namespace o2;
3042
using namespace o2::soa;

‎EventFiltering/PWGEM/EMPhotonFilterQC.cxx‎

Lines changed: 23 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -12,18 +12,31 @@
1212
// \brief Quick QC task for CEFP for EM photon
1313
// \author daiki.sekihata@cern.ch
1414

15-
#include "Math/Vector4D.h"
16-
#include "Framework/runDataProcessing.h"
17-
#include "Framework/AnalysisTask.h"
18-
#include "Framework/AnalysisDataModel.h"
19-
#include "Framework/ASoAHelpers.h"
20-
#include "Common/DataModel/CaloClusters.h"
21-
#include "DataFormatsPHOS/TriggerRecord.h"
2215
#include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
23-
#include "PWGEM/PhotonMeson/Core/V0PhotonCut.h"
24-
#include "PWGEM/PhotonMeson/Core/CutsLibrary.h"
16+
17+
#include "Common/CCDB/EventSelectionParams.h"
18+
#include "Common/DataModel/EventSelection.h"
2519
#include "EventFiltering/filterTables.h"
26-
#include "Framework/HistogramRegistry.h"
20+
21+
#include <Framework/ASoAHelpers.h>
22+
#include <Framework/AnalysisDataModel.h>
23+
#include <Framework/AnalysisTask.h>
24+
#include <Framework/Configurable.h>
25+
#include <Framework/HistogramRegistry.h>
26+
#include <Framework/HistogramSpec.h>
27+
#include <Framework/InitContext.h>
28+
#include <Framework/runDataProcessing.h>
29+
30+
#include <Math/Vector4D.h> // IWYU pragma: keep (do not replace with Math/Vector4Dfwd.h)
31+
#include <Math/Vector4Dfwd.h>
32+
#include <TH1.h>
33+
#include <TH2.h>
34+
#include <TMath.h>
35+
36+
#include <algorithm>
37+
#include <cstdint>
38+
#include <cstdlib>
39+
#include <vector>
2740

2841
using namespace o2;
2942
using namespace o2::soa;

‎EventFiltering/PWGEM/HeavyNeutralMesonFilter.cxx‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
/// \author Nicolas Strangmann (nicolas.strangmann@cern.ch) - Goethe University Frankfurt; Maximilian Korwieser (maximilian.korwieser@cern.ch) - Technical University Munich
1515
///
1616

17+
#include "Common/CCDB/EventSelectionParams.h"
1718
#include "EventFiltering/filterTables.h"
1819
//
1920
#include "PWGEM/PhotonMeson/Utils/HNMUtilities.h"
@@ -44,7 +45,7 @@
4445
#include <Framework/runDataProcessing.h>
4546

4647
#include <Math/GenVector/Boost.h>
47-
#include <Math/Vector4D.h> // IWYU pragma: keep
48+
#include <Math/Vector4D.h> // IWYU pragma: keep (do not replace with Math/Vector4Dfwd.h)
4849
#include <Math/Vector4Dfwd.h>
4950
#include <TH1.h>
5051
#include <TString.h>

‎EventFiltering/PWGEM/globalDimuonFilter.cxx‎

Lines changed: 31 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -12,37 +12,51 @@
1212
// \brief software trigger for global dimuons
1313
// \author daiki.sekihata@cern.ch
1414

15-
#include "Common/Core/TableHelper.h"
15+
#include "Common/CCDB/EventSelectionParams.h"
1616
#include "Common/Core/fwdtrackUtilities.h"
1717
#include "Common/DataModel/CollisionAssociationTables.h"
1818
#include "Common/DataModel/EventSelection.h"
1919
#include "EventFiltering/filterTables.h"
2020

21-
#include "CCDB/BasicCCDBManager.h"
22-
#include "CommonConstants/PhysicsConstants.h"
23-
#include "DataFormatsParameters/GRPMagField.h"
24-
#include "DetectorsBase/Propagator.h"
25-
#include "Field/MagneticField.h"
26-
#include "Framework/AnalysisDataModel.h"
27-
#include "Framework/AnalysisTask.h"
28-
#include "Framework/DataTypes.h"
29-
#include "Framework/HistogramRegistry.h"
30-
#include "Framework/runDataProcessing.h"
31-
#include "GlobalTracking/MatchGlobalFwd.h"
32-
#include "MCHTracking/TrackExtrap.h"
33-
#include "MCHTracking/TrackParam.h"
34-
#include "ReconstructionDataFormats/TrackFwd.h"
35-
36-
#include "Math/Vector4D.h"
21+
#include <CCDB/BasicCCDBManager.h>
22+
#include <CCDB/CcdbApi.h>
23+
#include <CommonConstants/PhysicsConstants.h>
24+
#include <DataFormatsParameters/GRPMagField.h>
25+
#include <DetectorsBase/GeometryManager.h>
26+
#include <DetectorsBase/Propagator.h>
27+
#include <Field/MagFieldParam.h>
28+
#include <Field/MagneticField.h>
29+
#include <Framework/AnalysisDataModel.h>
30+
#include <Framework/AnalysisHelpers.h>
31+
#include <Framework/AnalysisTask.h>
32+
#include <Framework/Configurable.h>
33+
#include <Framework/DataTypes.h>
34+
#include <Framework/HistogramRegistry.h>
35+
#include <Framework/HistogramSpec.h>
36+
#include <Framework/InitContext.h>
37+
#include <Framework/OutputObjHeader.h>
38+
#include <Framework/runDataProcessing.h>
39+
#include <MCHTracking/TrackExtrap.h>
40+
#include <MathUtils/Utils.h>
41+
#include <ReconstructionDataFormats/GlobalFwdTrack.h>
42+
43+
#include <Math/Vector4D.h> // IWYU pragma: keep (do not replace with Math/Vector4Dfwd.h)
44+
#include <Math/Vector4Dfwd.h>
45+
#include <TGeoGlobalMagField.h>
46+
#include <TH1.h>
3747

3848
#include <algorithm>
49+
#include <cmath>
3950
#include <map>
51+
#include <memory>
4052
#include <string>
4153
#include <tuple>
4254
#include <unordered_map>
4355
#include <utility>
4456
#include <vector>
4557

58+
#include <math.h>
59+
4660
using namespace o2;
4761
using namespace o2::soa;
4862
using namespace o2::aod;

‎EventFiltering/PWGHF/H2fromLbFilter.cxx‎

Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,7 @@
1616

1717
#include "../filterTables.h"
1818

19-
#include "Common/Core/RecoDecay.h"
20-
#include "Common/Core/TrackSelection.h"
19+
#include "Common/CCDB/EventSelectionParams.h"
2120
#include "Common/Core/trackUtilities.h"
2221
#include "Common/DataModel/CollisionAssociationTables.h"
2322
#include "Common/DataModel/EventSelection.h"
@@ -26,20 +25,23 @@
2625
#include "Common/DataModel/PIDResponseTPC.h"
2726
#include "Common/DataModel/TrackSelectionTables.h"
2827

29-
#include "CCDB/BasicCCDBManager.h"
30-
#include "CommonConstants/PhysicsConstants.h"
31-
#include "DataFormatsParameters/GRPMagField.h"
32-
#include "DataFormatsParameters/GRPObject.h"
33-
#include "DetectorsBase/Propagator.h"
34-
#include "Framework/ASoAHelpers.h"
35-
#include "Framework/AnalysisDataModel.h"
36-
#include "Framework/AnalysisTask.h"
37-
#include "Framework/runDataProcessing.h"
38-
#include "ReconstructionDataFormats/Track.h"
39-
#include "ReconstructionDataFormats/TrackParametrization.h"
40-
41-
#include "TVector3.h"
42-
28+
#include <CCDB/BasicCCDBManager.h>
29+
#include <DataFormatsParameters/GRPMagField.h>
30+
#include <DetectorsBase/Propagator.h>
31+
#include <Framework/AnalysisDataModel.h>
32+
#include <Framework/AnalysisHelpers.h>
33+
#include <Framework/AnalysisTask.h>
34+
#include <Framework/Configurable.h>
35+
#include <Framework/HistogramRegistry.h>
36+
#include <Framework/HistogramSpec.h>
37+
#include <Framework/InitContext.h>
38+
#include <Framework/OutputObjHeader.h>
39+
#include <Framework/runDataProcessing.h>
40+
41+
#include <TH1.h>
42+
43+
#include <array>
44+
#include <chrono>
4345
#include <cmath>
4446

4547
struct H2fromLbFilter {

‎EventFiltering/PWGHF/HFFilter.cxx‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
/// \author Federica Zanone <federica.zanone@cern.ch>, Heidelberg University
2020
/// \author Antonio Palasciano <antonio.palasciano@cern.ch>, INFN Bari
2121

22+
#include "Common/CCDB/EventSelectionParams.h"
2223
#include "EventFiltering/PWGHF/HFFilterHelpers.h"
2324
#include "EventFiltering/filterTables.h"
2425
//
@@ -301,7 +302,7 @@ struct HfFilter { // Main struct for HF triggers
301302
helper.setPtRangeSoftPiSigmaC(ptCuts->get(0u, 4u), ptCuts->get(1u, 4u));
302303
helper.setPtDeltaMassRangeSigmaC(cutsPtDeltaMassCharmReso->get(0u, 6u), cutsPtDeltaMassCharmReso->get(1u, 6u), cutsPtDeltaMassCharmReso->get(0u, 7u), cutsPtDeltaMassCharmReso->get(1u, 7u), cutsPtDeltaMassCharmReso->get(0u, 8u), cutsPtDeltaMassCharmReso->get(1u, 8u), cutsPtDeltaMassCharmReso->get(0u, 9u), cutsPtDeltaMassCharmReso->get(1u, 9u), cutsPtDeltaMassCharmReso->get(2u, 6u), cutsPtDeltaMassCharmReso->get(2u, 7u), cutsPtDeltaMassCharmReso->get(2u, 8u), cutsPtDeltaMassCharmReso->get(2u, 9u));
303304
helper.setPtRangeSoftKaonXicResoToSigmaC(ptCuts->get(0u, 5u), ptCuts->get(1u, 5u));
304-
helper.setVtxConfiguration(dfStrangeness, true); // (DCAFitterN, useAbsDCA)
305+
helper.setVtxConfiguration(dfStrangeness, true); // (DCAFitterN, useAbsDCA)
305306
helper.setVtxConfiguration(dfStrangeness3, true); // (DCAFitterN, useAbsDCA)
306307
helper.setParSigmaCPr(
307308
cutsPtDeltaMassCharmReso->get(0u, 13u), // min ΔM

‎EventFiltering/PWGHF/HFFilterHelpers.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@
3434
#include <CommonConstants/MathConstants.h>
3535
#include <CommonConstants/PhysicsConstants.h>
3636
#include <DCAFitter/DCAFitterN.h>
37-
#include <MathUtils/BetheBlochAleph.h>
3837
#include <DetectorsBase/Propagator.h>
3938
#include <Framework/ASoA.h>
4039
#include <Framework/AnalysisDataModel.h>
@@ -43,6 +42,7 @@
4342
#include <Framework/HistogramRegistry.h>
4443
#include <Framework/HistogramSpec.h>
4544
#include <Framework/Logger.h>
45+
#include <MathUtils/BetheBlochAleph.h>
4646

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

‎EventFiltering/PWGJE/fullJetFilter.cxx‎

Lines changed: 39 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -12,35 +12,50 @@
1212
// Full Jet Filter
1313
// Author: Gijs van Weelden
1414

15-
#include <array>
16-
#include <cmath>
17-
#include <string>
18-
#include <string_view>
19-
#include <TMath.h>
15+
#include "../filterTables.h"
2016

21-
#include <boost/algorithm/string/case_conv.hpp>
17+
#include "PWGJE/DataModel/EMCALClusterDefinition.h"
18+
#include "PWGJE/DataModel/EMCALClusters.h"
19+
#include "PWGJE/DataModel/Jet.h"
20+
#include "PWGJE/DataModel/JetReducedData.h"
2221

23-
#include "CCDB/BasicCCDBManager.h"
24-
#include "DataFormatsCTP/Configuration.h"
25-
#include "EMCALBase/Geometry.h"
26-
#include "ReconstructionDataFormats/Track.h"
27-
#include "Framework/runDataProcessing.h"
28-
#include "Framework/AnalysisTask.h"
29-
#include "Framework/AnalysisDataModel.h"
30-
#include "Framework/ASoA.h"
31-
#include "Framework/ASoAHelpers.h"
32-
#include "Framework/HistogramRegistry.h"
33-
34-
#include "Common/DataModel/EventSelection.h"
35-
#include "Common/DataModel/TrackSelectionTables.h"
3622
#include "Common/CCDB/TriggerAliases.h"
3723

38-
#include "PWGJE/DataModel/Jet.h"
39-
#include "PWGJE/DataModel/EMCALClusters.h"
40-
#include "PWGJE/Core/JetFinder.h"
41-
#include "PWGJE/Core/FastJetUtilities.h"
24+
#include <CCDB/BasicCCDBManager.h>
25+
#include <DataFormatsCTP/Configuration.h>
26+
#include <EMCALBase/GeometryBase.h>
27+
#include <Framework/ASoA.h>
28+
#include <Framework/AnalysisDataModel.h>
29+
#include <Framework/AnalysisHelpers.h>
30+
#include <Framework/AnalysisTask.h>
31+
#include <Framework/Configurable.h>
32+
#include <Framework/InitContext.h>
33+
#include <Framework/runDataProcessing.h>
34+
35+
#include <TH1.h>
36+
#include <TH2.h>
37+
#include <TMath.h>
38+
#include <TString.h>
39+
#include <TVector2.h>
4240

43-
#include "../filterTables.h"
41+
#include <boost/algorithm/string/case_conv.hpp>
42+
43+
#include <RtypesCore.h>
44+
45+
#include <algorithm>
46+
#include <array>
47+
#include <bitset>
48+
#include <cfloat>
49+
#include <cmath>
50+
#include <cstddef>
51+
#include <cstdint>
52+
#include <iostream>
53+
#include <map>
54+
#include <ostream>
55+
#include <sstream>
56+
#include <string>
57+
#include <type_traits>
58+
#include <vector>
4459

4560
using namespace o2;
4661
using namespace o2::framework;

0 commit comments

Comments
 (0)