Merge branch 'addMergeFlag' into '21.0' (fe2adf31) · Commits · atlas / athena · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

athena
- Activity
- Members
- Labels
- Jira

Snippets Groups Projects

fe2adf31

Commit fe2adf31 authored 7 years ago by James Beacham

Downloads
- Plain Diff

Merge branch 'addMergeFlag' into '21.0'

Introduce new rec flag to designate AOD-merging jobs and use it

See merge request atlas/athena!7445

parents 1b289c21 872cac7c

No related branches found

No related tags found

Loading

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

InnerDetector/InDetExample/InDetRecExample/share/InDetRec_jobOptions.py 5 additions, 4 deletions

...InDetExample/InDetRecExample/share/InDetRec_jobOptions.py
LArCalorimeter/LArDetDescr/share/LArDetDescr_joboptions.py 10 additions, 8 deletions

LArCalorimeter/LArDetDescr/share/LArDetDescr_joboptions.py
Reconstruction/MuonIdentification/MuonCombinedRecExample/share/MuonCombinedRec_config.py 3 additions, 2 deletions

...on/MuonCombinedRecExample/share/MuonCombinedRec_config.py
Reconstruction/RecExample/RecExCommon/share/RecExCommon_topOptions.py 1 addition, 0 deletions

...on/RecExample/RecExCommon/share/RecExCommon_topOptions.py
Reconstruction/RecExample/RecExCond/share/AllDet_detDescr.py 7 additions, 6 deletions

Reconstruction/RecExample/RecExCond/share/AllDet_detDescr.py
Reconstruction/RecExample/RecExConfig/python/RecFlags.py 10 additions, 1 deletion

Reconstruction/RecExample/RecExConfig/python/RecFlags.py
Reconstruction/RecJobTransforms/share/skeleton.MergePool_tf.py 3 additions, 0 deletions

...struction/RecJobTransforms/share/skeleton.MergePool_tf.py

with 39 additions and 21 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment