Merge branch 'master-22533-1' into 'master' (1cadeef5) · Commits · Peter Sherwood / athena

Commit 1cadeef5 authored 4 years ago by Walter Lampl

Merge branch 'master-22533-1' into 'master'

Add Condition Filtering to Fast Reduction

See merge request atlas/athena!39336

parents 50c0c6f9 08316e1e

No related branches found

No related tags found

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

Trigger/TrigHypothesis/TrigHLTJetHypo/TrigHLTJetHypo/TrigHLTJetHypoUtils/AllJetsGrouper.h 2 additions, 2 deletions

...tHypo/TrigHLTJetHypo/TrigHLTJetHypoUtils/AllJetsGrouper.h
Trigger/TrigHypothesis/TrigHLTJetHypo/TrigHLTJetHypo/TrigHLTJetHypoUtils/CombinationsGrouper.h 1 addition, 1 deletion

.../TrigHLTJetHypo/TrigHLTJetHypoUtils/CombinationsGrouper.h
Trigger/TrigHypothesis/TrigHLTJetHypo/TrigHLTJetHypo/TrigHLTJetHypoUtils/IJetGrouper.h 1 addition, 1 deletion

...TJetHypo/TrigHLTJetHypo/TrigHLTJetHypoUtils/IJetGrouper.h
Trigger/TrigHypothesis/TrigHLTJetHypo/TrigHLTJetHypo/TrigHLTJetHypoUtils/IndexedJetsGrouper.h 1 addition, 1 deletion

...o/TrigHLTJetHypo/TrigHLTJetHypoUtils/IndexedJetsGrouper.h
Trigger/TrigHypothesis/TrigHLTJetHypo/TrigHLTJetHypo/TrigHLTJetHypoUtils/SingleJetGrouper.h 3 additions, 3 deletions

...ypo/TrigHLTJetHypo/TrigHLTJetHypoUtils/SingleJetGrouper.h
Trigger/TrigHypothesis/TrigHLTJetHypo/python/ConditionsToolSetterFastReduction.py 112 additions, 28 deletions

...rigHLTJetHypo/python/ConditionsToolSetterFastReduction.py
Trigger/TrigHypothesis/TrigHLTJetHypo/python/TrigJetHypoToolConfig.py 17 additions, 12 deletions

...Hypothesis/TrigHLTJetHypo/python/TrigJetHypoToolConfig.py
Trigger/TrigHypothesis/TrigHLTJetHypo/python/chainDict2jetLabel.py 2 additions, 2 deletions

...rigHypothesis/TrigHLTJetHypo/python/chainDict2jetLabel.py
Trigger/TrigHypothesis/TrigHLTJetHypo/python/node.py 17 additions, 8 deletions

Trigger/TrigHypothesis/TrigHLTJetHypo/python/node.py
Trigger/TrigHypothesis/TrigHLTJetHypo/python/testChainDictMaker.py 24 additions, 2 deletions

...rigHypothesis/TrigHLTJetHypo/python/testChainDictMaker.py
Trigger/TrigHypothesis/TrigHLTJetHypo/python/treeVisitors.py 45 additions, 2 deletions

Trigger/TrigHypothesis/TrigHLTJetHypo/python/treeVisitors.py
Trigger/TrigHypothesis/TrigHLTJetHypo/src/ConditionFilter.cxx 57 additions, 0 deletions

...ger/TrigHypothesis/TrigHLTJetHypo/src/ConditionFilter.cxx
Trigger/TrigHypothesis/TrigHLTJetHypo/src/ConditionFilter.h 27 additions, 0 deletions

Trigger/TrigHypothesis/TrigHLTJetHypo/src/ConditionFilter.h
Trigger/TrigHypothesis/TrigHLTJetHypo/src/FastReducer.cxx 62 additions, 80 deletions

Trigger/TrigHypothesis/TrigHLTJetHypo/src/FastReducer.cxx
Trigger/TrigHypothesis/TrigHLTJetHypo/src/FastReducer.h 21 additions, 6 deletions

Trigger/TrigHypothesis/TrigHLTJetHypo/src/FastReducer.h
Trigger/TrigHypothesis/TrigHLTJetHypo/src/FastReductionMatcher.cxx 24 additions, 5 deletions

...rigHypothesis/TrigHLTJetHypo/src/FastReductionMatcher.cxx
Trigger/TrigHypothesis/TrigHLTJetHypo/src/FastReductionMatcher.h 10 additions, 6 deletions

.../TrigHypothesis/TrigHLTJetHypo/src/FastReductionMatcher.h
Trigger/TrigHypothesis/TrigHLTJetHypo/src/GrouperByCapacityFactory.cxx 28 additions, 0 deletions

...ypothesis/TrigHLTJetHypo/src/GrouperByCapacityFactory.cxx
Trigger/TrigHypothesis/TrigHLTJetHypo/src/GrouperByCapacityFactory.h 15 additions, 0 deletions

...gHypothesis/TrigHLTJetHypo/src/GrouperByCapacityFactory.h
Trigger/TrigHypothesis/TrigHLTJetHypo/src/HTConditionFastReduction.cxx 64 additions, 0 deletions

...ypothesis/TrigHLTJetHypo/src/HTConditionFastReduction.cxx

with 533 additions and 159 deletions

Please register or to comment