Merge branch 'indet-sync-21.0-TrigMC-to-master' into 'master' (a7e97f16) · Commits · Thomas Michael Carter / athena

Commit a7e97f16 authored 6 years ago by Adam Edward Barton

Merge branch 'indet-sync-21.0-TrigMC-to-master' into 'master'

Indet sync 21.0 trig mc to master

See merge request atlas/athena!20091

parents 434202fd d9f00752

No related branches found

No related tags found

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

InnerDetector/InDetCalibAlgs/TRT_CalibAlgs/share/AtlasStyle.h 0 additions, 1 deletion

...rDetector/InDetCalibAlgs/TRT_CalibAlgs/share/AtlasStyle.h
InnerDetector/InDetExample/InDetTrigRecExample/python/InDetTrigConfigRecNewTracking.py 2 additions, 2 deletions

...DetTrigRecExample/python/InDetTrigConfigRecNewTracking.py
InnerDetector/InDetExample/InDetTrigRecExample/python/InDetTrigConfigRecPostProcessing.py 4 additions, 0 deletions

...TrigRecExample/python/InDetTrigConfigRecPostProcessing.py
InnerDetector/InDetExample/InDetTrigRecExample/python/InDetTrigSliceSettings.py 8 additions, 5 deletions

...mple/InDetTrigRecExample/python/InDetTrigSliceSettings.py
InnerDetector/InDetRecTools/InDetMultipleVertexSeedFinderUtils/src/PVFindingTrackFilter_cxx 3 additions, 0 deletions

...ultipleVertexSeedFinderUtils/src/PVFindingTrackFilter_cxx
InnerDetector/InDetRecTools/SiClusterizationTool/src/MergedPixelsTool.cxx 9 additions, 12 deletions

...DetRecTools/SiClusterizationTool/src/MergedPixelsTool.cxx
InnerDetector/InDetRecTools/SiCombinatorialTrackFinderTool_xk/SiCombinatorialTrackFinderTool_xk/SiTrajectoryElement_xk.h 1 addition, 1 deletion

...iCombinatorialTrackFinderTool_xk/SiTrajectoryElement_xk.h
InnerDetector/InDetRecTools/SiCombinatorialTrackFinderTool_xk/src/SiTrajectoryElement_xk.cxx 3 additions, 3 deletions

...natorialTrackFinderTool_xk/src/SiTrajectoryElement_xk.cxx
InnerDetector/InDetRecTools/SiCombinatorialTrackFinderTool_xk/src/SiTrajectory_xk.cxx 4 additions, 4 deletions

...SiCombinatorialTrackFinderTool_xk/src/SiTrajectory_xk.cxx
InnerDetector/InDetRecTools/TRT_ElectronPidTools/src/BaseTRTPIDCalculator.cxx 3 additions, 1 deletion

...ecTools/TRT_ElectronPidTools/src/BaseTRTPIDCalculator.cxx
InnerDetector/InDetRecTools/TRT_TrackHoleSearch/python/print_hole_log.py 0 additions, 6 deletions

...nDetRecTools/TRT_TrackHoleSearch/python/print_hole_log.py
InnerDetector/InDetRecTools/TRT_TrackSegmentsTool_xk/TRT_TrackSegmentsTool_xk/TRT_DriftCircleLinkN_xk.h 14 additions, 14 deletions

...ool_xk/TRT_TrackSegmentsTool_xk/TRT_DriftCircleLinkN_xk.h
InnerDetector/InDetRecTools/TRT_TrackSegmentsTool_xk/TRT_TrackSegmentsTool_xk/TRT_TrackSegmentsMaker_ATLxk.h 2 additions, 2 deletions

...k/TRT_TrackSegmentsTool_xk/TRT_TrackSegmentsMaker_ATLxk.h
InnerDetector/InDetRecTools/TRT_TrackSegmentsTool_xk/src/TRT_TrackSegmentsMaker_ATLxk.cxx 1 addition, 1 deletion

...TrackSegmentsTool_xk/src/TRT_TrackSegmentsMaker_ATLxk.cxx
InnerDetector/InDetSimUtils/TRT_TR_Process/data/TRProcessRun.mac 0 additions, 1 deletion

...tector/InDetSimUtils/TRT_TR_Process/data/TRProcessRun.mac
InnerDetector/InDetTrigRecAlgs/InDetTrigPrepRawDataFormat/InDetTrigPrepRawDataFormat/FTK_TrackMaker.h 0 additions, 2 deletions

...RawDataFormat/InDetTrigPrepRawDataFormat/FTK_TrackMaker.h
InnerDetector/InDetTrigRecAlgs/InDetTrigPrepRawDataFormat/python/InDetTrigPrepRawDataFormatMonitoring.py 3 additions, 2 deletions

...DataFormat/python/InDetTrigPrepRawDataFormatMonitoring.py
InnerDetector/InDetTrigRecAlgs/InDetTrigPrepRawDataFormat/src/FTK_TrackMaker.cxx 0 additions, 2 deletions

...RecAlgs/InDetTrigPrepRawDataFormat/src/FTK_TrackMaker.cxx
InnerDetector/InDetTrigRecAlgs/InDetTrigPrepRawDataFormat/src/TRT_TrgRIO_Maker.cxx 2 additions, 8 deletions

...cAlgs/InDetTrigPrepRawDataFormat/src/TRT_TrgRIO_Maker.cxx
InnerDetector/InDetTrigRecAlgs/InDetTrigPriVxFinder/CMakeLists.txt 1 addition, 0 deletions

...ctor/InDetTrigRecAlgs/InDetTrigPriVxFinder/CMakeLists.txt

with 60 additions and 67 deletions

Please register or to comment