Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Please consider the following formatting changes to #7496 #337

Merged
merged 1 commit into from
Aug 29, 2024
Merged

Please consider the following formatting changes to #7496 #337

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
19 changes: 9 additions & 10 deletions ALICE3/DataModel/OTFMulticharm.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -86,7 +86,7 @@ DECLARE_SOA_TABLE(MCharmCores, "AOD", "MCharmCores",
otfmulticharm::MXiCC,
otfmulticharm::Pt,
otfmulticharm::Eta,

otfmulticharm::NSiliconHitsXi,
otfmulticharm::NSiliconHitsPiFromXi,
otfmulticharm::NSiliconHitsPiFromLa,
Expand All @@ -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

Expand Down
27 changes: 13 additions & 14 deletions ALICE3/TableProducer/alice3-multicharm.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ struct alice3multicharm {
float etaPiCC;

// charm daughters
int nSiliconHitsPiCC;
int nSiliconHitsPiCC;
int nTPCHitsPiCC;
} thisXiCCcandidate;

Expand Down Expand Up @@ -400,8 +400,8 @@ struct alice3multicharm {
uint32_t nCombinationsC = 0;
auto xi = xiCand.cascadeTrack_as<alice3tracks>(); // de-reference cascade track
auto piFromXi = xiCand.bachTrack_as<alice3tracks>(); // de-reference bach track
auto piFromLa = xiCand.negTrack_as<alice3tracks>(); // de-reference neg track
auto prFromLa = xiCand.posTrack_as<alice3tracks>(); // de-reference pos track
auto piFromLa = xiCand.negTrack_as<alice3tracks>(); // de-reference neg track
auto prFromLa = xiCand.posTrack_as<alice3tracks>(); // de-reference pos track

if (!bitcheck(xi.decayMap(), kTrueXiFromXiC))
continue;
Expand Down Expand Up @@ -475,9 +475,9 @@ struct alice3multicharm {
histos.fill(HIST("hDCAXiCCDaughters"), thisXiCCcandidate.dca);

const std::array<float, 3> 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);

Expand All @@ -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);
}
Expand Down
Loading