@@ -105,8 +105,7 @@ static constexpr std::array<const char*, eEventHistograms_N> EventHistNames = {
105105 " VertexX" ,
106106 " VertexY" ,
107107 " VertexZ" ,
108- " NumContrib"
109- };
108+ " NumContrib" };
110109
111110enum EnParticleHistograms {
112111 ePt,
@@ -116,8 +115,7 @@ enum EnParticleHistograms {
116115
117116static constexpr std::array<const char *, eParticleHistograms_N> ParticleHistNames = {
118117 " Pt" ,
119- " Phi"
120- };
118+ " Phi" };
121119
122120enum EnQAHistograms {
123121 eQACent,
@@ -133,8 +131,7 @@ enum EnCorrHistograms {
133131
134132static constexpr std::array<const char *, eCorrHistograms_N> CorrHistNames = {
135133 " Centrality" ,
136- " Multiplicity"
137- };
134+ " Multiplicity" };
138135
139136enum EnCentEstm {
140137 eCentFT0C,
@@ -146,8 +143,7 @@ enum EnCentEstm {
146143static constexpr std::array<const char *, eCentEstm_N> CentEstmNames = {
147144 " FT0C" ,
148145 " FT0M" ,
149- " FV0A"
150- };
146+ " FV0A" };
151147
152148enum EnMultEstm {
153149 eMultFT0C,
@@ -159,8 +155,7 @@ enum EnMultEstm {
159155static constexpr std::array<const char *, eMultEstm_N> MultEstmNames = {
160156 " FT0C" ,
161157 " FT0M" ,
162- " FV0A"
163- };
158+ " FV0A" };
164159
165160enum EnEstmCorr {
166161 eFT0CFT0M,
@@ -184,8 +179,7 @@ static constexpr std::array<const char*, eBeforeAfter_N * 2> BeforeAfterNames =
184179 " before" ,
185180 " after" ,
186181 " Before" ,
187- " After"
188- };
182+ " After" };
189183
190184static constexpr int NumHarmonics = 3 ;
191185
@@ -341,7 +335,7 @@ struct MultiparticleCumulants { // this name is used in lower-case format to nam
341335 struct CorrHistograms {
342336 TList* fCorrHistogramsList = nullptr ;
343337 std::array<std::array<std::array<std::array<TH2F *, eBeforeAfter_N>, eMultEstm_N>, eMultEstm_N>, eCorrHistograms_N> fCorrHistograms {}; // [mult/cent][type][type][before/after cut]
344- std::array<std::array<TF1 *, 2 >, eCorrHistograms_N + 2 > fCorrBounds {}; // [cent/multAB/multAC/multBC][upper/lower]
338+ std::array<std::array<TF1 *, 2 >, eCorrHistograms_N + 2 > fCorrBounds {}; // [cent/multAB/multAC/multBC][upper/lower]
345339 } cr;
346340
347341 struct WeightHistograms {
@@ -386,7 +380,7 @@ struct MultiparticleCumulants { // this name is used in lower-case format to nam
386380 std::map<int , TList*> fMultiparticleCorrelationByRunMap ;
387381 std::array<TProfile*, eBeforeAfter_N> fTwoParticleCorrelationProfiles {}; // [cut]
388382 std::array<TProfile*, eBeforeAfter_N> fFourParticleCorrelationProfiles {};
389- std::array<std::array<std::array<TH1D *, NumHarmonics>, eBeforeAfter_N>, eBeforeAfter_N> fTwoParticleCorrelationHistograms {}; // [cut][event weight][n]
383+ std::array<std::array<std::array<TH1D *, NumHarmonics>, eBeforeAfter_N>, eBeforeAfter_N> fTwoParticleCorrelationHistograms {}; // [cut][event weight][n]
390384 std::array<std::array<std::array<TH1D *, NumHarmonics>, eBeforeAfter_N>, eBeforeAfter_N> fFourParticleCorrelationHistograms {};
391385 std::array<TH1D *, NumHarmonics> fTwoParticleCorrelationGapHistograms {};
392386 } mc;
@@ -402,7 +396,7 @@ struct MultiparticleCumulants { // this name is used in lower-case format to nam
402396 std::array<std::array<float , NumHarmonics>, eBeforeAfter_N> fTwoParticleCorrelationEbye {}; // <2> [before, after][v2^2, v3^2, v4^2]
403397 std::array<std::array<float , NumHarmonics>, eBeforeAfter_N> fTwoParticleCorrelationMinEbye {};
404398 std::array<std::array<float , NumHarmonics>, eBeforeAfter_N> fTwoParticleCorrelationMaxEbye {};
405- std::array<std::array<float , NumHarmonics>, eBeforeAfter_N> fFourParticleCorrelationEbye {}; // <4> [before, after][v2^4, v3^2 v2^2, v4^2 v2^2]
399+ std::array<std::array<float , NumHarmonics>, eBeforeAfter_N> fFourParticleCorrelationEbye {}; // <4> [before, after][v2^4, v3^2 v2^2, v4^2 v2^2]
406400 std::array<std::array<float , NumHarmonics>, eBeforeAfter_N> fFourParticleCorrelationMinEbye {};
407401 std::array<std::array<float , NumHarmonics>, eBeforeAfter_N> fFourParticleCorrelationMaxEbye {};
408402 } ebye;
@@ -941,9 +935,9 @@ struct MultiparticleCumulants { // this name is used in lower-case format to nam
941935 mc.fFourParticleCorrelationProfiles [i] = nullptr ;
942936
943937 for (int j = 0 ; j < eBeforeAfter_N; j++) { // before/after weight
944- mc.fTwoParticleCorrelationHistograms [i][j].fill (nullptr );
945- mc.fFourParticleCorrelationHistograms [i][j].fill (nullptr );
946- }
938+ mc.fTwoParticleCorrelationHistograms [i][j].fill (nullptr );
939+ mc.fFourParticleCorrelationHistograms [i][j].fill (nullptr );
940+ }
947941 }
948942
949943 for (int i = 0 ; i < eBeforeAfter_N; i++) { // before/after cut
@@ -1395,7 +1389,6 @@ struct MultiparticleCumulants { // this name is used in lower-case format to nam
13951389 // if(mccTwo(0, 0, eBefore, 0).Re() < 0. || wTwoRecursionBefore < 0. || diff > 0.01) {
13961390 // LOGF(warning, "Compare <2>: cent=%f, n=%d, direct=%e, recursion=%e, diff=%e, denDirect=%e, denRec=%e", rlCollisionCent, mcc.h2, direct, recur, diff, mccTwo(0, 0, eBefore, 0).Re(), wTwoRecursionBefore);
13971391 // }
1398-
13991392 }
14001393
14011394 for (int i = 0 ; i < NumHarmonics; i++) {
@@ -1593,11 +1586,11 @@ struct MultiparticleCumulants { // this name is used in lower-case format to nam
15931586 cr.fCorrBounds [histType][0 ]->SetTitle (Form (" %s upper bound" , CorrHistNames[histType]));
15941587 cr.fCorrBounds [histType][1 ]->SetTitle (Form (" %s lower bound" , CorrHistNames[histType]));
15951588 } else if constexpr (histType == eCorrMult) {
1596- for (int i = 0 ; i < eEstmCorr_N; i++) {
1597- cr.fCorrBounds [histType + i][0 ] = new TF1 (Form (" fCorrUpperBound%s%s" , EstmCorrName[i], CorrHistNames[histType]), " [0] * x + [1]" );
1598- cr.fCorrBounds [histType + i][1 ] = new TF1 (Form (" fCorrLowerBound%s%s" , EstmCorrName[i], CorrHistNames[histType]), " [0] * x + [1]" );
1599- cr.fCorrBounds [histType + i][0 ]->SetTitle (Form (" %s %s upper bound" , EstmCorrName[i], CorrHistNames[histType]));
1600- cr.fCorrBounds [histType + i][1 ]->SetTitle (Form (" %s %s lower bound" , EstmCorrName[i], CorrHistNames[histType]));
1589+ for (int i = 0 ; i < eEstmCorr_N; i++) {
1590+ cr.fCorrBounds [histType + i][0 ] = new TF1 (Form (" fCorrUpperBound%s%s" , EstmCorrName[i], CorrHistNames[histType]), " [0] * x + [1]" );
1591+ cr.fCorrBounds [histType + i][1 ] = new TF1 (Form (" fCorrLowerBound%s%s" , EstmCorrName[i], CorrHistNames[histType]), " [0] * x + [1]" );
1592+ cr.fCorrBounds [histType + i][0 ]->SetTitle (Form (" %s %s upper bound" , EstmCorrName[i], CorrHistNames[histType]));
1593+ cr.fCorrBounds [histType + i][1 ]->SetTitle (Form (" %s %s lower bound" , EstmCorrName[i], CorrHistNames[histType]));
16011594 }
16021595 }
16031596
0 commit comments