2022-09-16: daily merge of 22.0 into master
Some conflicts:
- RecoRun3MC.sh - here I took the 22.0 update, but with
--no-output-checks
- References.py - after discussion with experts, agreed to leave sim and overlay, but update the reco versions (since this might avoid conflicts in the future and AODs aren't checked on master anyway)
Merge request reports
Activity
WARNING: big files (>100K) are found in the changeset 352K in file Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Menu/Physics_pp_run3_v1.py 328K in file Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref 148K in file Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/ItemDef.pyThis merge request affects 20 packages:
- AtlasTest/CITest
- Control/AthenaConfiguration
- DataQuality/DataQualityConfigurations
- HLT/Trigger/TrigControl/TrigExamples
- InnerDetector/InDetConfig
- InnerDetector/InDetExample/InDetTrigRecExample
- InnerDetector/InDetMonitoring/InDetGlobalMonitoringRun3Test
- MuonSpectrometer/MuonReconstruction/MuonTrackMakers/MuonTrackMakerTools/MuonTrackFinderTools
- PhysicsAnalysis/AnalysisCommon/ParticleJetTools
- TileCalorimeter/TileMonitoring
- Tools/PROCTools
- Tools/WorkflowTestRunner
- Trigger/TrigAlgorithms/TrigFastTrackFinder
- Trigger/TrigT1/L1CaloFEX/L1CaloFEXByteStream
- Trigger/TrigT1/TrigT1ResultByteStream
- Trigger/TrigTools/TrigInDetConfig
- Trigger/TrigValidation/TrigAnalysisTest
- Trigger/TrigValidation/TriggerTest
- Trigger/TriggerCommon/TrigEDMConfig
- Trigger/TriggerCommon/TriggerMenuMT
Affected files list will not be printed in this case
Adding @okumura ,@sutt ,@rosati ,@ademaria ,@ggonella ,@stavrop ,@jveatch ,@carquin ,@fwinkl ,@wiedenma ,@solodkov ,@bernius ,@okuprash ,@malconad ,@iouri ,@jojungge ,@mvozak ,@gipezzul ,@goetz ,@amorley ,@wleight ,@iriu ,@pavol ,@sroe ,@nagano ,@harkusha ,@ssnyder ,@apsallid ,@vmartin ,@pscholer ,@serodrig ,@thompson ,@shanisch ,@rbielski ,@mark as watchers
mentioned in merge request !56743 (merged)
CI Result FAILURE (hash 7982fef0)Athena AthSimulation AthGeneration AnalysisBase AthAnalysis DetCommon 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 1
AthSimulation: number of compilation errors 0, warnings 0
AthGeneration: number of compilation errors 0, warnings 0
AnalysisBase: number of compilation errors 1, warnings 0
AthAnalysis: number of compilation errors 0, warnings 0
DetCommon: number of compilation errors 0, warnings 0
For experts only: Jenkins output [CI-MERGE-REQUEST-CC7 59020]added review-user-action-required label and removed review-pending-level-1 label
- Resolved by Dan Guest
- Resolved by Edward Moyse
@tadej - how shall we proceed here? There are many RDO / SDO changes.
added 1 commit
- fd2ef002 - ParticleJetTools: Fix AsgDataHandles / StoreGate typo.
WARNING: big files (>100K) are found in the changeset 352K in file Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Menu/Physics_pp_run3_v1.py 328K in file Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref 148K in file Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/ItemDef.pyThis merge request affects 20 packages:
- AtlasTest/CITest
- Control/AthenaConfiguration
- DataQuality/DataQualityConfigurations
- HLT/Trigger/TrigControl/TrigExamples
- InnerDetector/InDetConfig
- InnerDetector/InDetExample/InDetTrigRecExample
- InnerDetector/InDetMonitoring/InDetGlobalMonitoringRun3Test
- MuonSpectrometer/MuonReconstruction/MuonTrackMakers/MuonTrackMakerTools/MuonTrackFinderTools
- PhysicsAnalysis/AnalysisCommon/ParticleJetTools
- TileCalorimeter/TileMonitoring
- Tools/PROCTools
- Tools/WorkflowTestRunner
- Trigger/TrigAlgorithms/TrigFastTrackFinder
- Trigger/TrigT1/L1CaloFEX/L1CaloFEXByteStream
- Trigger/TrigT1/TrigT1ResultByteStream
- Trigger/TrigTools/TrigInDetConfig
- Trigger/TrigValidation/TrigAnalysisTest
- Trigger/TrigValidation/TriggerTest
- Trigger/TriggerCommon/TrigEDMConfig
- Trigger/TriggerCommon/TriggerMenuMT
Affected files list will not be printed in this case
Adding @okumura ,@sutt ,@rosati ,@ademaria ,@ggonella ,@stavrop ,@jveatch ,@carquin ,@fwinkl ,@wiedenma ,@solodkov ,@bernius ,@okuprash ,@malconad ,@iouri ,@jojungge ,@mvozak ,@gipezzul ,@goetz ,@amorley ,@wleight ,@iriu ,@pavol ,@sroe ,@nagano ,@harkusha ,@ssnyder ,@apsallid ,@vmartin ,@pscholer ,@serodrig ,@thompson ,@shanisch ,@rbielski ,@mark as watchers
added review-pending-level-1 label and removed review-user-action-required label
mentioned in merge request !56837 (closed)