adding regex for dips variable

See merge request atlas/athena!42967

AnalysisTop: crash when encountering unsupported config options

See merge request atlas/athena!42745

DL2 umami

See merge request atlas/athena!42873

Sweeping !42812 from 21.3 to 21.2.
21.3 TRT_ToT_dEdx added protection for reading r22 conditions data

See merge request atlas/athena!42862

Add dictionary for FlavorTagDiscriminants::HbbTagTool.

See merge request atlas/athena!42854

Adding HLT_xAOD_PhotonContainer_egamma_Iso_Photons to HIGG5D3 extra content

See merge request atlas/athena!42878

John Derek Chapman authored Apr 22, 2021 and Atlas Nightlybuild committed Apr 23, 2021

21.3 TRT_ToT_dEdx added protection for reading r22 conditions data

See merge request atlas/athena!42812

(cherry picked from commit b281a5da)

497a91d3 Added protection for reading conditions data for r22

Adding to updates to the JES calibration functionality

See merge request atlas/athena!42742

Added ttH samples into the Heavy Flavor Decoration of MCTruth pkg for the study of HIGG8D1

See merge request atlas/athena!42808

AnalysisTop: Reduce warnings from unsupported photon-trigger scale factors

See merge request atlas/athena!42790

	modified:   PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/share/HIGG8D1.py
	modified:   PhysicsAnalysis/DerivationFramework/DerivationFrameworkMCTruth/src/HadronOriginClassifier.cxx

AnalysisTop: add new shower types to the check when submitting to the grid

See merge request atlas/athena!42776

Support for a new generic histogram scaling in the jet calibration sequence

See merge request atlas/athena!42709

Steven Schramm authored Apr 20, 2021 and Nils Erik Krumnack committed Apr 20, 2021

This adds a new GenericHistScaleCorrection class, which is designed
originally with the trigger-level dijet analysis in mind (where there is
the need for an additional online --> offline calibration factor), but
which can additionally be used also in other contexts as a generic way to
insert another calibration step into the jet calibration chain.

For the moment, as there is only one use case, the code is aligned
around the idea of a 1D histogram where the x-axis is pT, being applied
to a jet where the pT is scaled to a new value.  However, additional
configuration options could be added to easily adjust this to also
consider other histogram dimensionality, axis definitions, or methods
for scaling the jet four-vector.  These are not done at this time
because it's not clear how much this is needed beyond the TLA, rather the
code is designed to be more modular to support such extensions without too
much additional effort.

DerivationFrameworkHiggs: Add new ggH sample to HiggsMCsamples.cfg

See merge request atlas/athena!42711

Updated to the new April 2021 FTag CDI file in AT

See merge request atlas/athena!42734

AT: Fixing isolation SFs for electrons when no isolation is used

See merge request atlas/athena!42728

BugFix: adds safeguard for truth information for data

See merge request !42703

Implementing the 4-top parton history

See merge request !42619

AT: Adding configurable parameter for testing custom electron ID SF files

See merge request !42635

Add to EGAM5 particle flow jet information needed for the hadronic recoil tool

See merge request !42626