Skip to content

Commit 49249fb

Browse files
FabiolaLPFabiolaLP
committed
Fixed linter comments
1 parent 3914fd1 commit 49249fb

File tree

2 files changed

+36
-39
lines changed

2 files changed

+36
-39
lines changed

‎PWGLF/DataModel/LFAntinCexTables.h‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323

2424
namespace o2::aod
2525
{
26-
namespace antinCexNS
26+
namespace antin_cex
2727
{
2828
// Metadata
2929
DECLARE_SOA_COLUMN(IsCex, isCex, bool); // 1=CEX (from antin), 0=BG
@@ -95,35 +95,35 @@ DECLARE_SOA_COLUMN(DPairPz, dPairPz, float);
9595
DECLARE_SOA_COLUMN(DOpenAngle, dOpenAngle, float);
9696

9797
DECLARE_SOA_COLUMN(SVNearestLayerId, svNearestLayerId, int16_t);
98-
DECLARE_SOA_COLUMN(SVDeltaRtoLayer, svDeltaRtoLayer, float);
98+
DECLARE_SOA_COLUMN(SVDeltaRToLayer, svDeltaRToLayer, float);
9999

100100
DECLARE_SOA_COLUMN(PTrkItsHitMap, pTrkItsHitMap, uint16_t);
101101
DECLARE_SOA_COLUMN(APTrkItsHitMap, apTrkItsHitMap, uint16_t);
102-
DECLARE_SOA_COLUMN(PLayersOK, pLayersOK, int8_t);
103-
DECLARE_SOA_COLUMN(APLayersOK, apLayersOK, int8_t);
102+
DECLARE_SOA_COLUMN(PLayersOk, pLayersOk, int8_t);
103+
DECLARE_SOA_COLUMN(APLayersOk, apLayersOk, int8_t);
104104

105-
DECLARE_SOA_COLUMN(PvtxZ, pvtxZ, float);
106-
} // namespace antinCexNS
105+
DECLARE_SOA_COLUMN(PVtxZ, pVtxZ, float);
106+
} // namespace antin_cex
107107

108108
// Table
109-
DECLARE_SOA_TABLE(antinCexPairs, "AOD", "ANTINCEX",
110-
antinCexNS::IsCex,
111-
antinCexNS::MotherPdg, antinCexNS::ColId, antinCexNS::PId, antinCexNS::AntipId,
112-
antinCexNS::McPairP, antinCexNS::McPairPt, antinCexNS::McPairPz,
113-
antinCexNS::McDplane, antinCexNS::McAngleDeg, antinCexNS::McVtxX, antinCexNS::McVtxY, antinCexNS::McVtxZ,
114-
antinCexNS::TrkPairP, antinCexNS::TrkPairPt, antinCexNS::TrkPairPz, antinCexNS::TrkAngleDeg,
115-
antinCexNS::TrkVtxfitDcaPair, antinCexNS::TrkVtxfitR, antinCexNS::TrkVtxfitDistToPv,
116-
antinCexNS::TrkVtxfitSecVtxX, antinCexNS::TrkVtxfitSecVtxY, antinCexNS::TrkVtxfitSecVtxZ,
117-
antinCexNS::VtxfitChi2, antinCexNS::VtxfitStatus, antinCexNS::NCand,
118-
antinCexNS::VtxfitDX, antinCexNS::VtxfitDY, antinCexNS::VtxfitDZ, antinCexNS::VtxfitD3D,
119-
antinCexNS::PTrkP, antinCexNS::PTrkPx, antinCexNS::PTrkPy, antinCexNS::PTrkPz, antinCexNS::PTrkEta, antinCexNS::PTrkTpcSignal, antinCexNS::PTrkNClsIts,
120-
antinCexNS::AntipTrkP, antinCexNS::AntipTrkPx, antinCexNS::AntipTrkPy, antinCexNS::AntipTrkPz, antinCexNS::AntipTrkEta, antinCexNS::AntipTrkTpcSignal, antinCexNS::AntipTrkNClsIts,
121-
antinCexNS::SelMask,
122-
antinCexNS::PairPointingAngleDeg, antinCexNS::PairPBalance, antinCexNS::PairPtBalance, antinCexNS::PairQ,
123-
antinCexNS::DPairP, antinCexNS::DPairPt, antinCexNS::DPairPz, antinCexNS::DOpenAngle,
124-
antinCexNS::SVNearestLayerId, antinCexNS::SVDeltaRtoLayer,
125-
antinCexNS::PTrkItsHitMap, antinCexNS::APTrkItsHitMap, antinCexNS::PLayersOK, antinCexNS::APLayersOK,
126-
antinCexNS::PvtxZ);
109+
DECLARE_SOA_TABLE(AntinCexPairs, "AOD", "ANTINCEX",
110+
antin_cex::IsCex,
111+
antin_cex::MotherPdg, antin_cex::ColId, antin_cex::PId, antin_cex::AntipId,
112+
antin_cex::McPairP, antin_cex::McPairPt, antin_cex::McPairPz,
113+
antin_cex::McDplane, antin_cex::McAngleDeg, antin_cex::McVtxX, antin_cex::McVtxY, antin_cex::McVtxZ,
114+
antin_cex::TrkPairP, antin_cex::TrkPairPt, antin_cex::TrkPairPz, antin_cex::TrkAngleDeg,
115+
antin_cex::TrkVtxfitDcaPair, antin_cex::TrkVtxfitR, antin_cex::TrkVtxfitDistToPv,
116+
antin_cex::TrkVtxfitSecVtxX, antin_cex::TrkVtxfitSecVtxY, antin_cex::TrkVtxfitSecVtxZ,
117+
antin_cex::VtxfitChi2, antin_cex::VtxfitStatus, antin_cex::NCand,
118+
antin_cex::VtxfitDX, antin_cex::VtxfitDY, antin_cex::VtxfitDZ, antin_cex::VtxfitD3D,
119+
antin_cex::PTrkP, antin_cex::PTrkPx, antin_cex::PTrkPy, antin_cex::PTrkPz, antin_cex::PTrkEta, antin_cex::PTrkTpcSignal, antin_cex::PTrkNClsIts,
120+
antin_cex::AntipTrkP, antin_cex::AntipTrkPx, antin_cex::AntipTrkPy, antin_cex::AntipTrkPz, antin_cex::AntipTrkEta, antin_cex::AntipTrkTpcSignal, antin_cex::AntipTrkNClsIts,
121+
antin_cex::SelMask,
122+
antin_cex::PairPointingAngleDeg, antin_cex::PairPBalance, antin_cex::PairPtBalance, antin_cex::PairQ,
123+
antin_cex::DPairP, antin_cex::DPairPt, antin_cex::DPairPz, antin_cex::DOpenAngle,
124+
antin_cex::SVNearestLayerId, antin_cex::SVDeltaRToLayer,
125+
antin_cex::PTrkItsHitMap, antin_cex::APTrkItsHitMap, antin_cex::PLayersOk, antin_cex::APLayersOk,
126+
antin_cex::PVtxZ);
127127

