Skip to content

Commit 035f8a3

Browse files
committed
Merge branch 'master' into fixes-PWGCF
2 parents 0d62c8d + ed0e19a commit 035f8a3

35 files changed

+2936
-2134
lines changed

ALICE3/DataModel/OTFMCParticle.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@
2121

2222
#include <Framework/AnalysisDataModel.h>
2323

24+
#include <cstdint>
25+
2426
namespace o2::aod
2527
{
2628

ALICE3/Macros/drawFastTracker.C

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,25 @@
1414

1515
#include <DataFormatsParameters/GRPMagField.h>
1616
#include <DetectorsBase/Propagator.h>
17+
#include <Framework/Logger.h>
18+
#include <ReconstructionDataFormats/Track.h>
1719
#include <ReconstructionDataFormats/Vertex.h>
1820

1921
#include <TAxis.h>
2022
#include <TCanvas.h>
2123
#include <TDatabasePDG.h>
2224
#include <TEfficiency.h>
2325
#include <TGraph.h>
24-
#include <TH1F.h>
26+
#include <TH1.h>
2527
#include <TLatex.h>
2628
#include <TLorentzVector.h>
29+
#include <TParticlePDG.h>
30+
#include <TString.h>
31+
32+
#include <RtypesCore.h>
33+
34+
#include <cstddef>
35+
#include <vector>
2736

2837
void drawFastTracker(float magneticField = 5.f, // in units of kGauss
2938
const int nch = 100, // number of charged particles per unit rapidity

ALICE3/Macros/testFastTracker.C

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@
1515

1616
#include "ALICE3/Core/FastTracker.h"
1717

18-
#include <CCDB/BasicCCDBManager.h>
19-
#include <DataFormatsParameters/GRPLHCIFData.h>
2018
#include <Framework/Logger.h>
2119

20+
#include <string>
21+
2222
void testFastTracker(std::string geometryFile = "a3geo.ini")
2323
{
2424

DPG/Tasks/AOTTrack/PID/HMPID/hmpidTableProducer.cxx

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -11,32 +11,26 @@
1111

1212
#include "tableHMPID.h"
1313

14-
#include "Common/Core/PID/PIDTOF.h"
15-
#include "Common/Core/trackUtilities.h"
1614
#include "Common/DataModel/Centrality.h"
1715
#include "Common/DataModel/EventSelection.h"
1816
#include "Common/DataModel/Multiplicity.h"
1917
#include "Common/DataModel/PIDResponseTOF.h"
2018
#include "Common/DataModel/PIDResponseTPC.h"
2119
#include "Common/DataModel/TrackSelectionTables.h"
22-
#include "Common/TableProducer/PID/pidTOFBase.h"
2320

24-
#include "CCDB/BasicCCDBManager.h"
25-
#include "CCDB/CcdbApi.h"
21+
#include <CCDB/BasicCCDBManager.h>
2622
#include <Framework/ASoA.h>
27-
#include <Framework/ASoAHelpers.h>
2823
#include <Framework/AnalysisDataModel.h>
24+
#include <Framework/AnalysisHelpers.h>
2925
#include <Framework/AnalysisTask.h>
26+
#include <Framework/Configurable.h>
3027
#include <Framework/HistogramRegistry.h>
31-
#include <Framework/RunningWorkflowInfo.h>
28+
#include <Framework/HistogramSpec.h>
29+
#include <Framework/InitContext.h>
30+
#include <Framework/OutputObjHeader.h>
3231
#include <Framework/runDataProcessing.h>
33-
#include <ReconstructionDataFormats/DCA.h>
34-
#include <ReconstructionDataFormats/PID.h>
35-
#include <ReconstructionDataFormats/Track.h>
36-
#include <ReconstructionDataFormats/TrackParametrization.h>
37-
38-
#include <TTree.h>
3932

33+
#include <cstdint>
4034
#include <string>
4135
#include <unordered_set>
4236

DPG/Tasks/AOTTrack/PID/TOF/qaPIDTOFDynamic.cxx

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,30 @@
1616
///
1717

1818
#include "Common/DataModel/EventSelection.h"
19-
#include "Common/DataModel/FT0Corrected.h"
2019
#include "Common/DataModel/PIDResponseTOF.h"
2120
#include "Common/DataModel/TrackSelectionTables.h"
22-
#include "Common/TableProducer/PID/pidTOFBase.h"
2321

22+
#include <CCDB/BasicCCDBManager.h>
23+
#include <Framework/ASoA.h>
24+
#include <Framework/AnalysisDataModel.h>
25+
#include <Framework/AnalysisHelpers.h>
2426
#include <Framework/AnalysisTask.h>
27+
#include <Framework/Configurable.h>
28+
#include <Framework/Expressions.h>
2529
#include <Framework/HistogramRegistry.h>
30+
#include <Framework/HistogramSpec.h>
31+
#include <Framework/InitContext.h>
32+
#include <Framework/OutputObjHeader.h>
2633
#include <Framework/StaticFor.h>
2734
#include <Framework/runDataProcessing.h>
35+
#include <PID/PIDTOFParamService.h>
36+
#include <ReconstructionDataFormats/PID.h>
37+
38+
#include <TH1.h>
39+
#include <TMath.h>
40+
#include <TString.h>
41+
42+
#include <string_view>
2843

2944
using namespace o2;
3045
using namespace o2::framework;

0 commit comments

Comments
 (0)