Skip to content

[PWGDQ] fixed collision index for matching candidates in derived tables #16769

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

Draft
aferrero2707 wants to merge 1 commit into
base: master
Choose a base branch
from
+1 −1
Draft

[PWGDQ] fixed collision index for matching candidates in derived tables #16769

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
2 changes: 1 addition & 1 deletion PWGDQ/Tasks/global-muon-matcher.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 PWGDQ/Tasks/global-muon-matcher.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[name/workflow-file] 

Name of a workflow file must match the name of the main struct in it (without the PWG prefix). (Class implementation files should be in "Core" directories.)
// 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 @@ -98,7 +98,7 @@
{
DECLARE_SOA_ARRAY_INDEX_COLUMN(GlobalMuonMatchCandidate, globalMuonMatchCandidate); //! Array of GlobalMuonMatchCandidates indices
DECLARE_SOA_INDEX_COLUMN_FULL(FwdTrackRealign, fwdTrackRealign, int, FwdTracksReAlign, ""); //! Index of ambiguous FwdTracksReAlign entry
DECLARE_SOA_SLICE_INDEX_COLUMN(BC, bc); //! BC index slice compatible with the track time window

Check failure on line 101 in PWGDQ/Tasks/global-muon-matcher.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[name/o2-column] 

Use UpperCamelCase for names of O2 columns and matching lowerCamelCase names for their getters.
} // namespace globalmuonmatching

DECLARE_SOA_TABLE(FwdTrkMatchCands, "AOD", "FWDTRKMATCHCAND", //! Vectors of match-candidate indices stored per fwdtrack
Expand Down Expand Up @@ -968,7 +968,7 @@
int8_t nClusters = static_cast<int8_t>(std::min(127, static_cast<int>(mchPar.getNClusters()) + static_cast<int>(mftPar.getNClusters())));

const float chi2 = static_cast<float>(mchTrack.chi2());
const int32_t collisionId = mchTrack.has_collision() ? mchTrack.collisionId() : -1;
const int32_t collisionId = mchTrack.collisionId();
bool hasBcSlice = false;
std::array<int32_t, 2> bcSlice{};
if (collisionId < 0) {
Expand Down
Loading