Skip to content

Commit a840ad1

Browse files
alibuildalibuild
committed
Please consider the following formatting changes
1 parent dd21d8d commit a840ad1

2 files changed

Lines changed: 89 additions & 96 deletions

File tree

‎PWGCF/Flow/TableProducer/zdcQVectors.cxx‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1191,7 +1191,6 @@ struct ZdcQVectors {
11911191
registry.get<TProfile>(HIST("QA/after/ZNA_Qy"))->Fill(Form("%d", runnumber), qYaShift);
11921192
registry.get<TProfile>(HIST("QA/after/ZNC_Qx"))->Fill(Form("%d", runnumber), qXcShift);
11931193
registry.get<TProfile>(HIST("QA/after/ZNC_Qy"))->Fill(Form("%d", runnumber), qYcShift);
1194-
11951194
}
11961195

11971196
spTableZDC(runnumber, cents, v, foundBC.timestamp(), qXaShift, qYaShift, qXcShift, qYcShift, isSelected, eventSelectionFlags);

‎PWGCF/Flow/Tasks/flowSP.cxx‎

Lines changed: 89 additions & 95 deletions
Original file line numberDiff line numberDiff line change
@@ -431,7 +431,6 @@ struct FlowSP {
431431
histos.add("QA/after/PsiC_vs_Vz", "", {HistType::kTH2D, {axisPhiPlane, axisVz}});
432432
histos.add("QA/after/PsiFull_vs_Vz", "", {HistType::kTH2D, {axisPhiPlane, axisVz}});
433433
// histos.add("QA/after/DeltaPsivsPx", "", {HistType::kTH3D, {axisCent, axisPhiPlane, axisPx}});
434-
435434
}
436435

