Skip to content

Commit de817cb

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 de817cb

55 files changed

Lines changed: 175 additions & 175 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/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: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -127,10 +127,10 @@ 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.value;
131+
eventSelectionBits = jetderiveddatautilities::initialiseEventSelectionBits(eventSelections.value);
132132
triggerMaskBits = jetderiveddatautilities::initialiseTriggerMaskBits(triggerMasks);
133-
trackSelection = jetderiveddatautilities::initialiseTrackSelection(static_cast<std::string>(trackSelections));
133+
trackSelection = jetderiveddatautilities::initialiseTrackSelection(trackSelections.value);
134134
particleSelection = static_cast<std::string>(particleSelections);
135135

136136
clusterDefinitionsVec = jetderiveddatautilities::initialiseClusterDefinitions(clusterDefinitions.value);
@@ -173,7 +173,7 @@ struct JetFinderTask {
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: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -134,9 +134,9 @@ 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.value);
138138
triggerMaskBits = jetderiveddatautilities::initialiseTriggerMaskBits(triggerMasks);
139-
eventSelectionBits = jetderiveddatautilities::initialiseEventSelectionBits(static_cast<std::string>(eventSelections));
139+
eventSelectionBits = jetderiveddatautilities::initialiseEventSelectionBits(eventSelections.value);
140140
particleSelection = static_cast<std::string>(particleSelections);
141141
clusterDefinition = o2::aod::emcalcluster::getClusterDefinitionFromString(clusterDefinitionS.value);
142142

@@ -177,7 +177,7 @@ struct JetFinderHFTask {
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: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -132,9 +132,9 @@ 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.value);
136136
triggerMaskBits = jetderiveddatautilities::initialiseTriggerMaskBits(triggerMasks);
137-
eventSelectionBits = jetderiveddatautilities::initialiseEventSelectionBits(static_cast<std::string>(eventSelections));
137+
eventSelectionBits = jetderiveddatautilities::initialiseEventSelectionBits(eventSelections.value);
138138
particleSelection = static_cast<std::string>(particleSelections);
139139

140140
jetFinder.etaMin = trackEtaMin;
@@ -174,7 +174,7 @@ struct JetFinderHFHFBarTask {
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 {

‎PWGJE/JetFinders/jetFinderV0.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -116,9 +116,9 @@ 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.value);
120120
triggerMaskBits = jetderiveddatautilities::initialiseTriggerMaskBits(triggerMasks);
121-
eventSelectionBits = jetderiveddatautilities::initialiseEventSelectionBits(static_cast<std::string>(eventSelections));
121+
eventSelectionBits = jetderiveddatautilities::initialiseEventSelectionBits(eventSelections.value);
122122
particleSelection = static_cast<std::string>(particleSelections);
123123

124124
jetFinder.etaMin = trackEtaMin;
@@ -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: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,8 +103,8 @@ 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));
106+
eventSelectionBits = jetderiveddatautilities::initialiseEventSelectionBits(eventSelections.value);
107+
trackSelection = jetderiveddatautilities::initialiseTrackSelection(trackSelections.value);
108108
particleSelection = static_cast<std::string>(particleSelections);
109109

110110
eventWiseConstituentSubtractor.setDoRhoMassSub(doRhoMassSub);

‎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.value);
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.value);
243243
}
244244

245245
template <typename TrackT>

‎PWGJE/TableProducer/slimTablesProducer.cxx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -146,8 +146,8 @@ struct SlimTablesProducer {
146146
histos.add("Ntracks_pT", "track pT distribution;#it{p}_{T} (GeV/#it{c});entries", {HistType::kTH1F, {{200, -0.5, 199.5}}}, doSumw2);
147147
histos.add("Nparticles_pT", "particle pT distribution;#it{p}_{T} (GeV/#it{c});entries", {HistType::kTH1F, {{200, -0.5, 199.5}}}, doSumw2);
148148

149-
eventSelectionBits = jetderiveddatautilities::initialiseEventSelectionBits(static_cast<std::string>(eventSelections));
150-
trackSelection = jetderiveddatautilities::initialiseTrackSelection(static_cast<std::string>(trackSelections));
149+
eventSelectionBits = jetderiveddatautilities::initialiseEventSelectionBits(eventSelections.value);
150+
trackSelection = jetderiveddatautilities::initialiseTrackSelection(trackSelections.value);
151151
}
152152

153153
Produces<o2::aod::SlimCollisions> slimCollisions;

0 commit comments

Comments
 (0)