Forked from
atlas / athena
141619 commits behind, 16290 commits ahead of the upstream repository.
John Chapman
authored
This merge request merges the changes that went into the ~"21.0" branch between the [release/21.0.94](https://gitlab.cern.ch/atlas/athena/tags/release/21.0.94) and [release/21.0.95](https://gitlab.cern.ch/atlas/athena/tags/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 : 21.0-FastCaloSim: Adding function LoadFCalGeometryFromFiles to CaloGeometryFromFile * !21917 : Updating to the latest version of FastCaloSimV2 parametrization file * !21963 : Add protection for rounding errors * !21859 : Fix failure on invalid LumiAccounting data (affected 301915 and 301918) * !21828 : xAOD::EventInfo conversion fix in PileUpEventLoopMgr (ATLASSIM-4081) * !21598 : R-Hadron Mass Updates * !21660 : Patch preInclude.Qball.py to work-around missing specialConfiguration metadata * !21682 : User action that dumps all volumes and classifies them. * !21699 : Fix for TrigAnalysisTest test test_mc_ntup_physval_grid.sh * !21722 : 21.0-FastCaloSim: Removing LoadFCalGeometryFromFiles function * !21764 : Added more histograms as a function of initial step vol/process/material * !21768 : Protection for empty GenEvents in BeamEffectsAlg::patchSignalProcessVertex(...) * !21114 : DerivationFrameworkInDet: Fixes DOAD_IDTIDE derivation format * !21646 : Patch Simulation RunTier0Test job, so that it works in AthSimulation builds * !20467 : Optimization of CPU time of FastCaloSimV2 (ATLASSIM-3980) * !21400 : Tier0Tests: Add versioning for overlay background RDO samples * !21412 : Add new tests to TrigAnalysisTest ART tests * !21422 : Fixes for Qball simulation configuration * !21465 : replaces parameterized_sin with parameterized_sincos * !21492 : MC overlay ART updates (21.0 branch) * !21520 : Sweeping !21432 from 21.3 to 21.0. * !21539 : 21.0-ART_test-InDetPhysValMonitoring * !21577 : 2018PbPb overlay config update * !21587 : 21.0 SimulationJobOptions: Fix in postInclude.HijingPars.py to get output streams from correct locations * !20214 : PixelRadDamDigitization: Algorithm for interpolation of irraditaed E fields * !21336 : Tilecal new laser unpack 2019 02 19 * !21349 : Sweeping !21299 from 21.3 to 21.0. * !21374 : Sweeping !21326 from 21.3 to 21.0. * !21460 : RadiationMapsMaker: added flux for >100 keV neutrons and charged hadrons * !21256 : Sweeping !21226 from master to 21.0. * !21221 : TileJetMonTool: update of the tool * !21163 : 21.0-ISF_FastCaloSim: Adding TFCSCenterPositionCalculation to the simulation chain * !21074 : Switch off AthSimulation ART-build tests for unsupported Simulation configurations The full diff between [release/21.0.95](https://gitlab.cern.ch/atlas/athena/tags/release/21.0.95) and [release/21.0.94](https://gitlab.cern.ch/atlas/athena/tags/release/21.0.94) is available at https://gitlab.cern.ch/atlas/athena/compare/release/21.0.94...release/21.0.95
Code owners
Assign users and groups as approvers for specific file changes. Learn more.