Skip to content

GitLab

  • Projects
  • Groups
  • Snippets
  • Help
    • Loading...
  • Help
    • Help
    • Support
    • Community forum
    • Submit feedback
  • Sign in
athena
athena
  • Project overview
    • Project overview
    • Details
    • Activity
    • Releases
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
  • Jira
    • Jira
  • Labels
  • Merge Requests 214
    • Merge Requests 214
  • Packages & Registries
    • Packages & Registries
    • Container Registry
  • Analytics
    • Analytics
    • Code Review
    • Repository
    • Value Stream
  • Members
    • Members
  • Collapse sidebar
  • Activity
  • Graph
  • Commits
  • atlas
  • athenaathena
  • Merge Requests
  • !28272

Merged
Opened Nov 26, 2019 by Matthew Gignac@mgignacDeveloper

Check out, review, and merge locally

Step 1. Fetch and check out the branch for this merge request

git fetch "https://gitlab.cern.ch/matthewgignac/athena.git" "TrkProtection_VtxParticleThinning"
git checkout -b "matthewgignac/athena-TrkProtection_VtxParticleThinning" FETCH_HEAD

Step 2. Review the changes locally

Step 3. Merge the branch and fix any conflicts that come up

git fetch origin
git checkout "21.2"
git merge --no-ff "matthewgignac/athena-TrkProtection_VtxParticleThinning"

Step 4. Push the result of the merge to GitLab

git push origin "21.2"

Note that pushing to GitLab requires write access to this repository.

Tip: You can also checkout merge requests locally by following these guidelines.

Adding protection for tracks in vertex particle thinning

  • Overview 7
  • Commits 1
  • Changes 1

In some vertex containers (e.g. long-lived particle vertex containers), tracks can be from multiple track containers. In the current implementation of the VertexParticleThinning tool, track indices are assigned to the track mask associated to the input track container, but those indices could be from multiple track containers and causes issues. This MR adds protection against such cases.

Assignee
Assign to
None
Milestone
None
Assign milestone
Time tracking
Reference: atlas/athena!28272
Source branch: TrkProtection_VtxParticleThinning

Revert this merge request

This will create a new commit in order to revert the existing changes.

Switch branch
Cancel
A new branch will be created in your fork and a new merge request will be started.

Cherry-pick this merge request

Switch branch
Cancel
A new branch will be created in your fork and a new merge request will be started.