Skip to content

[PWGCF] Please consider the following formatting changes to #16938 #22

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
ariedel-cern merged 1 commit into from
Jul 6, 2026
Merged

[PWGCF] Please consider the following formatting changes to #16938 #22

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
1 change: 0 additions & 1 deletion PWGCF/Femto/Core/cascadeBuilder.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,6 @@ struct ConfOmegaSelection : o2::framework::ConfigurableGroup {

#undef CASCADE_DEFAULT_SELECTION


/// The different selections this task is capable of doing
enum CascadeSels {
// selections for cascades
Expand Down
40 changes: 19 additions & 21 deletions PWGCF/Femto/Core/cascadeHistManager.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,46 +170,45 @@ constexpr std::array<histmanager::HistInfo<CascadeHist>, kCascadeHistLast> HistT
{kSecondaryOther, o2::framework::HistType::kTH2F, "hFromSecondaryOther", "Particles from every other secondary decay; p_{T} (GeV/#it{c}); cos(#alpha)"}},
};


// NOLINTNEXTLINE(cppcoreguidelines-macro-usage)
#define CASCADE_HIST_ANALYSIS_MAP(conf) \
{kPt, {(conf).pt}}, \
{kEta, {(conf).eta}}, \
{kPhi, {(conf).phi}}, \
{kMass, {(conf).mass}}, \
{kSign, {(conf).sign}}, \
{kPt, {(conf).pt}}, \
{kEta, {(conf).eta}}, \
{kPhi, {(conf).phi}}, \
{kMass, {(conf).mass}}, \
{kSign, {(conf).sign}}, \
{kPtVsMass, {(conf).pt, (conf).mass}},

// NOLINTNEXTLINE(cppcoreguidelines-macro-usage)
#define CASCADE_HIST_MC_MAP(conf) \
#define CASCADE_HIST_MC_MAP(conf) \
{kTruePtVsPt, {(conf).pt, (conf).pt}}, \
{kTrueEtaVsEta, {(conf).eta, (conf).eta}}, \
{kTruePhiVsPhi, {(conf).phi, (conf).phi}}, \
{kPdg, {(conf).pdgCodes}}, \
{kPdgMother, {(conf).pdgCodes}}, \
{kPdg, {(conf).pdgCodes}}, \
{kPdgMother, {(conf).pdgCodes}}, \
{kPdgPartonicMother, {(conf).pdgCodes}},

// NOLINTNEXTLINE(cppcoreguidelines-macro-usage)
#define CASCADE_HIST_QA_MAP(confAnalysis, confQa) \
{kCosPa, {(confQa).cosPa}}, \
{kDecayDauDca, {(confQa).dauDcaAtDecay}}, \
{kTransRadius, {(confQa).transRadius}}, \
{kLambdaCosPa, {(confQa).lambdaCosPa}}, \
{kLambdaDauDca, {(confQa).lambdaDauDca}}, \
{kLambdaTransRadius, {(confQa).lambdaTransRadius}}, \
{kLambdaDcaToPv, {(confQa).lambdaDcaToPv}}, \
#define CASCADE_HIST_QA_MAP(confAnalysis, confQa) \
{kCosPa, {(confQa).cosPa}}, \
{kDecayDauDca, {(confQa).dauDcaAtDecay}}, \
{kTransRadius, {(confQa).transRadius}}, \
{kLambdaCosPa, {(confQa).lambdaCosPa}}, \
{kLambdaDauDca, {(confQa).lambdaDauDca}}, \
{kLambdaTransRadius, {(confQa).lambdaTransRadius}}, \
{kLambdaDcaToPv, {(confQa).lambdaDcaToPv}}, \
{kPtVsEta, {(confAnalysis).pt, (confAnalysis).eta}}, \
{kPtVsPhi, {(confAnalysis).pt, (confAnalysis).phi}}, \
{kPhiVsEta, {(confAnalysis).phi, (confAnalysis).eta}}, \
{kPtVsCosPa, {(confAnalysis).pt, (confQa).cosPa}}, \
{kMassXi, {(confQa).massXi}}, \
{kMassOmega, {(confQa).massOmega}}, \
{kMassXi, {(confQa).massXi}}, \
{kMassOmega, {(confQa).massOmega}}, \
{kPtVsMassXi, {(confAnalysis).pt, (confQa).massXi}}, \
{kPtVsMassOmega, {(confAnalysis).pt, (confQa).massOmega}}, \
{kMassXiVsMassOmega, {(confQa).massXi, (confQa).massOmega}},

