Conflicts resolved:
	InnerDetector/InDetMonitoring/InDetAlignmentMonitoringRun3/src/IDAlignMonGenericTracksAlg.cxx

remove legacy config flag-file CaloCellFlags.py

See merge request !71821

Remove BTaggingSecVtx related plots from TIDA [ATR-29483]

See merge request !71803

Benjamin Philip Kerridge authored 9 months ago and Dylan Remberto Van Arneman committed 9 months ago

remove requirement for HLT_AntiKt4EMPFlowJets_subresjesgscIS_ftf_BTaggingSecVtx which is now removed from the AOD

ATR-29478: Fix beamspot bits in b-jet trigger

See merge request !71793

Dan Guest authored 9 months ago and Dylan Remberto Van Arneman committed 9 months ago

ATR-29478: Fix beamspot bits in b-jet trigger

Fix bug for allowed truncation collections without Aux

See merge request !71549

Francesca Pastore authored 9 months ago and Dylan Remberto Van Arneman committed 9 months ago

Fix bug for allowed truncation collections without Aux

TrigGlobalEfficiencyCorrectionTool: remove map entries with default SF

See merge request atlas/athena!71824

Julien Maurer authored 9 months ago and Frank Winklmeier committed 9 months ago

TrigGlobalEfficiencyCorrectionTool: remove map entries with default SF

MuonGeometryCnv: Fix MDT DE identifiers

See merge request atlas/athena!71834

Edward Moyse authored 9 months ago and Frank Winklmeier committed 9 months ago

MuonGeometryCnv: Fix MDT DE identifiers

Minor clean-up of clients of PrimaryParticleInformation

See merge request !71757

John Derek Chapman authored 9 months ago and Frank Winklmeier committed 9 months ago

Minor clean-up of clients of PrimaryParticleInformation

Optionally deploy HGTD clusterization algorithm with new xAOD EDM

See merge request !71831

Carlo Varni authored 9 months ago and Frank Winklmeier committed 9 months ago

Optionally deploy HGTD clusterization algorithm with new xAOD EDM

update_ci_reference_files: improve update instructions

See merge request !71827

MuonReadoutGeometryCnv - Add pad dimensions to avoid FPE

See merge request !71825

Johannes Junggeburth authored 9 months ago and Frank Winklmeier committed 9 months ago

MuonReadoutGeometryCnv - Add pad dimensions to avoid FPE

revise structure to include "HLT_xAOD__JetContainer_a4tcemsubjesISFS"

See merge request atlas/athena!71775

Soumyananda Goswami authored 9 months ago and Frank Winklmeier committed 9 months ago

revise structure to include "HLT_xAOD__JetContainer_a4tcemsubjesISFS",
"HLT_xAOD__JetContainer_a4tcemsubjesISFSAux.",

Improve the instructions on how to `fetch` and update the developer
branch without having to add a new remote.

athenaHLT: remove support for running legacy job options

See merge request atlas/athena!71038

MdtRdoToPrepData - Add option to use the Phase II MuonDetMgr

See merge request !71815

Johannes Junggeburth authored 9 months ago and Frank Winklmeier committed 9 months ago

MdtRdoToPrepData - Add option to use the Phase II MuonDetMgr

main-coverity-JetToolHelpers

See merge request atlas/athena!71823

Shaun Roe authored 9 months ago and Frank Winklmeier committed 9 months ago

main-coverity-JetToolHelpers

fixes related to hole-on-track handling in the new HLT ITk tracking, EFTRACK-142

See merge request !71808

Dmitry Emeliyanov authored 9 months ago and Frank Winklmeier committed 9 months ago

fixes related to hole-on-track handling in the new HLT ITk tracking, EFTRACK-142

Introduce a common naming scheme for methods and variables related to GenParticles representing particles after all interactions so far

See merge request !71704

John Derek Chapman authored 9 months ago and Frank Winklmeier committed 9 months ago

Introduce a common naming scheme for methods and variables related to GenParticles representing particles after all interactions so far

Rename variables and methods related to GenParticles representing the particle being simulated after all interactions so far

MuonTrackingGeometry - Add internal structure to the chambers

See merge request atlas/athena!67875

Dimitra Amperiadou authored 9 months ago and Frank Winklmeier committed 9 months ago

MuonTrackingGeometry - Add internal structure to the chambers

CPAlgorithms: add DiTauMassCalculatorAlg from TopCPToolkit

See merge request !71774

Baptiste Ravina authored 9 months ago and Frank Winklmeier committed 9 months ago

CPAlgorithms: add DiTauMassCalculatorAlg from TopCPToolkit

Update AsgLeptonTrackSelectionAlg to write out d0 and z0sinTheta variables

See merge request !71496

Heather Russell authored 9 months ago and Frank Winklmeier committed 9 months ago

Update AsgLeptonTrackSelectionAlg to write out d0 and z0sinTheta variables

AthContainers, etc: Move auxid to the IAuxTypeVector base class.

See merge request atlas/athena!71802