Merge 21.0.118 into 21.3
- Sep 30, 2020
-
-
John Chapman authored -
Nils Erik Krumnack authored
Trig::WebBunchCrossingTool Test Removal, 21.2 branch (2020.08.04.) See merge request !35371
-
- Sep 28, 2020
-
-
John Chapman authored
This merge request merges all the changes that were made to the ~"21.0" branch between the release [release/21.0.118](https://gitlab.cern.ch/atlas/athena/tags/release/21.0.118) and the previous release [release/21.0.117](https://gitlab.cern.ch/atlas/athena/tags/release/21.0.117). Below is the full list of merge requests that were included between these two tags: * !36624 : Externals Update, 21.0 branch (2020.09.22.) * !36642 : Sweeping !36565 from master to 21.0. * !36597 : Sweeping !36550 from 21.2 to 21.0. * !36600 : preInclude file of fractionally charged particles * !36563 : Add overrides for HEC in overlay HI production * !36363 : Fix running trigger int 21.0 with 22.0 RDOs * !36401 : AFP webdisplay [rel 21] * !36345 : Address path resolver issue in ATLASSIM-4674 and store ParamFile in HITS file metadata * !36533 : Sweeping !36482 from 21.2 to 21.0. * !36179 : Add sampling fraction code and analysis for HEC * !36264 : Fix peeking of files with only xAOD::EventInfo * !35986 : Add functionality to find and remove duplicate FastCaloSim instances from the simulation chain * !36140 : Reverting the temporary special reference for HLTtau and restoring default trigger references * !35899 : Sweeping !35830 from master to 21.0. * !35840 : FastCaloSimGAN: skip unused layers early in the GAN layer simulation chain * !35802 : Update log file diff in post.sh Link to the full diff between [release/21.0.118](https://gitlab.cern.ch/atlas/athena/tags/release/21.0.118) and [release/21.0.117](https://gitlab.cern.ch/atlas/athena/tags/release/21.0.117) is available at https://gitlab.cern.ch/atlas/athena/compare/release/21.0.117...release/21.0.118
-
- Sep 24, 2020
-
-
Rachid Mazini authored
Externals Update, 21.0 branch (2020.09.22.) See merge request !36624
-
Rachid Mazini authored
Sweeping !36565 from master to 21.0. egamma ART additional plots See merge request !36642
-
Rachid Mazini authored
Sweeping !36550 from 21.2 to 21.0. Fix crash when loading L1TopoMenu twice (ATR-22015) See merge request !36597
-
Rachid Mazini authored
preInclude file of fractionally charged particles See merge request !36600
-
quli authored
-
- Sep 23, 2020
-
-
Attila Krasznahorkay authored -
egamma ART additional plots See merge request atlas/athena!36565 (cherry picked from commit 29f13141) 8450df4f add conversion radius difference to standard ART plots 5d3dc7ce plot conversion radius difference as comparison for various conversion types 947caf89 add title to x-axis 4eee0344 change ordering to keep x-axis text for first plots
-
- Sep 22, 2020
-
-
Attila Krasznahorkay authored
-
quli authored
-
quli authored
-
Fix crash when loading L1TopoMenu twice (ATR-22015) See merge request atlas/athena!36550 (cherry picked from commit 79e2dfdc) ff12f383 Fix crash when loading L1TopoMenu twice (ATR-22015)
-
- Sep 21, 2020
-
-
Rachid Mazini authored
Add overrides for HEC in overlay HI production See merge request !36563
-
Rachid Mazini authored
Fix running trigger int 21.0 with 22.0 RDOs See merge request !36363
-
Rachid Mazini authored
AFP webdisplay [rel 21] See merge request !36401
-
Rachid Mazini authored
Address path resolver issue in ATLASSIM-4674 and store ParamFile in HITS file metadata See merge request !36345
-
Rachid Mazini authored
Sweeping !36482 from 21.2 to 21.0. Fix to VSI track association See merge request !36533
-
Tatyana Kharlamova authored
-
- Sep 19, 2020
-
-
Fix to VSI track association See merge request atlas/athena!36482 (cherry picked from commit 66aabce6) 3227eeca Adding back SCT and pixel condidtions loading to VSI for SUSY15 3c0f7db2 Adding WARNING message when at least one module is disabled, for debugging 2709f329 Changing call to check disabled modules to use isGood() instead of isActive()... 819199a5 Now also compiles - such a hero sometimes. Towards... 5b5d7bb9 Turning off vertex dissolving, do not think we want that by default - moved... 026817ca Changes to SUSY15 config 06c01578 Merge branch '21.2' of https://gitlab.cern.ch:8443/atlas/athena into 21.2-schedule-vsi-in-susy15 c577b6aa Merge branch '21.2-schedule-vsi-in-susy15' into '21.2' ba2576f0 Update 21.2 to upstream/21.2, resolve merge conflicts in SUSY15.py and... 86990166 Merge remote-tracking branch 'upstream/21.2' into 21.2 d065294e Add attached tracks to vertex before attempting to attach more tracks
-
- Sep 17, 2020
-
-
Nikola Dikic authored
-
- Sep 15, 2020
-
-
Rachid Mazini authored
Add sampling fraction code and analysis for HEC See merge request !36179
-
-
- Sep 11, 2020
-
-
Tadej Novak authored -
Tadej Novak authored
-
John Chapman authored
-
John Chapman authored
-
- Sep 10, 2020
-
-
Rachid Mazini authored
Fix peeking of files with only xAOD::EventInfo See merge request !36264
-
Nikola Dikic authored
-
- Sep 09, 2020
-
-
Rachid Mazini authored
Add functionality to find and remove duplicate FastCaloSim instances from the simulation chain See merge request !35986
-
-
Rachid Mazini authored
Reverting the temporary special reference for HLTtau and restoring default trigger references See merge request !36140
-
- Sep 08, 2020
-
-
Tadej Novak authored
-
Nikola Dikic authored
-
Nikola Dikic authored
-
- Sep 03, 2020
-
-
Elin Bergeaas Kuutmann authored
-
- Sep 02, 2020
-
-
Rachid Mazini authored
Sweeping !35830 from master to 21.0. G4ExtraProcesses module See merge request !35899
-
- Sep 01, 2020
-
-
Michael Duehrssen-Debling authored
-
- Aug 31, 2020
-
-
Michael Duehrssen-Debling authored
-
Michael Duehrssen-Debling authored
-
- Aug 28, 2020
-
-
Michael Duehrssen-Debling authored
-
- Aug 26, 2020
-
-
G4ExtraProcesses module See merge request atlas/athena!35830 (cherry picked from commit 725fbd60) f7815503 G4ExtraProcesses module 6e71f97b linting
-
- Aug 25, 2020
-
-
Rachid Mazini authored
FastCaloSimGAN: skip unused layers early in the GAN layer simulation chain See merge request !35840
-
Rachid Mazini authored
Update log file diff in post.sh See merge request !35802
-
- Aug 24, 2020
-
-
Michael Duehrssen-Debling authored
-
- Aug 21, 2020
-
-
Rachid Mazini authored
-
Rachid Mazini authored
-
Rachid Mazini authored
-
John Chapman authored
Prior to this change log file diffs in unit tests compared the reference file to the current output, rather than the other way around, so that lines in the log removed due to local changes are marked with a `+` in the diff output and lines added to the log are marked with a `-`. This commit switches the order of comparison with the aim of making the output more intuitive. See discussion in ATEAM-644.
-