2024-07-25: merge of 24.0 into main
This sweep contains the following MRs:
- !68582 (merged) [ATR-28536][ATR-28717][ATR-28782] Working towards a trigger EDM refactor and integrating R4 into the EDM (part B) Derivation, Reconstruction, Trigger, TriggerEDM
- !72982 (merged) TriggerMenuMT: Create L1 menu files for run4, add and use new L1 items Trigger, TriggerMenu
- !73298 (merged) TrigHLTJetHypo: Fix compilation in dbg build. JetEtmiss, Trigger, TriggerJet
- !73316 (merged) Update IDPVM ART reco tests RDO inputs InnerDetector, PhysValidation, Tracking
- !73308 (merged) TrfTestsART: Update conditions tags for 2022/23 tests Tools, sweep:ignore
- !73295 (merged) TRT_CalibAlgs: Backport dbg linking/cppcheck fixes from main InnerDetector
- !73289 (merged) Replace OFC merger with generic LAr blob merger LAr
- !72585 (merged) Updates to primary vertexing performance plots InnerDetector, PhysValidation
- !72221 (merged) eFEX TOBs energy decorator Derivation, L1Calo, Trigger
- !73254 (merged) work around FPE reported as ATLASRECTS-8015 DQ, MuonSpectrometer
- !73257 (merged) LArLATOMEDecoder: One more consistency check to catch data-corruption LAr
- !73237 (merged) AthenaMonitoringKernel: reduce mock testing code Core, DQ
- !73286 (merged) Update collisions_run.config - added JetEfficiency monitoring plots DQ, L1Calo
- !73276 (merged) MuonDQAUtils: remove unused LWHists dependency DQ, MuonSpectrometer
- !73273 (merged) InDetPerformanceMonitoring: delete unused TRT_Electron_Monitoring_Tool DQ, Egamma, InnerDetector
- !73264 (merged) TileMonitoring: remove dependency on LWHists DQ, Tile
- !73262 (merged) InDetVertexMonitoring: delete unused legacy monitoring package DQ, InnerDetector
- !73260 (merged) MuonDQAMonitoring: remove legacy monitoring tools DQ, MuonSpectrometer, Trigger
- !73258 (merged) SCT_Monitoring: delete legacy monitoring tools DQ, InnerDetector
- !73230 (merged) JetTagMonitoring: delete legacy monitoring tool Analysis, BTagging, DQ, JetEtmiss
- !73271 (merged) Add possiblity to apply cut on q2 value Trigger, TriggerMinBias
- !73233 (merged) Update eFexTowerBuilder- use saturation code in data (not activating in MC for now) L1Calo, Trigger
- !73120 (merged) Adding new DPHI-2eEM1, DPHI-2eTAU1 and DPHI-2jTAU1 items, and the test chains Trigger, TriggerMenu
- !73185 (merged) disable legacy L1Calo stuff for DataYear >= 2024 DQ, Trigger
I had a few conflicts on this one:
- for
InDetPhysValMonitoring
, I am assuming commit 992cd44e to 24.0 supercedes month old change to main (cc @gfrattar). -
ArgStrToSizeT.h
I had to merge 17cacd46 and af5c6210 from @tsulaia and @ssnyder respectively. - For
TilePaterMonTool
I had to merge e4b3bd33 and 9820dda3 from @sroe and @fwinkl respectively.
Please let me know if any of the above is incorrect!
Edited by Edward Moyse