Skip to content

Commit c042fd0

Browse files
committed
fix some o2 linter errors
1 parent 2930d54 commit c042fd0

File tree

1 file changed

+20
-19
lines changed

1 file changed

+20
-19
lines changed

PWGLF/Tasks/Strangeness/cascadecorrelations.cxx

Lines changed: 20 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@
5454
using namespace o2;
5555
using namespace o2::soa;
5656
using namespace o2::constants::math;
57+
using namespace o2::constants::physics;
5758
using namespace o2::framework;
5859
using namespace o2::framework::expressions;
5960
using std::array;
@@ -306,7 +307,7 @@ struct CascadeSelector {
306307
if (!gen.isPhysicalPrimary())
307308
return;
308309
int genpdg = gen.pdgCode();
309-
if ((flag < 3 && std::abs(genpdg) == 3312) || (flag > 1 && std::abs(genpdg) == 3334)) {
310+
if ((flag < 3 && std::abs(genpdg) == kXiMinus) || (flag > 1 && std::abs(genpdg) == kOmegaMinus)) {
310311
// if casc is consistent with Xi and has matched gen Xi OR cand is consistent with Omega and has matched gen omega
311312
// have to do this in case we reco true Xi with only Omega hypothesis (or vice versa) (very unlikely)
312313
registry.fill(HIST("truerec/hV0Radius"), rec.v0radius());
@@ -333,16 +334,16 @@ struct CascadeSelector {
333334
registry.fill(HIST("truerec/hTPCChi2Neg"), rec.negTrack_as<FullTracksExtIUWithPID>().tpcChi2NCl());
334335
registry.fill(HIST("truerec/hTPCChi2Bach"), rec.bachelor_as<FullTracksExtIUWithPID>().tpcChi2NCl());
335336
switch (genpdg) { // is matched so we can use genpdg
336-
case 3312:
337+
case kXiMinus:
337338
registry.fill(HIST("truerec/hXiMinus"), rec.pt(), rec.yXi());
338339
break;
339-
case -3312:
340+
case kXiPlusBar:
340341
registry.fill(HIST("truerec/hXiPlus"), rec.pt(), rec.yXi());
341342
break;
342-
case 3334:
343+
case kOmegaMinus:
343344
registry.fill(HIST("truerec/hOmegaMinus"), rec.pt(), rec.yOmega());
344345
break;
345-
case -3334:
346+
case kOmegaPlusBar:
346347
registry.fill(HIST("truerec/hOmegaPlus"), rec.pt(), rec.yOmega());
347348
break;
348349
}
@@ -417,7 +418,7 @@ struct CascadeSelector {
417418
casc.v0cosPA(pvx, pvy, pvz) < v0setting_cospa ||
418419
casc.casccosPA(pvx, pvy, pvz) < cascadesetting_cospa ||
419420
std::abs(casc.dcav0topv(pvx, pvy, pvz)) < cascadesetting_mindcav0topv ||
420-
std::abs(casc.mLambda() - 1.115683) > cascadesetting_v0masswindow ||
421+
std::abs(casc.mLambda() - o2::constants::physics::MassLambda) > cascadesetting_v0masswindow ||
421422
std::abs(casc.dcapostopv()) < v0setting_dcapostopv ||
422423
std::abs(casc.dcanegtopv()) < v0setting_dcanegtopv ||
423424
casc.dcaV0daughters() > v0setting_dcav0dau ||
@@ -464,7 +465,7 @@ struct CascadeSelector {
464465
int flag = 0;
465466
if (std::abs(bachTrack.tpcNSigmaPi()) < tpcNsigmaBachelor)
466467
flag = 1;
467-
if (std::abs(bachTrack.tpcNSigmaKa()) < tpcNsigmaBachelor && (!doCompetingMassCut || std::abs(pdgDB->Mass(3312) - casc.mXi()) > competingMassWindow))
468+
if (std::abs(bachTrack.tpcNSigmaKa()) < tpcNsigmaBachelor && (!doCompetingMassCut || std::abs(o2::constants::physics::MassXiMinus - casc.mXi()) > competingMassWindow))
468469
flag = 3 - flag; // 3 if only consistent with omega, 2 if consistent with both
469470

470471
switch (flag) {
@@ -517,16 +518,16 @@ struct CascadeSelector {
517518
continue;
518519

519520
switch (mcPart.pdgCode()) {
520-
case 3312:
521+
case kXiMinus:
521522
registry.fill(HIST("gen/hXiMinus"), mcPart.pt(), mcPart.y());
522523
break;
523-
case -3312:
524+
case kXiPlusBar:
524525
registry.fill(HIST("gen/hXiPlus"), mcPart.pt(), mcPart.y());
525526
break;
526-
case 3334:
527+
case kOmegaMinus:
527528
registry.fill(HIST("gen/hOmegaMinus"), mcPart.pt(), mcPart.y());
528529
break;
529-
case -3334:
530+
case kOmegaPlusBar:
530531
registry.fill(HIST("gen/hOmegaPlus"), mcPart.pt(), mcPart.y());
531532
break;
532533
}
@@ -554,16 +555,16 @@ struct CascadeSelector {
554555
continue;
555556

556557
switch (mcPart.pdgCode()) {
557-
case 3312:
558+
case kXiMinus:
558559
registry.fill(HIST("genwithrec/hXiMinus"), mcPart.pt(), mcPart.y());
559560
break;
560-
case -3312:
561+
case kXiPlusBar:
561562
registry.fill(HIST("genwithrec/hXiPlus"), mcPart.pt(), mcPart.y());
562563
break;
563-
case 3334:
564+
case kOmegaMinus:
564565
registry.fill(HIST("genwithrec/hOmegaMinus"), mcPart.pt(), mcPart.y());
565566
break;
566-
case -3334:
567+
case kOmegaPlusBar:
567568
registry.fill(HIST("genwithrec/hOmegaPlus"), mcPart.pt(), mcPart.y());
568569
break;
569570
}
@@ -685,8 +686,8 @@ struct CascadeCorrelations {
685686
bool autoCorrelation(std::array<int, 3> triggerTracks, std::array<int, 3> assocTracks)
686687
{
687688
// function that loops over 2 arrays of track indices, checking for common elements
688-
for (int triggerTrack : triggerTracks) {
689-
for (int assocTrack : assocTracks) {
689+
for (const int triggerTrack : triggerTracks) {
690+
for (const int assocTrack : assocTracks) {
690691
if (triggerTrack == assocTrack)
691692
return true;
692693
}
@@ -1003,7 +1004,7 @@ struct CascadeCorrelations {
10031004
} // process mixed events
10041005

10051006
Configurable<float> etaGenCascades{"etaGenCascades", 0.8, "min/max of eta for generated cascades"};
1006-
Filter genCascadesFilter = nabs(aod::mcparticle::pdgCode) == 3312;
1007+
Filter genCascadesFilter = nabs(aod::mcparticle::pdgCode) == (int) kXiMinus;
10071008

10081009
void processMC(aod::McCollision const& mcCollision, soa::SmallGroups<soa::Join<aod::McCollisionLabels, MyCollisionsMult>> const& collisions, soa::Filtered<aod::McParticles> const& genCascades, aod::McParticles const& mcParticles)
10091010
{
@@ -1030,7 +1031,7 @@ struct CascadeCorrelations {
10301031
}
10311032

10321033
// QA
1033-
for (auto& casc : genCascades) {
1034+
for (const auto& casc : genCascades) {
10341035
if (!casc.isPhysicalPrimary())
10351036
continue;
10361037
registry.fill(HIST("MC/hPhi"), casc.phi());

0 commit comments

Comments
 (0)