Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions ALICE3/DataModel/OTFMulticharm.h
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,8 @@ DECLARE_SOA_COLUMN(XiccMass, xiccMass, float);
// kine vars
DECLARE_SOA_COLUMN(XiccPt, xiccPt, float);
DECLARE_SOA_COLUMN(XiccEta, xiccEta, float);
DECLARE_SOA_COLUMN(XicPt, xicPt, float);
DECLARE_SOA_COLUMN(XicEta, xicEta, float);

// topo vars
DECLARE_SOA_COLUMN(XiDCAz, xiDCAz, float);
Expand Down Expand Up @@ -122,12 +124,15 @@ DECLARE_SOA_TABLE(MCharmIndices, "AOD", "MCharmIndices",
otfmulticharm::XiCCPionId);

DECLARE_SOA_TABLE(MCharmCores, "AOD", "MCharmCores",
otfmulticharm::XicDauDCA,
otfmulticharm::XiccDauDCA,
otfmulticharm::XicMass,
otfmulticharm::XiccMass,
otfmulticharm::XiccPt,
otfmulticharm::XiccEta,
otfmulticharm::XiccDauDCA,

otfmulticharm::XicMass,
otfmulticharm::XicPt,
otfmulticharm::XicEta,
otfmulticharm::XicDauDCA,

otfmulticharm::XiDCAxy,
otfmulticharm::XiDCAz,
Expand Down
13 changes: 5 additions & 8 deletions ALICE3/TableProducer/alice3-multicharmTable.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -149,9 +149,9 @@

HistogramRegistry histos{"histos", {}, OutputObjHandlingPolicy::AnalysisObject};

Partition<aod::McParticles> trueXi = aod::mcparticle::pdgCode == 3312;

Check failure on line 152 in ALICE3/TableProducer/alice3-multicharmTable.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[pdg/explicit-code]

Avoid hard-coded PDG codes. Use named values from PDG_t or o2::constants::physics::Pdg instead.
Partition<aod::McParticles> trueXiC = aod::mcparticle::pdgCode == 4232;

Check failure on line 153 in ALICE3/TableProducer/alice3-multicharmTable.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[pdg/explicit-code]

Avoid hard-coded PDG codes. Use named values from PDG_t or o2::constants::physics::Pdg instead.
Partition<aod::McParticles> trueXiCC = aod::mcparticle::pdgCode == 4422;

Check failure on line 154 in ALICE3/TableProducer/alice3-multicharmTable.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[pdg/explicit-code]

Avoid hard-coded PDG codes. Use named values from PDG_t or o2::constants::physics::Pdg instead.

// filter expressions for D mesons
static constexpr uint32_t trackSelectionPiFromXiC = 1 << kInnerTOFPion | 1 << kOuterTOFPion | 1 << kRICHPion | 1 << kTruePiFromXiC;
Expand Down Expand Up @@ -245,14 +245,14 @@
thisXiCCcandidate.parentTrackCovMatrix[5] = covVtx(2, 2);

// set relevant values
thisXiCCcandidate.dca = TMath::Sqrt(fitter.getChi2AtPCACandidate());

Check failure on line 248 in ALICE3/TableProducer/alice3-multicharmTable.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[root/entity]

Replace ROOT entities with equivalents from standard C++ or from O2.
if (thisXiCCcandidate.dca > dcaXiCCDaughtersSelection) {
return false;
}

thisXiCCcandidate.mass = RecoDecay::m(array{array{thisXiCCcandidate.prong0mom[0], thisXiCCcandidate.prong0mom[1], thisXiCCcandidate.prong0mom[2]}, array{thisXiCCcandidate.prong1mom[0], thisXiCCcandidate.prong1mom[1], thisXiCCcandidate.prong1mom[2]}}, array{mass0, mass1});

Check failure on line 253 in ALICE3/TableProducer/alice3-multicharmTable.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[std-prefix]

Use std:: prefix for names from the std namespace.
thisXiCCcandidate.pt = std::hypot(thisXiCCcandidate.prong0mom[0] + thisXiCCcandidate.prong1mom[0], thisXiCCcandidate.prong0mom[1] + thisXiCCcandidate.prong1mom[1]);
thisXiCCcandidate.eta = RecoDecay::eta(array{thisXiCCcandidate.prong0mom[0] + thisXiCCcandidate.prong1mom[0], thisXiCCcandidate.prong0mom[1] + thisXiCCcandidate.prong1mom[1], thisXiCCcandidate.prong0mom[2] + thisXiCCcandidate.prong1mom[2]});

Check failure on line 255 in ALICE3/TableProducer/alice3-multicharmTable.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[std-prefix]

Use std:: prefix for names from the std namespace.
return true;
}

Expand Down Expand Up @@ -315,13 +315,13 @@
thisXiCcandidate.parentTrackCovMatrix[5] = covVtx(2, 2);

// set relevant values
thisXiCcandidate.dca = TMath::Sqrt(fitter3.getChi2AtPCACandidate());

Check failure on line 318 in ALICE3/TableProducer/alice3-multicharmTable.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[root/entity]

