2024-11-16: merge of 24.0 into main

Several conflicts here. Some of them were discussed on !75898 (closed).

There is a set MR-s related to ATLINFR-5582. The changes from these MR-s were not intended to be swept into main. Ideally, all of them should have been marked as sweep:ignore. Here is a list of conflicts generated by these MR-s. In all cases, the conflicts were resolved in favor of main versions

1. !75846 (merged) (@amete). Affected files:
   • Control/AthenaServices/CMakeLists.txt
   • Database/APR/RootStorageSvc/src/RootDatabase.cpp
   • Database/AthenaRoot/RootAuxDynIO/RootAuxDynIO/RootAuxDynDefs.h
   • Database/AthenaRoot/RootAuxDynIO/src/RNTupleAuxDynReader.cxx
   • Database/AthenaRoot/RootAuxDynIO/src/RNTupleAuxDynWriter.cxx
   • Database/AthenaRoot/RootAuxDynIO/src/RNTupleAuxDynWriter.h
2. !75862 (merged) (@jchapman). Affected files:
   • Control/AthenaCommon/python/AppMgr.py
3. !75867 (merged) (@jchapman). Affected files:
   • Event/PyDumper/python/Dumpers.py
4. !75865 (merged) (@jchapman). Affected files:
   • Tools/PyJobTransformsCore/python/fileutil.py
   • Tools/PyJobTransformsCore/python/full_trfarg.py
   • Tools/PyJobTransformsCore/python/trferr.py
5. !75913 (merged) (@jchapman). Affected files:
   • Calorimeter/CaloRec/python/CaloConfigFlags.py
6. !75910 (merged) (@jchapman). Affected files:
   • PhysicsAnalysis/Algorithms/AnalysisAlgorithmsConfig/python/ConfigFactory.py
   • PhysicsAnalysis/Algorithms/AnalysisAlgorithmsConfig/python/ConfigText.py
7. !75911 (merged) (@jchapman). Affected files:
   • Trigger/TriggerCommon/TriggerMenuMT/python/TriggerAPI/TriggerAPISession.py

We have another set of conflicts related to !75074 (merged) (@pavol). All of them have been resolved manually

1. LArCalorimeter/LArCafJobs/CMakeLists.txt
2. LArCalorimeter/LArCafJobs/src/LArNoiseBursts.cxx
3. LArCalorimeter/LArCellRec/python/LArNoisyROSummaryConfig.py (The version in main changed by !71844 (merged) (@fatsai))
4. LArCalorimeter/LArCnv/LArAthenaPool/src/LArNoisyROSummaryCnv.cxx

Other conflicts

1. LArCalorimeter/LArG4/LArG4FastSimulation/src/EndcapFastSimDedicatedSD.cxx. Comes from !75838 (merged) (@jchapman). Trivial conflict. Took the 24.0 version
2. ForwardDetectors/ZDC/ZdcAnalysis/Root/ZDCPulseAnalyzer.cxx. Comes from !75844 (merged) (@steinber). Trivial conflicts, but I had to resolve them manually anyway.
3. InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_zprime_tide.sh. Comes from !75813 (merged) (@tstreble). Resolved manually

This sweep contains the following MRs:

