2025-03-06: merge of 24.0 into main (!78332) · Merge requests · atlas / athena

Merged Tadej Novak requested to merge tadej/athena:sweep_24.0_main_2025-03-06 into main 1 month ago

Mar 06, 2025
- Fix merge resolution of xAODJetRetriever and TrackRetriever · 613aa6a2
  Tadej Novak authored 1 month ago
  
  Verified
  
  613aa6a2
- Merge remote-tracking branch 'upstream/24.0' into main · c6b6a4fb
  Tadej Novak authored 1 month ago
  
  Verified
  
  c6b6a4fb
- Merge branch 'hltcalo-monitor-chains' into '24.0' · 17b23c42
  Jiri Masik authored 1 month ago
  
  HLT Calo: Update configuration and add monitoring chains to Physics menu See merge request !78317
  17b23c42
- HLT Calo: Update configuration and add monitoring chains to Physics menu · f017bd0d
  Nuno Dos Santos Fernandes authored 1 month ago and Jiri Masik committed 1 month ago
  
  HLT Calo: Update configuration and add monitoring chains to Physics menu
  f017bd0d
- Merge branch 'ttree_ntuple_removal' into '24.0' · 1495ff1e
  Jiri Masik authored 1 month ago
  
  TrigT1NSWSimTools: PadTriggerLookupTool removal See merge request !78295
  1495ff1e
- TrigT1NSWSimTools: PadTriggerLookupTool removal · 4503a19b
  Francesco Giuseppe Gravili authored 1 month ago and Jiri Masik committed 1 month ago
  
  TrigT1NSWSimTools: PadTriggerLookupTool removal
  4503a19b
- Merge branch 'mc23g' into '24.0' · 84502ff5
  Jean-Baptiste De Vivie De Regie authored 1 month ago
  
  Add preliminary MC23g configuration and move tracking config to use it See merge request !78093
  84502ff5
- Merge branch 'crestapi' into '24.0' · 8175bfb1
  Jean-Baptiste De Vivie De Regie authored 1 month ago
  
  Projects: update externals to 2.1.16.7 See merge request !78278
  8175bfb1
- Bump project versions to 24.0.82 · bcde790a
  Jiří Mašík authored 1 month ago
  
  bcde790a
- Put MC23g tracking specifics under campaign check · e4eb6fc2
  Tadej Novak authored 2 months ago
  
  Verified
  
  e4eb6fc2
- Add initial MC23g campaign and enable campaign sorting · d7f79652
  Tadej Novak authored 2 months ago
  
  Verified
  
  d7f79652
- Merge branch 'TrkDetFlags' into '24.0' · 3285b747
  Duc Ta authored 1 month ago
  
  Clean up deprecated TrkDetFlags in Geant4MSFollowing See merge request !78279
  3285b747
- Clean up deprecated TrkDetFlags in Geant4MSFollowing · 89df5312
  Thomas Strebler authored 1 month ago and Duc Ta committed 1 month ago
  
  Clean up deprecated TrkDetFlags in Geant4MSFollowing
  89df5312
- Merge branch 'tilemontest' into '24.0' · 586beb97
  Duc Ta authored 1 month ago
  
  TileMonitoring: run unit tests in private working directory See merge request !78281
  586beb97
- Merge branch 'Tier0ChainTests_PHYSVAL' into '24.0' · 5b73129c
  Duc Ta authored 1 month ago
  
  Adjust Tier0ChainTests PHYSVAL tests See merge request atlas/athena!78280
  5b73129c
- Adjust Tier0ChainTests PHYSVAL tests · 407b6856
  Thomas Strebler authored 1 month ago and Duc Ta committed 1 month ago
  
  Adjust Tier0ChainTests PHYSVAL tests
  407b6856
- Merge branch 'emptyDecor.DerivationFrameworkCore-20250304' into '24.0' · 5fb8d702
  Duc Ta authored 1 month ago
  
  DerivationFrameworkCore: Skip locking decorations for an empty container. See merge request atlas/athena!78274
  5fb8d702
- DerivationFrameworkCore: Skip locking decorations for an empty container. · 49e56d74
  Scott Snyder authored 1 month ago and Duc Ta committed 1 month ago
  
  DerivationFrameworkCore: Skip locking decorations for an empty container. In LockDecorations, skip empty containers. They wouldn't have decorations anyway.
  49e56d74
- Merge branch 'btload.GdbUtils-20250304' into '24.0' · cf1b956e
  Duc Ta authored 1 month ago
  
  GdbUtils: Fix for btload. See merge request atlas/athena!78273
  cf1b956e
- GdbUtils: Fix for btload. · 65c0483a
  Scott Snyder authored 1 month ago and Duc Ta committed 1 month ago
  
  GdbUtils: Fix for btload. Tweak to allow btload to get past sanitizer libraries.
  65c0483a
- Merge branch 'retrievers' into '24.0' · 40a16a06
  Duc Ta authored 1 month ago
  
  Modernise xAOD JiveXML retrievers See merge request atlas/athena!78253
  40a16a06
- Modernise xAOD JiveXML retrievers · 76c6cd63
  Melissa Yexley authored 1 month ago and Duc Ta committed 1 month ago
  
  Modernise xAOD JiveXML retrievers
  76c6cd63
- Merge branch 'fix-idmonitoring' into '24.0' · 8b3f61d4
  Duc Ta authored 1 month ago
  
  InDetPhysValMonitoringTool: Make redundant member variable local See merge request atlas/athena!78216
  8b3f61d4
- InDetPhysValMonitoringTool: Make redundant member variable local · 0f378a63
  Tadej Novak authored 1 month ago and Duc Ta committed 1 month ago
  
  Apply 1 suggestion(s) to 1 file(s) Co-authored-by: Thomas Strebler <thomas.strebler@cern.ch>
  0f378a63
Mar 05, 2025

Projects: update externals to 2.1.16.7 · 779b28ff

Update all projects to atlasexternals 2.1.16.7. The only change is to
make the CrestApi package available for those projects not depending on
tdaq-common.

Relates to ATDBOPS-393.

779b28ff

TileMonitoring: run unit tests in private working directory · cfe78bf9

Frank Winklmeier authored 1 month ago

Tests executing athena need to run in their private directory to avoid
collisions in e.g. the pool catalogue XML file.

Also check for errors in test logs.

cfe78bf9

2025-03-06: merge of 24.0 into main

Merge request reports

Activity