Skip to content

Please consider the following formatting changes to #12614 #17

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
alibuild wants to merge 1 commit into from
Closed

Please consider the following formatting changes to #12614 #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
123 changes: 60 additions & 63 deletions PWGCF/FemtoDream/Core/femtoDreamDetaDphiStar.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@
#include "PWGCF/DataModel/FemtoDerived.h"
#include "Framework/HistogramRegistry.h"

using namespace o2;

Check failure on line 25 in PWGCF/FemtoDream/Core/femtoDreamDetaDphiStar.h

View workflow job for this annotation

GitHub Actions / O2 linter

[using-directive] 

Do not put using directives at global scope in headers.
using namespace o2::framework;

Check failure on line 26 in PWGCF/FemtoDream/Core/femtoDreamDetaDphiStar.h

View workflow job for this annotation

GitHub Actions / O2 linter

[using-directive] 

Do not put using directives at global scope in headers.

namespace o2::analysis
{
Expand Down Expand Up @@ -189,7 +189,7 @@
}
if (sameCharge) {
if (atWhichRadiiToSelect == 1) {
if (pow(dphiAvg, 2) / pow(deltaPhiMax, 2) + pow(deta, 2) / pow(deltaEtaMax, 2) < 1.) {

Check failure on line 192 in PWGCF/FemtoDream/Core/femtoDreamDetaDphiStar.h

View workflow job for this annotation

GitHub Actions / O2 linter

[std-prefix] 

Use std:: prefix for names from the std namespace.
return true;
} else {
if (Q3 == 999) {
Expand All @@ -202,7 +202,7 @@
return false;
}
} else if (atWhichRadiiToSelect == 0) {
if (pow(dphi_AT_PV, 2) / pow(deltaPhiMax, 2) + pow(deta, 2) / pow(deltaEtaMax, 2) < 1.) {

Check failure on line 205 in PWGCF/FemtoDream/Core/femtoDreamDetaDphiStar.h

View workflow job for this annotation

GitHub Actions / O2 linter

[std-prefix] 

Use std:: prefix for names from the std namespace.
return true;
} else {
if (Q3 == 999) {
Expand All @@ -215,7 +215,7 @@
return false;
}
} else if (atWhichRadiiToSelect == 2) {
if (pow(dphi_AT_SpecificRadii, 2) / pow(deltaPhiMax, 2) + pow(deta, 2) / pow(deltaEtaMax, 2) < 1.) {

Check failure on line 218 in PWGCF/FemtoDream/Core/femtoDreamDetaDphiStar.h

View workflow job for this annotation

GitHub Actions / O2 linter

[std-prefix] 

Use std:: prefix for names from the std namespace.
return true;
} else {
if (Q3 == 999) {
Expand Down Expand Up @@ -273,7 +273,7 @@
}
if (sameCharge) {
if (atWhichRadiiToSelect == 1) {
if (pow(dphiAvg, 2) / pow(deltaPhiMax, 2) + pow(deta, 2) / pow(deltaEtaMax, 2) < 1.) {

Check failure on line 276 in PWGCF/FemtoDream/Core/femtoDreamDetaDphiStar.h

View workflow job for this annotation

GitHub Actions / O2 linter

[std-prefix] 

Use std:: prefix for names from the std namespace.
pass = true;
} else {
if (Q3 == 999) {
Expand All @@ -285,7 +285,7 @@
}
}
} else if (atWhichRadiiToSelect == 0) {
if (pow(dphi_AT_PV, 2) / pow(deltaPhiMax, 2) + pow(deta, 2) / pow(deltaEtaMax, 2) < 1.) {

Check failure on line 288 in PWGCF/FemtoDream/Core/femtoDreamDetaDphiStar.h

View workflow job for this annotation

GitHub Actions / O2 linter

[std-prefix] 

Use std:: prefix for names from the std namespace.
pass = true;
} else {
if (Q3 == 999) {
Expand All @@ -297,7 +297,7 @@
}
}
} else if (atWhichRadiiToSelect == 2) {
if (pow(dphi_AT_SpecificRadii, 2) / pow(deltaPhiMax, 2) + pow(deta, 2) / pow(deltaEtaMax, 2) < 1.) {

Check failure on line 300 in PWGCF/FemtoDream/Core/femtoDreamDetaDphiStar.h

View workflow job for this annotation

GitHub Actions / O2 linter

[std-prefix] 

Use std:: prefix for names from the std namespace.
pass = true;
} else {
if (Q3 == 999) {
Expand Down Expand Up @@ -332,74 +332,72 @@
indexOfDaughterPart1 = part1.index() - 2 + i;
indexOfDaughterPart2 = part2.index() - 2 + j;
}

auto daughterPart1 = particles.begin() + indexOfDaughterPart1;
auto daughterPart2 = particles.begin() + indexOfDaughterPart2;
auto deta = daughterPart1.eta() - daughterPart2.eta();
auto dphi_AT_PV = daughterPart1.phi() - daughterPart2.phi();
auto dphi_AT_SpecificRadii = PhiAtSpecificRadiiTPC(daughterPart1, radiiTPC) - PhiAtSpecificRadiiTPC(daughterPart2, radiiTPC);
bool sameCharge = false;
auto dphiAvg = AveragePhiStar(*daughterPart1, *daughterPart2, nhist, &sameCharge);
if (Q3 == 999) {
histdetadpi[nhist][0]->Fill(deta, dphiAvg);
histdetadpi[nhist][2]->Fill(deta, dphi_AT_PV);
if (fillQA) {
histdetadpi_eta[nhist]->Fill(deta, dphiAvg, daughterPart1.eta(), daughterPart2.eta());
histdetadpi_phi[nhist]->Fill(deta, dphiAvg, daughterPart1.phi(), daughterPart2.phi());
}
} /* else if (Q3 < upperQ3LimitForPlotting) {
histdetadpi[i][0]->Fill(deta, dphiAvg);
histdetadpi[i][2]->Fill(deta, dphi_AT_PV);
if (fillQA) {
histdetadpi_eta[i]->Fill(deta, dphiAvg, part1.eta(), daughter.eta());
histdetadpi_phi[i]->Fill(deta, dphiAvg, part1.phi(), daughter.phi());
}
} */
if (sameCharge) {
if (atWhichRadiiToSelect == 1) {
if (pow(dphiAvg, 2) / pow(deltaPhiMax, 2) + pow(deta, 2) / pow(deltaEtaMax, 2) < 1.) {
pass = true;
} else {
if (Q3 == 999) {
histdetadpi[nhist][1]->Fill(deta, dphiAvg);
histdetadpi[nhist][3]->Fill(deta, dphi_AT_PV);
} else if (Q3 < upperQ3LimitForPlotting) {
histdetadpi[nhist][1]->Fill(deta, dphiAvg);
histdetadpi[nhist][3]->Fill(deta, dphi_AT_PV);

auto daughterPart1 = particles.begin() + indexOfDaughterPart1;
auto daughterPart2 = particles.begin() + indexOfDaughterPart2;
auto deta = daughterPart1.eta() - daughterPart2.eta();
auto dphi_AT_PV = daughterPart1.phi() - daughterPart2.phi();
auto dphi_AT_SpecificRadii = PhiAtSpecificRadiiTPC(daughterPart1, radiiTPC) - PhiAtSpecificRadiiTPC(daughterPart2, radiiTPC);
bool sameCharge = false;
auto dphiAvg = AveragePhiStar(*daughterPart1, *daughterPart2, nhist, &sameCharge);
if (Q3 == 999) {
histdetadpi[nhist][0]->Fill(deta, dphiAvg);
histdetadpi[nhist][2]->Fill(deta, dphi_AT_PV);
if (fillQA) {
histdetadpi_eta[nhist]->Fill(deta, dphiAvg, daughterPart1.eta(), daughterPart2.eta());
histdetadpi_phi[nhist]->Fill(deta, dphiAvg, daughterPart1.phi(), daughterPart2.phi());
}
} /* else if (Q3 < upperQ3LimitForPlotting) {
histdetadpi[i][0]->Fill(deta, dphiAvg);
histdetadpi[i][2]->Fill(deta, dphi_AT_PV);
if (fillQA) {
histdetadpi_eta[i]->Fill(deta, dphiAvg, part1.eta(), daughter.eta());
histdetadpi_phi[i]->Fill(deta, dphiAvg, part1.phi(), daughter.phi());
}
} */
if (sameCharge) {
if (atWhichRadiiToSelect == 1) {
if (pow(dphiAvg, 2) / pow(deltaPhiMax, 2) + pow(deta, 2) / pow(deltaEtaMax, 2) < 1.) {

Check failure on line 360 in PWGCF/FemtoDream/Core/femtoDreamDetaDphiStar.h

View workflow job for this annotation

GitHub Actions / O2 linter

[std-prefix] 

Use std:: prefix for names from the std namespace.
pass = true;
} else {
if (Q3 == 999) {
histdetadpi[nhist][1]->Fill(deta, dphiAvg);
histdetadpi[nhist][3]->Fill(deta, dphi_AT_PV);
} else if (Q3 < upperQ3LimitForPlotting) {
histdetadpi[nhist][1]->Fill(deta, dphiAvg);
histdetadpi[nhist][3]->Fill(deta, dphi_AT_PV);
}
}
}
} else if (atWhichRadiiToSelect == 0) {
if (pow(dphi_AT_PV, 2) / pow(deltaPhiMax, 2) + pow(deta, 2) / pow(deltaEtaMax, 2) < 1.) {
pass = true;
} else {
if (Q3 == 999) {
histdetadpi[nhist][1]->Fill(deta, dphiAvg);
histdetadpi[nhist][3]->Fill(deta, dphi_AT_PV);
} else if (Q3 < upperQ3LimitForPlotting) {
histdetadpi[nhist][1]->Fill(deta, dphiAvg);
histdetadpi[nhist][3]->Fill(deta, dphi_AT_PV);
} else if (atWhichRadiiToSelect == 0) {
if (pow(dphi_AT_PV, 2) / pow(deltaPhiMax, 2) + pow(deta, 2) / pow(deltaEtaMax, 2) < 1.) {

Check failure on line 372 in PWGCF/FemtoDream/Core/femtoDreamDetaDphiStar.h

View workflow job for this annotation

GitHub Actions / O2 linter

[std-prefix] 

Use std:: prefix for names from the std namespace.
pass = true;
} else {
if (Q3 == 999) {
histdetadpi[nhist][1]->Fill(deta, dphiAvg);
histdetadpi[nhist][3]->Fill(deta, dphi_AT_PV);
} else if (Q3 < upperQ3LimitForPlotting) {
histdetadpi[nhist][1]->Fill(deta, dphiAvg);
histdetadpi[nhist][3]->Fill(deta, dphi_AT_PV);
}
}
}
} else if (atWhichRadiiToSelect == 2) {
if (pow(dphi_AT_SpecificRadii, 2) / pow(deltaPhiMax, 2) + pow(deta, 2) / pow(deltaEtaMax, 2) < 1.) {
pass = true;
} else {
if (Q3 == 999) {
histdetadpi[nhist][1]->Fill(deta, dphiAvg);
histdetadpi[nhist][3]->Fill(deta, dphi_AT_PV);
} else if (Q3 < upperQ3LimitForPlotting) {
histdetadpi[nhist][1]->Fill(deta, dphiAvg);
histdetadpi[nhist][3]->Fill(deta, dphi_AT_PV);
} else if (atWhichRadiiToSelect == 2) {
if (pow(dphi_AT_SpecificRadii, 2) / pow(deltaPhiMax, 2) + pow(deta, 2) / pow(deltaEtaMax, 2) < 1.) {
pass = true;
} else {
if (Q3 == 999) {
histdetadpi[nhist][1]->Fill(deta, dphiAvg);
histdetadpi[nhist][3]->Fill(deta, dphi_AT_PV);
} else if (Q3 < upperQ3LimitForPlotting) {
histdetadpi[nhist][1]->Fill(deta, dphiAvg);
histdetadpi[nhist][3]->Fill(deta, dphi_AT_PV);
}
}
}
}
nhist += 1;
}
nhist += 1;
}
}



return pass;
} else if constexpr (mPartOneType == o2::aod::femtodreamparticle::ParticleType::kTrack && mPartTwoType == o2::aod::femtodreamparticle::ParticleType::kCharmHadron) {
// check if provided particles are in agreement with the class instantiation
Expand Down Expand Up @@ -485,8 +483,7 @@
histdetadpi[i][3]->Fill(deta, dphi_AT_PV);
}
}
}
else if (atWhichRadiiToSelect == 2) {
} else if (atWhichRadiiToSelect == 2) {
if (pow(dphi_AT_SpecificRadii, 2) / pow(deltaPhiMax, 2) + pow(deta, 2) / pow(deltaEtaMax, 2) < 1.) {
pass = true;
} else {
Expand Down
Loading
Loading