Skip to content

Commit a04d7ec

Browse files
alibuildalibuild
committed
Please consider the following formatting changes
1 parent 522ecc6 commit a04d7ec

2 files changed

Lines changed: 76 additions & 81 deletions

File tree

‎PWGCF/Flow/TableProducer/zdcQVectors.cxx‎

Lines changed: 19 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -350,7 +350,6 @@ struct ZdcQVectors {
350350
registry.add<TH2>("QA/ZNC_pm2_vs_Centrality", "ZNC_pm2_vs_Centrality", kTH2D, {{100, 0, 100}, {100, 0, 1}});
351351
registry.add<TH2>("QA/ZNC_pm3_vs_Centrality", "ZNC_pm3_vs_Centrality", kTH2D, {{100, 0, 100}, {100, 0, 1}});
352352
registry.add<TH2>("QA/ZNC_pm4_vs_Centrality", "ZNC_pm4_vs_Centrality", kTH2D, {{100, 0, 100}, {100, 0, 1}});
353-
354353
}
355354

356355
// Tower mean energies vs. centrality used for tower gain equalisation
@@ -378,8 +377,8 @@ struct ZdcQVectors {
378377
registry.add<TProfile2D>("CutAnalysis/hvertex_vy", "hvertex_vy", kTProfile2D, {{1, 0., 1.}, {nEventSelections + 5, 0, nEventSelections + 5}});
379378
registry.add<TProfile2D>("CutAnalysis/hvertex_vz", "hvertex_vz", kTProfile2D, {{1, 0., 1.}, {nEventSelections + 5, 0, nEventSelections + 5}});
380379
}
381-
registry.addClone("recentering/before/", "recentering/after/");
382-
registry.addClone("QA/before/", "QA/after/");
380+
registry.addClone("recentering/before/", "recentering/after/");
381+
registry.addClone("QA/before/", "QA/after/");
383382
}
384383
}
385384

