Skip to content
GitLab
Projects Groups Snippets
  • /
  • Help
    • Help
    • Support
    • Community forum
    • Submit feedback
  • Sign in
  • athena athena
  • Project information
    • Project information
    • Activity
    • Labels
    • Members
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
    • Locked Files
  • Jira
    • Jira
  • Merge requests 141
    • Merge requests 141
  • CI/CD
    • CI/CD
    • Pipelines
    • Jobs
    • Schedules
  • Deployments
    • Deployments
    • Releases
  • Packages and registries
    • Packages and registries
    • Container Registry
  • Analytics
    • Analytics
    • Value stream
    • CI/CD
    • Code review
    • Insights
    • Repository
  • Activity
  • Graph
  • Jobs
  • Commits
Collapse sidebar
  • atlasatlas
  • athenaathena
  • Merge requests
  • !61824

Muon(Combined)Config: fix unmerged CAs

  • Review changes

  • Download
  • Email patches
  • Plain diff
Merged Edward Moyse requested to merge emoyse/athena:23.0-fixunmerged-muon-CAs into 23.0 Mar 24, 2023
  • Overview 3
  • Commits 2
  • Pipelines 1
  • Changes 3

This fixes some unmerged (Combined)Muon CAs exposed by !61689 (merged)

Tested locally with make test, i.e. the unit tests.

I hope this won't introduce FT0-violating changes, but I'm going to let the CI test that.

Incidentally (cc @wlampl, I'm wondering if there is a reason not to modify ComponentAccumulator to return itself in some methods. For example, it surprised me that this results in a dropped CA:

    return result.merge(MyToolCfg(flags))

You need to do it in two steps e.g.:

   result,merge(MyToolCfg(flags))
   return result

Similarly, see !61772 (merged), which could be made more compact if setPrivateTools returned self

(I know Guido van Rossum was anti chaining in the past but personally I don't really understand why)

cc @fwinkl @tstreble

Assignee
Assign to
Reviewers
Request review from
Time tracking
Source branch: 23.0-fixunmerged-muon-CAs