Skip to content

[PWGCF] Please consider the following formatting changes to #18169 #35

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
Oct 4, 2026
Merged

[PWGCF] Please consider the following formatting changes to #18169 #35

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
18 changes: 9 additions & 9 deletions PWGCF/Femto/Core/partitions.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,15 +97,15 @@
// partition for resonances built from two photons (pi0, eta, ...): unlike MAKE_RESONANCE_0/1_PARTITON
// there is no sign and no momentum-threshold PID switch, just a plain mask check per (unordered) daughter
// NOLINTNEXTLINE(cppcoreguidelines-macro-usage)
#define MAKE_TWOPHOTONRESONANCE_PARTITION(selection) \
(o2::aod::femtobase::stored::pt > (selection).ptMin) && \
(o2::aod::femtobase::stored::pt < (selection).ptMax) && \
(o2::aod::femtobase::stored::eta > (selection).etaMin) && \
(o2::aod::femtobase::stored::eta < (selection).etaMax) && \
(o2::aod::femtobase::stored::phi > (selection).phiMin) && \
(o2::aod::femtobase::stored::phi < (selection).phiMax) && \
(o2::aod::femtobase::stored::mass > (selection).massMin) && \
(o2::aod::femtobase::stored::mass < (selection).massMax) && \
#define MAKE_TWOPHOTONRESONANCE_PARTITION(selection) \
(o2::aod::femtobase::stored::pt > (selection).ptMin) && \
(o2::aod::femtobase::stored::pt < (selection).ptMax) && \
(o2::aod::femtobase::stored::eta > (selection).etaMin) && \
(o2::aod::femtobase::stored::eta < (selection).etaMax) && \
(o2::aod::femtobase::stored::phi > (selection).phiMin) && \
(o2::aod::femtobase::stored::phi < (selection).phiMax) && \
(o2::aod::femtobase::stored::mass > (selection).massMin) && \
(o2::aod::femtobase::stored::mass < (selection).massMax) && \
ncheckbit(o2::aod::femtotwophotonresonances::maskDau1, (selection).dau1Mask) && \
ncheckbit(o2::aod::femtotwophotonresonances::maskDau2, (selection).dau2Mask)

