2025-12-10: merge of 24.0 into main
We have several conflicts in this MR:
Database/IOVDbMetaDataTools/src/IOVDbMetaDataTool.hDatabase/IOVDbMetaDataTools/src/IOVDbMetaDataTool.cxxEvent/ByteStreamCnvSvc/CMakeLists.txtLumiBlock/LumiBlockComps/src/BunchCrossingCondAlg.hLumiBlock/LumiBlockComps/src/BunchCrossingCondAlg.cxx
These were triggered by !84528 (merged). I resolved the conflicts manually. @maszyman, could you please confirm that the result is OK with you. Thanks!
PhysicsAnalysis/Algorithms/AsgAnalysisAlgorithms/python/PileupReweightingAlgConfig.pyPhysicsAnalysis/PATJobTransforms/scripts/PRWConfig_tf.py
These were triggered by !84800 (merged). I resolved the conflicts manually, mostly in favor of 24.0 changes. @jchapman, could you please have a look at the results. Thanks!
This sweep contains the following MRs:
- !84528 (merged) Serialize IOV metadata to ByteStream files for RDO to BS conversion DQ, Database, EDM, Tools
- !84800 (merged) Initial attempt at CA-based PRWConfig_tf.py (ATLASG-2969) Analysis, CPAlgorithms
- !84841 (merged) Adding AutoConfig settings for Dyons for MC20 Core, Simulation
Edited by Vakhtang Tsulaia