Skip to content
Snippets Groups Projects

Alignment modernisation

Merged Wouter Hulsbergen requested to merge alignmentmodernizationMay2020 into master

First (and not final!) step of code modernization and cleanup:

  • partial fix for #2: replaced private definition of matrix (AlMat) and vector (AlVec) by types from Eigen. Did not (yet) do this for the symmetric matrix (AlSymMat) as we rely heavily on it being symmetric and no drop-in replacement in Eigen exists. Removed dependence on LAPACK.
  • sanitized subset of the solver tools. Changed default tool by one based on Eigen.
  • added a script to run a set of solver tools on the same input data to allow for a comparison. Founds a bug in the Eigen and Gsl solver tools in doing so
  • modernized the tools in TAlignment and AlignSolvTools to use 'extends' and Gaudi::Property
Edited by Rosen Matev

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
  • added 1 commit

    Compare with previous version

  • added 2 commits

    • d3c05355 - use some pragma magic to suppress deprecated-copy warning in Eigen
    • 3e28eed1 - modernize

    Compare with previous version

  • added 1 commit

    Compare with previous version

  • added 1 commit

    • 863c138a - slight improvement in memory management using unique_ptr, but not really done yet

    Compare with previous version

  • added 1 commit

    Compare with previous version

  • added 1 commit

    Compare with previous version

  • Biljana Mitreska mentioned in merge request !124 (merged)

    mentioned in merge request !124 (merged)

  • Wouter Hulsbergen unmarked as a Work In Progress

    unmarked as a Work In Progress

  • Edited by Software for LHCb
  • added lhcb-gaudi-head label and removed lhcb-head label

  • assigned to @jonrob and unassigned @frodrigu

  • @jonrob the nightly appears to be fine.

  • @graven @wouter can you please conclude and when done resolve the discussions above.

  • Wouter Hulsbergen mentioned in issue #2

    mentioned in issue #2

  • added 2 commits

    • ccc75457 - removed some spurious commented code
    • c22a2220 - fixed counting of negative eigenvalues

    Compare with previous version

  • added 1 commit

    Compare with previous version

  • Wouter Hulsbergen mentioned in merge request !125 (merged)

    mentioned in merge request !125 (merged)

  • Christopher Rob Jones changed title from Alignmentmodernization may2020 to Alignment modernisation

    changed title from Alignmentmodernization may2020 to Alignment modernisation

  • Christopher Rob Jones mentioned in merge request !122 (merged)

    mentioned in merge request !122 (merged)

  • Edited by Software for LHCb
  • Rosen Matev changed the description

    changed the description

  • @wouter @bimitres we've now four related MRs: this, the formatting !125 (merged) and the new tests !122 (merged) !124 (merged). I'd propose that I clean up and merge the tests and the formatting and then we can rebase this one. This way we'll have new (genuine) failures on master but hopefully the modernization here will fix them.

    @wouter in practice, when I rebase this branch on top of the formatting, you'll have to do a reset on your local branch so it is important that you push any changes that you have locally before I do the rebase.

  • No worries: the remote branch is up to date with my local branch. I will then not do anything now.

  • I wouldn't merge !124 (merged) for now as it's not what we want for the moment, I need to add the iteration part there. For the other sounds good, let me know if I need to do anything there as I just put !122 (merged) on alignmentmodernizationMay2020 not on master.

    Edited by Biljana Mitreska
  • no need to do anything on !122 (merged), I'll take care. Regarding !124 (merged), I know it's not quite what you want to have in the end but it's useful already to add the convergence check everywhere so I would merge it and open another MR for the test with different solvers. (or even add that here to this MR)

    Edited by Rosen Matev
  • Ok that looks sensible, thanks for wrapping up all this.

  • Rosen Matev added 32 commits

    added 32 commits

    Compare with previous version

  • Rosen Matev added 25 commits

    added 25 commits

    • 109b78d5 - 1 commit from branch master
    • 17ffe419 - save intermediate versions before final cleanup
    • 20fb4038 - removed dependence on LAPACK. use Eigen for AlMat and AlVec
    • ca2690ed - moved to AlignTrTools
    • deabf840 - adapted to changes in AlignKernel. added Eigen solver
    • 7bf668bb - added script to test solvers
    • 940805ed - adapted to change in solver tools
    • 7f689230 - adapted to changes in AlignKernel
    • 118c77ba - adapted to changes in AlignKernel
    • 50922c8f - make use of extends
    • b7e50137 - make use of extends
    • a26cc082 - make use of extends
    • c73b2193 - make use of extends
    • 9232610d - make use of extends
    • 07813f60 - make use of extends
    • 5a87ef93 - - use extends
    • fdbd2295 - - make use of extends
    • 62128910 - modernize use of Properties
    • 832cffef - cleanup
    • 7ad66f6a - use some pragma magic to suppress deprecated-copy warning in Eigen
    • c0825f01 - modernize
    • a269b2fc - slight improvement in memory management using unique_ptr, but not really done yet
    • 13c9b846 - use ServiceHandle
    • 832ae9fb - removed some spurious commented code
    • 94b2d1ec - fixed counting of negative eigenvalues

    Compare with previous version

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