Skip to content
GitLab
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 150
    • Merge requests 150
  • CI/CD
    • CI/CD
    • Pipelines
    • Jobs
    • Schedules
  • Deployments
    • Deployments
    • Releases
  • Packages and registries
    • Packages and registries
    • Container Registry
  • Analytics
    • Analytics
    • Value stream
    • CI/CD
    • Code review
    • Repository
  • Activity
  • Graph
  • Jobs
  • Commits
Collapse sidebar
  • atlasatlas
  • athenaathena
  • Merge requests
  • !20965

Merge release/21.0.93 into 21.3

  • Review changes

  • Download
  • Email patches
  • Plain diff
Closed John Derek Chapman requested to merge jchapman/athena:Merge21.0.93into21.3 into 21.3 Feb 07, 2019
  • Overview 7
  • Commits 45
  • Pipelines 1
  • Changes 47

This merge request merges the changes that went into the 21.0 branch between the release/21.0.92 and release/21.0.93 tags into the 21.3 branch.

release/21.0.93 contains the following frozen-tier0-violating merge requests:

  • !20005 (merged)
  • !20021 (merged)
  • !20652 (merged)

MRs in https://gitlab.cern.ch/atlas/athena/tags/nightly/21.0/2019-01-28T2159, accepted since https://gitlab.cern.ch/atlas/athena/tags/nightly/21.0/2019-01-06T2159:

  • !20652 (merged): Adding variable HadronConeExclTruthLabelID to heavy-ion jet collections
  • !20005 (merged): Propagate xAOD::EventInfo from digitization step onwards
  • !20585 (merged): printing timestamp with the full list of arguments in a safe way (ATLINFR-2731)
  • !20607 (merged): 21.0 fix nightly test2
  • !20613 (merged): Sweeping !20595 (merged) from master to 21.0. Bugfix importing tools in RunTier0Test.py
  • !20543 (merged): Sweeping !20514 (merged) from master to 21.0. Start versioning the CI reference files for the RunTier0Tests
  • !20365 (merged): Sweeping !20318 (merged) from 21.3 to 21.0. Update art-include in TriggerTest
  • !20364 (merged): Sweeping !20324 (merged) from 21.3 to 21.0. TriggerTest: add a few tests running on data
  • !20323 (merged): Remove non-existing input file from HI build test
  • !20321 (merged): update art include for RecExOnline
  • !20262 (merged): PreStepPoint quantities in StepHistogramTool
  • !20219 (merged): Updates for processing of G4Commands via the G4UImanager
  • !20125 (merged): Sweeping !20078 (merged) from master to 21.0. Add script to summarise results of locally-ran trigger ART tests
  • !20022 (merged): additional plotting option added
  • !20021 (merged): Moving eta-phi correction for HIJetRec to calibration area (ATLHI-233 and ATLINFR-2834)
  • !20013 (merged): Adds an option to turn on range cuts for gamma processes (conv, phot, compt)
  • !20563 (merged): Changed permissions for m16e TCT test
  • !20519 (merged): Removed mc16d TCT and replaced with mc16e

The full diff between release/21.0.93 and release/21.0.92 is available at https://gitlab.cern.ch/atlas/athena/compare/release/21.0.92...release/21.0.93

Edited Feb 07, 2019 by John Derek Chapman
Assignee
Assign to
Reviewers
Request review from
Time tracking
Source branch: Merge21.0.93into21.3