Daily "22.0 to master" sweep: 30/11/22
This MR attempts to fix the problems seen in the previous daily sweep MR !58853 (closed)
- Reverted changes in the LAr Bad Channel infrastructure introduced by two MRs: !58752 (merged) and !58823 (merged). @pavol, please let me know if this is OK with you.
- Manually removed a reference to the
TestPixelLayerTool
property fromInDetTrackSummaryHelperToolConfig.py
introduced by !58392 (merged). This was causing crashes in several CI tests because theTestPixelLayerTool
property is no longer present in the master. @jmasik, please let me know if this is OK with you.
Also manually fixed a couple of merge conflicts introduced by !58822 (merged). Here are the affected files:
Reconstruction/Jet/JetRecConfig/python/StandardLargeRJets.py
-
PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/AntiKt10UFOCSSKSoftDropBeta100Zcut10JetsCPContent.py
Given !58822 (merged) is a manual sweep into 22.0, in both of the affected files the master versions were kept. @svanstro, please let me know if you see any issues with this.
Also CC @christos