Expand Down
32 changes: 16 additions & 16 deletions PWGCF/Femto/Core/photonBuilder.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,15 +62,15 @@ struct ConfPhotonFilters : o2::framework::ConfigurableGroup {

// selection bits for photons (PCM)
// NOLINTNEXTLINE(cppcoreguidelines-macro-usage)
#define PHOTON_DEFAULT_BITS \
o2::framework::Configurable<bool> passThrough{"passThrough", false, "If true, all photons are passed through. Bits for all selections are stored."}; \
o2::framework::Configurable<std::vector<float>> cosPaMin{"cosPaMin", {-1.f}, "Minimum cosine of pointing angle (not used by EMPhotonFilter, default is permissive)"}; \
o2::framework::Configurable<std::vector<float>> dcaToPvXYAbsMax{"dcaToPvXYAbsMax", {1e10f}, "Maximum |DCAxy| of the photon (V0) to the PV (cm)"}; \
o2::framework::Configurable<std::vector<float>> dcaToPvZAbsMax{"dcaToPvZAbsMax", {1e10f}, "Maximum |DCAz| of the photon (V0) to the PV (cm)"}; \
o2::framework::Configurable<std::vector<float>> chi2NdfMax{"chi2NdfMax", {1e10f}, "Maximum chi2/NDF of the KF conversion vertex"}; \
o2::framework::Configurable<std::vector<float>> v0RadiusMin{"v0RadiusMin", {0.f}, "Minimum transverse radius of the conversion point (cm)"}; \
o2::framework::Configurable<std::vector<float>> v0RadiusMax{"v0RadiusMax", {1e10f}, "Maximum transverse radius of the conversion point (cm)"}; \
o2::framework::Configurable<std::vector<float>> dauAbsEtaMax{"dauAbsEtaMax", {0.9f}, "Maximum |eta| for daughter tracks (matches EMPhotonFilter maxeta_v0, though unused there)"}; \
#define PHOTON_DEFAULT_BITS \
o2::framework::Configurable<bool> passThrough{"passThrough", false, "If true, all photons are passed through. Bits for all selections are stored."}; \
o2::framework::Configurable<std::vector<float>> cosPaMin{"cosPaMin", {-1.f}, "Minimum cosine of pointing angle (not used by EMPhotonFilter, default is permissive)"}; \
o2::framework::Configurable<std::vector<float>> dcaToPvXYAbsMax{"dcaToPvXYAbsMax", {1e10f}, "Maximum |DCAxy| of the photon (V0) to the PV (cm)"}; \
o2::framework::Configurable<std::vector<float>> dcaToPvZAbsMax{"dcaToPvZAbsMax", {1e10f}, "Maximum |DCAz| of the photon (V0) to the PV (cm)"}; \
o2::framework::Configurable<std::vector<float>> chi2NdfMax{"chi2NdfMax", {1e10f}, "Maximum chi2/NDF of the KF conversion vertex"}; \
o2::framework::Configurable<std::vector<float>> v0RadiusMin{"v0RadiusMin", {0.f}, "Minimum transverse radius of the conversion point (cm)"}; \
o2::framework::Configurable<std::vector<float>> v0RadiusMax{"v0RadiusMax", {1e10f}, "Maximum transverse radius of the conversion point (cm)"}; \
o2::framework::Configurable<std::vector<float>> dauAbsEtaMax{"dauAbsEtaMax", {0.9f}, "Maximum |eta| for daughter tracks (matches EMPhotonFilter maxeta_v0, though unused there)"}; \
o2::framework::Configurable<std::vector<float>> dauTpcNSigmaElAbsMax{"dauTpcNSigmaElAbsMax", {3.5f}, "Maximum |TPC nSigma_e| for V0 daughters (from EMPhotonFilter isSelectedSecondary)"}; \
o2::framework::Configurable<bool> keepDaughtersWithoutTpc{"keepDaughtersWithoutTpc", true, "If true, a daughter without a TPC signal is not rejected by the TPC electron PID cut (matches EMPhotonFilter behaviour)"};

Expand Down Expand Up @@ -101,13 +101,13 @@ using ConfPhotonSelection1 = ConfPhotonSelection<PrefixPhotonSelection1>;

/// The different selections for photons (PCM)
enum PhotonSels {
kCosPaMin, ///< Min. CPA (cosine pointing angle) of the conversion to the PV
kDcaToPvXYAbsMax, ///< Max. |DCAxy| of the photon to the PV
kDcaToPvZAbsMax, ///< Max. |DCAz| of the photon to the PV
kChi2NdfMax, ///< Max. chi2/NDF of the KF conversion vertex
kV0RadiusMin, ///< Min. transverse radius of the conversion point
kV0RadiusMax, ///< Max. transverse radius of the conversion point
kDauAbsEtaMax, ///< Max. absolute pseudorapidity of the daughters
kCosPaMin, ///< Min. CPA (cosine pointing angle) of the conversion to the PV
kDcaToPvXYAbsMax, ///< Max. |DCAxy| of the photon to the PV
kDcaToPvZAbsMax, ///< Max. |DCAz| of the photon to the PV
kChi2NdfMax, ///< Max. chi2/NDF of the KF conversion vertex
kV0RadiusMin, ///< Min. transverse radius of the conversion point
kV0RadiusMax, ///< Max. transverse radius of the conversion point
kDauAbsEtaMax, ///< Max. absolute pseudorapidity of the daughters
kPosDauTpcNSigmaEl, ///< TPC electron PID for positive daughter
kNegDauTpcNSigmaEl, ///< TPC electron PID for negative daughter
kPhotonSelsMax
Expand Down
36 changes: 18 additions & 18 deletions PWGCF/Femto/Core/photonHistManager.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,25 +123,25 @@ constexpr std::array<histmanager::HistInfo<PhotonHist>, kPhotonHistLast> HistTab
// NOLINTNEXTLINE(cppcoreguidelines-macro-usage)
#define PHOTON_HIST_QA_MAP(confAnalysis, confQa) \
{kCosPa, {(confQa).cosPa}}, \
{kPa, {(confQa).pa}}, \
{kDcaToPvXY, {(confQa).dcaToPv}}, \
{kDcaToPvZ, {(confQa).dcaToPv}}, \
{kChi2Ndf, {(confQa).chi2Ndf}}, \
{kV0Radius, {(confQa).v0Radius}}, \
{kDecayVtxX, {(confQa).decayVertex}}, \
{kDecayVtxY, {(confQa).decayVertex}}, \
{kDecayVtxZ, {(confQa).decayVertex}}, \
{kDecayVtx, {(confQa).decayVertex}}, \
{kPosDauTpcNSigmaEl, {(confQa).tpcNSigmaEl}}, \
{kNegDauTpcNSigmaEl, {(confQa).tpcNSigmaEl}}, \
{kPosDauPt, {(confQa).dauPt}}, \
{kNegDauPt, {(confQa).dauPt}}, \
{kPtVsEta, {(confAnalysis).pt, (confAnalysis).eta}}, \
{kPtVsPhi, {(confAnalysis).pt, (confAnalysis).phi}}, \
{kPhiVsEta, {(confAnalysis).phi, (confAnalysis).eta}}, \
{kPtVsCosPa, {(confAnalysis).pt, (confQa).cosPa}}, \
{kPa, {(confQa).pa}}, \
{kDcaToPvXY, {(confQa).dcaToPv}}, \
{kDcaToPvZ, {(confQa).dcaToPv}}, \
{kChi2Ndf, {(confQa).chi2Ndf}}, \
{kV0Radius, {(confQa).v0Radius}}, \
{kDecayVtxX, {(confQa).decayVertex}}, \
{kDecayVtxY, {(confQa).decayVertex}}, \
{kDecayVtxZ, {(confQa).decayVertex}}, \
{kDecayVtx, {(confQa).decayVertex}}, \
{kPosDauTpcNSigmaEl, {(confQa).tpcNSigmaEl}}, \
{kNegDauTpcNSigmaEl, {(confQa).tpcNSigmaEl}}, \
{kPosDauPt, {(confQa).dauPt}}, \
{kNegDauPt, {(confQa).dauPt}}, \
{kPtVsEta, {(confAnalysis).pt, (confAnalysis).eta}}, \
{kPtVsPhi, {(confAnalysis).pt, (confAnalysis).phi}}, \
{kPhiVsEta, {(confAnalysis).phi, (confAnalysis).eta}}, \
{kPtVsCosPa, {(confAnalysis).pt, (confQa).cosPa}}, \
{kPosDauVsNegDauTpcNSigmaEl, {(confQa).tpcNSigmaEl, (confQa).tpcNSigmaEl}}, \
{kPosDauTpcSignalVsP, {(confQa).dauTpcInnerParam, (confQa).dauTpcSignal}}, \
{kPosDauTpcSignalVsP, {(confQa).dauTpcInnerParam, (confQa).dauTpcSignal}}, \
{kNegDauTpcSignalVsP, {(confQa).dauTpcInnerParam, (confQa).dauTpcSignal}},

template <typename T>
Expand Down
20 changes: 10 additions & 10 deletions PWGCF/Femto/Core/twoPhotonResonanceBuilder.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,16 +58,16 @@ using ConfEtaFilters = ConfTwoPhotonResonanceFilters<PrefixEtaFilters>;
// unlike TWOTRACKRESONANCE_DEFAULT_SELECTION there is no pos/neg split and no momentum-threshold PID
// switch: photon daughters are unordered and have no momentum-dependent PID regime.
// NOLINTNEXTLINE(cppcoreguidelines-macro-usage)
#define TWOPHOTONRESONANCE_DEFAULT_SELECTION(defaultMassMin, defaultMassMax) \
o2::framework::Configurable<float> ptMin{"ptMin", 0.f, "Minimum pT"}; \
o2::framework::Configurable<float> ptMax{"ptMax", 10.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 the resonance"}; \
o2::framework::Configurable<float> massMax{"massMax", (defaultMassMax), "Maximum invariant mass for the resonance"}; \
o2::framework::Configurable<datatypes::PhotonMaskType> dau1Mask{"dau1Mask", 0, "Bitmask required for first photon daughter"}; \
#define TWOPHOTONRESONANCE_DEFAULT_SELECTION(defaultMassMin, defaultMassMax) \
o2::framework::Configurable<float> ptMin{"ptMin", 0.f, "Minimum pT"}; \
o2::framework::Configurable<float> ptMax{"ptMax", 10.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 the resonance"}; \
o2::framework::Configurable<float> massMax{"massMax", (defaultMassMax), "Maximum invariant mass for the resonance"}; \
o2::framework::Configurable<datatypes::PhotonMaskType> dau1Mask{"dau1Mask", 0, "Bitmask required for first photon daughter"}; \
o2::framework::Configurable<datatypes::PhotonMaskType> dau2Mask{"dau2Mask", 0, "Bitmask required for second photon daughter"};

struct ConfPi0Selection : o2::framework::ConfigurableGroup {
Expand Down
16 changes: 8 additions & 8 deletions PWGCF/Femto/Core/twoPhotonResonanceHistManager.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,10 +48,10 @@ enum TwoPhotonResonanceHist {
};

// NOLINTNEXTLINE(cppcoreguidelines-macro-usage)
#define TWOPHOTONRESONANCE_DEFAULT_BINNING(defaultMassMin, defaultMassMax) \
o2::framework::ConfigurableAxis pt{"pt", {{600, 0, 6}}, "Pt"}; \
o2::framework::ConfigurableAxis eta{"eta", {{300, -1.5, 1.5}}, "Eta"}; \
o2::framework::ConfigurableAxis phi{"phi", {{720, 0, 1.f * o2::constants::math::TwoPI}}, "Phi"}; \
#define TWOPHOTONRESONANCE_DEFAULT_BINNING(defaultMassMin, defaultMassMax) \
o2::framework::ConfigurableAxis pt{"pt", {{600, 0, 6}}, "Pt"}; \
o2::framework::ConfigurableAxis eta{"eta", {{300, -1.5, 1.5}}, "Eta"}; \
o2::framework::ConfigurableAxis phi{"phi", {{720, 0, 1.f * o2::constants::math::TwoPI}}, "Phi"}; \
o2::framework::ConfigurableAxis mass{"mass", {{200, (defaultMassMin), (defaultMassMax)}}, "Mass"};

struct ConfPi0Binning : o2::framework::ConfigurableGroup {
Expand Down Expand Up @@ -85,10 +85,10 @@ constexpr std::array<histmanager::HistInfo<TwoPhotonResonanceHist>, kTwoPhotonRe
{kPtVsMass, {(conf).pt, (conf).mass}},

// NOLINTNEXTLINE(cppcoreguidelines-macro-usage)
#define TWOPHOTONRESONANCE_HIST_QA_MAP(conf) \
{kPtVsEta, {(conf).pt, (conf).eta}}, \
{kPtVsPhi, {(conf).pt, (conf).phi}}, \
{kPhiVsEta, {(conf).phi, (conf).eta}}, \
#define TWOPHOTONRESONANCE_HIST_QA_MAP(conf) \
{kPtVsEta, {(conf).pt, (conf).eta}}, \
{kPtVsPhi, {(conf).pt, (conf).phi}}, \
{kPhiVsEta, {(conf).phi, (conf).eta}}, \
{kPtVsMass, {(conf).pt, (conf).mass}},

template <typename T>
Expand Down
32 changes: 16 additions & 16 deletions PWGCF/Femto/DataModel/FemtoTables.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -817,27 +817,27 @@ namespace femtophotons
DECLARE_SOA_COLUMN(Mask, mask, o2::analysis::femto::datatypes::PhotonMaskType); //! Bitmask for photon (PCM) selections

// columns for debug information
DECLARE_SOA_COLUMN(CosPa, cosPa, float); //! Cosine of pointing angle of the V0 (conversion) to the primary vertex
DECLARE_SOA_DYNAMIC_COLUMN(Pa, pa, //! pointing angle
DECLARE_SOA_COLUMN(CosPa, cosPa, float); //! Cosine of pointing angle of the V0 (conversion) to the primary vertex
DECLARE_SOA_DYNAMIC_COLUMN(Pa, pa, //! pointing angle
[](float cosPa) -> float {
return std::acos(cosPa);
});
DECLARE_SOA_COLUMN(DcaToPvXY, dcaToPvXY, float); //! DCAxy of the photon (V0) to the primary vertex
DECLARE_SOA_COLUMN(DcaToPvZ, dcaToPvZ, float); //! DCAz of the photon (V0) to the primary vertex
DECLARE_SOA_COLUMN(Chi2Ndf, chi2Ndf, float); //! Chi2 / NDF of the reconstructed conversion vertex (KF)
DECLARE_SOA_COLUMN(V0Radius, v0Radius, float); //! Transverse radius of the conversion point
DECLARE_SOA_COLUMN(PosDauTpcNSigmaEl, posDauTpcNSigmaEl, float); //! TPC electron nSigma of the positive daughter
DECLARE_SOA_COLUMN(NegDauTpcNSigmaEl, negDauTpcNSigmaEl, float); //! TPC electron nSigma of the negative daughter
DECLARE_SOA_COLUMN(PosDauPt, posDauPt, float); //! pT of the positive daughter (at the conversion point)
DECLARE_SOA_COLUMN(NegDauPt, negDauPt, float); //! pT of the negative daughter (at the conversion point)
DECLARE_SOA_COLUMN(DcaToPvXY, dcaToPvXY, float); //! DCAxy of the photon (V0) to the primary vertex
DECLARE_SOA_COLUMN(DcaToPvZ, dcaToPvZ, float); //! DCAz of the photon (V0) to the primary vertex
DECLARE_SOA_COLUMN(Chi2Ndf, chi2Ndf, float); //! Chi2 / NDF of the reconstructed conversion vertex (KF)
DECLARE_SOA_COLUMN(V0Radius, v0Radius, float); //! Transverse radius of the conversion point
DECLARE_SOA_COLUMN(PosDauTpcNSigmaEl, posDauTpcNSigmaEl, float); //! TPC electron nSigma of the positive daughter
DECLARE_SOA_COLUMN(NegDauTpcNSigmaEl, negDauTpcNSigmaEl, float); //! TPC electron nSigma of the negative daughter
DECLARE_SOA_COLUMN(PosDauPt, posDauPt, float); //! pT of the positive daughter (at the conversion point)
DECLARE_SOA_COLUMN(NegDauPt, negDauPt, float); //! pT of the negative daughter (at the conversion point)
DECLARE_SOA_COLUMN(PosDauTpcInnerParam, posDauTpcInnerParam, float); //! momentum of the positive daughter at the inner wall of the TPC
DECLARE_SOA_COLUMN(NegDauTpcInnerParam, negDauTpcInnerParam, float); //! momentum of the negative daughter at the inner wall of the TPC
DECLARE_SOA_COLUMN(PosDauTpcSignal, posDauTpcSignal, float); //! TPC dE/dx of the positive daughter
DECLARE_SOA_COLUMN(NegDauTpcSignal, negDauTpcSignal, float); //! TPC dE/dx of the negative daughter
DECLARE_SOA_COLUMN(DecayVtxX, decayVtxX, float); //! x coordinate of conversion point
DECLARE_SOA_COLUMN(DecayVtxY, decayVtxY, float); //! y coordinate of conversion point
DECLARE_SOA_COLUMN(DecayVtxZ, decayVtxZ, float); //! z coordinate of conversion point
DECLARE_SOA_DYNAMIC_COLUMN(DecayVtx, decayVtx, //! distance of conversion point from nominal interaction point
DECLARE_SOA_COLUMN(PosDauTpcSignal, posDauTpcSignal, float); //! TPC dE/dx of the positive daughter
DECLARE_SOA_COLUMN(NegDauTpcSignal, negDauTpcSignal, float); //! TPC dE/dx of the negative daughter
DECLARE_SOA_COLUMN(DecayVtxX, decayVtxX, float); //! x coordinate of conversion point
DECLARE_SOA_COLUMN(DecayVtxY, decayVtxY, float); //! y coordinate of conversion point
DECLARE_SOA_COLUMN(DecayVtxZ, decayVtxZ, float); //! z coordinate of conversion point
DECLARE_SOA_DYNAMIC_COLUMN(DecayVtx, decayVtx, //! distance of conversion point from nominal interaction point
[](float vtxX, float vtxY, float vtxZ) -> float {
return std::hypot(vtxX, vtxY, vtxZ);
});
Expand Down
Loading