2023-06-30: merge of 23.0 into master
One trivially solved conflict
Conflicts:
InnerDetector/InDetConfig/python/SiClusterizationToolConfig.py
This sweep contains the following MRs:
- !64019 (merged) RoiDescriptor: consistent use of virtual/override Geometry, Trigger
- !64029 (merged) Added printActiveConfig function for tracking passes InnerDetector, Tracking
- !64017 (merged) Drop boost::list_of in favour of c++11 constructors Core, LAr
- !64030 (merged) TSOS cnv : Allow slimming if not slimming was done Tracking
- !64028 (merged) PyJobTransforms: Add VTune support in the job transform a la Valgrind Tools
- !64008 (merged) LArHitEMapToDigitAlg : Use DataPool Digitization, LAr
- !64003 (merged) CscRawDataProvider - Replace conditions dependency on Aline container by DetMgr dependency MuonSpectrometer
- !64046 (merged) fix bins on 2D histo DQ, Trigger
- !64049 (merged) Update Legacy MergeMcEventCollTool configuration to match CA (ATLASSIM-6618) Simulation
- !64040 (merged) Remove AlignCondAthTest MuonSpectrometer
- !64031 (merged) 23.0-cleanup-PixelConditionsData InnerDetector
- !63981 (merged) Clean up unused vertex collections in JetBTaggingAlg Analysis, BTagging, Derivation, JetEtmiss
- !63979 (merged) Avoid potentially attempting to alter flags within OverlayMainContentCfg function Overlay, Simulation, Tools
- !64025 (merged) jFEX monitoring update, solving ATR-27831 and ATLASRECTS-7662 DQ, Trigger
- !64048 (merged) TrigTRTHTHCounter: fix dPhi vs |dPhi| bug Trigger
- !64014 (merged) Update TruthClusterizationFactory config to work with mu=0 samples ITk, InnerDetector, Simulation
- !64011 (merged) Move the isBSM function into TruthUtils Derivation, Generators
- !63920 (merged) Wrap CA config on a higher level in makeInDetTrigPrecisionTracking Tracking, Trigger, TriggerID
- !63968 (merged) new phase-I Topo ditau low-pT chains, ATR-27415 Trigger, TriggerMenu, changes-trigger-counts
- !64002 (merged) Remove ForceMSConditionsAlgs Core, DQ
- !63963 (merged) Migrate LRT muComb trigger step to CA configuration Trigger, TriggerMenu
- !63942 (merged) MuonTests - Do not rely on the CI reference files to perform unit tests MuonSpectrometer
- !63878 (merged) Add forward electrons to EGZ selection Analysis
- !64001 (merged) RoiUtil: code cleanup Geometry, Trigger
Merge request reports
Activity
This merge request affects 33 packages:
- Control/AthContainers
- Control/AthenaKernel
- Control/AthenaMonitoring
- DetectorDescription/IRegionSelector
- DetectorDescription/RoiDescriptor
- Generators/TruthUtils
- InnerDetector/InDetConditions/PixelConditionsData
- InnerDetector/InDetConfig
- InnerDetector/InDetRecTools/SiClusterizationTool
- LArCalorimeter/LArDigitization
- LArCalorimeter/LArMonTools
- MuonSpectrometer/MuonCnv/MuonByteStream
- MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondTest
- MuonSpectrometer/MuonGeoModelTest
- MuonSpectrometer/MuonReconstruction/MuonPatternFinders/MuonPatternFinderTools/MuonHoughPatternTools
- PhysicsAnalysis/DerivationFramework/DerivationFrameworkMCTruth
- PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging
- PhysicsAnalysis/PrimaryDPDMaker
- Simulation/G4Utilities/MCTruthSimAlgs
- Simulation/Overlay/OverlayConfiguration
- Tools/FullChainTransforms
- Tools/PyJobTransforms
- Tracking/TrkConfig
- Tracking/TrkEventCnv/TrkEventTPCnv
- Trigger/TrigAlgorithms/TrigTRTHighTHitCounter
- Trigger/TrigAlgorithms/TrigmuComb
- Trigger/TrigHypothesis/TrigMuonHypo
- Trigger/TrigT1/TrigT1CTMonitoring
- Trigger/TrigT1/TrigT1CaloMonitoring
- Trigger/TrigTools/TrigInDetConfig
- Trigger/TrigValidation/TrigAnalysisTest
- Trigger/TrigValidation/TrigP1Test
- Trigger/TriggerCommon/TriggerMenuMT
Affected files list will not be printed in this case
Adding @jchapman ,@cgrefe ,@ademaria ,@sroe ,@ggonella ,@vmartin ,@okumura ,@carquin ,@jojungge ,@jcatmore ,@ahaas ,@dguest ,@zmarshal ,@pavol ,@tkharlam ,@lgagnon ,@keli ,@calpigia ,@pscholer ,@serodrig ,@thompson ,@shanisch ,@tadej ,@ssnyder ,@rbianchi ,@martindl ,@rosati ,@maszyman ,@stavrop ,@battagl ,@mvozak ,@goetz ,@stsuno ,@malconad ,@bdong ,@gipezzul ,@lidiaz ,@sutt ,@salderwe ,@iriu ,@nagano ,@apsallid ,@calfayan ,@gemmeren ,@lshan as watchers
WARNING: big files (>100K) are found in the changeset 424K in file Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Menu/Physics_pp_run3_v1.py 116K in file Tools/PyJobTransforms/python/trfExe.py 248K in file Trigger/TrigValidation/TrigP1Test/share/ref_v1Dev_decodeBS_build.ref 436K in file Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref CI Result SUCCESS (hash e892903b)Athena AthSimulation AthGeneration AnalysisBase AthAnalysis externals cmake make tests Full details available on this CI monitor view. Check the JIRA CI status board for known problems
Athena: number of compilation errors 0, warnings 0
AthSimulation: number of compilation errors 0, warnings 0
AthGeneration: number of compilation errors 0, warnings 0
AnalysisBase: number of compilation errors 0, warnings 0
AthAnalysis: number of compilation errors 0, warnings 0
For experts only: Jenkins output [CI-MERGE-REQUEST-CC7 73673]mentioned in commit ab8b21df
added sweep:ignore label