Pseudomerge of FTK athena/Trigger packages from release 21 to master (part 1) (6e84908b) · Commits · Peter Sherwood / athena

Commit 6e84908b authored 6 years ago by John Baines

Browse files

Pseudomerge of FTK athena/Trigger packages from release 21 to master (part 1)

parent 6af7bfb3

No related branches found

No related tags found

Expand all Hide whitespace changes

Inline Side-by-side

Showing

Trigger/TrigAlgorithms/TrigFastTrackFinder/python/TrigFastTrackFinder_Config.py 2 additions, 2 deletions

.../TrigFastTrackFinder/python/TrigFastTrackFinder_Config.py
Trigger/TrigAlgorithms/TrigFastTrackFinder/src/TrigFastTrackFinder.cxx 7 additions, 8 deletions

...lgorithms/TrigFastTrackFinder/src/TrigFastTrackFinder.cxx
Trigger/TrigFTK/FTKStandaloneMonitoring/README.md 106 additions, 0 deletions

Trigger/TrigFTK/FTKStandaloneMonitoring/README.md
Trigger/TrigFTK/FTK_DataProviderInterfaces/FTK_DataProviderInterfaces/IFTK_DataProviderSvc.h 3 additions, 1 deletion

...erfaces/FTK_DataProviderInterfaces/IFTK_DataProviderSvc.h
Trigger/TrigFTK/FTK_DataProviderSvc/FTK_DataProviderSvc/FTK_DataProviderSvc.h 17 additions, 15 deletions

...DataProviderSvc/FTK_DataProviderSvc/FTK_DataProviderSvc.h
Trigger/TrigFTK/FTK_DataProviderSvc/src/FTK_DataProviderSvc.cxx 263 additions, 161 deletions

...r/TrigFTK/FTK_DataProviderSvc/src/FTK_DataProviderSvc.cxx
Trigger/TrigFTK/FTK_RecExample/python/FTK_DataProviderSvc_Config.py 0 additions, 201 deletions

...igFTK/FTK_RecExample/python/FTK_DataProviderSvc_Config.py
Trigger/TrigFTK/FTK_RecExample/share/FTKRec_jobOptions.py 20 additions, 24 deletions

Trigger/TrigFTK/FTK_RecExample/share/FTKRec_jobOptions.py
Trigger/TrigFTK/FTK_RecToolInterfaces/FTK_RecToolInterfaces/IFTK_DuplicateTrackRemovalTool.h 3 additions, 0 deletions

...es/FTK_RecToolInterfaces/IFTK_DuplicateTrackRemovalTool.h
Trigger/TrigFTK/FTK_RecToolInterfaces/FTK_RecToolInterfaces/IFTK_HashIDTool.h 30 additions, 0 deletions

...RecToolInterfaces/FTK_RecToolInterfaces/IFTK_HashIDTool.h
Trigger/TrigFTK/FTK_RecTools/CMakeLists.txt 8 additions, 5 deletions

Trigger/TrigFTK/FTK_RecTools/CMakeLists.txt
Trigger/TrigFTK/FTK_RecTools/FTK_RecTools/FTK_HashIDTool.h 139 additions, 0 deletions

Trigger/TrigFTK/FTK_RecTools/FTK_RecTools/FTK_HashIDTool.h
Trigger/TrigFTK/FTK_RecTools/FTK_RecTools/FTK_PixelClusterOnTrackTool.h 190 additions, 197 deletions

...K/FTK_RecTools/FTK_RecTools/FTK_PixelClusterOnTrackTool.h
Trigger/TrigFTK/FTK_RecTools/FTK_RecTools/FTK_VertexFinderTool.h 12 additions, 13 deletions

.../TrigFTK/FTK_RecTools/FTK_RecTools/FTK_VertexFinderTool.h
Trigger/TrigFTK/FTK_RecTools/src/FTK_DuplicateTrackRemovalTool.cxx 114 additions, 115 deletions

...rigFTK/FTK_RecTools/src/FTK_DuplicateTrackRemovalTool.cxx
Trigger/TrigFTK/FTK_RecTools/src/FTK_HashIDTool.cxx 529 additions, 0 deletions

Trigger/TrigFTK/FTK_RecTools/src/FTK_HashIDTool.cxx
Trigger/TrigFTK/FTK_RecTools/src/FTK_PixelClusterOnTrackTool.cxx 2 additions, 14 deletions

.../TrigFTK/FTK_RecTools/src/FTK_PixelClusterOnTrackTool.cxx
Trigger/TrigFTK/FTK_RecTools/src/FTK_SCTClusterOnTrackTool.cxx 2 additions, 6 deletions

...er/TrigFTK/FTK_RecTools/src/FTK_SCTClusterOnTrackTool.cxx
Trigger/TrigFTK/FTK_RecTools/src/components/FTK_RecTools_entries.cxx 2 additions, 0 deletions

...gFTK/FTK_RecTools/src/components/FTK_RecTools_entries.cxx
Trigger/TrigFTK/TrigFTKByteStream/src/FTKByteStreamDecoderEncoder.cxx 27 additions, 6 deletions

...FTK/TrigFTKByteStream/src/FTKByteStreamDecoderEncoder.cxx

with 1476 additions and 768 deletions

Please register or to comment