Skip to content

Commit 2c6951d

Browse files
alibuildalibuild
committed
Please consider the following formatting changes
1 parent ba3b327 commit 2c6951d

6 files changed

Lines changed: 77 additions & 77 deletions

File tree

‎PWGCF/Femto/Core/partitions.h‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -97,15 +97,15 @@
9797
// partition for resonances built from two photons (pi0, eta, ...): unlike MAKE_RESONANCE_0/1_PARTITON
9898
// there is no sign and no momentum-threshold PID switch, just a plain mask check per (unordered) daughter
9999
// NOLINTNEXTLINE(cppcoreguidelines-macro-usage)
100-
#define MAKE_TWOPHOTONRESONANCE_PARTITION(selection) \
101-
(o2::aod::femtobase::stored::pt > (selection).ptMin) && \
102-
(o2::aod::femtobase::stored::pt < (selection).ptMax) && \
103-
(o2::aod::femtobase::stored::eta > (selection).etaMin) && \
104-
(o2::aod::femtobase::stored::eta < (selection).etaMax) && \
105-
(o2::aod::femtobase::stored::phi > (selection).phiMin) && \
106-
(o2::aod::femtobase::stored::phi < (selection).phiMax) && \
107-
(o2::aod::femtobase::stored::mass > (selection).massMin) && \
108-
(o2::aod::femtobase::stored::mass < (selection).massMax) && \
100+
#define MAKE_TWOPHOTONRESONANCE_PARTITION(selection) \
101+
(o2::aod::femtobase::stored::pt > (selection).ptMin) && \
102+
(o2::aod::femtobase::stored::pt < (selection).ptMax) && \
103+
(o2::aod::femtobase::stored::eta > (selection).etaMin) && \
104+
(o2::aod::femtobase::stored::eta < (selection).etaMax) && \
105+
(o2::aod::femtobase::stored::phi > (selection).phiMin) && \
106+
(o2::aod::femtobase::stored::phi < (selection).phiMax) && \
107+
(o2::aod::femtobase::stored::mass > (selection).massMin) && \
108+
(o2::aod::femtobase::stored::mass < (selection).massMax) && \
109109
ncheckbit(o2::aod::femtotwophotonresonances::maskDau1, (selection).dau1Mask) && \
110110
ncheckbit(o2::aod::femtotwophotonresonances::maskDau2, (selection).dau2Mask)
111111

‎PWGCF/Femto/Core/photonBuilder.h‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -62,15 +62,15 @@ struct ConfPhotonFilters : o2::framework::ConfigurableGroup {
6262

6363
// selection bits for photons (PCM)
6464
// NOLINTNEXTLINE(cppcoreguidelines-macro-usage)
65-
#define PHOTON_DEFAULT_BITS \
66-
o2::framework::Configurable<bool> passThrough{"passThrough", false, "If true, all photons are passed through. Bits for all selections are stored."}; \
67-
o2::framework::Configurable<std::vector<float>> cosPaMin{"cosPaMin", {-1.f}, "Minimum cosine of pointing angle (not used by EMPhotonFilter, default is permissive)"}; \
68-
o2::framework::Configurable<std::vector<float>> dcaToPvXYAbsMax{"dcaToPvXYAbsMax", {1e10f}, "Maximum |DCAxy| of the photon (V0) to the PV (cm)"}; \
69-
o2::framework::Configurable<std::vector<float>> dcaToPvZAbsMax{"dcaToPvZAbsMax", {1e10f}, "Maximum |DCAz| of the photon (V0) to the PV (cm)"}; \
70-
o2::framework::Configurable<std::vector<float>> chi2NdfMax{"chi2NdfMax", {1e10f}, "Maximum chi2/NDF of the KF conversion vertex"}; \
71-
o2::framework::Configurable<std::vector<float>> v0RadiusMin{"v0RadiusMin", {0.f}, "Minimum transverse radius of the conversion point (cm)"}; \
72-
o2::framework::Configurable<std::vector<float>> v0RadiusMax{"v0RadiusMax", {1e10f}, "Maximum transverse radius of the conversion point (cm)"}; \
73-
o2::framework::Configurable<std::vector<float>> dauAbsEtaMax{"dauAbsEtaMax", {0.9f}, "Maximum |eta| for daughter tracks (matches EMPhotonFilter maxeta_v0, though unused there)"}; \
65+
#define PHOTON_DEFAULT_BITS \
66+
o2::framework::Configurable<bool> passThrough{"passThrough", false, "If true, all photons are passed through. Bits for all selections are stored."}; \
67+
o2::framework::Configurable<std::vector<float>> cosPaMin{"cosPaMin", {-1.f}, "Minimum cosine of pointing angle (not used by EMPhotonFilter, default is permissive)"}; \
68+
o2::framework::Configurable<std::vector<float>> dcaToPvXYAbsMax{"dcaToPvXYAbsMax", {1e10f}, "Maximum |DCAxy| of the photon (V0) to the PV (cm)"}; \
69+
o2::framework::Configurable<std::vector<float>> dcaToPvZAbsMax{"dcaToPvZAbsMax", {1e10f}, "Maximum |DCAz| of the photon (V0) to the PV (cm)"}; \
70+
o2::framework::Configurable<std::vector<float>> chi2NdfMax{"chi2NdfMax", {1e10f}, "Maximum chi2/NDF of the KF conversion vertex"}; \
71+
o2::framework::Configurable<std::vector<float>> v0RadiusMin{"v0RadiusMin", {0.f}, "Minimum transverse radius of the conversion point (cm)"}; \
72+
o2::framework::Configurable<std::vector<float>> v0RadiusMax{"v0RadiusMax", {1e10f}, "Maximum transverse radius of the conversion point (cm)"}; \
73+
o2::framework::Configurable<std::vector<float>> dauAbsEtaMax{"dauAbsEtaMax", {0.9f}, "Maximum |eta| for daughter tracks (matches EMPhotonFilter maxeta_v0, though unused there)"}; \
7474
o2::framework::Configurable<std::vector<float>> dauTpcNSigmaElAbsMax{"dauTpcNSigmaElAbsMax", {3.5f}, "Maximum |TPC nSigma_e| for V0 daughters (from EMPhotonFilter isSelectedSecondary)"}; \
7575
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)"};
7676

