Skip to content

Commit 2b1f459

Browse files
committed
Fix Megalinter
1 parent fd3eb04 commit 2b1f459

2 files changed

Lines changed: 27 additions & 27 deletions

File tree

PWGLF/DataModel/LFLambda1405Table.h

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@ DECLARE_SOA_COLUMN(NSigmaTPCPiKink, nSigmaTPCPiKink, float); //! Number of sigma
4444
DECLARE_SOA_COLUMN(NSigmaTOFPiKink, nSigmaTOFPiKink, float); //! Number of sigmas for the pion candidate from Sigma kink in TOF
4545
DECLARE_SOA_COLUMN(NSigmaTPCPrKink, nSigmaTPCPrKink, float); //! Number of sigmas for the proton candidate from Sigma kink in TPC
4646
DECLARE_SOA_COLUMN(NSigmaTOFPrKink, nSigmaTOFPrKink, float); //! Number of sigmas for the proton candidate from Sigma kink in TOF
47-
DECLARE_SOA_COLUMN(DCAKinkDauToPV, dcaKinkDauToPV, float); //! DCA of the kink daughter to the primary vertex
48-
DECLARE_SOA_COLUMN(DCASigmaToPV, dcaSigmaToPV, float); //! DCA of the sigma to the primary vertex
47+
DECLARE_SOA_COLUMN(DcaKinkDauToPv, dcaKinkDauToPv, float); //! DCA of the kink daughter to the primary vertex
48+
DECLARE_SOA_COLUMN(DcaSigmaToPv, dcaSigmaToPv, float); //! DCA of the sigma to the primary vertex
4949
DECLARE_SOA_COLUMN(NSigmaTPCPiDau, nSigmaTPCPiDau, float); //! Number of sigmas for the lambda1405 pion daughter in TPC
5050
DECLARE_SOA_COLUMN(NSigmaTOFPiDau, nSigmaTOFPiDau, float); //! Number of sigmas for the lambda1405 pion daughter in TOF
5151

@@ -109,7 +109,7 @@ DECLARE_SOA_TABLE(Lambda1405Cands, "AOD", "LAMBDA1405",
109109
lambda1405::PtKink,
110110
lambda1405::NSigmaTPCPiKink, lambda1405::NSigmaTOFPiKink,
111111
lambda1405::NSigmaTPCPrKink, lambda1405::NSigmaTOFPrKink,
112-
lambda1405::DCAKinkDauToPV,
112+
lambda1405::DcaKinkDauToPv,
113113
lambda1405::NSigmaTPCPiDau, lambda1405::NSigmaTOFPiDau,
114114
lambda1405::Centrality, lambda1405::Occupancy);
115115

@@ -121,7 +121,7 @@ DECLARE_SOA_TABLE(Lambda1405Flow, "AOD", "LAMBDA1405FLOW",
121121
lambda1405::AlphaAPSigma, lambda1405::QtAPSigma,
122122
lambda1405::NSigmaTPCPiKink, lambda1405::NSigmaTOFPiKink,
123123
lambda1405::NSigmaTPCPrKink, lambda1405::NSigmaTOFPrKink,
124-
lambda1405::DCAKinkDauToPV,
124+
lambda1405::DcaKinkDauToPv,
125125
lambda1405::NSigmaTPCPiDau, lambda1405::NSigmaTOFPiDau,
126126
lambda1405::ScalarProd, lambda1405::Centrality);
127127

