Skip to content

[MegaLinter] Apply linters automatic fixes to #4517 #9

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 2 commits into from
Closed

[MegaLinter] Apply linters automatic fixes to #4517 #9

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0f0ece1
Merge d9815053f952215977db311f3997bedec86b469b into f7a831a12992e82d7…
sarahherrmann Jan 30, 2024
f5f90ee
MegaLinter fixes
alibuild Jan 30, 2024
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
25 changes: 9 additions & 16 deletions Common/Core/CollisionAssociation.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,29 +242,22 @@ class CollisionAssociation
if constexpr (isCentralBarrel) {
if (mUsePvAssociation && track.isPVContributor()) {
thresholdTime = trackTimeRes;
} else if (TESTBIT(track.flags(), o2::aod::track::TrackTimeResIsRange))
{
//the track time resolution is a range, not a gaussian resolution
} else if (TESTBIT(track.flags(), o2::aod::track::TrackTimeResIsRange)) {
// the track time resolution is a range, not a gaussian resolution
thresholdTime = trackTimeRes + mNumSigmaForTimeCompat * std::sqrt(collTimeRes2) + mTimeMargin;
} else {
thresholdTime = mNumSigmaForTimeCompat * std::sqrt(sigmaTimeRes2) + mTimeMargin;
}
}
else
{
//the track is not a central track
if constexpr (TTracks::template contains<o2::aod::MFTTracks>())
{
//then the track is an MFT track, or an MFT track with additionnal joined info
//in this case TrackTimeResIsRange
} else {
// the track is not a central track
if constexpr (TTracks::template contains<o2::aod::MFTTracks>()) {
// then the track is an MFT track, or an MFT track with additionnal joined info
// in this case TrackTimeResIsRange
thresholdTime = trackTimeRes + mNumSigmaForTimeCompat * std::sqrt(collTimeRes2) + mTimeMargin;
}
else
{
//the track is a fwd track, with a gaussian time resolution
} else {
// the track is a fwd track, with a gaussian time resolution
thresholdTime = mNumSigmaForTimeCompat * std::sqrt(sigmaTimeRes2) + mTimeMargin;
}

}

if (std::abs(deltaTime) < thresholdTime) {
Expand Down