@@ -755,7 +754,7 @@ struct ZdcQVectors {
755754
const auto& foundBC = collision.foundBC_as<BCsRun3>();
756755
runnumber = foundBC.runNumber();
757756

758-
if (cfgFillHistRegistry && !cfgFillNothing){
757+
if (cfgFillHistRegistry && !cfgFillNothing) {
759758
registry.fill(HIST("QA/centrality_before"), cent);
760759
}
761760

@@ -841,7 +840,8 @@ struct ZdcQVectors {
841840
}
842841

843842
// load the calibration histos for iteration 0 step 0 (Energy Calibration)
844-
if(!cfgNoGain) loadCalibrations<kEnergyCal>(cfgEnergyCal.value);
843+
if (!cfgNoGain)
844+
loadCalibrations<kEnergyCal>(cfgEnergyCal.value);
845845
// load the calibrations for the mean v
846846
loadCalibrations<kMeanv>(cfgMeanv.value);
847847

@@ -869,25 +869,25 @@ struct ZdcQVectors {
869869

870870
// Now start gain equalisation!
871871
// Fill the list with calibration constants.
872-
if(!cfgNoGain){
872+
if (!cfgNoGain) {
873873
for (int tower = 0; tower < (nTowers + 2); tower++) {
874-
meanEZN[tower] = getCorrection<TProfile2D, kEnergyCal>(namesEcal[tower].Data());
875-
}
876-
}
874+
meanEZN[tower] = getCorrection<TProfile2D, kEnergyCal>(namesEcal[tower].Data());
875+
}
876+
}
877877

878878
// Use the calibration constants but now only loop over towers 1-4
879879
int calibtower = 0;
880880
std::vector<int> towersNocom = {1, 2, 3, 4, 6, 7, 8, 9};
881881

882882
for (const auto& tower : towersNocom) {
883-
if(cfgNoGain) {
884-
e[calibtower] = eZN[calibtower];
885-
} else {
883+
if (cfgNoGain) {
884+
e[calibtower] = eZN[calibtower];
885+
} else {
886886
if (meanEZN[tower] > 0) {
887887
double ecommon = (tower > nTowersPerSide) ? meanEZN[5] : meanEZN[0];
888888
e[calibtower] = eZN[calibtower] * (0.25 * ecommon) / meanEZN[tower];
889889
}
890-
}
890+
}
891891
calibtower++;
892892
}
893893

@@ -918,7 +918,6 @@ struct ZdcQVectors {
918918

919919
registry.fill(HIST("QA/ZNC_pmC_vs_Centrality"), centrality, zdcCol.energyCommonZNC());
920920
registry.fill(HIST("QA/ZNC_pmSUM_vs_Centrality"), centrality, sumZNC);
921-
922921

923922
registry.fill(HIST("QA/ZNA_pm1_vs_Centrality"), centrality, e[0] / sumZNA);
924923
registry.fill(HIST("QA/ZNA_pm2_vs_Centrality"), centrality, e[1] / sumZNA);
@@ -1002,13 +1001,12 @@ struct ZdcQVectors {
10021001
corrQyA.push_back(getCorrection<THnSparse, kRec>(names[0][1].Data(), it, 1));
10031002
corrQxC.push_back(getCorrection<THnSparse, kRec>(names[0][2].Data(), it, 1));
10041003
corrQyC.push_back(getCorrection<THnSparse, kRec>(names[0][3].Data(), it, 1));
1005-
10061004

10071005
if (cfgFillHistRegistry && !cfgFillNothing) {
1008-
registry.get<TH2>(HIST("recentering/QXA_vs_iteration"))->Fill(pb + 1, q[0] - std::accumulate(corrQxA.begin(), corrQxA.end(), 0.0));
1009-
registry.get<TH2>(HIST("recentering/QYA_vs_iteration"))->Fill(pb + 1, q[1] - std::accumulate(corrQyA.begin(), corrQyA.end(), 0.0));
1010-
registry.get<TH2>(HIST("recentering/QXC_vs_iteration"))->Fill(pb + 1, q[2] - std::accumulate(corrQxC.begin(), corrQxC.end(), 0.0));
1011-
registry.get<TH2>(HIST("recentering/QYC_vs_iteration"))->Fill(pb + 1, q[3] - std::accumulate(corrQyC.begin(), corrQyC.end(), 0.0));
1006+
registry.get<TH2>(HIST("recentering/QXA_vs_iteration"))->Fill(pb + 1, q[0] - std::accumulate(corrQxA.begin(), corrQxA.end(), 0.0));
1007+
registry.get<TH2>(HIST("recentering/QYA_vs_iteration"))->Fill(pb + 1, q[1] - std::accumulate(corrQyA.begin(), corrQyA.end(), 0.0));
1008+
registry.get<TH2>(HIST("recentering/QXC_vs_iteration"))->Fill(pb + 1, q[2] - std::accumulate(corrQxC.begin(), corrQxC.end(), 0.0));
1009+
registry.get<TH2>(HIST("recentering/QYC_vs_iteration"))->Fill(pb + 1, q[3] - std::accumulate(corrQyC.begin(), corrQyC.end(), 0.0));
10121010
}
10131011
pb++;
10141012

@@ -1023,7 +1021,7 @@ struct ZdcQVectors {
10231021
registry.get<TH2>(HIST("recentering/QYA_vs_iteration"))->Fill(pb + 1, q[1] - std::accumulate(corrQyA.begin(), corrQyA.end(), 0.0));
10241022
registry.get<TH2>(HIST("recentering/QXC_vs_iteration"))->Fill(pb + 1, q[2] - std::accumulate(corrQxC.begin(), corrQxC.end(), 0.0));
10251023
registry.get<TH2>(HIST("recentering/QYC_vs_iteration"))->Fill(pb + 1, q[3] - std::accumulate(corrQyC.begin(), corrQyC.end(), 0.0));
1026-
}
1024+
}
10271025

10281026
pb++;
10291027
}
@@ -1039,7 +1037,7 @@ struct ZdcQVectors {
10391037
registry.get<TH2>(HIST("recentering/QYA_vs_iteration"))->Fill(pb + 1, q[1] - std::accumulate(corrQyA.begin(), corrQyA.end(), 0.0));
10401038
registry.get<TH2>(HIST("recentering/QXC_vs_iteration"))->Fill(pb + 1, q[2] - std::accumulate(corrQxC.begin(), corrQxC.end(), 0.0));
10411039
registry.get<TH2>(HIST("recentering/QYC_vs_iteration"))->Fill(pb + 1, q[3] - std::accumulate(corrQyC.begin(), corrQyC.end(), 0.0));
1042-
}
1040+
}
10431041
pb++;
10441042
}
10451043
}

