Skip to content
Snippets Groups Projects
Commit 8a11e418 authored by Adam Edward Barton's avatar Adam Edward Barton
Browse files

Merge branch 'fss' into 'master' 

Apply basic track filtering for the fullscan tracking instance

See merge request atlas/athena!38241
parents 4e508336 5c5a0e50
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Trigger/TrigAlgorithms/TrigFastTrackFinder/python/TrigFastTrackFinder_Config.py
+ 5
− 1
View file @ 8a11e418
......@@ -291,11 +291,15 @@ class TrigFastTrackFinderBase(TrigFastTrackFinder):
from SiTrackMakerTool_xk.SiTrackMakerTool_xkConf import InDet__SiTrackMaker_xk
nClusterMin = TrackingCuts.minClusters()
if remapped_type=="fullScan":
nClusterMin = 10
TrackMaker_FTF = InDet__SiTrackMaker_xk(name = 'InDetTrigSiTrackMaker_FTF_'+type,
RoadTool = InDetTrigSiDetElementsRoadMaker_FTF,
CombinatorialTrackFinder = InDetTrigSiComTrackFinder_FTF,
pTmin = InDetTrigSliceSettings[('pTmin',remapped_type)],
nClustersMin = TrackingCuts.minClusters(),
nClustersMin = nClusterMin,
nHolesMax = TrackingCuts.nHolesMax(),
nHolesGapMax = TrackingCuts.nHolesGapMax(),
SeedsFilterLevel = 0, # Do not use built-in seeds filter
......
Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref
+ 93
− 103
View file @ 8a11e418
......@@ -389,11 +389,13 @@ HLT_5j70_pf_subresjesgscIS_ftf_0eta240_L14J15:
0: 9
1: 5
HLT_5j70_subresjesgscIS_ftf_0eta240_L14J15:
eventCount: 0
eventCount: 1
stepCounts:
0: 9
1: 1
stepFeatures:
0: 9
1: 5
HLT_5j85_pf_subresjesgscIS_ftf_L14J15:
eventCount: 0
stepCounts:
......@@ -1279,13 +1281,13 @@ HLT_j45_L1J15:
stepFeatures:
0: 49
HLT_j45_csskpf_nojcalib_ftf_L1J20:
eventCount: 15
eventCount: 16
stepCounts:
0: 19
1: 15
1: 16
stepFeatures:
0: 19
1: 30
1: 38
HLT_j45_cssktc_nojcalib_L1J20:
eventCount: 15
stepCounts:
......@@ -1299,7 +1301,7 @@ HLT_j45_ftf_L1J15:
1: 18
stepFeatures:
0: 20
1: 44
1: 45
HLT_j45_ftf_preselj45_L1J20:
eventCount: 18
stepCounts:
......@@ -1307,7 +1309,7 @@ HLT_j45_ftf_preselj45_L1J20:
1: 18
stepFeatures:
0: 19
1: 44
1: 45
HLT_j45_nojcalib_L1J20:
eventCount: 17
stepCounts:
......@@ -1315,57 +1317,57 @@ HLT_j45_nojcalib_L1J20:
stepFeatures:
0: 39
HLT_j45_pf_ftf_L1J20:
eventCount: 16
eventCount: 18
stepCounts:
0: 19
1: 16
1: 18
stepFeatures:
0: 19
1: 35
1: 48
HLT_j45_pf_ftf_preselj45_L1J20:
eventCount: 16
eventCount: 18
stepCounts:
0: 19
1: 16
1: 18
stepFeatures:
0: 19
1: 35
1: 48
HLT_j45_pf_nojcalib_ftf_L1J20:
eventCount: 16
eventCount: 18
stepCounts:
0: 19
1: 16
1: 18
stepFeatures:
0: 19
1: 36
1: 47
HLT_j45_pf_subjesgscIS_ftf_L1J20:
eventCount: 18
eventCount: 19
stepCounts:
0: 19
1: 18
1: 19
stepFeatures:
0: 19
1: 39
1: 49
HLT_j45_pf_subjesgscIS_ftf_bdl1r70_split_L1J20:
eventCount: 7
eventCount: 12
stepCounts:
0: 19
1: 16
2: 7
1: 18
2: 12
stepFeatures:
0: 19
1: 36
2: 15
1: 46
2: 24
HLT_j45_pf_subjesgscIS_ftf_boffperf_split_L1J20:
eventCount: 16
eventCount: 18
stepCounts:
0: 19
1: 16
2: 16
1: 18
2: 18
stepFeatures:
0: 19
1: 36
2: 36
1: 46
2: 46
HLT_j45_sktc_nojcalib_L1J20:
eventCount: 15
stepCounts:
......@@ -1381,29 +1383,29 @@ HLT_j45_subjesIS_ftf_preselj45_L1J20:
0: 19
1: 49
HLT_j45_subjesgscIS_ftf_011jvt_L1J15:
eventCount: 13
eventCount: 18
stepCounts:
0: 20
1: 13
1: 18
stepFeatures:
0: 20
1: 29
1: 41
HLT_j45_subjesgscIS_ftf_015jvt_L1J15:
eventCount: 13
eventCount: 18
stepCounts:
0: 20
1: 13
1: 18
stepFeatures:
0: 20
1: 29
1: 41
HLT_j45_subjesgscIS_ftf_059jvt_L1J15:
eventCount: 13
eventCount: 17
stepCounts:
0: 20
1: 13
1: 17
stepFeatures:
0: 20
1: 28
1: 40
HLT_j45_subjesgscIS_ftf_L1J15:
eventCount: 19
stepCounts:
......@@ -1411,27 +1413,27 @@ HLT_j45_subjesgscIS_ftf_L1J15:
1: 19
stepFeatures:
0: 20
1: 50
1: 47
HLT_j45_subjesgscIS_ftf_bdl1r70_split_L1J20:
eventCount: 7
eventCount: 12
stepCounts:
0: 19
1: 19
2: 7
2: 12
stepFeatures:
0: 19
1: 49
2: 14
1: 46
2: 22
HLT_j45_subjesgscIS_ftf_bmv2c1070_split_L1J20:
eventCount: 10
eventCount: 15
stepCounts:
0: 19
1: 19
2: 10
2: 15
stepFeatures:
0: 19
1: 49
2: 19
1: 46
2: 29
HLT_j45_subjesgscIS_ftf_boffperf_split_L1J20:
eventCount: 19
stepCounts:
......@@ -1440,8 +1442,8 @@ HLT_j45_subjesgscIS_ftf_boffperf_split_L1J20:
2: 19
stepFeatures:
0: 19
1: 49
2: 49
1: 46
2: 46
HLT_j45_subresjesgscIS_ftf_L1J15:
eventCount: 18
stepCounts:
......@@ -1449,7 +1451,7 @@ HLT_j45_subresjesgscIS_ftf_L1J15:
1: 18
stepFeatures:
0: 20
1: 44
1: 45
HLT_j460_a10_lcw_subjes_L1J100:
eventCount: 0
HLT_j460_a10_lcw_subjes_L1J20:
......@@ -1519,21 +1521,21 @@ HLT_j85_L1J20:
stepFeatures:
0: 21
HLT_j85_ftf_L1J20:
eventCount: 12
eventCount: 13
stepCounts:
0: 19
1: 12
1: 13
stepFeatures:
0: 19
1: 18
1: 20
HLT_j85_pf_ftf_L1J20:
eventCount: 11
eventCount: 13
stepCounts:
0: 19
1: 11
1: 13
stepFeatures:
0: 19
1: 17
1: 22
HLT_mb_sptrk_L1RD0_FILLED:
eventCount: 0
HLT_mu0_muoncalib_L1MU20:
......@@ -2523,11 +2525,7 @@ HLT_timeburner_L1All:
HLT_unconvtrk120_isohpttrack_icummedium_L1XE50:
eventCount: 0
HLT_unconvtrk120_isohpttrack_imedium_L1XE50:
eventCount: 6
stepCounts:
0: 6
stepFeatures:
0: 6
eventCount: 0
HLT_xe100_cvfpufit_L1XE50:
eventCount: 6
stepCounts:
......@@ -2543,37 +2541,37 @@ HLT_xe100_mht_L1XE50:
stepFeatures:
0: 9
HLT_xe100_mhtpufit_em_subjesgscIS_L1XE50:
eventCount: 5
eventCount: 6
stepCounts:
0: 10
1: 5
1: 6
stepFeatures:
0: 10
1: 5
1: 6
HLT_xe100_mhtpufit_pf_subjesgscIS_L1XE50:
eventCount: 4
eventCount: 5
stepCounts:
0: 10
1: 4
1: 5
stepFeatures:
0: 10
1: 4
1: 5
HLT_xe100_pfopufit_L1XE50:
eventCount: 3
eventCount: 4
stepCounts:
0: 10
1: 3
1: 4
stepFeatures:
0: 10
1: 3
1: 4
HLT_xe100_pfsum_L1XE50:
eventCount: 3
eventCount: 5
stepCounts:
0: 10
1: 3
1: 5
stepFeatures:
0: 10
1: 3
1: 5
HLT_xe100_tcpufit_L1XE50:
eventCount: 6
stepCounts:
......@@ -2581,21 +2579,21 @@ HLT_xe100_tcpufit_L1XE50:
stepFeatures:
0: 6
HLT_xe100_trkmht_L1XE50:
eventCount: 7
eventCount: 6
stepCounts:
0: 10
1: 7
1: 6
stepFeatures:
0: 10
1: 7
1: 6
HLT_xe100_trkmht_xe85_tcpufit_xe65_cell_L1XE50:
eventCount: 5
eventCount: 4
stepCounts:
0: 6
1: 5
1: 4
stepFeatures:
0: 6
1: 5
1: 4
HLT_xe110_mht_L1XE50:
eventCount: 7
stepCounts:
......@@ -2641,37 +2639,37 @@ HLT_xe30_mht_L1XE10:
stepFeatures:
0: 19
HLT_xe30_mhtpufit_em_subjesgscIS_L1XE10:
eventCount: 12
eventCount: 18
stepCounts:
0: 19
1: 12
1: 18
stepFeatures:
0: 19
1: 12
1: 18
HLT_xe30_mhtpufit_pf_subjesgscIS_L1XE10:
eventCount: 14
eventCount: 17
stepCounts:
0: 19
1: 14
1: 17
stepFeatures:
0: 19
1: 14
1: 17
HLT_xe30_pfopufit_L1XE10:
eventCount: 15
eventCount: 16
stepCounts:
0: 19
1: 15
1: 16
stepFeatures:
0: 19
1: 15
1: 16
HLT_xe30_pfsum_L1XE10:
eventCount: 16
eventCount: 17
stepCounts:
0: 19
1: 16
1: 17
stepFeatures:
0: 19
1: 16
1: 17
HLT_xe30_tcpufit_L1XE10:
eventCount: 14
stepCounts:
......@@ -2679,13 +2677,13 @@ HLT_xe30_tcpufit_L1XE10:
stepFeatures:
0: 14
HLT_xe30_trkmht_L1XE10:
eventCount: 15
eventCount: 17
stepCounts:
0: 19
1: 15
1: 17
stepFeatures:
0: 19
1: 15
1: 17
HLT_xe65_cell_L1XE50:
eventCount: 7
stepCounts:
......@@ -2701,17 +2699,9 @@ HLT_xe65_cell_xe110_tcpufit_L1XE50:
HLT_xe80_tcpufit_unconvtrk120_isohpttrack_icummedium_L1XE50:
eventCount: 0
HLT_xe80_tcpufit_unconvtrk120_isohpttrack_imedium_L1XE50:
eventCount: 5
stepCounts:
0: 5
stepFeatures:
0: 5
eventCount: 0
HLT_xe80_tcpufit_unconvtrk80_isohpttrack_imedium_L1XE50:
eventCount: 6
stepCounts:
0: 6
stepFeatures:
0: 6
eventCount: 0
HLT_xe95_trkmht_xe90_tcpufit_xe75_cell_L1XE50:
eventCount: 4
stepCounts:
......
Trigger/TrigValidation/TriggerTest/share/ref_data_v1Dev_build.ref
+ 21
− 29
View file @ 8a11e418
......@@ -1609,17 +1609,13 @@ HLT_tilecalib_laser_TilePEB_L1CALREQ2:
HLT_timeburner_L1All:
eventCount: 0
HLT_unconvtrk120_isohpttrack_icummedium_L1XE50:
eventCount: 3
stepCounts:
0: 3
stepFeatures:
0: 4
eventCount: 0
HLT_unconvtrk120_isohpttrack_imedium_L1XE50:
eventCount: 9
eventCount: 1
stepCounts:
0: 9
0: 1
stepFeatures:
0: 13
0: 1
HLT_xe100_cvfpufit_L1XE50:
eventCount: 0
stepCounts:
......@@ -1639,13 +1635,11 @@ HLT_xe100_mhtpufit_em_subjesgscIS_L1XE50:
stepFeatures:
0: 20
HLT_xe100_mhtpufit_pf_subjesgscIS_L1XE50:
eventCount: 1
eventCount: 0
stepCounts:
0: 20
1: 1
stepFeatures:
0: 20
1: 1
HLT_xe100_pfopufit_L1XE50:
eventCount: 0
stepCounts:
......@@ -1653,13 +1647,11 @@ HLT_xe100_pfopufit_L1XE50:
stepFeatures:
0: 20
HLT_xe100_pfsum_L1XE50:
eventCount: 1
eventCount: 0
stepCounts:
0: 20
1: 1
stepFeatures:
0: 20
1: 1
HLT_xe100_tcpufit_L1XE50:
eventCount: 0
HLT_xe100_trkmht_L1XE50:
......@@ -1707,37 +1699,37 @@ HLT_xe30_mht_L1XE10:
stepFeatures:
0: 14
HLT_xe30_mhtpufit_em_subjesgscIS_L1XE10:
eventCount: 5
eventCount: 6
stepCounts:
0: 20
1: 5
1: 6
stepFeatures:
0: 20
1: 5
1: 6
HLT_xe30_mhtpufit_pf_subjesgscIS_L1XE10:
eventCount: 5
eventCount: 3
stepCounts:
0: 20
1: 5
1: 3
stepFeatures:
0: 20
1: 5
1: 3
HLT_xe30_pfopufit_L1XE10:
eventCount: 4
eventCount: 3
stepCounts:
0: 20
1: 4
1: 3
stepFeatures:
0: 20
1: 4
1: 3
HLT_xe30_pfsum_L1XE10:
eventCount: 7
eventCount: 6
stepCounts:
0: 20
1: 7
1: 6
stepFeatures:
0: 20
1: 7
1: 6
HLT_xe30_tcpufit_L1XE10:
eventCount: 6
stepCounts:
......@@ -1745,13 +1737,13 @@ HLT_xe30_tcpufit_L1XE10:
stepFeatures:
0: 6
HLT_xe30_trkmht_L1XE10:
eventCount: 6
eventCount: 5
stepCounts:
0: 20
1: 6
1: 5
stepFeatures:
0: 20
1: 6
1: 5
HLT_xe65_cell_L1XE50:
eventCount: 0
HLT_xe65_cell_xe110_tcpufit_L1XE50:
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment