2024-07-11: merge of 24.0 into main
A few conflicts needed to be resolved
-
Control/AthenaServices/src/AthenaMtesEventLoopMgr.cxx
(kept the main version and reverted !72906 (merged). @juesseiv we'll probably need to manually sweep !72966 (merged) into main after this MR gets merged) -
DataQuality/DataQualityUtils/src/MonitoringFile.cxx
(manual resolution) -
Tools/Tier0ChainTests/test/test_bulkProcessing_data22.sh
(main version kept) -
Tools/Tier0ChainTests/test/test_bulkProcessing_data23.sh
(main version kept) -
Tools/Tier0ChainTests/test/test_drawProcessing_data23.sh
(main version kept) -
Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Menu/MC_pp_run4_v1.py
(24.0 version kept @tamartin @zhangbo) -
MuonSpectrometer/MuonCnv/MuonNSWCommonDecode/src/STGTPPackets.cxx
(24.0 version kept) -
PhysicsAnalysis/PhysicsValidation/PhysValMonitoring/python/PhysValMonitoringConfig.py
(manual resolution @cvarni @tstreble)
This sweep contains the following MRs:
- !72902 (merged) Stgc l1a v3 mrf 001 EDM, MuonSpectrometer, Trigger
- !72956 (merged) Adding pipeline and fiber IDs to test app ntuple MuonSpectrometer
- !72966 (merged) Set eventIndex In MtesEventLoop Core
- !72952 (merged) CaloCellMakerConfig test: Make ref-file handling more robust Calorimeter
- !72929 (merged) Turn on PhysVal Example by default Analysis, PhysValidation
- !72954 (merged) Bugfix to event counting in trfFileUtils Tools
- !72935 (merged) CxxUtils: Add a preload to change the bad_array_new_length to an immediate abort. Core
- !72955 (merged) Add additional Tau T&P chains Trigger, TriggerMenu, changes-trigger-counts
- !72583 (merged) Update run4 trigger menu Trigger, TriggerMenu
- !72914 (merged) Reco ART conditions tag patch Reconstruction, Tools
- !72906 (merged) Backport integration of EvtIdModifierSvc into AthenaMtesEventLoopMgr Core, Digitization, EDM, sweep:ignore
- !72923 (merged) Update conditions + minor fixes for Run 3 IDPVM ART tests InnerDetector, PhysValidation, Tracking
- !72936 (merged) AthContainers: Add AuxVectorData::lockDecoration. Core
- !72918 (merged) Update Simulation test conditions tag to fix ATLASSIM-7240 Simulation
- !72917 (merged) Add helper preInclude functions for fine-grained enabling/disabling of G4Optimizations Simulation, Tools
- !72909 (merged) fix potentially-uninitalized member Calorimeter
- !72897 (merged) missing newline in error message of DQ MonitoringFile DQ
- !72107 (merged) TrigmuCombHypoAlg uses only features corresponding to target chains Trigger
- !72895 (merged) MuonConfiguration - Prepare cabling configuration infrastructure for the JSON format MuonSpectrometer
Edited by Vakhtang Tsulaia