Daily merge of 23.0 into main
Conflicts:
Reconstruction/egamma/egammaAlgs/python/egammaTopoClusterCopierConfig.pyReconstruction/egamma/egammaConfig/python/egammaConfigFlags.py
Caused by !65217 (merged) in 23.0 (author @stapiaar) and !64179 (merged) in main (author @llewitt). I resolved these conflicts manually. Please confirm that you are OK with the resolution. Thanks.
This sweep contains the following MRs:
- !65217 (merged) ATLHI-501 fix to use EGamma reco with HIClusters as inputs Egamma, InnerDetector, Reconstruction, Tracking
- !65256 (merged) Merge branch 'ATLASSIM-6684' into 'main' Tracking
- !65259 (merged) ZDC reconstruction bug fix for 2018 trigger (re)processing ForwardDetectors
- !65195 (merged) redid mods to ZdcNtuple to work with Run 3 ForwardDetectors
- !65275 (merged) Add ART grid option comments Trigger
- !65276 (merged) clean-up and streamline LArCalib-Validation algorithm (cherry-pick from main) LAr
- !65269 (merged) Additional fix for RPC DQ postprocessing crash DQ, MuonSpectrometer