Skip to content

Commit d54fc02

Browse files
alibuildalibuild
committed
Please consider the following formatting changes
1 parent 21e2452 commit d54fc02

File tree

2 files changed

+53
-62
lines changed

2 files changed

+53
-62
lines changed

‎PWGCF/TwoParticleCorrelations/TableProducer/identifiedBfFilter.cxx‎

Lines changed: 51 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,6 @@ TH2F* fhPtYA = nullptr;
107107
TH1F* fhChi2A = nullptr;
108108
TH1I* fhITSNclA = nullptr;
109109

110-
111110
TH2F* fhNSigmaTPC[kIdBfNoOfSpecies] = {nullptr};
112111
TH2F* fhNSigmaTOF[kIdBfNoOfSpecies] = {nullptr};
113112
TH2F* fhNSigmaCombo[kIdBfNoOfSpecies] = {nullptr};
@@ -170,7 +169,6 @@ TH2F* fhTruePtYB = nullptr;
170169
TH2F* fhTruePhiYA = nullptr;
171170
TH2F* fhTruePtYA = nullptr;
172171

173-
174172
TH1F* fhTrueEtaB = nullptr;
175173
TH1F* fhTrueEtaA = nullptr;
176174

@@ -185,7 +183,6 @@ TH1F* fhTrueDCAzA = nullptr;
185183
TH2F* fhTrueDCAxyzB = nullptr;
186184
TH2F* fhTrueDCAxyzA = nullptr;
187185

188-
189186
//============================================================================================
190187
// The IdentifiedBfFilter multiplicity counters
191188
//============================================================================================
@@ -441,7 +438,7 @@ void IdentifiedBfFilter::processWithoutCent(aod::CollisionEvSel const& collision
441438
}
442439

443440
void IdentifiedBfFilter::processWithCentPID(aod::CollisionEvSelCent const& collision, IdBfFullTracksPID const& ftracks)
444-
{
441+
{
445442
processReconstructed(collision, ftracks, getCentMultPercentile(collision));
446443
}
447444

@@ -820,25 +817,25 @@ struct IdentifiedBfFilterTracks {
820817
fhCompatibleCollisionsZVtxRms = new TH2F("fHistCompatibleCollisionsZVtxRms", "Compatible collisions #it{z}_{vtx} RMS;#sigma_{#it{z}_{vtx}};Multiplicity (%);counts", 100, -10.0, 10.0, 101, -0.5, 100.5);
821818
}
822819

823-
for(int sp = 0; sp < kIdBfNoOfSpecies; ++sp){
820+
for (int sp = 0; sp < kIdBfNoOfSpecies; ++sp) {
824821
fhNSigmaTPC[sp] = new TH2F(TString::Format("fhNSigmaTPC_%s", speciesName[sp]).Data(),
825-
TString::Format("N Sigma from TPC vs P for %s;N #sigma;p (GeV/c)", speciesTitle[sp]).Data(),
826-
48, -6, 6,
827-
ptbins, ptlow, ptup);
822+
TString::Format("N Sigma from TPC vs P for %s;N #sigma;p (GeV/c)", speciesTitle[sp]).Data(),
823+
48, -6, 6,
824+
ptbins, ptlow, ptup);
828825
fhNSigmaTOF[sp] = new TH2F(TString::Format("fhNSigmaTOF_%s", speciesName[sp]).Data(),
829-
TString::Format("N Sigma from TOF vs P for %s;N #sigma;p (GeV/c)", speciesTitle[sp]).Data(),
830-
48, -6, 6,
831-
ptbins, ptlow, ptup);
826+
TString::Format("N Sigma from TOF vs P for %s;N #sigma;p (GeV/c)", speciesTitle[sp]).Data(),
827+
48, -6, 6,
828+
ptbins, ptlow, ptup);
832829
fhNSigmaCombo[sp] = new TH2F(TString::Format("fhNSigmaCombo_%s", speciesName[sp]).Data(),
833-
TString::Format("N Sigma from Combo vs P for %s;N #sigma;p (GeV/c)", speciesTitle[sp]).Data(),
834-
48, -6, 6,
835-
ptbins, ptlow, ptup);
830+
TString::Format("N Sigma from Combo vs P for %s;N #sigma;p (GeV/c)", speciesTitle[sp]).Data(),
831+
48, -6, 6,
832+
ptbins, ptlow, ptup);
836833
fhNSigmaTPC_IdTrks[sp] = new TH2F(TString::Format("fhNSigmaTPC_IdTrks_%s", speciesName[sp]).Data(),
837834
TString::Format("N Sigma from TPC vs P for Identified %s;N #sigma;p (GeV/c)", speciesTitle[sp]).Data(),
838835
48, -6, 6,
839836
ptbins, ptlow, ptup);
840837
}
841-
LOGF(info,"Making histos");
838+
LOGF(info, "Making histos");
842839

