Skip to content

Commit 4e3c5c1

Browse files
vkuceravkucera
committed
Fix includes and using statements
1 parent bca6d9b commit 4e3c5c1

39 files changed

+681
-480
lines changed

‎PWGMM/Lumi/Tasks/LumiFDDFT0.cxx‎

Lines changed: 24 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -10,36 +10,33 @@
1010
// or submit itself to any jurisdiction.
1111
// author: akhuntia@cern.ch
1212

13-
#include "Common/Core/TrackSelection.h"
1413
#include "Common/Core/trackUtilities.h"
1514
#include "Common/DataModel/EventSelection.h"
16-
#include "Common/DataModel/Multiplicity.h"
17-
#include "Common/DataModel/TrackSelectionTables.h"
18-
19-
#include "CCDB/BasicCCDBManager.h"
20-
#include "CCDB/CcdbApi.h"
21-
#include "CommonConstants/GeomConstants.h"
22-
#include "CommonUtils/NameConf.h"
23-
#include "DataFormatsCalibration/MeanVertexObject.h"
24-
#include "DataFormatsFDD/Digit.h"
25-
#include "DataFormatsFIT/Triggers.h"
26-
#include "DataFormatsParameters/GRPMagField.h"
27-
#include "DataFormatsParameters/GRPObject.h"
28-
#include "DetectorsBase/GeometryManager.h"
29-
#include "DetectorsBase/Propagator.h"
30-
#include "DetectorsVertexing/PVertexer.h"
31-
#include "Framework/ASoAHelpers.h"
32-
#include "Framework/AnalysisDataModel.h"
33-
#include "Framework/AnalysisTask.h"
34-
#include "Framework/HistogramRegistry.h"
35-
#include "Framework/RunningWorkflowInfo.h"
36-
#include "Framework/runDataProcessing.h"
37-
#include "ReconstructionDataFormats/DCA.h"
38-
#include "ReconstructionDataFormats/PrimaryVertex.h"
39-
#include "ReconstructionDataFormats/Vertex.h"
40-
41-
#include <array>
15+
16+
#include <CCDB/BasicCCDBManager.h>
17+
#include <CommonUtils/ConfigurableParam.h>
18+
#include <DataFormatsParameters/GRPMagField.h>
19+
#include <DetectorsBase/Propagator.h>
20+
#include <DetectorsVertexing/PVertexer.h>
21+
#include <Framework/AnalysisDataModel.h>
22+
#include <Framework/AnalysisHelpers.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+
#include <ReconstructionDataFormats/PrimaryVertex.h>
30+
#include <ReconstructionDataFormats/Track.h>
31+
#include <ReconstructionDataFormats/Vertex.h>
32+
33+
#include <RtypesCore.h>
34+
35+
#include <algorithm>
36+
#include <chrono>
4237
#include <cmath>
38+
#include <cstdint>
39+
#include <map>
4340
#include <vector>
4441

4542
using namespace o2;

‎PWGMM/Lumi/Tasks/fitLumi.cxx‎

Lines changed: 21 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -11,21 +11,25 @@
1111

1212
// author: arvind.khuntia@cern.ch
1313

14-
#include "Framework/runDataProcessing.h"
15-
#include "Framework/AnalysisTask.h"
16-
#include "Framework/AnalysisDataModel.h"
17-
#include "Common/DataModel/EventSelection.h"
18-
#include "DataFormatsFDD/Digit.h"
19-
#include "DataFormatsFIT/Triggers.h"
20-
#include "Common/DataModel/FT0Corrected.h"
21-
22-
#include "CCDB/CcdbApi.h"
23-
#include "CommonDataFormat/BunchFilling.h"
24-
#include "CCDB/BasicCCDBManager.h"
25-
#include "DataFormatsParameters/GRPObject.h"
26-
#include "DataFormatsParameters/GRPLHCIFData.h"
27-
#include "TH1F.h"
28-
#include "TH2F.h"
14+
#include <CommonConstants/LHCConstants.h>
15+
#include <DataFormatsFDD/Digit.h>
16+
#include <Framework/AnalysisDataModel.h>
17+
#include <Framework/AnalysisTask.h>
18+
#include <Framework/Configurable.h>
19+
#include <Framework/HistogramRegistry.h>
20+
#include <Framework/HistogramSpec.h>
21+
#include <Framework/InitContext.h>
22+
#include <Framework/runDataProcessing.h>
23+
24+
#include <TH1.h>
25+
#include <TH2.h>
26+
27+
#include <algorithm>
28+
#include <bitset>
29+
#include <cstdint>
30+
#include <iterator>
31+
#include <map>
32+
#include <vector>
2933