• !75931 (merged) Updates to LF monitoring for HI, temporary removed AFP items Trigger, TriggerMenu
• !75917 (merged) LArFCalTowerBuilderTool : improve thread safety of look-up table building Calorimeter, LAr
• !75837 (merged) Improve protection for cells container in TrigTowerMaker and avoid double container CaloCells in HI menu Egamma, Trigger, TriggerMenu
• !75889 (merged) HltEventLoopMgr: fix race condition during stop Trigger
• !75911 (merged) TriggerMenuMT: fix flake8 warnings seen when updating to LCG_106a Trigger, TriggerMenu
• !75910 (merged) Fixing Flake8 warnings in AnalysisAlgorithmsConfig seen when updating to LCG106a Analysis, CPAlgorithms
• !75915 (merged) HISTPostProcess_tf.py: add trfArgClass for custom arguments Reconstruction
• !75909 (merged) Updates to PyDumpers to support LCG_106a EDM
• !75894 (merged) Set conditionsTag for test_zprime_tide.sh InnerDetector, PhysValidation
• !75815 (merged) fix alignmon folders in DQ HI config DQ
• !75074 (merged) LAr HVlines noise flag Calorimeter, DQ, LAr, Run2-DataReco-output-changed, Run2-MCReco-output-changed, Run3-DataReco-output-changed, Run3-MCReco-output-changed, Tools, Trigger
• !75913 (merged) Updates to CaloRec package to support LCG_106a Calorimeter
• !75914 (merged) Updates to DQDefects package to support LCG_106a DQ
• !75884 (merged) Add new LAr patching LAr
• !75862 (merged) AthenaCommon: fix flake8 warnings seen after update to LCG106a Core, sweep:ignore
• !75847 (merged) AthContainers: Add warnUnlocked arguments. Core
• !75865 (merged) Fixing Flake8 warnings in multiple packages seen when updating to LCG106a Analysis, Database, Egamma, Generators, Overlay, Reconstruction, Simulation, Tools, sweep:ignore
• !75844 (merged) integration of FADC correction into ZDC reconstruction ForwardDetectors
• !75866 (merged) Fixing Flake8 warnings in MVAUtils seen when updating to LCG106a Reconstruction
• !75871 (merged) Updating T0 Trigger reference to run 488991 (ATR-30503) DQ, Trigger
• !75839 (merged) Update L1CaloCondConfig.py - incorrect folder being used for loading strategy ... removed unused folder L1Calo, Trigger
• !75864 (merged) ATR-29028: Lower DPHI-eTAU1 thresholds to 0.8, 0.8 Trigger, TriggerMenu
• !75838 (merged) Allow the possibility of weighting energy-deposits in LArSimHits made by Frozen Showers LAr, Simulation
• !75876 (merged) Introduce check against fixed reference for IDPVM simreco ART tests (ATLIDTRKCP-646) InnerDetector, PhysValidation
• !75867 (merged) Fixing Flake8 warnings in PyDumper seen when updating to LCG106a EDM, sweep:ignore
• !75831 (merged) RootUtils: fix build with LCG_106a Core
• !75835 (merged) Updates to Rivet_i and TruthRivetUtils to support the version of Rivet in LCG_106a Generators
• !75846 (merged) AthenaServices+RootStorageSvc+RootAuxDynIO: Fix compilation errors in 24.0 + LCG106 Core, Database, sweep:ignore
• !75860 (merged) Projects: disable Boost version warning Build, Simulation
• !75825 (merged) TRTCalib - Adding TRTCalib_StrawStatusPlots in replace of TRTCalib_StrawStatusReport.C root macro InnerDetector
• !75830 (merged) CaloRecGPU: copy version from main branch CUDA, Calorimeter
• !75623 (merged) TrigServices: disable handling of Ctrl-C in CoreDumpSvc Trigger
• !75829 (merged) TrigInDetCUDA: fix build with LCG_106a CUDA, ITk, Trigger
• !75826 (merged) TrigConfMuctpi: Fix compilation with boost 1.85. Trigger
• !74348 (merged) Updating the global monitoring script to be used for Online/ART Reconstruction
• !75782 (merged) Auxdata replaced with ConstAccessors in ZdcNtuple ForwardDetectors
• !75813 (merged) Align IDPVM Z' TIDE ART test with other sim+reco tests InnerDetector, PhysValidation
• !75812 (merged) Updated IDPVM ART mu100 GeV references to 24.0.71 InnerDetector, PhysValidation
• !75797 (merged) Campaigns: Add MC23aNoPileUp, MC23dNoPileUp, MC23eNoPileUp configurations Tools