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 136
    • Merge requests 136
  • 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
    • Repository
  • Activity
  • Graph
  • Jobs
  • Commits
Collapse sidebar
  • atlasatlas
  • athenaathena
  • Merge requests
  • !59030

23.0-cleanup-PixelCalibAlgs

  • Review changes

  • Download
  • Email patches
  • Plain diff
Merged Shaun Roe requested to merge sroe/athena:23.0-cleanup-PixelCalibAlgs into master Dec 06, 2022
  • Overview 6
  • Commits 3
  • Pipelines 1
  • Changes 6

image

This cleanup is not full and has one basic aim: To reduce the cyclomatic complexity of InnerDetector/InDetCalibAlgs/PixelCalibAlgs/ChargeCalibration/ibl/pixelMapping.h, which currently stands at 2049 and which appears to be killing my cppcheck runs,extending the run time to over three days.

Along the way I discovered that this file appears, identically, twice in the code in two different paths of the same package. The algorithm has been rationalised using std::array and std::find (there may be better ways, if performance is an issue). Further, the two files were combined in one in a new path of the package which I have called 'common'. With the changes in place, the CC is reduced to 2.

In addition to this there is a python executable in the package (recover.py) which parses the .h file to obtain a list of module names. This has been updated to reflect the new algorithm in the file, but remains extremely fragile; code reformatting would break the executable. A JIRA ticket has been created to address this: ATLASRECTS-7418

Edited Dec 06, 2022 by Johannes Junggeburth
Assignee
Assign to
Reviewers
Request review from
Time tracking
Source branch: 23.0-cleanup-PixelCalibAlgs