2025-02-19: merge of 24.0 into main

The following MR-s have been ignored during the sweep:

The following conflicts were generated during the sweep

  1. Related to !77766 (merged)
  • Simulation/G4Atlas/G4AtlasAlg/python/G4AtlasAlgConfig.py
  • Simulation/G4Atlas/G4AtlasTools/python/G4AtlasToolsConfig.py
  • Simulation/ISF/ISF_Config/python/ISF_MainConfig.py

@jchapman, I resolved the conflicts manually. Mostly in favor of 24.0, but not everywhere. Could you please confirm that the final resolution looks reasonable to you? Thanks.

  1. Related to !77855 (merged)
  • Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc23a_presampling_variable.sh
  • Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc23a_presampling_variable_TruthOnly.sh
  • Simulation/Tests/DigitizationTestsMT/test/test_Digi_tf_mc23a_MP_presampling_reproducibility.sh
  • Simulation/Tests/OverlayTests/test/test_MCOverlay_MC23a_ttbar.sh
  • Simulation/Tests/OverlayTestsMT/test/test_MCOverlay_MT_ttbar_Run3_8threads.sh
  • Simulation/Tests/OverlayTestsMT/test/test_MCOverlay_ttbar_Run3_ST_vs_MT.sh
  • Simulation/Tests/OverlayTestsMT/test/test_MCOverlay_ttbar_ST_vs_MT_Muon_NSW.sh

@jchapman, here again, I resolved the conflicts in favor of 24.0. @tstreble may not agree with this, though. Could you please have a look at the resolution and confirm that it is OK? Otherwise, please send me your suggestions for further changes. Thanks.

This sweep contains the following MRs:

Edited by Vakhtang Tsulaia

Merge request reports

Loading