Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions Common/CCDB/EventSelectionParams.cxx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2019-2020 CERN and copyright holders of ALICE O2.

Check failure on line 1 in Common/CCDB/EventSelectionParams.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[name/workflow-file]

Name of a workflow file must match the name of the main struct in it (without the PWG prefix). (Class implementation files should be in "Core" directories.)
// See https://alice-o2.web.cern.ch/copyright for details of the copyright holders.
// All rights not expressly granted are reserved.
//
Expand All @@ -18,6 +18,9 @@

#include "EventSelectionParams.h"

#include <cstddef>
#include <cstring>

namespace o2::aod::evsel
{
const char* selectionLabels[kNsel] = {
Expand Down Expand Up @@ -99,18 +102,18 @@
selectionMuonWithPileupCuts[kNoBGZNA] = 1;
selectionMuonWithoutPileupCuts[kNoBGZNA] = 1;
}
if (system == 2) { // additional ZDC checks in Ap

Check failure on line 105 in Common/CCDB/EventSelectionParams.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[magic-number]

Avoid magic numbers in expressions. Assign the value to a clearly named variable or constant.
selectionBarrel[kNoBGZNC] = 1;
selectionMuonWithPileupCuts[kNoBGZNC] = 1;
selectionMuonWithoutPileupCuts[kNoBGZNC] = 1;
}
if (system == 3) { // AA

Check failure on line 110 in Common/CCDB/EventSelectionParams.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[magic-number]

Avoid magic numbers in expressions. Assign the value to a clearly named variable or constant.
selectionBarrel[kIsBBZAC] = 1;
selectionMuonWithPileupCuts[kIsBBZAC] = 1;
selectionMuonWithoutPileupCuts[kIsBBZAC] = 1;
}
} else if (run == 2) {

Check failure on line 115 in Common/CCDB/EventSelectionParams.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[magic-number]

Avoid magic numbers in expressions. Assign the value to a clearly named variable or constant.
if (system == 0 || system == 1 || system == 2) { // pp, pA or Ap

Check failure on line 116 in Common/CCDB/EventSelectionParams.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[magic-number]

Avoid magic numbers in expressions. Assign the value to a clearly named variable or constant.
// default barrel selection
selectionBarrel[kIsBBV0A] = 1;
selectionBarrel[kIsBBV0C] = 1;
Expand Down Expand Up @@ -151,13 +154,13 @@
selectionMuonWithoutPileupCuts[kNoBGZNA] = 1;
}

if (system == 2) { // additional ZDC checks in Ap

Check failure on line 157 in Common/CCDB/EventSelectionParams.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[magic-number]

Avoid magic numbers in expressions. Assign the value to a clearly named variable or constant.
selectionBarrel[kNoBGZNC] = 1;
selectionMuonWithPileupCuts[kNoBGZNC] = 1;
selectionMuonWithoutPileupCuts[kNoBGZNC] = 1;
}

if (system == 3) { // AA

Check failure on line 163 in Common/CCDB/EventSelectionParams.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[magic-number]

Avoid magic numbers in expressions. Assign the value to a clearly named variable or constant.
selectionBarrel[kIsBBV0A] = 1;
selectionBarrel[kIsBBV0C] = 1;
selectionBarrel[kIsBBZAC] = 1;
Expand Down Expand Up @@ -207,7 +210,7 @@
return selectionBarrel;
} else if (iSelection == 1) {
return selectionMuonWithPileupCuts;
} else if (iSelection == 2) {

Check failure on line 213 in Common/CCDB/EventSelectionParams.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[magic-number]

Avoid magic numbers in expressions. Assign the value to a clearly named variable or constant.
return selectionMuonWithoutPileupCuts;
}
return NULL;
Expand Down
8 changes: 3 additions & 5 deletions Common/CCDB/RCTSelectionFlags.h
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,12 @@

#include <CommonUtils/EnumFlags.h>

#include <TMath.h>

#include <Rtypes.h>

#include <algorithm>
#include <concepts>
#include <cstdint>
#include <initializer_list>
#include <stdexcept>
#include <string>
#include <vector>

namespace o2::aod::rctsel
{
Expand Down
6 changes: 5 additions & 1 deletion Common/CCDB/TriggerAliases.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,11 @@
// or submit itself to any jurisdiction.

#include "Common/CCDB/TriggerAliases.h"
#include "Framework/Logger.h"

#include <Framework/Logger.h>

#include <cstdint>
#include <string>

std::string aliasLabels[kNaliases] = {
"kINT7",
Expand Down Expand Up @@ -44,9 +48,9 @@

void TriggerAliases::AddClassIdToAlias(uint32_t aliasId, int classId)
{
if (classId < 0 || classId > 99) {

Check failure on line 51 in Common/CCDB/TriggerAliases.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[magic-number]

Avoid magic numbers in expressions. Assign the value to a clearly named variable or constant.
LOGF(fatal, "Invalid classId = %d for aliasId = %d\n", classId, aliasId);
} else if (classId < 50) {

Check failure on line 53 in Common/CCDB/TriggerAliases.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[magic-number]

Avoid magic numbers in expressions. Assign the value to a clearly named variable or constant.
mAliasToTriggerMask[aliasId] |= 1ull << classId;
} else {
mAliasToTriggerMaskNext50[aliasId] |= 1ull << (classId - 50);
Expand Down
1 change: 1 addition & 0 deletions Common/CCDB/TriggerAliases.h
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
#define COMMON_CCDB_TRIGGERALIASES_H_

#include <Rtypes.h>
#include <RtypesCore.h>

#include <cstdint>
#include <map>
Expand Down
5 changes: 5 additions & 0 deletions Common/CCDB/ctpRateFetcher.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,13 @@
#include <DataFormatsCTP/Configuration.h>
#include <DataFormatsCTP/Scalers.h>
#include <DataFormatsParameters/GRPLHCIFData.h>
#include <Framework/Logger.h>

#include <cmath>
#include <cstddef>
#include <cstdint>
#include <map>
#include <ostream>
#include <string>
#include <vector>

Expand Down
1 change: 1 addition & 0 deletions Common/CCDB/ctpRateFetcher.h
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@

#include <CCDB/BasicCCDBManager.h>

#include <cstdint>
#include <string>

namespace o2
Expand Down
2 changes: 1 addition & 1 deletion Common/Core/CollisionAssociation.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@
/// \author Sarah Herrmann <sarah.herrmann@cern.ch>, IP2I Lyon
/// \author Maurice Coquet <maurice.louis.coquet@cern.ch>, CEA-Saclay/Irfu

#include "Common/Core/CollisionAssociation.h"
#include "Common/Core/CollisionAssociation.h" // IWYU pragma: keep
8 changes: 7 additions & 1 deletion Common/Core/CollisionAssociation.h
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,15 @@
#define COMMON_CORE_COLLISIONASSOCIATION_H_

#include <CommonConstants/LHCConstants.h>
#include <Framework/ASoAHelpers.h>
#include <Framework/AnalysisDataModel.h>
#include <Framework/DataTypes.h>
#include <Framework/Logger.h>

#include <Rtypes.h>

#include <cmath>
#include <cstdint>
#include <cstdlib>
#include <memory>
#include <utility>
#include <vector>
Expand Down
1 change: 1 addition & 0 deletions Common/Core/CollisionTypeHelper.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@

#include "Common/Core/CollisionTypeHelper.h"

#include <CommonConstants/LHCConstants.h>
#include <DataFormatsParameters/GRPLHCIFData.h>
#include <Framework/Logger.h>

Expand Down
2 changes: 1 addition & 1 deletion Common/Core/CollisionTypeHelper.h
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
#ifndef COMMON_CORE_COLLISIONTYPEHELPER_H_
#define COMMON_CORE_COLLISIONTYPEHELPER_H_

#include "DataFormatsParameters/GRPLHCIFData.h"
#include <DataFormatsParameters/GRPLHCIFData.h>

#include <string>

Expand Down
6 changes: 6 additions & 0 deletions Common/Core/EventPlaneHelper.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,16 @@

#include "Common/Core/EventPlaneHelper.h"

#include <FT0Base/Geometry.h>
#include <FV0Base/Geometry.h>

#include <TComplex.h>
#include <TH2.h>
#include <TMath.h>
#include <TVector3.h>

#include <algorithm>
#include <cmath>
#include <cstdio>
#include <iterator>
#include <memory>
Expand Down
15 changes: 7 additions & 8 deletions Common/Core/EventPlaneHelper.h
Original file line number Diff line number Diff line change
Expand Up @@ -21,17 +21,16 @@
#ifndef COMMON_CORE_EVENTPLANEHELPER_H_
#define COMMON_CORE_EVENTPLANEHELPER_H_

#include <vector>
#include <memory>

#include "TNamed.h"
#include <FT0Base/Geometry.h>
#include <FV0Base/Geometry.h>

#include <TComplex.h>
#include <TH2D.h>
#include <TProfile.h>
#include <TH2.h>

#include "FV0Base/Geometry.h"
#include "FT0Base/Geometry.h"
#include <Rtypes.h>

#include <memory>
#include <vector>

class EventPlaneHelper
{
Expand Down
9 changes: 9 additions & 0 deletions Common/Core/FFitWeights.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,16 @@

#include "FFitWeights.h"

#include <TCollection.h>
#include <TH1.h>
#include <TH2.h>
#include <TNamed.h>
#include <TObjArray.h>
#include <TSpline.h>
#include <TString.h>

#include <Rtypes.h>
#include <RtypesCore.h>

#include <cstdio>
#include <string>
Expand Down
12 changes: 4 additions & 8 deletions Common/Core/FFitWeights.h
Original file line number Diff line number Diff line change
Expand Up @@ -17,19 +17,15 @@
#ifndef COMMON_CORE_FFITWEIGHTS_H_
#define COMMON_CORE_FFITWEIGHTS_H_

#include <TAxis.h>
#include <TCollection.h>
#include <TFile.h>
#include <TH1D.h>
#include <TH2D.h>
#include <TH3D.h>
#include <TMath.h>
#include <TNamed.h>
#include <TObjArray.h>
#include <TString.h>

#include <algorithm>
#include <complex>
#include <memory>
#include <Rtypes.h>
#include <RtypesCore.h>

#include <string>
#include <utility>
#include <vector>
Expand Down
4 changes: 3 additions & 1 deletion Common/Core/MetadataHelper.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,11 @@

#include "Common/Core/MetadataHelper.h"

#include <Framework/ConfigContext.h>
#include <Framework/InitContext.h>
#include <Framework/RunningWorkflowInfo.h>
#include <Framework/Logger.h>

#include <array>
#include <string>

using namespace o2::common::core;
Expand Down
2 changes: 1 addition & 1 deletion Common/Core/MetadataHelper.h
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
#ifndef COMMON_CORE_METADATAHELPER_H_
#define COMMON_CORE_METADATAHELPER_H_

#include "Framework/ConfigContext.h"
#include <Framework/ConfigContext.h>

#include <map>
#include <string>
Expand Down
12 changes: 10 additions & 2 deletions Common/Core/OrbitRange.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,16 @@
//

#include "Common/Core/OrbitRange.h"
#include "TCollection.h"
#include "TMath.h"

#include <TCollection.h>
#include <TIterator.h>
#include <TMathBase.h>
#include <TObject.h>

#include <Rtypes.h>
#include <RtypesCore.h>

#include <cstdio>

ClassImp(OrbitRange)

Expand Down
5 changes: 5 additions & 0 deletions Common/Core/OrbitRange.h
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,11 @@

#include <TNamed.h>

#include <Rtypes.h>
#include <RtypesCore.h>

#include <cstdint>

class TCollection;

class OrbitRange : public TNamed
Expand Down
14 changes: 5 additions & 9 deletions Common/Core/PID/DetectorResponse.h
Original file line number Diff line number Diff line change
Expand Up @@ -20,21 +20,17 @@
#ifndef COMMON_CORE_PID_DETECTORRESPONSE_H_
#define COMMON_CORE_PID_DETECTORRESPONSE_H_

#include "Common/Core/PID/ParamBase.h"

#include <Framework/Logger.h>

#include <array>
#include <string>
#include <vector>
// ROOT includes
#include <TFile.h>
#include <TMath.h>

#include <Rtypes.h>

// O2 includes
#include "Common/Core/PID/ParamBase.h"

#include <ReconstructionDataFormats/PID.h>
#include <array>
#include <string>
#include <vector>

namespace o2::pid
{
Expand Down
11 changes: 11 additions & 0 deletions Common/Core/PID/PIDTOF.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,18 @@
///

#include "PIDTOF.h"

#include <Framework/Logger.h>

#include <TF2.h>
#include <TFile.h>
#include <TGraph.h>
#include <TString.h>

#include <array>
#include <cstdint>
#include <string>
#include <unordered_map>

namespace o2::pid::tof
{
Expand Down
26 changes: 13 additions & 13 deletions Common/Core/PID/PIDTOF.h
Original file line number Diff line number Diff line change
Expand Up @@ -19,25 +19,25 @@
#ifndef COMMON_CORE_PID_PIDTOF_H_
#define COMMON_CORE_PID_PIDTOF_H_

#include <string>
#include <unordered_map>
#include <vector>

// ROOT includes
#include <TF2.h>
#include <TFile.h>
#include <TGraph.h>
#include <TMath.h>

#include <Rtypes.h>

// O2 includes
#include <CommonConstants/PhysicsConstants.h>
#include <DataFormatsTOF/ParameterContainers.h>
#include <Framework/DataTypes.h>
#include <Framework/Logger.h>
#include <ReconstructionDataFormats/PID.h>

#include <TF2.h>
#include <TFile.h>
#include <TGraph.h>
#include <TString.h>

#include <array>
#include <cmath>
#include <cstdint>
#include <cstdlib>
#include <string>
#include <unordered_map>
#include <vector>

namespace o2::pid::tof
{

Expand Down
3 changes: 3 additions & 0 deletions Common/Core/PID/ParamBase.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,9 @@
#include <PID/ParamBase.h>

#include <TFile.h>
#include <TString.h>

#include <RtypesCore.h>

#include <vector>

Expand Down
15 changes: 9 additions & 6 deletions Common/Core/PID/ParamBase.h
Original file line number Diff line number Diff line change
Expand Up @@ -20,16 +20,19 @@
#ifndef COMMON_CORE_PID_PARAMBASE_H_
#define COMMON_CORE_PID_PARAMBASE_H_

#include <algorithm> // std::copy
#include <map> // std::map
#include <string> // std::string
#include <vector> // std::vector

// ROOT includes
#include <Framework/Logger.h>

#include <TFile.h>
#include <TNamed.h>
#include <TString.h>

#include <Rtypes.h>
#include <RtypesCore.h>

#include <algorithm> // std::copy
#include <map> // std::map
#include <string> // std::string
#include <vector> // std::vector

namespace o2::pid
{
Expand Down
13 changes: 7 additions & 6 deletions Common/Core/PID/TPCPIDResponse.h
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,15 @@
#ifndef COMMON_CORE_PID_TPCPIDRESPONSE_H_
#define COMMON_CORE_PID_TPCPIDRESPONSE_H_

#include <DataFormatsTPC/BetheBlochAleph.h>
#include <Framework/Logger.h>
#include <ReconstructionDataFormats/PID.h>

#include <Rtypes.h>

#include <array>
#include <vector>
#include <cmath>
#include "Framework/Logger.h"
// O2 includes
#include "ReconstructionDataFormats/PID.h"
#include "Framework/DataTypes.h"
#include "DataFormatsTPC/BetheBlochAleph.h"
#include <vector>

namespace o2::pid::tpc
{
Expand Down
Loading
Loading