// NOLINTNEXTLINE(cppcoreguidelines-macro-usage)
#define CASCADE_HIST_MC_QA_MAP(confAnalysis, confQa) \
#define CASCADE_HIST_MC_QA_MAP(confAnalysis, confQa) \
{kNoMcParticle, {(confAnalysis).pt, (confQa).cosPa}}, \
{kPrimary, {(confAnalysis).pt, (confQa).cosPa}}, \
{kFromWrongCollision, {(confAnalysis).pt, (confQa).cosPa}}, \
Expand Down Expand Up @@ -258,7 +257,6 @@ std::map<CascadeHist, std::vector<o2::framework::AxisSpec>> makeCascadeMcQaHistS
#undef CASCADE_HIST_QA_MAP
#undef CASCADE_HIST_MC_QA_MAP


constexpr char PrefixXiQa[] = "XiQA/";
constexpr char PrefixXi[] = "Xi/";
constexpr char PrefixOmegaQa[] = "OmegaQa/";
Expand Down
1,008 changes: 504 additions & 504 deletions PWGCF/Femto/Core/closePairRejection.h
View file
Open in desktop

Large diffs are not rendered by default.

26 changes: 13 additions & 13 deletions PWGCF/Femto/Core/collisionHistManager.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,29 +91,29 @@ constexpr std::array<histmanager::HistInfo<ColHist>, kColHistLast> HistTable = {

// NOLINTNEXTLINE(cppcoreguidelines-macro-usage)
#define COL_HIST_ANALYSIS_MAP(conf) \
{kPosZ, {(conf).vtxZ}}, \
{kMult, {(conf).mult}}, \
{kCent, {(conf).cent}}, \
{kPosZ, {(conf).vtxZ}}, \
{kMult, {(conf).mult}}, \
{kCent, {(conf).cent}}, \
{kMagField, {(conf).magField}},

// NOLINTNEXTLINE(cppcoreguidelines-macro-usage)
#define COL_HIST_QA_MAP(confAnalysis, confQa) \
{kPosX, {(confQa).vtxXY}}, \
{kPosY, {(confQa).vtxXY}}, \
{kPos, {(confQa).vtx}}, \
{kSphericity, {(confQa).sphericity}}, \
{kOccupancy, {(confQa).occupancy}}, \
#define COL_HIST_QA_MAP(confAnalysis, confQa) \
{kPosX, {(confQa).vtxXY}}, \
{kPosY, {(confQa).vtxXY}}, \
{kPos, {(confQa).vtx}}, \
{kSphericity, {(confQa).sphericity}}, \
{kOccupancy, {(confQa).occupancy}}, \
{kPoszVsMult, {(confAnalysis).vtxZ, (confAnalysis).mult}}, \
{kPoszVsCent, {(confAnalysis).vtxZ, (confAnalysis).cent}}, \
{kCentVsMult, {(confAnalysis).cent, (confAnalysis).mult}}, \
{kMultVsSphericity, {(confAnalysis).mult, (confQa).sphericity}}, \
{kCentVsSphericity, {confBinningAnalysis.cent, (confQa).sphericity}},

// NOLINTNEXTLINE(cppcoreguidelines-macro-usage)
#define COL_HIST_MC_MAP(conf) \
{kTruePosZ, {(conf).vtxZ}}, \
{kTrueCent, {(conf).cent}}, \
{kTrueMult, {(conf).mult}}, \
#define COL_HIST_MC_MAP(conf) \
{kTruePosZ, {(conf).vtxZ}}, \
{kTrueCent, {(conf).cent}}, \
{kTrueMult, {(conf).mult}}, \
{kTruePosZVsPosZ, {(conf).vtxZ, (conf).vtxZ}}, \
{kTrueCentVsCent, {(conf).cent, (conf).cent}}, \
{kTrueMultVsMult, {(conf).mult, (conf).mult}},
Expand Down
3 changes: 2 additions & 1 deletion PWGCF/Femto/Core/histManager.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,8 @@ struct HistInfo {
std::string_view n,
std::string_view d)
: hist(h), histtype(t), histname(n), histdesc(d)
{}
{
}

Hist hist{};
o2::framework::HistType histtype{o2::framework::kUndefinedHist};
Expand Down
16 changes: 8 additions & 8 deletions PWGCF/Femto/Core/kinkHistManager.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,14 +190,14 @@ constexpr std::array<histmanager::HistInfo<KinkHist>, kKinkHistLast> HistTable =

// NOLINTNEXTLINE(cppcoreguidelines-macro-usage)
#define KINK_HIST_QA_MAP(confAnalysis, confQa) \
{kKinkAngle, {(confQa).kinkAngle}}, \
{kDcaMothToPV, {(confQa).dcaMothToPV}}, \
{kDcaDaugToPV, {(confQa).dcaDaugToPV}}, \
{kDecayVtxX, {(confQa).decayVertex}}, \
{kDecayVtxY, {(confQa).decayVertex}}, \
{kDecayVtxZ, {(confQa).decayVertex}}, \
{kDecayVtx, {(confQa).decayVertex}}, \
{kTransRadius, {(confQa).transRadius}}, \
{kKinkAngle, {(confQa).kinkAngle}}, \
{kDcaMothToPV, {(confQa).dcaMothToPV}}, \
{kDcaDaugToPV, {(confQa).dcaDaugToPV}}, \
{kDecayVtxX, {(confQa).decayVertex}}, \
{kDecayVtxY, {(confQa).decayVertex}}, \
{kDecayVtxZ, {(confQa).decayVertex}}, \
{kDecayVtx, {(confQa).decayVertex}}, \
{kTransRadius, {(confQa).transRadius}}, \
{kPtVsEta, {(confAnalysis).pt, (confAnalysis).eta}}, \
{kPtVsPhi, {(confAnalysis).pt, (confAnalysis).phi}}, \
{kPhiVsEta, {(confAnalysis).phi, (confAnalysis).eta}}, \
Expand Down
4 changes: 2 additions & 2 deletions PWGCF/Femto/Core/particleCleaner.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,8 +120,8 @@ class ParticleCleaner
// since that lookup now goes through the mc particle row.
if (!particle.has_fMcParticle()) {
return !mRejectParticleWithoutMcParticle && mRequiredPdgCodes.empty() &&
!mRejectParticleWithoutMcMother && mRequiredMotherPdgCodes.empty() &&
!mRejectParticleWithoutMcPartonicMother && mRequiredPartonicMotherPdgCodes.empty();
!mRejectParticleWithoutMcMother && mRequiredMotherPdgCodes.empty() &&
!mRejectParticleWithoutMcPartonicMother && mRequiredPartonicMotherPdgCodes.empty();
}

auto mcParticle = particle.template fMcParticle_as<T2>();
Expand Down
2 changes: 1 addition & 1 deletion PWGCF/Femto/Core/tripletCleaner.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ class TrackTrackV0TripletCleaner : public paircleaner::BasePairCleaner
{
public:
TrackTrackV0TripletCleaner() = default;
~TrackTrackV0TripletCleaner() override = default;
~TrackTrackV0TripletCleaner() override = default;

template <typename T1, typename T2, typename T3, typename T4>
bool isCleanTriplet(T1 const& track1, T2 const& track2, T3 const& v0, T4 const& trackTable) const
Expand Down
20 changes: 10 additions & 10 deletions PWGCF/Femto/Core/twoTrackResonanceBuilder.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,16 +58,16 @@ using ConfPhiFilters = ConfTwoTrackResonanceFilters<PrefixPhiFilters>;
using ConfKstarFilters = ConfTwoTrackResonanceFilters<PrefixKstarFilters>;

// NOLINTNEXTLINE(cppcoreguidelines-macro-usage)
#define TWOTRACKRESONANCE_DEFAULT_SELECTION(defaultPdgCode, defaultMassMin, defaultMassMax) \
o2::framework::Configurable<int> pdgCodeAbs{"pdgCodeAbs", (defaultPdgCode), "Resonance PDG code. Set sign to minus 1 for antiparticle"}; \
o2::framework::Configurable<float> ptMin{"ptMin", 0.f, "Minimum pT"}; \
o2::framework::Configurable<float> ptMax{"ptMax", 6.f, "Maximum pT"}; \
o2::framework::Configurable<float> etaMin{"etaMin", -0.9f, "Minimum eta"}; \
o2::framework::Configurable<float> etaMax{"etaMax", 0.9f, "Maximum eta"}; \
o2::framework::Configurable<float> phiMin{"phiMin", 0.f, "Minimum phi"}; \
o2::framework::Configurable<float> phiMax{"phiMax", 1.f * o2::constants::math::TwoPI, "Maximum phi"}; \
o2::framework::Configurable<float> massMin{"massMin", (defaultMassMin), "Minimum invariant mass for Resonance"}; \
o2::framework::Configurable<float> massMax{"massMax", (defaultMassMax), "Maximum invariant mass for Resonance"}; \
#define TWOTRACKRESONANCE_DEFAULT_SELECTION(defaultPdgCode, defaultMassMin, defaultMassMax) \
o2::framework::Configurable<int> pdgCodeAbs{"pdgCodeAbs", (defaultPdgCode), "Resonance PDG code. Set sign to minus 1 for antiparticle"}; \
o2::framework::Configurable<float> ptMin{"ptMin", 0.f, "Minimum pT"}; \
o2::framework::Configurable<float> ptMax{"ptMax", 6.f, "Maximum pT"}; \
o2::framework::Configurable<float> etaMin{"etaMin", -0.9f, "Minimum eta"}; \
o2::framework::Configurable<float> etaMax{"etaMax", 0.9f, "Maximum eta"}; \
o2::framework::Configurable<float> phiMin{"phiMin", 0.f, "Minimum phi"}; \
o2::framework::Configurable<float> phiMax{"phiMax", 1.f * o2::constants::math::TwoPI, "Maximum phi"}; \
o2::framework::Configurable<float> massMin{"massMin", (defaultMassMin), "Minimum invariant mass for Resonance"}; \
o2::framework::Configurable<float> massMax{"massMax", (defaultMassMax), "Maximum invariant mass for Resonance"}; \
o2::framework::Configurable<o2::analysis::femto::datatypes::TrackMaskType> posDauMaskBelowThres{"posDauMaskBelowThres", 0x10u, "Bitmask for positive daughter below threshold"}; \
o2::framework::Configurable<o2::analysis::femto::datatypes::TrackMaskType> posDauMaskAboveThres{"posDauMaskAboveThres", 0x8u, "Bitmask for positive daughter above threshold"}; \
o2::framework::Configurable<o2::analysis::femto::datatypes::TrackMaskType> negDauMaskBelowThres{"negDauMaskBelowThres", 0x2u, "Bitmask for negative daughter below threshold"}; \
Expand Down
Loading