Skip to content
Snippets Groups Projects

2022-09-16: daily merge of 22.0 into master

Merged Edward Moyse requested to merge emoyse/athena:sweep_22.0_master_2022-09-16 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)

cc @tadej @jchapman

Edited by Edward Moyse

Merge request reports

Loading
Loading

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
  • Edward Moyse resolved all threads

    resolved all threads

  • Edward Moyse added 1 commit

    added 1 commit

    • fd2ef002 - ParticleJetTools: Fix AsgDataHandles / StoreGate typo.

    Compare with previous version

  • :warning: WARNING: big files (>100K) are found in the changeset

    :pencil: 352K in file Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Menu/Physics_pp_run3_v1.py

    :pencil: 328K in file Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref

    :pencil: 148K in file Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/ItemDef.py

  • This 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

  • Dan Guest mentioned in merge request !56837 (closed)

    mentioned in merge request !56837 (closed)

  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Please register or sign in to reply
    Loading