Merge branch 'GSF_array_for_merges' into 'master' (a1562535) · Commits · Peter Sherwood / athena · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

athena
- Activity
- Members
- Labels
- Terraform modules
- Incidents

Snippets Groups Projects

a1562535

Commit a1562535 authored 4 years ago by Vakhtang Tsulaia

Downloads
- Plain Diff

Merge branch 'GSF_array_for_merges' into 'master'

use array for the return value of the merges since we know the max size

See merge request atlas/athena!38200

parents 6ef4f306 52c99c49

No related branches found

No related tags found

Loading

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

Tracking/TrkFitter/TrkGaussianSumFilter/TrkGaussianSumFilter/KLGaussianMixtureReduction.h 15 additions, 3 deletions

...mFilter/TrkGaussianSumFilter/KLGaussianMixtureReduction.h
Tracking/TrkFitter/TrkGaussianSumFilter/src/GsfMaterialMixtureConvolution.cxx 8 additions, 11 deletions

...rkGaussianSumFilter/src/GsfMaterialMixtureConvolution.cxx
Tracking/TrkFitter/TrkGaussianSumFilter/src/KLGaussianMixtureReduction.cxx 12 additions, 13 deletions

...r/TrkGaussianSumFilter/src/KLGaussianMixtureReduction.cxx
Tracking/TrkFitter/TrkGaussianSumFilter/src/QuickCloseComponentsMultiStateMerger.cxx 5 additions, 4 deletions

...ianSumFilter/src/QuickCloseComponentsMultiStateMerger.cxx
Tracking/TrkFitter/TrkGaussianSumFilter/test/testMergeComponents.cxx 5 additions, 5 deletions

...kFitter/TrkGaussianSumFilter/test/testMergeComponents.cxx

with 45 additions and 36 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment