Skip to content
Draft
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
2 changes: 2 additions & 0 deletions ALICE3/Core/ALICE3CoreLinkDef.h
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@
// granted to it by virtue of its status as an Intergovernmental Organization
// or submit itself to any jurisdiction.

// NOLINT(build/header_guard)

#pragma link off all globals;
#pragma link off all classes;
#pragma link off all functions;
Expand Down
5 changes: 1 addition & 4 deletions ALICE3/Core/FastTrackerLinkDef.h
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,7 @@
// granted to it by virtue of its status as an Intergovernmental Organization
// or submit itself to any jurisdiction.

#ifndef ALICE3_CORE_FASTTRACKERLINKDEF_H_
#define ALICE3_CORE_FASTTRACKERLINKDEF_H_
// NOLINT(build/header_guard)

#pragma link off all globals;
#pragma link off all classes;
Expand All @@ -19,5 +18,3 @@
#pragma link C++ class o2::fastsim::GeometryContainer + ;
#pragma link C++ class o2::fastsim::FastTracker + ;
#pragma link C++ class o2::fastsim::FlatLutWriter + ;

#endif // ALICE3_CORE_FASTTRACKERLINKDEF_H_
2 changes: 1 addition & 1 deletion ALICE3/Tasks/alice3DqEfficiency.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -775,7 +775,7 @@ struct Alice3DqEfficiencyAnalysisSameEventPairing {
std::vector<MCSignal*> fGenMCSignals;

std::vector<AnalysisCompositeCut> fPairCuts;
AnalysisCompositeCut fMCGenAccCut;
AnalysisCompositeCut fMCGenAccCut{};
bool fUseMCGenAccCut = false;

uint32_t fTrackFilterMask = 0; // mask for the track cuts required in this task to be applied on the barrel cuts produced upstream
Expand Down
5 changes: 1 addition & 4 deletions Common/CCDB/AnalysisCCDBLinkDef.h
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,7 @@
///
/// \author Evgeny Kryshen <evgeny.kryshen@cern.ch>

#ifndef COMMON_CCDB_ANALYSISCCDBLINKDEF_H_
#define COMMON_CCDB_ANALYSISCCDBLINKDEF_H_
// NOLINT(build/header_guard)

#pragma link off all globals;
#pragma link off all classes;
Expand All @@ -24,5 +23,3 @@
#pragma link C++ class EventSelectionParams + ;
#pragma link C++ class TriggerAliases + ;
#pragma link C++ class std::map < uint64_t, uint32_t> + ;

#endif // COMMON_CCDB_ANALYSISCCDBLINKDEF_H_
2 changes: 1 addition & 1 deletion Common/CCDB/TriggerAliases.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
#include <cstdint>
#include <string>

std::string aliasLabels[kNaliases] = {
const std::array<std::string, kNaliases> aliasLabels{
"kINT7",
"kEMC7",
"kINT7inMUON",
Expand Down
2 changes: 1 addition & 1 deletion Common/CCDB/TriggerAliases.h
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ enum triggerAliases {
kNaliases
};

extern std::string aliasLabels[kNaliases];
extern const std::array<std::string, kNaliases> aliasLabels;

class TriggerAliases
{
Expand Down
12 changes: 6 additions & 6 deletions Common/CCDB/macros/upload_event_selection_params.C
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,12 @@ void upload_event_selection_params()
// ccdb.truncate("EventSelection/EventSelectionParams");
ccdb.init("https://alice-ccdb.cern.ch");

const int nPeriodsMax = 100;
EventSelectionParams* par[nPeriodsMax];
string period[nPeriodsMax];
int runFirst[nPeriodsMax];
int runLast[nPeriodsMax];
bool isNew[nPeriodsMax] = {0};
constexpr int NPeriodsMax{100};
std::array<EventSelectionParams*, NPeriodsMax> par{};
std::array<string, NPeriodsMax> period{};
std::array<int, NPeriodsMax> runFirst{};
std::array<int, NPeriodsMax> runLast{};
std::array<bool, NPeriodsMax> isNew{};

int n = 0;
period[n] = "pp2010";
Expand Down
5 changes: 1 addition & 4 deletions Common/Core/AnalysisCoreLinkDef.h
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,7 @@
// granted to it by virtue of its status as an Intergovernmental Organization
// or submit itself to any jurisdiction.

#ifndef COMMON_CORE_ANALYSISCORELINKDEF_H_
#define COMMON_CORE_ANALYSISCORELINKDEF_H_
// NOLINT(build/header_guard)

#pragma link off all globals;
#pragma link off all classes;
Expand All @@ -25,5 +24,3 @@
#pragma link C++ class o2::pid::tpc::Response + ;

#pragma link C++ class OrbitRange + ;

#endif // COMMON_CORE_ANALYSISCORELINKDEF_H_
2 changes: 2 additions & 0 deletions Common/Core/EventFilteringUtilsLinkDef.h
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@
// granted to it by virtue of its status as an Intergovernmental Organization
// or submit itself to any jurisdiction.

// NOLINT(build/header_guard)

#pragma link off all globals;
#pragma link off all classes;
#pragma link off all functions;
Expand Down
5 changes: 1 addition & 4 deletions Common/Core/FFitWeightsLinkDef.h
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,6 @@
///
/// \author Joachim C. K. B. Hansen

#ifndef COMMON_CORE_FFITWEIGHTSLINKDEF_H_
#define COMMON_CORE_FFITWEIGHTSLINKDEF_H_
// NOLINT(build/header_guard)

#pragma link C++ class FFitWeights + ;

#endif // COMMON_CORE_FFITWEIGHTSLINKDEF_H_
12 changes: 6 additions & 6 deletions Common/Core/PID/TPCPIDResponse.h
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ class Response
float GetExpectedSigma(const CollisionType& collision, const TrackType& trk, const o2::track::PID::ID id) const;
/// Gets the expected resolution of the track with multTPC explicitly provided
template <typename TrackType>
float GetExpectedSigmaAtMultiplicity(const long multTPC, const TrackType& trk, const o2::track::PID::ID id) const;
float GetExpectedSigmaAtMultiplicity(const int64_t multTPC, const TrackType& trk, const o2::track::PID::ID id) const;
/// Gets the number of sigmas with respect the expected value
template <typename CollisionType, typename TrackType>
float GetNumberOfSigma(const CollisionType& collision, const TrackType& trk, const o2::track::PID::ID id) const;
Expand All @@ -86,7 +86,7 @@ class Response
float GetNumberOfSigmaMCTuned(const CollisionType& collision, const TrackType& trk, const o2::track::PID::ID id, float mcTunedTPCSignal) const;
// Number of sigmas with respect to expected for MC, defining a tune-on-data signal value, explicit multTPC
template <typename TrackType>
float GetNumberOfSigmaMCTunedAtMultiplicity(const long multTPC, const TrackType& trk, const o2::track::PID::ID id, float mcTunedTPCSignal) const;
float GetNumberOfSigmaMCTunedAtMultiplicity(const int64_t multTPC, const TrackType& trk, const o2::track::PID::ID id, float mcTunedTPCSignal) const;
/// Gets the deviation to the expected signal
template <typename TrackType>
float GetSignalDelta(const TrackType& trk, const o2::track::PID::ID id) const;
Expand All @@ -99,7 +99,7 @@ class Response
private:
/// Compute expected sigma given a pre-computed expected signal, avoiding a redundant Bethe-Bloch call.
template <typename TrackType>
float sigmaFromSignal(float expectedSignal, const long multTPC, const TrackType& track, const o2::track::PID::ID id) const;
float sigmaFromSignal(float expectedSignal, const int64_t multTPC, const TrackType& track, const o2::track::PID::ID id) const;

std::array<float, 5> mBetheBlochParams = {0.03209809958934784, 19.9768009185791, 2.5266601063857674e-16, 2.7212300300598145, 6.080920219421387};
std::array<float, 2> mResolutionParamsDefault = {0.07, 0.0};
Expand Down Expand Up @@ -135,7 +135,7 @@ inline float Response::GetExpectedSigma(const CollisionType& collision, const Tr

/// Gets the expected resolution of the measurement
template <typename TrackType>
inline float Response::GetExpectedSigmaAtMultiplicity(const long multTPC, const TrackType& track, const o2::track::PID::ID id) const
inline float Response::GetExpectedSigmaAtMultiplicity(const int64_t multTPC, const TrackType& track, const o2::track::PID::ID id) const
{
if (!track.hasTPC()) {
return -999.f;
Expand All @@ -144,7 +144,7 @@ inline float Response::GetExpectedSigmaAtMultiplicity(const long multTPC, const
}

template <typename TrackType>
inline float Response::sigmaFromSignal(float expectedSignal, const long multTPC, const TrackType& track, const o2::track::PID::ID id) const
inline float Response::sigmaFromSignal(float expectedSignal, const int64_t multTPC, const TrackType& track, const o2::track::PID::ID id) const
{
float resolution = 0.f;
if (mUseDefaultResolutionParam) {
Expand Down Expand Up @@ -188,7 +188,7 @@ inline float Response::GetNumberOfSigmaMCTuned(const CollisionType& collision, c
}

template <typename TrackType>
inline float Response::GetNumberOfSigmaMCTunedAtMultiplicity(const long multTPC, const TrackType& trk, const o2::track::PID::ID id, float mcTunedTPCSignal) const
inline float Response::GetNumberOfSigmaMCTunedAtMultiplicity(const int64_t multTPC, const TrackType& trk, const o2::track::PID::ID id, float mcTunedTPCSignal) const
{
const float signal = GetExpectedSignal(trk, id);
if (signal < 0.f) {
Expand Down
5 changes: 3 additions & 2 deletions Common/Core/TrackSelection.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
#include <Framework/DataTypes.h>
#include <Framework/Logger.h>

#include <array>
#include <cstdint>
#include <functional>
#include <set>
Expand All @@ -37,7 +38,7 @@ bool TrackSelection::FulfillsITSHitRequirements(uint8_t itsClusterMap) const
return true;
}

const std::string TrackSelection::mCutNames[static_cast<int>(TrackSelection::TrackCuts::kNCuts)] = {"TrackType", "PtRange", "EtaRange", "TPCNCls", "TPCCrossedRows", "TPCCrossedRowsOverNCls", "TPCChi2NDF", "TPCRefit", "ITSNCls", "ITSChi2NDF", "ITSRefit", "ITSHits", "GoldenChi2", "DCAxy", "DCAz", "TPCFracSharedCls"};
const std::array<std::string, static_cast<int>(TrackSelection::TrackCuts::kNCuts)> TrackSelection::mCutNames{"TrackType", "PtRange", "EtaRange", "TPCNCls", "TPCCrossedRows", "TPCCrossedRowsOverNCls", "TPCChi2NDF", "TPCRefit", "ITSNCls", "ITSChi2NDF", "ITSRefit", "ITSHits", "GoldenChi2", "DCAxy", "DCAz", "TPCFracSharedCls"};

void TrackSelection::SetTrackType(o2::aod::track::TrackTypeEnum trackType)
{
Expand Down Expand Up @@ -149,7 +150,7 @@ void TrackSelection::print() const
for (int i = 0; i < static_cast<int>(TrackCuts::kNCuts); i++) {
switch (static_cast<TrackCuts>(i)) {
case TrackCuts::kTrackType:
LOG(info) << mCutNames[i].data() << " == " << static_cast<int>(mTrackType);
LOG(info) << mCutNames[i] << " == " << static_cast<int>(mTrackType);
break;
case TrackCuts::kPtRange:
LOG(info) << mCutNames[i] << " in [" << mMinPt << ", " << mMaxPt << "]";
Expand Down
2 changes: 1 addition & 1 deletion Common/Core/TrackSelection.h
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ class TrackSelection
ppPass3
};

static const std::string mCutNames[static_cast<int>(TrackCuts::kNCuts)];
static const std::array<std::string, static_cast<int>(TrackCuts::kNCuts)> mCutNames;

// True for Run 2 track types. Hoisted out of the per-cut IsSelected() so that
// the trackType() column is dereferenced once per track instead of once per cut.
Expand Down
4 changes: 4 additions & 0 deletions Common/DataModel/Centrality.h
Original file line number Diff line number Diff line change
Expand Up @@ -100,18 +100,22 @@ using BCCentFT0C = BCCentFT0Cs::iterator;

template <typename T>
concept HasRun2Centrality = requires(T&& t) {
// NOLINTBEGIN(readability/braces)
{ t.centRun2V0M() };
{ t.centRun2CL0() };
{ t.centRun2CL1() };
// NOLINTEND(readability/braces)
};

template <typename T>
concept HasCentrality = requires(T&& t) {
// NOLINTBEGIN(readability/braces)
{ t.centFV0A() };
{ t.centFT0M() };
{ t.centFT0A() };
{ t.centFT0C() };
{ t.centNTPV() };
// NOLINTEND(readability/braces)
};

} // namespace o2::aod
Expand Down
2 changes: 1 addition & 1 deletion Common/Tasks/flowTest.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ struct flowTest {
if (evPhi < 0)
evPhi += 2. * TMath::Pi();

long nCh = 0;
int64_t nCh = 0;

if (imp > minB && imp < maxB) {
// event within range
Expand Down
4 changes: 2 additions & 2 deletions Common/Tasks/multiplicityQa.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -290,8 +290,8 @@ struct MultiplicityQa {
return;
}

long NcontribsTOF = 0;
long NcontribsTRD = 0;
int64_t NcontribsTOF = 0;
int64_t NcontribsTRD = 0;
for (auto& track : tracks) {
if (track.isPVContributor()) {
if (track.hasTRD())
Expand Down
2 changes: 1 addition & 1 deletion Common/Tools/Multiplicity/MultModule.h
Original file line number Diff line number Diff line change
Expand Up @@ -480,7 +480,7 @@ class MultModule
LOGF(info, "Metadata information: isMC? %i", metadataInfo.isMC());
const auto& workflows = context.services().template get<o2::framework::RunningWorkflowInfo const>();

TString listOfRequestors[nTablesConst];
std::array<TString, nTablesConst> listOfRequestors{};
for (int i = 0; i < nTablesConst; i++) {
int f = internalOpts.enabledTables->get(tableNames[i].c_str(), "enable");
if (f == 1) {
Expand Down
7 changes: 4 additions & 3 deletions Common/Tools/Multiplicity/multCalibrator.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@

#include <cmath>
#include <iostream> // FIXME
#include <vector>

using namespace std;

Expand Down Expand Up @@ -353,8 +354,8 @@ TH1F* multCalibrator::GetCalibrationHistogram(TH1* histoRaw, const TString& lHis
// place squarely at the middle to ensure it's all fine
lMiddleOfBins[lB - 1] = 0.5 * (lDesiredBoundaries[lB] + lDesiredBoundaries[lB - 1]);
}
Double_t lBounds[lNDesiredBoundaries + 1];
Double_t lPrecision[lNDesiredBoundaries + 1];
std::vector<Double_t> lBounds(lNDesiredBoundaries + 1);
std::vector<Double_t> lPrecision(lNDesiredBoundaries + 1);

if (fAnchorPointValue > 0) {
lBounds[0] = 0;
Expand Down Expand Up @@ -382,7 +383,7 @@ TH1F* multCalibrator::GetCalibrationHistogram(TH1* histoRaw, const TString& lHis
cout << histoRaw->GetName() << " boundaries, percentile: " << lDesiredBoundaries[ii] << "%\t Signal value = " << lBounds[lDisplacedii] << "\tprecision = " << lPrecision[ii] << "% " << lPrecisionString.Data() << endl;
}
}
TH1F* hCalib = new TH1F(lHistoName.Data(), "", fAnchorPointValue < 0 ? lNDesiredBoundaries - 1 : lNDesiredBoundaries, lBounds);
TH1F* hCalib = new TH1F(lHistoName.Data(), "", fAnchorPointValue < 0 ? lNDesiredBoundaries - 1 : lNDesiredBoundaries, lBounds.data());
hCalib->SetDirectory(0);
hCalib->SetBinContent(0, 100.5);
hCalib->SetBinContent(1, 100.5);
Expand Down
2 changes: 2 additions & 0 deletions Common/Tools/Multiplicity/multToolsLinkDef.h
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@
// granted to it by virtue of its status as an Intergovernmental Organization
// or submit itself to any jurisdiction.

// NOLINT(build/header_guard)

#pragma link off all globals;
#pragma link off all classes;
#pragma link off all functions;
Expand Down
2 changes: 2 additions & 0 deletions Common/Tools/trackSelectionRequestLinkDef.h
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@
// granted to it by virtue of its status as an Intergovernmental Organization
// or submit itself to any jurisdiction.

// NOLINT(build/header_guard)

#pragma link off all globals;
#pragma link off all classes;
#pragma link off all functions;
Expand Down
25 changes: 10 additions & 15 deletions DPG/Tasks/AOTEvent/detectorOccupancyQa.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -1087,7 +1087,6 @@ struct DetectorOccupancyQaTask {
// July 2025: more for data vs MC:
if (track.hasTPC() && occupancy >= 0 && confAddBasicQAhistos) {
float pt = track.pt();
// pt 0.2-0.5
if (pt > 0.2 && pt < 0.5) {
if (nPV >= 10 && nPV < 400) {
histos.fill(HIST("QA_noTPCcuts/nPV_10_200/tpcNClsFindable_vs_occup_pt_02_05"), track.tpcNClsFindable(), occupancy);
Expand All @@ -1098,9 +1097,7 @@ struct DetectorOccupancyQaTask {
histos.fill(HIST("QA_noTPCcuts/nPV_above2000/tpcNClsFound_vs_occup_pt_02_05"), track.tpcNClsFound(), occupancy);
histos.fill(HIST("QA_noTPCcuts/nPV_above2000/tpcChi2NCl_vs_occup_pt_02_05"), track.tpcChi2NCl(), occupancy);
}
}
// pt 0.5-1.0
else if (pt > 0.5 && pt < 1.0) {
} else if (pt > 0.5 && pt < 1.0) {
if (nPV >= 10 && nPV < 400) {
histos.fill(HIST("QA_noTPCcuts/nPV_10_200/tpcNClsFindable_vs_occup_pt_05_10"), track.tpcNClsFindable(), occupancy);
histos.fill(HIST("QA_noTPCcuts/nPV_10_200/tpcNClsFound_vs_occup_pt_05_10"), track.tpcNClsFound(), occupancy);
Expand All @@ -1110,9 +1107,7 @@ struct DetectorOccupancyQaTask {
histos.fill(HIST("QA_noTPCcuts/nPV_above2000/tpcNClsFound_vs_occup_pt_05_10"), track.tpcNClsFound(), occupancy);
histos.fill(HIST("QA_noTPCcuts/nPV_above2000/tpcChi2NCl_vs_occup_pt_05_10"), track.tpcChi2NCl(), occupancy);
}
}
// pt > 1.0
else if (pt > 1.0) {
} else if (pt > 1.0) {
if (nPV >= 10 && nPV < 400) {
histos.fill(HIST("QA_noTPCcuts/nPV_10_200/tpcNClsFindable_vs_occup_pt_above1_0"), track.tpcNClsFindable(), occupancy);
histos.fill(HIST("QA_noTPCcuts/nPV_10_200/tpcNClsFound_vs_occup_pt_above1_0"), track.tpcNClsFound(), occupancy);
Expand Down Expand Up @@ -1383,8 +1378,8 @@ struct DetectorOccupancyQaTask {
int tpcNClsFound = track.tpcNClsFound();
int tpcNClsCrossedRows = track.tpcNClsCrossedRows();

if (sign > 0) // positive tracks
{
if (sign > 0) {
// positive tracks
histos.fill(HIST("track_distr_nITStrThisEv_10_200/kine_vs_weighted_occup/PV_hPt_pos"), pt, occupancy);
histos.fill(HIST("track_distr_nITStrThisEv_10_200/kine_vs_weighted_occup/PV_hEta_pos"), eta, occupancy);
histos.fill(HIST("track_distr_nITStrThisEv_10_200/kine_vs_weighted_occup/PV_hPhi_pos"), phi, occupancy, pt);
Expand All @@ -1401,8 +1396,8 @@ struct DetectorOccupancyQaTask {
histos.fill(HIST("track_distr_nITStrThisEv_10_200/kine_vs_weighted_occup/QA_tpcNClsFound_pos"), tpcNClsFound);
histos.fill(HIST("track_distr_nITStrThisEv_10_200/kine_vs_weighted_occup/QA_tpcNClsCrossedRows_pos"), tpcNClsCrossedRows);
}
} else // negative tracks
{
} else {
// negative tracks
histos.fill(HIST("track_distr_nITStrThisEv_10_200/kine_vs_weighted_occup/PV_hPt_neg"), pt, occupancy);
histos.fill(HIST("track_distr_nITStrThisEv_10_200/kine_vs_weighted_occup/PV_hEta_neg"), eta, occupancy);
histos.fill(HIST("track_distr_nITStrThisEv_10_200/kine_vs_weighted_occup/PV_hPhi_neg"), phi, occupancy, pt);
Expand Down Expand Up @@ -1449,8 +1444,8 @@ struct DetectorOccupancyQaTask {
} // end of TPC good global

// July 2025: for data vs MC kine distr comparison
if (sign > 0) // positive tracks
{
if (sign > 0) {
// positive tracks
histos.fill(HIST("track_distr_nITStrThisEv_above_2000/kine_vs_weighted_occup/PV_hPt_pos"), pt, occupancy);
histos.fill(HIST("track_distr_nITStrThisEv_above_2000/kine_vs_weighted_occup/PV_hEta_pos"), eta, occupancy);
histos.fill(HIST("track_distr_nITStrThisEv_above_2000/kine_vs_weighted_occup/PV_hPhi_pos"), phi, occupancy, pt);
Expand All @@ -1463,8 +1458,8 @@ struct DetectorOccupancyQaTask {
histos.fill(HIST("track_distr_nITStrThisEv_above_2000/kine_vs_weighted_occup/hPhi_posModifiedQA"), phi);
}
}
} else // negative tracks
{
} else {
// negative tracks
histos.fill(HIST("track_distr_nITStrThisEv_above_2000/kine_vs_weighted_occup/PV_hPt_neg"), pt, occupancy);
histos.fill(HIST("track_distr_nITStrThisEv_above_2000/kine_vs_weighted_occup/PV_hEta_neg"), eta, occupancy);
histos.fill(HIST("track_distr_nITStrThisEv_above_2000/kine_vs_weighted_occup/PV_hPhi_neg"), phi, occupancy, pt);
Expand Down
4 changes: 2 additions & 2 deletions DPG/Tasks/AOTEvent/lightIonsEvSelQa.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -991,9 +991,9 @@ struct LightIonsEvSelQa {

// vZ diff (FT0 vs by tracks)
bool badVzDiff = 0;
if (confUseDiffVzCutFromEvSel)
if (confUseDiffVzCutFromEvSel) {
badVzDiff = !col.selection_bit(kIsGoodZvtxFT0vsPV);
else { // tune by hand
} else { // tune by hand
float meanDiff = 0.0; // cm
// O-O
if (lastRunNumber == 564356)
Expand Down
Loading
Loading