Replace ROOT entities with equivalents from standard C++ or from O2.
if (thisXiCcandidate.dca > dcaXiCDaughtersSelection) {
return false;
}
thisXiCcandidate.mass = RecoDecay::m(array{array{thisXiCcandidate.prong0mom[0], thisXiCcandidate.prong0mom[1], thisXiCcandidate.prong0mom[2]}, array{thisXiCcandidate.prong1mom[0], thisXiCcandidate.prong1mom[1], thisXiCcandidate.prong1mom[2]}, array{thisXiCcandidate.prong2mom[0], thisXiCcandidate.prong2mom[1], thisXiCcandidate.prong2mom[2]}}, array{p0mass, p1mass, p2mass});

Check failure on line 322 in ALICE3/TableProducer/alice3-multicharmTable.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[std-prefix]

Use std:: prefix for names from the std namespace.
thisXiCcandidate.pt = std::hypot(thisXiCcandidate.prong0mom[0] + thisXiCcandidate.prong1mom[0] + thisXiCcandidate.prong2mom[0], thisXiCcandidate.prong0mom[1] + thisXiCcandidate.prong1mom[1] + thisXiCcandidate.prong2mom[1]);
thisXiCcandidate.eta = RecoDecay::eta(array{thisXiCcandidate.prong0mom[0] + thisXiCcandidate.prong1mom[0] + thisXiCcandidate.prong2mom[0], thisXiCcandidate.prong0mom[1] + thisXiCcandidate.prong1mom[1] + thisXiCcandidate.prong2mom[1], thisXiCcandidate.prong0mom[2] + thisXiCcandidate.prong1mom[2] + thisXiCcandidate.prong2mom[2]});

Check failure on line 324 in ALICE3/TableProducer/alice3-multicharmTable.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[std-prefix]

Use std:: prefix for names from the std namespace.
return true;
}

Expand All @@ -343,7 +343,7 @@
auto mcParticle1 = track1.template mcParticle_as<aod::McParticles>();
auto mcParticle2 = track2.template mcParticle_as<aod::McParticles>();
if (mcParticle1.has_mothers() && mcParticle2.has_mothers()) {
for (auto& mcParticleMother1 : mcParticle1.template mothers_as<aod::McParticles>()) {

Check failure on line 346 in ALICE3/TableProducer/alice3-multicharmTable.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[const-ref-in-for-loop]

Use constant references for non-modified iterators in range-based for loops.
for (auto& mcParticleMother2 : mcParticle2.template mothers_as<aod::McParticles>()) {
if (mcParticleMother1.globalIndex() == mcParticleMother2.globalIndex()) {
returnValue = true;
Expand Down Expand Up @@ -734,9 +734,10 @@
picc.globalIndex());

multiCharmCore(
thisXiCcandidate.dca, thisXiCCcandidate.dca,
thisXiCcandidate.mass, thisXiCCcandidate.mass,
thisXiCCcandidate.pt, thisXiCCcandidate.eta,
thisXiCCcandidate.mass, thisXiCCcandidate.pt,
thisXiCCcandidate.eta, thisXiCCcandidate.dca,
thisXiCcandidate.mass, thisXiCcandidate.pt,
thisXiCcandidate.eta, thisXiCcandidate.dca,
xi.dcaXY(), xi.dcaZ(),
xicdcaXY, xicdcaZ,
xiccdcaXY, xiccdcaZ,
Expand All @@ -756,12 +757,10 @@
pi1cTOFDiffOuter, pi1c.nSigmaPionOuterTOF(),
pi1c.hasSigPi(), pi1c.nSigmaPionRich(),
getPdgCodeForTrack(pi1c),

pi2cTOFDiffInner, pi2c.nSigmaPionInnerTOF(),
pi2cTOFDiffOuter, pi2c.nSigmaPionOuterTOF(),
pi2c.hasSigPi(), pi2c.nSigmaPionRich(),
getPdgCodeForTrack(pi2c),

piccTOFDiffInner, picc.nSigmaPionInnerTOF(),
piccTOFDiffOuter, picc.nSigmaPionOuterTOF(),
picc.hasSigPi(), picc.nSigmaPionRich(),
Expand All @@ -774,9 +773,7 @@
prFromLa.dcaXY(), prFromLa.dcaZ(),
piFromLa.pt(), piFromLa.eta(),
piFromLa.dcaXY(), piFromLa.dcaZ(),
pi1c.eta(),
pi2c.eta(),
picc.eta());
pi1c.eta(), pi2c.eta(), picc.eta());
}
}
histos.fill(HIST("hCombinationsXiCC"), nCombinationsCC);
Expand Down
2 changes: 1 addition & 1 deletion ALICE3/Tasks/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ o2physics_add_dpl_workflow(alice3-taskcorrelationddbar

o2physics_add_dpl_workflow(alice3-multicharm
SOURCES alice3-multicharm.cxx
PUBLIC_LINK_LIBRARIES O2Physics::AnalysisCore
PUBLIC_LINK_LIBRARIES O2Physics::AnalysisCore O2Physics::MLCore
COMPONENT_NAME Analysis)

o2physics_add_dpl_workflow(alice3-efficiency
Expand Down
Loading
Loading