Skip to content
Snippets Groups Projects

Fix inconsistent handling of outliers when counting shared hits.

Merged Goetz Gaycken requested to merge goetz/athena:SharedHits_master_fix_inconsistency into master
All threads resolved!

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

Loading
Loading

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
  • @goetz - please resolve and flip the labels back if this is realy intended.

  • Goetz Gaycken resolved all threads

    resolved all threads

  • Author Developer

    should not be merged before MR !34760 (merged).

  • should this now be merged?

  • Just pinging this MR, which is still not merged. Should this be merged now?

  • Hi @goetz ,

    this MR picked up some merge conflicts, could you please check ?

    Thanks, Pavol [as L2 MR shifter]

  • Goetz Gaycken added 3190 commits

    added 3190 commits

    • cf6261b5...04263fe9 - 3189 commits from branch atlas:master
    • a7fc8215 - Fix inconsistent handling of outliers when counting shared hits.

    Compare with previous version

  • This merge request affects 1 package:

    • InnerDetector/InDetRecTools/InDetTrackSummaryHelperTool

    Adding @goetz ,@amorley ,@sroe as watchers

  • Author Developer

    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
  • :white_check_mark: CI Result SUCCESS (hash a7fc8215)

    Athena AthSimulation AthGeneration AnalysisBase
    externals :white_check_mark: :white_check_mark: :white_check_mark: :white_check_mark:
    cmake :white_check_mark: :white_check_mark: :white_check_mark: :white_check_mark:
    make :white_check_mark: :white_check_mark: :white_check_mark: :white_check_mark:
    required tests :white_check_mark: :white_check_mark: :white_check_mark: :white_check_mark:
    optional tests :white_check_mark: :white_check_mark: :white_check_mark: :white_check_mark:

    Full details available on this CI monitor view
    :white_check_mark: Athena: number of compilation errors 0, warnings 0
    :white_check_mark: AthSimulation: number of compilation errors 0, warnings 0
    :white_check_mark: AthGeneration: number of compilation errors 0, warnings 0
    :white_check_mark: AnalysisBase: number of compilation errors 0, warnings 0
    :pencil: For experts only: Jenkins output [CI-MERGE-REQUEST-CC7 19849]

  • All seems fine, approving. Cheers, L1

  • added review-approved label and removed review-pending-level-1 label

  • Walter Lampl mentioned in commit 34ff46c9

    mentioned in commit 34ff46c9

  • merged

  • Please register or sign in to reply
    Loading