437436
if (cfgFillQABefore) {
@@ -605,52 +604,52 @@ struct FlowSP {
605604
histos.addClone("incl/", "neg/");
606605
}
607606

608-
if (doprocessDataPID) {
609-
if(cfgFillGeneralV1Histos) {
607+
if (doprocessDataPID) {
608+
if (cfgFillGeneralV1Histos) {
610609
registry.add<TProfile3D>("incl/pion/vnCodd", "", kTProfile3D, {axisPt, axisEtaVn, axisCentrality});
611610
registry.add<TProfile3D>("incl/pion/vnAodd", "", kTProfile3D, {axisPt, axisEtaVn, axisCentrality});
612611
registry.add<TProfile3D>("incl/pion/vnC", "", kTProfile3D, {axisPt, axisEtaVn, axisCentrality});
613612
registry.add<TProfile3D>("incl/pion/vnA", "", kTProfile3D, {axisPt, axisEtaVn, axisCentrality});
614613
registry.add<TProfile3D>("incl/vnCSetPlane", "", kTProfile3D, {axisPt, axisEtaVn, axisCentrality});
615614
registry.add<TProfile3D>("incl/vnASetPlane", "", kTProfile3D, {axisPt, axisEtaVn, axisCentrality});
616-
}
617-
618-
if (cfgFillEventPlane) {
619-
registry.add<TProfile3D>("incl/pion/vnA_EP", "", kTProfile3D, {axisPt, axisEtaVn, axisCentrality});
620-
registry.add<TProfile3D>("incl/pion/vnC_EP", "", kTProfile3D, {axisPt, axisEtaVn, axisCentrality});
621-
registry.add<TProfile3D>("incl/pion/vnFull_EP", "", kTProfile3D, {axisPt, axisEtaVn, axisCentrality});
622-
}
623-
if (cfgFillXandYterms) {
624-
registry.add<TProfile3D>("incl/pion/vnAx", "", kTProfile3D, {axisPt, axisEtaVn, axisCentrality});
625-
registry.add<TProfile3D>("incl/pion/vnAy", "", kTProfile3D, {axisPt, axisEtaVn, axisCentrality});
626-
registry.add<TProfile3D>("incl/pion/vnCx", "", kTProfile3D, {axisPt, axisEtaVn, axisCentrality});
627-
registry.add<TProfile3D>("incl/pion/vnCy", "", kTProfile3D, {axisPt, axisEtaVn, axisCentrality});
628-
}
629-
if (cfgFillMixedHarmonics) {
630-
registry.add<TProfile3D>("incl/pion/MH/vnAxCxUx_MH", "", kTProfile3D, {axisPt, axisEtaVn, axisCentrality});
631-
registry.add<TProfile3D>("incl/pion/MH/vnAyCyUx_MH", "", kTProfile3D, {axisPt, axisEtaVn, axisCentrality});
632-
registry.add<TProfile3D>("incl/pion/MH/vnAxCyUy_MH", "", kTProfile3D, {axisPt, axisEtaVn, axisCentrality});
633-
registry.add<TProfile3D>("incl/pion/MH/vnAyCxUy_MH", "", kTProfile3D, {axisPt, axisEtaVn, axisCentrality});
634-
}
635-
registry.addClone("incl/pion/", "incl/proton/");
636-
registry.addClone("incl/pion/", "incl/kaon/");
637-
if (cfgFillChargeDependence) {
638-
registry.addClone("incl/", "pos/");
639-
registry.addClone("incl/", "neg/");
640-
}
641615
}
642616

643-
} else if (doprocessMCGen) {
644-
registry.add("trackMCGen/nCollReconstructedPerMcCollision", "", {HistType::kTH1D, {{10, -5, 5}}});
645-
registry.add("trackMCGen/after/incl/hPt_hadron", "", {HistType::kTH3D, {axisPt, axisEta, axisCentrality}});
646-
registry.add("trackMCGen/after/incl/hPt_proton", "", {HistType::kTH3D, {axisPt, axisEta, axisCentrality}});
647-
registry.add("trackMCGen/after/incl/hPt_pion", "", {HistType::kTH3D, {axisPt, axisEta, axisCentrality}});
648-
registry.add("trackMCGen/after/incl/hPt_kaon", "", {HistType::kTH3D, {axisPt, axisEta, axisCentrality}});
649-
registry.add("trackMCGen/after/incl/phi_eta_vtxZ_gen", "", {HistType::kTH3D, {axisPhi, axisEta, axisVz}});
650-
registry.addClone("trackMCGen/after/incl/", "trackMCGen/after/pos/");
651-
registry.addClone("trackMCGen/after/incl/", "trackMCGen/after/neg/");
652-
registry.addClone("trackMCGen/after/", "trackMCGen/before/");
617+
if (cfgFillEventPlane) {
618+
registry.add<TProfile3D>("incl/pion/vnA_EP", "", kTProfile3D, {axisPt, axisEtaVn, axisCentrality});
619+
registry.add<TProfile3D>("incl/pion/vnC_EP", "", kTProfile3D, {axisPt, axisEtaVn, axisCentrality});
620+
registry.add<TProfile3D>("incl/pion/vnFull_EP", "", kTProfile3D, {axisPt, axisEtaVn, axisCentrality});
621+
}
622+
if (cfgFillXandYterms) {
623+
registry.add<TProfile3D>("incl/pion/vnAx", "", kTProfile3D, {axisPt, axisEtaVn, axisCentrality});
624+
registry.add<TProfile3D>("incl/pion/vnAy", "", kTProfile3D, {axisPt, axisEtaVn, axisCentrality});
625+
registry.add<TProfile3D>("incl/pion/vnCx", "", kTProfile3D, {axisPt, axisEtaVn, axisCentrality});
626+
registry.add<TProfile3D>("incl/pion/vnCy", "", kTProfile3D, {axisPt, axisEtaVn, axisCentrality});
627+
}
628+
if (cfgFillMixedHarmonics) {
629+
registry.add<TProfile3D>("incl/pion/MH/vnAxCxUx_MH", "", kTProfile3D, {axisPt, axisEtaVn, axisCentrality});
630+
registry.add<TProfile3D>("incl/pion/MH/vnAyCyUx_MH", "", kTProfile3D, {axisPt, axisEtaVn, axisCentrality});
631+
registry.add<TProfile3D>("incl/pion/MH/vnAxCyUy_MH", "", kTProfile3D, {axisPt, axisEtaVn, axisCentrality});
632+
registry.add<TProfile3D>("incl/pion/MH/vnAyCxUy_MH", "", kTProfile3D, {axisPt, axisEtaVn, axisCentrality});
633+
}
634+
registry.addClone("incl/pion/", "incl/proton/");
635+
registry.addClone("incl/pion/", "incl/kaon/");
636+
if (cfgFillChargeDependence) {
637+
registry.addClone("incl/", "pos/");
638+
registry.addClone("incl/", "neg/");
653639
}
640+
}
641+
642+
} else if (doprocessMCGen) {
643+
registry.add("trackMCGen/nCollReconstructedPerMcCollision", "", {HistType::kTH1D, {{10, -5, 5}}});
644+
registry.add("trackMCGen/after/incl/hPt_hadron", "", {HistType::kTH3D, {axisPt, axisEta, axisCentrality}});
645+
registry.add("trackMCGen/after/incl/hPt_proton", "", {HistType::kTH3D, {axisPt, axisEta, axisCentrality}});
646+
registry.add("trackMCGen/after/incl/hPt_pion", "", {HistType::kTH3D, {axisPt, axisEta, axisCentrality}});
647+
registry.add("trackMCGen/after/incl/hPt_kaon", "", {HistType::kTH3D, {axisPt, axisEta, axisCentrality}});
648+
registry.add("trackMCGen/after/incl/phi_eta_vtxZ_gen", "", {HistType::kTH3D, {axisPhi, axisEta, axisVz}});
649+
registry.addClone("trackMCGen/after/incl/", "trackMCGen/after/pos/");
650+
registry.addClone("trackMCGen/after/incl/", "trackMCGen/after/neg/");
651+
registry.addClone("trackMCGen/after/", "trackMCGen/before/");
652+
}
654653

655654
if (cfgEvSelsUseAdditionalEventCut) {
656655
fMultPVCutLow = new TF1("fMultPVCutLow", "[0]+[1]*x+[2]*x*x+[3]*x*x*x+[4]*x*x*x*x", 0, 100);
@@ -1089,9 +1088,10 @@ struct FlowSP {
10891088
inline void fillHistograms(TrackObject track)
10901089
{
10911090
double weight = spm.wacc[ct][pt] * spm.weff[ct][pt] * spm.centWeight;
1092-
int scale = 1.0;
1091+
int scale = 1.0;
10931092
int minusQ = -1.0;
1094-
if(track.eta() < 0) scale = -1.0;
1093+
if (track.eta() < 0)
1094+
scale = -1.0;
10951095

10961096
if (cfgFillGeneralV1Histos) {
10971097
registry.fill(HIST(Charge[ct]) + HIST(Species[pt]) + HIST("vnAodd"), track.pt(), track.eta(), spm.centrality, scale * (spm.uy * spm.qyA + spm.ux * spm.qxA) / std::sqrt(std::fabs(spm.corrQQ)), weight);
@@ -1127,7 +1127,7 @@ struct FlowSP {
11271127
registry.fill(HIST(Charge[ct]) + HIST(Species[pt]) + HIST("meanPT/hMeanPtCent"), spm.centrality, track.pt(), weight);
11281128
registry.fill(HIST(Charge[ct]) + HIST(Species[pt]) + HIST("meanPT/ptV1A"), track.eta(), spm.centrality, track.pt() * ((spm.uy * spm.qyA + spm.ux * spm.qxA) / (std::sqrt(std::fabs(spm.corrQQ)) * spm.meanPtWeight)), weight);
11291129
registry.fill(HIST(Charge[ct]) + HIST(Species[pt]) + HIST("meanPT/ptV1C"), track.eta(), spm.centrality, track.pt() * ((spm.uy * spm.qyC + spm.ux * spm.qxC) / (std::sqrt(std::fabs(spm.corrQQ)) * spm.meanPtWeight)), weight);
1130-
1130+
11311131
registry.fill(HIST(Charge[ct]) + HIST(Species[pt]) + HIST("meanPT/ptV1Aodd"), track.eta(), spm.centrality, track.pt() * scale * ((spm.uy * spm.qyA + spm.ux * spm.qxA) / (std::sqrt(std::fabs(spm.corrQQ)) * spm.meanPtWeight)), weight);
11321132
registry.fill(HIST(Charge[ct]) + HIST(Species[pt]) + HIST("meanPT/ptV1Codd"), track.eta(), spm.centrality, track.pt() * scale * ((spm.uy * spm.qyC + spm.ux * spm.qxC) / (std::sqrt(std::fabs(spm.corrQQ)) * spm.meanPtWeight)), weight);
11331133

@@ -1404,8 +1404,6 @@ struct FlowSP {
14041404
int meanPxEventCount = 0;
14051405
double sumPxCEvent = 0;
14061406

1407-
1408-
14091407
for (const auto& track : tracks) {
14101408

14111409
if (track.sign() == 0)
@@ -1529,8 +1527,8 @@ struct FlowSP {
15291527
double meanPxAEvent = sumPxAEvent / meanPxEventCount;
15301528
double meanPxCEvent = sumPxCEvent / meanPxEventCount;
15311529

1532-
registry.fill(HIST("incl/meanPT/meanPxA"), spm.centrality, spm.psiA - spm.psiC, meanPxAEvent);
1533-
registry.fill(HIST("incl/meanPT/meanPxC"), spm.centrality, spm.psiA - spm.psiC, meanPxCEvent);
1530+
registry.fill(HIST("incl/meanPT/meanPxA"), spm.centrality, spm.psiA - spm.psiC, meanPxAEvent);
1531+
registry.fill(HIST("incl/meanPT/meanPxC"), spm.centrality, spm.psiA - spm.psiC, meanPxCEvent);
15341532

15351533
// Now we want to fill the final relPt histogram
15361534
// Loop over all eta and fill bins
@@ -1555,7 +1553,7 @@ struct FlowSP {
15551553
registry.fill(HIST("incl/meanPT/meanRelPtA"), eta, spm.centrality, drelPxA / meanPt, spm.centWeight);
15561554
registry.fill(HIST("incl/meanPT/meanRelPtC"), eta, spm.centrality, drelPxC / meanPt, spm.centWeight);
15571555

1558-
if(cfgFillChargeDependence) {
1556+
if (cfgFillChargeDependence) {
15591557
registry.fill(HIST("neg/meanPT/meanRelPtA"), eta, spm.centrality, drelPxANeg / meanPtNeg, spm.centWeight);
15601558
registry.fill(HIST("pos/meanPT/meanRelPtA"), eta, spm.centrality, drelPxAPos / meanPtPos, spm.centWeight);
15611559
registry.fill(HIST("neg/meanPT/meanRelPtC"), eta, spm.centrality, drelPxCNeg / meanPtNeg, spm.centWeight);
@@ -1682,7 +1680,6 @@ struct FlowSP {
16821680

16831681
fillEventQA<kAfter>(collision, tracks);
16841682

1685-
16861683
for (const auto& track : tracks) {
16871684

16881685
ParticleType trackPID = (cfgFillPID || cfgFillPIDQA) ? getTrackPID(track) : kUnidentified;
@@ -1697,25 +1694,24 @@ struct FlowSP {
16971694
spm.charge = ((track.sign() > 0)) ? kPositive : kNegative;
16981695

16991696
if (cfgFillQABefore) {
1700-
switch (trackPID) {
1701-
case kPions:
1702-
fillAllQA<kBefore, kPions>(track);
1703-
break;
1704-
case kKaons:
1705-
fillAllQA<kBefore, kKaons>(track);
1706-
break;
1707-
case kProtons:
1708-
fillAllQA<kBefore, kProtons>(track);
1709-
break;
1710-
default: /* do nothing */
1711-
break;
1712-
}
1697+
switch (trackPID) {
1698+
case kPions:
1699+
fillAllQA<kBefore, kPions>(track);
1700+
break;
1701+
case kKaons:
1702+
fillAllQA<kBefore, kKaons>(track);
1703+
break;
1704+
case kProtons:
1705+
fillAllQA<kBefore, kProtons>(track);
1706+
break;
1707+
default: /* do nothing */
1708+
break;
1709+
}
17131710
}
17141711

17151712
if (!trackSelected(track, field))
17161713
continue;
17171714

1718-
17191715
// constrain angle to 0 -> [0,0+2pi]
17201716
auto phi = RecoDecay::constrainAngle(track.phi(), 0);
17211717

@@ -1763,49 +1759,47 @@ struct FlowSP {
17631759
break;
17641760
}
17651761

1766-
if (cfgFillChargeDependence) {
1767-
switch (spm.charge) {
1768-
case kPositive: {
1769-
switch (trackPID) {
1770-
case kPions:
1771-
fillHistograms<kPositive, kPions>(track);
1772-
break;
1773-
case kKaons:
1774-
fillHistograms<kPositive, kKaons>(track);
1775-
break;
1776-
case kProtons:
1777-
fillHistograms<kPositive, kProtons>(track);
1778-
break;
1779-
default: /* do nothing */
1780-
break;
1781-
}
1782-
break;
1762+
if (cfgFillChargeDependence) {
1763+
switch (spm.charge) {
1764+
case kPositive: {
1765+
switch (trackPID) {
1766+
case kPions:
1767+
fillHistograms<kPositive, kPions>(track);
1768+
break;
1769+
case kKaons:
1770+
fillHistograms<kPositive, kKaons>(track);
1771+
break;
1772+
case kProtons:
1773+
fillHistograms<kPositive, kProtons>(track);
1774+
break;
1775+
default: /* do nothing */
1776+
break;
17831777
}
1784-
case kNegative: {
1785-
switch (trackPID) {
1786-
case kPions:
1787-
fillHistograms<kNegative, kPions>(track);
1788-
break;
1789-
case kKaons:
1790-
fillHistograms<kNegative, kKaons>(track);
1791-
break;
1792-
case kProtons:
1793-
fillHistograms<kNegative, kProtons>(track);
1794-
break;
1795-
default: /* do nothing */
1796-
break;
1797-
}
1798-
break;
1778+
break;
1779+
}
1780+
case kNegative: {
1781+
switch (trackPID) {
1782+
case kPions:
1783+
fillHistograms<kNegative, kPions>(track);
1784+
break;
1785+
case kKaons:
1786+
fillHistograms<kNegative, kKaons>(track);
1787+
break;
1788+
case kProtons:
1789+
fillHistograms<kNegative, kProtons>(track);
1790+
break;
1791+
default: /* do nothing */
1792+
break;
17991793
}
1794+
break;
18001795
}
18011796
}
1797+
}
18021798
} // end of track loop
1803-
18041799
}
18051800

18061801
PROCESS_SWITCH(FlowSP, processDataPID, "Process analysis for non-derived data with PID", false);
18071802

1808-
18091803
void processMCReco(CC const& collision, aod::BCsWithTimestamps const&, TCs const& tracks, FilteredTCs const& filteredTracks, aod::McParticles const&)
18101804
{
18111805
auto bc = collision.template bc_as<aod::BCsWithTimestamps>();

0 commit comments

Comments
 (0)