3034
using namespace o2;
3135
using namespace o2::framework;
@@ -111,7 +115,7 @@ struct VdMAO2D {
111115
registry.get<TH1>(HIST("FT0/bcVertexCollBC"))->Fill(localBC);
112116
}
113117
} // vertex
114-
} // ft0
118+
} // ft0
115119
nTF++;
116120
} // process
117121

@@ -174,7 +178,7 @@ struct VdMAO2D {
174178
}
175179

176180
} // vertex
177-
} // fdd
181+
} // fdd
178182
}
179183
PROCESS_SWITCH(VdMAO2D, processFDD, "Process FDD trigger rates for VdM", true);
180184

‎PWGMM/Lumi/Tasks/lumi.cxx‎

Lines changed: 21 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -15,43 +15,30 @@
1515
// o2-analysis-trackselection -b --isRun3 0 | o2-analysis-mm-lumi -b
1616
// --configuration json://./config.json
1717

18-
#include <array>
19-
#include <cmath>
20-
#include <iostream>
21-
#include <vector>
22-
23-
#include "Common/Core/TrackSelection.h"
2418
#include "Common/Core/trackUtilities.h"
25-
#include "Common/DataModel/EventSelection.h"
2619
#include "Common/DataModel/TrackSelectionTables.h"
2720

28-
#include "CommonUtils/NameConf.h"
29-
30-
#include "Framework/ASoAHelpers.h"
31-
#include "Framework/AnalysisDataModel.h"
32-
#include "Framework/AnalysisTask.h"
33-
#include "Framework/HistogramRegistry.h"
34-
#include "Framework/RunningWorkflowInfo.h"
35-
#include "Framework/runDataProcessing.h"
36-
37-
#include "DetectorsVertexing/PVertexer.h"
38-
39-
#include "ReconstructionDataFormats/DCA.h"
40-
#include "ReconstructionDataFormats/PrimaryVertex.h"
41-
#include "ReconstructionDataFormats/Vertex.h"
42-
43-
#include "DataFormatsParameters/GRPObject.h"
44-
#include "DataFormatsParameters/GRPMagField.h"
45-
46-
#include "DetectorsBase/GeometryManager.h"
47-
#include "DetectorsBase/Propagator.h"
48-
49-
#include "CommonConstants/GeomConstants.h"
50-
51-
#include "CCDB/BasicCCDBManager.h"
52-
#include "CCDB/CcdbApi.h"
53-
54-
#include "DataFormatsCalibration/MeanVertexObject.h"
21+
#include <CCDB/BasicCCDBManager.h>
22+
#include <CommonUtils/ConfigurableParam.h>
23+
#include <DataFormatsParameters/GRPMagField.h>
24+
#include <DetectorsBase/Propagator.h>
25+
#include <DetectorsVertexing/PVertexer.h>
26+
#include <Framework/AnalysisDataModel.h>
27+
#include <Framework/AnalysisHelpers.h>
28+
#include <Framework/AnalysisTask.h>
29+
#include <Framework/Configurable.h>
30+
#include <Framework/HistogramRegistry.h>
31+
#include <Framework/HistogramSpec.h>
32+
#include <Framework/InitContext.h>
33+
#include <Framework/runDataProcessing.h>
34+
#include <ReconstructionDataFormats/PrimaryVertex.h>
35+
#include <ReconstructionDataFormats/Track.h>
36+
#include <ReconstructionDataFormats/Vertex.h>
37+
38+
#include <chrono>
39+
#include <cmath>
40+
#include <cstdint>
41+
#include <vector>
5542

