Skip to content

Commit 1b1dc8f

Browse files
authored
fix clang issue
1 parent f584227 commit 1b1dc8f

1 file changed

Lines changed: 26 additions & 40 deletions

File tree

PWGCF/EbyEFluctuations/Tasks/meanPtFlucId.cxx

Lines changed: 26 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -85,13 +85,13 @@ struct MeanPtFlucId {
8585
Configurable<float> cfgP1corr{"cfgP1corr", 0.0001, "p_{1} for corrected N_{TPC} "};
8686
Configurable<float> cfgP2corr{"cfgP2corr", 0.0001, "p_{2} for corrected N_{TPC} "};
8787
Configurable<bool> cfgSel8{"cfgSel8", true, "Sel8 trigger"};
88-
Configurable<bool> cfgNtpcEventCut{"cfgNtpcEventCut", true, "N_{TPC} Event Cut for reco"};
8988
Configurable<bool> cfgNoSameBunchPileup{"cfgNoSameBunchPileup", true, "kNoSameBunchPileup"};
9089
Configurable<bool> cfgIsVertexITSTPC{"cfgIsVertexITSTPC", true, "kIsVertexITSTPC"};
9190
Configurable<bool> cfgLightIonCuts{"cfgLightIonCuts", false, "Light Ion Cuts"};
9291
Configurable<bool> cfgIsGoodITSLayersAll{"cfgIsGoodITSLayersAll", true, "kIsGoodITSLayersAll"};
9392
Configurable<bool> cfgIsGoodZvtxFT0vsPV{"cfgIsGoodZvtxFT0vsPV", true, "kIsGoodZvtxFT0vsPV"};
9493
Configurable<bool> cfgRejTrk{"cfgRejTrk", true, "Rejected Tracks"};
94+
Configurable<bool> cfgNtpcEventCut{"cfgNtpcEventCut", true, "N_{TPC} Event Cut for reco"};
9595
ConfigurableAxis multTPCBins{"multTPCBins", {150, 0, 150}, "TPC Multiplicity bins"};
9696
ConfigurableAxis multMCBins{"multMCBins", {300, 0, 300}, "MC Multiplicity bins"};
9797
ConfigurableAxis multCorrBins{"multCorrBins", {100, 0., 150.}, "Corrected TPC Multiplicity bins"};
@@ -154,7 +154,7 @@ struct MeanPtFlucId {
154154
Gen_Proton
155155
};
156156

157-
static constexpr std::array<std::string_view, 12> Dire = {
157+
static constexpr std::array<std::string_view, 12> Dire{
158158
"QA/after/",
159159
"QA/Pion/",
160160
"QA/Kaon/",
@@ -575,19 +575,18 @@ struct MeanPtFlucId {
575575
template <typename T>
576576
bool rejectTracks(T const& track)
577577
{
578-
return (((track.tpcNSigmaEl()) > -cfgCutNSig3 &&
579-
(track.tpcNSigmaEl()) < cfgCutNSig5) &&
580-
(std::fabs(track.tpcNSigmaPi()) > cfgCutNSig3 &&
581-
std::fabs(track.tpcNSigmaKa()) > cfgCutNSig3 &&
582-
std::fabs(track.tpcNSigmaPr()) > cfgCutNSig3));
578+
return ((track.tpcNSigmaEl()) > -cfgCutNSig3 &&
579+
(track.tpcNSigmaEl()) < cfgCutNSig5) &&
580+
(std::fabs(track.tpcNSigmaPi()) > cfgCutNSig3 &&
581+
std::fabs(track.tpcNSigmaKa()) > cfgCutNSig3 &&
582+
std::fabs(track.tpcNSigmaPr()) > cfgCutNSig3);
583583
}
584584

585585
// PID cuts for identified particles
586586
template <typename T>
587587
bool identifyParticle(T const& track, PIDType species, PIDType reject1, PIDType reject2, float p, float momThreshold)
588588
{
589589
std::vector<float> vTpcNSigma = {-999.f, track.tpcNSigmaPi(), track.tpcNSigmaKa(), track.tpcNSigmaPr()};
590-
591590
std::vector<float> vTofNSigma = {-999.f, track.tofNSigmaPi(), track.tofNSigmaKa(), track.tofNSigmaPr()};
592591

593592
const int sp = static_cast<int>(species);
@@ -685,7 +684,7 @@ struct MeanPtFlucId {
685684

686685
// Fill Charged particles QA histograms after selection cuts:
687686
template <typename T>
688-
void fillChargedQAHistos(T const& track, float centFT0M)
687+
void fillChargedQAHistos(T const& track)
689688
{
690689
hist.fill(HIST("QA/Charged/h_Eta"), track.eta());
691690
hist.fill(HIST("QA/Charged/h_Phi"), track.phi());
@@ -712,32 +711,26 @@ struct MeanPtFlucId {
712711
hist.fill(HIST("QA/before/h2_pvsm2"), track.mass() * track.mass(), track.p());
713712

714713
hist.fill(HIST("QA/Pion/before/h2_TPCNsigma"), track.p(), track.tpcNSigmaPi());
715-
if (!track.hasTOF()) {
714+
if (!track.hasTOF())
716715
hist.fill(HIST("QA/Pion/before/h2_TPCNsigma_nottof"), track.p(), track.tpcNSigmaPi());
717-
}
718-
if (track.hasTOF()) {
716+
if (track.hasTOF())
719717
hist.fill(HIST("QA/Pion/before/h2_TPCNsigma_tof"), track.p(), track.tpcNSigmaPi());
720-
}
721718
hist.fill(HIST("QA/Pion/before/h2_TOFNsigma"), track.p(), track.tofNSigmaPi());
722719
hist.fill(HIST("QA/Pion/before/h2_TpcTofNsigma"), track.tpcNSigmaPi(), track.tofNSigmaPi());
723720

724721
hist.fill(HIST("QA/Kaon/before/h2_TPCNsigma"), track.p(), track.tpcNSigmaKa());
725-
if (!track.hasTOF()) {
722+
if (!track.hasTOF())
726723
hist.fill(HIST("QA/Kaon/before/h2_TPCNsigma_nottof"), track.p(), track.tpcNSigmaKa());
727-
}
728-
if (track.hasTOF()) {
724+
if (track.hasTOF())
729725
hist.fill(HIST("QA/Kaon/before/h2_TPCNsigma_tof"), track.p(), track.tpcNSigmaKa());
730-
}
731726
hist.fill(HIST("QA/Kaon/before/h2_TOFNsigma"), track.p(), track.tofNSigmaKa());
732727
hist.fill(HIST("QA/Kaon/before/h2_TpcTofNsigma"), track.tpcNSigmaKa(), track.tofNSigmaKa());
733728

734729
hist.fill(HIST("QA/Proton/before/h2_TPCNsigma"), track.p(), track.tpcNSigmaPr());
735-
if (!track.hasTOF()) {
730+
if (!track.hasTOF())
736731
hist.fill(HIST("QA/Proton/before/h2_TPCNsigma_nottof"), track.p(), track.tpcNSigmaPr());
737-
}
738-
if (track.hasTOF()) {
732+
if (track.hasTOF())
739733
hist.fill(HIST("QA/Proton/before/h2_TPCNsigma_tof"), track.p(), track.tpcNSigmaPr());
740-
}
741734
hist.fill(HIST("QA/Proton/before/h2_TOFNsigma"), track.p(), track.tofNSigmaPr());
742735
hist.fill(HIST("QA/Proton/before/h2_TpcTofNsigma"), track.tpcNSigmaPr(), track.tofNSigmaPr());
743736
}
@@ -815,10 +808,10 @@ struct MeanPtFlucId {
815808
}
816809
}
817810

818-
int getPtBin(double pt, const std::vector<double>& ptBins)
811+
int getPtBin(double pt, const std::vector<double>& ptB)
819812
{
820-
for (std::size_t i = 0; i < ptBins.size() - 1; ++i) {
821-
if (pt >= ptBins[i] && pt < ptBins[i + 1]) {
813+
for (size_t i = 0; i < ptB.size() - 1; ++i) {
814+
if (pt >= ptB[i] && pt < ptB[i + 1]) {
822815
return i;
823816
}
824817
}
@@ -827,7 +820,7 @@ struct MeanPtFlucId {
827820

828821
int getEtaBin(double eta)
829822
{
830-
for (std::size_t i = 0; i < etaBins->size() - 1; ++i) {
823+
for (size_t i = 0; i < etaBins->size() - 1; ++i) {
831824
if (eta >= etaBins->at(i) && eta < etaBins->at(i + 1)) {
832825
return i;
833826
}
@@ -849,33 +842,30 @@ struct MeanPtFlucId {
849842
int ipt = getPtBin(trk.pt, ptB);
850843
int ieta = getEtaBin(trk.eta);
851844

852-
if (ipt < 0 || ieta < 0) {
845+
if (ipt < 0 || ieta < 0)
853846
continue;
854-
}
855847

856848
int k = getK(ipt, ieta);
857849

858850
hist.fill(HIST(Dire[Mode]) + HIST("hN1Matrix"), centFT0M, k, 1.0);
859851
hist.fill(HIST(Dire[Mode]) + HIST("hPt1Matrix"), centFT0M, k, trk.pt);
860852
}
861853

862-
for (std::size_t i = 0; i < tracks.size(); ++i) {
854+
for (size_t i = 0; i < tracks.size(); ++i) {
863855
int ipt1 = getPtBin(tracks[i].pt, ptB);
864856
int ieta1 = getEtaBin(tracks[i].eta);
865857

866-
if (ipt1 < 0 || ieta1 < 0) {
858+
if (ipt1 < 0 || ieta1 < 0)
867859
continue;
868-
}
869860

870861
int k1 = getK(ipt1, ieta1);
871862

872-
for (std::size_t j = i + 1; j < tracks.size(); ++j) {
863+
for (size_t j = i + 1; j < tracks.size(); ++j) {
873864
int ipt2 = getPtBin(tracks[j].pt, ptB);
874865
int ieta2 = getEtaBin(tracks[j].eta);
875866

876-
if (ipt2 < 0 || ieta2 < 0) {
867+
if (ipt2 < 0 || ieta2 < 0)
877868
continue;
878-
}
879869

880870
int k2 = getK(ipt2, ieta2);
881871

@@ -1033,7 +1023,7 @@ struct MeanPtFlucId {
10331023
hist.fill(HIST("QA/Charged/h2_Pt_EtaMC"), etaMC, ptMC);
10341024
hist.fill(HIST("QA/Charged/h3_Pt_EtaMC_centFT0M"), etaMC, ptMC, centFT0M);
10351025

1036-
fillChargedQAHistos(track, centFT0M);
1026+
fillChargedQAHistos(track);
10371027

10381028
fillBeforePIDQAHistos(track);
10391029

@@ -1112,26 +1102,22 @@ struct MeanPtFlucId {
11121102
pionTracksGen.clear();
11131103
kaonTracksGen.clear();
11141104
protonTracksGen.clear();
1115-
11161105
nSim = 0;
11171106
int nChSim = 0, nPiSim = 0, nKaSim = 0, nPrSim = 0;
11181107
float pt = 0., eta = 0, phi = 0., rap = 0.;
11191108
double q1Ch = 0., q2Ch = 0., q1Pi = 0., q2Pi = 0., q1Ka = 0., q2Ka = 0., q1Pr = 0., q2Pr = 0.;
1120-
11211109
for (auto const& mcPart : mcParticles) {
11221110
if (!mcPart.isPhysicalPrimary()) {
11231111
continue;
11241112
}
11251113

11261114
auto* particle = pdg->GetParticle(mcPart.pdgCode());
11271115

1128-
if (!particle) {
1116+
if (!particle)
11291117
continue;
1130-
}
11311118

1132-
if (particle->Charge() == 0) {
1119+
if (particle->Charge() == 0)
11331120
continue;
1134-
}
11351121

11361122
pt = mcPart.pt();
11371123
eta = mcPart.eta();

0 commit comments

Comments
 (0)