2024-10-08: merge of 24.0 into main
A few conflicts had to be resolved:
ForwardDetectors/ZDC/ZdcAnalysis/Root/ZdcAnalysisTool.cxx
Caused by !74686 (merged). Kept the 24.0 version. @mhouseng could you please check that everything looks OK to you. Thanks.
MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/TgcRawDataMonitoring/src/TgcRawDataMonitorAlgorithm.cxx
Caused by !74804 (merged). Given the code has been reorganized in the main, I had to propagate the changes from 24.0 into main manually. @masato, could you please take a look at the result of the manual merge? Thanks.
Trigger/TrigHypothesis/TrigBjetHypo/src/TrigBjetBtagHypoTool.cxx
Caused by !74459 (merged). Kept the 24.0 version. @dguest could you please check that everything looks OK to you. Thanks.
This sweep contains the following MRs:
- !74820 (merged) Add the RS lookup table printout to the RegionSelector unit test Geometry, Trigger
- !74828 (merged) ATR-30253: High frequency monitoring of Pb+Pb ZDC triggers for luminosity measurement Trigger, TriggerMenu
- !74789 (merged) AthenaMonitoringKernel: fix memory leak on deregistration Core, DQ
- !74809 (merged) Updating labels in HI physics menu Trigger, TriggerMenu
- !74815 (merged) L1 MBTS logic simplification: ATR-29889 Trigger, TriggerMenu
- !74814 (merged) Update LVL1CaloRun2ByteStreamConfig.py - use run numbers rather than DataYear,... L1Calo, Trigger
- !74812 (merged) [ATR-28845] Inline schema evolution in TrigCompositeAuxContainer_v2 of linkColIndices - to 24.0 EDM, Trigger, sweep:ignore
- !74824 (merged) TileMonitoring: Fix Tile Jive XML configuration (ATLASRECTS-8119, ATLASRECTS-8120) DQ, Tile
- !74823 (merged) Fixing labels in Dev HI menu, ATR-30248 Trigger, TriggerMenu
- !74804 (merged) add online DQ-like plots to TGC offline DQ DQ, MuonSpectrometer
- !74791 (merged) Two HLT items added to Athena Low mu items, ATR-29747 Trigger, TriggerMenu
- !74792 (merged) ATR-30098 HIJetMonitoringUpdate DQ, JetEtmiss, Trigger, TriggerJet
- !74781 (merged) add trigger preScale into commonTree DQ, InnerDetector
- !74686 (merged) ZDC: factorize RPD reconstruction ForwardDetectors
- !74776 (merged) FlavorTagDiscriminants: Explicitly lock decorations we produce Analysis, BTagging, JetEtmiss
- !74767 (merged) ATR-29867 "Second MR" New partial event building stream for LAr DT extended readout Trigger, TriggerMenu
- !74779 (merged) One extra UPC HMT chain, removing overlay chains from MC menu Trigger, TriggerMenu, changes-trigger-counts
- !74768 (merged) LArSCvsRawChannelMonAlg DQ, LAr
- !74745 (merged) TileMonitoring: Add possibility to monitor channel amplitude vs LB DQ, Tile
- !74761 (merged) TrigT1TGC: use getMessageSvc instead of deprecated service pointers Trigger
- !74762 (merged) Dimuon HLT_2mu3_L12MU3V chain to low-mu menu to use in pp ref run for Bell’s inequality analysis ATR-30256 Trigger, TriggerMenu
- !74755 (merged) TrigMinBiasMonitoring: Small update to TRT monitoring DQ, Trigger, TriggerMinBias
- !74690 (merged) ATR-30210: Update for HI P1 menu Trigger, TriggerMenu, changes-trigger-counts
- !74760 (merged) TRTCalib - Changing path to save files, folder name and email list InnerDetector
- !74763 (merged) Fix updator in FillAlignTRTHits InnerDetector
- !74751 (merged) HI MC menu cleaning Trigger, TriggerMenu, changes-trigger-counts
- !74756 (merged) Remove chain that has been removed from menu Trigger
- !74747 (merged) dqm_algorithms: Fix ignored bins in Tile Trigger monitoring algorithm DQ, Trigger
- !74749 (merged) TrigT2CaloCommon: use ServiceHandle in LArCellCont Trigger
- !74459 (merged) ATR-27697, ATR-29390: Disable FTAG secondary vertexing in the HLT Analysis, BTagging, Derivation, JetEtmiss, Trigger, TriggerEDM, TriggerMenu, changes-trigger-counts
- !74694 (merged) ATR-29849: Configuration and new pixel track counting MinBias triggers Run3-DataReco-output-changed, Run3-MCReco-output-changed, Tools, Trigger, TriggerEDM, TriggerMenu, TriggerMinBias, changes-trigger-counts
- !74742 (merged) TileMonitoring: Add possibilit to reset 2D histograms with digi errors every N LB DQ, Tile
Edited by Vakhtang Tsulaia