Skip to content
Snippets Groups Projects
Commit 17ccb334 authored by Johannes Elmsheuser's avatar Johannes Elmsheuser
Browse files

Merge branch 'fs04' into 'master' 

Fix incorrectly named parameter

See merge request atlas/athena!42271
parents 56cc36cb 5a2e560b
No related branches found
Tags nightly/master/2021-04-06T0354
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 129 additions and 83 deletions
Trigger/TrigAlgorithms/TrigFastTrackFinder/src/TrigFastTrackFinder.cxx
+ 49
− 0
View file @ 17ccb334
......@@ -261,7 +261,56 @@ StatusCode TrigFastTrackFinder::initialize() {
ATH_CHECK(m_dEdxHitKey.initialize());
}
ATH_MSG_DEBUG("FTF : " << name() );
ATH_MSG_DEBUG(" m_tcs.m_doubletFilterRZ : " << m_tcs.m_doubletFilterRZ );
ATH_MSG_DEBUG(" m_tcs.m_doublet_dR_Max : " << m_tcs.m_doublet_dR_Max );
ATH_MSG_DEBUG(" m_tcs.m_doublet_dR_Max_Confirm : " << m_tcs.m_doublet_dR_Max_Confirm );
ATH_MSG_DEBUG(" m_tcs.m_seedRadBinWidth : " << m_tcs.m_seedRadBinWidth );
ATH_MSG_DEBUG(" m_tcs.m_tripletD0Max : " << m_tcs.m_tripletD0Max );
ATH_MSG_DEBUG(" m_tcs.m_tripletD0_PPS_Max : " << m_tcs.m_tripletD0_PPS_Max );
ATH_MSG_DEBUG(" m_tcs.m_nMaxPhiSlice : " << m_tcs.m_nMaxPhiSlice );
ATH_MSG_DEBUG(" m_tcs.m_maxTripletBufferLength : " << m_tcs.m_maxTripletBufferLength );
ATH_MSG_DEBUG(" m_tcs.m_tripletDoPSS : " << m_tcs.m_tripletDoPSS );
ATH_MSG_DEBUG(" m_tcs.m_tripletDoPPS : " << m_tcs.m_tripletDoPPS );
ATH_MSG_DEBUG(" m_tcs.m_tripletDoConfirm : " << m_tcs.m_tripletDoConfirm );
ATH_MSG_DEBUG(" m_tcs.m_curv_delta : " << m_tcs.m_curv_delta );
ATH_MSG_DEBUG(" m_tcs.m_tripletDtCut : " << m_tcs.m_tripletDtCut );
ATH_MSG_DEBUG(" m_tcs.m_useTrigSeedML : " << m_tcs.m_useTrigSeedML );
ATH_MSG_DEBUG(" m_trigseedML_LUT : " << m_trigseedML_LUT );
ATH_MSG_DEBUG(" m_tcs.m_maxEC_len : " << m_tcs.m_maxEC_len );
ATH_MSG_DEBUG(" m_vertexSeededMode : " << m_vertexSeededMode );
ATH_MSG_DEBUG(" m_doZFinder : " << m_doZFinder );
ATH_MSG_DEBUG(" m_doZFinderOnly : " << m_doZFinderOnly );
ATH_MSG_DEBUG(" m_doFastZVseeding : " << m_doFastZVseeding );
ATH_MSG_DEBUG(" m_tcs.m_zvError : " << m_tcs.m_zvError );
ATH_MSG_DEBUG(" m_storeZFinderVertices : " << m_storeZFinderVertices );
ATH_MSG_DEBUG(" m_tripletMinPtFrac : " << m_tripletMinPtFrac );
ATH_MSG_DEBUG(" m_pTmin : " << m_pTmin );
ATH_MSG_DEBUG(" m_initialD0Max : " << m_initialD0Max );
ATH_MSG_DEBUG(" m_Z0Max : " << m_Z0Max );
ATH_MSG_DEBUG(" m_checkSeedRedundancy : " << m_checkSeedRedundancy );
ATH_MSG_DEBUG(" m_minHits : " << m_minHits );
ATH_MSG_DEBUG(" " );
ATH_MSG_DEBUG(" m_useBeamSpot : " << m_useBeamSpot );
ATH_MSG_DEBUG(" m_nfreeCut : " << m_nfreeCut );
ATH_MSG_DEBUG(" m_spacePointTool : " << m_spacePointTool );
ATH_MSG_DEBUG(" m_numberingTool : " << m_numberingTool );
ATH_MSG_DEBUG(" m_trackMaker : " << m_trackMaker );
ATH_MSG_DEBUG(" m_trigInDetTrackFitter : " << m_trigInDetTrackFitter );
ATH_MSG_DEBUG(" m_trigZFinder : " << m_trigZFinder );
ATH_MSG_DEBUG(" m_trackSummaryTool : " << m_trackSummaryTool );
ATH_MSG_DEBUG(" m_doResMonitoring : " << m_doResMonitoring );
ATH_MSG_DEBUG(" m_doCloneRemoval : " << m_doCloneRemoval );
ATH_MSG_DEBUG(" m_useNewLayerNumberScheme : " << m_useNewLayerNumberScheme );
ATH_MSG_DEBUG(" m_useGPU : " << m_useGPU );
ATH_MSG_DEBUG(" m_LRTmode : " << m_LRTmode );
ATH_MSG_DEBUG(" m_doJseedHitDV : " << m_doJseedHitDV );
ATH_MSG_DEBUG(" m_dodEdxTrk : " << m_dodEdxTrk );
ATH_MSG_DEBUG(" Initialized successfully");
return StatusCode::SUCCESS;
}
......
Trigger/TrigTools/TrigInDetConfig/python/ConfigSettings.py
+ 3
− 3
View file @ 17ccb334
......@@ -165,7 +165,7 @@ class _ConfigSettings_fullScan( _ConfigSettingsBase ):
self._doTRT = False
self._DoubletDR_Max = 200
self._SeedRadBinWidth = 10
self._doPPS = False
self._TripletDoPPS = False
self._minCluster = 8
self._roadWidth = 5
......@@ -182,7 +182,7 @@ class _ConfigSettings_beamSpotFS( _ConfigSettingsBase ):
self._doTRT = False
self._DoubletDR_Max = 200
self._SeedRadBinWidth = 10
self._doPPS = False
self._TripletDoPPS = False
self._minCluster = 8
self._roadWidth = 5
self._doRecord = False
......@@ -210,7 +210,7 @@ class _ConfigSettings_fullScanUTT( _ConfigSettingsBase ):
self._doTRT = False
self._DoubletDR_Max = 200
self._SeedRadBinWidth = 10
self._doPPS = False
self._TripletDoPPS = False
self._minCluster = 8
self._roadWidth = 5
self._vertex = "HLT_IDVertex_FS"
......
Trigger/TrigTools/TrigInDetConfig/python/ConfigSettingsBase.py
+ 1
− 1
View file @ 17ccb334
......@@ -233,7 +233,7 @@ class _ConfigSettingsBase() :
log.info( " {} :".format( self._name ) ) # noqa: ATL901
log.info( " {} :".format( self._input_name ) ) # noqa: ATL901
log.info( " pTmin : {}".format( self._pTmin ) ) # noqa: ATL901
log.info( " TripletDoPPS : {}".format( self._TripletD0PPS ) ) # noqa: ATL901
log.info( " TripletDoPPS : {}".format( self._TripletDoPPS ) ) # noqa: ATL901
log.info( " Triplet_D0Max : {}".format( self._Triplet_D0Max ) ) # noqa: ATL901
log.info( " Triplet_D0_PPS_Max : {}".format( self._Triplet_D0_PPS_Max ) ) # noqa: ATL901
log.info( " doZFinder : {}".format( self._doZFinder ) ) # noqa: ATL901
......
Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref
+ 70
− 71
View file @ 17ccb334
......@@ -153,7 +153,7 @@ HLT_2j35_ftf_bmv2c1060_split_3j35_ftf_0eta320_L15J15p0ETA25:
stepFeatures:
0: 4
1: 51
2: 9
2: 8
HLT_2j35_ftf_bmv2c1070_split_2j35_ftf_bmv2c1085_split_L14J15p0ETA25:
eventCount: 5
stepCounts:
......@@ -163,37 +163,37 @@ HLT_2j35_ftf_bmv2c1070_split_2j35_ftf_bmv2c1085_split_L14J15p0ETA25:
stepFeatures:
0: 6
1: 81
2: 36
2: 37
HLT_2j35_pf_ftf_bdl1r60_split_3j35_pf_ftf_0eta320_L15J15p0ETA25:
eventCount: 2
eventCount: 1
stepCounts:
0: 4
1: 2
2: 2
2: 1
stepFeatures:
0: 4
1: 33
2: 6
2: 3
HLT_2j35_pf_ftf_bdl1r70_split_2j35_pf_ftf_bdl1r85_split_L14J15p0ETA25:
eventCount: 3
eventCount: 2
stepCounts:
0: 6
1: 3
2: 3
2: 2
stepFeatures:
0: 6
1: 48
2: 26
2: 24
HLT_2j45_ftf_bmv2c1050_split_2j45_ftf_0eta320_L14J15p0ETA25:
eventCount: 4
eventCount: 3
stepCounts:
0: 6
1: 4
2: 4
2: 3
stepFeatures:
0: 6
1: 54
2: 10
2: 9
HLT_2j45_ftf_bmv2c1060_split_3j45_ftf_0eta320_L15J15p0ETA25:
eventCount: 2
stepCounts:
......@@ -203,17 +203,17 @@ HLT_2j45_ftf_bmv2c1060_split_3j45_ftf_0eta320_L15J15p0ETA25:
stepFeatures:
0: 4
1: 30
2: 6
2: 5
HLT_2j45_pf_ftf_bdl1r60_split_3j45_pf_ftf_0eta320_L15J15p0ETA25:
eventCount: 2
eventCount: 1
stepCounts:
0: 4
1: 2
2: 2
2: 1
stepFeatures:
0: 4
1: 30
2: 5
2: 3
HLT_2j55_ftf_bmv2c1060_split_2j55_ftf_0eta320_L14J15p0ETA25:
eventCount: 2
stepCounts:
......@@ -223,7 +223,7 @@ HLT_2j55_ftf_bmv2c1060_split_2j55_ftf_0eta320_L14J15p0ETA25:
stepFeatures:
0: 6
1: 27
2: 5
2: 7
HLT_2j55_pf_ftf_bdl1r60_split_2j55_pf_ftf_0eta320_L14J15p0ETA25:
eventCount: 2
stepCounts:
......@@ -233,7 +233,7 @@ HLT_2j55_pf_ftf_bdl1r60_split_2j55_pf_ftf_0eta320_L14J15p0ETA25:
stepFeatures:
0: 6
1: 27
2: 6
2: 5
HLT_2j60_L1J15:
eventCount: 0
HLT_2mu10_bJpsimumu_L12MU10:
......@@ -535,7 +535,7 @@ HLT_3j35_ftf_bmv2c1070_split_j35_ftf_0eta320_L14J15p0ETA25:
stepFeatures:
0: 6
1: 81
2: 14
2: 15
HLT_3j35_pf_ftf_bdl1r70_split_j35_pf_ftf_0eta320_L14J15p0ETA25:
eventCount: 3
stepCounts:
......@@ -545,7 +545,7 @@ HLT_3j35_pf_ftf_bdl1r70_split_j35_pf_ftf_0eta320_L14J15p0ETA25:
stepFeatures:
0: 6
1: 48
2: 12
2: 11
HLT_3j65_ftf_bmv2c1077_split_L1J20:
eventCount: 3
stepCounts:
......@@ -555,17 +555,17 @@ HLT_3j65_ftf_bmv2c1077_split_L1J20:
stepFeatures:
0: 19
1: 14
2: 12
2: 13
HLT_3j65_pf_ftf_bdl1r77_split_L1J20:
eventCount: 3
eventCount: 2
stepCounts:
0: 19
1: 4
2: 3
2: 2
stepFeatures:
0: 19
1: 15
2: 13
2: 11
HLT_3mu4_bJpsi_L13MU4:
eventCount: 0
HLT_3mu4_bPhi_L13MU4:
......@@ -597,25 +597,25 @@ HLT_4j120_subresjesgscIS_ftf_L13J50:
stepFeatures:
0: 1
HLT_4j35_ftf_bmv2c1077_split_L1J20:
eventCount: 1
eventCount: 2
stepCounts:
0: 19
1: 13
2: 1
2: 2
stepFeatures:
0: 19
1: 68
2: 31
2: 33
HLT_4j35_pf_ftf_bdl1r77_split_L1J20:
eventCount: 2
eventCount: 1
stepCounts:
0: 19
1: 8
2: 2
2: 1
stepFeatures:
0: 19
1: 39
2: 21
2: 20
HLT_4mu4_L14MU4:
eventCount: 0
HLT_4mu4_bDimu6000_L14MU4:
......@@ -695,29 +695,29 @@ HLT_6j25_ftf_0eta240_L14J15:
0: 9
1: 85
HLT_6j25_pf_ftf_0eta240_010jvt_L14J15:
eventCount: 5
eventCount: 4
stepCounts:
0: 9
1: 5
1: 4
stepFeatures:
0: 9
1: 34
1: 30
HLT_6j25_pf_ftf_0eta240_020jvt_L14J15:
eventCount: 3
eventCount: 4
stepCounts:
0: 9
1: 3
1: 4
stepFeatures:
0: 9
1: 22
1: 29
HLT_6j25_pf_ftf_0eta240_050jvt_L14J15:
eventCount: 3
eventCount: 4
stepCounts:
0: 9
1: 3
1: 4
stepFeatures:
0: 9
1: 21
1: 27
HLT_6j25_pf_ftf_0eta240_L14J15:
eventCount: 5
stepCounts:
......@@ -725,7 +725,7 @@ HLT_6j25_pf_ftf_0eta240_L14J15:
1: 5
stepFeatures:
0: 9
1: 35
1: 37
HLT_6j35_0eta240_L14J15:
eventCount: 1
stepCounts:
......@@ -978,7 +978,7 @@ HLT_e17_lhmedium_ivarloose_tau25_mediumRNN_tracktwoMVA_03dRAB_L1EM15VHI_2TAU12IM
8: 6
9: 2
HLT_e17_lhmedium_tau25_mediumRNN_tracktwoMVA_xe50_cell_03dRAB_L1EM15VHI_2TAU12IM_XE35:
eventCount: 1
eventCount: 0
stepCounts:
0: 3
1: 2
......@@ -990,7 +990,6 @@ HLT_e17_lhmedium_tau25_mediumRNN_tracktwoMVA_xe50_cell_03dRAB_L1EM15VHI_2TAU12IM
7: 2
8: 2
9: 2
10: 1
stepFeatures:
0: 3
1: 3
......@@ -2461,15 +2460,15 @@ HLT_j0_fbdjshared_L1J20:
HLT_j0_perf_L1J12_EMPTY:
eventCount: 0
HLT_j110_subjesgscIS_ftf_bdl1r60_split_j45_subjesgscIS_ftf_bdl1r70_split_L1J50:
eventCount: 3
eventCount: 2
stepCounts:
0: 14
1: 6
2: 3
2: 2
stepFeatures:
0: 14
1: 53
2: 18
2: 13
HLT_j110_subjesgscIS_ftf_j45_subjesgscIS_ftf_L1J50:
eventCount: 6
stepCounts:
......@@ -2487,15 +2486,15 @@ HLT_j150_ftf_0eta320_2j55_ftf_bmv2c1070_split_L1J85_3J30:
stepFeatures:
0: 3
HLT_j150_pf_ftf_0eta320_2j55_pf_ftf_bdl1r70_split_L1J85_3J30:
eventCount: 1
eventCount: 2
stepCounts:
0: 3
1: 1
2: 1
1: 2
2: 2
stepFeatures:
0: 3
1: 7
2: 3
1: 16
2: 5
HLT_j150_subresjesgscIS_ftf_2j55_subresjesgscIS_ftf_L1J85_3J30:
eventCount: 0
stepCounts:
......@@ -2665,7 +2664,7 @@ HLT_j45_pf_ftf_010jvt_L1J15:
1: 19
stepFeatures:
0: 20
1: 57
1: 56
HLT_j45_pf_ftf_020jvt_L1J15:
eventCount: 19
stepCounts:
......@@ -2673,7 +2672,7 @@ HLT_j45_pf_ftf_020jvt_L1J15:
1: 19
stepFeatures:
0: 20
1: 57
1: 56
HLT_j45_pf_ftf_050jvt_L1J15:
eventCount: 19
stepCounts:
......@@ -2681,7 +2680,7 @@ HLT_j45_pf_ftf_050jvt_L1J15:
1: 19
stepFeatures:
0: 20
1: 55
1: 54
HLT_j45_pf_ftf_L1J15:
eventCount: 19
stepCounts:
......@@ -2689,7 +2688,7 @@ HLT_j45_pf_ftf_L1J15:
1: 19
stepFeatures:
0: 20
1: 58
1: 57
HLT_j45_pf_ftf_preselj20_L1J15:
eventCount: 19
stepCounts:
......@@ -2697,7 +2696,7 @@ HLT_j45_pf_ftf_preselj20_L1J15:
1: 19
stepFeatures:
0: 20
1: 58
1: 57
HLT_j45_pf_nojcalib_ftf_L1J15:
eventCount: 18
stepCounts:
......@@ -2715,15 +2714,15 @@ HLT_j45_pf_subjesgscIS_ftf_L1J15:
0: 20
1: 51
HLT_j45_pf_subjesgscIS_ftf_bdl1r70_split_L1J20:
eventCount: 11
eventCount: 10
stepCounts:
0: 19
1: 18
2: 11
2: 10
stepFeatures:
0: 19
1: 48
2: 25
2: 22
HLT_j45_pf_subjesgscIS_ftf_boffperf_split_L1J20:
eventCount: 18
stepCounts:
......@@ -2749,7 +2748,7 @@ HLT_j45_pf_subresjesgsc_ftf_L1J15:
1: 19
stepFeatures:
0: 20
1: 58
1: 57
HLT_j45_sk_nojcalib_L1J15:
eventCount: 15
stepCounts:
......@@ -2797,15 +2796,15 @@ HLT_j45_subjesgscIS_ftf_L1J15:
0: 20
1: 47
HLT_j45_subjesgscIS_ftf_bdl1r70_split_L1J20:
eventCount: 10
eventCount: 9
stepCounts:
0: 19
1: 19
2: 10
2: 9
stepFeatures:
0: 19
1: 46
2: 22
2: 18
HLT_j45_subjesgscIS_ftf_bmv2c1070_split_L1J20:
eventCount: 14
stepCounts:
......@@ -2815,7 +2814,7 @@ HLT_j45_subjesgscIS_ftf_bmv2c1070_split_L1J20:
stepFeatures:
0: 19
1: 46
2: 26
2: 27
HLT_j45_subjesgscIS_ftf_boffperf_split_L1J20:
eventCount: 19
stepCounts:
......@@ -3003,7 +3002,7 @@ HLT_j80_pf_ftf_j55_pf_ftf_j28_pf_ftf_j20_pf_ftf_L1J45p0ETA21_3J15p0ETA25:
1: 6
stepFeatures:
0: 7
1: 218
1: 215
HLT_j80_pf_ftf_j55_pf_ftf_j28_pf_ftf_j20_pf_ftf_L1MU10_2J15_J20:
eventCount: 5
stepCounts:
......@@ -3011,7 +3010,7 @@ HLT_j80_pf_ftf_j55_pf_ftf_j28_pf_ftf_j20_pf_ftf_L1MU10_2J15_J20:
1: 5
stepFeatures:
0: 8
1: 210
1: 218
HLT_j80_pf_ftf_j55_pf_ftf_j28_pf_ftf_j20_pf_ftf_L1MU20:
eventCount: 5
stepCounts:
......@@ -3019,7 +3018,7 @@ HLT_j80_pf_ftf_j55_pf_ftf_j28_pf_ftf_j20_pf_ftf_L1MU20:
1: 5
stepFeatures:
0: 8
1: 210
1: 218
HLT_j85_050momemfrac100SEPmomhecfrac010_L1J20:
eventCount: 9
stepCounts:
......@@ -4663,21 +4662,21 @@ HLT_xe110_mht_L1XE50:
stepFeatures:
0: 6
HLT_xe110_pfsum_L1XE50:
eventCount: 4
eventCount: 5
stepCounts:
0: 10
1: 4
1: 5
stepFeatures:
0: 10
1: 4
1: 5
HLT_xe110_pfsum_cssk_L1XE50:
eventCount: 2
eventCount: 3
stepCounts:
0: 10
1: 2
1: 3
stepFeatures:
0: 10
1: 2
1: 3
HLT_xe110_pfsum_vssk_L1XE50:
eventCount: 3
stepCounts:
......
Trigger/TrigValidation/TrigInDetValidation/share/TIDAvtx_preinclude.py
+ 0
− 1
View file @ 17ccb334
......@@ -5,7 +5,6 @@ log = logging.getLogger("TrigInDetValidation")
log.info( "preinclude: TIDAvtx_preinclude.py" )
from TrigInDetConfig.ConfigSettings import getInDetTrigConfig
from TrigInDetConfig.ConfigSettings import getInDetTrigTrackingConfig
getInDetTrigConfig("jet")._adaptiveVertex = True
......
Trigger/TrigValidation/TriggerTest/share/ref_data_v1Dev_build.ref
+ 6
− 7
View file @ 17ccb334
......@@ -262,7 +262,6 @@ HLT_3j35_ftf_bmv2c1070_split_j35_ftf_0eta320_L14J15p0ETA25:
stepFeatures:
0: 20
1: 11
2: 1
HLT_3j35_pf_ftf_bdl1r70_split_j35_pf_ftf_0eta320_L14J15p0ETA25:
eventCount: 0
stepCounts:
......@@ -1378,13 +1377,13 @@ HLT_j45_pf_nojcalib_ftf_L1J15:
0: 7
1: 4
HLT_j45_pf_subjesgscIS_ftf_L1J15:
eventCount: 6
eventCount: 7
stepCounts:
0: 7
1: 6
1: 7
stepFeatures:
0: 7
1: 6
1: 7
HLT_j45_pf_subjesgscIS_ftf_bdl1r70_split_L1J20:
eventCount: 0
stepCounts:
......@@ -1404,13 +1403,13 @@ HLT_j45_pf_subjesgscIS_ftf_boffperf_split_L1J20:
1: 5
2: 5
HLT_j45_pf_subjesgsc_ftf_L1J15:
eventCount: 6
eventCount: 7
stepCounts:
0: 7
1: 6
1: 7
stepFeatures:
0: 7
1: 6
1: 7
HLT_j45_pf_subresjesgsc_ftf_L1J15:
eventCount: 7
stepCounts:
......
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