Skip to content

[PWGHF] Please consider the following formatting changes to #12598 #33

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
Marcellocosti merged 1 commit into from
Aug 16, 2025
Merged

[PWGHF] Please consider the following formatting changes to #12598 #33

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
2 changes: 1 addition & 1 deletion PWGHF/D2H/Tasks/taskB0Reduced.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ DECLARE_SOA_COLUMN(FlagWrongCollision, flagWrongCollision, int8_t);
} // namespace hf_cand_b0_lite

DECLARE_SOA_TABLE(HfRedCandB0Lites, "AOD", "HFREDCANDB0LITE", //! Table with some B0 properties
// B meson features
// B meson features
hf_cand_b0_lite::M,
hf_cand_b0_lite::Pt,
hf_cand_b0_lite::Eta,
Expand Down
10 changes: 5 additions & 5 deletions PWGHF/D2H/Tasks/taskBsReduced.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,8 @@ DECLARE_SOA_COLUMN(ImpactParameterProduct, impactParameterProduct, float); //!
DECLARE_SOA_COLUMN(MaxNormalisedDeltaIP, maxNormalisedDeltaIP, float); //! Maximum normalized difference between measured and expected impact parameter of candidate prongs
DECLARE_SOA_COLUMN(MlScoreSig, mlScoreSig, float); //! ML score for signal class
// D meson features
DECLARE_SOA_COLUMN(MProng0, mProng0, float); //! Invariant mass of prong0 (GeV/c)
DECLARE_SOA_COLUMN(PtProng0, ptProng0, float); //! Transverse momentum of prong0 (GeV/c)
DECLARE_SOA_COLUMN(MProng0, mProng0, float); //! Invariant mass of prong0 (GeV/c)
DECLARE_SOA_COLUMN(PtProng0, ptProng0, float); //! Transverse momentum of prong0 (GeV/c)
DECLARE_SOA_COLUMN(DecayLength0, decayLength0, float); //! Decay length of D-meson daughter candidate (cm)
DECLARE_SOA_COLUMN(DecayLengthXY0, decayLengthXY0, float); //! Transverse decay length of D-meson daughter candidate (cm)
DECLARE_SOA_COLUMN(ImpactParameter0, impactParameter0, float); //! Impact parameter product of D-meson daughter candidate
Expand Down Expand Up @@ -99,12 +99,12 @@ DECLARE_SOA_COLUMN(NSigTpcTofPiProng1, nSigTpcTofPiProng1, float); //!
DECLARE_SOA_COLUMN(FlagWrongCollision, flagWrongCollision, int8_t); //! Flag for association with wrong collision
DECLARE_SOA_COLUMN(PtGen, ptGen, float); //! Transverse momentum of candidate (GeV/c)
// General vars (unused for now)
DECLARE_SOA_COLUMN(P, p, float); //! Momentum of candidate (GeV/c)
DECLARE_SOA_COLUMN(E, e, float); //! Energy of candidate (GeV)
DECLARE_SOA_COLUMN(P, p, float); //! Momentum of candidate (GeV/c)
DECLARE_SOA_COLUMN(E, e, float); //! Energy of candidate (GeV)
} // namespace hf_cand_bs_lite

