diff --git a/Trigger/TrigHypothesis/TrigEgammaHypo/python/TrigEgammaTLAPhotonFexConfig.py b/Trigger/TrigHypothesis/TrigEgammaHypo/python/TrigEgammaTLAPhotonFexConfig.py index 4eae955e91b7f38c444829d89d196c45c92203be..0cd253720e718a9fc8ec6a05fbf96487f4079bde 100644 --- a/Trigger/TrigHypothesis/TrigEgammaHypo/python/TrigEgammaTLAPhotonFexConfig.py +++ b/Trigger/TrigHypothesis/TrigEgammaHypo/python/TrigEgammaTLAPhotonFexConfig.py @@ -2,7 +2,7 @@ # Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration # -def getConfiguredTLAPhotonSelector(photonPtThreshold=35000, maxNPhotons=-1, inputPhotonsKey="HLT_egamma_Photons", TLAPhotonsKey="HLT_egamma_Photons_TLA"): +def getConfiguredTLAPhotonSelector(photonPtThreshold=10000, maxNPhotons=-1, inputPhotonsKey="HLT_egamma_Photons", TLAPhotonsKey="HLT_egamma_Photons_TLA"): diff --git a/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref b/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref index 56101c268ae7709853919b12314953f08ecf8456..db2dd5e2859475c5bd59ff0a33a88c9d924c18b0 100644 --- a/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref +++ b/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref @@ -1087,26 +1087,6 @@ HLT_7j45_pf_ftf_L14J15: 0: 9 HLT_7j45_subjesIS_L14J15: eventCount: 0 -HLT_JetDS_j20_L1HT190-J15s5pETA21: - eventCount: 4 - stepCounts: - 0: 4 - 1: 4 - 2: 4 - stepFeatures: - 0: 42 - 1: 42 - 2: 4 -HLT_JetDS_j20_L1J100: - eventCount: 3 - stepCounts: - 0: 3 - 1: 3 - 2: 3 - stepFeatures: - 0: 27 - 1: 27 - 2: 3 HLT_beamspot_allTE_trkfast_BeamSpotPEB_L1J15: eventCount: 0 HLT_beamspot_trkFS_trkfast_BeamSpotPEB_L1J15: @@ -3535,6 +3515,36 @@ HLT_j175_pf_ftf_preselj20_L1J50: stepFeatures: 0: 13 1: 1 +HLT_j20_JetDS_L1HT190-J15s5pETA21: + eventCount: 4 + stepCounts: + 0: 4 + 1: 4 + 2: 4 + stepFeatures: + 0: 42 + 1: 42 + 2: 4 +HLT_j20_JetDS_L1J100: + eventCount: 3 + stepCounts: + 0: 3 + 1: 3 + 2: 3 + stepFeatures: + 0: 27 + 1: 27 + 2: 3 +HLT_j20_JetDS_L1J50_DETA20-J50J: + eventCount: 9 + stepCounts: + 0: 9 + 1: 9 + 2: 9 + stepFeatures: + 0: 87 + 1: 87 + 2: 9 HLT_j20_pf_ftf_boffperf_L1HT190-J15s5pETA21: eventCount: 4 stepCounts: @@ -4107,6 +4117,16 @@ HLT_j60_j0_FBDJSHARED_L1J20: 0: 7 stepFeatures: 0: 278 +HLT_j60_j45_2j20_JetDS_L1J45p0ETA21_3J15p0ETA25: + eventCount: 9 + stepCounts: + 0: 9 + 1: 9 + 2: 9 + stepFeatures: + 0: 244 + 1: 95 + 2: 9 HLT_j60_pf_ftf_preselj20_L1J20: eventCount: 18 stepCounts: diff --git a/Trigger/TrigValidation/TriggerTest/share/ref_data_v1Dev_build.ref b/Trigger/TrigValidation/TriggerTest/share/ref_data_v1Dev_build.ref index bfab8a08fa4bbf2e18bece7ea82aabd40cf6d8e6..ee73c29ead81a5c5441c9c45916641e2ca0986e7 100644 --- a/Trigger/TrigValidation/TriggerTest/share/ref_data_v1Dev_build.ref +++ b/Trigger/TrigValidation/TriggerTest/share/ref_data_v1Dev_build.ref @@ -711,18 +711,6 @@ HLT_7j45_pf_ftf_L14J15: 0: 7 HLT_7j45_subjesIS_L14J15: eventCount: 0 -HLT_JetDS_j20_L1HT190-J15s5pETA21: - eventCount: 17 - stepCounts: - 0: 17 - 1: 17 - 2: 17 - stepFeatures: - 0: 57 - 1: 57 - 2: 17 -HLT_JetDS_j20_L1J100: - eventCount: 0 HLT_beamspot_allTE_trkfast_BeamSpotPEB_L1J15: eventCount: 20 stepCounts: @@ -1830,6 +1818,28 @@ HLT_j175_pf_ftf_preselj20_L1J50: 0: 2 stepFeatures: 0: 2 +HLT_j20_JetDS_L1HT190-J15s5pETA21: + eventCount: 17 + stepCounts: + 0: 17 + 1: 17 + 2: 17 + stepFeatures: + 0: 57 + 1: 57 + 2: 17 +HLT_j20_JetDS_L1J100: + eventCount: 0 +HLT_j20_JetDS_L1J50_DETA20-J50J: + eventCount: 17 + stepCounts: + 0: 17 + 1: 17 + 2: 17 + stepFeatures: + 0: 57 + 1: 57 + 2: 17 HLT_j20_pf_ftf_boffperf_L1HT190-J15s5pETA21: eventCount: 15 stepCounts: @@ -2262,6 +2272,8 @@ HLT_j60_j0_FBDJSHARED_L1J20: 0: 1 stepFeatures: 0: 21 +HLT_j60_j45_2j20_JetDS_L1J45p0ETA21_3J15p0ETA25: + eventCount: 0 HLT_j60_pf_ftf_preselj20_L1J20: eventCount: 3 stepCounts: diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py index 2261a0a4aa1337d4017c83bb92a55390cd6e20b7..af6d88175df80d7c03a8be81f751812bd7ce0e91 100644 --- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py +++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py @@ -381,13 +381,14 @@ def setupMenu(): ChainProp(name='HLT_j165_LArPEBHLT_L1J100', stream=['LArCells'], groups=['PS:Online']+SingleJetGroup), # TLA test chains, ATR-20395 - ChainProp(name='HLT_JetDS_j20_L1J100', stream=['JetDS'], groups=SingleJetGroup), + ChainProp(name='HLT_j20_JetDS_L1J100', stream=['JetDS'], groups=SingleJetGroup), + ChainProp(name='HLT_j20_JetDS_L1J50_DETA20-J50J', l1SeedThresholds=['FSNOSEED'], stream=['JetDS'], groups=SingleJetGroup), # TLA test HT chains, ATR-21594 - ChainProp(name='HLT_JetDS_j20_L1HT190-J15s5pETA21', l1SeedThresholds=['FSNOSEED'], stream=['JetDS'], groups=SingleJetGroup), + ChainProp(name='HLT_j20_JetDS_L1HT190-J15s5pETA21', l1SeedThresholds=['FSNOSEED'], stream=['JetDS'], groups=SingleJetGroup), + # Piggybacking on HH4b, exact thresholds for preselections to be determined later - this is for rate and cost + ChainProp(name='HLT_j60_j45_2j20_JetDS_L1J45p0ETA21_3J15p0ETA25', l1SeedThresholds=['FSNOSEED']*3, stream=['JetDS'], groups=MultiJetGroup), - - # ATR-22096 ChainProp(name='HLT_j420_ftf_L1J100', groups=SingleJetGroup+ PrimaryLegGroup), ChainProp(name='HLT_j420_pf_ftf_L1J100', groups=SingleJetGroup+ PrimaryLegGroup),