Skip to content

2022-10-24: Daily sweep of 22.0 into master

Tadej Novak requested to merge tadej/athena:sweep-2022-10-24 into master

Conflicts:

  • DataQuality/DataQualityUtils/scripts/hotSpotInHIST.py (removed redundand comments)
  • LArCalorimeter/LArCalibTools/src/LArSC2Ntuple.cxx (updated from master to use event context)
  • LArCalorimeter/LArExample/LArCalibProcessing/python/LArSC2NtupleConfig.py (whitespace issues)
  • LArCalorimeter/LArExample/LArCalibProcessing/share/LArSC2NtupleDumper.py (removed comment)
  • PhysicsAnalysis/DerivationFramework/DerivationFrameworkFlavourTag/python/FtagCommon.py (taken from 22.0 as instructed by @svanstro).
  • version.txt

/cc @emoyse @pavol

Merge request reports