@@ -134,7 +134,7 @@ DECLARE_SOA_TABLE(Lambda1405CandsMC, "AOD", "MCLAMBDA1405",
134134
lambda1405::PtKink,
135135
lambda1405::NSigmaTPCPiKink, lambda1405::NSigmaTOFPiKink,
136136
lambda1405::NSigmaTPCPrKink, lambda1405::NSigmaTOFPrKink,
137-
lambda1405::DCAKinkDauToPV,
137+
lambda1405::DcaKinkDauToPv,
138138
lambda1405::NSigmaTPCPiDau, lambda1405::NSigmaTOFPiDau,
139139
lambda1405::PtMC, lambda1405::MassMC, lambda1405::SigmaPdgCode, lambda1405::KinkDauPdgCode,
140140
lambda1405::Centrality, lambda1405::Occupancy);
@@ -163,7 +163,7 @@ DECLARE_SOA_TABLE(Lambda1405SigmaEffMC, "AOD", "MCL1405SIGEFF",
163163
lambda1405::ZKinkVtx, lambda1405::DeltaZKinkVtx,
164164
lambda1405::AlphaAPSigma, lambda1405::QtAPSigma,
165165
lambda1405::AlphaAPSigmaRecalc, lambda1405::QtAPSigmaRecalc,
166-
lambda1405::DCAKinkDauToPV, lambda1405::DCASigmaToPV,
166+
lambda1405::DcaKinkDauToPv, lambda1405::DcaSigmaToPv,
167167
lambda1405::SigmaPdgCode, lambda1405::KinkDauPdgCode,
168168
lambda1405::Centrality, lambda1405::Occupancy, lambda1405::PvContrib);
169169

