Skip to content

GitLab

  • Menu
Projects Groups Snippets
  • Help
    • Help
    • Support
    • Community forum
    • Submit feedback
  • Sign in
  • athena athena
  • Project information
    • Project information
    • Activity
    • Labels
    • Members
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
    • Locked Files
  • Jira
    • Jira
  • Merge requests 137
    • Merge requests 137
  • Deployments
    • Deployments
    • Releases
  • Packages & Registries
    • Packages & Registries
    • Container Registry
  • Analytics
    • Analytics
    • Value stream
    • Code review
    • Issue
    • Repository
  • Activity
  • Graph
  • Commits
Collapse sidebar
  • atlas
  • athenaathena
  • Merge requests
  • !44343

Factoring out common content of DAOD_PHYS and PHYSLITE into a single config file

  • Review changes

  • Download
  • Email patches
  • Plain diff
Merged James Catmore requested to merge jcatmore/athena:master-PHYSLITE_PHYS_triggermatching into master Jun 11, 2021
  • Overview 17
  • Commits 2
  • Pipelines 2
  • Changes 7

ATLASG-1598

This MR takes the content of DAOD_PHYS and DAOD_PHYSLITE that is common to both and puts it into a new config file that is imported by both. This fixes name clashes and duplicate problems that have occurred when trying to run both formats in a train. Most of the changes are just moving existing content from one python file to another. However, in order abide by the Python checker (Flake8) rules I have found it necessary to put the content that schedules common augmentations for tracks, muons and e-gamma into methods that are then called in the new config file. For jets, MET and flavour tagging, this is already how they have things set up. This will have a knock-on effect for other DAOD formats who will either need to call these methods themselves or (better) also include the new common config file. Since no other DAODs are currently being used in release 22, I don't see this as a problem, and in any case, I think it is better Python.

As well as fixing the issues with trains, this will also mean that changes to the common content will only have to be done once.

Assignee
Assign to
Reviewer
Request review from
Time tracking
Source branch: master-PHYSLITE_PHYS_triggermatching