Skip to content

Commit 2eed4d3

Browse files
alibuildalibuild
committed
Please consider the following formatting changes
1 parent 8ba1ce0 commit 2eed4d3

File tree

4 files changed

+177
-178
lines changed

4 files changed

+177
-178
lines changed

‎PWGHF/D2H/Tasks/taskCharmPolarisation.cxx‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,12 @@
1717
/// \author M. Faggin (CERN) mattia.faggin@cern.ch
1818
/// \author M. Li (CCNU) mingze.li@cern.ch
1919

20-
2120
#include "PWGHF/Core/CentralityEstimation.h"
2221
#include "PWGHF/Core/DecayChannels.h"
2322
#include "PWGHF/Core/HfHelper.h"
23+
#include "PWGHF/D2H/Utils/utilsFlow.h"
2424
#include "PWGHF/DataModel/CandidateReconstructionTables.h"
2525
#include "PWGHF/DataModel/CandidateSelectionTables.h"
26-
#include "PWGHF/D2H/Utils/utilsFlow.h"
2726
#include "PWGHF/Utils/utilsEvSelHf.h"
2827

2928
#include "Common/Core/EventPlaneHelper.h"
@@ -221,7 +220,7 @@ struct HfTaskCharmPolarisation {
221220

222221
SliceCache cache;
223222
EventPlaneHelper epHelper; // event plane helper
224-
HfEventSelection hfEvSel; // event selection and monitoring
223+
HfEventSelection hfEvSel; // event selection and monitoring
225224
o2::framework::Service<o2::ccdb::BasicCCDBManager> ccdb;
226225

227226
using CollisionsWithMcLabels = soa::SmallGroups<soa::Join<aod::Collisions, aod::McCollisionLabels>>;

‎PWGHF/D2H/Tasks/taskFlowCharmHadrons.cxx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@
1919

2020
#include "PWGHF/Core/CentralityEstimation.h"
2121
#include "PWGHF/Core/HfHelper.h"
22+
#include "PWGHF/D2H/Utils/utilsFlow.h"
2223
#include "PWGHF/DataModel/CandidateReconstructionTables.h"
2324
#include "PWGHF/DataModel/CandidateSelectionTables.h"
24-
#include "PWGHF/D2H/Utils/utilsFlow.h"
2525
#include "PWGHF/Utils/utilsEvSelHf.h"
2626

2727
#include "Common/Core/EventPlaneHelper.h"

‎PWGHF/D2H/Utils/utilsFlow.h‎

Lines changed: 173 additions & 173 deletions
Original file line numberDiff line numberDiff line change
@@ -24,180 +24,180 @@ namespace o2::analysis
2424
{
2525
namespace hf_flow_utils
2626
{
27-
enum QvecEstimator { FV0A = 0,
28-
FT0M,
29-
FT0A,
30-
FT0C,
31-
TPCPos,
32-
TPCNeg,
33-
TPCTot };
34-
35-
/// Compute the delta psi in the range [0, pi/harmonic]
36-
/// \param psi1 is the first angle
37-
/// \param psi2 is the second angle
38-
/// \param harmonic is the harmonic
39-
/// \note Ported from AliAnalysisTaskSECharmHadronvn::GetDeltaPsiSubInRange
40-
float getDeltaPsiInRange(float psi1, float psi2, int harmonic)
41-
{
42-
float deltaPsi = psi1 - psi2;
43-
deltaPsi = RecoDecay::constrainAngle(deltaPsi, -o2::constants::math::PI / harmonic, harmonic);
44-
return deltaPsi;
45-
}
46-
47-
/// Get the Q vector
48-
template <typename T>
49-
concept HasQvecFT0A = requires(T collision) {
50-
collision.qvecFT0ARe();
51-
collision.qvecFT0AIm();
52-
};
53-
54-
template <typename T>
55-
concept HasQvecFT0C = requires(T collision) {
56-
collision.qvecFT0CRe();
57-
collision.qvecFT0CIm();
58-
};
59-
60-
template <typename T>
61-
concept HasQvecFT0M = requires(T collision) {
62-
collision.qvecFT0MRe();
63-
collision.qvecFT0MIm();
64-
};
65-
66-
template <typename T>
67-
concept HasQvecFV0A = requires(T collision) {
68-
collision.qvecFV0ARe();
69-
collision.qvecFV0AIm();
70-
};
71-
72-
template <typename T>
73-
concept HasQvecTPCpos = requires(T collision) {
74-
collision.qvecBPosRe();
75-
collision.qvecBPosIm();
76-
};
77-
78-
template <typename T>
79-
concept HasQvecTPCneg = requires(T collision) {
80-
collision.qvecBNegRe();
81-
collision.qvecBNegIm();
82-
};
83-
84-
template <typename T>
85-
concept HasQvecTPCtot = requires(T collision) {
86-
collision.qvecBTotRe();
87-
collision.qvecBTotIm();
88-
};
89-
90-
/// Get the Q vector using FT0A estimator
91-
/// \param collision is the collision
92-
/// \return Q vector of the collision
93-
template <HasQvecFT0A TCollision>
94-
std::array<float, 3> getQvec(const TCollision& collision)
95-
{
96-
return std::array<float, 3>{collision.qvecFT0ARe(), collision.qvecFT0AIm(), collision.sumAmplFT0A()};
97-
}
98-
99-
/// Get the Q vector using FT0C estimator
100-
/// \param collision is the collision
101-
/// \return Q vector of the collision
102-
template <HasQvecFT0C TCollision>
103-
std::array<float, 3> getQvec(const TCollision& collision)
104-
{
105-
return std::array<float, 3>{collision.qvecFT0CRe(), collision.qvecFT0CIm(), collision.sumAmplFT0C()};
106-
}
107-
108-
/// Get the Q vector using FT0C estimator
109-
/// \param collision is the collision
110-
/// \return Q vector of the collision
111-
template <HasQvecFT0M TCollision>
112-
std::array<float, 3> getQvec(const TCollision& collision)
113-
{
114-
return std::array<float, 3>{collision.qvecFT0MRe(), collision.qvecFT0MIm(), collision.sumAmplFT0M()};
115-
}
116-
117-
/// Get the Q vector using FV0A estimator
118-
/// \param collision is the collision
119-
/// \return Q vector of the collision
120-
template <HasQvecFV0A TCollision>
121-
std::array<float, 3> getQvec(const TCollision& collision)
122-
{
123-
return std::array<float, 3>{collision.qvecFV0ARe(), collision.qvecFV0AIm(), collision.sumAmplFV0A()};
124-
}
125-
126-
/// Get the Q vector using TPCpos estimator
127-
/// \param collision is the collision
128-
/// \return Q vector of the collision
129-
template <HasQvecTPCpos TCollision>
130-
std::array<float, 3> getQvec(const TCollision& collision)
131-
{
132-
return std::array<float, 3>{collision.qvecBPosRe(), collision.qvecBPosIm(), collision.nTrkBPos()};
133-
}
134-
135-
/// Get the Q vector using TPCneg estimator
136-
/// \param collision is the collision
137-
/// \return Q vector of the collision
138-
template <HasQvecTPCneg TCollision>
139-
std::array<float, 3> getQvec(const TCollision& collision)
140-
{
141-
return std::array<float, 3>{collision.qvecBNegRe(), collision.qvecBNegIm(), collision.nTrkBNeg()};
142-
}
143-
144-
/// Get the Q vector using TPCtot estimator
145-
/// \param collision is the collision
146-
/// \return Q vector of the collision
147-
template <HasQvecTPCtot TCollision>
148-
std::array<float, 3> getQvec(const TCollision& collision)
149-
{
150-
return std::array<float, 3>{collision.qvecBTotRe(), collision.qvecBTotIm(), collision.nTrkBTot()};
151-
}
152-
153-
/// Get the Q vector choosing your favourite estimator
154-
/// \param collision is the collision with the Q vector information
155-
/// \param qvecEst is the chosen Q-vector estimator
156-
template <typename TCollision>
157-
std::array<float, 3> getQvec(TCollision const& collision, const int qvecEst)
158-
{
159-
switch (qvecEst) {
160-
case QvecEstimator::FV0A:
161-
if constexpr (HasQvecFV0A<TCollision>) {
162-
return std::array<float, 3>{collision.qvecFV0ARe(), collision.qvecFV0AIm(), collision.sumAmplFV0A()};
163-
}
164-
break;
165-
case QvecEstimator::FT0A:
166-
if constexpr (HasQvecFT0A<TCollision>) {
167-
return std::array<float, 3>{collision.qvecFT0ARe(), collision.qvecFT0AIm(), collision.sumAmplFT0A()};
168-
}
169-
break;
170-
case QvecEstimator::FT0C:
171-
if constexpr (HasQvecFT0C<TCollision>) {
172-
return std::array<float, 3>{collision.qvecFT0CRe(), collision.qvecFT0CIm(), collision.sumAmplFT0C()};
173-
}
174-
break;
175-
case QvecEstimator::FT0M:
176-
if constexpr (HasQvecFT0M<TCollision>) {
177-
return std::array<float, 3>{collision.qvecFT0MRe(), collision.qvecFT0MIm(), collision.sumAmplFT0M()};
178-
}
179-
break;
180-
case QvecEstimator::TPCPos:
181-
if constexpr (HasQvecTPCpos<TCollision>) {
182-
return std::array<float, 3>{collision.qvecBPosRe(), collision.qvecBPosIm(), static_cast<float>(collision.nTrkBPos())};
183-
}
184-
break;
185-
case QvecEstimator::TPCNeg:
186-
if constexpr (HasQvecTPCneg<TCollision>) {
187-
return std::array<float, 3>{collision.qvecBNegRe(), collision.qvecBNegIm(), static_cast<float>(collision.nTrkBNeg())};
188-
}
189-
break;
190-
case QvecEstimator::TPCTot:
191-
if constexpr (HasQvecTPCtot<TCollision>) {
192-
return std::array<float, 3>{collision.qvecBTotRe(), collision.qvecBTotIm(), static_cast<float>(collision.nTrkBTot())};
193-
}
194-
break;
195-
default:
196-
LOGP(fatal, "Q-vector estimator not valid. Please choose between FV0A, FT0M, FT0A, FT0C, TPCPos, TPCNeg, TPCTot");
197-
break;
198-
}
199-
return std::array<float, 3>{-999.f, -999.f, -999.f};
27+
enum QvecEstimator { FV0A = 0,
28+
FT0M,
29+
FT0A,
30+
FT0C,
31+
TPCPos,
32+
TPCNeg,
33+
TPCTot };
34+
35+
/// Compute the delta psi in the range [0, pi/harmonic]
36+
/// \param psi1 is the first angle
37+
/// \param psi2 is the second angle
38+
/// \param harmonic is the harmonic
39+
/// \note Ported from AliAnalysisTaskSECharmHadronvn::GetDeltaPsiSubInRange
40+
float getDeltaPsiInRange(float psi1, float psi2, int harmonic)
41+
{
42+
float deltaPsi = psi1 - psi2;
43+
deltaPsi = RecoDecay::constrainAngle(deltaPsi, -o2::constants::math::PI / harmonic, harmonic);
44+
return deltaPsi;
45+
}
46+
47+
/// Get the Q vector
48+
template <typename T>
49+
concept HasQvecFT0A = requires(T collision) {
50+
collision.qvecFT0ARe();
51+
collision.qvecFT0AIm();
52+
};
53+
54+
template <typename T>
55+
concept HasQvecFT0C = requires(T collision) {
56+
collision.qvecFT0CRe();
57+
collision.qvecFT0CIm();
58+
};
59+
60+
template <typename T>
61+
concept HasQvecFT0M = requires(T collision) {
62+
collision.qvecFT0MRe();
63+
collision.qvecFT0MIm();
64+
};
65+
66+
template <typename T>
67+
concept HasQvecFV0A = requires(T collision) {
68+
collision.qvecFV0ARe();
69+
collision.qvecFV0AIm();
70+
};
71+
72+
template <typename T>
73+
concept HasQvecTPCpos = requires(T collision) {
74+
collision.qvecBPosRe();
75+
collision.qvecBPosIm();
76+
};
77+
78+
template <typename T>
79+
concept HasQvecTPCneg = requires(T collision) {
80+
collision.qvecBNegRe();
81+
collision.qvecBNegIm();
82+
};
83+
84+
template <typename T>
85+
concept HasQvecTPCtot = requires(T collision) {
86+
collision.qvecBTotRe();
87+
collision.qvecBTotIm();
88+
};
89+
90+
/// Get the Q vector using FT0A estimator
91+
/// \param collision is the collision
92+
/// \return Q vector of the collision
93+
template <HasQvecFT0A TCollision>
94+
std::array<float, 3> getQvec(const TCollision& collision)
95+
{
96+
return std::array<float, 3>{collision.qvecFT0ARe(), collision.qvecFT0AIm(), collision.sumAmplFT0A()};
97+
}
98+
99+
/// Get the Q vector using FT0C estimator
100+
/// \param collision is the collision
101+
/// \return Q vector of the collision
102+
template <HasQvecFT0C TCollision>
103+
std::array<float, 3> getQvec(const TCollision& collision)
104+
{
105+
return std::array<float, 3>{collision.qvecFT0CRe(), collision.qvecFT0CIm(), collision.sumAmplFT0C()};
106+
}
107+
108+
/// Get the Q vector using FT0C estimator
109+
/// \param collision is the collision
110+
/// \return Q vector of the collision
111+
template <HasQvecFT0M TCollision>
112+
std::array<float, 3> getQvec(const TCollision& collision)
113+
{
114+
return std::array<float, 3>{collision.qvecFT0MRe(), collision.qvecFT0MIm(), collision.sumAmplFT0M()};
115+
}
116+
117+
/// Get the Q vector using FV0A estimator
118+
/// \param collision is the collision
119+
/// \return Q vector of the collision
120+
template <HasQvecFV0A TCollision>
121+
std::array<float, 3> getQvec(const TCollision& collision)
122+
{
123+
return std::array<float, 3>{collision.qvecFV0ARe(), collision.qvecFV0AIm(), collision.sumAmplFV0A()};
124+
}
125+
126+
/// Get the Q vector using TPCpos estimator
127+
/// \param collision is the collision
128+
/// \return Q vector of the collision
129+
template <HasQvecTPCpos TCollision>
130+
std::array<float, 3> getQvec(const TCollision& collision)
131+
{
132+
return std::array<float, 3>{collision.qvecBPosRe(), collision.qvecBPosIm(), collision.nTrkBPos()};
133+
}
134+
135+
/// Get the Q vector using TPCneg estimator
136+
/// \param collision is the collision
137+
/// \return Q vector of the collision
138+
template <HasQvecTPCneg TCollision>
139+
std::array<float, 3> getQvec(const TCollision& collision)
140+
{
141+
return std::array<float, 3>{collision.qvecBNegRe(), collision.qvecBNegIm(), collision.nTrkBNeg()};
142+
}
143+
144+
/// Get the Q vector using TPCtot estimator
145+
/// \param collision is the collision
146+
/// \return Q vector of the collision
147+
template <HasQvecTPCtot TCollision>
148+
std::array<float, 3> getQvec(const TCollision& collision)
149+
{
150+
return std::array<float, 3>{collision.qvecBTotRe(), collision.qvecBTotIm(), collision.nTrkBTot()};
151+
}
152+
153+
/// Get the Q vector choosing your favourite estimator
154+
/// \param collision is the collision with the Q vector information
155+
/// \param qvecEst is the chosen Q-vector estimator
156+
template <typename TCollision>
157+
std::array<float, 3> getQvec(TCollision const& collision, const int qvecEst)
158+
{
159+
switch (qvecEst) {
160+
case QvecEstimator::FV0A:
161+
if constexpr (HasQvecFV0A<TCollision>) {
162+
return std::array<float, 3>{collision.qvecFV0ARe(), collision.qvecFV0AIm(), collision.sumAmplFV0A()};
163+
}
164+
break;
165+
case QvecEstimator::FT0A:
166+
if constexpr (HasQvecFT0A<TCollision>) {
167+
return std::array<float, 3>{collision.qvecFT0ARe(), collision.qvecFT0AIm(), collision.sumAmplFT0A()};
168+
}
169+
break;
170+
case QvecEstimator::FT0C:
171+
if constexpr (HasQvecFT0C<TCollision>) {
172+
return std::array<float, 3>{collision.qvecFT0CRe(), collision.qvecFT0CIm(), collision.sumAmplFT0C()};
173+
}
174+
break;
175+
case QvecEstimator::FT0M:
176+
if constexpr (HasQvecFT0M<TCollision>) {
177+
return std::array<float, 3>{collision.qvecFT0MRe(), collision.qvecFT0MIm(), collision.sumAmplFT0M()};
178+
}
179+
break;
180+
case QvecEstimator::TPCPos:
181+
if constexpr (HasQvecTPCpos<TCollision>) {
182+
return std::array<float, 3>{collision.qvecBPosRe(), collision.qvecBPosIm(), static_cast<float>(collision.nTrkBPos())};
183+
}
184+
break;
185+
case QvecEstimator::TPCNeg:
186+
if constexpr (HasQvecTPCneg<TCollision>) {
187+
return std::array<float, 3>{collision.qvecBNegRe(), collision.qvecBNegIm(), static_cast<float>(collision.nTrkBNeg())};
188+
}
189+
break;
190+
case QvecEstimator::TPCTot:
191+
if constexpr (HasQvecTPCtot<TCollision>) {
192+
return std::array<float, 3>{collision.qvecBTotRe(), collision.qvecBTotIm(), static_cast<float>(collision.nTrkBTot())};
193+
}
194+
break;
195+
default:
196+
LOGP(fatal, "Q-vector estimator not valid. Please choose between FV0A, FT0M, FT0A, FT0C, TPCPos, TPCNeg, TPCTot");
197+
break;
200198
}
199+
return std::array<float, 3>{-999.f, -999.f, -999.f};
200+
}
201201
} // namespace hf_flow_utils
202202
} // namespace o2::analysis
203203

‎PWGHF/Utils/utilsEvSelHf.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,7 @@ struct HfEventSelection : o2::framework::ConfigurableGroup {
254254

255255
/// \brief Inits the HF event selection object
256256
/// \param registry reference to the histogram registry
257-
template<typename T>
257+
template <typename T>
258258
void init(o2::framework::HistogramRegistry& registry, T& zorroSummary)
259259
{
260260
// we initialise the RCT checker

0 commit comments

Comments
 (0)