Skip to content

Commit 85e0b12

Browse files
authored
Merge branch 'AliceO2Group:master' into master
2 parents 893bf75 + b178c96 commit 85e0b12

File tree

225 files changed

+6893
-3545
lines changed

Some content is hidden

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

225 files changed

+6893
-3545
lines changed

.clang-format

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ IncludeCategories:
5151
Priority: 3
5252
CaseSensitive: true
5353
# O2
54-
- Regex: ^(<|")(Algorithm|CCDB|Common[A-Z]|DataFormats|DCAFitter|Detectors|EMCAL|Field|Framework|FT0|FV0|GlobalTracking|ITS|MathUtils|MFT|MCH|MID|PHOS|PID|ReconstructionDataFormats|SimulationDataFormat|TOF|TPC|ZDC).*/.*\.h
54+
- Regex: ^(<|")(Algorithm|CCDB|Common[A-Z]|DataFormats|DCAFitter|Detectors|EMCAL|Field|Framework|FT0|FV0|GlobalTracking|GPU|ITS|MathUtils|MFT|MCH|MID|PHOS|PID|ReconstructionDataFormats|SimulationDataFormat|TOF|TPC|ZDC).*/.*\.h
5555
Priority: 4
5656
CaseSensitive: true
5757
# ROOT

Common/CCDB/EventSelectionParams.cxx

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,9 @@
1818

1919
#include "EventSelectionParams.h"
2020

21+
#include <cstddef>
22+
#include <cstring>
23+
2124
namespace o2::aod::evsel
2225
{
2326
const char* selectionLabels[kNsel] = {

Common/CCDB/RCTSelectionFlags.h

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,12 @@
1919

2020
#include <CommonUtils/EnumFlags.h>
2121

22-
#include <TMath.h>
23-
24-
#include <Rtypes.h>
25-
2622
#include <algorithm>
23+
#include <concepts>
24+
#include <cstdint>
25+
#include <initializer_list>
2726
#include <stdexcept>
2827
#include <string>
29-
#include <vector>
3028

3129
namespace o2::aod::rctsel
3230
{

Common/CCDB/TriggerAliases.cxx

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,11 @@
1010
// or submit itself to any jurisdiction.
1111

1212
#include "Common/CCDB/TriggerAliases.h"
13-
#include "Framework/Logger.h"
13+
14+
#include <Framework/Logger.h>
15+
16+
#include <cstdint>
17+
#include <string>
1418

1519
std::string aliasLabels[kNaliases] = {
1620
"kINT7",

Common/CCDB/TriggerAliases.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
#define COMMON_CCDB_TRIGGERALIASES_H_
1414

1515
#include <Rtypes.h>
16+
#include <RtypesCore.h>
1617

1718
#include <cstdint>
1819
#include <map>

Common/CCDB/ctpRateFetcher.cxx

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,13 @@
1616
#include <DataFormatsCTP/Configuration.h>
1717
#include <DataFormatsCTP/Scalers.h>
1818
#include <DataFormatsParameters/GRPLHCIFData.h>
19+
#include <Framework/Logger.h>
1920

21+
#include <cmath>
22+
#include <cstddef>
23+
#include <cstdint>
2024
#include <map>
25+
#include <ostream>
2126
#include <string>
2227
#include <vector>
2328

Common/CCDB/ctpRateFetcher.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414

1515
#include <CCDB/BasicCCDBManager.h>
1616

17+
#include <cstdint>
1718
#include <string>
1819

1920
namespace o2

Common/Core/CollisionAssociation.cxx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,4 @@
1717
/// \author Sarah Herrmann <sarah.herrmann@cern.ch>, IP2I Lyon
1818
/// \author Maurice Coquet <maurice.louis.coquet@cern.ch>, CEA-Saclay/Irfu
1919

20-
#include "Common/Core/CollisionAssociation.h"
20+
#include "Common/Core/CollisionAssociation.h" // IWYU pragma: keep

Common/Core/CollisionAssociation.h

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,15 @@
2121
#define COMMON_CORE_COLLISIONASSOCIATION_H_
2222

2323
#include <CommonConstants/LHCConstants.h>
24-
#include <Framework/ASoAHelpers.h>
2524
#include <Framework/AnalysisDataModel.h>
25+
#include <Framework/DataTypes.h>
26+
#include <Framework/Logger.h>
2627

28+
#include <Rtypes.h>
29+
30+
#include <cmath>
31+
#include <cstdint>
32+
#include <cstdlib>
2733
#include <memory>
2834
#include <utility>
2935
#include <vector>

Common/Core/CollisionTypeHelper.cxx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717

1818
#include "Common/Core/CollisionTypeHelper.h"
1919

20+
#include <CommonConstants/LHCConstants.h>
2021
#include <DataFormatsParameters/GRPLHCIFData.h>
2122
#include <Framework/Logger.h>
2223

0 commit comments

Comments
 (0)