Skip to content

Commit ee1ba0a

Browse files
alibuildalibuild
committed
Please consider the following formatting changes
1 parent ba1fed4 commit ee1ba0a

2 files changed

Lines changed: 213 additions & 217 deletions

File tree

‎PWGCF/FemtoDream/Core/femtoDreamDetaDphiStar.h‎

Lines changed: 60 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -332,74 +332,72 @@ class FemtoDreamDetaDphiStar
332332
indexOfDaughterPart1 = part1.index() - 2 + i;
333333
indexOfDaughterPart2 = part2.index() - 2 + j;
334334
}
335-
336-
337-
auto daughterPart1 = particles.begin() + indexOfDaughterPart1;
338-
auto daughterPart2 = particles.begin() + indexOfDaughterPart2;
339-
auto deta = daughterPart1.eta() - daughterPart2.eta();
340-
auto dphi_AT_PV = daughterPart1.phi() - daughterPart2.phi();
341-
auto dphi_AT_SpecificRadii = PhiAtSpecificRadiiTPC(daughterPart1, radiiTPC) - PhiAtSpecificRadiiTPC(daughterPart2, radiiTPC);
342-
bool sameCharge = false;
343-
auto dphiAvg = AveragePhiStar(*daughterPart1, *daughterPart2, nhist, &sameCharge);
344-
if (Q3 == 999) {
345-
histdetadpi[nhist][0]->Fill(deta, dphiAvg);
346-
histdetadpi[nhist][2]->Fill(deta, dphi_AT_PV);
347-
if (fillQA) {
348-
histdetadpi_eta[nhist]->Fill(deta, dphiAvg, daughterPart1.eta(), daughterPart2.eta());
349-
histdetadpi_phi[nhist]->Fill(deta, dphiAvg, daughterPart1.phi(), daughterPart2.phi());
350-
}
351-
} /* else if (Q3 < upperQ3LimitForPlotting) {
352-
histdetadpi[i][0]->Fill(deta, dphiAvg);
353-
histdetadpi[i][2]->Fill(deta, dphi_AT_PV);
354-
if (fillQA) {
355-
histdetadpi_eta[i]->Fill(deta, dphiAvg, part1.eta(), daughter.eta());
356-
histdetadpi_phi[i]->Fill(deta, dphiAvg, part1.phi(), daughter.phi());
357-
}
358-
} */
359-
if (sameCharge) {
360-
if (atWhichRadiiToSelect == 1) {
361-
if (pow(dphiAvg, 2) / pow(deltaPhiMax, 2) + pow(deta, 2) / pow(deltaEtaMax, 2) < 1.) {
362-
pass = true;
363-
} else {
364-
if (Q3 == 999) {
365-
histdetadpi[nhist][1]->Fill(deta, dphiAvg);
366-
histdetadpi[nhist][3]->Fill(deta, dphi_AT_PV);
367-
} else if (Q3 < upperQ3LimitForPlotting) {
368-
histdetadpi[nhist][1]->Fill(deta, dphiAvg);
369-
histdetadpi[nhist][3]->Fill(deta, dphi_AT_PV);
335+
336+
auto daughterPart1 = particles.begin() + indexOfDaughterPart1;
337+
auto daughterPart2 = particles.begin() + indexOfDaughterPart2;
338+
auto deta = daughterPart1.eta() - daughterPart2.eta();
339+
auto dphi_AT_PV = daughterPart1.phi() - daughterPart2.phi();
340+
auto dphi_AT_SpecificRadii = PhiAtSpecificRadiiTPC(daughterPart1, radiiTPC) - PhiAtSpecificRadiiTPC(daughterPart2, radiiTPC);
341+
bool sameCharge = false;
342+
auto dphiAvg = AveragePhiStar(*daughterPart1, *daughterPart2, nhist, &sameCharge);
343+
if (Q3 == 999) {
344+
histdetadpi[nhist][0]->Fill(deta, dphiAvg);
345+
histdetadpi[nhist][2]->Fill(deta, dphi_AT_PV);
346+
if (fillQA) {
347+
histdetadpi_eta[nhist]->Fill(deta, dphiAvg, daughterPart1.eta(), daughterPart2.eta());
348+
histdetadpi_phi[nhist]->Fill(deta, dphiAvg, daughterPart1.phi(), daughterPart2.phi());
349+
}
350+
} /* else if (Q3 < upperQ3LimitForPlotting) {
351+
histdetadpi[i][0]->Fill(deta, dphiAvg);
352+
histdetadpi[i][2]->Fill(deta, dphi_AT_PV);
353+
if (fillQA) {
354+
histdetadpi_eta[i]->Fill(deta, dphiAvg, part1.eta(), daughter.eta());
355+
histdetadpi_phi[i]->Fill(deta, dphiAvg, part1.phi(), daughter.phi());
356+
}
357+
} */
358+
if (sameCharge) {
359+
if (atWhichRadiiToSelect == 1) {
360+
if (pow(dphiAvg, 2) / pow(deltaPhiMax, 2) + pow(deta, 2) / pow(deltaEtaMax, 2) < 1.) {
361+
pass = true;
362+
} else {
363+
if (Q3 == 999) {
364+
histdetadpi[nhist][1]->Fill(deta, dphiAvg);
365+
histdetadpi[nhist][3]->Fill(deta, dphi_AT_PV);
366+
} else if (Q3 < upperQ3LimitForPlotting) {
367+
histdetadpi[nhist][1]->Fill(deta, dphiAvg);
368+
histdetadpi[nhist][3]->Fill(deta, dphi_AT_PV);
369+
}
370370
}
371-
}
372-
} else if (atWhichRadiiToSelect == 0) {
373-
if (pow(dphi_AT_PV, 2) / pow(deltaPhiMax, 2) + pow(deta, 2) / pow(deltaEtaMax, 2) < 1.) {
374-
pass = true;
375-
} else {
376-
if (Q3 == 999) {
377-
histdetadpi[nhist][1]->Fill(deta, dphiAvg);
378-
histdetadpi[nhist][3]->Fill(deta, dphi_AT_PV);
379-
} else if (Q3 < upperQ3LimitForPlotting) {
380-
histdetadpi[nhist][1]->Fill(deta, dphiAvg);
381-
histdetadpi[nhist][3]->Fill(deta, dphi_AT_PV);
371+
} else if (atWhichRadiiToSelect == 0) {
372+
if (pow(dphi_AT_PV, 2) / pow(deltaPhiMax, 2) + pow(deta, 2) / pow(deltaEtaMax, 2) < 1.) {
373+
pass = true;
374+
} else {
375+
if (Q3 == 999) {
376+
histdetadpi[nhist][1]->Fill(deta, dphiAvg);
377+
histdetadpi[nhist][3]->Fill(deta, dphi_AT_PV);
378+
} else if (Q3 < upperQ3LimitForPlotting) {
379+
histdetadpi[nhist][1]->Fill(deta, dphiAvg);
380+
histdetadpi[nhist][3]->Fill(deta, dphi_AT_PV);
381+
}
382382
}
383-
}
384-
} else if (atWhichRadiiToSelect == 2) {
385-
if (pow(dphi_AT_SpecificRadii, 2) / pow(deltaPhiMax, 2) + pow(deta, 2) / pow(deltaEtaMax, 2) < 1.) {
386-
pass = true;
387-
} else {
388-
if (Q3 == 999) {
389-
histdetadpi[nhist][1]->Fill(deta, dphiAvg);
390-
histdetadpi[nhist][3]->Fill(deta, dphi_AT_PV);
391-
} else if (Q3 < upperQ3LimitForPlotting) {
392-
histdetadpi[nhist][1]->Fill(deta, dphiAvg);
393-
histdetadpi[nhist][3]->Fill(deta, dphi_AT_PV);
383+
} else if (atWhichRadiiToSelect == 2) {
384+
if (pow(dphi_AT_SpecificRadii, 2) / pow(deltaPhiMax, 2) + pow(deta, 2) / pow(deltaEtaMax, 2) < 1.) {
385+
pass = true;
386+
} else {
387+
if (Q3 == 999) {
388+
histdetadpi[nhist][1]->Fill(deta, dphiAvg);
389+
histdetadpi[nhist][3]->Fill(deta, dphi_AT_PV);
390+
} else if (Q3 < upperQ3LimitForPlotting) {
391+
histdetadpi[nhist][1]->Fill(deta, dphiAvg);
392+
histdetadpi[nhist][3]->Fill(deta, dphi_AT_PV);
393+
}
394394
}
395395
}
396396
}
397+
nhist += 1;
397398
}
398-
nhist += 1;
399399
}
400-
}
401-
402-
400+
403401
return pass;
404402
} else if constexpr (mPartOneType == o2::aod::femtodreamparticle::ParticleType::kTrack && mPartTwoType == o2::aod::femtodreamparticle::ParticleType::kCharmHadron) {
405403
// check if provided particles are in agreement with the class instantiation
@@ -485,8 +483,7 @@ class FemtoDreamDetaDphiStar
485483
histdetadpi[i][3]->Fill(deta, dphi_AT_PV);
486484
}
487485
}
488-
}
489-
else if (atWhichRadiiToSelect == 2) {
486+
} else if (atWhichRadiiToSelect == 2) {
490487
if (pow(dphi_AT_SpecificRadii, 2) / pow(deltaPhiMax, 2) + pow(deta, 2) / pow(deltaEtaMax, 2) < 1.) {
491488
pass = true;
492489
} else {

0 commit comments

Comments
 (0)