Skip to content

Please consider the following formatting changes to #8670 #45

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
Luca610 merged 1 commit into from
Nov 26, 2024
Merged

Please consider the following formatting changes to #8670 #45

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 PWGHF/TableProducer/candidateCreator2Prong.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -724,7 +724,7 @@ struct HfCandidateCreator2ProngExpressions {
int8_t sign = 0;
int8_t flag = 0;
int8_t origin = 0;
int8_t nKinkedTracks = 0;
int8_t nKinkedTracks = 0;

// Match reconstructed candidates.
// Spawned table can be used directly
Expand Down Expand Up @@ -753,7 +753,7 @@ struct HfCandidateCreator2ProngExpressions {
std::vector<int> idxBhadMothers{};

// D0(bar) → π± K∓
if (matchKinkedDecayTopology){
if (matchKinkedDecayTopology) {
indexRec = RecoDecay::getMatchedMCRec<false, false, false, true>(mcParticles, arrayDaughters, Pdg::kD0, std::array{+kPiPlus, -kKPlus}, true, &sign, 1, &nKinkedTracks);
} else {
indexRec = RecoDecay::getMatchedMCRec(mcParticles, arrayDaughters, Pdg::kD0, std::array{+kPiPlus, -kKPlus}, true, &sign);
Expand Down
17 changes: 8 additions & 9 deletions PWGHF/TableProducer/candidateCreator3Prong.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -458,7 +458,6 @@ struct HfCandidateCreator3ProngExpressions {
o2::framework::Configurable<bool> rejectBackground{"rejectBackground", true, "Reject particles from background events"};
o2::framework::Configurable<bool> matchKinkedDecayTopology{"matchKinkedDecayTopology", true, "Match also candidates with tracks that decay with kinked topology"};


bool createDplus{false};
bool createDs{false};
bool createLc{false};
Expand Down Expand Up @@ -568,9 +567,9 @@ struct HfCandidateCreator3ProngExpressions {

// D± → π± K∓ π±
if (createDplus) {
if (matchKinkedDecayTopology){
if (matchKinkedDecayTopology) {
indexRec = RecoDecay::getMatchedMCRec<false, false, false, true>(mcParticles, arrayDaughters, Pdg::kDPlus, std::array{+kPiPlus, -kKPlus, +kPiPlus}, true, &sign, 2, &nKinkedTracks);
} else{
} else {
indexRec = RecoDecay::getMatchedMCRec(mcParticles, arrayDaughters, Pdg::kDPlus, std::array{+kPiPlus, -kKPlus, +kPiPlus}, true, &sign, 2);
}
if (indexRec > -1) {
Expand All @@ -581,14 +580,14 @@ struct HfCandidateCreator3ProngExpressions {
// Ds± → K± K∓ π± and D± → K± K∓ π±
if (flag == 0 && createDs) {
bool isDplus = false;
if (matchKinkedDecayTopology){
if (matchKinkedDecayTopology) {
indexRec = RecoDecay::getMatchedMCRec<false, false, false, true>(mcParticles, arrayDaughters, Pdg::kDS, std::array{+kKPlus, -kKPlus, +kPiPlus}, true, &sign, 2, &nKinkedTracks);
} else {
indexRec = RecoDecay::getMatchedMCRec(mcParticles, arrayDaughters, Pdg::kDS, std::array{+kKPlus, -kKPlus, +kPiPlus}, true, &sign, 2);
}
if (indexRec == -1) {
isDplus = true;
if (matchKinkedDecayTopology){
if (matchKinkedDecayTopology) {
indexRec = RecoDecay::getMatchedMCRec<false, false, false, true>(mcParticles, arrayDaughters, Pdg::kDPlus, std::array{+kKPlus, -kKPlus, +kPiPlus}, true, &sign, 2, &nKinkedTracks);
} else {
indexRec = RecoDecay::getMatchedMCRec(mcParticles, arrayDaughters, Pdg::kDPlus, std::array{+kKPlus, -kKPlus, +kPiPlus}, true, &sign, 2);
Expand Down Expand Up @@ -618,9 +617,9 @@ struct HfCandidateCreator3ProngExpressions {

// Λc± → p± K∓ π±
if (flag == 0 && createLc) {
if (matchKinkedDecayTopology){
if (matchKinkedDecayTopology) {
indexRec = RecoDecay::getMatchedMCRec<false, false, false, true>(mcParticles, arrayDaughters, Pdg::kLambdaCPlus, std::array{+kProton, -kKPlus, +kPiPlus}, true, &sign, 2, &nKinkedTracks);
} else{
} else {
indexRec = RecoDecay::getMatchedMCRec(mcParticles, arrayDaughters, Pdg::kLambdaCPlus, std::array{+kProton, -kKPlus, +kPiPlus}, true, &sign, 2);
}
if (indexRec > -1) {
Expand Down Expand Up @@ -649,11 +648,11 @@ struct HfCandidateCreator3ProngExpressions {

// Ξc± → p± K∓ π±
if (flag == 0 && createXic) {
if (matchKinkedDecayTopology){
if (matchKinkedDecayTopology) {
indexRec = RecoDecay::getMatchedMCRec<false, false, false, true>(mcParticles, arrayDaughters, Pdg::kXiCPlus, std::array{+kProton, -kKPlus, +kPiPlus}, true, &sign, 2, &nKinkedTracks);
} else {
indexRec = RecoDecay::getMatchedMCRec(mcParticles, arrayDaughters, Pdg::kXiCPlus, std::array{+kProton, -kKPlus, +kPiPlus}, true, &sign, 2);
}
}
if (indexRec > -1) {
flag = sign * (1 << DecayType::XicToPKPi);
}
Expand Down
7 changes: 2 additions & 5 deletions PWGHF/TableProducer/candidateCreatorDstar.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -508,7 +508,6 @@ struct HfCandidateCreatorDstarExpressions {
o2::framework::Configurable<bool> rejectBackground{"rejectBackground", true, "Reject particles from background events"};
o2::framework::Configurable<bool> matchKinkedDecayTopology{"matchKinkedDecayTopology", true, "Match also candidates with tracks that decay with kinked topology"};


using McCollisionsNoCents = soa::Join<aod::Collisions, aod::EvSels, aod::McCollisionLabels>;
using McCollisionsFT0Cs = soa::Join<aod::Collisions, aod::EvSels, aod::McCollisionLabels, aod::CentFT0Cs>;
using McCollisionsFT0Ms = soa::Join<aod::Collisions, aod::EvSels, aod::McCollisionLabels, aod::CentFT0Ms>;
Expand Down Expand Up @@ -556,7 +555,6 @@ struct HfCandidateCreatorDstarExpressions {
int8_t originDstar = 0, originD0 = 0;
int8_t nKinkedTracksDstar = 0, nKinkedTracksD0 = 0;


// Match reconstructed candidates.
for (const auto& rowCandidateDstar : *rowsCandidateDstar) {
flagDstar = 0;
Expand Down Expand Up @@ -590,8 +588,7 @@ struct HfCandidateCreatorDstarExpressions {
}
}


if (matchKinkedDecayTopology){
if (matchKinkedDecayTopology) {
// D*± → D0(bar) π±
indexRecDstar = RecoDecay::getMatchedMCRec<false, false, false, true>(mcParticles, arrayDaughtersDstar, Pdg::kDStar, std::array{+kPiPlus, +kPiPlus, -kKPlus}, true, &signDstar, 2, &nKinkedTracksDstar);
// D0(bar) → π± K∓
Expand All @@ -602,7 +599,7 @@ struct HfCandidateCreatorDstarExpressions {
// D0(bar) → π± K∓
indexRecD0 = RecoDecay::getMatchedMCRec(mcParticles, arrayDaughtersofD0, Pdg::kD0, std::array{+kPiPlus, -kKPlus}, true, &signD0);
}

if (indexRecDstar > -1) {
flagDstar = signDstar * (BIT(aod::hf_cand_dstar::DecayType::DstarToD0Pi));
}
Expand Down
Loading