Skip to content

Commit 5e3b396

Browse files
ljoergenljoergen
authored
appeasing o2 linter and mega linter
changing the file name next time
1 parent c5c8d64 commit 5e3b396

File tree

1 file changed

+68
-65
lines changed

1 file changed

+68
-65
lines changed

‎PWGLF/Tasks/Nuspex/AngularCorrelationsInJets.cxx‎

Lines changed: 68 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,11 @@
88
// In applying this license CERN does not waive the privileges and immunities
99
// granted to it by virtue of its status as an Intergovernmental Organization
1010
// or submit itself to any jurisdiction.
11-
//
12-
// author: Lars Jörgensen
11+
///
12+
/// \file AngularCorrelationsInJets.cxx
13+
///
14+
/// \author Lars Jörgensen ([email protected])
15+
/// \brief task for analysis of antinuclei in jets using Fastjet
1316

1417
#include <vector>
1518
#include <utility>
@@ -70,7 +73,7 @@ struct AngularCorrelationsInJets {
7073
Configurable<bool> dopipiCorrelations{"dopipiCorrelations", false, "measure correlations for pi+-p+, pi--pi-"};
7174
Configurable<bool> doJetCorrelations{"doJetCorrelations", false, "measure correlations for all particles inside jets"};
7275
Configurable<bool> doFullCorrelations{"doFullCorrelations", false, "measure correlations for all particles in an event"};
73-
Configurable<bool> measureKaons{"dokkCorrelations", false, "measure correlations for K-K"};
76+
Configurable<bool> measureKaons{"measureKaons", false, "measure correlations for K-K"};
7477

7578
// Track Cuts
7679
Configurable<int> minNCrossedRowsTPC{"minNCrossedRowsTPC", 80, "min number of crossed rows TPC"};
@@ -147,7 +150,7 @@ struct AngularCorrelationsInJets {
147150

148151
// QC Configurables
149152
Configurable<float> zVtx{"zVtx", 10.0, "max zVertex"};
150-
Configurable<float> Rmax{"Rmax", 0.4, "Maximum radius for jet and UE regions"};
153+
Configurable<float> rMax{"rMax", 0.4, "Maximum radius for jet and UE regions"};
151154

152155
Service<o2::ccdb::BasicCCDBManager> ccdb;
153156
int mRunNumber;
@@ -418,7 +421,7 @@ struct AngularCorrelationsInJets {
418421
return false;
419422
if (track.itsChi2NCl() > maxChi2ITS)
420423
return false;
421-
if (fabs(track.eta()) > maxEta)
424+
if (std::fabs(track.eta()) > maxEta)
422425
return false;
423426
if (track.pt() < minTrackPt)
424427
return false;
@@ -913,7 +916,7 @@ struct AngularCorrelationsInJets {
913916

914917
if (subtractedJetPerp.pt() < minJetPt) // cut on jet w/o bkg
915918
return jetCounter;
916-
if ((fabs(jet.eta()) + jetR) > (maxEta - deltaEtaEdge))
919+
if ((std::fabs(jet.eta()) + jetR) > (maxEta - deltaEtaEdge))
917920
return jetCounter;
918921
jetCounter++;
919922
registryData.fill(HIST("ptTotalSubJetPerp"), subtractedJetPerp.pt());
@@ -960,14 +963,14 @@ struct AngularCorrelationsInJets {
960963
registryQC.fill(HIST("maxRadiusVsPt"), jet.pt(), maxRadius);
961964

962965
// QA for comparison with nuclei_in_jets
963-
TVector3 UEAxis1(0.0, 0.0, 0.0);
964-
TVector3 UEAxis2(0.0, 0.0, 0.0);
965-
getPerpendicularAxis(pJet, UEAxis1, +1.0);
966-
getPerpendicularAxis(pJet, UEAxis2, -1.0);
967-
968-
double NchJetPlusUE(0);
969-
double NchJet(0);
970-
double NchUE(0);
966+
TVector3 ueAxis1(0.0, 0.0, 0.0);
967+
TVector3 ueAxis2(0.0, 0.0, 0.0);
968+
getPerpendicularAxis(pJet, ueAxis1, +1.0);
969+
getPerpendicularAxis(pJet, ueAxis2, -1.0);
970+
971+
double nchJetPlusUE(0);
972+
double nchJet(0);
973+
double nchUE(0);
971974
double ptJetPlusUE(0);
972975
double ptJet(0);
973976
double ptUE(0);
@@ -977,38 +980,38 @@ struct AngularCorrelationsInJets {
977980
double deltaEtaJet = particleDir.Eta() - pJet.Eta();
978981
double deltaPhiJet = getDeltaPhi(particleDir.Phi(), pJet.Phi());
979982
double deltaRJet = std::abs(deltaEtaJet * deltaEtaJet + deltaPhiJet * deltaPhiJet);
980-
double deltaEtaUE1 = particleDir.Eta() - UEAxis1.Eta();
981-
double deltaPhiUE1 = getDeltaPhi(particleDir.Phi(), UEAxis1.Phi());
983+
double deltaEtaUE1 = particleDir.Eta() - ueAxis1.Eta();
984+
double deltaPhiUE1 = getDeltaPhi(particleDir.Phi(), ueAxis1.Phi());
982985
double deltaRUE1 = std::abs(deltaEtaUE1 * deltaEtaUE1 + deltaPhiUE1 * deltaPhiUE1);
983-
double deltaEtaUE2 = particleDir.Eta() - UEAxis2.Eta();
984-
double deltaPhiUE2 = getDeltaPhi(particleDir.Phi(), UEAxis2.Phi());
986+
double deltaEtaUE2 = particleDir.Eta() - ueAxis2.Eta();
987+
double deltaPhiUE2 = getDeltaPhi(particleDir.Phi(), ueAxis2.Phi());
985988
double deltaRUE2 = std::abs(deltaEtaUE2 * deltaEtaUE2 + deltaPhiUE2 * deltaPhiUE2);
986989

987-
if (deltaRJet < Rmax) {
990+
if (deltaRJet < rMax) {
988991
if (deltaPhiJet != -999)
989992
registryQC.fill(HIST("deltaEtadeltaPhiJet"), deltaEtaJet, deltaPhiJet);
990-
NchJetPlusUE++;
993+
nchJetPlusUE++;
991994
ptJetPlusUE = ptJetPlusUE + track.pt();
992995
}
993-
if (deltaRUE1 < Rmax) {
996+
if (deltaRUE1 < rMax) {
994997
if (deltaPhiUE1 != -999)
995998
registryQC.fill(HIST("deltaEtadeltaPhiUE"), deltaEtaUE1, deltaPhiUE1);
996-
NchUE++;
999+
nchUE++;
9971000
ptUE = ptUE + track.pt();
9981001
}
999-
if (deltaRUE2 < Rmax) {
1002+
if (deltaRUE2 < rMax) {
10001003
if (deltaPhiUE2 != -999)
10011004
registryQC.fill(HIST("deltaEtadeltaPhiUE"), deltaEtaUE2, deltaPhiUE2);
1002-
NchUE++;
1005+
nchUE++;
10031006
ptUE = ptUE + track.pt();
10041007
}
10051008
} // for (const auto& [index, track] : particles)
10061009

1007-
NchJet = NchJetPlusUE - 0.5 * NchUE;
1010+
nchJet = nchJetPlusUE - 0.5 * nchUE;
10081011
ptJet = ptJetPlusUE - 0.5 * ptUE;
1009-
registryQC.fill(HIST("multiplicityJetPlusUE"), NchJetPlusUE);
1010-
registryQC.fill(HIST("multiplicityJet"), NchJet);
1011-
registryQC.fill(HIST("multiplicityUE"), 0.5 * NchUE);
1012+
registryQC.fill(HIST("multiplicityJetPlusUE"), nchJetPlusUE);
1013+
registryQC.fill(HIST("multiplicityJet"), nchJet);
1014+
registryQC.fill(HIST("multiplicityUE"), 0.5 * nchUE);
10121015
registryQC.fill(HIST("ptJetPlusUE"), ptJetPlusUE);
10131016
registryQC.fill(HIST("ptJet"), ptJet);
10141017
registryQC.fill(HIST("ptUE"), 0.5 * ptUE);
@@ -1209,13 +1212,13 @@ struct AngularCorrelationsInJets {
12091212
registryData.fill(HIST("eventProtocol"), 2);
12101213

12111214
// Reconstruct Jets
1212-
double ghost_maxrap = 1.0;
1213-
double ghost_area = 0.005;
1214-
int ghost_repeat = 1;
1215+
double ghostMaxrap = 1.0;
1216+
double ghostArea = 0.005;
1217+
int ghostRepeat = 1;
12151218
fastjet::JetDefinition jetDef(fastjet::antikt_algorithm, jetR);
12161219
fastjet::JetDefinition jetDefBkg(fastjet::kt_algorithm, jetR);
1217-
fastjet::AreaDefinition areaDef(fastjet::active_area, fastjet::GhostedAreaSpec(ghost_maxrap, ghost_repeat, ghost_area));
1218-
fastjet::AreaDefinition areaDefBkg(fastjet::active_area_explicit_ghosts, fastjet::GhostedAreaSpec(ghost_maxrap));
1220+
fastjet::AreaDefinition areaDef(fastjet::active_area, fastjet::GhostedAreaSpec(ghostMaxrap, ghostRepeat, ghostArea));
1221+
fastjet::AreaDefinition areaDefBkg(fastjet::active_area_explicit_ghosts, fastjet::GhostedAreaSpec(ghostMaxrap));
12191222
fastjet::ClusterSequenceArea clusterSeq(jetInput, jetDef, areaDef);
12201223
jets = sorted_by_pt(clusterSeq.inclusive_jets());
12211224

@@ -1282,13 +1285,13 @@ struct AngularCorrelationsInJets {
12821285
registryData.fill(HIST("eventProtocol"), 2);
12831286

12841287
// Reconstruct Jets
1285-
double ghost_maxrap = 1.0;
1286-
double ghost_area = 0.005;
1287-
int ghost_repeat = 1;
1288+
double ghostMaxrap = 1.0;
1289+
double ghostArea = 0.005;
1290+
int ghostRepeat = 1;
12881291
fastjet::JetDefinition jetDef(fastjet::antikt_algorithm, jetR);
12891292
fastjet::JetDefinition jetDefBkg(fastjet::kt_algorithm, jetR);
1290-
fastjet::AreaDefinition areaDef(fastjet::active_area, fastjet::GhostedAreaSpec(ghost_maxrap, ghost_repeat, ghost_area));
1291-
fastjet::AreaDefinition areaDefBkg(fastjet::active_area_explicit_ghosts, fastjet::GhostedAreaSpec(ghost_maxrap));
1293+
fastjet::AreaDefinition areaDef(fastjet::active_area, fastjet::GhostedAreaSpec(ghostMaxrap, ghostRepeat, ghostArea));
1294+
fastjet::AreaDefinition areaDefBkg(fastjet::active_area_explicit_ghosts, fastjet::GhostedAreaSpec(ghostMaxrap));
12921295
fastjet::ClusterSequenceArea clusterSeq(jetInput, jetDef, areaDef);
12931296
jets = sorted_by_pt(clusterSeq.inclusive_jets());
12941297

@@ -1301,7 +1304,7 @@ struct AngularCorrelationsInJets {
13011304
auto [rho, rhoM] = bkgSub.estimateRhoAreaMedian(jetInput, doSparse);
13021305
auto [rhoPerp, rhoMPerp] = bkgSub.estimateRhoPerpCone(jetInput, jets);
13031306

1304-
for (auto& jet : jets) {
1307+
for (const auto& jet : jets) {
13051308
if (!jet.has_constituents())
13061309
continue;
13071310
fastjet::PseudoJet subtractedJetPerp(0., 0., 0., 0.);
@@ -1352,14 +1355,14 @@ struct AngularCorrelationsInJets {
13521355
// QA for comparison with nuclei_in_jets
13531356
TVector3 pJet(0., 0., 0.);
13541357
pJet.SetXYZ(jet.px(), jet.py(), jet.pz());
1355-
TVector3 UEAxis1(0.0, 0.0, 0.0);
1356-
TVector3 UEAxis2(0.0, 0.0, 0.0);
1357-
getPerpendicularAxis(pJet, UEAxis1, +1.0);
1358-
getPerpendicularAxis(pJet, UEAxis2, -1.0);
1359-
1360-
double NchJetPlusUE(0);
1361-
double NchJet(0);
1362-
double NchUE(0);
1358+
TVector3 ueAxis1(0.0, 0.0, 0.0);
1359+
TVector3 ueAxis2(0.0, 0.0, 0.0);
1360+
getPerpendicularAxis(pJet, ueAxis1, +1.0);
1361+
getPerpendicularAxis(pJet, ueAxis2, -1.0);
1362+
1363+
double nchJetPlusUE(0);
1364+
double nchJet(0);
1365+
double nchUE(0);
13631366
double ptJetPlusUE(0);
13641367
double ptJet(0);
13651368
double ptUE(0);
@@ -1369,38 +1372,38 @@ struct AngularCorrelationsInJets {
13691372
double deltaEtaJet = particleDir.Eta() - pJet.Eta();
13701373
double deltaPhiJet = getDeltaPhi(particleDir.Phi(), pJet.Phi());
13711374
double deltaRJet = std::abs(deltaEtaJet * deltaEtaJet + deltaPhiJet * deltaPhiJet);
1372-
double deltaEtaUE1 = particleDir.Eta() - UEAxis1.Eta();
1373-
double deltaPhiUE1 = getDeltaPhi(particleDir.Phi(), UEAxis1.Phi());
1375+
double deltaEtaUE1 = particleDir.Eta() - ueAxis1.Eta();
1376+
double deltaPhiUE1 = getDeltaPhi(particleDir.Phi(), ueAxis1.Phi());
13741377
double deltaRUE1 = std::abs(deltaEtaUE1 * deltaEtaUE1 + deltaPhiUE1 * deltaPhiUE1);
1375-
double deltaEtaUE2 = particleDir.Eta() - UEAxis2.Eta();
1376-
double deltaPhiUE2 = getDeltaPhi(particleDir.Phi(), UEAxis2.Phi());
1378+
double deltaEtaUE2 = particleDir.Eta() - ueAxis2.Eta();
1379+
double deltaPhiUE2 = getDeltaPhi(particleDir.Phi(), ueAxis2.Phi());
13771380
double deltaRUE2 = std::abs(deltaEtaUE2 * deltaEtaUE2 + deltaPhiUE2 * deltaPhiUE2);
13781381

1379-
if (deltaRJet < Rmax) {
1382+
if (deltaRJet < rMax) {
13801383
if (deltaPhiJet != -999)
13811384
registryQC.fill(HIST("deltaEtadeltaPhiJet"), deltaEtaJet, deltaPhiJet);
1382-
NchJetPlusUE++;
1385+
nchJetPlusUE++;
13831386
ptJetPlusUE = ptJetPlusUE + track.pt();
13841387
}
1385-
if (deltaRUE1 < Rmax) {
1388+
if (deltaRUE1 < rMax) {
13861389
if (deltaPhiUE1 != -999)
13871390
registryQC.fill(HIST("deltaEtadeltaPhiUE"), deltaEtaUE1, deltaPhiUE1);
1388-
NchUE++;
1391+
nchUE++;
13891392
ptUE = ptUE + track.pt();
13901393
}
1391-
if (deltaRUE2 < Rmax) {
1394+
if (deltaRUE2 < rMax) {
13921395
if (deltaPhiUE2 != -999)
13931396
registryQC.fill(HIST("deltaEtadeltaPhiUE"), deltaEtaUE2, deltaPhiUE2);
1394-
NchUE++;
1397+
nchUE++;
13951398
ptUE = ptUE + track.pt();
13961399
}
13971400
} // for (const auto& [index, track] : particles)
13981401

1399-
NchJet = NchJetPlusUE - 0.5 * NchUE;
1402+
nchJet = nchJetPlusUE - 0.5 * nchUE;
14001403
ptJet = ptJetPlusUE - 0.5 * ptUE;
1401-
registryQC.fill(HIST("multiplicityJetPlusUE"), NchJetPlusUE);
1402-
registryQC.fill(HIST("multiplicityJet"), NchJet);
1403-
registryQC.fill(HIST("multiplicityUE"), 0.5 * NchUE);
1404+
registryQC.fill(HIST("multiplicityJetPlusUE"), nchJetPlusUE);
1405+
registryQC.fill(HIST("multiplicityJet"), nchJet);
1406+
registryQC.fill(HIST("multiplicityUE"), 0.5 * nchUE);
14041407
registryQC.fill(HIST("ptJetPlusUE"), ptJetPlusUE);
14051408
registryQC.fill(HIST("ptJet"), ptJet);
14061409
registryQC.fill(HIST("ptUE"), 0.5 * ptUE);
@@ -1560,8 +1563,8 @@ struct AngularCorrelationsInJets {
15601563

15611564
void processRun3(soa::Filtered<soa::Join<aod::JetCollisions, aod::JCollisionPIs, aod::BkgChargedRhos>>::iterator const& collision,
15621565
soa::Filtered<soa::Join<aod::ChargedJets, aod::ChargedJetConstituents>> const& allJets,
1563-
soa::Filtered<FullTracksRun3> const& /* ,
1564-
soa::Filtered<JetTracksRun3> const& */
1566+
soa::Filtered<FullTracksRun3> const&
1567+
/* , soa::Filtered<JetTracksRun3> const& */
15651568
)
15661569
{
15671570
registryData.fill(HIST("eventProtocol"), 0);
@@ -1838,7 +1841,7 @@ struct AngularCorrelationsInJets {
18381841
}
18391842
PROCESS_SWITCH(AngularCorrelationsInJets, processRun3MCReco, "process Run 3 MC, not currently usable", false);
18401843

1841-
void processMCRun2old(McCollisions const& collisions, soa::Filtered<McTracksRun2> const& tracks, BCsWithRun2Info const&, aod::McParticles&, aod::McCollisions const&)
1844+
void processMCRun2old(McCollisions const& collisions, soa::Filtered<McTracksRun2> const& tracks, BCsWithRun2Info const&, aod::McParticles& const&, aod::McCollisions const&)
18421845
{
18431846
for (const auto& collision : collisions) {
18441847
auto bc = collision.bc_as<BCsWithRun2Info>();
@@ -1857,7 +1860,7 @@ struct AngularCorrelationsInJets {
18571860
}
18581861
PROCESS_SWITCH(AngularCorrelationsInJets, processMCRun2old, "process Run 2 MC w/o jet tables, not currently usable", false);
18591862

1860-
void processMCRun3old(McCollisions const& collisions, soa::Filtered<McTracksRun3old> const& tracks, aod::McParticles&, aod::McCollisions const&)
1863+
void processMCRun3old(McCollisions const& collisions, soa::Filtered<McTracksRun3old> const& tracks, aod::McParticles& const&, aod::McCollisions const&)
18611864
{
18621865
for (const auto& collision : collisions) {
18631866
registryData.fill(HIST("eventProtocol"), 0);

0 commit comments

Comments
 (0)