Merge branch 'master' of ssh://gitlab.cern.ch:7999/jojungge/athena into large_d0_muons (8c261d47) · Commits · atlas / athena

Commit 8c261d47 authored 4 years ago by Johannes Junggeburth

Browse files

Merge branch 'master' of ssh://gitlab.cern.ch:7999/jojungge/athena into large_d0_muons

parents a618e84d 6effd81e

No related branches found

No related tags found

Expand all Hide whitespace changes

Inline Side-by-side

Showing

Control/AthenaServices/src/MetaDataSvc.cxx 7 additions, 14 deletions

Control/AthenaServices/src/MetaDataSvc.cxx
Database/IOVDbSvc/src/IOVDbSvc.cxx 11 additions, 34 deletions

Database/IOVDbSvc/src/IOVDbSvc.cxx
Event/EventOverlay/EventOverlayJobTransforms/share/OverlayOutputItemList_jobOptions.py 1 addition, 1 deletion

...ayJobTransforms/share/OverlayOutputItemList_jobOptions.py
Event/EventOverlay/EventOverlayJobTransforms/share/OverlayOutput_jobOptions.py 1 addition, 1 deletion

...entOverlayJobTransforms/share/OverlayOutput_jobOptions.py
HLT/Trigger/TrigControl/TrigCommon/python/TrigPyHelper.py 1 addition, 1 deletion

HLT/Trigger/TrigControl/TrigCommon/python/TrigPyHelper.py
HLT/Trigger/TrigControl/TrigServices/src/HltROBDataProviderSvc.cxx 2 additions, 1 deletion

...er/TrigControl/TrigServices/src/HltROBDataProviderSvc.cxx
InnerDetector/InDetDetDescr/PixelGeoModel/src/GeoPixelDetailedStaveSupport.cxx 2 additions, 2 deletions

...tDescr/PixelGeoModel/src/GeoPixelDetailedStaveSupport.cxx
InnerDetector/InDetRawAlgs/InDetOverlay/python/PixelOverlayConfig.py 1 addition, 1 deletion

...or/InDetRawAlgs/InDetOverlay/python/PixelOverlayConfig.py
MagneticField/MagFieldElements/MagFieldElements/AtlasFieldCache.h 0 additions, 1 deletion

...Field/MagFieldElements/MagFieldElements/AtlasFieldCache.h
MagneticField/MagFieldElements/MagFieldElements/BFieldMeshZR.h 29 additions, 39 deletions

...ticField/MagFieldElements/MagFieldElements/BFieldMeshZR.h
MagneticField/MagFieldElements/MagFieldElements/BFieldMeshZR.icc 86 additions, 0 deletions

...cField/MagFieldElements/MagFieldElements/BFieldMeshZR.icc
MagneticField/MagFieldElements/MagFieldElements/BFieldZone.h 5 additions, 10 deletions

MagneticField/MagFieldElements/MagFieldElements/BFieldZone.h
MagneticField/MagFieldElements/MagFieldElements/BFieldZone.icc 37 additions, 0 deletions

...ticField/MagFieldElements/MagFieldElements/BFieldZone.icc
MagneticField/MagFieldElements/src/AtlasFieldCache.cxx 4 additions, 1 deletion

MagneticField/MagFieldElements/src/AtlasFieldCache.cxx
MagneticField/MagFieldElements/src/AtlasFieldMap.cxx 0 additions, 16 deletions

MagneticField/MagFieldElements/src/AtlasFieldMap.cxx
MuonSpectrometer/MuonReconstruction/MuonSegmentCombiners/MuonSegmentCombinerTools/MooSegmentCombinationFinder/src/MooSegmentCombinationFinder.cxx 385 additions, 368 deletions

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

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

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

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

.../MooSegmentCombinationFinder/src/MuonSegmentFinderAlg.cxx

with 1208 additions and 1126 deletions

Please register or to comment