5643
namespace o2::aod
5744
{

‎PWGMM/Lumi/Tasks/lumiStability.cxx‎

Lines changed: 25 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -16,22 +16,32 @@
1616

1717
#include "Common/CCDB/EventSelectionParams.h"
1818
#include "Common/CCDB/ctpRateFetcher.h"
19-
#include "Common/DataModel/EventSelection.h"
20-
#include "Common/DataModel/TrackSelectionTables.h"
21-
22-
#include "CCDB/BasicCCDBManager.h"
23-
#include "CommonDataFormat/BunchFilling.h"
24-
#include "DataFormatsFDD/Digit.h"
25-
#include "DataFormatsFT0/Digit.h"
26-
#include "DataFormatsFV0/Digit.h"
27-
#include "DataFormatsParameters/GRPECSObject.h"
28-
#include "DataFormatsParameters/GRPLHCIFData.h"
29-
#include "Framework/ASoA.h"
30-
#include "Framework/ASoAHelpers.h"
31-
#include "Framework/AnalysisDataModel.h"
32-
#include "Framework/AnalysisTask.h"
33-
#include "Framework/runDataProcessing.h"
3419

20+
#include <CCDB/BasicCCDBManager.h>
21+
#include <CommonConstants/LHCConstants.h>
22+
#include <CommonDataFormat/BunchFilling.h>
23+
#include <DataFormatsFDD/Digit.h>
24+
#include <DataFormatsFT0/Digit.h>
25+
#include <DataFormatsFV0/Digit.h>
26+
#include <DataFormatsParameters/GRPECSObject.h>
27+
#include <DataFormatsParameters/GRPLHCIFData.h>
28+
#include <Framework/ASoA.h>
29+
#include <Framework/AnalysisDataModel.h>
30+
#include <Framework/AnalysisHelpers.h>
31+
#include <Framework/AnalysisTask.h>
32+
#include <Framework/Configurable.h>
33+
#include <Framework/HistogramRegistry.h>
34+
#include <Framework/HistogramSpec.h>
35+
#include <Framework/InitContext.h>
36+
#include <Framework/OutputObjHeader.h>
37+
#include <Framework/runDataProcessing.h>
38+
39+
#include <TH1.h>
40+
#include <TString.h>
41+
42+
#include <algorithm>
43+
#include <bitset>
44+
#include <cstdint>
3545
#include <map>
3646
#include <string>
3747
#include <utility>

‎PWGMM/Lumi/Tasks/lumiStabilityLightIons.cxx‎

Lines changed: 22 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,25 +15,39 @@
1515
/// \author Nicolas Strangmann (nicolas.strangmann@cern.ch) - Goethe University Frankfurt
1616
/// \author Stefanie Mrozinski (stefanie.mrozinski@cern.ch) - Goethe University Frankfurt
1717

18+
#include "Common/CCDB/EventSelectionParams.h"
1819
#include "Common/CCDB/ctpRateFetcher.h"
1920
#include "Common/Core/MetadataHelper.h"
20-
#include "Common/DataModel/Centrality.h"
2121
#include "Common/DataModel/EventSelection.h"
2222

23-
#include "CCDB/BasicCCDBManager.h"
24-
#include "DataFormatsParameters/AggregatedRunInfo.h"
25-
#include "DataFormatsParameters/GRPLHCIFData.h"
26-
#include "Framework/ASoA.h"
27-
#include "Framework/AnalysisDataModel.h"
28-
#include "Framework/AnalysisTask.h"
29-
#include "Framework/runDataProcessing.h"
23+
#include <CCDB/BasicCCDBManager.h>
24+
#include <CommonConstants/LHCConstants.h>
25+
#include <DataFormatsParameters/AggregatedRunInfo.h>
26+
#include <DataFormatsParameters/GRPLHCIFData.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/HistogramRegistry.h>
33+
#include <Framework/HistogramSpec.h>
34+
#include <Framework/InitContext.h>
35+
#include <Framework/OutputObjHeader.h>
36+
#include <Framework/runDataProcessing.h>
37+
38+
#include <TH1.h>
39+
#include <TH2.h>
40+
#include <TString.h>
3041

3142
#include <array>
3243
#include <bitset>
44+
#include <cstdint>
45+
#include <cstdlib>
3346
#include <limits>
3447
#include <map>
3548
#include <memory>
3649
#include <string>
50+
#include <string_view>
3751
#include <vector>
3852

3953
using namespace o2;

‎PWGMM/Lumi/Tasks/lumiStabilityPP.cxx‎

Lines changed: 23 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -17,25 +17,33 @@
1717

1818
#include "Common/CCDB/ctpRateFetcher.h"
1919
#include "Common/Core/MetadataHelper.h"
20-
#include "Common/DataModel/Centrality.h"
21-
#include "Common/DataModel/EventSelection.h"
22-
#include "Common/DataModel/FT0Corrected.h"
23-
24-
#include "CCDB/BasicCCDBManager.h"
25-
#include "DataFormatsFT0/Digit.h"
26-
#include "DataFormatsParameters/AggregatedRunInfo.h"
27-
#include "DataFormatsParameters/GRPLHCIFData.h"
28-
#include "Framework/ASoA.h"
29-
#include "Framework/AnalysisDataModel.h"
30-
#include "Framework/AnalysisTask.h"
31-
#include "Framework/runDataProcessing.h"
20+
21+
#include <CCDB/BasicCCDBManager.h>
22+
#include <CommonConstants/LHCConstants.h>
23+
#include <DataFormatsParameters/AggregatedRunInfo.h>
24+
#include <DataFormatsParameters/GRPLHCIFData.h>
25+
#include <Framework/ASoA.h>
26+
#include <Framework/AnalysisDataModel.h>
27+
#include <Framework/AnalysisHelpers.h>
28+
#include <Framework/AnalysisTask.h>
3229
#include <Framework/Array2D.h>
3330
#include <Framework/Configurable.h>
34-
35-
#include <limits>
31+
#include <Framework/HistogramRegistry.h>
32+
#include <Framework/HistogramSpec.h>
33+
#include <Framework/InitContext.h>
34+
#include <Framework/runDataProcessing.h>
35+
36+
#include <TH1.h>
37+
#include <TString.h>
38+
39+
#include <algorithm>
40+
#include <bitset>
41+
#include <cstddef>
42+
#include <cstdint>
3643
#include <map>
3744
#include <memory>
3845
#include <string>
46+
#include <string_view>
3947
#include <vector>
4048

4149
o2::common::core::MetadataHelper metadataInfo; // Metadata helper
@@ -213,7 +221,7 @@ struct LumiStabilityPP {
213221

214222
std::array<int, 2> totalLeadingBCs = {0, 0};
215223
for (int iBC = 0; iBC < o2::constants::lhc::LHCMaxBunches; iBC++) {
216-
if (bcPatternB[iBC]) { // Check if current BC is of type B
224+
if (bcPatternB[iBC]) { // Check if current BC is of type B
217225
int nonBtypeBCsBefore{0}, emptyBCsBefore{0}; // Count how many consecutive BCs before this one are non-B
218226
for (int j = 1; j <= numEmptyBCsBeforeLeadingBC->get(0u, 0u); j++) {
219227
int prevBC = (iBC - j + o2::constants::lhc::LHCMaxBunches) % o2::constants::lhc::LHCMaxBunches; // Protection for BCs at small indices to check the end of the orbit

‎PWGMM/Lumi/macros/merger.C‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,15 @@
1313
// merge all trees into one tree to construct event by event log-likelihood
1414
// function.
1515

16+
#include <TCollection.h>
17+
#include <TDirectoryFile.h>
18+
#include <TFile.h>
19+
#include <TList.h>
20+
#include <TString.h>
21+
#include <TTree.h>
22+
23+
#include <RtypesCore.h>
24+
1625
void merger()
1726
{
1827
TFile* fin = new TFile("../data/PbPb_NF/AnalysisResults_trees.root", "read");

‎PWGMM/Lumi/macros/non_fac.C‎

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,21 @@
1212
/// \since November 2021
1313
// code for fitting the luminous region for each step
1414

15+
#include <TFile.h>
16+
#include <TH1.h>
17+
#include <TMath.h>
18+
#include <TMathBase.h>
19+
#include <TMatrixD.h> // IWYU pragma: keep (do not replace with TMatrixDfwd.h)
20+
#include <TMatrixDfwd.h>
21+
#include <TMinuit.h>
22+
#include <TString.h>
23+
#include <TTree.h>
24+
25+
#include <RtypesCore.h>
26+
27+
#include <cmath>
28+
#include <iostream>
29+
1530
TFile* fin = new TFile("mergedOutput.root", "read");
1631
TTree* tin;
1732

@@ -193,7 +208,7 @@ void non_fac()
193208
FunMinuit[i]->mnexcm("MIGRAD", arglist, 2, ierflg);
194209
for (int p = 0; p < 10; p++) {
195210
FunMinuit[i]->GetParameter(p, FitRes_cntl[i][p], FitRes_stat[i][p]);
196-
cout << FitRes_cntl[i][p] << ", " << FitRes_stat[i][p] << endl;
211+
std::cout << FitRes_cntl[i][p] << ", " << FitRes_stat[i][p] << std::endl;
197212
}
198213
hResults[i] = new TH1D(Form("hResults%d", i), "", 12, 0, 12);
199214
for (int p = 0; p < 10; p++) {

0 commit comments

Comments
 (0)