Skip to content

Commit 131d339

Browse files
alibuildalibuild
committed
Please consider the following formatting changes
1 parent 13192eb commit 131d339

2 files changed

Lines changed: 49 additions & 53 deletions

File tree

‎PWGCF/TwoParticleCorrelations/TableProducer/identifiedBfFilter.cxx‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1409,7 +1409,6 @@ void fillNSigmaHistos(TrackObject const& track)
14091409
fhNSigmaCombo[kIdBfProton]->Fill(sqrtf(track.tofNSigmaPr() * track.tofNSigmaPr() + actualTPCNSigmaPr * actualTPCNSigmaPr), track.tpcInnerParam());
14101410
}
14111411

1412-
14131412
/// \brief Identifies the passed track with TPC and TOF data
14141413
/// \param track the track of interest
14151414
/// \return the internal track id, -1 if not accepted

‎PWGCF/TwoParticleCorrelations/Tasks/identifiedbf.cxx‎

Lines changed: 49 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -89,22 +89,22 @@ struct IdentifiedBfCorrelationsTask {
8989
//============================================================================================
9090
/* histograms */
9191
TH1F* fhVertexZA; //!<! the z vertex distribution for the current multiplicity/centrality class
92-
std::vector<TH1F*> fhN1VsPt{nch, nullptr}; //!<! weighted single particle distribution vs \f$p_T\f$, for the different species
93-
std::vector<TH2F*> fhN1VsEtaPhi{nch, nullptr}; //!<! weighted single particle distribution vs \f$\eta,\;\phi\f$, for the different species
94-
std::vector<TH2F*> fhSum1PtVsEtaPhi{nch, nullptr}; //!<! accumulated sum of weighted \f$p_T\f$ vs \f$\eta,\;\phi\f$, for the different species
95-
std::vector<TH3F*> fhN1VsZEtaPhiPt{nch, nullptr}; //!<! single particle distribution vs \f$\mbox{vtx}_z,\; \eta,\;\phi,\;p_T\f$, for the different species
96-
std::vector<TH3F*> fhN1VsZEtaPhiPtPrimary{nch, nullptr}; //!<! single particle distribution of primary particles vs \f$\mbox{vtx}_z,\; \eta,\;\phi,\;p_T\f$, for the different species
97-
std::vector<TH3F*> fhN1VsZEtaPhiPtSecondary{nch, nullptr}; //!<! single particle distribution of primary particles vs \f$\mbox{vtx}_z,\; \eta,\;\phi,\;p_T\f$, for the different species
98-
std::vector<TH3F*> fhSum1PtVsZEtaPhiPt{nch, nullptr}; //!<! accumulated sum of weighted \f$p_T\f$ vs \f$\mbox{vtx}_z,\; \eta,\;\phi,\;p_T\f$, for the different species
99-
std::vector<TH3*> fhNuaNueVsZEtaPhiPt{nch, nullptr}; //!<! NUA+NUE correction vs \f$\mbox{vtx}_z,\; \eta,\;\phi,\;p_T\f$, for the differents species
100-
std::vector<TH2*> fhPtAvgVsEtaPhi{nch, nullptr}; //!<! average \f$p_T\f$ vs \f$\eta,\;\phi\f$, for the different species
101-
std::vector<std::vector<TH2F*>> fhN2VsPtPt{nch, {nch, nullptr}}; //!<! weighted two particle distribution vs \f${p_T}_1, {p_T}_2\f$ for the different species combinations
102-
std::vector<std::vector<TH2F*>> fhN2VsDEtaDPhi{nch, {nch, nullptr}}; //!<! two-particle distribution vs \f$\Delta\eta,\;\Delta\phi\f$ for the different species combinations
103-
std::vector<std::vector<TH2F*>> fhN2ContVsDEtaDPhi{nch, {nch, nullptr}}; //!<! two-particle distribution continuous vs \f$\Delta\eta,\;\Delta\phi\f$ for the different species combinations
104-
std::vector<std::vector<TH2F*>> fhSum2PtPtVsDEtaDPhi{nch, {nch, nullptr}}; //!<! two-particle \f$\sum {p_T}_1 {p_T}_2\f$ distribution vs \f$\Delta\eta,\;\Delta\phi\f$ for the different species combinations
105-
std::vector<std::vector<TH2F*>> fhSum2DptDptVsDEtaDPhi{nch, {nch, nullptr}}; //!<! two-particle \f$\sum ({p_T}_1- <{p_T}_1>) ({p_T}_2 - <{p_T}_2>) \f$ distribution vs \f$\Delta\eta,\;\Delta\phi\f$ for the different species combinations
106-
std::vector<std::vector<TH2F*>> fhSupN1N1VsDEtaDPhi{nch, {nch, nullptr}}; //!<! suppressed n1n1 two-particle distribution vs \f$\Delta\eta,\;\Delta\phi\f$ for the different species combinations
107-
std::vector<std::vector<TH2F*>> fhSupPt1Pt1VsDEtaDPhi{nch, {nch, nullptr}}; //!<! suppressed \f${p_T}_1 {p_T}_2\f$ two-particle distribution vs \f$\Delta\eta,\;\Delta\phi\f$ for the different species combinations
92+
std::vector<TH1F*> fhN1VsPt{nch, nullptr}; //!<! weighted single particle distribution vs \f$p_T\f$, for the different species
93+
std::vector<TH2F*> fhN1VsEtaPhi{nch, nullptr}; //!<! weighted single particle distribution vs \f$\eta,\;\phi\f$, for the different species
94+
std::vector<TH2F*> fhSum1PtVsEtaPhi{nch, nullptr}; //!<! accumulated sum of weighted \f$p_T\f$ vs \f$\eta,\;\phi\f$, for the different species
95+
std::vector<TH3F*> fhN1VsZEtaPhiPt{nch, nullptr}; //!<! single particle distribution vs \f$\mbox{vtx}_z,\; \eta,\;\phi,\;p_T\f$, for the different species
96+
std::vector<TH3F*> fhN1VsZEtaPhiPtPrimary{nch, nullptr}; //!<! single particle distribution of primary particles vs \f$\mbox{vtx}_z,\; \eta,\;\phi,\;p_T\f$, for the different species
97+
std::vector<TH3F*> fhN1VsZEtaPhiPtSecondary{nch, nullptr}; //!<! single particle distribution of primary particles vs \f$\mbox{vtx}_z,\; \eta,\;\phi,\;p_T\f$, for the different species
98+
std::vector<TH3F*> fhSum1PtVsZEtaPhiPt{nch, nullptr}; //!<! accumulated sum of weighted \f$p_T\f$ vs \f$\mbox{vtx}_z,\; \eta,\;\phi,\;p_T\f$, for the different species
99+
std::vector<TH3*> fhNuaNueVsZEtaPhiPt{nch, nullptr}; //!<! NUA+NUE correction vs \f$\mbox{vtx}_z,\; \eta,\;\phi,\;p_T\f$, for the differents species
100+
std::vector<TH2*> fhPtAvgVsEtaPhi{nch, nullptr}; //!<! average \f$p_T\f$ vs \f$\eta,\;\phi\f$, for the different species
101+
std::vector<std::vector<TH2F*>> fhN2VsPtPt{nch, {nch, nullptr}}; //!<! weighted two particle distribution vs \f${p_T}_1, {p_T}_2\f$ for the different species combinations
102+
std::vector<std::vector<TH2F*>> fhN2VsDEtaDPhi{nch, {nch, nullptr}}; //!<! two-particle distribution vs \f$\Delta\eta,\;\Delta\phi\f$ for the different species combinations
103+
std::vector<std::vector<TH2F*>> fhN2ContVsDEtaDPhi{nch, {nch, nullptr}}; //!<! two-particle distribution continuous vs \f$\Delta\eta,\;\Delta\phi\f$ for the different species combinations
104+
std::vector<std::vector<TH2F*>> fhSum2PtPtVsDEtaDPhi{nch, {nch, nullptr}}; //!<! two-particle \f$\sum {p_T}_1 {p_T}_2\f$ distribution vs \f$\Delta\eta,\;\Delta\phi\f$ for the different species combinations
105+
std::vector<std::vector<TH2F*>> fhSum2DptDptVsDEtaDPhi{nch, {nch, nullptr}}; //!<! two-particle \f$\sum ({p_T}_1- <{p_T}_1>) ({p_T}_2 - <{p_T}_2>) \f$ distribution vs \f$\Delta\eta,\;\Delta\phi\f$ for the different species combinations
106+
std::vector<std::vector<TH2F*>> fhSupN1N1VsDEtaDPhi{nch, {nch, nullptr}}; //!<! suppressed n1n1 two-particle distribution vs \f$\Delta\eta,\;\Delta\phi\f$ for the different species combinations
107+
std::vector<std::vector<TH2F*>> fhSupPt1Pt1VsDEtaDPhi{nch, {nch, nullptr}}; //!<! suppressed \f${p_T}_1 {p_T}_2\f$ two-particle distribution vs \f$\Delta\eta,\;\Delta\phi\f$ for the different species combinations
108108
/* versus centrality/multiplicity profiles */
109109
std::vector<TProfile*> fhN1VsC{nch, nullptr}; //!<! weighted single particle distribution vs event centrality/multiplicity, track 1 and 2
110110
std::vector<TProfile*> fhSum1PtVsC{nch, nullptr}; //!<! accumulated sum of weighted \f$p_T\f$ vs event centrality/multiplicity, track 1 and 2
@@ -140,7 +140,7 @@ struct IdentifiedBfCorrelationsTask {
140140
{
141141
using namespace correlationstask;
142142
using namespace o2::analysis::identifiedbffilter;
143-
phi = RecoDecay::constrainAngle(phi,philow, phiup);
143+
phi = RecoDecay::constrainAngle(phi, philow, phiup);
144144
return phi;
145145
}
146146

@@ -264,17 +264,15 @@ struct IdentifiedBfCorrelationsTask {
264264
return ptavg;
265265
}
266266

267-
268267
/// \brief checks whether MC track is a physical primary or secondary
269268
/// \param track passed MC track converted to MCParticle
270269
template <typename TrackObject>
271270
void trackPrimaryCheck(TrackObject const& track, float zvtx, float corr)
272271
{
273272
if constexpr (framework::has_type_v<aod::mctracklabel::McParticleId, typename TrackObject::all_columns>) {
274-
if(isPrimaryCheck(track.template mcParticle_as<aod::McParticles>())){
273+
if (isPrimaryCheck(track.template mcParticle_as<aod::McParticles>())) {
275274
fhN1VsZEtaPhiPtPrimary[track.trackacceptedid()]->Fill(zvtx, getEtaPhiIndex(track) + 0.5, track.pt(), corr);
276-
}
277-
else{
275+
} else {
278276
fhN1VsZEtaPhiPtSecondary[track.trackacceptedid()]->Fill(zvtx, getEtaPhiIndex(track) + 0.5, track.pt(), corr);
279277
}
280278
}
@@ -288,7 +286,6 @@ struct IdentifiedBfCorrelationsTask {
288286
return particle.isPhysicalPrimary();
289287
}
290288

291-
292289
/// \brief fills the singles histograms in singles execution mode
293290
/// \param passedtracks filtered table with the tracks associated to the passed index
294291
/// \param tix index, in the singles histogram bank, for the passed filetered track table
@@ -392,7 +389,7 @@ struct IdentifiedBfCorrelationsTask {
392389
int globalbin = getDEtaDPhiGlobalIndex(track1, track2);
393390
float deltaeta = track1.eta() - track2.eta();
394391
float deltaphi = track1.phi() - track2.phi();
395-
deltaphi = RecoDecay::constrainAngle(deltaphi,deltaphilow,deltaphiup);
392+
deltaphi = RecoDecay::constrainAngle(deltaphi, deltaphilow, deltaphiup);
396393
if ((fUseConversionCuts && fPairCuts.conversionCuts(track1, track2)) || (fUseTwoTrackCut && fPairCuts.twoTrackCut(track1, track2, bfield))) {
397394
/* suppress the pair */
398395
fhSupN1N1VsDEtaDPhi[track1.trackacceptedid()][track2.trackacceptedid()]->AddBinContent(globalbin, corr);
@@ -508,19 +505,19 @@ struct IdentifiedBfCorrelationsTask {
508505
for (uint i = 0; i < nch; ++i) {
509506
/* histograms for each track, one and two */
510507
fhN1VsPt[i] = new TH1F(TString::Format("n1_%s_vsPt", tname[i].c_str()).Data(),
511-
TString::Format("#LT n_{1} #GT;p_{t,%s} (GeV/c);#LT n_{1} #GT", tname[i].c_str()).Data(),
512-
ptbins, ptlow, ptup);
508+
TString::Format("#LT n_{1} #GT;p_{t,%s} (GeV/c);#LT n_{1} #GT", tname[i].c_str()).Data(),
509+
ptbins, ptlow, ptup);
513510
/* we don't want the Sumw2 structure being created here */
514511
bool defSumw2 = TH1::GetDefaultSumw2();
515512
if constexpr (smallsingles) {
516513
fhN1VsEtaPhi[i] = new TH2F(TString::Format("n1_%s_vsEtaPhi", tname[i].c_str()).Data(),
517-
TString::Format("#LT n_{1} #GT;#eta_{%s};#varphi_{%s} (radian);#LT n_{1} #GT", tname[i].c_str(), tname[i].c_str()).Data(),
518-
etabins, etalow, etaup, phibins, philow, phiup);
514+
TString::Format("#LT n_{1} #GT;#eta_{%s};#varphi_{%s} (radian);#LT n_{1} #GT", tname[i].c_str(), tname[i].c_str()).Data(),
515+
etabins, etalow, etaup, phibins, philow, phiup);
519516
fhSum1PtVsEtaPhi[i] = new TH2F(TString::Format("sumPt_%s_vsEtaPhi", tname[i].c_str()).Data(),
520-
TString::Format("#LT #Sigma p_{t,%s} #GT;#eta_{%s};#varphi_{%s} (radian);#LT #Sigma p_{t,%s} #GT (GeV/c)",
521-
tname[i].c_str(), tname[i].c_str(), tname[i].c_str(), tname[i].c_str())
522-
.Data(),
523-
etabins, etalow, etaup, phibins, philow, phiup);
517+
TString::Format("#LT #Sigma p_{t,%s} #GT;#eta_{%s};#varphi_{%s} (radian);#LT #Sigma p_{t,%s} #GT (GeV/c)",
518+
tname[i].c_str(), tname[i].c_str(), tname[i].c_str(), tname[i].c_str())
519+
.Data(),
520+
etabins, etalow, etaup, phibins, philow, phiup);
524521
} else {
525522
TH1::SetDefaultSumw2(false);
526523
fhN1VsZEtaPhiPt[i] = new TH3F(
@@ -539,7 +536,7 @@ struct IdentifiedBfCorrelationsTask {
539536
ptbins,
540537
ptlow,
541538
ptup);
542-
539+
543540
fhN1VsZEtaPhiPtPrimary[i] = new TH3F(
544541
TString::Format("n1_%s_Primary_vsZ_vsEtaPhi_vsPt", tname[i].c_str()).Data(),
545542
TString::Format("#LT n_{1} Primary #GT;vtx_{z};#eta_{%s}#times#varphi_{%s};p_{t,%s} (GeV/c)",
@@ -630,24 +627,24 @@ struct IdentifiedBfCorrelationsTask {
630627
for (uint i = 0; i < nch; ++i) {
631628
/* histograms for each track species */
632629
fhN1VsEtaPhi[i] = new TH2F(TString::Format("n1_%s_vsEtaPhi", tname[i].c_str()).Data(),
633-
TString::Format("#LT n_{1} #GT;#eta_{%s};#varphi_{%s} (radian);#LT n_{1} #GT", tname[i].c_str(), tname[i].c_str()).Data(),
634-
etabins, etalow, etaup, phibins, philow, phiup);
630+
TString::Format("#LT n_{1} #GT;#eta_{%s};#varphi_{%s} (radian);#LT n_{1} #GT", tname[i].c_str(), tname[i].c_str()).Data(),
631+
etabins, etalow, etaup, phibins, philow, phiup);
635632
fhSum1PtVsEtaPhi[i] = new TH2F(TString::Format("sumPt_%s_vsEtaPhi", tname[i].c_str()).Data(),
636-
TString::Format("#LT #Sigma p_{t,%s} #GT;#eta_{%s};#varphi_{%s} (radian);#LT #Sigma p_{t,%s} #GT (GeV/c)",
637-
tname[i].c_str(), tname[i].c_str(), tname[i].c_str(), tname[i].c_str())
638-
.Data(),
639-
etabins, etalow, etaup, phibins, philow, phiup);
633+
TString::Format("#LT #Sigma p_{t,%s} #GT;#eta_{%s};#varphi_{%s} (radian);#LT #Sigma p_{t,%s} #GT (GeV/c)",
634+
tname[i].c_str(), tname[i].c_str(), tname[i].c_str(), tname[i].c_str())
635+
.Data(),
636+
etabins, etalow, etaup, phibins, philow, phiup);
640637
fhN1VsC[i] = new TProfile(TString::Format("n1_%s_vsM", tname[i].c_str()).Data(),
641-
TString::Format("#LT n_{1} #GT (weighted);Centrality/Multiplicity (%%);#LT n_{1} #GT").Data(),
642-
100, 0.0, 100.0);
638+
TString::Format("#LT n_{1} #GT (weighted);Centrality/Multiplicity (%%);#LT n_{1} #GT").Data(),
639+
100, 0.0, 100.0);
643640
fhSum1PtVsC[i] = new TProfile(TString::Format("sumPt_%s_vsM", tname[i].c_str()),
644-
TString::Format("#LT #Sigma p_{t,%s} #GT (weighted);Centrality/Multiplicity (%%);#LT #Sigma p_{t,%s} #GT (GeV/c)", tname[i].c_str(), tname[i].c_str()).Data(),
645-
100, 0.0, 100.0);
641+
TString::Format("#LT #Sigma p_{t,%s} #GT (weighted);Centrality/Multiplicity (%%);#LT #Sigma p_{t,%s} #GT (GeV/c)", tname[i].c_str(), tname[i].c_str()).Data(),
642+
100, 0.0, 100.0);
646643
fhN1NWVsC[i] = new TProfile(TString::Format("n1Nw_%s_vsM", tname[i].c_str()).Data(),
647-
TString::Format("#LT n_{1} #GT;Centrality/Multiplicity (%%);#LT n_{1} #GT").Data(),
648-
100, 0.0, 100.0);
644+
TString::Format("#LT n_{1} #GT;Centrality/Multiplicity (%%);#LT n_{1} #GT").Data(),
645+
100, 0.0, 100.0);
649646
fhSum1PtNWVsC[i] = new TProfile(TString::Format("sumPtNw_%s_vsM", tname[i].c_str()).Data(),
650-
TString::Format("#LT #Sigma p_{t,%s} #GT;Centrality/Multiplicity (%%);#LT #Sigma p_{t,%s} #GT (GeV/c)", tname[i].c_str(), tname[i].c_str()).Data(), 100, 0.0, 100.0);
647+
TString::Format("#LT #Sigma p_{t,%s} #GT;Centrality/Multiplicity (%%);#LT #Sigma p_{t,%s} #GT (GeV/c)", tname[i].c_str(), tname[i].c_str()).Data(), 100, 0.0, 100.0);
651648
fhNuaNueVsZEtaPhiPt[i] = nullptr;
652649
fhPtAvgVsEtaPhi[i] = nullptr;
653650
fOutputList->Add(fhN1VsEtaPhi[i]);
@@ -666,22 +663,22 @@ struct IdentifiedBfCorrelationsTask {
666663
// const char* pname = chargePairsNames[i][j].c_str();
667664
const char* pname = speciesPairNames[i][j].c_str();
668665
fhN2VsDEtaDPhi[i][j] = new TH2F(TString::Format("n2_12_vsDEtaDPhi_%s", pname), TString::Format("#LT n_{2} #GT (%s);#Delta#eta;#Delta#varphi;#LT n_{2} #GT", pname),
669-
deltaetabins, deltaetalow, deltaetaup, deltaphibins, deltaphilow, deltaphiup);
666+
deltaetabins, deltaetalow, deltaetaup, deltaphibins, deltaphilow, deltaphiup);
670667
fhN2ContVsDEtaDPhi[i][j] = new TH2F(TString::Format("n2_12cont_vsDEtaDPhi_%s", pname), TString::Format("#LT n_{2} #GT (%s);#Delta#eta;#Delta#varphi;#LT n_{2} #GT", pname),
671-
deltaetabins, deltaetalow, deltaetaup, deltaphibins, deltaphilow, deltaphiup);
668+
deltaetabins, deltaetalow, deltaetaup, deltaphibins, deltaphilow, deltaphiup);
672669
fhSum2PtPtVsDEtaDPhi[i][j] = new TH2F(TString::Format("sumPtPt_12_vsDEtaDPhi_%s", pname), TString::Format("#LT #Sigma p_{t,1}p_{t,2} #GT (%s);#Delta#eta;#Delta#varphi;#LT #Sigma p_{t,1}p_{t,2} #GT (GeV^{2})", pname),
673-
deltaetabins, deltaetalow, deltaetaup, deltaphibins, deltaphilow, deltaphiup);
670+
deltaetabins, deltaetalow, deltaetaup, deltaphibins, deltaphilow, deltaphiup);
674671
fhSum2DptDptVsDEtaDPhi[i][j] = new TH2F(TString::Format("sumDptDpt_12_vsDEtaDPhi_%s", pname), TString::Format("#LT #Sigma (p_{t,1} - #LT p_{t,1} #GT)(p_{t,2} - #LT p_{t,2} #GT) #GT (%s);#Delta#eta;#Delta#varphi;#LT #Sigma (p_{t,1} - #LT p_{t,1} #GT)(p_{t,2} - #LT p_{t,2} #GT) #GT (GeV^{2})", pname),
675-
deltaetabins, deltaetalow, deltaetaup, deltaphibins, deltaphilow, deltaphiup);
672+
deltaetabins, deltaetalow, deltaetaup, deltaphibins, deltaphilow, deltaphiup);
676673
fhSupN1N1VsDEtaDPhi[i][j] = new TH2F(TString::Format("suppn1n1_12_vsDEtaDPhi_%s", pname), TString::Format("Suppressed #LT n_{1} #GT#LT n_{1} #GT (%s);#Delta#eta;#Delta#varphi;#LT n_{1} #GT#LT n_{1} #GT", pname),
677-
deltaetabins, deltaetalow, deltaetaup, deltaphibins, deltaphilow, deltaphiup);
674+
deltaetabins, deltaetalow, deltaetaup, deltaphibins, deltaphilow, deltaphiup);
678675
fhSupPt1Pt1VsDEtaDPhi[i][j] = new TH2F(TString::Format("suppPtPt_12_vsDEtaDPhi_%s", pname), TString::Format("Suppressed #LT p_{t,1} #GT#LT p_{t,2} #GT (%s);#Delta#eta;#Delta#varphi;#LT p_{t,1} #GT#LT p_{t,2} #GT (GeV^{2})", pname),
679-
deltaetabins, deltaetalow, deltaetaup, deltaphibins, deltaphilow, deltaphiup);
676+
deltaetabins, deltaetalow, deltaetaup, deltaphibins, deltaphilow, deltaphiup);
680677
/* we return it back to previuos state */
681678
TH1::SetDefaultSumw2(defSumw2);
682679

683680
fhN2VsPtPt[i][j] = new TH2F(TString::Format("n2_12_vsPtVsPt_%s", pname), TString::Format("#LT n_{2} #GT (%s);p_{t,1} (GeV/c);p_{t,2} (GeV/c);#LT n_{2} #GT", pname),
684-
ptbins, ptlow, ptup, ptbins, ptlow, ptup);
681+
ptbins, ptlow, ptup, ptbins, ptlow, ptup);
685682

686683
fhN2VsC[i][j] = new TProfile(TString::Format("n2_12_vsM_%s", pname), TString::Format("#LT n_{2} #GT (%s) (weighted);Centrality/Multiplicity (%%);#LT n_{2} #GT", pname), 100, 0.0, 100.0);
687684
fhSum2PtPtVsC[i][j] = new TProfile(TString::Format("sumPtPt_12_vsM_%s", pname), TString::Format("#LT #Sigma p_{t,1}p_{t,2} #GT (%s) (weighted);Centrality/Multiplicity (%%);#LT #Sigma p_{t,1}p_{t,2} #GT (GeV^{2})", pname), 100, 0.0, 100.0);

0 commit comments

Comments
 (0)