Skip to content

Commit 908f4cc

Browse files
alibuildalibuild
committed
Please consider the following formatting changes
1 parent 021ab6c commit 908f4cc

File tree

5 files changed

+113
-109
lines changed

5 files changed

+113
-109
lines changed

‎PWGCF/GenericFramework/Core/GFW.cxx‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,11 @@
1010
// or submit itself to any jurisdiction.
1111

1212
#include "GFW.h"
13+
1314
#include <cstdio>
14-
#include <utility>
15-
#include <vector>
1615
#include <string>
16+
#include <utility>
17+
#include <vector>
1718

1819
using std::complex;
1920
using std::pair;

‎PWGCF/GenericFramework/Core/GFW.h‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,13 @@
1818

1919
#include "GFWCumulant.h"
2020
#include "GFWPowerArray.h"
21-
#include <vector>
22-
#include <string>
23-
#include <utility>
21+
2422
#include <algorithm>
2523
#include <complex>
2624
#include <cstdio>
25+
#include <string>
26+
#include <utility>
27+
#include <vector>
2728

2829
class GFW
2930
{

‎PWGCF/GenericFramework/Core/GFWCumulant.cxx‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
// or submit itself to any jurisdiction.
1111

1212
#include "GFWCumulant.h"
13+
1314
#include <vector>
1415

1516
using std::complex;

‎PWGCF/GenericFramework/Core/GFWSpace.h‎

Lines changed: 104 additions & 103 deletions
Original file line numberDiff line numberDiff line change
@@ -3,107 +3,108 @@
33
#define PWGCF_GENERICFRAMEWORK_CORE_GFWSpace_H_
44

55
#include "Calculator.h"
6-
namespace GFWSpace {
7-
//Flow observables
8-
Calculator::ObsFunc kV22 = &Calculator::getV22; //v2{2}
9-
Calculator::ObsFunc kV32 = &Calculator::getV32; //v3{2}
10-
Calculator::ObsFunc kV42 = &Calculator::getV42; //v4{2}
11-
12-
Calculator::ObsFunc kV24 = &Calculator::getV24; //v2{4}
13-
Calculator::ObsFunc kV24_3sub = &Calculator::getV24_3sub; //v2{4}_3sub
14-
Calculator::ObsFunc kV2LLMR = &Calculator::getV2LLMR; //v2{LLMR}
15-
Calculator::ObsFunc kV2LMMR = &Calculator::getV2LMMR; //v2{LMMR}
16-
Calculator::ObsFunc kV2LMRR = &Calculator::getV2LMRR; //v2{LMRR}
17-
18-
Calculator::ObsFunc kC22 = &Calculator::getC22; //c2{2}
19-
Calculator::ObsFunc kC32 = &Calculator::getC32; //c3{2}
20-
Calculator::ObsFunc kC42 = &Calculator::getC42; //c4{2}
21-
Calculator::ObsFunc kC24 = &Calculator::getC24; //c2{4}
22-
Calculator::ObsFunc kC24_3sub = &Calculator::getC24_3sub; //v2{4}_3sub
23-
Calculator::ObsFunc kC2LLMR = &Calculator::getC2LLMR; //c2{LLMR}
24-
Calculator::ObsFunc kC2LMMR = &Calculator::getC2LMMR; //c2{LMMR}
25-
Calculator::ObsFunc kC2LMRR = &Calculator::getC2LMRR; //c2{LMRR}
26-
27-
Calculator::ObsFunc k2LR = &Calculator::get2LR;
28-
Calculator::ObsFunc k2LM = &Calculator::get2LM;
29-
Calculator::ObsFunc k2MR = &Calculator::get2MR;
30-
31-
Calculator::ObsFunc k22 = &Calculator::get22; //<2>_{2,-2}
32-
Calculator::ObsFunc k32 = &Calculator::get32; //<2>_{3,-3}
33-
Calculator::ObsFunc k42 = &Calculator::get42; //<2>_{4,-4}
34-
Calculator::ObsFunc k24 = &Calculator::get24; //<4>_{2,2,-2,-2}
35-
36-
//pt-diff flow
37-
Calculator::PtDiffFunc kVPt22 = &Calculator::getVPt22; //pt-diff v2{2}
38-
Calculator::PtDiffFunc kVPt32 = &Calculator::getVPt32; //pt-diff v3{2}
39-
Calculator::PtDiffFunc kVPt42 = &Calculator::getVPt42; //pt-diff v4{2}
40-
Calculator::PtDiffFunc kVPt24 = &Calculator::getVPt24; //pt-diff v2{4}
41-
Calculator::PtDiffFunc kD22 = &Calculator::getD22; //pt-diff v2{2}
42-
Calculator::PtDiffFunc kD32 = &Calculator::getD32; //pt-diff v3{2}
43-
Calculator::PtDiffFunc kD42 = &Calculator::getD42; //pt-diff v4{2}
44-
Calculator::PtDiffFunc kD24 = &Calculator::getD24; //pt-diff v2{4}
45-
46-
Calculator::PtDiffFunc kVPt24_3sub = &Calculator::getVPt24_3sub;
47-
Calculator::PtDiffFunc kD24_3sub = &Calculator::getD24_3sub;
48-
Calculator::PtDiffFunc kD2LpLMR = &Calculator::getD2LpLMR;
49-
Calculator::PtDiffFunc kD2LLMpR = &Calculator::getD2LLMpR;
50-
Calculator::PtDiffFunc kD2LLMRp = &Calculator::getD2LLMRp;
51-
Calculator::PtDiffFunc kD2LpMMR = &Calculator::getD2LpMMR;
52-
Calculator::PtDiffFunc kD2LMpMR = &Calculator::getD2LMpMR;
53-
Calculator::PtDiffFunc kD2LMMRp = &Calculator::getD2LMMRp;
54-
Calculator::PtDiffFunc kD2LpMRR = &Calculator::getD2LpMRR;
55-
Calculator::PtDiffFunc kD2LMpRR = &Calculator::getD2LMpRR;
56-
Calculator::PtDiffFunc kD2LMRpR = &Calculator::getD2LMRpR;
57-
58-
Calculator::PtDiffFunc k2LpLMR = &Calculator::get2LpLMR;
59-
Calculator::PtDiffFunc k2LLMpR = &Calculator::get2LLMpR;
60-
Calculator::PtDiffFunc k2LLMRp = &Calculator::get2LLMRp;
61-
Calculator::PtDiffFunc k2LpMMR = &Calculator::get2LpMMR;
62-
Calculator::PtDiffFunc k2LMpMR = &Calculator::get2LMpMR;
63-
Calculator::PtDiffFunc k2LMMRp = &Calculator::get2LMMRp;
64-
Calculator::PtDiffFunc k2LpMRR = &Calculator::get2LpMRR;
65-
Calculator::PtDiffFunc k2LMpRR = &Calculator::get2LMpRR;
66-
Calculator::PtDiffFunc k2LMRpR = &Calculator::get2LMRpR;
67-
68-
Calculator::PtDiffFunc k2LRp = &Calculator::get2LRp;
69-
Calculator::PtDiffFunc k2LpR = &Calculator::get2LpR;
70-
Calculator::PtDiffFunc k2LpM = &Calculator::get2LpM;
71-
Calculator::PtDiffFunc k2LMp = &Calculator::get2LMp;
72-
Calculator::PtDiffFunc k2MpR = &Calculator::get2MpR;
73-
Calculator::PtDiffFunc k2MRp = &Calculator::get2MRp;
74-
75-
Calculator::ObsFunc kVarV22 = &Calculator::getVarV22; //Var(v_2^2)
76-
77-
//Transverse momentum observables
78-
Calculator::ObsFunc kMpt = &Calculator::getMpt; //[pt]
79-
Calculator::ObsFunc kMpt2 = &Calculator::getMpt2; //2nd moment of [pt]
80-
Calculator::ObsFunc kMpt3 = &Calculator::getMpt3; //3rd moment of [pt]
81-
Calculator::ObsFunc kMpt4 = &Calculator::getMpt4; //4th moment of [pt]
82-
Calculator::ObsFunc kK2 = &Calculator::getK2; //2nd order [pt] cumulant
83-
Calculator::ObsFunc kK3 = &Calculator::getK3; //3rd order [pt] cumulant
84-
Calculator::ObsFunc kK4 = &Calculator::getK4; //4th order [pt] cumulant
85-
Calculator::ObsFunc kMu2 = &Calculator::getMu2; //2nd order central [pt] moment (also known as ck)
86-
Calculator::ObsFunc kMu3 = &Calculator::getMu3; //3rd order central [pt] moment
87-
Calculator::ObsFunc kMu4 = &Calculator::getMu4; //4th order central [pt] moment
88-
89-
Calculator::ObsFunc kK2Norm = &Calculator::getK2Norm; //normalised [pt] variance
90-
Calculator::ObsFunc kStdSkew = &Calculator::getStdSkew; //standardized [pt] skewness
91-
Calculator::ObsFunc kIntSkew = &Calculator::getIntSkew; //intensive [pt] skewness
92-
Calculator::ObsFunc kExKur = &Calculator::getExKur; //Excess [pt] kurtosis
93-
94-
//Flow-transverse momentum observables
95-
Calculator::ObsFunc kCV22pt = &Calculator::getCV22pt; //v2^2-dpt cumulant
96-
Calculator::ObsFunc kCV32pt = &Calculator::getCV32pt; //v3^2-dpt cumulant
97-
Calculator::ObsFunc kCV42pt = &Calculator::getCV42pt; //v4^2-dpt cumulant
98-
Calculator::ObsFunc kCV22pt2 = &Calculator::getCV22pt2; //v2^2-dpt^2 cumulant
99-
Calculator::ObsFunc kCV22pt3 = &Calculator::getCV22pt3; //v2^2-dpt^3 cumulant
100-
Calculator::ObsFunc kCV22pt4 = &Calculator::getCV22pt4; //v2^2-dpt^4 cumulant
101-
Calculator::ObsFunc kCV24pt = &Calculator::getCV24pt; //v2^4-dpt cumulant
102-
Calculator::ObsFunc kCV24pt2 = &Calculator::getCV24pt2; //v2^4-dpt^2 cumulant
103-
104-
Calculator::ObsFunc kRhoV22pt = &Calculator::getRhoV22pt; //ρ(v2^2,dpt)
105-
Calculator::ObsFunc kRhoV32pt = &Calculator::getRhoV32pt; //ρ(v3^2,dpt)
106-
Calculator::ObsFunc kRhoV42pt = &Calculator::getRhoV42pt; //ρ(v4^2,dpt)
107-
108-
}
6+
namespace GFWSpace
7+
{
8+
// Flow observables
9+
Calculator::ObsFunc kV22 = &Calculator::getV22; // v2{2}
10+
Calculator::ObsFunc kV32 = &Calculator::getV32; // v3{2}
11+
Calculator::ObsFunc kV42 = &Calculator::getV42; // v4{2}
12+
13+
Calculator::ObsFunc kV24 = &Calculator::getV24; // v2{4}
14+
Calculator::ObsFunc kV24_3sub = &Calculator::getV24_3sub; // v2{4}_3sub
15+
Calculator::ObsFunc kV2LLMR = &Calculator::getV2LLMR; // v2{LLMR}
16+
Calculator::ObsFunc kV2LMMR = &Calculator::getV2LMMR; // v2{LMMR}
17+
Calculator::ObsFunc kV2LMRR = &Calculator::getV2LMRR; // v2{LMRR}
18+
19+
Calculator::ObsFunc kC22 = &Calculator::getC22; // c2{2}
20+
Calculator::ObsFunc kC32 = &Calculator::getC32; // c3{2}
21+
Calculator::ObsFunc kC42 = &Calculator::getC42; // c4{2}
22+
Calculator::ObsFunc kC24 = &Calculator::getC24; // c2{4}
23+
Calculator::ObsFunc kC24_3sub = &Calculator::getC24_3sub; // v2{4}_3sub
24+
Calculator::ObsFunc kC2LLMR = &Calculator::getC2LLMR; // c2{LLMR}
25+
Calculator::ObsFunc kC2LMMR = &Calculator::getC2LMMR; // c2{LMMR}
26+
Calculator::ObsFunc kC2LMRR = &Calculator::getC2LMRR; // c2{LMRR}
27+
28+
Calculator::ObsFunc k2LR = &Calculator::get2LR;
29+
Calculator::ObsFunc k2LM = &Calculator::get2LM;
30+
Calculator::ObsFunc k2MR = &Calculator::get2MR;
31+
32+
Calculator::ObsFunc k22 = &Calculator::get22; //<2>_{2,-2}
33+
Calculator::ObsFunc k32 = &Calculator::get32; //<2>_{3,-3}
34+
Calculator::ObsFunc k42 = &Calculator::get42; //<2>_{4,-4}
35+
Calculator::ObsFunc k24 = &Calculator::get24; //<4>_{2,2,-2,-2}
36+
37+
// pt-diff flow
38+
Calculator::PtDiffFunc kVPt22 = &Calculator::getVPt22; // pt-diff v2{2}
39+
Calculator::PtDiffFunc kVPt32 = &Calculator::getVPt32; // pt-diff v3{2}
40+
Calculator::PtDiffFunc kVPt42 = &Calculator::getVPt42; // pt-diff v4{2}
41+
Calculator::PtDiffFunc kVPt24 = &Calculator::getVPt24; // pt-diff v2{4}
42+
Calculator::PtDiffFunc kD22 = &Calculator::getD22; // pt-diff v2{2}
43+
Calculator::PtDiffFunc kD32 = &Calculator::getD32; // pt-diff v3{2}
44+
Calculator::PtDiffFunc kD42 = &Calculator::getD42; // pt-diff v4{2}
45+
Calculator::PtDiffFunc kD24 = &Calculator::getD24; // pt-diff v2{4}
46+
47+
Calculator::PtDiffFunc kVPt24_3sub = &Calculator::getVPt24_3sub;
48+
Calculator::PtDiffFunc kD24_3sub = &Calculator::getD24_3sub;
49+
Calculator::PtDiffFunc kD2LpLMR = &Calculator::getD2LpLMR;
50+
Calculator::PtDiffFunc kD2LLMpR = &Calculator::getD2LLMpR;
51+
Calculator::PtDiffFunc kD2LLMRp = &Calculator::getD2LLMRp;
52+
Calculator::PtDiffFunc kD2LpMMR = &Calculator::getD2LpMMR;
53+
Calculator::PtDiffFunc kD2LMpMR = &Calculator::getD2LMpMR;
54+
Calculator::PtDiffFunc kD2LMMRp = &Calculator::getD2LMMRp;
55+
Calculator::PtDiffFunc kD2LpMRR = &Calculator::getD2LpMRR;
56+
Calculator::PtDiffFunc kD2LMpRR = &Calculator::getD2LMpRR;
57+
Calculator::PtDiffFunc kD2LMRpR = &Calculator::getD2LMRpR;
58+
59+
Calculator::PtDiffFunc k2LpLMR = &Calculator::get2LpLMR;
60+
Calculator::PtDiffFunc k2LLMpR = &Calculator::get2LLMpR;
61+
Calculator::PtDiffFunc k2LLMRp = &Calculator::get2LLMRp;
62+
Calculator::PtDiffFunc k2LpMMR = &Calculator::get2LpMMR;
63+
Calculator::PtDiffFunc k2LMpMR = &Calculator::get2LMpMR;
64+
Calculator::PtDiffFunc k2LMMRp = &Calculator::get2LMMRp;
65+
Calculator::PtDiffFunc k2LpMRR = &Calculator::get2LpMRR;
66+
Calculator::PtDiffFunc k2LMpRR = &Calculator::get2LMpRR;
67+
Calculator::PtDiffFunc k2LMRpR = &Calculator::get2LMRpR;
68+
69+
Calculator::PtDiffFunc k2LRp = &Calculator::get2LRp;
70+
Calculator::PtDiffFunc k2LpR = &Calculator::get2LpR;
71+
Calculator::PtDiffFunc k2LpM = &Calculator::get2LpM;
72+
Calculator::PtDiffFunc k2LMp = &Calculator::get2LMp;
73+
Calculator::PtDiffFunc k2MpR = &Calculator::get2MpR;
74+
Calculator::PtDiffFunc k2MRp = &Calculator::get2MRp;
75+
76+
Calculator::ObsFunc kVarV22 = &Calculator::getVarV22; // Var(v_2^2)
77+
78+
// Transverse momentum observables
79+
Calculator::ObsFunc kMpt = &Calculator::getMpt; //[pt]
80+
Calculator::ObsFunc kMpt2 = &Calculator::getMpt2; // 2nd moment of [pt]
81+
Calculator::ObsFunc kMpt3 = &Calculator::getMpt3; // 3rd moment of [pt]
82+
Calculator::ObsFunc kMpt4 = &Calculator::getMpt4; // 4th moment of [pt]
83+
Calculator::ObsFunc kK2 = &Calculator::getK2; // 2nd order [pt] cumulant
84+
Calculator::ObsFunc kK3 = &Calculator::getK3; // 3rd order [pt] cumulant
85+
Calculator::ObsFunc kK4 = &Calculator::getK4; // 4th order [pt] cumulant
86+
Calculator::ObsFunc kMu2 = &Calculator::getMu2; // 2nd order central [pt] moment (also known as ck)
87+
Calculator::ObsFunc kMu3 = &Calculator::getMu3; // 3rd order central [pt] moment
88+
Calculator::ObsFunc kMu4 = &Calculator::getMu4; // 4th order central [pt] moment
89+
90+
Calculator::ObsFunc kK2Norm = &Calculator::getK2Norm; // normalised [pt] variance
91+
Calculator::ObsFunc kStdSkew = &Calculator::getStdSkew; // standardized [pt] skewness
92+
Calculator::ObsFunc kIntSkew = &Calculator::getIntSkew; // intensive [pt] skewness
93+
Calculator::ObsFunc kExKur = &Calculator::getExKur; // Excess [pt] kurtosis
94+
95+
// Flow-transverse momentum observables
96+
Calculator::ObsFunc kCV22pt = &Calculator::getCV22pt; // v2^2-dpt cumulant
97+
Calculator::ObsFunc kCV32pt = &Calculator::getCV32pt; // v3^2-dpt cumulant
98+
Calculator::ObsFunc kCV42pt = &Calculator::getCV42pt; // v4^2-dpt cumulant
99+
Calculator::ObsFunc kCV22pt2 = &Calculator::getCV22pt2; // v2^2-dpt^2 cumulant
100+
Calculator::ObsFunc kCV22pt3 = &Calculator::getCV22pt3; // v2^2-dpt^3 cumulant
101+
Calculator::ObsFunc kCV22pt4 = &Calculator::getCV22pt4; // v2^2-dpt^4 cumulant
102+
Calculator::ObsFunc kCV24pt = &Calculator::getCV24pt; // v2^4-dpt cumulant
103+
Calculator::ObsFunc kCV24pt2 = &Calculator::getCV24pt2; // v2^4-dpt^2 cumulant
104+
105+
Calculator::ObsFunc kRhoV22pt = &Calculator::getRhoV22pt; // ρ(v2^2,dpt)
106+
Calculator::ObsFunc kRhoV32pt = &Calculator::getRhoV32pt; // ρ(v3^2,dpt)
107+
Calculator::ObsFunc kRhoV42pt = &Calculator::getRhoV42pt; // ρ(v4^2,dpt)
108+
109+
} // namespace GFWSpace
109110
#endif

‎PWGCF/GenericFramework/Tasks/flowGenericFramework.cxx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -299,7 +299,7 @@ struct FlowGenericFramework {
299299
registry.add("MCGen/before/pt_gen", "", {HistType::kTH1D, {ptAxis}});
300300
registry.add("MCGen/before/phi_eta_vtxZ_gen", "", {HistType::kTH3D, {phiAxis, etaAxis, vtxAxis}});
301301
registry.addClone("MCGen/before/", "MCGen/after/");
302-
if (doprocessOnTheFly)
302+
if (doprocessOnTheFly)
303303
registry.add("MCGen/impactParameter", "", {HistType::kTH2D, {{bAxis, nchAxis}}});
304304
}
305305
if (doprocessMCReco || doprocessData || doprocessRun2) {

0 commit comments

Comments
 (0)