Merge branch 'R3TriggerMatching' into 'master' (3b1c93cb) · Commits · Peter Sherwood / athena

Commit 3b1c93cb authored 4 years ago by Vakhtang Tsulaia

Merge branch 'R3TriggerMatching' into 'master'

R3 trigger matching

See merge request atlas/athena!38981

parents bffb3c16 c9cb6fb5

No related branches found

No related tags found

Hide whitespace changes

Inline Side-by-side

Showing

Event/xAOD/xAODTrigger/Root/TrigComposite_v1.cxx 0 additions, 12 deletions

Event/xAOD/xAODTrigger/Root/TrigComposite_v1.cxx
Event/xAOD/xAODTrigger/xAODTrigger/versions/TrigComposite_v1.icc 11 additions, 0 deletions

...AOD/xAODTrigger/xAODTrigger/versions/TrigComposite_v1.icc
Trigger/TrigAnalysis/TriggerMatchingTool/CMakeLists.txt 1 addition, 1 deletion

Trigger/TrigAnalysis/TriggerMatchingTool/CMakeLists.txt
Trigger/TrigAnalysis/TriggerMatchingTool/Root/MatchingTool.cxx 0 additions, 1 deletion

...er/TrigAnalysis/TriggerMatchingTool/Root/MatchingTool.cxx
Trigger/TrigAnalysis/TriggerMatchingTool/Root/R3MatchingTool.cxx 174 additions, 0 deletions

.../TrigAnalysis/TriggerMatchingTool/Root/R3MatchingTool.cxx
Trigger/TrigAnalysis/TriggerMatchingTool/TriggerMatchingTool/R3MatchingTool.h 51 additions, 0 deletions

.../TriggerMatchingTool/TriggerMatchingTool/R3MatchingTool.h
Trigger/TrigAnalysis/TriggerMatchingTool/TriggerMatchingTool/selection.xml 1 addition, 0 deletions

...sis/TriggerMatchingTool/TriggerMatchingTool/selection.xml
Trigger/TrigAnalysis/TriggerMatchingTool/src/components/TriggerMatchingTool_entries.cxx 7 additions, 7 deletions

...tchingTool/src/components/TriggerMatchingTool_entries.cxx
Trigger/TrigSteer/TrigCompositeUtils/CMakeLists.txt 10 additions, 1 deletion

Trigger/TrigSteer/TrigCompositeUtils/CMakeLists.txt
Trigger/TrigSteer/TrigCompositeUtils/Root/Combinations.cxx 82 additions, 0 deletions

Trigger/TrigSteer/TrigCompositeUtils/Root/Combinations.cxx
Trigger/TrigSteer/TrigCompositeUtils/Root/IPartCombItr.cxx 201 additions, 0 deletions

Trigger/TrigSteer/TrigCompositeUtils/Root/IPartCombItr.cxx
Trigger/TrigSteer/TrigCompositeUtils/Root/KFromNItr.cxx 113 additions, 0 deletions

Trigger/TrigSteer/TrigCompositeUtils/Root/KFromNItr.cxx
Trigger/TrigSteer/TrigCompositeUtils/Root/TrigCompositeUtilsRoot.cxx 51 additions, 4 deletions

...gSteer/TrigCompositeUtils/Root/TrigCompositeUtilsRoot.cxx
Trigger/TrigSteer/TrigCompositeUtils/TrigCompositeUtils/Combinations.h 54 additions, 0 deletions

...teer/TrigCompositeUtils/TrigCompositeUtils/Combinations.h
Trigger/TrigSteer/TrigCompositeUtils/TrigCompositeUtils/IPartCombItr.h 151 additions, 0 deletions

...teer/TrigCompositeUtils/TrigCompositeUtils/IPartCombItr.h
Trigger/TrigSteer/TrigCompositeUtils/TrigCompositeUtils/KFromNItr.h 81 additions, 0 deletions

...igSteer/TrigCompositeUtils/TrigCompositeUtils/KFromNItr.h
Trigger/TrigSteer/TrigCompositeUtils/TrigCompositeUtils/LinkInfo.h 48 additions, 0 deletions

...rigSteer/TrigCompositeUtils/TrigCompositeUtils/LinkInfo.h
Trigger/TrigSteer/TrigCompositeUtils/TrigCompositeUtils/TrigCompositeUtils.h 76 additions, 33 deletions

...rigCompositeUtils/TrigCompositeUtils/TrigCompositeUtils.h
Trigger/TrigSteer/TrigCompositeUtils/share/IPartCombItr_test.ref 4 additions, 0 deletions

.../TrigSteer/TrigCompositeUtils/share/IPartCombItr_test.ref
Trigger/TrigSteer/TrigCompositeUtils/share/KFromNItr_test.ref 4 additions, 0 deletions

...ger/TrigSteer/TrigCompositeUtils/share/KFromNItr_test.ref

with 1120 additions and 59 deletions

Please register or to comment

Admin message

Merge branch 'R3TriggerMatching' into 'master'