Skip to content

Commit ba963a6

Browse files
author
Emil Gorm Nielsen
committed
Clang-format
1 parent 5bd6aaf commit ba963a6

2 files changed

Lines changed: 15 additions & 16 deletions

File tree

PWGCF/GenericFramework/Core/GFWConfig.h

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -48,22 +48,21 @@ class GFWBinningCuts
4848
{
4949
public:
5050
GFWBinningCuts(int vtxzbins_ = 40, float vtxzmin_ = -10., float vtxzmax_ = 10, int etabins_ = 16, float etamin_ = -0.8, float etamax_ = 0.8,
51-
int phibins_ = 72, int nchbins_ = 300, float nchmin_ = 0.5, float nchmax_ = 3000.5,
52-
float ptpoimin_ = 0.2, float ptpoimax_ = 10., float ptrefmin_ = 0.2, float ptrefmax_ = 3.,
53-
std::vector<double> ptbinning_ = {0.2, 0.25, 0.3, 0.35, 0.4, 0.45, 0.5, 0.55,
54-
0.6, 0.65, 0.7, 0.75, 0.8, 0.85, 0.9, 0.95,
55-
1, 1.1, 1.2, 1.3, 1.4, 1.5, 1.6, 1.7, 1.8, 1.9,
56-
2, 2.2, 2.4, 2.6, 2.8, 3, 3.5, 4, 5, 6, 8, 10},
57-
std::vector<double> centbinning_ = {0.0, 1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0, 19.0, 20.0,
58-
21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0, 28.0, 29.0, 30.0, 31.0, 32.0, 33.0, 34.0, 35.0, 36.0, 37.0, 38.0, 39.0,
59-
40.0, 41.0, 42.0, 43.0, 44.0, 45.0, 46.0, 47.0, 48.0, 49.0, 50.0, 51.0, 52.0, 53.0, 54.0, 55.0, 56.0, 57.0, 58.0, 59.0,
60-
60.0, 61.0, 62.0, 63.0, 64.0, 65.0, 66.0, 67.0, 68.0, 69.0, 70.0, 71.0, 72.0, 73.0, 74.0, 75.0, 76.0, 77.0, 78.0, 79.0,
61-
80.0, 81.0, 82.0, 83.0, 84.0, 85.0, 86.0, 87.0, 88.0, 89.0, 90.0}) :
62-
mVtxZbins{vtxzbins_}, mVtxZmin{vtxzmin_}, mVtxZmax{vtxzmax_}, mEtabins{etabins_}, mEtamin{etamin_}, mEtamax{etamax_}, mPhibins{phibins_}, mNchbins{nchbins_}, mNchmin{nchmin_}, mNchmax{nchmax_}, mPTpoimin{ptpoimin_}, mPTpoimax{ptpoimax_}, mPTrefmin{ptrefmin_}, mPTrefmax{ptrefmax_}, mPTbinning{std::move(ptbinning_)}, mCentbinning{std::move(centbinning_)} {};
51+
int phibins_ = 72, int nchbins_ = 300, float nchmin_ = 0.5, float nchmax_ = 3000.5,
52+
float ptpoimin_ = 0.2, float ptpoimax_ = 10., float ptrefmin_ = 0.2, float ptrefmax_ = 3.,
53+
std::vector<double> ptbinning_ = {0.2, 0.25, 0.3, 0.35, 0.4, 0.45, 0.5, 0.55,
54+
0.6, 0.65, 0.7, 0.75, 0.8, 0.85, 0.9, 0.95,
55+
1, 1.1, 1.2, 1.3, 1.4, 1.5, 1.6, 1.7, 1.8, 1.9,
56+
2, 2.2, 2.4, 2.6, 2.8, 3, 3.5, 4, 5, 6, 8, 10},
57+
std::vector<double> centbinning_ = {0.0, 1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0, 19.0, 20.0,
58+
21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0, 28.0, 29.0, 30.0, 31.0, 32.0, 33.0, 34.0, 35.0, 36.0, 37.0, 38.0, 39.0,
59+
40.0, 41.0, 42.0, 43.0, 44.0, 45.0, 46.0, 47.0, 48.0, 49.0, 50.0, 51.0, 52.0, 53.0, 54.0, 55.0, 56.0, 57.0, 58.0, 59.0,
60+
60.0, 61.0, 62.0, 63.0, 64.0, 65.0, 66.0, 67.0, 68.0, 69.0, 70.0, 71.0, 72.0, 73.0, 74.0, 75.0, 76.0, 77.0, 78.0, 79.0,
61+
80.0, 81.0, 82.0, 83.0, 84.0, 85.0, 86.0, 87.0, 88.0, 89.0, 90.0}) : mVtxZbins{vtxzbins_}, mVtxZmin{vtxzmin_}, mVtxZmax{vtxzmax_}, mEtabins{etabins_}, mEtamin{etamin_}, mEtamax{etamax_}, mPhibins{phibins_}, mNchbins{nchbins_}, mNchmin{nchmin_}, mNchmax{nchmax_}, mPTpoimin{ptpoimin_}, mPTpoimax{ptpoimax_}, mPTrefmin{ptrefmin_}, mPTrefmax{ptrefmax_}, mPTbinning{std::move(ptbinning_)}, mCentbinning{std::move(centbinning_)} {};
6362

