Fix inconsistent handling of outliers when counting shared hits.
When creating a new track summary, do not count shared outlier hits as shared hits to be consistent with the alternative method updateSharedHitCount.
Merge request reports
Activity
depends on MR !34760 (merged).
qtests (q220-q223,q431) produce identical AODs. Though, in other configurations (if shared hits are computed when creating a track summary rather than updating the shared hit counts of an existing track summary) then differences may show up due to the changed handling of outlier hits.
mentioned in merge request !34774 (merged)
added InnerDetector master review-pending-level-1 labels
CI Result SUCCESS (hash cf6261b5)Athena AthSimulation AnalysisBase AthGeneration externals cmake make required tests optional tests Full details available on this CI monitor view
Athena: number of compilation errors 0, warnings 0
AthSimulation: number of compilation errors 0, warnings 0
AnalysisBase: number of compilation errors 0, warnings 0
AthGeneration: number of compilation errors 0, warnings 0
For experts only: Jenkins output [CI-MERGE-REQUEST-CC7 17195]- Resolved by Goetz Gaycken
added review-user-action-required label and removed review-pending-level-1 label
@goetz - please resolve and flip the labels back if this is realy intended.
removed review-user-action-required label
should not be merged before MR !34760 (merged).
added review-user-action-required label
Hi @goetz ,
this MR picked up some merge conflicts, could you please check ?
Thanks, Pavol [as L2 MR shifter]
added 3190 commits
-
cf6261b5...04263fe9 - 3189 commits from branch
atlas:master
- a7fc8215 - Fix inconsistent handling of outliers when counting shared hits.
-
cf6261b5...04263fe9 - 3189 commits from branch
added review-pending-level-1 label and removed review-user-action-required label
The diff wrt the previous version is big due to the rebase to nightly/master/2020-09-02T2101. The differences in the only file that is changed by this MR are small and only contain Atilla's fix (MR !34936 (merged)). Here without white space differences:
git diff -b cf6261b5463092dfc767e4f8ff5a8f87fe17bcbc -- InnerDetector/InDetRecTools/InDetTrackSummaryHelperTool/src/InDetTrackSummaryHelperTool.cxx diff --git a/InnerDetector/InDetRecTools/InDetTrackSummaryHelperTool/src/InDetTrackSummaryHelperTool.cxx b/InnerDetector/InDetRecTools/InDetTrackSummaryHelperTool/src/InDetTrackSummaryHelperTool.cxx index a0a063013a8..99cf280d053 100755 --- a/InnerDetector/InDetRecTools/InDetTrackSummaryHelperTool/src/InDetTrackSummaryHelperTool.cxx +++ b/InnerDetector/InDetRecTools/InDetTrackSummaryHelperTool/src/InDetTrackSummaryHelperTool.cxx @@ -298,7 +298,7 @@ void InDet::InDetTrackSummaryHelperTool::analyse(const Trk::Track& track, if (m_doSharedHitsTRT && !isOutlier) { // used in more than one track ? - assert(nformation[Trk::numberOfTRTSharedHits]>=0); + assert(information[Trk::numberOfTRTSharedHits]>=0); if ( isShared(prd_to_track_map, m_assoTool, *(rot->prepRawData())) ) { ATH_MSG_DEBUG("shared TRT hit found"); information[Trk::numberOfTRTSharedHits]++;
Edited by Goetz Gaycken CI Result SUCCESS (hash a7fc8215)Athena AthSimulation AthGeneration AnalysisBase externals cmake make required tests optional tests Full details available on this CI monitor view
Athena: number of compilation errors 0, warnings 0
AthSimulation: number of compilation errors 0, warnings 0
AthGeneration: number of compilation errors 0, warnings 0
AnalysisBase: number of compilation errors 0, warnings 0
For experts only: Jenkins output [CI-MERGE-REQUEST-CC7 19849]added review-approved label and removed review-pending-level-1 label
mentioned in commit 34ff46c9
added sweep:ignore label