Merge branch 'muonsegment-reentrant' into 'master' (9f37c395) · Commits · Peter Sherwood / athena

Commit 9f37c395 authored 4 years ago by Frank Winklmeier

Merge branch 'muonsegment-reentrant' into 'master'

Make Muon Segment Finding Algs Reentrant

See merge request atlas/athena!37444

parents 083229bf 21cc9d39

No related branches found

No related tags found

No related merge requests found

Expand all Hide whitespace changes

Inline Side-by-side

Showing

MuonSpectrometer/MuonReconstruction/MuonSegmentCombiners/MuonSegmentCombinerTools/MooSegmentCombinationFinder/src/MooSegmentCombinationFinder.cxx 2 additions, 2 deletions

...mentCombinationFinder/src/MooSegmentCombinationFinder.cxx
MuonSpectrometer/MuonReconstruction/MuonSegmentCombiners/MuonSegmentCombinerTools/MooSegmentCombinationFinder/src/MooSegmentCombinationFinder.h 2 additions, 2 deletions

...egmentCombinationFinder/src/MooSegmentCombinationFinder.h
MuonSpectrometer/MuonReconstruction/MuonSegmentCombiners/MuonSegmentCombinerTools/MooSegmentCombinationFinder/src/MooSegmentFinderAlg.cxx 15 additions, 15 deletions

...s/MooSegmentCombinationFinder/src/MooSegmentFinderAlg.cxx
MuonSpectrometer/MuonReconstruction/MuonSegmentCombiners/MuonSegmentCombinerTools/MooSegmentCombinationFinder/src/MooSegmentFinderAlg.h 7 additions, 7 deletions

...ols/MooSegmentCombinationFinder/src/MooSegmentFinderAlg.h
MuonSpectrometer/MuonReconstruction/MuonSegmentCombiners/MuonSegmentCombinerTools/MooSegmentCombinationFinder/src/MuonSegmentFinderAlg.cxx 12 additions, 18 deletions

.../MooSegmentCombinationFinder/src/MuonSegmentFinderAlg.cxx
MuonSpectrometer/MuonReconstruction/MuonSegmentCombiners/MuonSegmentCombinerTools/MooSegmentCombinationFinder/src/MuonSegmentFinderAlg.h 5 additions, 6 deletions

...ls/MooSegmentCombinationFinder/src/MuonSegmentFinderAlg.h
MuonSpectrometer/MuonReconstruction/MuonSegmentCombiners/MuonSegmentCombinerTools/MuonCurvedSegmentCombiner/MuonCurvedSegmentCombiner/MuonCurvedSegmentCombiner.h 16 additions, 24 deletions

...ner/MuonCurvedSegmentCombiner/MuonCurvedSegmentCombiner.h
MuonSpectrometer/MuonReconstruction/MuonSegmentCombiners/MuonSegmentCombinerTools/MuonCurvedSegmentCombiner/src/MuonCurvedSegmentCombiner.cxx 110 additions, 105 deletions

...onCurvedSegmentCombiner/src/MuonCurvedSegmentCombiner.cxx
MuonSpectrometer/MuonReconstruction/MuonSegmentCombiners/MuonSegmentCombinerTools/MuonSegmentCombinerToolInterfaces/MuonSegmentCombinerToolInterfaces/IMooSegmentCombinationFinder.h 2 additions, 2 deletions

...mentCombinerToolInterfaces/IMooSegmentCombinationFinder.h
MuonSpectrometer/MuonReconstruction/MuonSegmentCombiners/MuonSegmentCombinerTools/MuonSegmentCombinerToolInterfaces/MuonSegmentCombinerToolInterfaces/IMuonCurvedSegmentCombiner.h 2 additions, 2 deletions

...egmentCombinerToolInterfaces/IMuonCurvedSegmentCombiner.h
MuonSpectrometer/MuonReconstruction/MuonSegmentCombiners/MuonSegmentCombinerTools/MuonSegmentCombinerToolInterfaces/MuonSegmentCombinerToolInterfaces/IMuonSegmentCombinationCleanerTool.h 2 additions, 2 deletions

...mbinerToolInterfaces/IMuonSegmentCombinationCleanerTool.h
MuonSpectrometer/MuonReconstruction/MuonSegmentMakers/MuonSegmentMakerTools/MuonSegmentMakerToolInterfaces/MuonSegmentMakerToolInterfaces/IMuonSegmentPairFittingTool.h 1 addition, 9 deletions

...nSegmentMakerToolInterfaces/IMuonSegmentPairFittingTool.h
MuonSpectrometer/MuonReconstruction/MuonSegmentMakers/MuonSegmentMakerTools/MuonSegmentOverlapRemovalTools/src/MuonSegmentCombinationCleanerTool.cxx 2 additions, 2 deletions

...lapRemovalTools/src/MuonSegmentCombinationCleanerTool.cxx
MuonSpectrometer/MuonReconstruction/MuonSegmentMakers/MuonSegmentMakerTools/MuonSegmentOverlapRemovalTools/src/MuonSegmentCombinationCleanerTool.h 2 additions, 2 deletions

...erlapRemovalTools/src/MuonSegmentCombinationCleanerTool.h

with 180 additions and 198 deletions

Please register or to comment