2023-06-29: merge of 23.0 into master
Conflicts resolved by hand
Conflicts:
Generators/TruthConverters/Root/xAODtoHepMCTool.cxx
Trigger/EFTracking/EFTrackingSim/TrigHTTConfTools/CMakeLists.txt
Trigger/EFTracking/FPGATrackSim/FPGATrackSimSGInput/CMakeLists.txt
This sweep contains the following MRs:
- !63974 (merged) Minor name fix for error message in JetBTaggingAlg Analysis, BTagging, Derivation, JetEtmiss
- !63971 (merged) 23.0-test-PixelConditionsData InnerDetector
- !63984 (merged) 23.0-bugfix-PixelConditionsData InnerDetector
- !64006 (merged) LArDigit add all ctors LAr
- !63941 (merged) Introduce Geantinos in the Athena Generators, Simulation
- !64016 (merged) TrigInDetValidation: propagate L1EM->L1eEM menu change Trigger
- !63999 (merged) PixelDistortionData : gather together some of the magic 20,21 InnerDetector
- !63966 (merged) CaloTopoSplitterHashCluster: replace new/delete with std::optional Calorimeter
- !63945 (merged) Merge two versions of MagicNumbers.h Analysis, Core, DQ, Derivation, Digitization, Egamma, Generators, InnerDetector, JetEtmiss, LAr, MuonSpectrometer, Reconstruction, Simulation, Tracking, Trigger