@@ -101,13 +101,13 @@ using ConfPhotonSelection1 = ConfPhotonSelection<PrefixPhotonSelection1>;
101101

102102
/// The different selections for photons (PCM)
103103
enum PhotonSels {
104-
kCosPaMin, ///< Min. CPA (cosine pointing angle) of the conversion to the PV
105-
kDcaToPvXYAbsMax, ///< Max. |DCAxy| of the photon to the PV
106-
kDcaToPvZAbsMax, ///< Max. |DCAz| of the photon to the PV
107-
kChi2NdfMax, ///< Max. chi2/NDF of the KF conversion vertex
108-
kV0RadiusMin, ///< Min. transverse radius of the conversion point
109-
kV0RadiusMax, ///< Max. transverse radius of the conversion point
110-
kDauAbsEtaMax, ///< Max. absolute pseudorapidity of the daughters
104+
kCosPaMin, ///< Min. CPA (cosine pointing angle) of the conversion to the PV
105+
kDcaToPvXYAbsMax, ///< Max. |DCAxy| of the photon to the PV
106+
kDcaToPvZAbsMax, ///< Max. |DCAz| of the photon to the PV
107+
kChi2NdfMax, ///< Max. chi2/NDF of the KF conversion vertex
108+
kV0RadiusMin, ///< Min. transverse radius of the conversion point
109+
kV0RadiusMax, ///< Max. transverse radius of the conversion point
110+
kDauAbsEtaMax, ///< Max. absolute pseudorapidity of the daughters
111111
kPosDauTpcNSigmaEl, ///< TPC electron PID for positive daughter
112112
kNegDauTpcNSigmaEl, ///< TPC electron PID for negative daughter
113113
kPhotonSelsMax

‎PWGCF/Femto/Core/photonHistManager.h‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -123,25 +123,25 @@ constexpr std::array<histmanager::HistInfo<PhotonHist>, kPhotonHistLast> HistTab
123123
// NOLINTNEXTLINE(cppcoreguidelines-macro-usage)
124124
#define PHOTON_HIST_QA_MAP(confAnalysis, confQa) \
125125
{kCosPa, {(confQa).cosPa}}, \
126-
{kPa, {(confQa).pa}}, \
127-
{kDcaToPvXY, {(confQa).dcaToPv}}, \
128-
{kDcaToPvZ, {(confQa).dcaToPv}}, \
129-
{kChi2Ndf, {(confQa).chi2Ndf}}, \
130-
{kV0Radius, {(confQa).v0Radius}}, \
131-
{kDecayVtxX, {(confQa).decayVertex}}, \
132-
{kDecayVtxY, {(confQa).decayVertex}}, \
133-
{kDecayVtxZ, {(confQa).decayVertex}}, \
134-
{kDecayVtx, {(confQa).decayVertex}}, \
135-
{kPosDauTpcNSigmaEl, {(confQa).tpcNSigmaEl}}, \
136-
{kNegDauTpcNSigmaEl, {(confQa).tpcNSigmaEl}}, \
137-
{kPosDauPt, {(confQa).dauPt}}, \
138-
{kNegDauPt, {(confQa).dauPt}}, \
139-
{kPtVsEta, {(confAnalysis).pt, (confAnalysis).eta}}, \
140-
{kPtVsPhi, {(confAnalysis).pt, (confAnalysis).phi}}, \
141-
{kPhiVsEta, {(confAnalysis).phi, (confAnalysis).eta}}, \
142-
{kPtVsCosPa, {(confAnalysis).pt, (confQa).cosPa}}, \
126+
{kPa, {(confQa).pa}}, \
127+
{kDcaToPvXY, {(confQa).dcaToPv}}, \
128+
{kDcaToPvZ, {(confQa).dcaToPv}}, \
129+
{kChi2Ndf, {(confQa).chi2Ndf}}, \
130+
{kV0Radius, {(confQa).v0Radius}}, \
131+
{kDecayVtxX, {(confQa).decayVertex}}, \
132+
{kDecayVtxY, {(confQa).decayVertex}}, \
133+
{kDecayVtxZ, {(confQa).decayVertex}}, \
134+
{kDecayVtx, {(confQa).decayVertex}}, \
135+
{kPosDauTpcNSigmaEl, {(confQa).tpcNSigmaEl}}, \
136+
{kNegDauTpcNSigmaEl, {(confQa).tpcNSigmaEl}}, \
137+
{kPosDauPt, {(confQa).dauPt}}, \
138+
{kNegDauPt, {(confQa).dauPt}}, \
139+
{kPtVsEta, {(confAnalysis).pt, (confAnalysis).eta}}, \
140+
{kPtVsPhi, {(confAnalysis).pt, (confAnalysis).phi}}, \
141+
{kPhiVsEta, {(confAnalysis).phi, (confAnalysis).eta}}, \
142+
{kPtVsCosPa, {(confAnalysis).pt, (confQa).cosPa}}, \
143143
{kPosDauVsNegDauTpcNSigmaEl, {(confQa).tpcNSigmaEl, (confQa).tpcNSigmaEl}}, \
144-
{kPosDauTpcSignalVsP, {(confQa).dauTpcInnerParam, (confQa).dauTpcSignal}}, \
144+
{kPosDauTpcSignalVsP, {(confQa).dauTpcInnerParam, (confQa).dauTpcSignal}}, \
145145
{kNegDauTpcSignalVsP, {(confQa).dauTpcInnerParam, (confQa).dauTpcSignal}},
146146

147147
template <typename T>

‎PWGCF/Femto/Core/twoPhotonResonanceBuilder.h‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -58,16 +58,16 @@ using ConfEtaFilters = ConfTwoPhotonResonanceFilters<PrefixEtaFilters>;
5858
// unlike TWOTRACKRESONANCE_DEFAULT_SELECTION there is no pos/neg split and no momentum-threshold PID
5959
// switch: photon daughters are unordered and have no momentum-dependent PID regime.
6060
// NOLINTNEXTLINE(cppcoreguidelines-macro-usage)
61-
#define TWOPHOTONRESONANCE_DEFAULT_SELECTION(defaultMassMin, defaultMassMax) \
62-
o2::framework::Configurable<float> ptMin{"ptMin", 0.f, "Minimum pT"}; \
63-
o2::framework::Configurable<float> ptMax{"ptMax", 10.f, "Maximum pT"}; \
64-
o2::framework::Configurable<float> etaMin{"etaMin", -0.9f, "Minimum eta"}; \
65-
o2::framework::Configurable<float> etaMax{"etaMax", 0.9f, "Maximum eta"}; \
66-
o2::framework::Configurable<float> phiMin{"phiMin", 0.f, "Minimum phi"}; \
67-
o2::framework::Configurable<float> phiMax{"phiMax", 1.f * o2::constants::math::TwoPI, "Maximum phi"}; \
68-
o2::framework::Configurable<float> massMin{"massMin", (defaultMassMin), "Minimum invariant mass for the resonance"}; \
69-
o2::framework::Configurable<float> massMax{"massMax", (defaultMassMax), "Maximum invariant mass for the resonance"}; \
70-
o2::framework::Configurable<datatypes::PhotonMaskType> dau1Mask{"dau1Mask", 0, "Bitmask required for first photon daughter"}; \
61+
#define TWOPHOTONRESONANCE_DEFAULT_SELECTION(defaultMassMin, defaultMassMax) \
62+
o2::framework::Configurable<float> ptMin{"ptMin", 0.f, "Minimum pT"}; \
63+
o2::framework::Configurable<float> ptMax{"ptMax", 10.f, "Maximum pT"}; \
64+
o2::framework::Configurable<float> etaMin{"etaMin", -0.9f, "Minimum eta"}; \
65+
o2::framework::Configurable<float> etaMax{"etaMax", 0.9f, "Maximum eta"}; \
66+
o2::framework::Configurable<float> phiMin{"phiMin", 0.f, "Minimum phi"}; \
67+
o2::framework::Configurable<float> phiMax{"phiMax", 1.f * o2::constants::math::TwoPI, "Maximum phi"}; \
68+
o2::framework::Configurable<float> massMin{"massMin", (defaultMassMin), "Minimum invariant mass for the resonance"}; \
69+
o2::framework::Configurable<float> massMax{"massMax", (defaultMassMax), "Maximum invariant mass for the resonance"}; \
70+
o2::framework::Configurable<datatypes::PhotonMaskType> dau1Mask{"dau1Mask", 0, "Bitmask required for first photon daughter"}; \
7171
o2::framework::Configurable<datatypes::PhotonMaskType> dau2Mask{"dau2Mask", 0, "Bitmask required for second photon daughter"};
7272

7373
struct ConfPi0Selection : o2::framework::ConfigurableGroup {

‎PWGCF/Femto/Core/twoPhotonResonanceHistManager.h‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -48,10 +48,10 @@ enum TwoPhotonResonanceHist {
4848
};
4949

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

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

8787
// NOLINTNEXTLINE(cppcoreguidelines-macro-usage)
88-
#define TWOPHOTONRESONANCE_HIST_QA_MAP(conf) \
89-
{kPtVsEta, {(conf).pt, (conf).eta}}, \
90-
{kPtVsPhi, {(conf).pt, (conf).phi}}, \
91-
{kPhiVsEta, {(conf).phi, (conf).eta}}, \
88+
#define TWOPHOTONRESONANCE_HIST_QA_MAP(conf) \
89+
{kPtVsEta, {(conf).pt, (conf).eta}}, \
90+
{kPtVsPhi, {(conf).pt, (conf).phi}}, \
91+
{kPhiVsEta, {(conf).phi, (conf).eta}}, \
9292
{kPtVsMass, {(conf).pt, (conf).mass}},
9393

9494
template <typename T>

‎PWGCF/Femto/DataModel/FemtoTables.h‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -817,27 +817,27 @@ namespace femtophotons
817817
DECLARE_SOA_COLUMN(Mask, mask, o2::analysis::femto::datatypes::PhotonMaskType); //! Bitmask for photon (PCM) selections
818818

819819
// columns for debug information
820-
DECLARE_SOA_COLUMN(CosPa, cosPa, float); //! Cosine of pointing angle of the V0 (conversion) to the primary vertex
821-
DECLARE_SOA_DYNAMIC_COLUMN(Pa, pa, //! pointing angle
820+
DECLARE_SOA_COLUMN(CosPa, cosPa, float); //! Cosine of pointing angle of the V0 (conversion) to the primary vertex
821+
DECLARE_SOA_DYNAMIC_COLUMN(Pa, pa, //! pointing angle
822822
[](float cosPa) -> float {
823823
return std::acos(cosPa);
824824
});
825-
DECLARE_SOA_COLUMN(DcaToPvXY, dcaToPvXY, float); //! DCAxy of the photon (V0) to the primary vertex
826-
DECLARE_SOA_COLUMN(DcaToPvZ, dcaToPvZ, float); //! DCAz of the photon (V0) to the primary vertex
827-
DECLARE_SOA_COLUMN(Chi2Ndf, chi2Ndf, float); //! Chi2 / NDF of the reconstructed conversion vertex (KF)
828-
DECLARE_SOA_COLUMN(V0Radius, v0Radius, float); //! Transverse radius of the conversion point
829-
DECLARE_SOA_COLUMN(PosDauTpcNSigmaEl, posDauTpcNSigmaEl, float); //! TPC electron nSigma of the positive daughter
830-
DECLARE_SOA_COLUMN(NegDauTpcNSigmaEl, negDauTpcNSigmaEl, float); //! TPC electron nSigma of the negative daughter
831-
DECLARE_SOA_COLUMN(PosDauPt, posDauPt, float); //! pT of the positive daughter (at the conversion point)
832-
DECLARE_SOA_COLUMN(NegDauPt, negDauPt, float); //! pT of the negative daughter (at the conversion point)
825+
DECLARE_SOA_COLUMN(DcaToPvXY, dcaToPvXY, float); //! DCAxy of the photon (V0) to the primary vertex
826+
DECLARE_SOA_COLUMN(DcaToPvZ, dcaToPvZ, float); //! DCAz of the photon (V0) to the primary vertex
827+
DECLARE_SOA_COLUMN(Chi2Ndf, chi2Ndf, float); //! Chi2 / NDF of the reconstructed conversion vertex (KF)
828+
DECLARE_SOA_COLUMN(V0Radius, v0Radius, float); //! Transverse radius of the conversion point
829+
DECLARE_SOA_COLUMN(PosDauTpcNSigmaEl, posDauTpcNSigmaEl, float); //! TPC electron nSigma of the positive daughter
830+
DECLARE_SOA_COLUMN(NegDauTpcNSigmaEl, negDauTpcNSigmaEl, float); //! TPC electron nSigma of the negative daughter
831+
DECLARE_SOA_COLUMN(PosDauPt, posDauPt, float); //! pT of the positive daughter (at the conversion point)
832+
DECLARE_SOA_COLUMN(NegDauPt, negDauPt, float); //! pT of the negative daughter (at the conversion point)
833833
DECLARE_SOA_COLUMN(PosDauTpcInnerParam, posDauTpcInnerParam, float); //! momentum of the positive daughter at the inner wall of the TPC
834834
DECLARE_SOA_COLUMN(NegDauTpcInnerParam, negDauTpcInnerParam, float); //! momentum of the negative daughter at the inner wall of the TPC
835-
DECLARE_SOA_COLUMN(PosDauTpcSignal, posDauTpcSignal, float); //! TPC dE/dx of the positive daughter
836-
DECLARE_SOA_COLUMN(NegDauTpcSignal, negDauTpcSignal, float); //! TPC dE/dx of the negative daughter
837-
DECLARE_SOA_COLUMN(DecayVtxX, decayVtxX, float); //! x coordinate of conversion point
838-
DECLARE_SOA_COLUMN(DecayVtxY, decayVtxY, float); //! y coordinate of conversion point
839-
DECLARE_SOA_COLUMN(DecayVtxZ, decayVtxZ, float); //! z coordinate of conversion point
840-
DECLARE_SOA_DYNAMIC_COLUMN(DecayVtx, decayVtx, //! distance of conversion point from nominal interaction point
835+
DECLARE_SOA_COLUMN(PosDauTpcSignal, posDauTpcSignal, float); //! TPC dE/dx of the positive daughter
836+
DECLARE_SOA_COLUMN(NegDauTpcSignal, negDauTpcSignal, float); //! TPC dE/dx of the negative daughter
837+
DECLARE_SOA_COLUMN(DecayVtxX, decayVtxX, float); //! x coordinate of conversion point
838+
DECLARE_SOA_COLUMN(DecayVtxY, decayVtxY, float); //! y coordinate of conversion point
839+
DECLARE_SOA_COLUMN(DecayVtxZ, decayVtxZ, float); //! z coordinate of conversion point
840+
DECLARE_SOA_DYNAMIC_COLUMN(DecayVtx, decayVtx, //! distance of conversion point from nominal interaction point
841841
[](float vtxX, float vtxY, float vtxZ) -> float {
842842
return std::hypot(vtxX, vtxY, vtxZ);
843843
});

0 commit comments

Comments
 (0)