Conflicts:
	InnerDetector/InDetRecTools/SiTrackMakerTool_xk/src/SiTrackMaker_xk.cxx

HLT menu changes for letting multi jet chains being executed

See merge request atlas/athena!37075

update RoI for the second L2MuonSA in L2 inside-out chains

See merge request atlas/athena!37758

Bug fix to treatment toggle of muons in eflowRec

See merge request atlas/athena!37754

CondDB: properly handle <noover/> on folder extraction

Closes ATLASSIM-4912

See merge request atlas/athena!37752

Consolidate L1Calo configuration

See merge request atlas/athena!37584

ATLASRECTS-5721, AFT-503, AFT-513 Disable unused b-tagging algorithms

See merge request !37741

Speed up DQ algorithms in high nthread limit

See merge request atlas/athena!37705

Support FlowElements in MET Reconstruction

See merge request atlas/athena!37630

TileMonitoring: Migrate Tile TMDB monitoring for Run 3

See merge request !37739

TileMonitoring: Add Cell energy difference histograms for Run3

See merge request !37744

tauRecTools: workaround for buggy constituent p4 (ATLJETMET-1280)

See merge request !37750

Xiaozhong Huang authored 4 years ago and Frank Winklmeier committed 4 years ago

The constituent p4 is buggy for EMPFlow seed jets, but the p4 of the
rawConstituent is OK. As a workaround, we now use the rawConstituent
p4.

Fix TriggerDB Frontier Test (unit test of TrigConfigSvc)

Closes ATR-22251

See merge request !37722

Joerg Stelzer authored 4 years ago and Frank Winklmeier committed 4 years ago

failing on the first one

22.0-change_interface-TrackSummaryTool

See merge request !37655

ART script for jet reco HITS to AOD

See merge request !37745

Master run3 tmdb bytestream

See merge request !37335

Joao Gentil Mendes Saraiva authored 4 years ago and Frank Winklmeier committed 4 years ago

The TMDB board bytestream as been updated. RUN2 conversion is still inplace. Versions are interchangeable using tile cabling service flag that checks on the run period.

add comparexAODDigest.py script

See merge request !37735

GsfMeasurementUpdator::update , remove some redundant declaration. Declare when used

See merge request !37748

TrkFitter/TrkTools clang-tidy llvm 10 , qualify auto pass by const ref where applicable

See merge request !37751

MuonRecExample: enable flake8 and fix code

See merge request !37629

Modernised new JO HLT driver script, switched to 2018 data

See merge request !37709

Speed up PixelConditionsSummaryTool/SCT_ByteStreamErrorsTool at high thread count

See merge request atlas/athena!37714

ATR-22107 and ATR-22234 moving MinBias to PhysicsP1 and adding new noL1 chains

See merge request !37661

Event/xAOD/xAOD*Cnv: enable flake8 and make code compliant

See merge request atlas/athena!37737