PWGLF/Tasks/Resonances/lambda1405analysis.cxx

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1544,9 +1544,9 @@ struct lambda1405analysis {
15441544

15451545
// Recompute the sigma momentum
15461546
bool success{false};
1547-
float sigmaPRecalc = recalcSigmaMomReco(success, isSigmaMinusKink,
1548-
sigmaCand.pxMoth(), sigmaCand.pyMoth(), sigmaCand.pzMoth(),
1549-
sigmaCand.pxDaug(), sigmaCand.pyDaug(), sigmaCand.pzDaug());
1547+
float sigmaPRecalc = recalcSigmaMom(success, isSigmaMinusKink,
1548+
sigmaCand.pxMoth(), sigmaCand.pyMoth(), sigmaCand.pzMoth(),
1549+
sigmaCand.pxDaug(), sigmaCand.pyDaug(), sigmaCand.pzDaug());
15501550
if (!success && skipSigmasFailedRecompMom) {
15511551
return;
15521552
}
@@ -1561,7 +1561,7 @@ struct lambda1405analysis {
15611561
sigmaMomReco[2] *= scale;
15621562

15631563
sigmaPt = std::sqrt(sigmaMomReco[0] * sigmaMomReco[0] + sigmaMomReco[1] * sigmaMomReco[1]);
1564-
if (lambda1405Cand.isSigmaMinus) {
1564+
if (isSigmaMinusKink) {
15651565
rSigmaMinus.fill(HIST("hDeltaPxRecalcSigmaMinus"), sigmaMomReco[0] - sigmaCand.pxMoth(), sigmaCand.pxMoth());
15661566
rSigmaMinus.fill(HIST("hDeltaPyRecalcSigmaMinus"), sigmaMomReco[1] - sigmaCand.pyMoth(), sigmaCand.pyMoth());
15671567
rSigmaMinus.fill(HIST("hDeltaPzRecalcSigmaMinus"), sigmaMomReco[2] - sigmaCand.pzMoth(), sigmaCand.pzMoth());
@@ -1589,35 +1589,35 @@ struct lambda1405analysis {
15891589
float genSigmaQtAP = qtAP(sigmaMomGen, kinkMomGen);
15901590
if (isSigmaMinusKink) {
15911591
rSigmaMinus.fill(HIST("hSparseGenSigmaMinus"), genMassSigma, genSigma.pt(), genSigmaAlphaAP, genSigmaQtAP, genCentMult, genNumContrib, genOcc);
1592-
} else if (isSigmaPlusKink) {
1592+
} else if (isSigmaPlusToPiKink || isSigmaPlusToPrKink) {
15931593
rSigmaPlus.fill(HIST("hSparseGenSigmaPlus"), genMassSigma, genSigma.pt(), genSigmaAlphaAP, genSigmaQtAP, genCentMult, genNumContrib, genOcc);
15941594
}
15951595
}
15961596

15971597
// Fill table with sigma properties for efficiency studies
15981598
outputSigmaEffMC(
1599-
sigmaCand.pxMoth, sigmaCand.pxMoth - genSigma.px(),
1600-
sigmaCand.pyMoth, sigmaCand.pyMoth - genSigma.py(),
1601-
sigmaCand.pzMoth, sigmaCand.pzMoth - genSigma.pz(),
1602-
sigmaPt, sigmaPt - genSigma.pz(),
1599+
sigmaCand.pxMoth(), sigmaCand.pxMoth() - genSigma.px(),
1600+
sigmaCand.pyMoth(), sigmaCand.pyMoth() - genSigma.py(),
1601+
sigmaCand.pzMoth(), sigmaCand.pzMoth() - genSigma.pz(),
1602+
sigmaCand.pt(), sigmaCand.pt() - genSigma.pt(),
16031603
massSigma, massSigma - genMassSigma,
1604-
sigmaCand.pxMoth - sigmaMomReco[0],
1605-
sigmaCand.pyMoth - sigmaMomReco[1],
1606-
sigmaCand.pzMoth - sigmaMomReco[2],
1604+
sigmaCand.pxMoth() - sigmaMomReco[0],
1605+
sigmaCand.pyMoth() - sigmaMomReco[1],
1606+
sigmaCand.pzMoth() - sigmaMomReco[2],
16071607
genSigma.phi(),
16081608
genSigma.eta(),
1609-
sigmaCand.pxDaug, sigmaCand.pxDaug - genKinkDaug.px(),
1610-
sigmaCand.pyDaug, sigmaCand.pyDaug - genKinkDaug.py(),
1611-
sigmaCand.pzDaug, sigmaCand.pzDaug - genKinkDaug.pz(),
1612-
kinkPt, kinkPt - genKinkDaug.pz(),
1609+
sigmaCand.pxDaug(), sigmaCand.pxDaug() - genKinkDaug.px(),
1610+
sigmaCand.pyDaug(), sigmaCand.pyDaug() - genKinkDaug.py(),
1611+
sigmaCand.pzDaug(), sigmaCand.pzDaug() - genKinkDaug.pz(),
1612+
kinkPt, kinkPt - genKinkDaug.pt(),
16131613
genKinkDaug.phi(),
16141614
genKinkDaug.eta(),
1615-
sigmaCand.xDecVtx, sigmaCand.xDecVtx - genKinkDaug.vx,
1616-
sigmaCand.yDecVtx, sigmaCand.yDecVtx - genKinkDaug.vy,
1617-
sigmaCand.zDecVtx, sigmaCand.zDecVtx - genKinkDaug.vz,
1615+
sigmaCand.xDecVtx(), sigmaCand.xDecVtx() - genKinkDaug.vx(),
1616+
sigmaCand.yDecVtx(), sigmaCand.yDecVtx() - genKinkDaug.vy(),
1617+
sigmaCand.zDecVtx(), sigmaCand.zDecVtx() - genKinkDaug.vz(),
16181618
recoSigmaAlphaAP, recoSigmaQtAP,
1619-
recoRecalcPtSigmaQtAP, recoRecalcPtSigmaQtAP,
1620-
sigmaCand.dcaDaugPv, sigmaCand.dcaMothPv,
1619+
recoRecalcPtSigmaAlphaAP, recoRecalcPtSigmaQtAP,
1620+
sigmaCand.dcaDaugPv(), sigmaCand.dcaMothPv(),
16211621
genSigma.pdgCode(), genKinkDaug.pdgCode(),
16221622
centMult, collision.ft0cOccupancyInTimeRange(), collision.numContrib());
16231623
}

0 commit comments

Comments
 (0)