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
  • !28298

Merged
Opened Nov 26, 2019 by Louis Portales@lportale

Check out, review, and merge locally

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

git fetch "https://gitlab.cern.ch/lportale/athena.git" "mvfjvtFix"
git checkout -b "lportale/athena-mvfjvtFix" 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 "lportale/athena-mvfjvtFix"

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.

JetForwardJvtToolBDT: Removed need for WP config when running in DF

  • Overview 22
  • Commits 3
  • Pipelines 6
  • Changes 2

Just a small fix: WP configuration file had to be fetched when using the tool in DF, but served no purpose. Only the BDT xml files are now required at this level. These will be put in the JetEtMiss calibArea momentarily, and the path will be updated once it's done, probably in a separated MR.

Edit: Added a new fix to allow the use of latest WP format defined (removing year-by-year WPs)

Edited Nov 27, 2019 by Louis Portales
Assignee
Assign to
None
Milestone
None
Assign milestone
Time tracking
Reference: atlas/athena!28298
Source branch: mvfjvtFix

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.