2023-12-08: merge of 23.0 into main (!67695) · Merge requests · atlas / athena · GitLab

gitlab-api requested to merge emoyse/athena:sweep_23.0_main_2023-12-08 into main Dec 08, 2023

This sweep contains the following MRs:

!67681 (merged) Patching MC23d configuration Digitization, Simulation, Tools
!67627 (merged) 23.0 zdc sd class ATLASSIM-6751 ForwardDetectors, Simulation
!67629 (merged) Fixed ordering bug in the random numbers given to the GAN in FastCaloGAN Simulation

I had a few conflicts:

Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimEvent/share/TFCSEnergyAndHitGANV2_test.ref
Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimEvent/src/TFCSONNXHandler.cxx
- Both these were deleted in HEAD and modified in upstream/23.0. I kept them deleted.
Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimEvent/src/TFCSPredictExtrapWeights.cxx
- Minor internal conflict, which I just resolved.

Edited Dec 08, 2023 by Edward Moyse