Skip to content

Please consider the following formatting changes to #12170 #13

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 #12170 #13

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
13 changes: 7 additions & 6 deletions PWGJE/Tasks/jetFragmentation.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
#include <Framework/runDataProcessing.h>

#include <TPDGCode.h>

#include <cmath>
#include <cstdint>
#include <string>
Expand Down Expand Up @@ -1540,15 +1541,15 @@
const int nCones = 2;
double perpConeR = jet.r() * 1e-2;
double conePhi[nCones] = {RecoDecay::constrainAngle(jet.phi() - constants::math::PIHalf, -constants::math::PI),
RecoDecay::constrainAngle(jet.phi() + constants::math::PIHalf, -constants::math::PI)};
RecoDecay::constrainAngle(jet.phi() + constants::math::PIHalf, -constants::math::PI)};
double conePt[nCones] = {0., 0.};
int nV0sinCone[nCones] = {0, 0};
for (const auto& v0 : v0s) {
// Need to check if v0 passed jet finder selection/preselector cuts
bool v0InCones = false;
double dEta = v0.eta() - jet.eta();
double dPhi[nCones] = {RecoDecay::constrainAngle(v0.phi() - conePhi[0], -constants::math::PI),
RecoDecay::constrainAngle(v0.phi() - conePhi[1], -constants::math::PI)};
RecoDecay::constrainAngle(v0.phi() - conePhi[1], -constants::math::PI)};
for (int i = 0; i < nCones; i++) {
if (std::sqrt(dEta * dEta + dPhi[i] * dPhi[i]) < perpConeR) {
conePt[i] += v0.pt();
Expand Down Expand Up @@ -1904,7 +1905,7 @@
const int nCones = 2;
double perpConeR = mcdjet.r() * 1e-2;
double conePhi[nCones] = {RecoDecay::constrainAngle(mcdjet.phi() - constants::math::PIHalf, -constants::math::PI),
RecoDecay::constrainAngle(mcdjet.phi() + constants::math::PIHalf, -constants::math::PI)};
RecoDecay::constrainAngle(mcdjet.phi() + constants::math::PIHalf, -constants::math::PI)};
double coneMatchedPt[nCones] = {0., 0.};
double coneFakePt[nCones] = {0., 0.};
int nMatchedV0sinCone[nCones] = {0, 0};
Expand All @@ -1913,7 +1914,7 @@
for (const auto& v0 : v0s) {
double dEta = v0.eta() - mcdjet.eta();
double dPhi[nCones] = {RecoDecay::constrainAngle(v0.phi() - conePhi[0], -constants::math::PI),
RecoDecay::constrainAngle(v0.phi() - conePhi[1], -constants::math::PI)};
RecoDecay::constrainAngle(v0.phi() - conePhi[1], -constants::math::PI)};
for (int i = 0; i < nCones; i++) {
if (std::sqrt(dEta * dEta + dPhi[i] * dPhi[i]) > perpConeR) {
continue;
Expand Down Expand Up @@ -1974,7 +1975,7 @@
const int nCones = 2;
double perpConeR = mcdjet.r() * 1e-2;
double conePhi[nCones] = {RecoDecay::constrainAngle(mcdjet.phi() - constants::math::PIHalf, -constants::math::PI),
RecoDecay::constrainAngle(mcdjet.phi() + constants::math::PIHalf, -constants::math::PI)};
RecoDecay::constrainAngle(mcdjet.phi() + constants::math::PIHalf, -constants::math::PI)};
double coneMatchedPt[nCones] = {0., 0.};
double coneFakePt[nCones] = {0., 0.};
int nMatchedV0sinCone[nCones] = {0, 0};
Expand All @@ -1983,7 +1984,7 @@
for (const auto& v0 : v0s) {
double dEta = v0.eta() - mcdjet.eta();
double dPhi[nCones] = {RecoDecay::constrainAngle(v0.phi() - conePhi[0], -constants::math::PI),
RecoDecay::constrainAngle(v0.phi() - conePhi[1], -constants::math::PI)};
RecoDecay::constrainAngle(v0.phi() - conePhi[1], -constants::math::PI)};
for (int i = 0; i < nCones; i++) {
if (std::sqrt(dEta * dEta + dPhi[i] * dPhi[i]) > perpConeR) {
continue;
Expand Down Expand Up @@ -2673,9 +2674,9 @@
double z = getMomFrac(jet, v0);
std::vector<double> w;

if (nV0Classes == 2)

Check failure on line 2677 in PWGJE/Tasks/jetFragmentation.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.
w = getV0SignalProbVector2Classes(v0);
else if (nV0Classes == 4)

Check failure on line 2679 in PWGJE/Tasks/jetFragmentation.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.
w = getV0SignalProbVector4Classes(v0);
else
return;
Expand Down
1 change: 1 addition & 0 deletions PWGJE/Tasks/v0QA.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2019-2020 CERN and copyright holders of ALICE O2.

Check failure on line 1 in PWGJE/Tasks/v0QA.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[name/o2-task] 

Specify task name only when it cannot be derived from the struct name. Only append to the default name.
// See https://alice-o2.web.cern.ch/copyright for details of the copyright holders.
// All rights not expressly granted are reserved.
//
Expand Down Expand Up @@ -35,6 +35,7 @@
#include <Framework/runDataProcessing.h>

#include <TPDGCode.h>

#include <cstdlib>
#include <string>
#include <vector>
Expand Down Expand Up @@ -1369,5 +1370,5 @@
WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
{
return WorkflowSpec{
adaptAnalysisTask<V0QA>(cfgc, TaskName{"jet-v0qa"})};

Check failure on line 1373 in PWGJE/Tasks/v0QA.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[name/o2-task] 

Specified task name jet-v0qa produces device name jet-v0qa which does not match the device name v0-q-a from the struct name V0QA. (Matching struct name JetV0qa)
}
Loading