Commit 28d2c206 authored 3 years ago by Adam Edward Barton

Merge branch 'dedx_latest_work75' into 'master'

Redesign of disappearing and large dEdx track trigger hypos (ATR-21591 and ATR-21590) and fix for disappering track hypo thread safety

See merge request !46101

parents 65c79508 ec90d914

No related branches found

No related tags found

Expand all Hide whitespace changes

Inline Side-by-side

Showing

Trigger/TrigAlgorithms/TrigFastTrackFinder/src/TrigFastTrackFinder.cxx 6 additions, 6 deletions

...lgorithms/TrigFastTrackFinder/src/TrigFastTrackFinder.cxx
Trigger/TrigHypothesis/TrigLongLivedParticlesHypo/python/TrigDisappearingTrackHypoConfig.py 30 additions, 23 deletions

...edParticlesHypo/python/TrigDisappearingTrackHypoConfig.py
Trigger/TrigHypothesis/TrigLongLivedParticlesHypo/python/TrigdEdxTrackHypoConfig.py 35 additions, 26 deletions

...gLongLivedParticlesHypo/python/TrigdEdxTrackHypoConfig.py
Trigger/TrigHypothesis/TrigLongLivedParticlesHypo/src/TrigDisappearingTrackHypoAlg.cxx 632 additions, 0 deletions

...ngLivedParticlesHypo/src/TrigDisappearingTrackHypoAlg.cxx
Trigger/TrigHypothesis/TrigLongLivedParticlesHypo/src/TrigDisappearingTrackHypoAlg.h 115 additions, 0 deletions

...LongLivedParticlesHypo/src/TrigDisappearingTrackHypoAlg.h
Trigger/TrigHypothesis/TrigLongLivedParticlesHypo/src/TrigDisappearingTrackHypoTool.cxx 180 additions, 0 deletions

...gLivedParticlesHypo/src/TrigDisappearingTrackHypoTool.cxx
Trigger/TrigHypothesis/TrigLongLivedParticlesHypo/src/TrigDisappearingTrackHypoTool.h 56 additions, 0 deletions

...ongLivedParticlesHypo/src/TrigDisappearingTrackHypoTool.h
Trigger/TrigHypothesis/TrigLongLivedParticlesHypo/src/TrigDisappearingTrackTriggerHypoAlg.cxx 0 additions, 111 deletions

...ParticlesHypo/src/TrigDisappearingTrackTriggerHypoAlg.cxx
Trigger/TrigHypothesis/TrigLongLivedParticlesHypo/src/TrigDisappearingTrackTriggerHypoAlg.h 0 additions, 35 deletions

...edParticlesHypo/src/TrigDisappearingTrackTriggerHypoAlg.h
Trigger/TrigHypothesis/TrigLongLivedParticlesHypo/src/TrigDisappearingTrackTriggerHypoTool.h 0 additions, 130 deletions

...dParticlesHypo/src/TrigDisappearingTrackTriggerHypoTool.h
Trigger/TrigHypothesis/TrigLongLivedParticlesHypo/src/TrigHitDVHypoAlg.cxx 9 additions, 9 deletions

...hesis/TrigLongLivedParticlesHypo/src/TrigHitDVHypoAlg.cxx
Trigger/TrigHypothesis/TrigLongLivedParticlesHypo/src/TrigHitDVHypoAlg.h 10 additions, 10 deletions

...othesis/TrigLongLivedParticlesHypo/src/TrigHitDVHypoAlg.h
Trigger/TrigHypothesis/TrigLongLivedParticlesHypo/src/TrigdEdxTrackHypoAlg.cxx 264 additions, 0 deletions

...s/TrigLongLivedParticlesHypo/src/TrigdEdxTrackHypoAlg.cxx
Trigger/TrigHypothesis/TrigLongLivedParticlesHypo/src/TrigdEdxTrackHypoAlg.h 46 additions, 0 deletions

...sis/TrigLongLivedParticlesHypo/src/TrigdEdxTrackHypoAlg.h
Trigger/TrigHypothesis/TrigLongLivedParticlesHypo/src/TrigdEdxTrackHypoTool.cxx 177 additions, 0 deletions

.../TrigLongLivedParticlesHypo/src/TrigdEdxTrackHypoTool.cxx
Trigger/TrigHypothesis/TrigLongLivedParticlesHypo/src/TrigdEdxTrackHypoTool.h 57 additions, 0 deletions

...is/TrigLongLivedParticlesHypo/src/TrigdEdxTrackHypoTool.h
Trigger/TrigHypothesis/TrigLongLivedParticlesHypo/src/TrigdEdxTrackTriggerHypoAlg.cxx 0 additions, 122 deletions

...ongLivedParticlesHypo/src/TrigdEdxTrackTriggerHypoAlg.cxx
Trigger/TrigHypothesis/TrigLongLivedParticlesHypo/src/TrigdEdxTrackTriggerHypoTool.cxx 0 additions, 149 deletions

...ngLivedParticlesHypo/src/TrigdEdxTrackTriggerHypoTool.cxx
Trigger/TrigHypothesis/TrigLongLivedParticlesHypo/src/components/TrigLongLivedParticlesHypo_entries.cxx 8 additions, 8 deletions

...ypo/src/components/TrigLongLivedParticlesHypo_entries.cxx
Trigger/TrigSteer/TrigOutputHandling/TrigOutputHandling/TriggerEDMAuxAccessors.h 6 additions, 9 deletions

...utputHandling/TrigOutputHandling/TriggerEDMAuxAccessors.h

with 1631 additions and 638 deletions

Please register or to comment