Skip to content

[DPG] Please consider the following formatting changes to #11153 #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

[DPG] Please consider the following formatting changes to #11153 #13

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
102 changes: 50 additions & 52 deletions DPG/Tasks/TPC/tpcSkimsTableCreator.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,10 +81,10 @@

Filter trackFilter = (trackSelection.node() == 0) ||
((trackSelection.node() == 1) && requireGlobalTrackInFilter()) ||
((trackSelection.node() == 2) && requireGlobalTrackWoPtEtaInFilter()) ||

Check failure on line 84 in DPG/Tasks/TPC/tpcSkimsTableCreator.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.
((trackSelection.node() == 3) && requireGlobalTrackWoDCAInFilter()) ||

Check failure on line 85 in DPG/Tasks/TPC/tpcSkimsTableCreator.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.
((trackSelection.node() == 4) && requireQualityTracksInFilter()) ||

Check failure on line 86 in DPG/Tasks/TPC/tpcSkimsTableCreator.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.
((trackSelection.node() == 5) && requireTrackCutInFilter(TrackSelectionFlags::kInAcceptanceTracks));

Check failure on line 87 in DPG/Tasks/TPC/tpcSkimsTableCreator.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.

ctpRateFetcher mRateFetcher;

Expand Down Expand Up @@ -163,32 +163,32 @@
const double pseudoRndm = track.pt() * 1000. - static_cast<int64_t>(track.pt() * 1000);
if (pseudoRndm < dwnSmplFactor) {
rowTPCTreeWithdEdxTrkQA(track.tpcSignal(),
1. / dEdxExp,
track.tpcInnerParam(),
track.tgl(),
track.signed1Pt(),
track.eta(),
track.phi(),
track.y(),
mass,
bg,
multTPC / 11000.,
std::sqrt(nClNorm / ncl),
nclPID,
id,
nSigmaTPC,
nSigmaTOF,
alpha,
qt,
cosPA,
pT,
v0radius,
gammapsipair,
runnumber,
trackocc,
ft0occ,
hadronicRate,
existTrkQA ? trackQA.tpcdEdxNorm() : -999);
1. / dEdxExp,
track.tpcInnerParam(),
track.tgl(),
track.signed1Pt(),
track.eta(),
track.phi(),
track.y(),
mass,
bg,
multTPC / 11000.,
std::sqrt(nClNorm / ncl),
nclPID,
id,
nSigmaTPC,
nSigmaTOF,
alpha,
qt,
cosPA,
pT,
v0radius,
gammapsipair,
runnumber,
trackocc,
ft0occ,
hadronicRate,
existTrkQA ? trackQA.tpcdEdxNorm() : -999);
}
};

Expand Down Expand Up @@ -296,7 +296,7 @@
if (!collision.sel7()) {
return false;
}
} else if (applyEvSel == 2) {

Check failure on line 299 in DPG/Tasks/TPC/tpcSkimsTableCreator.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 (!collision.sel8()) {
return false;
}
Expand Down Expand Up @@ -469,10 +469,8 @@
} /// process with dEdx from TrackQA
PROCESS_SWITCH(TreeWriterTpcV0, processWithdEdxTrQA, "Standard V0 Samples with dEdx from Track QA for PID", false);



//Preslice<Trks> perCollisionTracks = aod::track::collisionId;
//Preslice<V0sWithID> perCollisionV0s = aod::v0data::collisionId;
// Preslice<Trks> perCollisionTracks = aod::track::collisionId;
// Preslice<V0sWithID> perCollisionV0s = aod::v0data::collisionId;
void processWithTrQA(Colls const& collisions, Trks const& myTracks, V0sWithID const& myV0s, MyBCTable const&, aod::TracksQAVersion const& tracksQA)
{
std::vector<int64_t> labelTrack2TrackQA;
Expand Down Expand Up @@ -640,10 +638,10 @@

Filter trackFilter = (trackSelection.node() == 0) ||
((trackSelection.node() == 1) && requireGlobalTrackInFilter()) ||
((trackSelection.node() == 2) && requireGlobalTrackWoPtEtaInFilter()) ||

Check failure on line 641 in DPG/Tasks/TPC/tpcSkimsTableCreator.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.
((trackSelection.node() == 3) && requireGlobalTrackWoDCAInFilter()) ||

Check failure on line 642 in DPG/Tasks/TPC/tpcSkimsTableCreator.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.
((trackSelection.node() == 4) && requireQualityTracksInFilter()) ||

Check failure on line 643 in DPG/Tasks/TPC/tpcSkimsTableCreator.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.
((trackSelection.node() == 5) && requireTrackCutInFilter(TrackSelectionFlags::kInAcceptanceTracks));

Check failure on line 644 in DPG/Tasks/TPC/tpcSkimsTableCreator.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.

ctpRateFetcher mRateFetcher;

Expand Down Expand Up @@ -730,27 +728,27 @@
const double pseudoRndm = track.pt() * 1000. - static_cast<int64_t>(track.pt() * 1000);
if (pseudoRndm < dwnSmplFactor) {
rowTPCTOFTreeWithdEdxTrkQA(track.tpcSignal(),
1. / dEdxExp,
track.tpcInnerParam(),
track.tgl(),
track.signed1Pt(),
track.eta(),
track.phi(),
track.y(),
mass,
bg,
multTPC / 11000.,
std::sqrt(nClNorm / ncl),
nclPID,
id,
nSigmaTPC,
nSigmaTOF,
nSigmaITS,
runnumber,
trackocc,
ft0occ,
hadronicRate,
existTrkQA ? trackQA.tpcdEdxNorm() : -999);
1. / dEdxExp,
track.tpcInnerParam(),
track.tgl(),
track.signed1Pt(),
track.eta(),
track.phi(),
track.y(),
mass,
bg,
multTPC / 11000.,
std::sqrt(nClNorm / ncl),
nclPID,
id,
nSigmaTPC,
nSigmaTOF,
nSigmaITS,
runnumber,
trackocc,
ft0occ,
hadronicRate,
existTrkQA ? trackQA.tpcdEdxNorm() : -999);
}
};
/// Function to fill trees
Expand Down Expand Up @@ -813,7 +811,7 @@
if (!collision.sel7()) {
return false;
}
} else if (applyEvSel == 2) {

Check failure on line 814 in DPG/Tasks/TPC/tpcSkimsTableCreator.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 (!collision.sel8()) {
return false;
}
Expand Down Expand Up @@ -951,7 +949,7 @@
}
} /// process
PROCESS_SWITCH(TreeWriterTPCTOF, processWithdEdxTrQA, "Samples for PID with TrackQA info", false);
//Preslice<Trks> perCollisionTracks = aod::track::collisionId;
// Preslice<Trks> perCollisionTracks = aod::track::collisionId;
void processWithTrQA(Colls const& collisions, Trks const& myTracks, MyBCTable const&, aod::TracksQAVersion const& tracksQA)
{
std::vector<int64_t> labelTrack2TrackQA;
Expand Down
Loading