‎PWGCF/Flow/Tasks/flowSP.cxx‎

Lines changed: 57 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,7 @@ struct FlowSP {
258258
double meanPxC = 0;
259259
} spm;
260260

261-
struct ptMaps {
261+
struct ptMaps {
262262
TProfile* meanPTMap = new TProfile("meanPTMap", "meanPTMap", 8, -0.8, 0.8);
263263
TProfile* meanPTMapPos = new TProfile("meanPTMapPos", "meanPTMapPos", 8, -0.8, 0.8);
264264
TProfile* meanPTMapNeg = new TProfile("meanPTMapNeg", "meanPTMapNeg", 8, -0.8, 0.8);
@@ -271,7 +271,7 @@ struct FlowSP {
271271

272272
TProfile* relPxCNeg = new TProfile("relPxCNeg", "relPxCNeg", 8, -0.8, 0.8);
273273
TProfile* relPxCPos = new TProfile("relPxCPos", "relPxCPos", 8, -0.8, 0.8);
274-
} ptmaps;
274+
} ptmaps;
275275

276276
OutputObj<GFWWeights> fWeights{GFWWeights("weights")};
277277
OutputObj<GFWWeights> fWeightsPOS{GFWWeights("weights_positive")};
@@ -700,38 +700,38 @@ struct FlowSP {
700700
fMultCutHigh = new TF1("fMultCutHigh", "[0]+[1]*x+[2]*x*x+[3]*x*x*x+[4]*x*x*x*x", 0, 100);
701701

702702
std::vector<double> paramsMultPVCut;
703-
std::vector<double> paramsMultCut;
704-
if(cfg.cUsePredeFinedSigma){
705-
if(cfg.cUsePredeFinedSigmaYear == 2023) {
706-
if(cfg.cUsePredeFinedSigmaNsigma == 1){
707-
paramsMultPVCut = {2615.47, -90.5747, 1.25125, -0.00847075, 2.41183e-05, 3399.72, -121.652, 1.84077, -0.0142886, 4.71449e-05};
708-
paramsMultCut = {1716.84, -56.5663, 0.715202, -0.00426007, 1.05075e-05, 2550.82, -87.4873, 1.22205, -0.00852644, 2.54248e-05 };
709-
} else if(cfg.cUsePredeFinedSigmaNsigma == 2){
710-
paramsMultPVCut = {2223.49, -75.1444, 0.963572, -0.00570399, 1.34877e-05, 3790.99, -137.064, 2.13044, -0.017122, 5.82834e-05};
711-
paramsMultCut = {1301.56, -41.4615, 0.478224, -0.00239449, 4.46966e-06, 2967.6, -102.927, 1.47488, -0.0106534, 3.28622e-05};
712-
} else if(cfg.cUsePredeFinedSigmaNsigma == 3){
713-
paramsMultPVCut = {1837.75, -60.852, 0.724331, -0.00366975, 6.47562e-06, 4182.12, -152.459, 2.41955, -0.0199481, 6.93894e-05};
714-
paramsMultCut = {885.976, -26.3397, 0.240114, -0.000496168, -1.82704e-06, 3384.43, -118.377, 1.72823, -0.0127887, 4.03432e-05};
715-
} else {
716-
LOGF(fatal, "nSigma can only be 1-3 please reset the variable or give the parameters manually and set cfg.cUsePredeFinedSigma to FALSE");
717-
}
718-
} else if(cfg.cUsePredeFinedSigmaYear == 2024){
719-
if(cfg.cUsePredeFinedSigmaNsigma == 1){
720-
paramsMultPVCut = {2726.93, -100.128, 1.45046, -0.0099354, 2.71182e-05, 3404.72, -126.569, 1.92500, -0.0142653, 4.31645e-05};
721-
paramsMultCut = {1858.77, -66.6070, 0.929146, -0.00606961, 1.57639e-05 , 2672.43, -96.7708, 1.39109 , -0.00942498, 2.54268e-05};
722-
} else if(cfg.cUsePredeFinedSigmaNsigma == 2){
723-
paramsMultPVCut = {2390.04, -87.3154, 1.23176, -0.00806869, 2.06624e-05, 3744.26, -139.927, 2.16863, -0.0165329, 5.17269e-05};
724-
paramsMultCut = {1451.23, -51.4314, 0.694609, -0.00433959, 1.06698e-05, 3080.42, -112.071, 1.63166 , -0.0112533 , 3.10348e-05};
725-
} else if(cfg.cUsePredeFinedSigmaNsigma == 3){
726-
paramsMultPVCut = {2053.64, -74.5950, 1.01563, -0.00621473, 1.41276e-05, 4083.79, -153.304, 2.41333, -0.0188198, 6.03974e-05};
727-
paramsMultCut = {1042.50, -35.9374, 0.440681, -0.00222218, 3.20643e-06, 3488.53, -127.396, 1.87339 , -0.0131007, 3.67434e-05};
728-
} else {
729-
LOGF(fatal, "cUsePredeFinedSigmaNsigma can only be 1-3 please reset the variable or give the parameters manually and set cUsePredeFinedSigma to FALSE");
730-
}
731-
} else {
732-
LOGF(fatal, "cUsePredeFinedSigmaYear can only be 2023/2024 please reset the variable or give the parameters manually and set cUsePredeFinedSigma to FALSE");
703+
std::vector<double> paramsMultCut;
704+
if (cfg.cUsePredeFinedSigma) {
705+
if (cfg.cUsePredeFinedSigmaYear == 2023) {
706+
if (cfg.cUsePredeFinedSigmaNsigma == 1) {
707+
paramsMultPVCut = {2615.47, -90.5747, 1.25125, -0.00847075, 2.41183e-05, 3399.72, -121.652, 1.84077, -0.0142886, 4.71449e-05};
708+
paramsMultCut = {1716.84, -56.5663, 0.715202, -0.00426007, 1.05075e-05, 2550.82, -87.4873, 1.22205, -0.00852644, 2.54248e-05};
709+
} else if (cfg.cUsePredeFinedSigmaNsigma == 2) {
710+
paramsMultPVCut = {2223.49, -75.1444, 0.963572, -0.00570399, 1.34877e-05, 3790.99, -137.064, 2.13044, -0.017122, 5.82834e-05};
711+
paramsMultCut = {1301.56, -41.4615, 0.478224, -0.00239449, 4.46966e-06, 2967.6, -102.927, 1.47488, -0.0106534, 3.28622e-05};
712+
} else if (cfg.cUsePredeFinedSigmaNsigma == 3) {
713+
paramsMultPVCut = {1837.75, -60.852, 0.724331, -0.00366975, 6.47562e-06, 4182.12, -152.459, 2.41955, -0.0199481, 6.93894e-05};
714+
paramsMultCut = {885.976, -26.3397, 0.240114, -0.000496168, -1.82704e-06, 3384.43, -118.377, 1.72823, -0.0127887, 4.03432e-05};
715+
} else {
716+
LOGF(fatal, "nSigma can only be 1-3 please reset the variable or give the parameters manually and set cfg.cUsePredeFinedSigma to FALSE");
717+
}
718+
} else if (cfg.cUsePredeFinedSigmaYear == 2024) {
719+
if (cfg.cUsePredeFinedSigmaNsigma == 1) {
720+
paramsMultPVCut = {2726.93, -100.128, 1.45046, -0.0099354, 2.71182e-05, 3404.72, -126.569, 1.92500, -0.0142653, 4.31645e-05};
721+
paramsMultCut = {1858.77, -66.6070, 0.929146, -0.00606961, 1.57639e-05, 2672.43, -96.7708, 1.39109, -0.00942498, 2.54268e-05};
722+
} else if (cfg.cUsePredeFinedSigmaNsigma == 2) {
723+
paramsMultPVCut = {2390.04, -87.3154, 1.23176, -0.00806869, 2.06624e-05, 3744.26, -139.927, 2.16863, -0.0165329, 5.17269e-05};
724+
paramsMultCut = {1451.23, -51.4314, 0.694609, -0.00433959, 1.06698e-05, 3080.42, -112.071, 1.63166, -0.0112533, 3.10348e-05};
725+
} else if (cfg.cUsePredeFinedSigmaNsigma == 3) {
726+
paramsMultPVCut = {2053.64, -74.5950, 1.01563, -0.00621473, 1.41276e-05, 4083.79, -153.304, 2.41333, -0.0188198, 6.03974e-05};
727+
paramsMultCut = {1042.50, -35.9374, 0.440681, -0.00222218, 3.20643e-06, 3488.53, -127.396, 1.87339, -0.0131007, 3.67434e-05};
728+
} else {
729+
LOGF(fatal, "cUsePredeFinedSigmaNsigma can only be 1-3 please reset the variable or give the parameters manually and set cUsePredeFinedSigma to FALSE");
733730
}
734-
} else {
731+
} else {
732+
LOGF(fatal, "cUsePredeFinedSigmaYear can only be 2023/2024 please reset the variable or give the parameters manually and set cUsePredeFinedSigma to FALSE");
733+
}
734+
} else {
735735
paramsMultPVCut = cfg.cEvSelsMultPv;
736736
paramsMultCut = cfg.cEvSelsMult;
737737
}
@@ -1188,20 +1188,20 @@ struct FlowSP {
11881188
if (track.eta() < 0)
11891189
scale = -1.0;
11901190

1191-
const double invSqrtQQ = 1.0 / std::sqrt(std::fabs(spm.corrQQ));
1191+
const double invSqrtQQ = 1.0 / std::sqrt(std::fabs(spm.corrQQ));
11921192
const double invSqrtQQx = 1.0 / std::sqrt(std::fabs(spm.corrQQx));
11931193
const double invSqrtQQy = 1.0 / std::sqrt(std::fabs(spm.corrQQy));
1194-
const double uqA = spm.uy * spm.qyA + spm.ux * spm.qxA;
1195-
const double uqC = spm.uy * spm.qyC + spm.ux * spm.qxC;
1196-
const double invMeanPtQQ = 1.0 / spm.meanPtWeight;
1194+
const double uqA = spm.uy * spm.qyA + spm.ux * spm.qxA;
1195+
const double uqC = spm.uy * spm.qyC + spm.ux * spm.qxC;
1196+
const double invMeanPtQQ = 1.0 / spm.meanPtWeight;
11971197

11981198
if (cfg.cFillGeneralV1Histos) {
1199-
registry.fill(HIST(Charge[ct]) + HIST(Species[pt]) + HIST("vnAodd"), track.pt(), track.eta(), spm.centrality, scale * (uqA) * invSqrtQQ, weight);
1200-
registry.fill(HIST(Charge[ct]) + HIST(Species[pt]) + HIST("vnCodd"), track.pt(), track.eta(), spm.centrality, scale * (uqC) * invSqrtQQ, weight);
1199+
registry.fill(HIST(Charge[ct]) + HIST(Species[pt]) + HIST("vnAodd"), track.pt(), track.eta(), spm.centrality, scale * (uqA)*invSqrtQQ, weight);
1200+
registry.fill(HIST(Charge[ct]) + HIST(Species[pt]) + HIST("vnCodd"), track.pt(), track.eta(), spm.centrality, scale * (uqC)*invSqrtQQ, weight);
12011201
registry.fill(HIST(Charge[ct]) + HIST(Species[pt]) + HIST("vnOdd"), track.pt(), track.eta(), spm.centrality, scale * 0.5 * ((uqA) - (uqC)) * invSqrtQQ, weight);
12021202
registry.fill(HIST(Charge[ct]) + HIST(Species[pt]) + HIST("vnEven"), track.pt(), track.eta(), spm.centrality, 0.5 * ((uqA) + (uqC)) * invSqrtQQ, weight);
1203-
registry.fill(HIST(Charge[ct]) + HIST(Species[pt]) + HIST("vnA"), track.pt(), track.eta(), spm.centrality, (uqA) * invSqrtQQ, weight);
1204-
registry.fill(HIST(Charge[ct]) + HIST(Species[pt]) + HIST("vnC"), track.pt(), track.eta(), spm.centrality, (uqC) * invSqrtQQ, weight);
1203+
registry.fill(HIST(Charge[ct]) + HIST(Species[pt]) + HIST("vnA"), track.pt(), track.eta(), spm.centrality, (uqA)*invSqrtQQ, weight);
1204+
registry.fill(HIST(Charge[ct]) + HIST(Species[pt]) + HIST("vnC"), track.pt(), track.eta(), spm.centrality, (uqC)*invSqrtQQ, weight);
12051205
registry.fill(HIST(Charge[ct]) + HIST(Species[pt]) + HIST("vnCSetPlane"), track.pt(), track.eta(), spm.centrality, (spm.uy + spm.ux) * invSqrtQQ, weight);
12061206
registry.fill(HIST(Charge[ct]) + HIST(Species[pt]) + HIST("vnASetPlane"), track.pt(), track.eta(), spm.centrality, (minusQ * spm.ux - spm.uy) * invSqrtQQ, weight);
12071207
}
@@ -1254,7 +1254,7 @@ struct FlowSP {
12541254
if (!cfg.cFillTrackQA)
12551255
return;
12561256

1257-
double weight = spm.wacc[ct][par] * spm.weff[ct][par] * spm.centWeight;
1257+
double weight = spm.wacc[ct][par] * spm.weff[ct][par] * spm.centWeight;
12581258

12591259
static constexpr std::string_view Time[] = {"before/", "after/"};
12601260
// NOTE: species[kUnidentified] = "" (when nocfg.cTrackSelDo) {
@@ -1488,30 +1488,28 @@ struct FlowSP {
14881488
if (centW <= 0) {
14891489
spm.centWeight = 0.;
14901490
LOGF(fatal, "Centrality weight cannot be negative .. setting to 0. for (%.2f)", spm.centrality);
1491-
} else {
1492-
spm.centWeight = centW;
1491+
} else {
1492+
spm.centWeight = centW;
14931493
}
14941494
}
14951495

14961496
// Always fill centrality histogram after event selections!
14971497
histos.fill(HIST("hCentralityCW"), spm.centrality);
14981498

1499-
15001499
fillEventQA<kAfter>(collision, tracks);
15011500

1502-
ptmaps.meanPTMap->Reset();
1503-
ptmaps.meanPTMapPos->Reset();
1504-
ptmaps.meanPTMapNeg->Reset();
1501+
ptmaps.meanPTMap->Reset();
1502+
ptmaps.meanPTMapPos->Reset();
1503+
ptmaps.meanPTMapNeg->Reset();
15051504

1506-
ptmaps.relPxA->Reset();
1507-
ptmaps.relPxC->Reset();
1505+
ptmaps.relPxA->Reset();
1506+
ptmaps.relPxC->Reset();
15081507

1509-
ptmaps.relPxANeg->Reset();
1510-
ptmaps.relPxAPos->Reset();
1511-
1512-
ptmaps.relPxCNeg->Reset();
1513-
ptmaps.relPxCPos->Reset();
1508+
ptmaps.relPxANeg->Reset();
1509+
ptmaps.relPxAPos->Reset();
15141510

1511+
ptmaps.relPxCNeg->Reset();
1512+
ptmaps.relPxCPos->Reset();
15151513

15161514
double sumPxAEvent = 0;
15171515
double meanPxEventCount = 0;
@@ -1637,11 +1635,10 @@ struct FlowSP {
16371635

16381636
} // end of track loop
16391637

1638+
double meanPxAEvent = 0;
1639+
double meanPxCEvent = 0;
16401640

1641-
double meanPxAEvent = 0;
1642-
double meanPxCEvent = 0;
1643-
1644-
if(meanPxEventCount > 0) {
1641+
if (meanPxEventCount > 0) {
16451642
meanPxAEvent = sumPxAEvent / meanPxEventCount;
16461643
meanPxCEvent = sumPxCEvent / meanPxEventCount;
16471644
}
@@ -2057,7 +2054,7 @@ struct FlowSP {
20572054
auto trackSlice = tracks.sliceBy(trackPerCollision, col.globalIndex());
20582055

20592056
// get filtered tracks that belong to reconstructed collision
2060-
// mcReco uses filtered tracks
2057+
// mcReco uses filtered tracks
20612058
auto filteredTrackSlice = filteredTracks.sliceBy(trackPerCollision, col.globalIndex());
20622059

20632060
spm.centrality = col.centFT0C();

0 commit comments

Comments
 (0)