2025-05-01: merge of 24.0 into main
This sweep triggered several conflicts:
-
InnerDetector/InDetValidation/InDetPhysValMonitoring/src/InDetRttPlots.cxxcaused by !79654 (merged), CC @tstreble. Given the previous MR on 24.0 that touched this file was labeled as sweep:ignore, I assumed that I should ignore this change too. -
Trigger/TrigHypothesis/TrigEgammaHypo/CMakeLists.txtcaused by !79659 (merged), CC @martindl. The changes conflicted with a several-month-old MR on the main branch by @xju. Resolved the conflicts manually. -
Trigger/TrigTools/TrigInDetConfig/python/BuildSignatureFlags.py,Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Electron/PrecisionElectronRecoSequences.py,Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Electron/PrecisionTracks_GSFRefittedSequence.pycaused by !79670 (merged), CC @jmasik. Again, these changes conflicted with some developments in the main branch. I used an "educated guess" approach for resolving the conflicts (mostly in favor of the main revisions). @jmasik, please confirm that you are happy with the outcome of the conflict resolution. Thanks
The following MR has been excluded from the sweep:
- !79346 (merged) ThinGeant4Algs - Fix TruthThinning for muons & declare dependency on the truth decorations Analysis, MuonSpectrometer, Run2-MCReco-output-changed, Run3-MCReco-output-changed, Tools, sweep:ignore
This sweep contains the following MRs:
- !79683 (merged) TrigValTools: fix check_log.py when ignorePattern is empty Trigger
- !79677 (merged) Update L1ADVAE thresholds Trigger, TriggerMenu, changes-trigger-counts
- !79670 (merged) IDTrig+Egamma: set internal objects from global section of flags Egamma, Trigger, TriggerID, TriggerMenu
- !79673 (merged) Fix the threshold for passing rhad fraction cut in eTAU in algoVersion 2 DQ, L1Calo, Trigger
- !79653 (merged) ATR-31181 + ETSum truncation added to gFEXBSInputDecodes + gFEX offline monitoring plot fixes DQ, L1Calo, Trigger
- !79642 (merged) Convert ThinInDetClustersAlg to an AthReentrantAlgorithm Analysis
- !79658 (merged) fix wrong IOVDbSvcConfig import for ISF_ValidationMT/test_RUN3_FullG4MT_QS_minbias_MT.sh [ATLASSIM-7475] Simulation
- !79549 (merged) Do not add /GLOBAL/FILECOUNT/PROMPT for Run3 onwards DQ, Run3-DataReco-output-changed, Tools
- !79567 (merged) Configuring eFex, jFex and gFex through flags and enable only if available DQ, L1Calo, Trigger
- !79648 (merged) Edit eFEXegAlgo.cxx - patch for rhad algorithm update L1Calo, Trigger
- !79661 (merged) Adjust memory requirement for q454 Tools
- !79659 (merged) TrigEgammaHypo: header cleanup Egamma, Trigger
- !79652 (merged) fix the merge option WARNINGs for vs lb histograms DQ, MuonSpectrometer
- !79656 (merged) Increase TRT hit range to 50 in IDPVM InnerDetector, PhysValidation
- !79654 (merged) Drop Selected directory in per-author HitsOnTracks IDPVM plots InnerDetector, PhysValidation
Edited by Vakhtang Tsulaia