Skip to content

Commit f969d1d

Browse files
vkuceravkucera
committed
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`)
1 parent dc12526 commit f969d1d

20 files changed

Lines changed: 45 additions & 45 deletions

‎PWGUD/AQC/udQC.cxx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ struct UDQC {
9797
// initialize global variables
9898
maxdEdxTPC = 0.;
9999
maxdEdxTOF = 0.;
100-
diffCuts = (DGCutparHolder)DGCuts;
100+
diffCuts = DGCutparHolder(DGCuts);
101101

102102
// add histograms for the different process functions
103103
if (context.mOptions.get<bool>("processMain")) {

‎PWGUD/AQC/udQCmidRap.cxx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ struct UDQCmid {
8686
// initialize global variables
8787
maxdEdxTPC = 0.;
8888
maxdEdxTOF = 0.;
89-
diffCuts = (DGCutparHolder)DGCuts;
89+
diffCuts = DGCutparHolder(DGCuts);
9090

9191
// add histograms for the different process functions
9292
if (context.mOptions.get<bool>("processMain")) {

‎PWGUD/AQC/udQcMuon.cxx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ struct UdQcMuon {
9898

9999
void init(InitContext& context)
100100
{
101-
diffCuts = (DGCutparHolder)dgCuts;
101+
diffCuts = DGCutparHolder(dgCuts);
102102

103103
// add histograms for the different process functions
104104
if (context.mOptions.get<bool>("processMain")) {

‎PWGUD/TableProducer/DGBCCandProducer.cxx‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -131,8 +131,8 @@ struct tracksWGTInBCs {
131131
// compute the BC closest in time
132132
auto firstCompatibleBC = ambTracksSlice.begin().bc().begin().globalBC();
133133
LOGF(debug, "First compatible BC %d Track time %f", firstCompatibleBC, track.trackTime());
134-
closestBC = (uint64_t)(firstCompatibleBC +
135-
(track.trackTime() / o2::constants::lhc::LHCBunchSpacingNS));
134+
closestBC = static_cast<uint64_t>(firstCompatibleBC +
135+
(track.trackTime() / o2::constants::lhc::LHCBunchSpacingNS));
136136
} else {
137137
// this track is not ambiguous, has hence a unique association to a collision/BC
138138
if (!track.has_collision()) {
@@ -147,7 +147,7 @@ struct tracksWGTInBCs {
147147

148148
// update tracksInBCList
149149
LOGF(debug, "Updating tracksInBCList with %d", closestBC);
150-
tracksInBCList[closestBC].emplace_back((int32_t)track.globalIndex());
150+
tracksInBCList[closestBC].emplace_back(static_cast<int32_t>(track.globalIndex()));
151151
}
152152
}
153153

@@ -215,8 +215,8 @@ struct tracksWGTInBCs {
215215

216216
// compute the BC closest in time
217217
auto firstCompatibleBC = ambFwdTracksSlice.begin().bc().begin().globalBC();
218-
closestBC = (uint64_t)(firstCompatibleBC +
219-
(fwdTrack.trackTime() / o2::constants::lhc::LHCBunchSpacingNS));
218+
closestBC = static_cast<uint64_t>(firstCompatibleBC +
219+
(fwdTrack.trackTime() / o2::constants::lhc::LHCBunchSpacingNS));
220220
} else {
221221
// this track is not ambiguous, has hence a unique association to a collision/BC
222222
if (!fwdTrack.has_collision()) {
@@ -231,7 +231,7 @@ struct tracksWGTInBCs {
231231

232232
// update tracksInBCList
233233
LOGF(debug, "Updating fwdTracksInBCList with %d", closestBC);
234-
fwdTracksInBCList[closestBC].emplace_back((int32_t)fwdTrack.globalIndex());
234+
fwdTracksInBCList[closestBC].emplace_back(static_cast<int32_t>(fwdTrack.globalIndex()));
235235
}
236236
}
237237

@@ -385,7 +385,7 @@ struct DGBCCandProducer {
385385

386386
void init(InitContext& context)
387387
{
388-
diffCuts = (DGCutparHolder)DGCuts;
388+
diffCuts = DGCutparHolder(DGCuts);
389389

390390
if (context.mOptions.get<bool>("processTinBCs")) {
391391
registry.add("table/candCase", "#candCase", {HistType::kTH1F, {{4, -0.5, 3.5}}});

‎PWGUD/TableProducer/SGCandProducer.cxx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -392,8 +392,8 @@ struct SGCandProducer {
392392
ccdb->setURL("http://alice-ccdb.cern.ch");
393393
ccdb->setCaching(true);
394394
ccdb->setFatalWhenNull(false);
395-
sameCuts = (SGCutParHolder)SGCuts;
396-
fitCuts = (FITCutParHolder)FITCuts;
395+
sameCuts = SGCutParHolder(SGCuts);
396+
fitCuts = FITCutParHolder(FITCuts);
397397

398398
// add histograms for the different process functions
399399
histPointers.clear();

‎PWGUD/TableProducer/UPCCandidateProducer.cxx‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ struct UpcCandProducer {
157157
fwdSelectors.resize(upchelpers::kNFwdSels - 1, false);
158158
barrelSelectors.resize(upchelpers::kNBarrelSels - 1, false);
159159

160-
upcCuts = (UPCCutparHolder)inputCuts;
160+
upcCuts = UPCCutparHolder(inputCuts);
161161

162162
// initialize RCT flag checker
163163
if (rctLabel.value != "none" && rctLabel.value != "muon" && rctLabel.value != "muon_glo") {
@@ -1990,7 +1990,7 @@ struct UpcCandProducer {
19901990
fwdTracks, fwdTrkClusters, ambFwdTracks,
19911991
bcs, collisions,
19921992
ft0s, fdds, fv0as,
1993-
(o2::aod::McTrackLabels*)nullptr, (o2::aod::McFwdTrackLabels*)nullptr);
1993+
nullptr, nullptr);
19941994
}
19951995

19961996
// create candidates for central region
@@ -2007,7 +2007,7 @@ struct UpcCandProducer {
20072007
createCandidatesCentral(barrelTracks, ambBarrelTracks,
20082008
bcs, collisions,
20092009
ft0s, fdds, fv0as, zdcs,
2010-
(o2::aod::McTrackLabels*)nullptr);
2010+
nullptr);
20112011
}
20122012

20132013
// MC processors
@@ -2076,7 +2076,7 @@ struct UpcCandProducer {
20762076
createCandidatesFwd(fwdTracks, fwdTrkClusters, ambFwdTracks,
20772077
bcs, collisions,
20782078
ft0s, fdds, fv0as, zdcs,
2079-
(o2::aod::McFwdTrackLabels*)nullptr);
2079+
nullptr);
20802080
}
20812081

20822082
void processForwardMC(ForwardTracks const& fwdTracks,
@@ -2116,7 +2116,7 @@ struct UpcCandProducer {
21162116
createCandidatesFwdGlobal(fwdTracks, fwdTrkClusters, ambFwdTracks,
21172117
bcs, collisions,
21182118
ft0s, fdds, fv0as, zdcs,
2119-
(o2::aod::McFwdTrackLabels*)nullptr);
2119+
nullptr);
21202120
}
21212121

21222122
void processForwardGlobalMC(ForwardTracks const& fwdTracks,

‎PWGUD/TableProducer/dgCandProducer.cxx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -456,7 +456,7 @@ struct DgCandProducer {
456456
ccdb->setFatalWhenNull(false);
457457

458458
// DGCuts
459-
diffCuts = (DGCutparHolder)DGCuts;
459+
diffCuts = DGCutparHolder(DGCuts);
460460

461461
// add histograms for the different process functions
462462
histPointers.clear();

‎PWGUD/TableProducer/upcCandProducerGlobalMuon.cxx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ struct UpcCandProducerGlobalMuon {
124124

125125
void init(InitContext&)
126126
{
127-
fUpcCuts = (UPCCutparHolder)fUpcCutsConf;
127+
fUpcCuts = UPCCutparHolder(fUpcCutsConf);
128128
if (fUpcCuts.getUseFwdCuts() || fEnableMFT) {
129129
fCCDB->setURL("http://alice-ccdb.cern.ch");
130130
fCCDB->setCaching(true);
@@ -610,7 +610,7 @@ struct UpcCandProducerGlobalMuon {
610610
}
611611
// Initialize FwdDCAFitter with magnetic field
612612
if (fEnableMFT) {
613-
o2::field::MagneticField* field = static_cast<o2::field::MagneticField*>(TGeoGlobalMagField::Instance()->GetField());
613+
o2::field::MagneticField* field = dynamic_cast<o2::field::MagneticField*>(TGeoGlobalMagField::Instance()->GetField());
614614
static constexpr double kCenterMFT[3] = {0, 0, -61.4};
615615
float bz = field->getBz(kCenterMFT);
616616
LOG(info) << "FwdDCAFitter magnetic field at MFT center: bZ = " << bz;
@@ -922,7 +922,7 @@ struct UpcCandProducerGlobalMuon {
922922
o2::aod::Zdcs const& zdcs)
923923
{
924924
fDoMC = false;
925-
createCandidates(fwdTracks, mftTracks, fwdTrkCls, ambFwdTracks, bcs, collisions, fv0s, zdcs, (o2::aod::McFwdTrackLabels*)nullptr);
925+
createCandidates(fwdTracks, mftTracks, fwdTrkCls, ambFwdTracks, bcs, collisions, fv0s, zdcs, nullptr);
926926
}
927927

928928
void processFwdMC(ForwardTracks const& fwdTracks,

‎PWGUD/TableProducer/upcCandProducerMuon.cxx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ struct UpcCandProducerMuon {
8888

8989
void init(InitContext&)
9090
{
91-
fUpcCuts = (UPCCutparHolder)fUpcCutsConf;
91+
fUpcCuts = UPCCutparHolder(fUpcCutsConf);
9292
if (fUpcCuts.getUseFwdCuts()) {
9393
fCCDB->setURL("http://alice-ccdb.cern.ch");
9494
fCCDB->setCaching(true);
@@ -520,7 +520,7 @@ struct UpcCandProducerMuon {
520520
o2::aod::Zdcs const& zdcs)
521521
{
522522
fDoMC = false;
523-
createCandidates(fwdTracks, ambFwdTracks, bcs, collisions, fv0s, zdcs, (o2::aod::McFwdTrackLabels*)nullptr);
523+
createCandidates(fwdTracks, ambFwdTracks, bcs, collisions, fv0s, zdcs, nullptr);
524524
}
525525

526526
void processFwdMC(ForwardTracks const& fwdTracks,

‎PWGUD/TableProducer/upcCandProducerSemiFwd.cxx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ struct UpcCandProducerSemiFwd {
108108

109109
void init(InitContext&)
110110
{
111-
fUpcCuts = (UPCCutparHolder)fUpcCutsConf;
111+
fUpcCuts = UPCCutparHolder(fUpcCutsConf);
112112
if (fUpcCuts.getUseFwdCuts()) {
113113
fCCDB->setURL("http://alice-ccdb.cern.ch");
114114
fCCDB->setCaching(true);
@@ -653,7 +653,7 @@ struct UpcCandProducerSemiFwd {
653653
{
654654
fDoMC = false;
655655
createCandidates(fwdTracks, ambFwdTracks, barrelTracks, ambBarrelTracks, bcs, collisions, fv0s, zdcs,
656-
(o2::aod::McFwdTrackLabels*)nullptr, (o2::aod::McTrackLabels*)nullptr);
656+
nullptr, nullptr);
657657
}
658658

659659
void processSemiFwdMC(ForwardTracks const& fwdTracks,

0 commit comments

Comments
 (0)