modified:   Trigger/TrigValidation/TrigInDetValidation/share/TrigInDetValidation_RTT_topOptions_BeamspotSlice.py
	new file:   Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_beamspot_ttbar_pu80_zfinder_ml2_art.sh

Manual sweep of !37022 from 21.0 to 21.3: Externals Update, 21.0 branch (2020.10.06.)

See merge request atlas/athena!37097

Manual sweep of !37009 (Added STGC and MM truth hits in MuonTruthParticlesAux)

See merge request atlas/athena!37119

Manual sweep of !36900 (Let MdtIdHelper return the correct tubeMax)

See merge request atlas/athena!37030

Externals Update, 21.0 branch (2020.10.06.)

See merge request atlas/athena!37022

add LS and SS frames to NSW AGDD, move JD to passive materials

See merge request atlas/athena!37033

Cleanup of v8 L1 menu to fit into the Run 3 connectivity constraints

See merge request atlas/athena!37027

remove xe0noL1_l2fsperf_trkmht_LRT from the ps_rerun_list and add it to a new ps_unconvtrk_list

See merge request atlas/athena!37018

Manual sweep of !36952 (Add temporary warning as long as no BI sMDT calibration constants exits in DB)

See merge request atlas/athena!37024

Manual sweep of !36910 (Avoid hard crash of BIS78 geometries in digitisation)

See merge request atlas/athena!37015

Nicolas Koehler authored Oct 07, 2020 and John Derek Chapman committed Oct 07, 2020

Avoid hard crash of BIS78 geometries in digitisation

See merge request atlas/athena!36910

Add new ML tests for TrigInDetValidation ART tests

See merge request atlas/athena!36929

Julie Kirk authored Oct 06, 2020 and John Derek Chapman committed Oct 06, 2020

	modified:   Trigger/TrigValidation/TrigInDetValidation/share/TrigInDetValidation_RTT_topOptions_BjetSlice.py
	modified:   Trigger/TrigValidation/TrigInDetValidation/share/TrigInDetValidation_RTT_topOptions_TauSlice.py
	new file:   Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_bjet_ibl_pu40_ml_art.sh
	new file:   Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_tau_ibl_pu46_ml_art.sh

MM geometry fixes

See merge request atlas/athena!34420

Fix printout statement in MuonStationBuilder

See merge request atlas/athena!36926

Manual sweep of !36853 from 21.0 to 21.3: Externals Update and CentOS 7 Fixes, 21.0 branch (2020.09.30.)

See merge request atlas/athena!36899

Fixes in RPC active area for BIS78

See merge request atlas/athena!36895

Externals Update and CentOS 7 Fixes, 21.0 branch (2020.09.30.)

See merge request atlas/athena!36853

Merge 21.0.118 into 21.3

See merge request atlas/athena!36772

Add xe0noL1_l2fsperf_trkmht_LRT to MC_pp_v8 in 21.3 for Run 3 trigger performance studies

See merge request atlas/athena!36806

Trig::WebBunchCrossingTool Test Removal, 21.2 branch (2020.08.04.)

See merge request atlas/athena!35371

Manual cherry pick of pixel ladder shape fix

See merge request atlas/athena!36651

Yee Chinn Yap authored Sep 29, 2020 and John Derek Chapman committed Sep 29, 2020

Pixel ladder shape change

See merge request atlas/athena!34961
Conflicts:
	InnerDetector/InDetDetDescr/PixelGeoModel/src/GeoPixelDetailedStaveSupport.cxx
	Tools/PROCTools/python/RunTier0TestsTools.py

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

Externals Update, 21.0 branch (2020.09.22.)

See merge request !36624

Sweeping !36565 from master to 21.0.
egamma ART additional plots

See merge request !36642

Sweeping !36550 from 21.2 to 21.0.
Fix crash when loading L1TopoMenu twice (ATR-22015)

See merge request !36597

preInclude file of fractionally charged particles

See merge request !36600

VMM Shaper

See merge request atlas/athena!36593