Merge 21.3.23 into 21.9

This merge request merges all the changes that were made in the 21.3 branch between the release release/21.3.22 and the previous release release/21.3.23.

Below is a list of merge requests that were accepted between those two tags:

• !37222 (merged): Remove explicit HLToks since full HLT folder is already vetoed
• !37158 (merged): Manual sweep of second part of !36845 (merged) (Modifications to support combined NSW&BIS78 layouts)
• !37142 (merged): Add new ML beamspot test to TrigInDetValidation
• !37147 (merged): Cleanup of RPC readout element storage and creation
• !37200 (merged): Switch off building the HLT as part of Athena in the 21.3 branch (ATLINFR-3756).
• !37028 (merged): add sTGC calib in NSWCalibTool
• !37097 (merged): Manual sweep of !37022 (merged) from 21.0 to 21.3: Externals Update, 21.0 branch (2020.10.06.)
• !37119 (merged): Manual sweep of !37009 (merged) (Added STGC and MM truth hits in MuonTruthParticlesAux)
• !37030 (merged): Manual sweep of !36900 (merged) (Let MdtIdHelper return the correct tubeMax)
• !37033 (merged): add LS and SS frames to NSW AGDD, move JD to passive materials
• !37027 (merged): Cleanup of v8 L1 menu to fit into the Run 3 connectivity constraints
• !37018 (merged): remove xe0noL1_l2fsperf_trkmht_LRT from the ps_rerun_list and add it to a new ps_unconvtrk_list
• !37024 (merged): Manual sweep of !36952 (merged) (Add temporary warning as long as no BI sMDT calibration constants exits in DB)
• !37015 (merged): Manual sweep of !36910 (merged) (Avoid hard crash of BIS78 geometries in digitisation)
• !36929 (merged): Add new ML tests for TrigInDetValidation ART tests
• !34420 (merged): MM geometry fixes
• !36926 (merged): Fix printout statement in MuonStationBuilder
• !36899 (merged): Manual sweep of !36853 (merged) from 21.0 to 21.3: Externals Update and CentOS 7 Fixes, 21.0 branch (2020.09.30.)
• !36895 (merged): Fixes in RPC active area for BIS78
• !36772 (merged): Merge 21.0.118 into 21.3
• !36806 (merged): Add xe0noL1_l2fsperf_trkmht_LRT to MC_pp_v8 in 21.3 for Run 3 trigger performance studies
• !36651 (merged): Manual cherry pick of pixel ladder shape fix
• !36593 (merged): VMM Shaper
• !36644 (merged): Sweeping !36553 (merged) from master to 21.3. Add muon IdDict dictionnaries for Run3 (NSW+BIS78)
• !36614 (merged): fixed phi-angle wrapping at -x axis of pi to -pi bug
• !36598 (merged): Sweeping !36550 (merged) from 21.2 to 21.3. Fix crash when loading L1TopoMenu twice (ATR-22015)
• !36067 (merged): Simulation r-index endless loop fix
• !36000 (merged): Add issMdt and hasHPTDC methods to MuonIdHelperTool
• !35922 (merged): update TrigInDetValidation art-html links
• !35878 (merged): Bugs fixing and tr
• !35875 (merged): Merge 21.0.117 into 21.3
• !35901 (merged): Sweeping !35847 (merged) from master to 21.3. Do not increment tightWP counter in case no ID track is present
• !35399 (merged): Add Large Radius Tracking to TrigFastTrackFinder in 21.3
• !35867 (merged): Sweeping !35832 (merged) from master to 21.3. Increase cut value for L-S overlaps to also work for EO stations (ATLASRECTS-5611)
• !35804 (merged): Update log file diff in post.sh
• !35770 (merged): NSWCalibTool adding pdo to charge functions
• !35603 (merged): Manual sweep from 21.0 to 21.3: !35250 (merged) Decide whether SimHit Collections should be created per simulator on a per region-basis
• !35513 (merged): Switch off test_AtlasG4_FullG4_comparison.sh for 21.3 and 21.9
• !35470 (merged): sumET fix for the R3METAlgs and addition of jXERHO to output TriggerEDM
• !34837 (merged): Update tau trigger cluster orientation
• !35379 (merged): Sweeping !35336 (merged) from master to 21.3. Increase memory limit for MooPerformance ART tests
• !35352 (merged): Temporarily bypass VMM charge measurement in MM digi
• !35334 (merged): change verbosity level of sTGC prep data error printing
• !35130 (merged): L1 calo eFEX configuration
• !35282 (merged): Merge 21.0.116 into 21.3
• !35222 (merged): 21.3 updatemonitoring
• !34631 (merged): TrigL1CaloUpgrade: eFEX egamma update

