Skip to content

Commit 9963b3e

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 7900bb8 commit 9963b3e

57 files changed

Lines changed: 199 additions & 200 deletions

Some content is hidden

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

‎PWGJE/Core/JetFindingUtilities.h‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -284,12 +284,11 @@ bool analyseV0s(std::vector<fastjet::PseudoJet>& inputParticles, T const& v0s, f
284284
* @param doHFJetFinding set whether only jets containing a HF candidate are saved
285285
*/
286286
template <typename T, typename U, typename V>
287-
void findJets(JetFinder& jetFinder, std::vector<fastjet::PseudoJet>& inputParticles, float jetPtMin, float jetPtMax, std::vector<double> jetRadius, float jetAreaFractionMin, T const& collision, U& jetsTable, V& constituentsTable, const std::shared_ptr<THn>& thnSparseJet, bool fillThnSparse, bool doCandidateJetFinding = false)
287+
void findJets(JetFinder& jetFinder, std::vector<fastjet::PseudoJet>& inputParticles, float jetPtMin, float jetPtMax, const std::vector<double>& jetRadius, float jetAreaFractionMin, T const& collision, U& jetsTable, V& constituentsTable, const std::shared_ptr<THn>& thnSparseJet, bool fillThnSparse, bool doCandidateJetFinding = false)
288288
{
289-
auto jetRValues = static_cast<std::vector<double>>(std::move(jetRadius));
290289
jetFinder.jetPtMin = jetPtMin;
291290
jetFinder.jetPtMax = jetPtMax;
292-
for (auto R : jetRValues) {
291+
for (auto R : jetRadius) {
293292
jetFinder.jetR = R;
294293
std::vector<fastjet::PseudoJet> jets;
295294
fastjet::ClusterSequenceArea clusterSeq(jetFinder.findJets(inputParticles, jets));

‎PWGJE/Core/JetTaggingUtilities.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -997,8 +997,8 @@ int vertexClustering(AnyCollision const& collision, AnalysisJet const& jet, AnyT
997997
trkLabels["trkOrigin"].push_back(0); // mismatched coll track
998998
} else {
999999
int orig = RecoDecay::getParticleOrigin(particles, particle, searchUpToQuark);
1000-
trkLabels["trkOrigin"].push_back((orig != RecoDecay::OriginType::None) ? static_cast<int>(orig) : (trkLabels["trkVtxIndex"][trkIdx] == 0) ? 3
1001-
: 4); // 1: charm, 2: beauty, 3: primary, 4: other secondary
1000+
trkLabels["trkOrigin"].push_back((orig != RecoDecay::OriginType::None) ? orig : (trkLabels["trkVtxIndex"][trkIdx] == 0) ? 3
1001+
: 4); // 1: charm, 2: beauty, 3: primary, 4: other secondary
10021002
}
10031003
}
10041004

‎PWGJE/JetFinders/jetFinder.h‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -127,13 +127,13 @@ struct JetFinderTask {
127127

128128
void init(o2::framework::InitContext const&)
129129
{
130-
hadronicCorrectionTypesVec = (std::vector<int>)hadronicCorrectionTypes;
131-
eventSelectionBits = jetderiveddatautilities::initialiseEventSelectionBits(static_cast<std::string>(eventSelections));
130+
hadronicCorrectionTypesVec = hadronicCorrectionTypes;
131+
eventSelectionBits = jetderiveddatautilities::initialiseEventSelectionBits(eventSelections);
132132
triggerMaskBits = jetderiveddatautilities::initialiseTriggerMaskBits(triggerMasks);
133-
trackSelection = jetderiveddatautilities::initialiseTrackSelection(static_cast<std::string>(trackSelections));
134-
particleSelection = static_cast<std::string>(particleSelections);
133+
trackSelection = jetderiveddatautilities::initialiseTrackSelection(trackSelections);
134+
particleSelection = particleSelections;
135135

136-
clusterDefinitionsVec = jetderiveddatautilities::initialiseClusterDefinitions(clusterDefinitions.value);
136+
clusterDefinitionsVec = jetderiveddatautilities::initialiseClusterDefinitions(clusterDefinitions);
137137

138138
jetFinder.etaMin = trackEtaMin;
139139
jetFinder.etaMax = trackEtaMax;
@@ -164,16 +164,16 @@ struct JetFinderTask {
164164
jetFinder.jetEtaDefault = true;
165165
}
166166

167-
jetFinder.algorithm = static_cast<fastjet::JetAlgorithm>(static_cast<int>(jetAlgorithm));
168-
jetFinder.recombScheme = static_cast<fastjet::RecombinationScheme>(static_cast<int>(jetRecombScheme));
167+
jetFinder.algorithm = static_cast<fastjet::JetAlgorithm>(jetAlgorithm.value);
168+
jetFinder.recombScheme = static_cast<fastjet::RecombinationScheme>(jetRecombScheme.value);
169169
jetFinder.ghostArea = jetGhostArea;
170170
jetFinder.ghostRepeatN = ghostRepeat;
171171
if (DoTriggering) {
172172
jetFinder.isTriggering = true;
173173
}
174174
jetFinder.fastjetExtraParam = jetExtraParam;
175175

176-
auto jetRadiiBins = (std::vector<double>)jetRadius;
176+
auto jetRadiiBins = jetRadius.value;
177177
if (jetRadiiBins.size() > 1) {
178178
jetRadiiBins.push_back(jetRadiiBins[jetRadiiBins.size() - 1] + (TMath::Abs(jetRadiiBins[jetRadiiBins.size() - 1] - jetRadiiBins[jetRadiiBins.size() - 2])));
179179
} else {

‎PWGJE/JetFinders/jetFinderHF.h‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -134,11 +134,11 @@ struct JetFinderHFTask {
134134

135135
void init(o2::framework::InitContext const&)
136136
{
137-
trackSelection = jetderiveddatautilities::initialiseTrackSelection(static_cast<std::string>(trackSelections));
137+
trackSelection = jetderiveddatautilities::initialiseTrackSelection(trackSelections);
138138
triggerMaskBits = jetderiveddatautilities::initialiseTriggerMaskBits(triggerMasks);
139-
eventSelectionBits = jetderiveddatautilities::initialiseEventSelectionBits(static_cast<std::string>(eventSelections));
140-
particleSelection = static_cast<std::string>(particleSelections);
141-
clusterDefinition = o2::aod::emcalcluster::getClusterDefinitionFromString(clusterDefinitionS.value);
139+
eventSelectionBits = jetderiveddatautilities::initialiseEventSelectionBits(eventSelections);
140+
particleSelection = particleSelections;
141+
clusterDefinition = o2::aod::emcalcluster::getClusterDefinitionFromString(clusterDefinitionS);
142142

143143
jetFinder.etaMin = trackEtaMin;
144144
jetFinder.etaMax = trackEtaMax;
@@ -168,16 +168,16 @@ struct JetFinderHFTask {
168168
if (jetEtaMin < -98.0) {
169169
jetFinder.jetEtaDefault = true;
170170
}
171-
jetFinder.algorithm = static_cast<fastjet::JetAlgorithm>(static_cast<int>(jetAlgorithm));
172-
jetFinder.recombScheme = static_cast<fastjet::RecombinationScheme>(static_cast<int>(jetRecombScheme));
171+
jetFinder.algorithm = static_cast<fastjet::JetAlgorithm>(jetAlgorithm.value);
172+
jetFinder.recombScheme = static_cast<fastjet::RecombinationScheme>(jetRecombScheme.value);
173173
jetFinder.ghostArea = jetGhostArea;
174174
jetFinder.ghostRepeatN = ghostRepeat;
175175
if (DoTriggering) {
176176
jetFinder.isTriggering = true;
177177
}
178178
jetFinder.fastjetExtraParam = jetExtraParam;
179179

180-
auto jetRadiiBins = (std::vector<double>)jetRadius;
180+
auto jetRadiiBins = jetRadius.value;
181181
if (jetRadiiBins.size() > 1) {
182182
jetRadiiBins.push_back(jetRadiiBins[jetRadiiBins.size() - 1] + (TMath::Abs(jetRadiiBins[jetRadiiBins.size() - 1] - jetRadiiBins[jetRadiiBins.size() - 2])));
183183
} else {

‎PWGJE/JetFinders/jetFinderHFHFBar.h‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -132,10 +132,10 @@ struct JetFinderHFHFBarTask {
132132

133133
void init(o2::framework::InitContext const&)
134134
{
135-
trackSelection = jetderiveddatautilities::initialiseTrackSelection(static_cast<std::string>(trackSelections));
135+
trackSelection = jetderiveddatautilities::initialiseTrackSelection(trackSelections);
136136
triggerMaskBits = jetderiveddatautilities::initialiseTriggerMaskBits(triggerMasks);
137-
eventSelectionBits = jetderiveddatautilities::initialiseEventSelectionBits(static_cast<std::string>(eventSelections));
138-
particleSelection = static_cast<std::string>(particleSelections);
137+
eventSelectionBits = jetderiveddatautilities::initialiseEventSelectionBits(eventSelections);
138+
particleSelection = particleSelections;
139139

140140
jetFinder.etaMin = trackEtaMin;
141141
jetFinder.etaMax = trackEtaMax;
@@ -165,16 +165,16 @@ struct JetFinderHFHFBarTask {
165165
if (jetEtaMin < -98.0) {
166166
jetFinder.jetEtaDefault = true;
167167
}
168-
jetFinder.algorithm = static_cast<fastjet::JetAlgorithm>(static_cast<int>(jetAlgorithm));
169-
jetFinder.recombScheme = static_cast<fastjet::RecombinationScheme>(static_cast<int>(jetRecombScheme));
168+
jetFinder.algorithm = static_cast<fastjet::JetAlgorithm>(jetAlgorithm.value);
169+
jetFinder.recombScheme = static_cast<fastjet::RecombinationScheme>(jetRecombScheme.value);
170170
jetFinder.ghostArea = jetGhostArea;
171171
jetFinder.ghostRepeatN = ghostRepeat;
172172
if (DoTriggering) {
173173
jetFinder.isTriggering = true;
174174
}
175175
jetFinder.fastjetExtraParam = jetExtraParam;
176176

177-
auto jetRadiiBins = (std::vector<double>)jetRadius;
177+
auto jetRadiiBins = jetRadius.value;
178178
if (jetRadiiBins.size() > 1) {
179179
jetRadiiBins.push_back(jetRadiiBins[jetRadiiBins.size() - 1] + (TMath::Abs(jetRadiiBins[jetRadiiBins.size() - 1] - jetRadiiBins[jetRadiiBins.size() - 2])));
180180
} else {
@@ -192,7 +192,7 @@ struct JetFinderHFHFBarTask {
192192
registry.add("hJetMCP", "sparse for mcp jets", {o2::framework::HistType::kTHnD, {{jetRadiiBins, ""}, {jetPtBinNumber, jetPtMinDouble, jetPtMaxDouble}, {40, -1.0, 1.0}, {18, 0.0, 7.0}}});
193193
}
194194

195-
o2::aod::EMCALClusterDefinition clusterDefinition = o2::aod::emcalcluster::getClusterDefinitionFromString(clusterDefinitionS.value);
195+
o2::aod::EMCALClusterDefinition clusterDefinition = o2::aod::emcalcluster::getClusterDefinitionFromString(clusterDefinitionS);
196196
o2::framework::expressions::Filter collisionFilter = (nabs(o2::aod::jcollision::posZ) < vertexZCut && o2::aod::jcollision::centFT0M >= centralityMin && o2::aod::jcollision::centFT0M < centralityMax && o2::aod::jcollision::trackOccupancyInTimeRange <= trackOccupancyInTimeRangeMax);
197197
o2::framework::expressions::Filter mcCollisionFilter = (nabs(o2::aod::jmccollision::posZ) < vertexZCut);
198198
o2::framework::expressions::Filter trackCuts = (o2::aod::jtrack::pt >= trackPtMin && o2::aod::jtrack::pt < trackPtMax && o2::aod::jtrack::eta >= trackEtaMin && o2::aod::jtrack::eta <= trackEtaMax && o2::aod::jtrack::phi >= trackPhiMin && o2::aod::jtrack::phi <= trackPhiMax && (phiExclusionMin < -998.0 || (o2::aod::jtrack::phi <= phiExclusionMin || o2::aod::jtrack::phi >= phiExclusionMax)));

‎PWGJE/JetFinders/jetFinderV0.h‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -116,10 +116,10 @@ struct JetFinderV0Task {
116116

117117
void init(o2::framework::InitContext const&)
118118
{
119-
trackSelection = jetderiveddatautilities::initialiseTrackSelection(static_cast<std::string>(trackSelections));
119+
trackSelection = jetderiveddatautilities::initialiseTrackSelection(trackSelections);
120120
triggerMaskBits = jetderiveddatautilities::initialiseTriggerMaskBits(triggerMasks);
121-
eventSelectionBits = jetderiveddatautilities::initialiseEventSelectionBits(static_cast<std::string>(eventSelections));
122-
particleSelection = static_cast<std::string>(particleSelections);
121+
eventSelectionBits = jetderiveddatautilities::initialiseEventSelectionBits(eventSelections);
122+
particleSelection = particleSelections;
123123

124124
jetFinder.etaMin = trackEtaMin;
125125
jetFinder.etaMax = trackEtaMax;
@@ -149,8 +149,8 @@ struct JetFinderV0Task {
149149
if (jetEtaMin < -98.0) {
150150
jetFinder.jetEtaDefault = true;
151151
}
152-
jetFinder.algorithm = static_cast<fastjet::JetAlgorithm>(static_cast<int>(jetAlgorithm));
153-
jetFinder.recombScheme = static_cast<fastjet::RecombinationScheme>(static_cast<int>(jetRecombScheme));
152+
jetFinder.algorithm = static_cast<fastjet::JetAlgorithm>(jetAlgorithm.value);
153+
jetFinder.recombScheme = static_cast<fastjet::RecombinationScheme>(jetRecombScheme.value);
154154
jetFinder.ghostArea = jetGhostArea;
155155
jetFinder.ghostRepeatN = ghostRepeat;
156156
if (DoTriggering) {
@@ -165,7 +165,7 @@ struct JetFinderV0Task {
165165
candIndex = 1;
166166
}
167167

168-
auto jetRadiiBins = (std::vector<double>)jetRadius;
168+
auto jetRadiiBins = jetRadius.value;
169169
if (jetRadiiBins.size() > 1) {
170170
jetRadiiBins.push_back(jetRadiiBins[jetRadiiBins.size() - 1] + (TMath::Abs(jetRadiiBins[jetRadiiBins.size() - 1] - jetRadiiBins[jetRadiiBins.size() - 2])));
171171
} else {

‎PWGJE/TableProducer/eventwiseConstituentSubtractor.cxx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -103,9 +103,9 @@ struct eventWiseConstituentSubtractorTask {
103103

104104
void init(o2::framework::InitContext&)
105105
{
106-
eventSelectionBits = jetderiveddatautilities::initialiseEventSelectionBits(static_cast<std::string>(eventSelections));
107-
trackSelection = jetderiveddatautilities::initialiseTrackSelection(static_cast<std::string>(trackSelections));
108-
particleSelection = static_cast<std::string>(particleSelections);
106+
eventSelectionBits = jetderiveddatautilities::initialiseEventSelectionBits(eventSelections);
107+
trackSelection = jetderiveddatautilities::initialiseTrackSelection(trackSelections);
108+
particleSelection = particleSelections;
109109

110110
eventWiseConstituentSubtractor.setDoRhoMassSub(doRhoMassSub);
111111
eventWiseConstituentSubtractor.setConstSubAlphaRMax(alpha, rMax);

‎PWGJE/TableProducer/jetTaggerHF.cxx‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -376,46 +376,46 @@ struct JetTaggerHFTask {
376376
// Set up the resolution function
377377
switch (resoFuncMatch) {
378378
case 0:
379-
vecParamsData = (std::vector<float>)paramsResoFuncData;
380-
vecParamsCharmJetMC = (std::vector<float>)paramsResoFuncCharmJetMC;
381-
vecParamsBeautyJetMC = (std::vector<float>)paramsResoFuncBeautyJetMC;
382-
vecParamsLfJetMC = (std::vector<float>)paramsResoFuncLfJetMC;
379+
vecParamsData = paramsResoFuncData.value;
380+
vecParamsCharmJetMC = paramsResoFuncCharmJetMC.value;
381+
vecParamsBeautyJetMC = paramsResoFuncBeautyJetMC.value;
382+
vecParamsLfJetMC = paramsResoFuncLfJetMC.value;
383383
LOG(info) << "defined parameters of resolution function: custom";
384384
break;
385385
case 1:
386-
vecParamsData = (std::vector<float>)paramsResoFuncData;
387-
vecParamsIncJetMC = (std::vector<float>)paramsResoFuncIncJetMC;
386+
vecParamsData = paramsResoFuncData.value;
387+
vecParamsIncJetMC = paramsResoFuncIncJetMC.value;
388388
useResoFuncFromIncJet = true;
389389
LOG(info) << "defined parameters of resolution function: custom & use inclusive distribution";
390390
break;
391391
case 2: // TODO
392-
vecParamsData = (std::vector<float>)paramsResoFuncData;
392+
vecParamsData = paramsResoFuncData.value;
393393
vecParamsCharmJetMC = {282119.753, -0.065, 0.893, 11.608, 0.945, 8.029, 0.131, 6.244, 0.027};
394394
vecParamsBeautyJetMC = {74901.583, -0.082, 0.874, 10.332, 0.941, 7.352, 0.097, 6.220, 0.022};
395395
vecParamsLfJetMC = {1539435.343, -0.061, 0.896, 13.272, 1.034, 5.884, 0.004, 7.843, 0.090};
396396
LOG(info) << "defined parameters of resolution function: PYTHIA8, MB, LHC23d1k";
397397
break;
398398
case 3: // TODO
399-
vecParamsData = (std::vector<float>)paramsResoFuncData;
399+
vecParamsData = paramsResoFuncData.value;
400400
vecParamsIncJetMC = {1908803.027, -0.059, 0.895, 13.467, 1.005, 8.867, 0.098, 6.929, 0.011};
401401
LOG(info) << "defined parameters of resolution function: PYTHIA8, MB, LHC23d1k & use inclusive distribution";
402402
useResoFuncFromIncJet = true;
403403
break;
404404
case 4: // TODO
405-
vecParamsData = (std::vector<float>)paramsResoFuncData;
405+
vecParamsData = paramsResoFuncData.value;
406406
vecParamsCharmJetMC = {743719.121, -0.960, -0.240, 13.765, 1.314, 10.761, 0.293, 8.538, 0.052};
407407
vecParamsBeautyJetMC = {88888.418, 0.256, 1.003, 10.185, 0.740, 8.216, 0.147, 7.228, 0.040};
408408
vecParamsLfJetMC = {414860.372, -1.000, 0.285, 14.561, 1.464, 11.693, 0.339, 9.183, 0.052};
409409
LOG(info) << "defined parameters of resolution function: PYTHIA8, JJ, weighted, LHC24g4";
410410
break;
411411
case 5: // TODO
412-
vecParamsData = (std::vector<float>)paramsResoFuncData;
412+
vecParamsData = paramsResoFuncData.value;
413413
vecParamsIncJetMC = {2211391.862, 0.360, 1.028, 13.019, 0.650, 11.151, 0.215, 9.462, 0.044};
414414
LOG(info) << "defined parameters of resolution function: PYTHIA8, JJ, weighted, LHC24g4 & use inclusive distribution";
415415
useResoFuncFromIncJet = true;
416416
break;
417417
case 6: // TODO
418-
vecParamsData = (std::vector<float>)paramsResoFuncData;
418+
vecParamsData = paramsResoFuncData.value;
419419
for (size_t j = 0; j < resoFuncIncCCDB.size(); j++) {
420420
std::vector<float> params;
421421
if (resoFuncIncCCDB[j]) {
@@ -429,7 +429,7 @@ struct JetTaggerHFTask {
429429
useResoFuncFromIncJet = true;
430430
break;
431431
case 7: // TODO
432-
vecParamsData = (std::vector<float>)paramsResoFuncData;
432+
vecParamsData = paramsResoFuncData.value;
433433
for (size_t j = 0; j < resoFuncBeautyCCDB.size(); j++) {
434434
std::vector<float> params;
435435
if (resoFuncBeautyCCDB[j]) {
@@ -558,7 +558,7 @@ struct JetTaggerHFTask {
558558

559559
int nSVs = analysisJet.template secondaryVertices_as<SecondaryVertices>().size();
560560

561-
jettaggingutilities::BJetParams jetparam = {analysisJet.pt(), analysisJet.eta(), analysisJet.phi(), static_cast<int>(tracksParams.size()), static_cast<int>(nSVs), analysisJet.mass()};
561+
jettaggingutilities::BJetParams jetparam = {analysisJet.pt(), analysisJet.eta(), analysisJet.phi(), static_cast<int>(tracksParams.size()), nSVs, analysisJet.mass()};
562562
tracksParams.resize(nJetConst); // resize to the number of inputs of the ML
563563
svsParams.resize(nJetConst); // resize to the number of inputs of the ML
564564

‎PWGJE/TableProducer/mcOutlierRejector.cxx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ struct McOutlierRejectorTask {
4747
std::vector<bool> collisionFlag;
4848
std::vector<bool> mcCollisionFlag;
4949

50-
int trackSelection = jetderiveddatautilities::initialiseTrackSelection(static_cast<std::string>(trackSelections));
50+
int trackSelection = jetderiveddatautilities::initialiseTrackSelection(trackSelections);
5151

5252
void processSetupCollisionSelection(aod::JCollisions const& collisions)
5353
{

‎PWGJE/TableProducer/quarkGluonJetsProducer.cxx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,7 @@ struct QuarkGluonJetsProducer {
239239

240240
void init(InitContext const&)
241241
{
242-
eventSelectionBits = jetderiveddatautilities::initialiseEventSelectionBits(static_cast<std::string>(eventSelections));
242+
eventSelectionBits = jetderiveddatautilities::initialiseEventSelectionBits(eventSelections);
243243
}
244244

245245
template <typename TrackT>

0 commit comments

Comments
 (0)