From 30cb801e342a597892614daa373d483a25f967ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=20Ku=C4=8Dera?= <26327373+vkucera@users.noreply.github.com> Date: Thu, 22 Oct 2026 19:03:42 +0200 Subject: [PATCH] Fix casts Fixes C-style, redundant, wrong, and dangerous casts (found by Clang-Tidy and cpplint). - Remove redundant casts. (`readability-redundant-casting`) - Remove `const_cast`. (`cppcoreguidelines-pro-type-const-cast`) - Replace C-style casts with `static_cast`. (`google-readability-casting`, cpplint: `readability/casting`) - Replace unsafe C-style casts with `dynamic_cast`. (`cppcoreguidelines-pro-type-cstyle-cast`) - Replace `static_cast` in downcasts with `dynamic_cast`. (`cppcoreguidelines-pro-type-static-cast-downcast`) - Replace `reinterpret_cast` with `static_cast` or `dynamic_cast`. (`cppcoreguidelines-pro-type-reinterpret-cast`) - Replace two-step casting through `void*` with `reinterpret_cast`. (`bugprone-casting-through-void`) --- PWGMM/Lumi/Tasks/lumiStability.cxx | 2 +- PWGMM/Lumi/macros/merger.C | 4 +- PWGMM/Lumi/macros/non_fac.C | 4 +- .../ambiguousTrackPropagation.cxx | 4 +- PWGMM/Mult/TableProducer/reducer.cxx | 24 +++++---- PWGMM/Mult/Tasks/dndeta-hi.cxx | 50 +++++++++---------- PWGMM/Mult/Tasks/dndeta-mft.cxx | 8 +-- PWGMM/Mult/Tasks/dndeta.cxx | 10 ++-- PWGMM/Mult/Tasks/effpt-mft.cxx | 6 +-- PWGMM/Mult/Tasks/heavy-ion-mult.cxx | 10 ++-- .../Mult/Tasks/mftReassociationValidation.cxx | 2 +- PWGMM/Mult/Tasks/pseudoEffMFT.cxx | 2 +- PWGMM/Mult/Tasks/qaReassocMFTPbPb.cxx | 2 +- PWGMM/Mult/Tasks/run2dndeta.cxx | 10 ++-- 14 files changed, 70 insertions(+), 68 deletions(-) diff --git a/PWGMM/Lumi/Tasks/lumiStability.cxx b/PWGMM/Lumi/Tasks/lumiStability.cxx index ab1dca52f6e..7bdbb1b3d95 100644 --- a/PWGMM/Lumi/Tasks/lumiStability.cxx +++ b/PWGMM/Lumi/Tasks/lumiStability.cxx @@ -104,7 +104,7 @@ struct LumiStabilityTask { const AxisSpec axisTime{1000, -10, 40}; const AxisSpec axisTimeFDD{1000, -20, 100}; const AxisSpec axisCountsTime{2, -0.5, 1.5}; - const AxisSpec axisOrbits{static_cast(nOrbits / nOrbitsPerTF), 0., static_cast(nOrbits), ""}; + const AxisSpec axisOrbits{(nOrbits / nOrbitsPerTF), 0., static_cast(nOrbits), ""}; const AxisSpec axisTimeRate{static_cast(static_cast(43200) / (nOrbitsPerTF * 89e-6)), 0., 43200, ""}; // t in seconds. Histo for 12 hrs. Each bin contain one time frame (128/32 orbits for 2022/2023). const AxisSpec timeAxis{1200, 0., 1200., "#bf{t-t_{SOF} (min)}"}; diff --git a/PWGMM/Lumi/macros/merger.C b/PWGMM/Lumi/macros/merger.C index 1ad2cd5f920..ea9e4b1fcf6 100644 --- a/PWGMM/Lumi/macros/merger.C +++ b/PWGMM/Lumi/macros/merger.C @@ -55,8 +55,8 @@ void merger() tin->Branch("fVertexChi2", &fVertexChi2, "fVertexChi2/D"); tin->Branch("fNContrib", &fNContrib, "fNContrib/I"); - while (TDirectoryFile* dir = (TDirectoryFile*)next()) { - tadd = (TTree*)fin->Get(Form("%s/O2eventinfo", dir->GetName())); + while (TDirectoryFile* dir = dynamic_cast(next())) { + tadd = dynamic_cast(fin->Get(Form("%s/O2eventinfo", dir->GetName()))); tadd->SetBranchAddress("fTimeStamp", &fTimeStamp); diff --git a/PWGMM/Lumi/macros/non_fac.C b/PWGMM/Lumi/macros/non_fac.C index ea858e409f0..579555af9a4 100644 --- a/PWGMM/Lumi/macros/non_fac.C +++ b/PWGMM/Lumi/macros/non_fac.C @@ -50,7 +50,7 @@ void chi2(Int_t& npar, Double_t* gin, Double_t& f, Double_t* par, Int_t flag) TMatrixD sigma(2, 2); double results = 0.; - tin = (TTree*)fin->Get("EventInfo_merged"); + tin = dynamic_cast(fin->Get("EventInfo_merged")); tin->SetBranchAddress("fTimeStamp", &fTimeStamp); @@ -132,7 +132,7 @@ void non_fac() new TH1D(Form("hPreDistPos_%d_%d", i, 2), "", 1000, -100, 100); } - tin = (TTree*)fin->Get("EventInfo_merged"); + tin = dynamic_cast(fin->Get("EventInfo_merged")); tin->SetBranchAddress("fTimeStamp", &fTimeStamp); diff --git a/PWGMM/Mult/TableProducer/ambiguousTrackPropagation.cxx b/PWGMM/Mult/TableProducer/ambiguousTrackPropagation.cxx index af3a895eec3..b585c497a61 100644 --- a/PWGMM/Mult/TableProducer/ambiguousTrackPropagation.cxx +++ b/PWGMM/Mult/TableProducer/ambiguousTrackPropagation.cxx @@ -161,7 +161,7 @@ struct AmbiguousTrackPropagation { runNumber = bc.runNumber(); if (doprocessMFT || doprocessMFTReassoc || doprocessMFTReassoc3D) { - o2::field::MagneticField* field = static_cast(TGeoGlobalMagField::Instance()->GetField()); + o2::field::MagneticField* field = dynamic_cast(TGeoGlobalMagField::Instance()->GetField()); bZ = field->getBz(CcenterMFT); LOG(info) << "The field at the center of the MFT is bZ = " << bZ; } @@ -215,7 +215,7 @@ struct AmbiguousTrackPropagation { if ((track.trackCutFlag() & CtrackSelectionITS) != CtrackSelectionITS) { continue; } - if ((track.detectorMap() & (uint8_t)o2::aod::track::TPC) == (uint8_t)o2::aod::track::TPC) { + if ((track.detectorMap() & static_cast(o2::aod::track::TPC)) == static_cast(o2::aod::track::TPC)) { if ((track.trackCutFlag() & CtrackSelectionTPC) != CtrackSelectionTPC) { continue; } diff --git a/PWGMM/Mult/TableProducer/reducer.cxx b/PWGMM/Mult/TableProducer/reducer.cxx index 6d290692e55..2744ceb286d 100644 --- a/PWGMM/Mult/TableProducer/reducer.cxx +++ b/PWGMM/Mult/TableProducer/reducer.cxx @@ -99,13 +99,15 @@ struct Reducer { // p[6] - normalization // alpha = p[1]^2 / ( 1 + p[1]^2), relative weight, 0 < alpha < 1 - return params->get((int)0, 6) * - (params->get((int)0, 1) * params->get((int)0, 1) / (1. + params->get((int)0, 1) * params->get((int)0, 1)) * // alpha - // v1 + - 1. / (x * TMath::Beta(x, (1. + params->get((int)0, 3) * params->get((int)0, 3)))) * TMath::Power((params->get((int)0, 2) * params->get((int)0, 2)) / ((1. + params->get((int)0, 3) * params->get((int)0, 3)) + (params->get((int)0, 2) * params->get((int)0, 2))), x) * TMath::Power((1. + params->get((int)0, 3) * params->get((int)0, 3)) / ((1. + params->get((int)0, 3) * params->get((int)0, 3)) + (params->get((int)0, 2) * params->get((int)0, 2))), (1. + params->get((int)0, 3) * params->get((int)0, 3))) + - 1. / (1 + params->get((int)0, 1) * params->get((int)0, 1)) * // 1 - alpha - // v2 ); - 1. / (x * TMath::Beta(x, (1. + params->get((int)0, 5) * params->get((int)0, 5)))) * TMath::Power((params->get((int)0, 4) * params->get((int)0, 4)) / ((1. + params->get((int)0, 5) * params->get((int)0, 5)) + (params->get((int)0, 4) * params->get((int)0, 4))), x) * TMath::Power((1. + params->get((int)0, 5) * params->get((int)0, 5)) / ((1. + params->get((int)0, 5) * params->get((int)0, 5)) + (params->get((int)0, 4) * params->get((int)0, 4))), (1. + params->get((int)0, 5) * params->get((int)0, 5)))); + // NOLINTBEGIN(readability-redundant-casting) + return params->get(static_cast(0), 6) * + (params->get(static_cast(0), 1) * params->get(static_cast(0), 1) / (1. + params->get(static_cast(0), 1) * params->get(static_cast(0), 1)) * // alpha + // v1 + + 1. / (x * TMath::Beta(x, (1. + params->get(static_cast(0), 3) * params->get(static_cast(0), 3)))) * TMath::Power((params->get(static_cast(0), 2) * params->get(static_cast(0), 2)) / ((1. + params->get(static_cast(0), 3) * params->get(static_cast(0), 3)) + (params->get(static_cast(0), 2) * params->get(static_cast(0), 2))), x) * TMath::Power((1. + params->get(static_cast(0), 3) * params->get(static_cast(0), 3)) / ((1. + params->get(static_cast(0), 3) * params->get(static_cast(0), 3)) + (params->get(static_cast(0), 2) * params->get(static_cast(0), 2))), (1. + params->get(static_cast(0), 3) * params->get(static_cast(0), 3))) + + 1. / (1 + params->get(static_cast(0), 1) * params->get(static_cast(0), 1)) * // 1 - alpha + // v2 ); + 1. / (x * TMath::Beta(x, (1. + params->get(static_cast(0), 5) * params->get(static_cast(0), 5)))) * TMath::Power((params->get(static_cast(0), 4) * params->get(static_cast(0), 4)) / ((1. + params->get(static_cast(0), 5) * params->get(static_cast(0), 5)) + (params->get(static_cast(0), 4) * params->get(static_cast(0), 4))), x) * TMath::Power((1. + params->get(static_cast(0), 5) * params->get(static_cast(0), 5)) / ((1. + params->get(static_cast(0), 5) * params->get(static_cast(0), 5)) + (params->get(static_cast(0), 4) * params->get(static_cast(0), 4))), (1. + params->get(static_cast(0), 5) * params->get(static_cast(0), 5)))); + // NOLINTEND(readability-redundant-casting) } template @@ -121,8 +123,8 @@ struct Reducer { void init(InitContext const&) { randomgen.seed(rd()); - LOGP(debug, ">>> Starting with params: {}, {}, {}, {}, {}, {}, {}", params->get((int)0, int(0)), params->get((int)0, 1), params->get((int)0, 2), - params->get((int)0, 3), params->get((int)0, 4), params->get((int)0, 5), params->get((int)0, 6)); + LOGP(debug, ">>> Starting with params: {}, {}, {}, {}, {}, {}, {}", params->get(static_cast(0), static_cast(0)), params->get(static_cast(0), 1), params->get(static_cast(0), 2), + params->get(static_cast(0), 3), params->get(static_cast(0), 4), params->get(static_cast(0), 5), params->get(static_cast(0), 6)); etabins = static_cast>(etaBins); phibins = static_cast>(phiBins); binned.resize((etabins.size() - 1) * (phibins.size() - 1)); @@ -147,11 +149,11 @@ struct Reducer { { weights.clear(); weights.resize(mccollisions.size()); - std::fill(weights.begin(), weights.end(), (float)-1.); + std::fill(weights.begin(), weights.end(), static_cast(-1.)); auto i = 0; LOGP(debug, ">>> {} MC collisions for BC", mccollisions.size()); for (auto& mcc : mccollisions) { - auto value = (mcc.multMCNParticlesEta10() == 0) ? params->get((int)0, (int)0) : NormalizedDoubleNBD((double)mcc.multMCNParticlesEta10()); + auto value = (mcc.multMCNParticlesEta10() == 0) ? params->get(static_cast(0), static_cast(0)) : NormalizedDoubleNBD(static_cast(mcc.multMCNParticlesEta10())); // // NOLINT(readability-redundant-casting) LOGP(debug, ">>> {} value for reduction (threshold {})", value, (float)reductionFactor); if (value < reductionFactor) { // if the fraction of events at this multiplicity is less than reduction factor, keep the event as is diff --git a/PWGMM/Mult/Tasks/dndeta-hi.cxx b/PWGMM/Mult/Tasks/dndeta-hi.cxx index 630922994cb..4ab2ac08313 100644 --- a/PWGMM/Mult/Tasks/dndeta-hi.cxx +++ b/PWGMM/Mult/Tasks/dndeta-hi.cxx @@ -367,7 +367,7 @@ struct MultiplicityCounter { } for (auto itrigc = 1u; itrigc < kTrigend; itrigc++) { if (btrigc[itrigc]) - registry.fill(HIST("hreczvtx"), Double_t(kDATA), Double_t(itrigc), z, cent); + registry.fill(HIST("hreczvtx"), static_cast(kDATA), static_cast(itrigc), z, cent); } for (auto& track : pertracks) { @@ -378,8 +378,8 @@ struct MultiplicityCounter { for (auto itrigc = 1u; itrigc < kTrigend; itrigc++) { if (btrigc[itrigc]) { - registry.fill(HIST("hphieta"), Double_t(kDATA), Double_t(itrigc), track.phi(), track.eta(), cent); - registry.fill(HIST("hrecdndeta"), Double_t(kDATA), Double_t(itrigc), z, track.eta(), cent, Double_t(kParDATA), track.phi()); + registry.fill(HIST("hphieta"), static_cast(kDATA), static_cast(itrigc), track.phi(), track.eta(), cent); + registry.fill(HIST("hrecdndeta"), static_cast(kDATA), static_cast(itrigc), z, track.eta(), cent, static_cast(kParDATA), track.phi()); } } } @@ -472,7 +472,7 @@ struct MultiplicityCounter { } for (auto ievtc = 1u; ievtc < kECend; ievtc++) { if (bevtc[ievtc]) - registry.fill(HIST("hgenzvtx"), Double_t(ievtc), genz, cent); + registry.fill(HIST("hgenzvtx"), static_cast(ievtc), genz, cent); } Int_t pid = 0; std::vector particleetas; @@ -502,14 +502,14 @@ struct MultiplicityCounter { if (std::abs(p->Charge()) >= 3) { for (auto ievtc = 1u; ievtc < kECend; ievtc++) { if (bevtc[ievtc]) { - registry.fill(HIST("hgendndeta"), Double_t(ievtc), genz, particle.eta(), cent, Double_t(pid), kNoPtVar, particle.phi()); + registry.fill(HIST("hgendndeta"), static_cast(ievtc), genz, particle.eta(), cent, static_cast(pid), kNoPtVar, particle.phi()); if (particle.pt() < 0.1) { - registry.fill(HIST("hgendndeta"), Double_t(ievtc), genz, particle.eta(), cent, Double_t(pid), kPtUp, particle.phi(), -10.0 * particle.pt() + 2); - registry.fill(HIST("hgendndeta"), Double_t(ievtc), genz, particle.eta(), cent, Double_t(pid), kPtDw, particle.phi(), 5.0 * particle.pt() + 0.5); + registry.fill(HIST("hgendndeta"), static_cast(ievtc), genz, particle.eta(), cent, static_cast(pid), kPtUp, particle.phi(), -10.0 * particle.pt() + 2); + registry.fill(HIST("hgendndeta"), static_cast(ievtc), genz, particle.eta(), cent, static_cast(pid), kPtDw, particle.phi(), 5.0 * particle.pt() + 0.5); } else { - registry.fill(HIST("hgendndeta"), Double_t(ievtc), genz, particle.eta(), cent, Double_t(pid), kPtUp, particle.phi()); - registry.fill(HIST("hgendndeta"), Double_t(ievtc), genz, particle.eta(), cent, Double_t(pid), kPtDw, particle.phi()); + registry.fill(HIST("hgendndeta"), static_cast(ievtc), genz, particle.eta(), cent, static_cast(pid), kPtUp, particle.phi()); + registry.fill(HIST("hgendndeta"), static_cast(ievtc), genz, particle.eta(), cent, static_cast(pid), kPtDw, particle.phi()); } } } @@ -596,7 +596,7 @@ struct MultiplicityCounter { for (auto ievtc = 1u; ievtc < kECend; ievtc++) { for (auto itrigc = 1u; itrigc < kTrigend; itrigc++) { if (bevtc[ievtc] && btrigc[itrigc]) { - registry.fill(HIST("hreczvtx"), Double_t(ievtc), Double_t(itrigc), z, cent); + registry.fill(HIST("hreczvtx"), static_cast(ievtc), static_cast(itrigc), z, cent); } } } @@ -641,8 +641,8 @@ struct MultiplicityCounter { for (auto ievtc = 1u; ievtc < kECend; ievtc++) { for (auto itrigc = 1u; itrigc < kTrigend; itrigc++) { if (bevtc[ievtc] && btrigc[itrigc]) { - registry.fill(HIST("hrecdndeta"), Double_t(ievtc), Double_t(itrigc), z, particle.eta(), cent, Double_t(pid), particle.phi()); - registry.fill(HIST("hphieta"), Double_t(ievtc), Double_t(itrigc), track.phi(), track.eta(), cent); + registry.fill(HIST("hrecdndeta"), static_cast(ievtc), static_cast(itrigc), z, particle.eta(), cent, static_cast(pid), particle.phi()); + registry.fill(HIST("hphieta"), static_cast(ievtc), static_cast(itrigc), track.phi(), track.eta(), cent); } } } @@ -651,7 +651,7 @@ struct MultiplicityCounter { for (auto ievtc = 1u; ievtc < kECend; ievtc++) { for (auto itrigc = 1u; itrigc < kTrigend; itrigc++) { if (bevtc[ievtc] && btrigc[itrigc]) { - registry.fill(HIST("hrecdndeta"), Double_t(ievtc), Double_t(itrigc), z, track.eta(), cent, Double_t(kBkg), track.phi()); + registry.fill(HIST("hrecdndeta"), static_cast(ievtc), static_cast(itrigc), z, track.eta(), cent, static_cast(kBkg), track.phi()); } } } @@ -710,7 +710,7 @@ struct MultiplicityCounter { } for (auto ievtc = 1u; ievtc < kECend; ievtc++) { if (bevtc[ievtc]) - registry.fill(HIST("hgenzvtx"), Double_t(ievtc), genz, -1.0); + registry.fill(HIST("hgenzvtx"), static_cast(ievtc), genz, -1.0); } Int_t pid = 0; for (auto& particle : mcParticles) { @@ -739,14 +739,14 @@ struct MultiplicityCounter { if (std::abs(p->Charge()) >= 3) { for (auto ievtc = 1u; ievtc < kECend; ievtc++) { if (bevtc[ievtc]) { - registry.fill(HIST("hgendndeta"), Double_t(ievtc), genz, particle.eta(), -1.0, Double_t(pid), kNoPtVar, particle.phi()); + registry.fill(HIST("hgendndeta"), static_cast(ievtc), genz, particle.eta(), -1.0, static_cast(pid), kNoPtVar, particle.phi()); if (particle.pt() < 0.1) { - registry.fill(HIST("hgendndeta"), Double_t(ievtc), genz, particle.eta(), -1.0, Double_t(pid), kPtUp, particle.phi(), 2.0); - registry.fill(HIST("hgendndeta"), Double_t(ievtc), genz, particle.eta(), -1.0, Double_t(pid), kPtDw, particle.phi(), 0.5); + registry.fill(HIST("hgendndeta"), static_cast(ievtc), genz, particle.eta(), -1.0, static_cast(pid), kPtUp, particle.phi(), 2.0); + registry.fill(HIST("hgendndeta"), static_cast(ievtc), genz, particle.eta(), -1.0, static_cast(pid), kPtDw, particle.phi(), 0.5); } else { - registry.fill(HIST("hgendndeta"), Double_t(ievtc), genz, particle.eta(), -1.0, Double_t(pid), kPtUp, particle.phi()); - registry.fill(HIST("hgendndeta"), Double_t(ievtc), genz, particle.eta(), -1.0, Double_t(pid), kPtDw, particle.phi()); + registry.fill(HIST("hgendndeta"), static_cast(ievtc), genz, particle.eta(), -1.0, static_cast(pid), kPtUp, particle.phi()); + registry.fill(HIST("hgendndeta"), static_cast(ievtc), genz, particle.eta(), -1.0, static_cast(pid), kPtDw, particle.phi()); } } } @@ -797,9 +797,9 @@ struct MultiplicityCounter { if (fabs(v0.eta()) < 0.5) registry.fill(HIST("hv0k0s"), v0.mK0Short()); - registry.fill(HIST("hv0mass"), cent, Double_t(kK0short), v0.eta(), Double_t(v0.mK0Short())); - registry.fill(HIST("hv0mass"), cent, Double_t(kLambda), v0.eta(), Double_t(v0.mLambda())); - registry.fill(HIST("hv0mass"), cent, Double_t(kAntilambda), v0.eta(), Double_t(v0.mAntiLambda())); + registry.fill(HIST("hv0mass"), cent, static_cast(kK0short), v0.eta(), static_cast(v0.mK0Short())); + registry.fill(HIST("hv0mass"), cent, static_cast(kLambda), v0.eta(), static_cast(v0.mLambda())); + registry.fill(HIST("hv0mass"), cent, static_cast(kAntilambda), v0.eta(), static_cast(v0.mAntiLambda())); } } } @@ -840,9 +840,9 @@ struct MultiplicityCounter { abs(pTrack.eta()) < etadau && abs(nTrack.eta()) < etadau) { - registry.fill(HIST("hv0mass"), cent, Double_t(kK0short), v0.eta(), Double_t(v0.mK0Short())); - registry.fill(HIST("hv0mass"), cent, Double_t(kLambda), v0.eta(), Double_t(v0.mLambda())); - registry.fill(HIST("hv0mass"), cent, Double_t(kAntilambda), v0.eta(), Double_t(v0.mAntiLambda())); + registry.fill(HIST("hv0mass"), cent, static_cast(kK0short), v0.eta(), static_cast(v0.mK0Short())); + registry.fill(HIST("hv0mass"), cent, static_cast(kLambda), v0.eta(), static_cast(v0.mLambda())); + registry.fill(HIST("hv0mass"), cent, static_cast(kAntilambda), v0.eta(), static_cast(v0.mAntiLambda())); } } } diff --git a/PWGMM/Mult/Tasks/dndeta-mft.cxx b/PWGMM/Mult/Tasks/dndeta-mft.cxx index e7ff487021d..e2f700e9b19 100644 --- a/PWGMM/Mult/Tasks/dndeta-mft.cxx +++ b/PWGMM/Mult/Tasks/dndeta-mft.cxx @@ -362,8 +362,8 @@ struct PseudorapidityDensityMFT { expressions::Filter trackSelectionCentral = ((aod::track::trackCutFlag & trackSelectionITS) == trackSelectionITS) && - ifnode((aod::track::v001::detectorMap & (uint8_t)o2::aod::track::TPC) == - (uint8_t)o2::aod::track::TPC, + ifnode((aod::track::v001::detectorMap & static_cast(o2::aod::track::TPC)) == + static_cast(o2::aod::track::TPC), (aod::track::trackCutFlag & trackSelectionTPC) == trackSelectionTPC, true) && @@ -552,8 +552,8 @@ struct PseudorapidityDensityMFT { using Particles = soa::Filtered; expressions::Filter primaries = (aod::mcparticle::flags & - (uint8_t)o2::aod::mcparticle::enums::PhysicalPrimary) == - (uint8_t)o2::aod::mcparticle::enums::PhysicalPrimary; + static_cast(o2::aod::mcparticle::enums::PhysicalPrimary)) == + static_cast(o2::aod::mcparticle::enums::PhysicalPrimary); Partition mcSample = nabs(aod::mcparticle::eta) < 1.1f; Partition mcSampleCentral = nabs(aod::mcparticle::eta) < estimatorEta; diff --git a/PWGMM/Mult/Tasks/dndeta.cxx b/PWGMM/Mult/Tasks/dndeta.cxx index 6f69f60e42c..a95f6cbde55 100644 --- a/PWGMM/Mult/Tasks/dndeta.cxx +++ b/PWGMM/Mult/Tasks/dndeta.cxx @@ -474,7 +474,7 @@ struct MultiplicityCounter { using ExCols = soa::Join; // PV contributors for INEL>0 (PV) collision sample definition - Partition pvContribTracksIUEta1 = (nabs(aod::track::eta) < 1.0f) && ((aod::track::flags & (uint32_t)o2::aod::track::PVContributor) == (uint32_t)o2::aod::track::PVContributor); + Partition pvContribTracksIUEta1 = (nabs(aod::track::eta) < 1.0f) && ((aod::track::flags & static_cast(o2::aod::track::PVContributor)) == static_cast(o2::aod::track::PVContributor)); template int countTracks(T const& tracks, float z, float c, float o) @@ -978,13 +978,13 @@ struct MultiplicityCounter { if constexpr (has_reco_cent) { for (auto const& track : relatedTracks) { for (auto layer = 0; layer < 7; ++layer) { - if (track.itsClusterMap() & (uint8_t(1) << layer)) { + if (track.itsClusterMap() & (static_cast(1) << layer)) { binnedRegistry.fill(HIST(ITSlayers), layer + 1, c_gen, o); } } auto hasbit = false; for (auto bit = 0; bit < 16; ++bit) { - if (track.mcMask() & (uint8_t(1) << bit)) { + if (track.mcMask() & (static_cast(1) << bit)) { binnedRegistry.fill(HIST(Mask), bit, c_gen, o); hasbit = true; } @@ -1002,13 +1002,13 @@ struct MultiplicityCounter { } else { for (auto const& track : relatedTracks) { for (auto layer = 0; layer < 7; ++layer) { - if (track.itsClusterMap() & (uint8_t(1) << layer)) { + if (track.itsClusterMap() & (static_cast(1) << layer)) { inclusiveRegistry.fill(HIST(ITSlayers), layer + 1, o); } } auto hasbit = false; for (auto bit = 0; bit < 16; ++bit) { - if (track.mcMask() & (uint8_t(1) << bit)) { + if (track.mcMask() & (static_cast(1) << bit)) { inclusiveRegistry.fill(HIST(Mask), bit, o); hasbit = true; } diff --git a/PWGMM/Mult/Tasks/effpt-mft.cxx b/PWGMM/Mult/Tasks/effpt-mft.cxx index c34dea1def2..1095731506f 100644 --- a/PWGMM/Mult/Tasks/effpt-mft.cxx +++ b/PWGMM/Mult/Tasks/effpt-mft.cxx @@ -93,7 +93,7 @@ struct EffPtMFT { } using Particles = aod::McParticles; - expressions::Filter primaries = (aod::mcparticle::flags & (uint8_t)o2::aod::mcparticle::enums::PhysicalPrimary) == (uint8_t)o2::aod::mcparticle::enums::PhysicalPrimary; + expressions::Filter primaries = (aod::mcparticle::flags & static_cast(o2::aod::mcparticle::enums::PhysicalPrimary)) == static_cast(o2::aod::mcparticle::enums::PhysicalPrimary); void processGen(aod::McCollisions::iterator const& mcCollision, o2::soa::SmallGroups> const& collisions, soa::Filtered const& particles) { @@ -112,7 +112,7 @@ struct EffPtMFT { auto p = pdg->GetParticle(particle.pdgCode()); auto charge = 0; if (p != nullptr) { - charge = (int)p->Charge(); + charge = static_cast(p->Charge()); } if (std::abs(charge) < 3.) { continue; @@ -162,7 +162,7 @@ struct EffPtMFT { // using MFTTracksLabeled = soa::Join; using ParticlesI = soa::Join; // expressions::Filter primaries = (aod::mcparticle::flags & (uint8_t)o2::aod::mcparticle::enums::PhysicalPrimary) == (uint8_t)o2::aod::mcparticle::enums::PhysicalPrimary; - Partition primariesI = ((aod::mcparticle::flags & (uint8_t)o2::aod::mcparticle::enums::PhysicalPrimary) == (uint8_t)o2::aod::mcparticle::enums::PhysicalPrimary); + Partition primariesI = ((aod::mcparticle::flags & static_cast(o2::aod::mcparticle::enums::PhysicalPrimary)) == static_cast(o2::aod::mcparticle::enums::PhysicalPrimary)); void processTrackEfficiencyIndexed(soa::Join const& collisions, aod::McCollisions const&, diff --git a/PWGMM/Mult/Tasks/heavy-ion-mult.cxx b/PWGMM/Mult/Tasks/heavy-ion-mult.cxx index d281fb37ac7..e33f3d91db9 100644 --- a/PWGMM/Mult/Tasks/heavy-ion-mult.cxx +++ b/PWGMM/Mult/Tasks/heavy-ion-mult.cxx @@ -571,7 +571,7 @@ struct HeavyIonMultiplicity { if (!IsTrackSelected(Rectrack)) { continue; } - histos.fill(HIST("FillMCrecSpecies"), SelectColCentrality(RecCollision), OccupancyValue, Rectrack.eta(), Double_t(kSpAll)); + histos.fill(HIST("FillMCrecSpecies"), SelectColCentrality(RecCollision), OccupancyValue, Rectrack.eta(), static_cast(kSpAll)); if (Rectrack.has_mcParticle()) { Int_t pid = kBkg; auto mcpart = Rectrack.template mcParticle_as(); @@ -603,9 +603,9 @@ struct HeavyIonMultiplicity { pid = kBkg; } mclabels.push_back(Rectrack.mcParticleId()); - histos.fill(HIST("FillMCrecSpecies"), SelectColCentrality(RecCollision), OccupancyValue, Rectrack.eta(), Double_t(pid)); + histos.fill(HIST("FillMCrecSpecies"), SelectColCentrality(RecCollision), OccupancyValue, Rectrack.eta(), static_cast(pid)); } else { - histos.fill(HIST("FillMCrecSpecies"), SelectColCentrality(RecCollision), OccupancyValue, Rectrack.eta(), Double_t(kBkg)); + histos.fill(HIST("FillMCrecSpecies"), SelectColCentrality(RecCollision), OccupancyValue, Rectrack.eta(), static_cast(kBkg)); } } // rec track loop @@ -613,7 +613,7 @@ struct HeavyIonMultiplicity { if (!IsGenTrackSelected(particle)) { continue; } - histos.fill(HIST("FillMCgenSpecies"), SelectColCentrality(RecCollision), particle.eta(), Double_t(kSpAll)); + histos.fill(HIST("FillMCgenSpecies"), SelectColCentrality(RecCollision), particle.eta(), static_cast(kSpAll)); Int_t pid = 0; switch (std::abs(particle.pdgCode())) { case 211: @@ -629,7 +629,7 @@ struct HeavyIonMultiplicity { pid = kSpOther; break; } - histos.fill(HIST("FillMCgenSpecies"), SelectColCentrality(RecCollision), particle.eta(), Double_t(pid)); + histos.fill(HIST("FillMCgenSpecies"), SelectColCentrality(RecCollision), particle.eta(), static_cast(pid)); } // gen track loop } // collision loop } diff --git a/PWGMM/Mult/Tasks/mftReassociationValidation.cxx b/PWGMM/Mult/Tasks/mftReassociationValidation.cxx index 65cb143aa0a..f250f4e6093 100644 --- a/PWGMM/Mult/Tasks/mftReassociationValidation.cxx +++ b/PWGMM/Mult/Tasks/mftReassociationValidation.cxx @@ -971,7 +971,7 @@ struct MftReassociationValidation { grpmag = ccdb->getForTimeStamp(configTask.grpmagPath, bc.timestamp()); o2::base::Propagator::initFieldFromGRP(grpmag); - o2::field::MagneticField* field = static_cast(TGeoGlobalMagField::Instance()->GetField()); + o2::field::MagneticField* field = dynamic_cast(TGeoGlobalMagField::Instance()->GetField()); bZ = field->getBz(CcenterMFT); if (configTask.cfgApplyZShiftFromCCDB) { diff --git a/PWGMM/Mult/Tasks/pseudoEffMFT.cxx b/PWGMM/Mult/Tasks/pseudoEffMFT.cxx index 7a47c760094..f4d9dcef574 100644 --- a/PWGMM/Mult/Tasks/pseudoEffMFT.cxx +++ b/PWGMM/Mult/Tasks/pseudoEffMFT.cxx @@ -517,7 +517,7 @@ struct PseudoEffMFT { Filter filtATrackDCAxy = (nabs(aod::fwdtrack::bestDCAXY) < trackCuts.maxDCAxy); Filter filtATrackDCAz = (nabs(aod::fwdtrack::bestDCAZ) < trackCuts.maxDCAz); /// Filters - mc particles - Filter primaries = (aod::mcparticle::flags & (uint8_t)o2::aod::mcparticle::enums::PhysicalPrimary) == (uint8_t)o2::aod::mcparticle::enums::PhysicalPrimary && (aod::mcparticle::eta < trackCuts.maxEta) && (aod::mcparticle::eta > trackCuts.minEta); + Filter primaries = (aod::mcparticle::flags & static_cast(o2::aod::mcparticle::enums::PhysicalPrimary)) == static_cast(o2::aod::mcparticle::enums::PhysicalPrimary) && (aod::mcparticle::eta < trackCuts.maxEta) && (aod::mcparticle::eta > trackCuts.minEta); /// Joined tables using FullBCs = soa::Join; diff --git a/PWGMM/Mult/Tasks/qaReassocMFTPbPb.cxx b/PWGMM/Mult/Tasks/qaReassocMFTPbPb.cxx index f71e39a128c..04e7a791e32 100644 --- a/PWGMM/Mult/Tasks/qaReassocMFTPbPb.cxx +++ b/PWGMM/Mult/Tasks/qaReassocMFTPbPb.cxx @@ -1710,7 +1710,7 @@ struct QaReassocMFTPbPb { int nTrk = 0, nFakeTrk = 0, nGoodTrk = 0; for (const auto& track : tracks) { - uint index = uint(track.collisionId() >= 0); + uint index = static_cast(track.collisionId() >= 0); if (track.has_mcParticle() && track.mcMask() == trackCuts.selMcMask) { // auto particle = track.mcParticle_as(); const auto& particle = track.mcParticle(); diff --git a/PWGMM/Mult/Tasks/run2dndeta.cxx b/PWGMM/Mult/Tasks/run2dndeta.cxx index 84e7fca4123..16233cc7677 100644 --- a/PWGMM/Mult/Tasks/run2dndeta.cxx +++ b/PWGMM/Mult/Tasks/run2dndeta.cxx @@ -94,7 +94,7 @@ struct PseudorapidityDensity { x->SetBinLabel(5, "Selected INEL>0"); fRatio = new TF1("fRatio", "pol6", -15, 15); - auto param = (std::vector)parRatio; + auto param = std::vector(parRatio); fRatio->SetParameters(param[0], param[1], param[2], param[3], param[4], param[5], param[6]); } @@ -112,7 +112,7 @@ struct PseudorapidityDensity { } } - expressions::Filter trackTypeFilter = (aod::track::trackType == (uint8_t)aod::track::TrackTypeEnum::Run2Tracklet); + expressions::Filter trackTypeFilter = (aod::track::trackType == static_cast(aod::track::TrackTypeEnum::Run2Tracklet)); using Trks = soa::Filtered>; Partition sample = nabs(aod::track::eta) < estimatorEta; @@ -189,7 +189,7 @@ struct PseudorapidityDensity { PROCESS_SWITCH(PseudorapidityDensity, processBinned, "Process centrality/mult. percentile binned", false); using Particles = aod::McParticles; - expressions::Filter primaries = (aod::mcparticle::flags & (uint8_t)o2::aod::mcparticle::enums::PhysicalPrimary) == (uint8_t)o2::aod::mcparticle::enums::PhysicalPrimary; + expressions::Filter primaries = (aod::mcparticle::flags & static_cast(o2::aod::mcparticle::enums::PhysicalPrimary)) == static_cast(o2::aod::mcparticle::enums::PhysicalPrimary); Partition> mcSample = nabs(aod::mcparticle::eta) < estimatorEta; void processGen(aod::McCollisions::iterator const& mcCollision, soa::Join const& collisions, soa::Filtered const& particles, soa::Filtered> const& /*tracks*/) @@ -200,7 +200,7 @@ struct PseudorapidityDensity { auto charge = 0; auto p = pdg->GetParticle(particle.pdgCode()); if (p != nullptr) { - charge = (int)p->Charge(); + charge = static_cast(p->Charge()); } if (charge != 0) { nCharged++; @@ -235,7 +235,7 @@ struct PseudorapidityDensity { auto p = pdg->GetParticle(particle.pdgCode()); auto charge = 0; if (p != nullptr) { - charge = (int)p->Charge(); + charge = static_cast(p->Charge()); } if (charge != 0) { registry.fill(HIST("TracksEtaZvtxGen_t"), particle.eta(), mcCollision.posZ());