Link to the full diff between release/21.3.23 and release/21.3.22 is available at https://gitlab.cern.ch/atlas/athena/compare/release/21.3.22...release/21.3.23

added sweep:from 21.3 sweep:ignore labels

WARNING: big files (>100K) are found in the changeset

180K in file DataQuality/DataQualityConfigurations/config/L1Calo/cosmics_run.config

168K in file Trigger/TriggerCommon/TrigEDMConfig/python/TriggerEDM.py

180K in file Trigger/TrigMonitoring/TrigTauMonitoring/src/HLTTauMonTool.cxx

120K in file DataQuality/DataQualityConfigurations/config/Tile/collisions_run.config

184K in file DataQuality/DataQualityConfigurations/config/L1Calo/heavyions_run.config

212K in file Trigger/TriggerCommon/TriggerMenu/python/l1menu/ItemDef.py

232K in file Trigger/TriggerCommon/TriggerMenu/python/menu/Physics_pp_v8.py

104K in file Trigger/TriggerCommon/TriggerMenu/python/menu/MC_pp_v8.py

120K in file DataQuality/DataQualityConfigurations/config/Tile/heavyions_run.config

816K in file DataQuality/DataQualityConfigurations/config/HLT/HLTtau/collisions_run.config

184K in file DataQuality/DataQualityConfigurations/config/L1Calo/collisions_run.config

This merge request affects 44 packages. Since this is a long list, I will not print it here.

Adding @jchapman ,@goetz ,@rosati ,@amete ,@mfauccig ,@orlando ,@gavrilen ,@kwhalen ,@xiaozhon ,@jsandesa ,@pop ,@jpanduro ,@okuprash ,@ahaas ,@asonay ,@oda ,@bernius ,@nkoehler ,@cmorenom ,@carquin ,@sutt ,@pjacka ,@wleight ,@afaulkne ,@schaarsc ,@tkharlam ,@sroe ,@nagano ,@mark ,@mvozak ,@hartj ,@ahasib ,@ademaria ,@okumura ,@malconad ,@vpascuzz ,@tadej ,@ssnyder ,@rbianchi as watchers

added 21.9 Core DQ EDM Egamma Generators InnerDetector JetEtmiss MuonSpectrometer Overlay Reconstruction Simulation Tau Tools Trigger TriggerEDM TriggerMenu review-pending-level-1 labels

CI Result SUCCESS (hash 5ea3d5dc)

	Athena
externals
cmake
make
required tests
optional tests

Full details available on this CI monitor view
Athena: number of compilation errors 0, warnings 143
For experts only: Jenkins output [CI-MERGE-REQUEST-CC7 45035]

resolved all threads

resolved all threads

added review-approved label and removed review-pending-level-1 label

Hi @seroslia1,

Thanks for the review. This is a sweep of changes from 21.3 to 21.9. The changes have all been reviewed in their original merge requests. The idea is to keep the two branches in sync as much as possible, so I will not be introducing minor changes which will introduce conflicts in future sweeps.

Cheers,

John

added review-user-action-required label and removed review-approved label

resolved all threads

added review-approved label and removed review-user-action-required label

merged

mentioned in commit 6f68a156