DECLARE_SOA_TABLE(HfRedCandBsLites, "AOD", "HFREDCANDBSLITE", //! Table with some Bs properties
// B meson features
// B meson features
hf_cand_bs_lite::M,
hf_cand_bs_lite::Pt,
hf_cand_bs_lite::Eta,
Expand Down
6 changes: 3 additions & 3 deletions PWGHF/Tasks/taskMcValidation.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,9 +107,9 @@
static constexpr std::array<int, nChannels> PDGArrayParticle = {o2::constants::physics::Pdg::kD0, o2::constants::physics::Pdg::kDStar,
o2::constants::physics::Pdg::kDPlus, o2::constants::physics::Pdg::kDPlus,
o2::constants::physics::Pdg::kDS, o2::constants::physics::Pdg::kDS, o2::constants::physics::Pdg::kDS1, o2::constants::physics::Pdg::kDS2Star,
o2::constants::physics::Pdg::kD10, o2::constants::physics::Pdg::kD2Star0,
o2::constants::physics::Pdg::kB0, o2::constants::physics::Pdg::kBPlus, o2::constants::physics::Pdg::kBS,
o2::constants::physics::Pdg::kLambdaCPlus, o2::constants::physics::Pdg::kLambdaCPlus,
o2::constants::physics::Pdg::kD10, o2::constants::physics::Pdg::kD2Star0,
o2::constants::physics::Pdg::kB0, o2::constants::physics::Pdg::kBPlus, o2::constants::physics::Pdg::kBS,
o2::constants::physics::Pdg::kLambdaCPlus, o2::constants::physics::Pdg::kLambdaCPlus,
o2::constants::physics::Pdg::kXiCPlus, o2::constants::physics::Pdg::kXiCPlus, o2::constants::physics::Pdg::kXiC0,
o2::constants::physics::Pdg::kOmegaC0, o2::constants::physics::Pdg::kOmegaC0};
static constexpr std::array<unsigned int, nChannels> nDaughters = {2, 3, 3, 3, 3, 3, 5, 5, 4, 4, 4, 3, 4, 3, 3, 3, 5, 4, 4, 4};
Expand Down Expand Up @@ -356,13 +356,13 @@
std::vector<int> listDaughters{};

// Check that the decay channel is correct and retrieve the daughters
if (nDaughters[iD] == 2) {

Check failure on line 359 in PWGHF/Tasks/taskMcValidation.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[magic-number] 

Avoid magic numbers in expressions. Assign the value to a clearly named variable or constant.
if (!RecoDecay::isMatchedMCGen(mcParticles, particle, PDGArrayParticle[iD], arrPDGFinal2Prong[iD], true, nullptr, maxDepthForSearch[iD], &listDaughters)) {
continue;
}
}

if (nDaughters[iD] == 3) {

Check failure on line 365 in PWGHF/Tasks/taskMcValidation.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[magic-number] 

Avoid magic numbers in expressions. Assign the value to a clearly named variable or constant.
if (!RecoDecay::isMatchedMCGen<false, true>(mcParticles, particle, PDGArrayParticle[iD], arrPDGFinal3Prong[iD], true, nullptr, maxDepthForSearch[iD], &listDaughters)) {
continue;
}
Expand Down Expand Up @@ -390,7 +390,7 @@
}
}