6463
auto Print() const
6564
{
66-
LOGF(info,"Vz: %d, %.1f, %.1f | Eta: %d, %.1f, %.1f | Phi: %d | Pt POI: %.2f, %.2f | Pt Ref: %.2f, %.2f | Nch: %d, %.1f, %.1f",mVtxZbins,mVtxZmin,mVtxZmax,mEtabins,mEtamin,mEtamax,mPhibins,mPTpoimin,mPTpoimax,mPTrefmin,mPTrefmax,mNchbins,mNchmin,mNchmax);
65+
LOGF(info, "Vz: %d, %.1f, %.1f | Eta: %d, %.1f, %.1f | Phi: %d | Pt POI: %.2f, %.2f | Pt Ref: %.2f, %.2f | Nch: %d, %.1f, %.1f", mVtxZbins, mVtxZmin, mVtxZmax, mEtabins, mEtamin, mEtamax, mPhibins, mPTpoimin, mPTpoimax, mPTrefmin, mPTrefmax, mNchbins, mNchmin, mNchmax);
6766
return;
6867
}
6968

@@ -160,7 +159,7 @@ class GFWRegions
160159
auto Print() const
161160
{
162161
for (auto i = 0; i < names.size(); ++i) {
163-
LOGF(info,"{%s, %.1f, %.1f, %d, %d}",names[i].c_str(),etaminvals[i],etamaxvals[i],pTDifs[i],bitmasks[i]);
162+
LOGF(info, "{%s, %.1f, %.1f, %d, %d}", names[i].c_str(), etaminvals[i], etamaxvals[i], pTDifs[i], bitmasks[i]);
164163
}
165164
return;
166165
}
@@ -205,7 +204,7 @@ class GFWCorrConfigs
205204
auto Print() const
206205
{
207206
for (auto i = 0; i < corrs.size(); ++i) {
208-
LOGF(info,"{%s,%s,%d,%d}",heads[i].c_str(),corrs[i].c_str(),pTDifs[i],pTCorrMasks[i]);
207+
LOGF(info, "{%s,%s,%d,%d}", heads[i].c_str(), corrs[i].c_str(), pTDifs[i], pTCorrMasks[i]);
209208
}
210209
return;
211210
}

PWGCF/GenericFramework/Tasks/flowGenericFramework.cxx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ struct GenericFramework {
8686
O2_DEFINE_CONFIGURABLE(cfgPtmin, float, 0.2, "minimum pt");
8787
O2_DEFINE_CONFIGURABLE(cfgPtmax, float, 10, "maximum pt");
8888

89-
Configurable<GFWBinningCuts> cfgGFWBinning{"cfgGFWBinning",{40, -10.0, 10.0, 16, -0.8, 0.8, 72, 300, 0.5, 3000.5, 0.2, 10.0, 0.2, 3.0, {0.2, 0.25, 0.3, 0.35, 0.4, 0.45, 0.5, 0.55, 0.6, 0.65, 0.7, 0.75, 0.8, 0.85, 0.9, 0.95, 1, 1.1, 1.2, 1.3, 1.4, 1.5, 1.6, 1.7, 1.8, 1.9, 2, 2.2, 2.4, 2.6, 2.8, 3, 3.5, 4, 5, 6, 8, 10}, {0, 5, 10, 20, 30, 40, 50, 60, 70, 80, 90}},"Configuration for binning"};
89+
Configurable<GFWBinningCuts> cfgGFWBinning{"cfgGFWBinning", {40, -10.0, 10.0, 16, -0.8, 0.8, 72, 300, 0.5, 3000.5, 0.2, 10.0, 0.2, 3.0, {0.2, 0.25, 0.3, 0.35, 0.4, 0.45, 0.5, 0.55, 0.6, 0.65, 0.7, 0.75, 0.8, 0.85, 0.9, 0.95, 1, 1.1, 1.2, 1.3, 1.4, 1.5, 1.6, 1.7, 1.8, 1.9, 2, 2.2, 2.4, 2.6, 2.8, 3, 3.5, 4, 5, 6, 8, 10}, {0, 5, 10, 20, 30, 40, 50, 60, 70, 80, 90}}, "Configuration for binning"};
9090
Configurable<GFWRegions> cfgRegions{"cfgRegions", {{"refN", "refP", "refFull"}, {-0.8, 0.4, -0.8}, {-0.4, 0.8, 0.8}, {0, 0, 0}, {1, 1, 1}}, "Configurations for GFW regions"};
9191

9292
Configurable<GFWCorrConfigs> cfgCorrConfig{"cfgCorrConfig", {{"refP {2} refN {-2}", "refP {3} refN {-3}", "refP {4} refN {-4}", "refFull {2 -2}", "refFull {2 2 -2 -2}"}, {"ChGap22", "ChGap32", "ChGap42", "ChFull22", "ChFull24"}, {0, 0, 0, 0, 0}, {15, 1, 1, 0, 0}}, "Configurations for each correlation to calculate"};

0 commit comments

Comments
 (0)