2025-03-06: merge of 24.0 into main
This sweep contains the following MRs:
- !78317 (merged) HLT Calo: Update configuration and add monitoring chains to Physics menu Trigger, TriggerMenu
- !78295 (merged) TrigT1NSWSimTools: PadTriggerLookupTool removal Trigger
- !78093 (merged) Add preliminary MC23g configuration and move tracking config to use it InnerDetector, Tools, Tracking
- !78278 (merged) Projects: update externals to 2.1.16.7 Build, Simulation
- !78279 (merged) Clean up deprecated TrkDetFlags in Geant4MSFollowing Simulation, Tracking
- !78281 (merged) TileMonitoring: run unit tests in private working directory DQ, Tile
- !78280 (merged) Adjust Tier0ChainTests PHYSVAL tests PhysValidation, Tools
- !78274 (merged) DerivationFrameworkCore: Skip locking decorations for an empty container. Derivation
- !78273 (merged) GdbUtils: Fix for btload. Tools
- !78253 (merged) Modernise xAOD JiveXML retrievers Analysis, Egamma, EventDisplay, JetEtmiss, Tau, Tracking
- !78216 (merged) InDetPhysValMonitoringTool: Make redundant member variable local InnerDetector, PhysValidation
Merge request reports
Activity
added 1 commit
- c6b6a4fb - Merge remote-tracking branch 'upstream/24.0' into main
added 1 commit
- 6bcbb432 - Fix merge resolution of xAODJetRetriever and TrackRetriever
This merge request affects 18 packages:
- InnerDetector/InDetConfig
- InnerDetector/InDetValidation/InDetPhysValMonitoring
- PhysicsAnalysis/AnalysisEventDisplay/xAODJiveXML
- PhysicsAnalysis/DerivationFramework/DerivationFrameworkCore
- TileCalorimeter/TileMonitoring
- Tools/Campaigns
- Tools/GdbUtils
- Tools/Tier0ChainTests
- Tracking/TrkConfig
- Tracking/TrkEventCnv/TrkJiveXML
- Tracking/TrkG4Components/TrkG4UserActions
- Trigger/TrigAlgorithms/TrigCaloRec
- Trigger/TrigT1/TrigT1NSW
- Trigger/TrigT1/TrigT1NSWSimTools
- Trigger/TriggerCommon/TriggerJobOpts
- Trigger/TriggerCommon/TriggerMenuMT
- graphics/EventDisplaysOnline
- graphics/JiveXML
Affected files list will not be printed in this case
Adding @tstreble ,@lgagnon ,@sroe ,@shanisch ,@rbianchi ,@sutt ,@xiaozhon ,@lidiaz ,@fpastore ,@goetz ,@jchapman ,@adbailey ,@damazio ,@emmat ,@gipezzul ,@ademaria ,@keli ,@fwinkl ,@slai ,@iriu ,@ggonella ,@jburzyns ,@solodkov ,@harkusha ,@martindl ,@jcatmore ,@dossantn ,@jmcgowan ,@pavol ,@iouri as watchers
added 1 commit
- 613aa6a2 - Fix merge resolution of xAODJetRetriever and TrackRetriever
This merge request affects 18 packages:
- InnerDetector/InDetConfig
- InnerDetector/InDetValidation/InDetPhysValMonitoring
- PhysicsAnalysis/AnalysisEventDisplay/xAODJiveXML
- PhysicsAnalysis/DerivationFramework/DerivationFrameworkCore
- TileCalorimeter/TileMonitoring
- Tools/Campaigns
- Tools/GdbUtils
- Tools/Tier0ChainTests
- Tracking/TrkConfig
- Tracking/TrkEventCnv/TrkJiveXML
- Tracking/TrkG4Components/TrkG4UserActions
- Trigger/TrigAlgorithms/TrigCaloRec
- Trigger/TrigT1/TrigT1NSW
- Trigger/TrigT1/TrigT1NSWSimTools
- Trigger/TriggerCommon/TriggerJobOpts
- Trigger/TriggerCommon/TriggerMenuMT
- graphics/EventDisplaysOnline
- graphics/JiveXML
Affected files list will not be printed in this case
Adding @emmat ,@goetz ,@fpastore ,@damazio ,@jburzyns ,@iouri ,@pavol ,@sroe ,@tstreble ,@xiaozhon ,@harkusha ,@ggonella ,@adbailey ,@ademaria ,@fwinkl ,@martindl ,@lidiaz ,@rbianchi ,@lgagnon ,@jcatmore ,@solodkov ,@sutt ,@jmcgowan ,@gipezzul ,@jchapman ,@keli ,@dossantn ,@iriu ,@slai ,@shanisch as watchers
CI Result SUCCESS (hash 6bcbb432)Athena AthSimulation AthGeneration AnalysisBase AthAnalysis externals cmake make tests Full details available on this CI monitor view. Check the JIRA CI status board for known problems
Athena: number of compilation errors 0, warnings 1
AthSimulation: number of compilation errors 0, warnings 0
AthGeneration: number of compilation errors 0, warnings 0
AnalysisBase: number of compilation errors 0, warnings 0
AthAnalysis: number of compilation errors 0, warnings 0
For experts only: Jenkins output (remote access info) CI Result SUCCESS (hash 613aa6a2)Athena AthSimulation AthGeneration AnalysisBase AthAnalysis externals cmake make tests Full details available on this CI monitor view. Check the JIRA CI status board for known problems
Athena: number of compilation errors 0, warnings 0
AthSimulation: number of compilation errors 0, warnings 0
AthGeneration: number of compilation errors 0, warnings 0
AnalysisBase: number of compilation errors 0, warnings 0
AthAnalysis: number of compilation errors 0, warnings 0
For experts only: Jenkins output (remote access info)mentioned in commit bc3f55e4