Skip to content

Commit ddb5a5b

Browse files
cnkostercnkoster
authored
Merge pull request #68 from alibuild/alibot-cleanup-12000
[PWGCF] Please consider the following formatting changes to #12000
2 parents 56e2391 + 2603cd0 commit ddb5a5b

File tree

2 files changed

+40
-41
lines changed

2 files changed

+40
-41
lines changed

‎PWGCF/Flow/TableProducer/zdcQVectors.cxx‎

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -257,19 +257,19 @@ struct ZdcQVectors {
257257
registry.add<TH2>("QA/before/ZNC_Qx_vs_Centrality", "ZNC_Qx_vs_Centrality", kTH2D, {{100, 0, 100}, {200, -2, 2}});
258258
registry.add<TH2>("QA/before/ZNC_Qy_vs_Centrality", "ZNC_Qy_vs_Centrality", kTH2D, {{100, 0, 100}, {200, -2, 2}});
259259

260-
registry.add<TH2>("QA/before/ZNA_pmC_vs_Centrality", "ZNA_pmC_vs_Centrality", kTH2D, {{100,0,100}, {300, 0, 300}});
261-
registry.add<TH2>("QA/before/ZNA_pmSUM_vs_Centrality", "ZNA_pmSUM_vs_Centrality", kTH2D, {{100,0,100}, {300, 0, 300}});
262-
registry.add<TH2>("QA/before/ZNA_pm1_vs_Centrality", "ZNA_pm1_vs_Centrality", kTH2D, {{100,0,100}, {100,0,1}});
263-
registry.add<TH2>("QA/before/ZNA_pm2_vs_Centrality", "ZNA_pm2_vs_Centrality", kTH2D, {{100,0,100}, {100,0,1}});
264-
registry.add<TH2>("QA/before/ZNA_pm3_vs_Centrality", "ZNA_pm3_vs_Centrality", kTH2D, {{100,0,100}, {100,0,1}});
265-
registry.add<TH2>("QA/before/ZNA_pm4_vs_Centrality", "ZNA_pm4_vs_Centrality", kTH2D, {{100,0,100}, {100,0,1}});
266-
267-
registry.add<TH2>("QA/before/ZNC_pmC_vs_Centrality", "ZNC_pmC_vs_Centrality", kTH2D, {{100,0,100}, {300, 0, 300}});
268-
registry.add<TH2>("QA/before/ZNC_pmSUM_vs_Centrality", "ZNC_pmSUM_vs_Centrality", kTH2D, {{100,0,100}, {300, 0, 300}});
269-
registry.add<TH2>("QA/before/ZNC_pm1_vs_Centrality", "ZNC_pm1_vs_Centrality", kTH2D, {{100,0,100}, {100,0,1}});
270-
registry.add<TH2>("QA/before/ZNC_pm2_vs_Centrality", "ZNC_pm2_vs_Centrality", kTH2D, {{100,0,100}, {100,0,1}});
271-
registry.add<TH2>("QA/before/ZNC_pm3_vs_Centrality", "ZNC_pm3_vs_Centrality", kTH2D, {{100,0,100}, {100,0,1}});
272-
registry.add<TH2>("QA/before/ZNC_pm4_vs_Centrality", "ZNC_pm4_vs_Centrality", kTH2D, {{100,0,100}, {100,0,1}});
260+
registry.add<TH2>("QA/before/ZNA_pmC_vs_Centrality", "ZNA_pmC_vs_Centrality", kTH2D, {{100, 0, 100}, {300, 0, 300}});
261+
registry.add<TH2>("QA/before/ZNA_pmSUM_vs_Centrality", "ZNA_pmSUM_vs_Centrality", kTH2D, {{100, 0, 100}, {300, 0, 300}});
262+
registry.add<TH2>("QA/before/ZNA_pm1_vs_Centrality", "ZNA_pm1_vs_Centrality", kTH2D, {{100, 0, 100}, {100, 0, 1}});
263+
registry.add<TH2>("QA/before/ZNA_pm2_vs_Centrality", "ZNA_pm2_vs_Centrality", kTH2D, {{100, 0, 100}, {100, 0, 1}});
264+
registry.add<TH2>("QA/before/ZNA_pm3_vs_Centrality", "ZNA_pm3_vs_Centrality", kTH2D, {{100, 0, 100}, {100, 0, 1}});
265+
registry.add<TH2>("QA/before/ZNA_pm4_vs_Centrality", "ZNA_pm4_vs_Centrality", kTH2D, {{100, 0, 100}, {100, 0, 1}});
266+
267+
registry.add<TH2>("QA/before/ZNC_pmC_vs_Centrality", "ZNC_pmC_vs_Centrality", kTH2D, {{100, 0, 100}, {300, 0, 300}});
268+
registry.add<TH2>("QA/before/ZNC_pmSUM_vs_Centrality", "ZNC_pmSUM_vs_Centrality", kTH2D, {{100, 0, 100}, {300, 0, 300}});
269+
registry.add<TH2>("QA/before/ZNC_pm1_vs_Centrality", "ZNC_pm1_vs_Centrality", kTH2D, {{100, 0, 100}, {100, 0, 1}});
270+
registry.add<TH2>("QA/before/ZNC_pm2_vs_Centrality", "ZNC_pm2_vs_Centrality", kTH2D, {{100, 0, 100}, {100, 0, 1}});
271+
registry.add<TH2>("QA/before/ZNC_pm3_vs_Centrality", "ZNC_pm3_vs_Centrality", kTH2D, {{100, 0, 100}, {100, 0, 1}});
272+
registry.add<TH2>("QA/before/ZNC_pm4_vs_Centrality", "ZNC_pm4_vs_Centrality", kTH2D, {{100, 0, 100}, {100, 0, 1}});
273273

274274
registry.addClone("QA/before/", "QA/after/");
275275

@@ -723,31 +723,31 @@ struct ZdcQVectors {
723723

724724
registry.fill(HIST("QA/") + HIST("before") + HIST("/ZNA_pmC_vs_Centrality"), centrality, zdcCol.energyCommonZNA());
725725
registry.fill(HIST("QA/") + HIST("before") + HIST("/ZNA_pmSUM_vs_Centrality"), centrality, sumZNAbefore);
726-
registry.fill(HIST("QA/") + HIST("before") + HIST("/ZNA_pm1_vs_Centrality"), centrality, eZN[0]/sumZNAbefore);
727-
registry.fill(HIST("QA/") + HIST("before") + HIST("/ZNA_pm2_vs_Centrality"), centrality, eZN[1]/sumZNAbefore);
728-
registry.fill(HIST("QA/") + HIST("before") + HIST("/ZNA_pm3_vs_Centrality"), centrality, eZN[2]/sumZNAbefore);
729-
registry.fill(HIST("QA/") + HIST("before") + HIST("/ZNA_pm4_vs_Centrality"), centrality, eZN[3]/sumZNAbefore);
726+
registry.fill(HIST("QA/") + HIST("before") + HIST("/ZNA_pm1_vs_Centrality"), centrality, eZN[0] / sumZNAbefore);
727+
registry.fill(HIST("QA/") + HIST("before") + HIST("/ZNA_pm2_vs_Centrality"), centrality, eZN[1] / sumZNAbefore);
728+
registry.fill(HIST("QA/") + HIST("before") + HIST("/ZNA_pm3_vs_Centrality"), centrality, eZN[2] / sumZNAbefore);
729+
registry.fill(HIST("QA/") + HIST("before") + HIST("/ZNA_pm4_vs_Centrality"), centrality, eZN[3] / sumZNAbefore);
730730

731731
registry.fill(HIST("QA/") + HIST("before") + HIST("/ZNC_pmC_vs_Centrality"), centrality, zdcCol.energyCommonZNC());
732732
registry.fill(HIST("QA/") + HIST("before") + HIST("/ZNC_pmSUM_vs_Centrality"), centrality, sumZNCbefore);
733-
registry.fill(HIST("QA/") + HIST("before") + HIST("/ZNC_pm1_vs_Centrality"), centrality, eZN[4]/sumZNCbefore);
734-
registry.fill(HIST("QA/") + HIST("before") + HIST("/ZNC_pm2_vs_Centrality"), centrality, eZN[5]/sumZNCbefore);
735-
registry.fill(HIST("QA/") + HIST("before") + HIST("/ZNC_pm3_vs_Centrality"), centrality, eZN[6]/sumZNCbefore);
736-
registry.fill(HIST("QA/") + HIST("before") + HIST("/ZNC_pm4_vs_Centrality"), centrality, eZN[7]/sumZNCbefore);
733+
registry.fill(HIST("QA/") + HIST("before") + HIST("/ZNC_pm1_vs_Centrality"), centrality, eZN[4] / sumZNCbefore);
734+
registry.fill(HIST("QA/") + HIST("before") + HIST("/ZNC_pm2_vs_Centrality"), centrality, eZN[5] / sumZNCbefore);
735+
registry.fill(HIST("QA/") + HIST("before") + HIST("/ZNC_pm3_vs_Centrality"), centrality, eZN[6] / sumZNCbefore);
736+
registry.fill(HIST("QA/") + HIST("before") + HIST("/ZNC_pm4_vs_Centrality"), centrality, eZN[7] / sumZNCbefore);
737737

738738
registry.fill(HIST("QA/") + HIST("after") + HIST("/ZNA_pmC_vs_Centrality"), centrality, zdcCol.energyCommonZNA());
739739
registry.fill(HIST("QA/") + HIST("after") + HIST("/ZNA_pmSUM_vs_Centrality"), centrality, sumZNAafter);
740-
registry.fill(HIST("QA/") + HIST("after") + HIST("/ZNA_pm1_vs_Centrality"), centrality, e[0]/sumZNAafter);
741-
registry.fill(HIST("QA/") + HIST("after") + HIST("/ZNA_pm2_vs_Centrality"), centrality, e[1]/sumZNAafter);
742-
registry.fill(HIST("QA/") + HIST("after") + HIST("/ZNA_pm3_vs_Centrality"), centrality, e[2]/sumZNAafter);
743-
registry.fill(HIST("QA/") + HIST("after") + HIST("/ZNA_pm4_vs_Centrality"), centrality, e[3]/sumZNAafter);
740+
registry.fill(HIST("QA/") + HIST("after") + HIST("/ZNA_pm1_vs_Centrality"), centrality, e[0] / sumZNAafter);
741+
registry.fill(HIST("QA/") + HIST("after") + HIST("/ZNA_pm2_vs_Centrality"), centrality, e[1] / sumZNAafter);
742+
registry.fill(HIST("QA/") + HIST("after") + HIST("/ZNA_pm3_vs_Centrality"), centrality, e[2] / sumZNAafter);
743+
registry.fill(HIST("QA/") + HIST("after") + HIST("/ZNA_pm4_vs_Centrality"), centrality, e[3] / sumZNAafter);
744744

745745
registry.fill(HIST("QA/") + HIST("after") + HIST("/ZNC_pmC_vs_Centrality"), centrality, zdcCol.energyCommonZNC());
746746
registry.fill(HIST("QA/") + HIST("after") + HIST("/ZNC_pmSUM_vs_Centrality"), centrality, sumZNCafter);
747-
registry.fill(HIST("QA/") + HIST("after") + HIST("/ZNC_pm1_vs_Centrality"), centrality, e[4]/sumZNCafter);
748-
registry.fill(HIST("QA/") + HIST("after") + HIST("/ZNC_pm2_vs_Centrality"), centrality, e[5]/sumZNCafter);
749-
registry.fill(HIST("QA/") + HIST("after") + HIST("/ZNC_pm3_vs_Centrality"), centrality, e[6]/sumZNCafter);
750-
registry.fill(HIST("QA/") + HIST("after") + HIST("/ZNC_pm4_vs_Centrality"), centrality, e[7]/sumZNCafter);
747+
registry.fill(HIST("QA/") + HIST("after") + HIST("/ZNC_pm1_vs_Centrality"), centrality, e[4] / sumZNCafter);
748+
registry.fill(HIST("QA/") + HIST("after") + HIST("/ZNC_pm2_vs_Centrality"), centrality, e[5] / sumZNCafter);
749+
registry.fill(HIST("QA/") + HIST("after") + HIST("/ZNC_pm3_vs_Centrality"), centrality, e[6] / sumZNCafter);
750+
registry.fill(HIST("QA/") + HIST("after") + HIST("/ZNC_pm4_vs_Centrality"), centrality, e[7] / sumZNCafter);
751751
}
752752

753753
// Now calculate Q-vector

‎PWGCF/Flow/Tasks/flowSP.cxx‎

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ struct FlowSP {
167167
OutputObj<GFWWeights> fWeights{GFWWeights("weights")};
168168
OutputObj<GFWWeights> fWeightsPOS{GFWWeights("weights_positive")};
169169
OutputObj<GFWWeights> fWeightsNEG{GFWWeights("weights_negative")};
170-
170+
171171
HistogramRegistry registry{"registry"};
172172

173173
// Event selection cuts - Alex
@@ -250,7 +250,7 @@ struct FlowSP {
250250
AxisSpec axisDCAxy = {100, -.5, .5, "DCA_{xy} (cm)"};
251251
AxisSpec axisPhiMod = {100, 0, constants::math::PI / 9, "fmod(#varphi,#pi/9)"};
252252
AxisSpec axisPhi = {60, 0, constants::math::TwoPI, "#varphi"};
253-
AxisSpec axisEta = {64, -1.6,1.6, "#eta"};
253+
AxisSpec axisEta = {64, -1.6, 1.6, "#eta"};
254254
AxisSpec axisEtaVn = {8, -.8, .8, "#eta"};
255255
AxisSpec axisVx = {40, -0.01, 0.01, "v_{x}"};
256256
AxisSpec axisVy = {40, -0.01, 0.01, "v_{y}"};
@@ -302,8 +302,7 @@ struct FlowSP {
302302
registry.add<TH3>("weights/hPhi_Eta_vz", "", kTH3D, {axisPhi, axisEta, axisVz});
303303
registry.add<TH3>("weights/hPhi_Eta_vz_positive", "", kTH3D, {axisPhi, axisEta, axisVz});
304304
registry.add<TH3>("weights/hPhi_Eta_vz_negative", "", kTH3D, {axisPhi, axisEta, axisVz});
305-
}
306-
else {
305+
} else {
307306
// define output objects
308307
fWeights->setPtBins(ptbins, &ptbinning[0]);
309308
fWeights->init(true, false);
@@ -584,7 +583,7 @@ struct FlowSP {
584583
}
585584
} // end of init
586585

587-
float getNUA2D(TH3D* hNUA, float eta, float phi, float vtxz)
586+
float getNUA2D(TH3D* hNUA, float eta, float phi, float vtxz)
588587
{
589588
int xind = hNUA->GetXaxis()->FindBin(phi);
590589
int etaind = hNUA->GetYaxis()->FindBin(eta);
@@ -666,7 +665,7 @@ struct FlowSP {
666665

667666
int nWeights = 3;
668667

669-
if(cfguseNUA1D) {
668+
if (cfguseNUA1D) {
670669
if (cfgCCDB_NUA.value.empty() == false) {
671670
TList* listCorrections = ccdb->getForTimeStamp<TList>(cfgCCDB_NUA, timestamp);
672671
cfg.mAcceptance.push_back(reinterpret_cast<GFWWeights*>(listCorrections->FindObject("weights")));
@@ -680,10 +679,10 @@ struct FlowSP {
680679
} else {
681680
LOGF(info, "cfgCCDB_NUA empty! No corrections loaded");
682681
}
683-
} else if(cfguseNUA2D) {
682+
} else if (cfguseNUA2D) {
684683
if (cfgCCDB_NUA.value.empty() == false) {
685684
TH3D* hNUA2D = ccdb->getForTimeStamp<TH3D>(cfgCCDB_NUA, timestamp);
686-
if (!hNUA2D){
685+
if (!hNUA2D) {
687686
LOGF(fatal, "Could not load acceptance weights from %s", cfgCCDB_NUA.value.c_str());
688687
} else {
689688
LOGF(info, "Loaded acceptance weights from %s", cfgCCDB_NUA.value.c_str());
@@ -723,15 +722,15 @@ struct FlowSP {
723722
return false;
724723
weight_nue = 1. / eff;
725724

726-
if(cfguseNUA1D) {
725+
if (cfguseNUA1D) {
727726
int sizeAcc = cfg.mAcceptance.size();
728727
if (sizeAcc > pID) {
729728
weight_nua = cfg.mAcceptance[pID]->getNUA(phi, eta, vtxz);
730729
} else {
731730
weight_nua = 1;
732731
}
733-
} else if(cfguseNUA2D) {
734-
if(cfg.mAcceptance2D.size() > 0) {
732+
} else if (cfguseNUA2D) {
733+
if (cfg.mAcceptance2D.size() > 0) {
735734
weight_nua = getNUA2D(cfg.mAcceptance2D[0], eta, phi, vtxz);
736735
} else {
737736
weight_nua = 1;
@@ -1314,7 +1313,7 @@ struct FlowSP {
13141313

13151314
if (cfguseNUA2D && cfgFillWeights) {
13161315
registry.fill(HIST("weights/hPhi_Eta_vz"), phi, track.eta(), vtxz, 1);
1317-
if(pos) {
1316+
if (pos) {
13181317
registry.fill(HIST("weights/hPhi_Eta_vz_positive"), phi, track.eta(), vtxz, 1);
13191318
} else {
13201319
registry.fill(HIST("weights/hPhi_Eta_vz_negative"), phi, track.eta(), vtxz, 1);

0 commit comments

Comments
 (0)