if (nDaughters[iD] == 4) {

Check failure on line 393 in PWGHF/Tasks/taskMcValidation.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[magic-number] 

Avoid magic numbers in expressions. Assign the value to a clearly named variable or constant.
if (iD != B0ToDminusPi) {
if (!RecoDecay::isMatchedMCGen<false, true>(mcParticles, particle, PDGArrayParticle[iD], arrPDGFinal4Prong[iD], true, nullptr, maxDepthForSearch[iD], &listDaughters)) {
continue;
Expand Down Expand Up @@ -426,7 +426,7 @@
}
}

if (nDaughters[iD] == 5) {

Check failure on line 429 in PWGHF/Tasks/taskMcValidation.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[magic-number] 

Avoid magic numbers in expressions. Assign the value to a clearly named variable or constant.
if (!RecoDecay::isMatchedMCGen<false, true>(mcParticles, particle, PDGArrayParticle[iD], arrPDGFinal5Prong[iD], true, nullptr, maxDepthForSearch[iD], &listDaughters)) {
continue;
}
Expand Down Expand Up @@ -460,7 +460,7 @@
auto pxDiff = particle.px() - sumPxDau;
auto pyDiff = particle.py() - sumPyDau;
auto pzDiff = particle.pz() - sumPzDau;
if (std::abs(pxDiff) > 0.001 || std::abs(pyDiff) > 0.001 || std::abs(pzDiff) > 0.001) {

Check failure on line 463 in PWGHF/Tasks/taskMcValidation.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[magic-number] 

Avoid magic numbers in expressions. Assign the value to a clearly named variable or constant.
momentumCheck = false;
}
double pDiff = RecoDecay::p(pxDiff, pyDiff, pzDiff);
Expand Down Expand Up @@ -488,7 +488,7 @@
auto decayLength = RecoDecay::distance(vertexPrimary, vertexDau);
if (iD < nCharmMesonChannels) {
if (origin == RecoDecay::OriginType::Prompt) { // Prompt charm mesons
if (std::abs(particle.y()) < 0.5) {

Check failure on line 491 in PWGHF/Tasks/taskMcValidation.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[magic-number] 

Avoid magic numbers in expressions. Assign the value to a clearly named variable or constant.
registry.fill(HIST("PromptCharmMesons/hPromptMesonsPtDistr"), iD, particle.pt());
registry.fill(HIST("PromptCharmMesons/hPromptMesonsPtCentDistr"), iD, particle.pt(), centrality);
if (storeOccupancy) {
Expand All @@ -498,7 +498,7 @@
registry.fill(HIST("PromptCharmMesons/hPromptMesonsYDistr"), iD, particle.y());
registry.fill(HIST("PromptCharmMesons/hPromptMesonsDecLenDistr"), iD, decayLength * 10000);
} else if (origin == RecoDecay::OriginType::NonPrompt) {
if (std::abs(particle.y()) < 0.5) {

Check failure on line 501 in PWGHF/Tasks/taskMcValidation.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[magic-number] 

Avoid magic numbers in expressions. Assign the value to a clearly named variable or constant.
registry.fill(HIST("NonPromptCharmMesons/hNonPromptMesonsPtDistr"), iD, particle.pt());
registry.fill(HIST("NonPromptCharmMesons/hNonPromptMesonsPtCentDistr"), iD, particle.pt(), centrality);
if (storeOccupancy) {
Expand All @@ -509,7 +509,7 @@
registry.fill(HIST("NonPromptCharmMesons/hNonPromptMesonsDecLenDistr"), iD, decayLength * 10000);
}
} else if (iD < nCharmMesonChannels + nBeautyChannels) { // Beauty mesons
if (std::abs(particle.y()) < 0.5) {

Check failure on line 512 in PWGHF/Tasks/taskMcValidation.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[magic-number] 

Avoid magic numbers in expressions. Assign the value to a clearly named variable or constant.
registry.fill(HIST("Beauty/hPtDistr"), iD - nCharmMesonChannels, particle.pt());
registry.fill(HIST("Beauty/hPtCentDistr"), iD - nCharmMesonChannels, particle.pt(), centrality);
}
Expand All @@ -517,7 +517,7 @@
registry.fill(HIST("Beauty/hDecLenDistr"), iD - nCharmMesonChannels, decayLength * 10000);
} else { // Charm baryons
if (origin == RecoDecay::OriginType::Prompt) {
if (std::abs(particle.y()) < 0.5) {

Check failure on line 520 in PWGHF/Tasks/taskMcValidation.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[magic-number] 

Avoid magic numbers in expressions. Assign the value to a clearly named variable or constant.
registry.fill(HIST("PromptCharmBaryons/hPromptBaryonsPtDistr"), iD - nCharmMesonChannels - nBeautyChannels, particle.pt());
registry.fill(HIST("PromptCharmBaryons/hPromptBaryonsPtCentDistr"), iD - nCharmMesonChannels - nBeautyChannels, particle.pt(), centrality);
if (storeOccupancy) {
Expand All @@ -527,7 +527,7 @@
registry.fill(HIST("PromptCharmBaryons/hPromptBaryonsYDistr"), iD - nCharmMesonChannels - nBeautyChannels, particle.y());
registry.fill(HIST("PromptCharmBaryons/hPromptBaryonsDecLenDistr"), iD - nCharmMesonChannels - nBeautyChannels, decayLength * 10000);
} else if (origin == RecoDecay::OriginType::NonPrompt) {
if (std::abs(particle.y()) < 0.5) {

Check failure on line 530 in PWGHF/Tasks/taskMcValidation.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[magic-number] 

Avoid magic numbers in expressions. Assign the value to a clearly named variable or constant.
registry.fill(HIST("NonPromptCharmBaryons/hNonPromptBaryonsPtDistr"), iD - nCharmMesonChannels - nBeautyChannels, particle.pt());
registry.fill(HIST("NonPromptCharmBaryons/hNonPromptBaryonsPtCentDistr"), iD - nCharmMesonChannels - nBeautyChannels, particle.pt(), centrality);
if (storeOccupancy) {
Expand Down
Loading