2024-09-09: merge of 24.0 into main
A few conflicts on this sweep
-
InnerDetector/InDetValidation/InDetPhysValMonitoring/src/InDetPhysHitDecoratorAlg.cxx
. A small change introduced by @smh in !74129 (merged) conflicted with a large cleanup of this class implemented by @ncalace in !73610 (merged). I propagated the change from 24.0 into main. It would be good to double-check that I did the right thing, though. Thanks! -
InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_ttbarPU40_reco.sh
. The conflict was resolved following a suggestion by @tstreble. Thanks! -
Trigger/TrigTools/TrigInDetConfig/python/BuildSignatureFlags.py
andTrigger/TrigValidation/TriggerTest/test/test_trig_mc_v1Dev_ITk_ttbar200PU_build.py
. Conflicts were resolved after a discussion with @jmasik. Please confirm that the resolutions look good. Thanks!
This sweep contains the following MRs:
- !74129 (merged) ID and muon tracking: Pass EventContext down ACTS, DQ, Digitization, Egamma, ITk, InnerDetector, MuonSpectrometer, PhysValidation, Reconstruction, Tracking, Trigger, TriggerID
- !73919 (merged) DetCommon: add dqm_algorithms package Build
- !74170 (merged) Use TRT hit analysis when TRT enabled Simulation
- !74173 (merged) Use TRT RDOAnalysisConfig when TRT enabled Simulation
- !74116 (merged) decouple ITK & InDet impact settings Trigger, TriggerID
- !74148 (merged) Modify the histogram settings Trigger
- !74132 (merged) take globalTags from defaultConditionsTags / 1st part also for 24.0 Core, ITk, Trigger
- !74094 (merged) PixelConditionsTool: Reduce calling getCacheEntry Build, InnerDetector, Simulation
- !74079 (merged) Add Peak Detection on 1D Histograms DQ
- !74076 (merged) updating the ID ART reference plots to a new release InnerDetector, PhysValidation
- !72108 (merged) Remove hardcoded tags of TGC Digitization conditions MuonSpectrometer, Overlay, Run2-MCOverlay-output-changed, Run2-MCReco-output-changed, Run3-MCOverlay-output-changed, Run3-MCReco-output-changed, Run4-MCReco-output-changed, Simulation, Test, Tools
Edited by Vakhtang Tsulaia