128128
} // namespace o2::aod
129129

‎PWGLF/TableProducer/Nuspex/nucleiAntineutronCex.cxx‎

Lines changed: 12 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525

2626
#include "TMCProcess.h"
2727

28+
#include <algorithm>
2829
#include <optional>
2930
// ROOT
3031
#include "CommonConstants/MathConstants.h"
@@ -61,7 +62,7 @@ struct NucleiAntineutronCex {
6162
static constexpr double kVtxTol = 1e-4;
6263

6364
HistogramRegistry histos{"histos", {}, OutputObjHandlingPolicy::AnalysisObject};
64-
Produces<aod::antinCexPairs> outPairs;
65+
Produces<aod::AntinCexPairs> outPairs;
6566

6667
void init(InitContext const&)
6768
{
@@ -619,7 +620,7 @@ struct NucleiAntineutronCex {
619620
auto trAP = makeTPCovFromAOD(*apRow);
620621
int nCand = fitter.process(trP, trAP);
621622
auto status = fitter.getFitStatus();
622-
histos.fill(HIST("vtxfitStatus"), (int)status);
623+
histos.fill(HIST("vtxfitStatus"), static_cast<int>(status));
623624
if (nCand > 0 && (status == DCAFitter2::FitStatus::Converged || status == DCAFitter2::FitStatus::MaxIter)) {
624625
// Secondary vertex (commom PCA) [x,y,z] cm
625626
auto vtx = fitter.getPCACandidatePos();
@@ -641,10 +642,6 @@ struct NucleiAntineutronCex {
641642
if (motherPdg != -kNeutron)
642643
histos.fill(HIST("cexbg_pairtrkVtxfitDcaPair"), dcaPair);
643644

644-
// Cuts
645-
// if (dcaPair > 10.0) continue;
646-
// if (trkangleDeg > 60) continue;
647-
// if (std::abs(dplane) > 2) continue;
648645
if (!(antipLayers && pLayers))
649646
continue;
650647
double cexPairTrkP = total_trk_pVec.Mag();
@@ -681,12 +678,12 @@ struct NucleiAntineutronCex {
681678
// closest ITS layer: Radius need to be checked
682679
static const std::array<double, 7> Rlayers = {2.2, 2.8, 3.6, 19.6, 24.0, 29.0, 35.0};
683680
int16_t svNearestLayerId = -1;
684-
float svDeltaRtoLayer = 1e9f;
685-
for (int i = 0; i < (int)Rlayers.size(); ++i) {
686-
const float dR = std::abs((float)radius - (float)Rlayers[i]);
687-
if (dR < svDeltaRtoLayer) {
688-
svDeltaRtoLayer = dR;
689-
svNearestLayerId = i;
681+
float SVDeltaRToLayer = 1e9f;
682+
for (int i = 0; i < static_cast<int>(Rlayers.size()); ++i) {
683+
const float dR = static_cast<float>(std::abs(radius - Rlayers[i]));
684+
if (dR < SVDeltaRToLayer) {
685+
SVDeltaRToLayer = dR;
686+
svNearestLayerId = static_cast<int16_t>(i);
690687
}
691688
}
692689

@@ -792,12 +789,12 @@ struct NucleiAntineutronCex {
792789
dOpenAngle,
793790

794791
svNearestLayerId,
795-
svDeltaRtoLayer,
792+
SVDeltaRToLayer,
796793

797794
pItsMap,
798795
apItsMap,
799-
(int8_t)(pLayers ? 1 : 0),
800-
(int8_t)(antipLayers ? 1 : 0),
796+
static_cast<int8_t>(pLayers ? 1 : 0),
797+
static_cast<int8_t>(antipLayers ? 1 : 0),
801798

802799
pvtxZ);
803800
}

0 commit comments

Comments
 (0)