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

Merged
Opened Nov 12, 2019 by Sara Alderweireldt@salderweDeveloper

Check out, review, and merge locally

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

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

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.

Timestamped btagging container support in SUSYTools

  • Overview 16
  • Commits 6
  • Pipelines 2
  • Changes 9

The fix from !27533 (merged) requires passing a timestamped jetkey in GetJets(). Since this shouldn't be a requirement, we need an additional fix. General discussion belongs in ATLSUSYBGF-494.

We:

  • update the GetJets function to deal with various possible configurations
  • add warnings for invalid timestamps or misconfigurations
  • add the Btag.TimeStamp template to the Default conf
  • update the input files to the nightly tests to include time-stamped containers and updated the references

Aside from the FTAG fix we:

  • update the README with updated contact details
  • add the EWK combination config template to data/
  • lower the VR trackjet pT threshold to the supported 10 GeV (ATLSUSYBGF-502)

The nightly tests are likely to fail until /eos/atlas/atlascerngroupdisk/data-art/grid-input/SUSYTools/ has synced to /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/SUSYTools.

Edited Nov 19, 2019 by Sara Alderweireldt
Assignee
Assign to
None
Milestone
None
Assign milestone
Time tracking
Reference: atlas/athena!27902
Source branch: salderwe/ST/FTAG

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.