2024-11-11: merge of 24.0 into main
A few conflicts were generated while preparing this sweep
-
AtlasTest/CITest/Athena.cmake
andForwardDetectors/ZDC/ZdcRec/CMakeLists.txt
. The ZDC unit test was kept disabled, per discussion on !75733 (closed). CC @tadej and @steinber -
ForwardDetectors/ZDC/ZdcNtuple/Root/ZdcNtuple.cxx
. The conflict was generated by the edits implemented in !75732 (merged). I kept the main versions of the conflicting areas. CC @bcole and @steinber. Please let me know if you are happy with the conflict resolution. -
Trigger/TrigAlgorithms/TrigTauRec/python/TrigTauToolsConfig.py
had recent minor edits in the main (CC @ademaria) and was deleted in 24.0 (CC @jbeaucam). It is now deleted in the sweep as well.
This sweep contains the following MRs:
- !75728 (merged) ZDC - multiply LGrefit amplitude & amp error by LG gain factor; adding HG-to-LG ratio histograms with no nonlinear corrections; EDM changes with new-decoration writings ForwardDetectors
- !75554 (merged) Update/Cleanup of the TrigTauRec package Tau, Trigger, TriggerEDM, TriggerMenu
- !75713 (merged) Tidy up efex tob decorator algorithms Derivation, L1Calo, Trigger
- !75767 (merged) eta center fix DQ, L1Calo, Trigger
- !75752 (merged) SCT_CalibAlgs: Fix cppcheck warning. InnerDetector
- !75723 (merged) Introduced Tracking.TRTStandalone.startArOriginalPerigee flag Analysis, BTagging, JetEtmiss, Reconstruction, Tracking
- !75702 (merged) improve protection for Heavy Ions algorithms. JetEtmiss, Reconstruction
- !75747 (merged) RingerSelectorTools: Fix cppcheck warning. Analysis, CaloRinger
- !75745 (merged) ZdcAnalysis: Fix clang warnings/errors. ForwardDetectors
- !75743 (merged) DerivationFrameworkMCTruth: Use decoration handles. Derivation
- !75453 (merged) ZDC: Fix for RPD Configuration in ZdcNtuple ForwardDetectors
- !75732 (merged) Additional quantities for monitoring, update to Pb+Pb reco WP ForwardDetectors
- !75734 (merged) Lower gFex seedThr, ART-30042 Trigger, TriggerMenu
- !75735 (merged) Update in LF per BCID monitoring, HI menu, ATR-30479, ATR-30480 Trigger, TriggerMenu
- !75727 (merged) fixes to UCC chains, ATR-29024 Trigger, TriggerMenu, changes-trigger-counts
- !75731 (merged) Implementation of ZDC nonlinear FADC corrections ForwardDetectors
- !75721 (merged) ATR-30470: Bugfix for Irreproducibility in ZDC Trigger Simulation Trigger
- !75718 (merged) New ZDC DQM algorithm to look for anomalies in a LB-dependent time series DQ
- !75724 (merged) Updates to UPC chains, ATR-30471, ATR-30476 Trigger, TriggerMenu, changes-trigger-counts
- !75714 (merged) Additional chain for UPC HMT, ATR-30471 Trigger, TriggerMenu, changes-trigger-counts
- !75587 (merged) gFEX - eta centers and eta edges updated; mapping of gTowers in the Forward Region; fixing monitoring plots DQ, EDM, JetEtmiss, L1Calo, Trigger
- !75707 (merged) Update config for offline monitoring for HLT jet trigger DQ, Trigger
- !75708 (merged) ZDCFitWrapper: Fix clang compilation issues ForwardDetectors
- !75242 (merged) DAOD_IDTIDE: include Phase1 jet triggers to the trigger selection Derivation, Tracking
- !75667 (merged) ZDC changes: adjusted pulse-fitting settings and monitoring for pp-mode physics data & injector pulse; incorporated monitoring with trigger selections for pp-ref + UCC triggers ForwardDetectors, Test
- !75695 (merged) Update fixed reference for 20 GeV muon IDPVM ART test InnerDetector, PhysValidation
Edited by Vakhtang Tsulaia