Skip to content

[PWGJE] Please consider the following formatting changes to #13303 #10

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

[PWGJE] Please consider the following formatting changes to #13303 #10

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
35 changes: 12 additions & 23 deletions PWGJE/Tasks/jetSpectraCharged.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,14 +252,14 @@
template <typename TTracks, typename TJets>
bool isAcceptedJet(TJets const& jet, bool mcLevelIsParticleLevel = false)
{
if (jetAreaFractionMin > -98.0) {

Check failure on line 255 in PWGJE/Tasks/jetSpectraCharged.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[magic-number] 

Avoid magic numbers in expressions. Assign the value to a clearly named variable or constant.
if (jet.area() < jetAreaFractionMin * o2::constants::math::PI * (jet.r() / 100.0) * (jet.r() / 100.0)) {
return false;
}
}
bool checkConstituentPt = true;
bool checkConstituentMinPt = (leadingConstituentPtMin > -98.0);

Check failure on line 261 in PWGJE/Tasks/jetSpectraCharged.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[magic-number] 

Avoid magic numbers in expressions. Assign the value to a clearly named variable or constant.
bool checkConstituentMaxPt = (leadingConstituentPtMax < 9998.0);

Check failure on line 262 in PWGJE/Tasks/jetSpectraCharged.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[magic-number] 

Avoid magic numbers in expressions. Assign the value to a clearly named variable or constant.
if (!checkConstituentMinPt && !checkConstituentMaxPt) {
checkConstituentPt = false;
}
Expand Down Expand Up @@ -510,7 +510,7 @@
if (jetMCD.r() == round(selectedJetsRadius * 100.0f)) {
double corrTagjetpt = jetMCP.pt() - (mcrho * jetMCP.area());
double corrBasejetpt = jetMCD.pt() - (rho * jetMCD.area());
double dcorrpt = corrBasejetpt - corrTagjetpt;
double dcorrpt = corrBasejetpt - corrTagjetpt;
if (jetfindingutilities::isInEtaAcceptance(jetMCD, jetEtaMin, jetEtaMax, trackEtaMin, trackEtaMax)) {
registry.fill(HIST("h2_jet_pt_mcd_jet_pt_mcp_matchedgeo_rhoareasubtracted_mcdetaconstraint"), corrBasejetpt, corrTagjetpt, weight);
registry.fill(HIST("h2_jet_pt_mcd_jet_pt_diff_matchedgeo_rhoareasubtracted"), corrBasejetpt, dcorrpt / corrBasejetpt, weight);
Expand All @@ -531,8 +531,7 @@
float centrality = 0.0;
if (checkCentFT0M) {
centrality = collision.centFT0M();
}
else {
} else {
centrality = collision.centFT0C();
}
if (centrality < centralityMin || centrality > centralityMax) {
Expand Down Expand Up @@ -578,8 +577,7 @@
float centrality = 0.0;
if (checkCentFT0M) {
centrality = collision.centFT0M();
}
else {
} else {
centrality = collision.centFT0C();
}
if (centrality < centralityMin || centrality > centralityMax) {
Expand Down Expand Up @@ -632,8 +630,7 @@
float centrality = 0.0;
if (checkCentFT0M) {
centrality = collision.centFT0M();
}
else {
} else {
centrality = collision.centFT0C();
}
if (centrality < centralityMin || centrality > centralityMax) {
Expand Down Expand Up @@ -664,8 +661,7 @@
float centrality = 0.0;
if (checkCentFT0M) {
centrality = collision.centFT0M();
}
else {
} else {
centrality = collision.centFT0C();
}
if (centrality < centralityMin || centrality > centralityMax) {
Expand Down Expand Up @@ -696,8 +692,7 @@
float centrality = 0.0;
if (checkCentFT0M) {
centrality = collision.centFT0M();
}
else {
} else {
centrality = collision.centFT0C();
}
if (centrality < centralityMin || centrality > centralityMax) {
Expand Down Expand Up @@ -728,8 +723,7 @@
float centrality = 0.0;
if (checkCentFT0M) {
centrality = collision.centFT0M();
}
else {
} else {
centrality = collision.centFT0C();
}
if (centrality < centralityMin || centrality > centralityMax) {
Expand Down Expand Up @@ -806,7 +800,7 @@
bool hasSel8Coll = false;
bool centralityIsGood = false;
bool occupancyIsGood = false;
if (acceptSplitCollisions == 2) {

Check failure on line 803 in PWGJE/Tasks/jetSpectraCharged.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[magic-number] 

Avoid magic numbers in expressions. Assign the value to a clearly named variable or constant.
if (jetderiveddatautilities::selectCollision(collisions.begin(), eventSelectionBits, skipMBGapEvents)) {
hasSel8Coll = true;
}
Expand Down Expand Up @@ -880,8 +874,7 @@
float centrality = 0.0;
if (checkCentFT0M) {
centrality = collision.centFT0M();
}
else {
} else {
centrality = collision.centFT0C();
}
if (jetderiveddatautilities::selectCollision(collision, eventSelectionBits, skipMBGapEvents)) {
Expand Down Expand Up @@ -963,7 +956,7 @@
}
float jetweight = jet.eventWeight();
double pTHat = 10. / (std::pow(jetweight, 1.0 / pTHatExponent));
for (int N = 1; N < 21; N++) {

Check failure on line 959 in PWGJE/Tasks/jetSpectraCharged.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[magic-number] 

Avoid magic numbers in expressions. Assign the value to a clearly named variable or constant.
if (jet.pt() < N * 0.25 * pTHat && jet.r() == round(selectedJetsRadius * 100.0f)) {
registry.fill(HIST("h2_jet_ptcut_part"), jet.pt(), N * 0.25, jetweight);
}
Expand All @@ -981,8 +974,7 @@
float centrality = 0.0;
if (checkCentFT0M) {
centrality = collision.centFT0M();
}
else {
} else {
centrality = collision.centFT0C();
}
if (centrality < centralityMin || centrality > centralityMax) {
Expand Down Expand Up @@ -1013,8 +1005,7 @@
float centrality = 0.0;
if (checkCentFT0M) {
centrality = collision.centFT0M();
}
else {
} else {
centrality = collision.centFT0C();
}
if (centrality < centralityMin || centrality > centralityMax) {
Expand Down Expand Up @@ -1046,8 +1037,7 @@
float centrality = 0.0;
if (checkCentFT0M) {
centrality = collision.centFT0M();
}
else {
} else {
centrality = collision.centFT0C();
}
if (centrality < centralityMin || centrality > centralityMax) {
Expand Down Expand Up @@ -1110,8 +1100,7 @@
float centrality = 0.0;
if (checkCentFT0M) {
centrality = collision.centFT0M();
}
else {
} else {
centrality = collision.centFT0C();
}
registry.fill(HIST("h_mcd_events_matched"), 0.5);
Expand Down
Loading