Skip to content

Please consider the following formatting changes to #7176 #317

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

Merged
ddobrigk merged 1 commit into from
Aug 6, 2024
Merged

Please consider the following formatting changes to #7176 #317

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
4 changes: 2 additions & 2 deletions ALICE3/DataModel/A3DecayFinderTables.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,8 @@ enum a3selectionBit : uint32_t { kDCAxy = 0,
kTruePiMinusFromLc,
kTrueKaMinusFromLc,
kTruePrMinusFromLc,
kTrueXiFromXiC,
kTruePiFromXiC,
kTrueXiFromXiC,
kTruePiFromXiC,
kTruePiFromXiCC };

namespace o2::aod
Expand Down
2 changes: 1 addition & 1 deletion ALICE3/TableProducer/OTF/onTheFlyTracker.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1126,7 +1126,7 @@ struct OnTheFlyTracker {
TracksAlice3(false);
}

for(const auto& cascade : cascadesAlice3){
for (const auto& cascade : cascadesAlice3) {
upgradeCascades(
collisions.lastIndex(), // now we know the collision index -> populate table
cascade.cascadeTrackId,
Expand Down
6 changes: 3 additions & 3 deletions ALICE3/TableProducer/alice3-decaypreselector.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,11 +187,11 @@ struct alice3decaypreselector {
bitoff(selectionMap[track.globalIndex()], kTruePiMinusFromLc);

// XiCC daughters
if (!checkPDG(track, 4232, 211)) //4422 -> 4232 -211
if (!checkPDG(track, 4232, 211)) // 4422 -> 4232 -211
bitoff(selectionMap[track.globalIndex()], kTruePiFromXiC);
if (!checkPDG(track, 4232, 3312)) //4232 -> 3312 211 211
if (!checkPDG(track, 4232, 3312)) // 4232 -> 3312 211 211
bitoff(selectionMap[track.globalIndex()], kTrueXiFromXiC);
if (!checkPDG(track, 4232, 211)) //4232 -> 3312 211 211
if (!checkPDG(track, 4232, 211)) // 4232 -> 3312 211 211
bitoff(selectionMap[track.globalIndex()], kTruePiFromXiC);
}
}
Expand Down
29 changes: 14 additions & 15 deletions ALICE3/TableProducer/alice3-multicharm.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,9 +151,9 @@ struct alice3multicharm {
thisCandidate.xyz[i] = vtx[i];
}

// compute cov mat
for (int ii=0; ii<21; ii++)
thisCandidate.parentTrackCovMatrix[ii] = 0.0f;
// compute cov mat
for (int ii = 0; ii < 21; ii++)
thisCandidate.parentTrackCovMatrix[ii] = 0.0f;

std::array<float, 21> covA = {0};
std::array<float, 21> covB = {0};
Expand All @@ -163,7 +163,7 @@ struct alice3multicharm {
const int momInd[6] = {9, 13, 14, 18, 19, 20}; // cov matrix elements for momentum component
for (int i = 0; i < 6; i++) {
int j = momInd[i];
thisCandidate.parentTrackCovMatrix[j] = covA[j]+covB[j];
thisCandidate.parentTrackCovMatrix[j] = covA[j] + covB[j];
}

auto covVtx = fitter.calcPCACovMatrix();
Expand Down Expand Up @@ -215,9 +215,9 @@ struct alice3multicharm {
thisCandidate.xyz[i] = vtx[i];
}

// compute cov mat
for (int ii=0; ii<21; ii++)
thisCandidate.parentTrackCovMatrix[ii] = 0.0f;
// compute cov mat
for (int ii = 0; ii < 21; ii++)
thisCandidate.parentTrackCovMatrix[ii] = 0.0f;

std::array<float, 21> covA = {0};
std::array<float, 21> covB = {0};
Expand All @@ -229,7 +229,7 @@ struct alice3multicharm {
const int momInd[6] = {9, 13, 14, 18, 19, 20}; // cov matrix elements for momentum component
for (int i = 0; i < 6; i++) {
int j = momInd[i];
thisCandidate.parentTrackCovMatrix[j] = covA[j]+covB[j]+covC[j];
thisCandidate.parentTrackCovMatrix[j] = covA[j] + covB[j] + covC[j];
}

auto covVtx = fitter3.calcPCACovMatrix();
Expand Down Expand Up @@ -331,7 +331,7 @@ struct alice3multicharm {
auto tracksPiFromXiCCgrouped = tracksPiFromXiCC->sliceByCached(aod::track::collisionId, collision.globalIndex(), cache);

if (doDCAplots) {
for (auto const& cascade : cascades){
for (auto const& cascade : cascades) {
auto track = cascade.cascadeTrack_as<alice3tracks>(); // de-reference cascade track
histos.fill(HIST("h2dDCAxyVsPtXiFromXiC"), track.pt(), track.dcaXY() * 1e+4);
}
Expand All @@ -351,9 +351,9 @@ struct alice3multicharm {
for (auto const& pi2c : tracksPiFromXiCgrouped) {
if (mcSameMotherCheck && !checkSameMother(xi, pi2c))
continue;
// if I am here, it means this is a triplet to be considered for XiC vertexing.
// will now attempt to build a three-body decay candidate with these three track rows.
if(!buildDecayCandidateThreeBody(xi, pi1c, pi2c, 1.32171, 0.139570, 0.139570))
// if I am here, it means this is a triplet to be considered for XiC vertexing.
// will now attempt to build a three-body decay candidate with these three track rows.
if (!buildDecayCandidateThreeBody(xi, pi1c, pi2c, 1.32171, 0.139570, 0.139570))
continue; // failed at building candidate

const std::array<float, 3> momentumC = {
Expand All @@ -365,10 +365,10 @@ struct alice3multicharm {

histos.fill(HIST("hMassXiC"), thisCandidate.mass);

// attempt XiCC finding
// attempt XiCC finding
for (auto const& picc : tracksPiFromXiCCgrouped) {
o2::track::TrackParCov piccTrack = getTrackParCov(picc);
if(!buildDecayCandidateTwoBody(xicTrack, piccTrack, 2.46793, 0.139570))
if (!buildDecayCandidateTwoBody(xicTrack, piccTrack, 2.46793, 0.139570))
continue; // failed at building candidate

histos.fill(HIST("hMassXiCC"), thisCandidate.mass);
Expand All @@ -379,7 +379,6 @@ struct alice3multicharm {
}
//*+-+*+-+*+-+*+-+*+-+*+-+*+-+*+-+*+-+*+-+*


//*>-~-<*>-~-<*>-~-<*>-~-<*>-~-<*>-~-<*>-~-<*>-~-<*
PROCESS_SWITCH(alice3multicharm, processGenerated, "fill MC-only histograms", true);
PROCESS_SWITCH(alice3multicharm, processFindXiCC, "find XiCC mesons", true);
Expand Down