Skip to content

Commit 47473a9

Browse files
author
Preet Pati
committed
Fixed the formatting and linter errors
1 parent bb06557 commit 47473a9

2 files changed

Lines changed: 18 additions & 42 deletions

File tree

PWGCF/Flow/Tasks/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,4 +62,4 @@ o2physics_add_dpl_workflow(flow-sp
6262
o2physics_add_dpl_workflow(flow-pbpb-reso
6363
SOURCES flowPbpbReso.cxx
6464
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore O2Physics::GFWCore
65-
COMPONENT_NAME Analysis)
65+
COMPONENT_NAME Analysis)

PWGCF/Flow/Tasks/flowPbpbReso.cxx

Lines changed: 17 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ struct FlowPbpbReso {
181181
pz2 = candidate2.pz();
182182
p1 = candidate1.p();
183183
p2 = candidate2.p();
184-
angle = TMath::ACos((pt1 * pt2 + pz1 * pz2) / (p1 * p2));
184+
angle = std::acos((pt1 * pt2 + pz1 * pz2) / (p1 * p2));
185185
if (cfgUsePointingAngle && angle < cfgPointingAnglePhi) {
186186
return false;
187187
}
@@ -215,10 +215,10 @@ struct FlowPbpbReso {
215215
template <typename T>
216216
bool selectionPIDpTdependent(const T& candidate)
217217
{
218-
if (candidate.pt() < 0.5 && TMath::Abs(candidate.tpcNSigmaKa()) < cfgTpcNsigmaCut) {
218+
if (candidate.pt() < 0.5 && std::abs(candidate.tpcNSigmaKa()) < cfgTpcNsigmaCut) {
219219
return true;
220220
}
221-
if (candidate.pt() >= 0.5 && candidate.hasTOF() && candidate.beta() > cfgCutTOFBeta && TMath::Abs(candidate.tpcNSigmaKa()) < cfgTpcNsigmaCut && TMath::Abs(candidate.tofNSigmaKa()) < cfgTofNsigmaCut) {
221+
if (candidate.pt() >= 0.5 && candidate.hasTOF() && candidate.beta() > cfgCutTOFBeta && std::abs(candidate.tpcNSigmaKa()) < cfgTpcNsigmaCut && std::abs(candidate.tofNSigmaKa()) < cfgTofNsigmaCut) {
222222
return true;
223223
}
224224
if (!useGlobalTrack && !candidate.hasTPC()) {
@@ -229,10 +229,10 @@ struct FlowPbpbReso {
229229
template <typename T>
230230
bool selectionPID(const T& candidate)
231231
{
232-
if (!candidate.hasTOF() && TMath::Abs(candidate.tpcNSigmaKa()) < cfgTpcNsigmaCut) {
232+
if (!candidate.hasTOF() && std::abs(candidate.tpcNSigmaKa()) < cfgTpcNsigmaCut) {
233233
return true;
234234
}
235-
if (candidate.hasTOF() && candidate.beta() > cfgCutTOFBeta && TMath::Abs(candidate.tpcNSigmaKa()) < cfgTpcNsigmaCut && TMath::Abs(candidate.tofNSigmaKa()) < cfgTofNsigmaCut) {
235+
if (candidate.hasTOF() && candidate.beta() > cfgCutTOFBeta && std::abs(candidate.tpcNSigmaKa()) < cfgTpcNsigmaCut && std::abs(candidate.tofNSigmaKa()) < cfgTofNsigmaCut) {
236236
return true;
237237
}
238238
return false;
@@ -243,39 +243,15 @@ struct FlowPbpbReso {
243243
{
244244
const auto pglobal = track.p();
245245
const auto ptpc = track.tpcInnerParam();
246-
if (TMath::Abs(pglobal - ptpc) > cfgFakePartCut) {
246+
if (std::abs(pglobal - ptpc) > cfgFakePartCut) {
247247
return true;
248248
}
249249
return false;
250250
}
251251

252-
double GetPhiInRange(double phi)
253-
{
254-
double result = phi;
255-
while (result < 0) {
256-
result = result + 2. * TMath::Pi() / 2;
257-
}
258-
while (result > 2. * TMath::Pi() / 2) {
259-
result = result - 2. * TMath::Pi() / 2;
260-
}
261-
return result;
262-
}
263-
264-
double GetDeltaPsiSubInRange(double psi1, double psi2)
265-
{
266-
double delta = psi1 - psi2;
267-
if (TMath::Abs(delta) > TMath::Pi() / 2) {
268-
if (delta > 0.)
269-
delta -= 2. * TMath::Pi() / 2;
270-
else
271-
delta += 2. * TMath::Pi() / 2;
272-
}
273-
return delta;
274-
}
275-
276252
using BinningTypeVertexContributor = ColumnBinningPolicy<aod::collision::PosZ, aod::cent::CentFT0C, o2::aod::evsel::NumTracksInTimeRange>;
277-
ROOT::Math::PxPyPzMVector PhiMom, KaonPlus, KaonMinus;
278-
double massKaplus = o2::constants::physics::MassKPlus;
253+
ROOT::Math::PxPyPzMVector phiMom, kaonPlus, kaonminus;
254+
double massKaPlus = o2::constants::physics::MassKPlus;
279255

280256
void process(AodCollisions::iterator const& collision, aod::BCsWithTimestamps const&, AodTracksWithoutBayes const& tracks)
281257
{
@@ -303,7 +279,7 @@ struct FlowPbpbReso {
303279
auto posSlicedTracks = posTracks->sliceByCached(aod::track::collisionId, collision.globalIndex(), cache);
304280
auto negSlicedTracks = negTracks->sliceByCached(aod::track::collisionId, collision.globalIndex(), cache);
305281

306-
for (auto track1 : posSlicedTracks) {
282+
for (auto const& track1 : posSlicedTracks) {
307283
// track selection
308284
if (!selectionTrack(track1)) {
309285
continue;
@@ -319,7 +295,7 @@ struct FlowPbpbReso {
319295
histos.fill(HIST("KaplusTOF"), track1.pt(), track1.tofNSigmaKa());
320296
auto track1ID = track1.globalIndex();
321297

322-
for (auto track2 : negSlicedTracks) {
298+
for (auto const& track2 : negSlicedTracks) {
323299
// track selection
324300
if (!selectionTrack(track2)) {
325301
continue;
@@ -346,13 +322,13 @@ struct FlowPbpbReso {
346322
}
347323
histos.fill(HIST("KaminusTPC"), track2.pt(), track2.tpcNSigmaKa());
348324
histos.fill(HIST("KaminusTOF"), track2.pt(), track2.tofNSigmaKa());
349-
KaonPlus = ROOT::Math::PxPyPzMVector(track1.px(), track1.py(), track1.pz(), massKaplus);
350-
KaonMinus = ROOT::Math::PxPyPzMVector(track2.px(), track2.py(), track2.pz(), massKaplus);
351-
PhiMom = KaonPlus + KaonMinus;
352-
if (TMath::Abs(PhiMom.Rapidity()) < confRapidity) {
353-
histos.fill(HIST("hPhiMass_sparse"), PhiMom.M(), PhiMom.Pt(), cent);
354-
histos.fill(HIST("hPhi"), PhiMom.Phi());
355-
histos.fill(HIST("hEta"), PhiMom.Eta());
325+
kaonPlus = ROOT::Math::PxPyPzMVector(track1.px(), track1.py(), track1.pz(), massKaPlus);
326+
kaonminus = ROOT::Math::PxPyPzMVector(track2.px(), track2.py(), track2.pz(), massKaPlus);
327+
phiMom = kaonPlus + kaonminus;
328+
if (std::abs(phiMom.Rapidity()) < confRapidity) {
329+
histos.fill(HIST("hPhiMass_sparse"), phiMom.M(), phiMom.Pt(), cent);
330+
histos.fill(HIST("hPhi"), phiMom.Phi());
331+
histos.fill(HIST("hEta"), phiMom.Eta());
356332
}
357333
} // end of track 2
358334
} // end of track 1

0 commit comments

Comments
 (0)