diff --git a/ALICE3/DataModel/OTFMulticharm.h b/ALICE3/DataModel/OTFMulticharm.h index e67e6148504..7dbde7bdc9a 100644 --- a/ALICE3/DataModel/OTFMulticharm.h +++ b/ALICE3/DataModel/OTFMulticharm.h @@ -58,7 +58,7 @@ DECLARE_SOA_COLUMN(NTPCHitsPiC1, nTPCHitsPiC1, int); DECLARE_SOA_COLUMN(NTPCHitsPiC2, nTPCHitsPiC2, int); DECLARE_SOA_COLUMN(NTPCHitsPiCC, nTPCHitsPiCC, int); -// DCA to PV variables +// DCA to PV variables DECLARE_SOA_COLUMN(DCAToPVXi, dcaToPVXi, float); DECLARE_SOA_COLUMN(DCAToPVXiC, dcaToPVXiC, float); DECLARE_SOA_COLUMN(DCAToPVXiCC, dcaToPVXiCC, float); @@ -86,7 +86,7 @@ DECLARE_SOA_TABLE(MCharmCores, "AOD", "MCharmCores", otfmulticharm::MXiCC, otfmulticharm::Pt, otfmulticharm::Eta, - + otfmulticharm::NSiliconHitsXi, otfmulticharm::NSiliconHitsPiFromXi, otfmulticharm::NSiliconHitsPiFromLa, @@ -99,18 +99,17 @@ DECLARE_SOA_TABLE(MCharmCores, "AOD", "MCharmCores", otfmulticharm::NTPCHitsPrFromLa, otfmulticharm::NTPCHitsPiC1, otfmulticharm::NTPCHitsPiC2, - otfmulticharm::NTPCHitsPiCC, + otfmulticharm::NTPCHitsPiCC, - otfmulticharm::DCAToPVXi, - otfmulticharm::DCAToPVXiC, - otfmulticharm::DCAToPVXiCC, - otfmulticharm::DCAToPVPiFromXi, - otfmulticharm::DCAToPVPiFromLa, + otfmulticharm::DCAToPVXi, + otfmulticharm::DCAToPVXiC, + otfmulticharm::DCAToPVXiCC, + otfmulticharm::DCAToPVPiFromXi, + otfmulticharm::DCAToPVPiFromLa, otfmulticharm::DCAToPVPrFromLa, otfmulticharm::DCAToPVPiC1, otfmulticharm::DCAToPVPiC2, - otfmulticharm::DCAToPVPiCC - ); + otfmulticharm::DCAToPVPiCC); } // namespace o2::aod diff --git a/ALICE3/TableProducer/alice3-multicharm.cxx b/ALICE3/TableProducer/alice3-multicharm.cxx index 0d863525390..c5e103cb90d 100644 --- a/ALICE3/TableProducer/alice3-multicharm.cxx +++ b/ALICE3/TableProducer/alice3-multicharm.cxx @@ -149,7 +149,7 @@ struct alice3multicharm { float etaPiCC; // charm daughters - int nSiliconHitsPiCC; + int nSiliconHitsPiCC; int nTPCHitsPiCC; } thisXiCCcandidate; @@ -400,8 +400,8 @@ struct alice3multicharm { uint32_t nCombinationsC = 0; auto xi = xiCand.cascadeTrack_as(); // de-reference cascade track auto piFromXi = xiCand.bachTrack_as(); // de-reference bach track - auto piFromLa = xiCand.negTrack_as(); // de-reference neg track - auto prFromLa = xiCand.posTrack_as(); // de-reference pos track + auto piFromLa = xiCand.negTrack_as(); // de-reference neg track + auto prFromLa = xiCand.posTrack_as(); // de-reference pos track if (!bitcheck(xi.decayMap(), kTrueXiFromXiC)) continue; @@ -475,9 +475,9 @@ struct alice3multicharm { histos.fill(HIST("hDCAXiCCDaughters"), thisXiCCcandidate.dca); const std::array momentumCC = { - thisXiCCcandidate.prong0mom[0] + thisXiCCcandidate.prong1mom[0], - thisXiCCcandidate.prong0mom[1] + thisXiCCcandidate.prong1mom[1], - thisXiCCcandidate.prong0mom[2] + thisXiCCcandidate.prong1mom[2]}; + thisXiCCcandidate.prong0mom[0] + thisXiCCcandidate.prong1mom[0], + thisXiCCcandidate.prong0mom[1] + thisXiCCcandidate.prong1mom[1], + thisXiCCcandidate.prong0mom[2] + thisXiCCcandidate.prong1mom[2]}; o2::track::TrackParCov xiccTrack(thisXiCCcandidate.xyz, momentumCC, thisXiCCcandidate.parentTrackCovMatrix, +2); @@ -491,16 +491,15 @@ struct alice3multicharm { multiCharmCore( thisXiCcandidate.dca, thisXiCCcandidate.dca, thisXiCcandidate.mass, thisXiCCcandidate.mass, - thisXiCCcandidate.pt, thisXiCCcandidate.eta, - xi.nSiliconHits(), piFromXi.nSiliconHits(), - piFromLa.nSiliconHits(), prFromLa.nSiliconHits(), - pi1c.nSiliconHits(), pi2c.nSiliconHits(), picc.nSiliconHits(), + thisXiCCcandidate.pt, thisXiCCcandidate.eta, + xi.nSiliconHits(), piFromXi.nSiliconHits(), + piFromLa.nSiliconHits(), prFromLa.nSiliconHits(), + pi1c.nSiliconHits(), pi2c.nSiliconHits(), picc.nSiliconHits(), piFromXi.nTPCHits(), piFromLa.nTPCHits(), prFromLa.nTPCHits(), - pi1c.nTPCHits(), pi2c.nTPCHits(), picc.nTPCHits(), + pi1c.nTPCHits(), pi2c.nTPCHits(), picc.nTPCHits(), xi.dcaXY(), xicdcaXY, xiccdcaXY, - piFromXi.dcaXY(), piFromLa.dcaXY(), prFromLa.dcaXY(), - pi1c.dcaXY(), pi2c.dcaXY(), picc.dcaXY() - ); + piFromXi.dcaXY(), piFromLa.dcaXY(), prFromLa.dcaXY(), + pi1c.dcaXY(), pi2c.dcaXY(), picc.dcaXY()); } histos.fill(HIST("hCombinationsXiCC"), nCombinationsCC); }