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 152
    • Merge requests 152
  • 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
  • !22121

Merge 21.0.95 into 21.3 branch

  • Review changes

  • Download
  • Email patches
  • Plain diff
Merged John Derek Chapman requested to merge jchapman/athena:Merge21.0.95_21.3 into 21.3 Mar 25, 2019
  • Overview 23
  • Commits 124
  • Pipelines 3
  • Changes 87

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

MRs in https://gitlab.cern.ch/atlas/athena/tags/nightly/21.0/2019-02-13T2159, accepted since https://gitlab.cern.ch/atlas/athena/tags/nightly/21.0/2019-03-20T2159 :

  • !21887 (merged) : 21.0-FastCaloSim: Adding function LoadFCalGeometryFromFiles to CaloGeometryFromFile
  • !21917 (merged) : Updating to the latest version of FastCaloSimV2 parametrization file
  • !21963 (merged) : Add protection for rounding errors
  • !21859 (merged) : Fix failure on invalid LumiAccounting data (affected 301915 and 301918)
  • !21828 (merged) : xAOD::EventInfo conversion fix in PileUpEventLoopMgr (ATLASSIM-4081)
  • !21598 (merged) : R-Hadron Mass Updates
  • !21660 (merged) : Patch preInclude.Qball.py to work-around missing specialConfiguration metadata
  • !21682 (merged) : User action that dumps all volumes and classifies them.
  • !21699 (merged) : Fix for TrigAnalysisTest test test_mc_ntup_physval_grid.sh
  • !21722 (merged) : 21.0-FastCaloSim: Removing LoadFCalGeometryFromFiles function
  • !21764 (merged) : Added more histograms as a function of initial step vol/process/material
  • !21768 (merged) : Protection for empty GenEvents in BeamEffectsAlg::patchSignalProcessVertex(...)
  • !21114 (merged) : DerivationFrameworkInDet: Fixes DOAD_IDTIDE derivation format
  • !21646 (merged) : Patch Simulation RunTier0Test job, so that it works in AthSimulation builds
  • !20467 (merged) : Optimization of CPU time of FastCaloSimV2 (ATLASSIM-3980)
  • !21400 (merged) : Tier0Tests: Add versioning for overlay background RDO samples
  • !21412 (merged) : Add new tests to TrigAnalysisTest ART tests
  • !21422 (merged) : Fixes for Qball simulation configuration
  • !21465 (merged) : replaces parameterized_sin with parameterized_sincos ~"changes-fullsim-output"
  • !21492 (merged) : MC overlay ART updates (21.0 branch)
  • !21520 (merged) : Sweeping !21432 (merged) from 21.3 to 21.0.
  • !21539 (merged) : 21.0-ART_test-InDetPhysValMonitoring
  • !21577 (merged) : 2018PbPb overlay config update
  • !21587 (merged) : 21.0 SimulationJobOptions: Fix in postInclude.HijingPars.py to get output streams from correct locations
  • !20214 (merged) : PixelRadDamDigitization: Algorithm for interpolation of irraditaed E fields
  • !21336 (merged) : Tilecal new laser unpack 2019 02 19
  • !21349 (merged) : Sweeping !21299 (merged) from 21.3 to 21.0.
  • !21374 (merged) : Sweeping !21326 (merged) from 21.3 to 21.0.
  • !21460 (merged) : RadiationMapsMaker: added flux for >100 keV neutrons and charged hadrons
  • !21256 (merged) : Sweeping !21226 (merged) from master to 21.0.
  • !21221 (merged) : TileJetMonTool: update of the tool
  • !21163 (merged) : 21.0-ISF_FastCaloSim: Adding TFCSCenterPositionCalculation to the simulation chain
  • !21074 (merged) : Switch off AthSimulation ART-build tests for unsupported Simulation configurations

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

7d996a63

Edited Mar 27, 2019 by John Derek Chapman
Assignee
Assign to
Reviewers
Request review from
Time tracking
Source branch: Merge21.0.95_21.3