843840
for (int sp = 0; sp < kIdBfNoOfSpecies + 1; ++sp) {
844841
fhPA[sp] = new TH1F(TString::Format("fHistPA_%s", speciesName[sp]).Data(),
@@ -867,11 +864,11 @@ struct IdentifiedBfFilterTracks {
867864
ptbins, ptlow, ptup, 1000, 0.0, 1000.0);
868865
}
869866
fhdEdxA[kIdBfNoOfSpecies + 1] = new TH2F(TString::Format("fhdEdxA_WrongSpecies").Data(),
870-
TString::Format("dE/dx vs P reconstructed Wrong Species; P (GeV/c); dE/dx (a.u.)").Data(),
871-
ptbins, ptlow, ptup, 1000, 0.0, 1000.0);
867+
TString::Format("dE/dx vs P reconstructed Wrong Species; P (GeV/c); dE/dx (a.u.)").Data(),
868+
ptbins, ptlow, ptup, 1000, 0.0, 1000.0);
872869
fhdEdxIPTPCA[kIdBfNoOfSpecies + 1] = new TH2F(TString::Format("fhdEdxIPTPCA_WrongSpecies").Data(),
873-
TString::Format("dE/dx vs P_{IP} reconstructed Wrong Species; P (GeV/c); dE/dx (a.u.)").Data(),
874-
ptbins, ptlow, ptup, 1000, 0.0, 1000.0);
870+
TString::Format("dE/dx vs P_{IP} reconstructed Wrong Species; P (GeV/c); dE/dx (a.u.)").Data(),
871+
ptbins, ptlow, ptup, 1000, 0.0, 1000.0);
875872
/* add the hstograms to the output list */
876873
fOutputList->Add(fhXYB);
877874
fOutputList->Add(fhYZB);
@@ -967,7 +964,7 @@ struct IdentifiedBfFilterTracks {
967964
fhTrueDCAxyA = new TH1F("TrueDCAxyA", "DCA_{xy} distribution for generated;DCA_{xy};counts (cm)", 1000, -4., 4.0);
968965
fhTrueDCAzB = new TH1F("TrueDCAzB", "DCA_{z} distribution for generated before;DCA_{z} (cm);counts", 1000, -4.0, 4.0);
969966
fhTrueDCAzA = new TH1F("TrueDCAzA", "DCA_{z} distribution for generated;DCA_{z} (cm);counts", 1000, -4.0, 4.0);
970-
fhTrueDCAxyzB = new TH2F("TrueDCAxyzB", "DCA_{xy} vs DCA_{z} distribution for generated before;DCA_{xy} (cm);DCA_{z} (cm);counts", 1000, -4.0, 4.0,1000, -4.0, 4.0);
967+
fhTrueDCAxyzB = new TH2F("TrueDCAxyzB", "DCA_{xy} vs DCA_{z} distribution for generated before;DCA_{xy} (cm);DCA_{z} (cm);counts", 1000, -4.0, 4.0, 1000, -4.0, 4.0);
971968
fhTrueDCAxyzA = new TH2F("TrueDCAxyzA", "DCA_{xy} vs DCA_{z} distribution for generated after;DCA_{xy} (cm);DCA_{z} (cm);counts", 1000, -4.0, 4.0, 1000, -4.0, 4.0);
972969

973970
for (int sp = 0; sp < kIdBfNoOfSpecies + 1; ++sp) {
@@ -1015,7 +1012,6 @@ struct IdentifiedBfFilterTracks {
10151012
fOutputList->Add(fhTrueDCAxyzB);
10161013
fOutputList->Add(fhTrueDCAxyzA);
10171014

1018-
10191015
for (int sp = 0; sp < kIdBfNoOfSpecies + 1; ++sp) {
10201016
fOutputList->Add(fhTruePA[sp]);
10211017
fOutputList->Add(fhTruePtA[sp]);
@@ -1128,12 +1124,12 @@ struct IdentifiedBfFilterTracks {
11281124

11291125
for (auto& particle : particles) {
11301126
int8_t pid = -1;
1131-
if(particle.isPhysicalPrimary()){
1127+
if (particle.isPhysicalPrimary()) {
11321128
TParticlePDG* pdgpart = fPDG->GetParticle(particle.pdgCode());
11331129
float charge = 0;
1134-
if (pdgpart != nullptr){
1130+
if (pdgpart != nullptr) {
11351131
charge = getCharge(pdgpart->Charge());
1136-
//print charge
1132+
// print charge
11371133
}
11381134
fhTrueCharge->Fill(charge);
11391135
if (charge != 0) {
@@ -1155,14 +1151,13 @@ struct IdentifiedBfFilterTracks {
11551151
}
11561152

11571153
} else {
1158-
if((particle.mcCollisionId() == 0) && traceCollId0){
1154+
if ((particle.mcCollisionId() == 0) && traceCollId0) {
11591155
LOGF(IDENTIFIEDBFFILTERLOGTRACKS, "Particle %d not Physical Primary", particle.globalIndex());
11601156
}
11611157
}
11621158
if (!fullDerivedData) {
11631159
gentracksinfo(pid);
11641160
}
1165-
11661161
}
11671162
LOGF(info,
11681163
"Processed %d accepted generated collisions out of a total of %d with %d accepted particles out of a "
@@ -1383,7 +1378,7 @@ inline MatchRecoGenSpecies IdentifiedBfFilterTracks::IdentifyTrack(TrackObject c
13831378
float min_nsigma = 999.0f;
13841379
MatchRecoGenSpecies sp_min_nsigma = kWrongSpecies;
13851380
for (int sp = 0; sp < kIdBfNoOfSpecies; ++sp) {
1386-
if (fabs(nsigmas[sp]) < fabs(min_nsigma)) { // Check if species nsigma is less than current nsigma
1381+
if (fabs(nsigmas[sp]) < fabs(min_nsigma)) { // Check if species nsigma is less than current nsigma
13871382
min_nsigma = nsigmas[sp]; // If yes, set species nsigma to current nsigma
13881383
sp_min_nsigma = MatchRecoGenSpecies(sp); // set current species sp number to current sp
13891384
}
@@ -1496,12 +1491,11 @@ inline int8_t IdentifiedBfFilterTracks::AcceptParticle(ParticleObject& particle,
14961491
}
14971492
TParticlePDG* pdgpart = fPDG->GetParticle(particle.pdgCode());
14981493
float charge = 0;
1499-
if (pdgpart != nullptr){
1494+
if (pdgpart != nullptr) {
15001495
charge = getCharge(pdgpart->Charge());
15011496
}
15021497

1503-
1504-
if (particle.isPhysicalPrimary() && fabs(charge)>0.0) {
1498+
if (particle.isPhysicalPrimary() && fabs(charge) > 0.0) {
15051499
if ((particle.mcCollisionId() == 0) && traceCollId0) {
15061500
LOGF(info, "Particle %d passed isPhysicalPrimary", particle.globalIndex());
15071501
}
@@ -1600,14 +1594,14 @@ int8_t IdentifiedBfFilterTracks::selectTrackAmbiguousCheck(CollisionObjects cons
16001594
template <typename TrackObject, typename CollisionObject>
16011595
void IdentifiedBfFilterTracks::fillTrackHistosBeforeSelection(TrackObject const& track, CollisionObject const& collision)
16021596
{
1603-
fhXYB->Fill(track.x(),track.y());
1604-
fhYZB->Fill(track.y(),track.z());
1597+
fhXYB->Fill(track.x(), track.y());
1598+
fhYZB->Fill(track.y(), track.z());
16051599
fhNClustersB->Fill(track.tpcNClsFound());
1606-
fhPhiYB->Fill(track.phi(),track.eta());
1607-
fhPtYB->Fill(track.pt(),track.eta());
1600+
fhPhiYB->Fill(track.phi(), track.eta());
1601+
fhPtYB->Fill(track.pt(), track.eta());
16081602
fhChi2B->Fill(track.tpcChi2NCl());
16091603
fhITSNclB->Fill(track.itsNCls());
1610-
1604+
16111605
fhPB->Fill(track.p());
16121606
fhPtB->Fill(track.pt());
16131607
fhEtaB->Fill(track.eta());
@@ -1620,13 +1614,13 @@ void IdentifiedBfFilterTracks::fillTrackHistosBeforeSelection(TrackObject const&
16201614
fhPtNegB->Fill(track.pt());
16211615
}
16221616

1623-
//float dcaxy = CalculateDCA(track, collision,0);
1624-
//float dcaz = CalculateDCA(track, collision,1);
1625-
//fhDCAxyB->Fill(dcaxy);
1626-
//fhDCAzB->Fill(dcaz);
1617+
// float dcaxy = CalculateDCA(track, collision,0);
1618+
// float dcaz = CalculateDCA(track, collision,1);
1619+
// fhDCAxyB->Fill(dcaxy);
1620+
// fhDCAzB->Fill(dcaz);
16271621
fhDCAxyB->Fill(track.dcaXY());
16281622
fhDCAzB->Fill(track.dcaZ());
1629-
fhDCAxyzB->Fill(track.dcaXY(),track.dcaZ());
1623+
fhDCAxyzB->Fill(track.dcaXY(), track.dcaZ());
16301624
}
16311625

16321626
template <typename TrackObject, typename CollisionObject>
@@ -1636,20 +1630,20 @@ void IdentifiedBfFilterTracks::fillTrackHistosAfterSelection(TrackObject const&
16361630
if (sp == kIdBfCharged) {
16371631
fhEtaA->Fill(track.eta());
16381632
fhPhiA->Fill(track.phi());
1639-
fhXYA->Fill(track.x(),track.y());
1640-
fhYZA->Fill(track.y(),track.z());
1633+
fhXYA->Fill(track.x(), track.y());
1634+
fhYZA->Fill(track.y(), track.z());
16411635
fhNClustersA->Fill(track.tpcNClsFound());
1642-
fhPhiYA->Fill(track.phi(),track.eta());
1643-
fhPtYA->Fill(track.pt(),track.eta());
1636+
fhPhiYA->Fill(track.phi(), track.eta());
1637+
fhPtYA->Fill(track.pt(), track.eta());
16441638
fhChi2A->Fill(track.tpcChi2NCl());
16451639
fhITSNclA->Fill(track.itsNCls());
1646-
//float dcaxy = CalculateDCA(track, collision, 0);
1647-
//float dcaz = CalculateDCA(track, collision, 1);
1648-
//fhDCAxyA->Fill(dcaxy);
1649-
//fhDCAzA->Fill(dcaz);
1640+
// float dcaxy = CalculateDCA(track, collision, 0);
1641+
// float dcaz = CalculateDCA(track, collision, 1);
1642+
// fhDCAxyA->Fill(dcaxy);
1643+
// fhDCAzA->Fill(dcaz);
16501644
fhDCAxyA->Fill(track.dcaXY());
16511645
fhDCAzA->Fill(track.dcaZ());
1652-
fhDCAxyzA->Fill(track.dcaXY(),track.dcaZ());
1646+
fhDCAxyzA->Fill(track.dcaXY(), track.dcaZ());
16531647

16541648
if (track.dcaXY() < 1.0) {
16551649
fhFineDCAxyA->Fill(track.dcaXY());
@@ -1672,8 +1666,8 @@ void IdentifiedBfFilterTracks::fillTrackHistosAfterSelection(TrackObject const&
16721666
template <typename ParticleObject, typename MCCollisionObject>
16731667
void IdentifiedBfFilterTracks::fillParticleHistosBeforeSelection(ParticleObject const& particle, MCCollisionObject const& collision, float charge)
16741668
{
1675-
fhTruePhiYB->Fill(particle.phi(),particle.eta());
1676-
fhTruePtYB->Fill(particle.pt(),particle.eta());
1669+
fhTruePhiYB->Fill(particle.phi(), particle.eta());
1670+
fhTruePtYB->Fill(particle.pt(), particle.eta());
16771671
fhTruePB->Fill(particle.p());
16781672
fhTruePtB->Fill(particle.pt());
16791673
fhTrueEtaB->Fill(particle.eta());
@@ -1693,8 +1687,8 @@ void IdentifiedBfFilterTracks::fillParticleHistosBeforeSelection(ParticleObject
16931687
fhTrueDCAxyB->Fill(TMath::Sqrt((particle.vx() - collision.posX()) * (particle.vx() - collision.posX()) +
16941688
(particle.vy() - collision.posY()) * (particle.vy() - collision.posY())));
16951689
fhTrueDCAxyzB->Fill(TMath::Sqrt((particle.vx() - collision.posX()) * (particle.vx() - collision.posX()) +
1696-
(particle.vy() - collision.posY()) * (particle.vy() - collision.posY())),
1697-
(particle.vz() - collision.posZ()));
1690+
(particle.vy() - collision.posY()) * (particle.vy() - collision.posY())),
1691+
(particle.vz() - collision.posZ()));
16981692
fhTrueDCAzB->Fill((particle.vz() - collision.posZ()));
16991693
}
17001694

@@ -1703,8 +1697,8 @@ void IdentifiedBfFilterTracks::fillParticleHistosAfterSelection(ParticleObject c
17031697
{
17041698
/* the charged species should have been called first so avoid double counting */
17051699
if (sp == kIdBfCharged) {
1706-
fhTruePhiYA->Fill(particle.phi(),particle.eta());
1707-
fhTruePtYA->Fill(particle.pt(),particle.eta());
1700+
fhTruePhiYA->Fill(particle.phi(), particle.eta());
1701+
fhTruePtYA->Fill(particle.pt(), particle.eta());
17081702
fhTrueEtaA->Fill(particle.eta());
17091703
fhTruePhiA->Fill(particle.phi());
17101704
float dcaxy = TMath::Sqrt((particle.vx() - collision.posX()) * (particle.vx() - collision.posX()) +
@@ -1719,8 +1713,8 @@ void IdentifiedBfFilterTracks::fillParticleHistosAfterSelection(ParticleObject c
17191713
(particle.vy() - collision.posY()) * (particle.vy() - collision.posY())));
17201714
fhTrueDCAzA->Fill((particle.vz() - collision.posZ()));
17211715
fhTrueDCAxyzA->Fill(TMath::Sqrt((particle.vx() - collision.posX()) * (particle.vx() - collision.posX()) +
1722-
(particle.vy() - collision.posY()) * (particle.vy() - collision.posY())),
1723-
(particle.vz() - collision.posZ()));
1716+
(particle.vy() - collision.posY()) * (particle.vy() - collision.posY())),
1717+
(particle.vz() - collision.posZ()));
17241718
}
17251719
fhTruePA[sp]->Fill(particle.p());
17261720
fhTruePtA[sp]->Fill(particle.pt());
@@ -1729,7 +1723,6 @@ void IdentifiedBfFilterTracks::fillParticleHistosAfterSelection(ParticleObject c
17291723
} else {
17301724
fhTruePtNegA[sp]->Fill(particle.pt());
17311725
}
1732-
17331726
}
17341727

17351728
WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)

‎PWGCF/TwoParticleCorrelations/TableProducer/identifiedBfFilter.h‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -85,9 +85,9 @@ enum SpeciesPairMatch {
8585
kIdBfProtonProton ///< Proton-Proton
8686
};
8787

88-
const char* speciesName[kIdBfNoOfSpecies+1] = {"e", "pi", "ka", "p","ha"};
88+
const char* speciesName[kIdBfNoOfSpecies + 1] = {"e", "pi", "ka", "p", "ha"};
8989

90-
const char* speciesTitle[kIdBfNoOfSpecies+1] = {"e", "#pi", "K", "p","ha"};
90+
const char* speciesTitle[kIdBfNoOfSpecies + 1] = {"e", "#pi", "K", "p", "ha"};
9191

9292
const int speciesChargeValue1[kIdBfNoOfSpecies] = {
9393
0, //< electron
@@ -727,8 +727,6 @@ inline bool matchTrackType(TrackObject const& track, CollisionObject const& coll
727727
}
728728
}
729729

730-
731-
732730
/// \brief Accepts or not the passed track
733731
/// \param track the track of interest
734732
/// \return the internal track id, -1 if not accepted

0 commit comments

Comments
 (0)