Skip to content

Commit dfd488c

Browse files
kgwizdzikgwizdzi
committed
FemtoUniverse: fixing clang
1 parent 042e8b5 commit dfd488c

File tree

3 files changed

+27
-29
lines changed

3 files changed

+27
-29
lines changed

‎PWGCF/FemtoUniverse/TableProducer/femtoUniverseProducerTask.cxx‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -745,7 +745,7 @@ struct FemtoUniverseProducerTask {
745745
-999., -999., -999., -999., -999., -999., -999., -999.,
746746
-999., -999., -999., -999., -999.,
747747
-999.,
748-
hfHelper.yD0(particle), // getter transRadius
748+
hfHelper.yD0(particle), // getter transRadius
749749
particle.mlProbD0bar()[0], // getter decayVtxX
750750
particle.mlProbD0bar()[1], // getter decayVtxY
751751
particle.mlProbD0bar()[2], // getter decayVtxZ
@@ -761,10 +761,10 @@ struct FemtoUniverseProducerTask {
761761
template <bool isD0ML, bool isD0barML, typename ParticleType>
762762
void fillDebugD0D0barMcMl(ParticleType const& particle)
763763
{
764-
int8_t originMcReco = 2; // 0 - prompt, 1 - non-prompt, 2 - default/else
765-
if(particle.originMcRec() == RecoDecay::OriginType::Prompt) {
764+
int8_t originMcReco = 2; // 0 - prompt, 1 - non-prompt, 2 - default/else
765+
if (particle.originMcRec() == RecoDecay::OriginType::Prompt) {
766766
originMcReco = 0;
767-
} else if(particle.originMcRec() == RecoDecay::OriginType::NonPrompt) {
767+
} else if (particle.originMcRec() == RecoDecay::OriginType::NonPrompt) {
768768
originMcReco = 1;
769769
} else {
770770
originMcReco = 2;
@@ -774,7 +774,7 @@ struct FemtoUniverseProducerTask {
774774
originMcReco, -999., -999., -999., -999., -999., -999., -999.,
775775
-999., -999., -999., -999., -999., -999., -999., -999.,
776776
-999., -999., -999., -999., -999.,
777-
-999.,
777+
-999.,
778778
hfHelper.yD0(particle), // getter transRadius
779779
particle.mlProbD0()[0], // getter decayVtxX
780780
particle.mlProbD0()[1], // getter decayVtxY
@@ -785,7 +785,7 @@ struct FemtoUniverseProducerTask {
785785
originMcReco, -999., -999., -999., -999., -999., -999., -999.,
786786
-999., -999., -999., -999., -999.,
787787
-999.,
788-
hfHelper.yD0(particle), // getter transRadius
788+
hfHelper.yD0(particle), // getter transRadius
789789
particle.mlProbD0bar()[0], // getter decayVtxX
790790
particle.mlProbD0bar()[1], // getter decayVtxY
791791
particle.mlProbD0bar()[2], // getter decayVtxZ
@@ -1567,8 +1567,8 @@ struct FemtoUniverseProducerTask {
15671567
hfCand.eta(),
15681568
hfCand.phi(),
15691569
aod::femtouniverseparticle::ParticleType::kD0,
1570-
-999, // cut, CutContainerType
1571-
-999, // PID, CutContainerType
1570+
-999, // cut, CutContainerType
1571+
-999, // PID, CutContainerType
15721572
-999., // tempFitVar
15731573
indexChildID,
15741574
invMassD0, // D0 mass (mLambda)
@@ -1706,8 +1706,8 @@ struct FemtoUniverseProducerTask {
17061706
hfCand.eta(),
17071707
hfCand.phi(),
17081708
aod::femtouniverseparticle::ParticleType::kD0,
1709-
-999, // cut, CutContainerType
1710-
-999, // PID, CutContainerType
1709+
-999, // cut, CutContainerType
1710+
-999, // PID, CutContainerType
17111711
-999., // tempFitVar
17121712
indexChildID,
17131713
invMassD0, // D0 mass (mLambda)
@@ -1725,7 +1725,7 @@ struct FemtoUniverseProducerTask {
17251725
}
17261726
}
17271727
if constexpr (isMC) {
1728-
auto particleMother = mcParticles.rawIteratorAt(indexMcRec); // gen. level pT
1728+
auto particleMother = mcParticles.rawIteratorAt(indexMcRec); // gen. level pT
17291729
auto yGen = RecoDecay::y(particleMother.pVector(), o2::constants::physics::MassD0); // gen. level y
17301730
outputPartsMC(0, particleMother.pdgCode(), particleMother.pt(), yGen, particleMother.phi());
17311731
outputPartsMCLabels(outputPartsMC.lastIndex());

‎PWGCF/FemtoUniverse/Tasks/femtoUniverseEfficiencyBase.cxx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -327,7 +327,7 @@ struct FemtoUniverseEfficiencyBase {
327327
break;
328328
case 321: // Kaon+
329329
case -321: // Kaon-
330-
if(isKaonLF) {
330+
if (isKaonLF) {
331331
return isKaonNSigmaLF(mom, nsigmaTPCK, nsigmaTOFK);
332332
} else {
333333
return isKaonNSigma(mom, nsigmaTPCK, nsigmaTOFK);

‎PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackD0.cxx‎

Lines changed: 15 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -23,30 +23,30 @@
2323
#include "PWGCF/FemtoUniverse/Core/FemtoUniverseEventHisto.h"
2424
#include "PWGCF/FemtoUniverse/Core/FemtoUniversePairCleaner.h"
2525
#include "PWGCF/FemtoUniverse/Core/FemtoUniverseParticleHisto.h"
26-
#include "PWGCF/FemtoUniverse/Core/FemtoUniverseTrackSelection.h"
2726
#include "PWGCF/FemtoUniverse/Core/FemtoUniverseSoftPionRemoval.h"
27+
#include "PWGCF/FemtoUniverse/Core/FemtoUniverseTrackSelection.h"
2828
#include "PWGCF/FemtoUniverse/Core/femtoUtils.h"
2929
#include "PWGCF/FemtoUniverse/DataModel/FemtoDerived.h"
30-
31-
#include "PWGHF/Core/HfHelper.h"
3230
#include "PWGHF/Core/DecayChannels.h"
31+
#include "PWGHF/Core/HfHelper.h"
3332
#include "PWGHF/Core/SelectorCuts.h"
3433
#include "PWGHF/DataModel/CandidateReconstructionTables.h"
3534
#include "PWGHF/DataModel/CandidateSelectionTables.h"
3635

3736
#include "Common/Core/RecoDecay.h"
3837
#include "Common/DataModel/PIDResponse.h"
39-
#include "Framework/AnalysisTask.h"
38+
4039
#include "Framework/ASoAHelpers.h"
40+
#include "Framework/AnalysisTask.h"
4141
#include "Framework/HistogramRegistry.h"
4242
#include "Framework/O2DatabasePDGPlugin.h"
43-
#include "Framework/runDataProcessing.h"
4443
#include "Framework/RunningWorkflowInfo.h"
4544
#include "Framework/StepTHn.h"
45+
#include "Framework/runDataProcessing.h"
4646
#include "ReconstructionDataFormats/PID.h"
4747

48-
#include <vector>
4948
#include <string>
49+
#include <vector>
5050

5151
using namespace o2;
5252
using namespace o2::analysis;
@@ -253,7 +253,7 @@ struct FemtoUniversePairTaskTrackD0 {
253253
float weight = 1.0;
254254

255255
HistogramRegistry registry{"registry",
256-
{{"hPtD0", "D^{0} cand.;#it{p}_{T} (GeV/#it{c});counts", {HistType::kTH1F, {confPtBins}}},
256+
{{"hPtD0", "D^{0} cand.;#it{p}_{T} (GeV/#it{c});counts", {HistType::kTH1F, {confPtBins}}},
257257
{"hPtD0bar", "#bar{D^{0}};#it{p}_{T} (GeV/#it{c});counts", {HistType::kTH1F, {confPtBins}}},
258258
{"hPtD0D0bar", "#bar{D^{0}};#it{p}_{T} (GeV/#it{c});counts", {HistType::kTH1F, {confPtBins}}},
259259
{"hPhiD0D0bar", ";#varphi (rad);counts", {HistType::kTH1F, {{80, 0., o2::constants::math::TwoPI}}}},
@@ -465,7 +465,7 @@ struct FemtoUniversePairTaskTrackD0 {
465465
mcRecoRegistry.add("hMcRecAntiPrPt", "MC Reco antiproton;#it{p}_{T} (GeV/c); counts", {HistType::kTH1F, {{500, 0, 5}}});
466466
mcRecoRegistry.add("hMcRecAntiPrPtGenEtaGen", "MC Reco antiproton;#it{p}_{T} (GeV/c); #eta", {HistType::kTH2F, {{500, 0, 5}, {400, -1.0, 1.0}}});
467467

468-
// MC truth
468+
// MC truth
469469
mcTruthRegistry.add("hMcGenD0", "MC Truth all D0s;#it{p}_{T} (GeV/c); #eta", {HistType::kTH2F, {{vbins, "#it{p}_{T} (GeV/#it{c})"}, {400, -1.0, 1.0}}});
470470
mcTruthRegistry.add("hMcGenD0Prompt", "MC Truth prompt D0s;#it{p}_{T} (GeV/c); #eta", {HistType::kTH2F, {{vbins, "#it{p}_{T} (GeV/#it{c})"}, {400, -1.0, 1.0}}});
471471
mcTruthRegistry.add("hMcGenD0NonPrompt", "MC Truth non-prompt D0s;#it{p}_{T} (GeV/c); #eta", {HistType::kTH2F, {{vbins, "#it{p}_{T} (GeV/#it{c})"}, {400, -1.0, 1.0}}});
@@ -509,7 +509,6 @@ struct FemtoUniversePairTaskTrackD0 {
509509

510510
vPIDTrack = ConfTrack.confPIDTrack.value;
511511
kNsigma = ConfBothTracks.confTrkPIDnSigmaMax.value;
512-
513512
}
514513

515514
template <typename CollisionType>
@@ -675,7 +674,7 @@ struct FemtoUniversePairTaskTrackD0 {
675674
registry.fill(HIST("DebugBdt/hBdtScore1VsStatus"), d0d0bar.decayVtxX(), 1);
676675
registry.fill(HIST("DebugBdt/hBdtScore2VsStatus"), d0d0bar.decayVtxY(), 1);
677676
registry.fill(HIST("DebugBdt/hBdtScore3VsStatus"), d0d0bar.decayVtxZ(), 1);
678-
677+
679678
weight = 1.0f;
680679
if (doEfficiencyCorr) {
681680
weight = efficiencyCalculator.getWeight(ParticleNo::TWO, d0d0bar.pt());
@@ -1154,20 +1153,20 @@ struct FemtoUniversePairTaskTrackD0 {
11541153
mcRecoRegistry.fill(HIST("hMcRecKmPtGenEtaGen"), mcpart.pt(), mcpart.eta());
11551154
}
11561155
}
1157-
}
1156+
}
11581157
} else if ((part.partType() == aod::femtouniverseparticle::ParticleType::kD0) && (part.pt() > ConfDmesons.confMinPtD0D0barReco) && (part.pt() < ConfDmesons.confMaxPtD0D0barReco)) {
11591158
if (mcpart.pdgMCTruth() == ConfDmesons.confPDGCodeD0) {
11601159
mcRecoRegistry.fill(HIST("hMcRecD0"), part.pt(), part.eta());
11611160
mcRecoRegistry.fill(HIST("hMcRecD0Phi"), part.phi());
1162-
if(part.tpcNClsFound() == 0) { // prompt candidates
1161+
if (part.tpcNClsFound() == 0) { // prompt candidates
11631162
mcRecoRegistry.fill(HIST("hMcRecD0Prompt"), part.pt(), part.eta());
11641163
} else if (part.tpcNClsFound() == 1) { // non-prompt candidates
11651164
mcRecoRegistry.fill(HIST("hMcRecD0NonPrompt"), part.pt(), part.eta());
11661165
}
11671166
} else if (mcpart.pdgMCTruth() == ConfDmesons.confPDGCodeD0bar) {
11681167
mcRecoRegistry.fill(HIST("hMcRecD0bar"), part.pt(), part.eta());
11691168
mcRecoRegistry.fill(HIST("hMcRecD0barPhi"), part.phi());
1170-
if(part.tpcNClsFound() == 0) { // prompt candidates
1169+
if (part.tpcNClsFound() == 0) { // prompt candidates
11711170
mcRecoRegistry.fill(HIST("hMcRecD0barPrompt"), part.pt(), part.eta());
11721171
} else if (part.tpcNClsFound() == 1) { // non-prompt candidates
11731172
mcRecoRegistry.fill(HIST("hMcRecD0barNonPrompt"), part.pt(), part.eta());
@@ -1194,14 +1193,14 @@ struct FemtoUniversePairTaskTrackD0 {
11941193
}
11951194
// filling the inv. mass histograms
11961195
if (part.mLambda() > 0) {
1197-
if(part.sign() == o2::hf_decay::hf_cand_2prong::DecayChannelMain::D0ToPiK) {
1196+
if (part.sign() == o2::hf_decay::hf_cand_2prong::DecayChannelMain::D0ToPiK) {
11981197
mcRecoRegistry.fill(HIST("hMassVsPtD0Sig"), part.mLambda(), part.pt(), weight);
11991198
} else if (part.sign() == -o2::hf_decay::hf_cand_2prong::DecayChannelMain::D0ToPiK) {
12001199
mcRecoRegistry.fill(HIST("hMassVsPtD0Refl"), part.mLambda(), part.pt(), weight);
12011200
} else {
12021201
mcRecoRegistry.fill(HIST("hMassVsPtD0Bkg"), part.mLambda(), part.pt(), weight);
12031202
}
1204-
if(part.tpcNClsFound() == 0) { // prompt candidates
1203+
if (part.tpcNClsFound() == 0) { // prompt candidates
12051204
mcRecoRegistry.fill(HIST("hMassVsPtD0Prompt"), part.mLambda(), part.pt(), weight);
12061205
} else if (part.tpcNClsFound() == 1) { // non-prompt candidates
12071206
mcRecoRegistry.fill(HIST("hMassVsPtD0NonPrompt"), part.mLambda(), part.pt(), weight);
@@ -1214,7 +1213,7 @@ struct FemtoUniversePairTaskTrackD0 {
12141213
} else {
12151214
mcRecoRegistry.fill(HIST("hMassVsPtD0barBkg"), part.mAntiLambda(), part.pt(), weight);
12161215
}
1217-
if(part.tpcNClsFound() == 0) { // prompt candidates
1216+
if (part.tpcNClsFound() == 0) { // prompt candidates
12181217
mcRecoRegistry.fill(HIST("hMassVsPtD0barPrompt"), part.mAntiLambda(), part.pt(), weight);
12191218
} else if (part.tpcNClsFound() == 1) { // non-prompt candidates
12201219
mcRecoRegistry.fill(HIST("hMassVsPtD0barNonPrompt"), part.mAntiLambda(), part.pt(), weight);
@@ -1259,7 +1258,6 @@ struct FemtoUniversePairTaskTrackD0 {
12591258
mcTruthRegistry.fill(HIST("hMcGenD0NonPrompt"), part.pt(), part.eta());
12601259
}
12611260
}
1262-
12631261
}
12641262
if (pdgCode == PDG_t::kProton) {
12651263
mcTruthRegistry.fill(HIST("hMcGenPrPtVsEta"), part.pt(), part.eta());

0 commit comments

Comments
 (0)