Skip to content

Commit 68e98ee

Browse files
RrantuRrantu
authored
[PWGHF] Fix O2 linter issues (#9021)
1 parent 58a0e21 commit 68e98ee

File tree

3 files changed

+54
-53
lines changed

3 files changed

+54
-53
lines changed

‎PWGHF/TableProducer/candidateCreatorXic0Omegac0.cxx‎

Lines changed: 39 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -958,12 +958,12 @@ struct HfCandidateCreatorXic0Omegac0 {
958958
auto charmbaryonChi2OverNdf = kfOmegac0Candidate.chi2GeoOmegac / charmbaryonNDF;
959959

960960
kfOmegac0Candidate.chi2MassV0 = kfV0MassConstrained.GetChi2();
961-
auto v0NDF_m = kfV0MassConstrained.GetNDF();
962-
auto v0Chi2OverNdf_m = kfOmegac0Candidate.chi2MassV0 / v0NDF_m;
961+
auto v0Ndfm = kfV0MassConstrained.GetNDF();
962+
auto v0Chi2OverNdfm = kfOmegac0Candidate.chi2MassV0 / v0Ndfm;
963963

964964
kfOmegac0Candidate.chi2MassCasc = kfOmegaMassConstrained.GetChi2();
965-
auto cascNDF_m = kfOmegaMassConstrained.GetNDF();
966-
auto cascChi2OverNdf_m = kfOmegac0Candidate.chi2MassCasc / cascNDF_m;
965+
auto cascNdfm = kfOmegaMassConstrained.GetNDF();
966+
auto cascChi2OverNdfm = kfOmegac0Candidate.chi2MassCasc / cascNdfm;
967967

968968
// KF topo Chi2
969969
kfOmegac0Candidate.chi2TopoV0ToPv = kfV0ToPv.GetChi2();
@@ -988,17 +988,17 @@ struct HfCandidateCreatorXic0Omegac0 {
988988
kfOmegac0Candidate.kfDcaOmegacDau = kfBachPionToOmegaC.GetDistanceFromParticle(kfOmegaToOmegaC);
989989

990990
// KF decay length
991-
float DecayLxy_Lam, err_DecayLxy_Lam;
992-
kfV0ToCasc.GetDecayLengthXY(DecayLxy_Lam, err_DecayLxy_Lam);
993-
kfOmegac0Candidate.decayLenXYLambda = DecayLxy_Lam;
991+
float decayLxyLam, errDecayLxyLam;
992+
kfV0ToCasc.GetDecayLengthXY(decayLxyLam, errDecayLxyLam);
993+
kfOmegac0Candidate.decayLenXYLambda = decayLxyLam;
994994

995-
float DecayLxy_Casc, err_DecayLxy_Casc;
996-
kfOmegaToOmegaC.GetDecayLengthXY(DecayLxy_Casc, err_DecayLxy_Casc);
997-
kfOmegac0Candidate.decayLenXYCasc = DecayLxy_Casc;
995+
float decayLxyCasc, errDecayLxyCasc;
996+
kfOmegaToOmegaC.GetDecayLengthXY(decayLxyCasc, errDecayLxyCasc);
997+
kfOmegac0Candidate.decayLenXYCasc = decayLxyCasc;
998998

999-
float DecayLxy_Omegac0, err_DecayLxy_Omegac0;
1000-
kfOmegac0ToPv.GetDecayLengthXY(DecayLxy_Omegac0, err_DecayLxy_Omegac0);
1001-
kfOmegac0Candidate.decayLenXYOmegac = DecayLxy_Omegac0;
999+
float decayLxyOmegac0, errDecayLxyOmegac0;
1000+
kfOmegac0ToPv.GetDecayLengthXY(decayLxyOmegac0, errDecayLxyOmegac0);
1001+
kfOmegac0Candidate.decayLenXYOmegac = decayLxyOmegac0;
10021002

10031003
// KF cosPA
10041004
kfOmegac0Candidate.cosPaV0ToPv = cpaFromKF(kfV0, kfPV);
@@ -1086,8 +1086,8 @@ struct HfCandidateCreatorXic0Omegac0 {
10861086
kfOmegac0Candidate.cosPaV0ToCasc, kfOmegac0Candidate.cosPaCascToOmegac, kfOmegac0Candidate.cosPaXYV0ToCasc, kfOmegac0Candidate.cosPaXYCascToOmegac,
10871087
kfOmegac0Candidate.rapOmegac, kfOmegac0Candidate.ptPiFromOmegac, kfOmegac0Candidate.ptOmegac,
10881088
kfOmegac0Candidate.cosThetaStarPiFromOmegac,
1089-
v0NDF, cascNDF, charmbaryonNDF, v0NDF_m, cascNDF_m,
1090-
v0Chi2OverNdf, cascChi2OverNdf, charmbaryonChi2OverNdf, v0Chi2OverNdf_m, cascChi2OverNdf_m);
1089+
v0NDF, cascNDF, charmbaryonNDF, v0Ndfm, cascNdfm,
1090+
v0Chi2OverNdf, cascChi2OverNdf, charmbaryonChi2OverNdf, v0Chi2OverNdfm, cascChi2OverNdfm);
10911091

10921092
} // loop over LF Cascade-bachelor candidates
10931093
} // end of run function
@@ -1140,7 +1140,8 @@ struct HfCandidateCreatorXic0Omegac0 {
11401140
auto trackParCovV0Dau0 = getTrackParCov(trackV0Dau0);
11411141
auto trackParCovV0Dau1 = getTrackParCov(trackV0Dau1);
11421142
// pion <- casc TrackParCov
1143-
auto XiDauChargedTrackParCov = getTrackParCov(trackCascDauCharged);
1143+
auto xiDauChargedTrackParCov = getTrackParCov(trackCascDauCharged);
1144+
11441145
// convert tracks into KFParticle object
11451146
KFPTrack kfTrack0 = createKFPTrackFromTrack(trackV0Dau0);
11461147
KFPTrack kfTrack1 = createKFPTrackFromTrack(trackV0Dau1);
@@ -1202,12 +1203,12 @@ struct HfCandidateCreatorXic0Omegac0 {
12021203

12031204
//__________________________________________
12041205
//*>~<* step 2 : reconstruct cascade(Xi) with KF
1205-
const KFParticle* XiDaugthers[2] = {&kfBachPion, &kfV0};
1206+
const KFParticle* xiDaugthers[2] = {&kfBachPion, &kfV0};
12061207
// construct cascade
12071208
KFParticle kfXi;
12081209
kfXi.SetConstructMethod(kfConstructMethod);
12091210
try {
1210-
kfXi.Construct(XiDaugthers, 2);
1211+
kfXi.Construct(xiDaugthers, 2);
12111212
} catch (std::runtime_error& e) {
12121213
LOG(debug) << "Failed to construct Xi from V0 and bachelor track: " << e.what();
12131214
continue;
@@ -1239,13 +1240,13 @@ struct HfCandidateCreatorXic0Omegac0 {
12391240
// Create KF charm bach Pion from track
12401241
KFPTrack kfTrackBachPion = createKFPTrackFromTrack(trackCharmBachelor);
12411242
KFParticle kfCharmBachPion(kfTrackBachPion, kPiPlus);
1242-
const KFParticle* XiC0Daugthers[2] = {&kfCharmBachPion, &kfXi};
1243+
const KFParticle* xiC0Daugthers[2] = {&kfCharmBachPion, &kfXi};
12431244

12441245
// construct XiC0
12451246
KFParticle kfXiC0;
12461247
kfXiC0.SetConstructMethod(kfConstructMethod);
12471248
try {
1248-
kfXiC0.Construct(XiC0Daugthers, 2);
1249+
kfXiC0.Construct(xiC0Daugthers, 2);
12491250
} catch (std::runtime_error& e) {
12501251
LOG(debug) << "Failed to construct XiC0 from Cascade and bachelor pion track: " << e.what();
12511252
continue;
@@ -1293,8 +1294,8 @@ struct HfCandidateCreatorXic0Omegac0 {
12931294
auto trackParVarCharmBachelor = getTrackParCovFromKFP(kfCharmBachPionToXiC, o2::track::PID::Pion, -bachCharge); // chrambaryon bach pion
12941295
trackParVarCharmBachelor.setAbsCharge(1);
12951296

1296-
XiDauChargedTrackParCov = getTrackParCovFromKFP(kfBachPionToXi, o2::track::PID::Pion, bachCharge); // Cascade bach pion
1297-
XiDauChargedTrackParCov.setAbsCharge(1);
1297+
xiDauChargedTrackParCov = getTrackParCovFromKFP(kfBachPionToXi, o2::track::PID::Pion, bachCharge); // Cascade bach pion
1298+
xiDauChargedTrackParCov.setAbsCharge(1);
12981299
o2::track::TrackParCov trackCasc = getTrackParCovFromKFP(kfXiToXiC, kfXiToXiC.GetPDG(), bachCharge);
12991300
trackCasc.setAbsCharge(1);
13001301

@@ -1342,7 +1343,7 @@ struct HfCandidateCreatorXic0Omegac0 {
13421343
gpu::gpustd::array<float, 2> impactParameterKaFromCasc;
13431344
o2::base::Propagator::Instance()->propagateToDCABxByBz({collision.posX(), collision.posY(), collision.posZ()}, trackParCovV0Dau0, 2.f, matCorr, &impactParameterV0Dau0);
13441345
o2::base::Propagator::Instance()->propagateToDCABxByBz({collision.posX(), collision.posY(), collision.posZ()}, trackParCovV0Dau1, 2.f, matCorr, &impactParameterV0Dau1);
1345-
o2::base::Propagator::Instance()->propagateToDCABxByBz({collision.posX(), collision.posY(), collision.posZ()}, XiDauChargedTrackParCov, 2.f, matCorr, &impactParameterKaFromCasc);
1346+
o2::base::Propagator::Instance()->propagateToDCABxByBz({collision.posX(), collision.posY(), collision.posZ()}, xiDauChargedTrackParCov, 2.f, matCorr, &impactParameterKaFromCasc);
13461347
float dcaxyV0Dau0 = impactParameterV0Dau0[0];
13471348
float dcaxyV0Dau1 = impactParameterV0Dau1[0];
13481349
float dcaxyCascBachelor = impactParameterKaFromCasc[0];
@@ -1388,12 +1389,12 @@ struct HfCandidateCreatorXic0Omegac0 {
13881389
auto charmbaryonChi2OverNdf = kfXic0Candidate.chi2GeoXic / charmbaryonNDF;
13891390

13901391
kfXic0Candidate.chi2MassV0 = kfV0MassConstrained.GetChi2();
1391-
auto v0NDF_m = kfV0MassConstrained.GetNDF();
1392-
auto v0Chi2OverNdf_m = kfXic0Candidate.chi2MassV0 / v0NDF_m;
1392+
auto v0Ndfm = kfV0MassConstrained.GetNDF();
1393+
auto v0Chi2OverNdfm = kfXic0Candidate.chi2MassV0 / v0Ndfm;
13931394

13941395
kfXic0Candidate.chi2MassCasc = kfXiMassConstrained.GetChi2();
1395-
auto cascNDF_m = kfXiMassConstrained.GetNDF();
1396-
auto cascChi2OverNdf_m = kfXic0Candidate.chi2MassCasc / cascNDF_m;
1396+
auto cascNdfm = kfXiMassConstrained.GetNDF();
1397+
auto cascChi2OverNdfm = kfXic0Candidate.chi2MassCasc / cascNdfm;
13971398

13981399
// KF topo Chi2
13991400
kfXic0Candidate.chi2TopoV0ToPv = kfV0ToPv.GetChi2();
@@ -1418,17 +1419,17 @@ struct HfCandidateCreatorXic0Omegac0 {
14181419
kfXic0Candidate.kfDcaXicDau = kfCharmBachPionToXiC.GetDistanceFromParticle(kfXiToXiC);
14191420

14201421
// KF decay length
1421-
float DecayLxy_Lam, err_DecayLxy_Lam;
1422-
kfV0ToCasc.GetDecayLengthXY(DecayLxy_Lam, err_DecayLxy_Lam);
1423-
kfXic0Candidate.decayLenXYLambda = DecayLxy_Lam;
1422+
float decayLxyLam, errDecayLxyLam;
1423+
kfV0ToCasc.GetDecayLengthXY(decayLxyLam, errDecayLxyLam);
1424+
kfXic0Candidate.decayLenXYLambda = decayLxyLam;
14241425

1425-
float DecayLxy_Casc, err_DecayLxy_Casc;
1426-
kfXiToXiC.GetDecayLengthXY(DecayLxy_Casc, err_DecayLxy_Casc);
1427-
kfXic0Candidate.decayLenXYCasc = DecayLxy_Casc;
1426+
float decayLxyCasc, errDecayLxyCasc;
1427+
kfXiToXiC.GetDecayLengthXY(decayLxyCasc, errDecayLxyCasc);
1428+
kfXic0Candidate.decayLenXYCasc = decayLxyCasc;
14281429

1429-
float DecayLxy_Xic0, err_DecayLxy_Xic0;
1430-
kfXic0ToPv.GetDecayLengthXY(DecayLxy_Xic0, err_DecayLxy_Xic0);
1431-
kfXic0Candidate.decayLenXYXic = DecayLxy_Xic0;
1430+
float decayLxyXic0, errDecayLxyXic0;
1431+
kfXic0ToPv.GetDecayLengthXY(decayLxyXic0, errDecayLxyXic0);
1432+
kfXic0Candidate.decayLenXYXic = decayLxyXic0;
14321433

14331434
// KF cosPA
14341435
kfXic0Candidate.cosPaV0ToPv = cpaFromKF(kfV0, kfPV);
@@ -1516,8 +1517,8 @@ struct HfCandidateCreatorXic0Omegac0 {
15161517
kfXic0Candidate.cosPaV0ToCasc, kfXic0Candidate.cosPaCascToXic, kfXic0Candidate.cosPaXYV0ToCasc, kfXic0Candidate.cosPaXYCascToXic,
15171518
kfXic0Candidate.rapXic, kfXic0Candidate.ptPiFromXic, kfXic0Candidate.ptXic,
15181519
kfXic0Candidate.cosThetaStarPiFromXic,
1519-
v0NDF, cascNDF, charmbaryonNDF, v0NDF_m, cascNDF_m,
1520-
v0Chi2OverNdf, cascChi2OverNdf, charmbaryonChi2OverNdf, v0Chi2OverNdf_m, cascChi2OverNdf_m);
1520+
v0NDF, cascNDF, charmbaryonNDF, v0Ndfm, cascNdfm,
1521+
v0Chi2OverNdf, cascChi2OverNdf, charmbaryonChi2OverNdf, v0Chi2OverNdfm, cascChi2OverNdfm);
15211522

15221523
} // loop over LF Cascade-bachelor candidates
15231524
}

‎PWGHF/TableProducer/candidateSelectorXic0ToXiPiKf.cxx‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
// granted to it by virtue of its status as an Intergovernmental Organization
1010
// or submit itself to any jurisdiction.
1111

12-
/// \file candidateSelectorToXiPi.cxx
12+
/// \file candidateSelectorXic0ToXiPiKf.cxx
1313
/// \brief Xic0 → Xi Pi selection task
1414
/// \author Ran Tu <ran.tu@cern.ch>, Fudan University
1515

@@ -29,11 +29,11 @@ using namespace o2::aod;
2929
using namespace o2::framework;
3030
using namespace o2::analysis;
3131

32-
enum pidInfoStored {
33-
kPiFromLam = 0,
34-
kPrFromLam,
35-
kPiFromCasc,
36-
kPiFromCharm
32+
enum PidInfoStored {
33+
KPiFromLam = 0,
34+
KPrFromLam,
35+
KPiFromCasc,
36+
KPiFromCharm
3737
};
3838

3939
/// Struct for applying Xic0 -> Xi pi selection cuts
@@ -407,28 +407,28 @@ struct HfCandidateSelectorXic0ToXiPiKf {
407407
}
408408

409409
if (trackPiFromLam.hasTPC()) {
410-
SETBIT(infoTpcStored, kPiFromLam);
410+
SETBIT(infoTpcStored, KPiFromLam);
411411
}
412412
if (trackPrFromLam.hasTPC()) {
413-
SETBIT(infoTpcStored, kPrFromLam);
413+
SETBIT(infoTpcStored, KPiFromLam);
414414
}
415415
if (trackPiFromCasc.hasTPC()) {
416-
SETBIT(infoTpcStored, kPiFromCasc);
416+
SETBIT(infoTpcStored, KPiFromCasc);
417417
}
418418
if (trackPiFromCharm.hasTPC()) {
419-
SETBIT(infoTpcStored, kPiFromCharm);
419+
SETBIT(infoTpcStored, KPiFromCharm);
420420
}
421421
if (trackPiFromLam.hasTOF()) {
422-
SETBIT(infoTofStored, kPiFromLam);
422+
SETBIT(infoTofStored, KPiFromLam);
423423
}
424424
if (trackPrFromLam.hasTOF()) {
425-
SETBIT(infoTofStored, kPrFromLam);
425+
SETBIT(infoTofStored, KPiFromLam);
426426
}
427427
if (trackPiFromCasc.hasTOF()) {
428-
SETBIT(infoTofStored, kPiFromCasc);
428+
SETBIT(infoTofStored, KPiFromCasc);
429429
}
430430
if (trackPiFromCharm.hasTOF()) {
431-
SETBIT(infoTofStored, kPiFromCharm);
431+
SETBIT(infoTofStored, KPiFromCharm);
432432
}
433433

434434
if (usePidTpcOnly) {

‎PWGHF/TableProducer/treeCreatorXic0ToXiPiKf.cxx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
// granted to it by virtue of its status as an Intergovernmental Organization
1010
// or submit itself to any jurisdiction.
1111

12-
/// \file treeCreatorToXiPi.cxx
12+
/// \file treeCreatorXic0ToXiPiKf.cxx
1313
/// \brief Writer of the xic0 to Xi Pi candidates in the form of flat tables to be stored in TTrees.
1414
/// In this file are defined and filled the output tables
1515
///

0 commit comments

Comments
 (0)