2025-02-21: merge of 24.0 into main
The following MRs have been ignored during the sweep:
- !77974 (merged) Pixel and Strip clusterization: Do not create handles without keys in tight loops (24.0 version) ACTS, InnerDetector, Tracking, sweep:ignore
- !77950 (merged) Projects: Update 24.0 externals to version 2.1.16.4 Build, Simulation, sweep:ignore
Several conflicts have been resolved.
-
AtlasTest/CITest/Athena.cmake. New tests have been added to the end of this file in 24.0 and main (one in each branch). Kept both. -
Calorimeter/CaloCondPhysAlgs/src/CaloAddCellPedShift.[h,cxx]. Triggered by !77943 (merged) (CC @wlampl). The conflicts resolved in favor of 24.0 -
MuonSpectrometer/MuonPhaseII/MuonG4/MuonSensitiveDetectorsR4/python/SensitiveDetectorsCfg.pyandReconstruction/Jet/JetMomentTools/JetMomentTools/JetVertexNNTagger.h. The conflicts triggered by fixes/resolutions applied to the previous sweep MR. Resolved in favor of main -
Tracking/TrkConfig/python/TrkConfigFlags.py. Triggered by !77100 (merged) (CC @tstreble). Resolved in favor of main
This sweep contains the following MRs:
- !77981 (merged) Updated the chains needed by the tier0 vertex analysis Trigger
- !77973 (merged) Improve TRT monitoring threading performance DQ, InnerDetector
- !77977 (merged) LArRinj2Ntuple: use ReadCondHandleKey instead of plain string LAr
- !77963 (merged) Track regex line for new naming convention in flavor tagging variables Analysis, BTagging, JetEtmiss
- !77968 (merged) add aditional HLT container to DESDM_MCP for toroid off runs Analysis
- !77906 (merged) Add CI test for TrigInDetValidation to test against menu Test, Trigger
- !77943 (merged) Modernize CaloCellAddPedShift Calorimeter
- !77942 (merged) Update SGInputLoader.cxx - access to auxvariables of extraoutput-declared... Core
- !77736 (merged) [ATR-30816] add new HLT NN JVT, augmented with additional tracking information (base 24.0) JetEtmiss, Reconstruction
- !77925 (merged) TileConfiguration: Update default value of flag 'Tile.doTimingHistogramsForCell' Tile
- !77902 (merged) Fix TRT conditions access in non G4 jobs InnerDetector
- !77894 (merged) Initial version of Campaign configuration for MC matching the 2024 Heavy Ion data Core, Tools
- !77917 (merged) Change copy to std::move EDM
- !77905 (merged) Add LAr, MDT, RPC and TGC to the RDOAnalysis package Digitization, Simulation
- !77907 (merged) [ATR-30804] Add ShallowCopy output property to HLTEDMCreator for scheduler awareness Trigger
- !77908 (merged) Tidy up includes in HLTEDMCreator Trigger
- !77100 (merged) Update startAtOriginalPerigee tracking flags to true (ATLASRECTS-8132) InnerDetector, Reconstruction, Tracking
- !75251 (merged) Enable TRT Ar ToT correction for 2025 data-taking (ATLIDTRKCP-632) InnerDetector, Tracking
- !77889 (merged) Configuration fixes for Simulation configurations using Fatras (ATLASSIM-7425) HGTD, MuonSpectrometer, Simulation, Upgrade
Edited by Vakhtang Tsulaia