diff --git a/Trigger/TrigMonitoring/TrigTauMonitoring/python/TrigTauMonitCategory.py b/Trigger/TrigMonitoring/TrigTauMonitoring/python/TrigTauMonitCategory.py index b930bd1d53c3132bc97581d1cd6bfdbb8d88fe9a..607538445c4935ec5aed9ec833041e67a240fa97 100644 --- a/Trigger/TrigMonitoring/TrigTauMonitoring/python/TrigTauMonitCategory.py +++ b/Trigger/TrigMonitoring/TrigTauMonitoring/python/TrigTauMonitCategory.py @@ -38,26 +38,16 @@ monitoring_tau_pp = [ 'tau160_perf_tracktwoEF_L1TAU100', 'tau160_perf_tracktwoMVA_L1TAU100', 'tau160_perf_tracktwoMVABDT_L1TAU100', - 'tau160_mediumRNN_track_L1TAU100', - 'tau160_mediumRNN_tracktwo_L1TAU100', - 'tau160_mediumRNN_tracktwoEF_L1TAU100', 'tau160_mediumRNN_tracktwoMVA_L1TAU100', 'tau160_mediumRNN_tracktwoMVABDT_L1TAU100', 'tau160_medium1_track_L1TAU100', 'tau160_medium1_tracktwo_L1TAU100', 'tau160_medium1_tracktwoEF_L1TAU100', - 'tau160_medium1_tracktwoMVA_L1TAU100', - 'tau160_medium1_tracktwoMVABDT_L1TAU100', - 'tau200_mediumRNN_track_L1TAU100', - 'tau200_mediumRNN_tracktwo_L1TAU100', - 'tau200_mediumRNN_tracktwoEF_L1TAU100', 'tau200_mediumRNN_tracktwoMVA_L1TAU100', 'tau200_mediumRNN_tracktwoMVABDT_L1TAU100', 'tau200_medium1_track_L1TAU100', 'tau200_medium1_tracktwo_L1TAU100', 'tau200_medium1_tracktwoEF_L1TAU100', - 'tau200_medium1_tracktwoMVA_L1TAU100', - 'tau200_medium1_tracktwoMVABDT_L1TAU100', # Will keep this commented out for now #'tau80_mediumRNN_tracktwoMVA_tau60_mediumRNN_tracktwoMVA_L1TAU60_2TAU40', #'tau80_mediumRNN_tracktwoMVA_tau35_mediumRNN_tracktwoMVA_L1TAU60_DR-TAU20ITAU12I', diff --git a/Trigger/TrigMonitoring/TrigTauMonitoring/python/TrigTauMonitoringConfigMT.py b/Trigger/TrigMonitoring/TrigTauMonitoring/python/TrigTauMonitoringConfigMT.py index 50230d2037028de49272278ad325c60d7fb1f174..12f64e07169f03fee949575cd4b63340e0e38d0d 100644 --- a/Trigger/TrigMonitoring/TrigTauMonitoring/python/TrigTauMonitoringConfigMT.py +++ b/Trigger/TrigMonitoring/TrigTauMonitoring/python/TrigTauMonitoringConfigMT.py @@ -166,19 +166,10 @@ class TrigTauMonAlgBuilder: 'HLT_tau25_perf_tracktwoEF_L1TAU12IM', 'HLT_tau25_perf_tracktwoMVA_L1TAU12IM', 'HLT_tau25_perf_tracktwoMVABDT_L1TAU12IM', - 'HLT_tau25_looseRNN_track_L1TAU12IM', - 'HLT_tau25_looseRNN_tracktwo_L1TAU12IM', - 'HLT_tau25_looseRNN_tracktwoEF_L1TAU12IM', 'HLT_tau25_looseRNN_tracktwoMVA_L1TAU12IM', 'HLT_tau25_looseRNN_tracktwoMVABDT_L1TAU12IM', - 'HLT_tau25_mediumRNN_track_L1TAU12IM', - 'HLT_tau25_mediumRNN_tracktwo_L1TAU12IM', - 'HLT_tau25_mediumRNN_tracktwoEF_L1TAU12IM', 'HLT_tau25_mediumRNN_tracktwoMVA_L1TAU12IM', 'HLT_tau25_mediumRNN_tracktwoMVABDT_L1TAU12IM', - 'HLT_tau25_tightRNN_track_L1TAU12IM', - 'HLT_tau25_tightRNN_tracktwo_L1TAU12IM', - 'HLT_tau25_tightRNN_tracktwoEF_L1TAU12IM', 'HLT_tau25_tightRNN_tracktwoMVA_L1TAU12IM', 'HLT_tau25_tightRNN_tracktwoMVABDT_L1TAU12IM', 'HLT_tau25_medium1_track_L1TAU12IM', @@ -196,19 +187,10 @@ class TrigTauMonAlgBuilder: 'HLT_tau35_perf_tracktwoEF_L1TAU12IM', 'HLT_tau35_perf_tracktwoMVA_L1TAU12IM', 'HLT_tau35_perf_tracktwoMVABDT_L1TAU12IM', - 'HLT_tau35_looseRNN_track_L1TAU12IM', - 'HLT_tau35_looseRNN_tracktwo_L1TAU12IM', - 'HLT_tau35_looseRNN_tracktwoEF_L1TAU12IM', 'HLT_tau35_looseRNN_tracktwoMVA_L1TAU12IM', 'HLT_tau35_looseRNN_tracktwoMVABDT_L1TAU12IM', - 'HLT_tau35_mediumRNN_track_L1TAU12IM', - 'HLT_tau35_mediumRNN_tracktwo_L1TAU12IM', - 'HLT_tau35_mediumRNN_tracktwoEF_L1TAU12IM', 'HLT_tau35_mediumRNN_tracktwoMVA_L1TAU12IM', 'HLT_tau35_mediumRNN_tracktwoMVABDT_L1TAU12IM', - 'HLT_tau35_tightRNN_track_L1TAU12IM', - 'HLT_tau35_tightRNN_tracktwo_L1TAU12IM', - 'HLT_tau35_tightRNN_tracktwoEF_L1TAU12IM', 'HLT_tau35_tightRNN_tracktwoMVA_L1TAU12IM', 'HLT_tau35_tightRNN_tracktwoMVABDT_L1TAU12IM', # tau80 @@ -225,9 +207,6 @@ class TrigTauMonAlgBuilder: 'HLT_tau160_perf_tracktwoEF_L1TAU100', 'HLT_tau160_perf_tracktwoMVA_L1TAU100', 'HLT_tau160_perf_tracktwoMVABDT_L1TAU100', - 'HLT_tau160_mediumRNN_track_L1TAU100', - 'HLT_tau160_mediumRNN_tracktwo_L1TAU100', - 'HLT_tau160_mediumRNN_tracktwoEF_L1TAU100', 'HLT_tau160_mediumRNN_tracktwoMVA_L1TAU100', 'HLT_tau160_mediumRNN_tracktwoMVABDT_L1TAU100', 'HLT_tau160_medium1_track_L1TAU100', @@ -235,9 +214,6 @@ class TrigTauMonAlgBuilder: 'HLT_tau160_medium1_tracktwoEF_L1TAU100', # tau200 'HLT_tau200_ptonly_L1TAU100', - 'HLT_tau200_mediumRNN_track_L1TAU100', - 'HLT_tau200_mediumRNN_tracktwo_L1TAU100', - 'HLT_tau200_mediumRNN_tracktwoEF_L1TAU100', 'HLT_tau200_mediumRNN_tracktwoMVA_L1TAU100', 'HLT_tau200_mediumRNN_tracktwoMVABDT_L1TAU100', 'HLT_tau200_medium1_track_L1TAU100', diff --git a/Trigger/TrigMonitoring/TrigTauMonitoring/src/TrigTauMonitorAlgorithm.cxx b/Trigger/TrigMonitoring/TrigTauMonitoring/src/TrigTauMonitorAlgorithm.cxx index 9e3360feb52bc9b7c7306d0bcc5068c4de34633d..1a4168cdd49720fbde1a029487117e06df55c451 100644 --- a/Trigger/TrigMonitoring/TrigTauMonitoring/src/TrigTauMonitorAlgorithm.cxx +++ b/Trigger/TrigMonitoring/TrigTauMonitoring/src/TrigTauMonitorAlgorithm.cxx @@ -109,7 +109,7 @@ StatusCode TrigTauMonitorAlgorithm::executeNavigation( const EventContext& ctx, } std::string tauContainerName = "HLT_TrigTauRecMerged_Precision"; - if(trigItem.find("EF_")!=std::string::npos || trigItem.find("MVA_")!=std::string::npos || trigItem.find("MVABDT_")!=std::string::npos) { + if(trigItem.find("MVA_")!=std::string::npos || trigItem.find("MVABDT_")!=std::string::npos) { tauContainerName="HLT_TrigTauRecMerged_MVA"; }else if(trigItem.find("ptonly") != std::string::npos) tauContainerName="HLT_TrigTauRecMerged_CaloOnly"; @@ -184,7 +184,7 @@ void TrigTauMonitorAlgorithm::fillDistributions(const EventContext& ctx, std::ve } std::string tauContainerName = "HLT_TrigTauRecMerged_Precision"; - if(trigger.find("EF_")!=std::string::npos || trigger.find("MVA_")!=std::string::npos || trigger.find("MVABDT_")!=std::string::npos){ + if(trigger.find("MVA_")!=std::string::npos || trigger.find("MVABDT_")!=std::string::npos){ tauContainerName="HLT_TrigTauRecMerged_MVA"; }else if(trigger.find("ptonly") != std::string::npos) tauContainerName="HLT_TrigTauRecMerged_CaloOnly"; diff --git a/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref b/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref index 77f67066608cd547ca9241c7dc3ec434b735f704..12197a6e00a1019c9af091d2dd3515e2089adb20 100644 --- a/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref +++ b/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref @@ -2911,7 +2911,7 @@ HLT_j80_pf_ftf_020jvt_j55_pf_ftf_020jvt_j28_pf_ftf_020jvt_j20_pf_ftf_020jvt_L1J4 stepFeatures: 0: 7 1: 189 -HLT_j80_pf_ftf_0eta240_020jvt_j55_pf_ftf_0eta240_020jvt_j28_pf_ftf_0eta240_020jvt_j20_pf_ftf_0eta240_020jvt_L1J45p0ETA21_3J15p0ETA25: +HLT_j80_pf_ftf_0eta240_020jvt_j55_pf_ftf_0eta240_020jvt_j28_pf_ftf_0eta240_020jvt_j20_pf_ftf_0eta240_020jvt_L1J45p0ETA21_3J15p0ETA25: eventCount: 6 stepCounts: 0: 7 @@ -3898,16 +3898,10 @@ HLT_tau160_medium1_tracktwoEF_L1TAU100: eventCount: 0 HLT_tau160_medium1_tracktwo_L1TAU100: eventCount: 0 -HLT_tau160_mediumRNN_track_L1TAU100: - eventCount: 0 -HLT_tau160_mediumRNN_tracktwoEF_L1TAU100: - eventCount: 0 HLT_tau160_mediumRNN_tracktwoMVABDT_L1TAU100: eventCount: 0 HLT_tau160_mediumRNN_tracktwoMVA_L1TAU100: eventCount: 0 -HLT_tau160_mediumRNN_tracktwo_L1TAU100: - eventCount: 0 HLT_tau160_perf_track_L1TAU100: eventCount: 0 HLT_tau160_perf_tracktwoEF_L1TAU100: @@ -3926,16 +3920,10 @@ HLT_tau200_medium1_tracktwoEF_L1TAU100: eventCount: 0 HLT_tau200_medium1_tracktwo_L1TAU100: eventCount: 0 -HLT_tau200_mediumRNN_track_L1TAU100: - eventCount: 0 -HLT_tau200_mediumRNN_tracktwoEF_L1TAU100: - eventCount: 0 HLT_tau200_mediumRNN_tracktwoMVABDT_L1TAU100: eventCount: 0 HLT_tau200_mediumRNN_tracktwoMVA_L1TAU100: eventCount: 0 -HLT_tau200_mediumRNN_tracktwo_L1TAU100: - eventCount: 0 HLT_tau200_ptonly_L1TAU100: eventCount: 0 HLT_tau25_idperf_track_L1TAU12IM: @@ -4010,28 +3998,6 @@ HLT_tau25_idperf_tracktwo_L1TAU12IM: 3: 9 4: 9 5: 9 -HLT_tau25_looseRNN_track_L1TAU12IM: - eventCount: 0 - stepCounts: - 0: 12 - 1: 9 - stepFeatures: - 0: 22 - 1: 13 -HLT_tau25_looseRNN_tracktwoEF_L1TAU12IM: - eventCount: 6 - stepCounts: - 0: 12 - 1: 10 - 2: 6 - 3: 6 - 4: 6 - stepFeatures: - 0: 22 - 1: 14 - 2: 8 - 3: 8 - 4: 7 HLT_tau25_looseRNN_tracktwoMVABDT_L1TAU12IM: eventCount: 6 stepCounts: @@ -4060,16 +4026,6 @@ HLT_tau25_looseRNN_tracktwoMVA_L1TAU12IM: 2: 8 3: 8 4: 7 -HLT_tau25_looseRNN_tracktwo_L1TAU12IM: - eventCount: 0 - stepCounts: - 0: 12 - 1: 10 - 2: 6 - stepFeatures: - 0: 22 - 1: 14 - 2: 8 HLT_tau25_medium1_track_L1TAU12IM: eventCount: 0 stepCounts: @@ -4079,17 +4035,19 @@ HLT_tau25_medium1_track_L1TAU12IM: 0: 22 1: 13 HLT_tau25_medium1_tracktwoEF_L1TAU12IM: - eventCount: 0 + eventCount: 5 stepCounts: 0: 12 1: 10 2: 6 3: 6 + 4: 5 stepFeatures: 0: 22 1: 14 2: 8 3: 8 + 4: 5 HLT_tau25_medium1_tracktwo_L1TAU12IM: eventCount: 0 stepCounts: @@ -4100,28 +4058,6 @@ HLT_tau25_medium1_tracktwo_L1TAU12IM: 0: 22 1: 14 2: 8 -HLT_tau25_mediumRNN_track_L1TAU12IM: - eventCount: 0 - stepCounts: - 0: 12 - 1: 9 - stepFeatures: - 0: 22 - 1: 13 -HLT_tau25_mediumRNN_tracktwoEF_L1TAU12IM: - eventCount: 4 - stepCounts: - 0: 12 - 1: 10 - 2: 6 - 3: 6 - 4: 4 - stepFeatures: - 0: 22 - 1: 14 - 2: 8 - 3: 8 - 4: 4 HLT_tau25_mediumRNN_tracktwoMVABDT_L1TAU12IM: eventCount: 4 stepCounts: @@ -4136,7 +4072,7 @@ HLT_tau25_mediumRNN_tracktwoMVABDT_L1TAU12IM: 2: 8 3: 8 4: 4 -HLT_tau25_mediumRNN_tracktwoMVABDT_tau20_mediumRNN_tracktwoMVABDT_j70_0eta320_j50_0eta490_j0_dijetSEP50j12etSEP900djmass_L1MJJ-500-NFF: +HLT_tau25_mediumRNN_tracktwoMVABDT_tau20_mediumRNN_tracktwoMVABDT_j70_0eta320_j50_0eta490_j0_dijetSEP50j12etSEP900djmass_L1MJJ-500-NFF: eventCount: 0 stepFeatures: 0: 4 @@ -4154,20 +4090,10 @@ HLT_tau25_mediumRNN_tracktwoMVA_L1TAU12IM: 2: 8 3: 8 4: 4 -HLT_tau25_mediumRNN_tracktwoMVA_tau20_mediumRNN_tracktwoMVA_j70_0eta320_j50_0eta490_j0_dijetSEP50j12etSEP900djmass_L1MJJ-500-NFF: +HLT_tau25_mediumRNN_tracktwoMVA_tau20_mediumRNN_tracktwoMVA_j70_0eta320_j50_0eta490_j0_dijetSEP50j12etSEP900djmass_L1MJJ-500-NFF: eventCount: 0 stepFeatures: 0: 4 -HLT_tau25_mediumRNN_tracktwo_L1TAU12IM: - eventCount: 0 - stepCounts: - 0: 12 - 1: 10 - 2: 6 - stepFeatures: - 0: 22 - 1: 14 - 2: 8 HLT_tau25_perf_track_L1TAU12IM: eventCount: 8 stepCounts: @@ -4246,28 +4172,6 @@ HLT_tau25_ptonly_L1TAU12IM: 0: 12 stepFeatures: 0: 22 -HLT_tau25_tightRNN_track_L1TAU12IM: - eventCount: 0 - stepCounts: - 0: 12 - 1: 9 - stepFeatures: - 0: 22 - 1: 13 -HLT_tau25_tightRNN_tracktwoEF_L1TAU12IM: - eventCount: 4 - stepCounts: - 0: 12 - 1: 10 - 2: 6 - 3: 6 - 4: 4 - stepFeatures: - 0: 22 - 1: 14 - 2: 8 - 3: 8 - 4: 4 HLT_tau25_tightRNN_tracktwoMVABDT_L1TAU12IM: eventCount: 4 stepCounts: @@ -4296,16 +4200,6 @@ HLT_tau25_tightRNN_tracktwoMVA_L1TAU12IM: 2: 8 3: 8 4: 4 -HLT_tau25_tightRNN_tracktwo_L1TAU12IM: - eventCount: 0 - stepCounts: - 0: 12 - 1: 10 - 2: 6 - stepFeatures: - 0: 22 - 1: 14 - 2: 8 HLT_tau35_idperf_track_L1TAU12IM: eventCount: 11 stepCounts: @@ -4378,28 +4272,6 @@ HLT_tau35_idperf_tracktwo_L1TAU12IM: 3: 9 4: 9 5: 9 -HLT_tau35_looseRNN_track_L1TAU12IM: - eventCount: 0 - stepCounts: - 0: 11 - 1: 8 - stepFeatures: - 0: 19 - 1: 11 -HLT_tau35_looseRNN_tracktwoEF_L1TAU12IM: - eventCount: 6 - stepCounts: - 0: 11 - 1: 9 - 2: 6 - 3: 6 - 4: 6 - stepFeatures: - 0: 19 - 1: 12 - 2: 7 - 3: 7 - 4: 6 HLT_tau35_looseRNN_tracktwoMVABDT_L1TAU12IM: eventCount: 6 stepCounts: @@ -4428,38 +4300,6 @@ HLT_tau35_looseRNN_tracktwoMVA_L1TAU12IM: 2: 8 3: 8 4: 7 -HLT_tau35_looseRNN_tracktwo_L1TAU12IM: - eventCount: 0 - stepCounts: - 0: 11 - 1: 9 - 2: 6 - stepFeatures: - 0: 19 - 1: 12 - 2: 7 -HLT_tau35_mediumRNN_track_L1TAU12IM: - eventCount: 0 - stepCounts: - 0: 11 - 1: 8 - stepFeatures: - 0: 19 - 1: 11 -HLT_tau35_mediumRNN_tracktwoEF_L1TAU12IM: - eventCount: 3 - stepCounts: - 0: 11 - 1: 9 - 2: 6 - 3: 6 - 4: 3 - stepFeatures: - 0: 19 - 1: 12 - 2: 7 - 3: 7 - 4: 3 HLT_tau35_mediumRNN_tracktwoMVABDT_L1TAU12IM: eventCount: 4 stepCounts: @@ -4514,16 +4354,6 @@ HLT_tau35_mediumRNN_tracktwoMVA_tau25_mediumRNN_tracktwoMVA_03dRleg000leg00130_L 2: 10 3: 8 4: 2 -HLT_tau35_mediumRNN_tracktwo_L1TAU12IM: - eventCount: 0 - stepCounts: - 0: 11 - 1: 9 - 2: 6 - stepFeatures: - 0: 19 - 1: 12 - 2: 7 HLT_tau35_perf_track_L1TAU12IM: eventCount: 7 stepCounts: @@ -4602,28 +4432,6 @@ HLT_tau35_ptonly_L1TAU12IM: 0: 11 stepFeatures: 0: 19 -HLT_tau35_tightRNN_track_L1TAU12IM: - eventCount: 0 - stepCounts: - 0: 11 - 1: 8 - stepFeatures: - 0: 19 - 1: 11 -HLT_tau35_tightRNN_tracktwoEF_L1TAU12IM: - eventCount: 3 - stepCounts: - 0: 11 - 1: 9 - 2: 6 - 3: 6 - 4: 3 - stepFeatures: - 0: 19 - 1: 12 - 2: 7 - 3: 7 - 4: 3 HLT_tau35_tightRNN_tracktwoMVABDT_L1TAU12IM: eventCount: 4 stepCounts: @@ -4652,16 +4460,6 @@ HLT_tau35_tightRNN_tracktwoMVA_L1TAU12IM: 2: 8 3: 8 4: 4 -HLT_tau35_tightRNN_tracktwo_L1TAU12IM: - eventCount: 0 - stepCounts: - 0: 11 - 1: 9 - 2: 6 - stepFeatures: - 0: 19 - 1: 12 - 2: 7 HLT_tau60_mediumRNN_tracktwoMVA_tau25_mediumRNN_tracktwoMVA_xe50_cell_L1TAU40_2TAU12IM_XE40: eventCount: 0 stepCounts: diff --git a/Trigger/TrigValidation/TriggerTest/share/ref_data_v1Dev_build.ref b/Trigger/TrigValidation/TriggerTest/share/ref_data_v1Dev_build.ref index 489ff713b3d460a1f7dc227c4519613f30df9f64..d786796f6a69385dfeaf076ed2981ec0c2b356e1 100644 --- a/Trigger/TrigValidation/TriggerTest/share/ref_data_v1Dev_build.ref +++ b/Trigger/TrigValidation/TriggerTest/share/ref_data_v1Dev_build.ref @@ -1615,7 +1615,7 @@ HLT_j80_pf_ftf_020jvt_j55_pf_ftf_020jvt_j28_pf_ftf_020jvt_j20_pf_ftf_020jvt_L1J4 0: 20 stepFeatures: 0: 20 -HLT_j80_pf_ftf_0eta240_020jvt_j55_pf_ftf_0eta240_020jvt_j28_pf_ftf_0eta240_020jvt_j20_pf_ftf_0eta240_020jvt_L1J45p0ETA21_3J15p0ETA25: +HLT_j80_pf_ftf_0eta240_020jvt_j55_pf_ftf_0eta240_020jvt_j28_pf_ftf_0eta240_020jvt_j20_pf_ftf_0eta240_020jvt_L1J45p0ETA21_3J15p0ETA25: eventCount: 0 stepCounts: 0: 20 @@ -2338,16 +2338,10 @@ HLT_tau160_medium1_tracktwoEF_L1TAU100: eventCount: 0 HLT_tau160_medium1_tracktwo_L1TAU100: eventCount: 0 -HLT_tau160_mediumRNN_track_L1TAU100: - eventCount: 0 -HLT_tau160_mediumRNN_tracktwoEF_L1TAU100: - eventCount: 0 HLT_tau160_mediumRNN_tracktwoMVABDT_L1TAU100: eventCount: 0 HLT_tau160_mediumRNN_tracktwoMVA_L1TAU100: eventCount: 0 -HLT_tau160_mediumRNN_tracktwo_L1TAU100: - eventCount: 0 HLT_tau160_perf_track_L1TAU100: eventCount: 0 HLT_tau160_perf_tracktwoEF_L1TAU100: @@ -2366,16 +2360,10 @@ HLT_tau200_medium1_tracktwoEF_L1TAU100: eventCount: 0 HLT_tau200_medium1_tracktwo_L1TAU100: eventCount: 0 -HLT_tau200_mediumRNN_track_L1TAU100: - eventCount: 0 -HLT_tau200_mediumRNN_tracktwoEF_L1TAU100: - eventCount: 0 HLT_tau200_mediumRNN_tracktwoMVABDT_L1TAU100: eventCount: 0 HLT_tau200_mediumRNN_tracktwoMVA_L1TAU100: eventCount: 0 -HLT_tau200_mediumRNN_tracktwo_L1TAU100: - eventCount: 0 HLT_tau200_ptonly_L1TAU100: eventCount: 0 HLT_tau25_idperf_track_L1TAU12IM: @@ -2450,28 +2438,6 @@ HLT_tau25_idperf_tracktwo_L1TAU12IM: 3: 2 4: 2 5: 2 -HLT_tau25_looseRNN_track_L1TAU12IM: - eventCount: 0 - stepCounts: - 0: 3 - 1: 3 - stepFeatures: - 0: 4 - 1: 3 -HLT_tau25_looseRNN_tracktwoEF_L1TAU12IM: - eventCount: 2 - stepCounts: - 0: 3 - 1: 3 - 2: 2 - 3: 2 - 4: 2 - stepFeatures: - 0: 4 - 1: 3 - 2: 2 - 3: 2 - 4: 2 HLT_tau25_looseRNN_tracktwoMVABDT_L1TAU12IM: eventCount: 2 stepCounts: @@ -2500,16 +2466,6 @@ HLT_tau25_looseRNN_tracktwoMVA_L1TAU12IM: 2: 2 3: 2 4: 2 -HLT_tau25_looseRNN_tracktwo_L1TAU12IM: - eventCount: 0 - stepCounts: - 0: 3 - 1: 3 - 2: 2 - stepFeatures: - 0: 4 - 1: 3 - 2: 2 HLT_tau25_medium1_track_L1TAU12IM: eventCount: 0 stepCounts: @@ -2519,17 +2475,19 @@ HLT_tau25_medium1_track_L1TAU12IM: 0: 4 1: 3 HLT_tau25_medium1_tracktwoEF_L1TAU12IM: - eventCount: 0 + eventCount: 1 stepCounts: 0: 3 1: 3 2: 2 3: 2 + 4: 1 stepFeatures: 0: 4 1: 3 2: 2 3: 2 + 4: 1 HLT_tau25_medium1_tracktwo_L1TAU12IM: eventCount: 0 stepCounts: @@ -2540,28 +2498,6 @@ HLT_tau25_medium1_tracktwo_L1TAU12IM: 0: 4 1: 3 2: 2 -HLT_tau25_mediumRNN_track_L1TAU12IM: - eventCount: 0 - stepCounts: - 0: 3 - 1: 3 - stepFeatures: - 0: 4 - 1: 3 -HLT_tau25_mediumRNN_tracktwoEF_L1TAU12IM: - eventCount: 1 - stepCounts: - 0: 3 - 1: 3 - 2: 2 - 3: 2 - 4: 1 - stepFeatures: - 0: 4 - 1: 3 - 2: 2 - 3: 2 - 4: 1 HLT_tau25_mediumRNN_tracktwoMVABDT_L1TAU12IM: eventCount: 1 stepCounts: @@ -2576,7 +2512,7 @@ HLT_tau25_mediumRNN_tracktwoMVABDT_L1TAU12IM: 2: 2 3: 2 4: 1 -HLT_tau25_mediumRNN_tracktwoMVABDT_tau20_mediumRNN_tracktwoMVABDT_j70_0eta320_j50_0eta490_j0_dijetSEP50j12etSEP900djmass_L1MJJ-500-NFF: +HLT_tau25_mediumRNN_tracktwoMVABDT_tau20_mediumRNN_tracktwoMVABDT_j70_0eta320_j50_0eta490_j0_dijetSEP50j12etSEP900djmass_L1MJJ-500-NFF: eventCount: 0 stepCounts: 0: 1 @@ -2597,23 +2533,13 @@ HLT_tau25_mediumRNN_tracktwoMVA_L1TAU12IM: 2: 2 3: 2 4: 1 -HLT_tau25_mediumRNN_tracktwoMVA_tau20_mediumRNN_tracktwoMVA_j70_0eta320_j50_0eta490_j0_dijetSEP50j12etSEP900djmass_L1MJJ-500-NFF: +HLT_tau25_mediumRNN_tracktwoMVA_tau20_mediumRNN_tracktwoMVA_j70_0eta320_j50_0eta490_j0_dijetSEP50j12etSEP900djmass_L1MJJ-500-NFF: eventCount: 0 stepCounts: 0: 1 stepFeatures: 0: 8 1: 2 -HLT_tau25_mediumRNN_tracktwo_L1TAU12IM: - eventCount: 0 - stepCounts: - 0: 3 - 1: 3 - 2: 2 - stepFeatures: - 0: 4 - 1: 3 - 2: 2 HLT_tau25_perf_track_L1TAU12IM: eventCount: 2 stepCounts: @@ -2692,28 +2618,6 @@ HLT_tau25_ptonly_L1TAU12IM: 0: 3 stepFeatures: 0: 4 -HLT_tau25_tightRNN_track_L1TAU12IM: - eventCount: 0 - stepCounts: - 0: 3 - 1: 3 - stepFeatures: - 0: 4 - 1: 3 -HLT_tau25_tightRNN_tracktwoEF_L1TAU12IM: - eventCount: 1 - stepCounts: - 0: 3 - 1: 3 - 2: 2 - 3: 2 - 4: 1 - stepFeatures: - 0: 4 - 1: 3 - 2: 2 - 3: 2 - 4: 1 HLT_tau25_tightRNN_tracktwoMVABDT_L1TAU12IM: eventCount: 1 stepCounts: @@ -2742,16 +2646,6 @@ HLT_tau25_tightRNN_tracktwoMVA_L1TAU12IM: 2: 2 3: 2 4: 1 -HLT_tau25_tightRNN_tracktwo_L1TAU12IM: - eventCount: 0 - stepCounts: - 0: 3 - 1: 3 - 2: 2 - stepFeatures: - 0: 4 - 1: 3 - 2: 2 HLT_tau35_idperf_track_L1TAU12IM: eventCount: 3 stepCounts: @@ -2824,28 +2718,6 @@ HLT_tau35_idperf_tracktwo_L1TAU12IM: 3: 2 4: 2 5: 2 -HLT_tau35_looseRNN_track_L1TAU12IM: - eventCount: 0 - stepCounts: - 0: 3 - 1: 3 - stepFeatures: - 0: 4 - 1: 3 -HLT_tau35_looseRNN_tracktwoEF_L1TAU12IM: - eventCount: 2 - stepCounts: - 0: 3 - 1: 3 - 2: 2 - 3: 2 - 4: 2 - stepFeatures: - 0: 4 - 1: 3 - 2: 2 - 3: 2 - 4: 2 HLT_tau35_looseRNN_tracktwoMVABDT_L1TAU12IM: eventCount: 2 stepCounts: @@ -2874,38 +2746,6 @@ HLT_tau35_looseRNN_tracktwoMVA_L1TAU12IM: 2: 2 3: 2 4: 2 -HLT_tau35_looseRNN_tracktwo_L1TAU12IM: - eventCount: 0 - stepCounts: - 0: 3 - 1: 3 - 2: 2 - stepFeatures: - 0: 4 - 1: 3 - 2: 2 -HLT_tau35_mediumRNN_track_L1TAU12IM: - eventCount: 0 - stepCounts: - 0: 3 - 1: 3 - stepFeatures: - 0: 4 - 1: 3 -HLT_tau35_mediumRNN_tracktwoEF_L1TAU12IM: - eventCount: 1 - stepCounts: - 0: 3 - 1: 3 - 2: 2 - 3: 2 - 4: 1 - stepFeatures: - 0: 4 - 1: 3 - 2: 2 - 3: 2 - 4: 1 HLT_tau35_mediumRNN_tracktwoMVABDT_L1TAU12IM: eventCount: 1 stepCounts: @@ -2948,16 +2788,6 @@ HLT_tau35_mediumRNN_tracktwoMVA_tau25_mediumRNN_tracktwoMVA_03dRleg000leg00130_L stepFeatures: 0: 8 1: 2 -HLT_tau35_mediumRNN_tracktwo_L1TAU12IM: - eventCount: 0 - stepCounts: - 0: 3 - 1: 3 - 2: 2 - stepFeatures: - 0: 4 - 1: 3 - 2: 2 HLT_tau35_perf_track_L1TAU12IM: eventCount: 2 stepCounts: @@ -3036,28 +2866,6 @@ HLT_tau35_ptonly_L1TAU12IM: 0: 3 stepFeatures: 0: 4 -HLT_tau35_tightRNN_track_L1TAU12IM: - eventCount: 0 - stepCounts: - 0: 3 - 1: 3 - stepFeatures: - 0: 4 - 1: 3 -HLT_tau35_tightRNN_tracktwoEF_L1TAU12IM: - eventCount: 1 - stepCounts: - 0: 3 - 1: 3 - 2: 2 - 3: 2 - 4: 1 - stepFeatures: - 0: 4 - 1: 3 - 2: 2 - 3: 2 - 4: 1 HLT_tau35_tightRNN_tracktwoMVABDT_L1TAU12IM: eventCount: 1 stepCounts: @@ -3086,16 +2894,6 @@ HLT_tau35_tightRNN_tracktwoMVA_L1TAU12IM: 2: 2 3: 2 4: 1 -HLT_tau35_tightRNN_tracktwo_L1TAU12IM: - eventCount: 0 - stepCounts: - 0: 3 - 1: 3 - 2: 2 - stepFeatures: - 0: 4 - 1: 3 - 2: 2 HLT_tau60_mediumRNN_tracktwoMVA_tau25_mediumRNN_tracktwoMVA_xe50_cell_L1TAU40_2TAU12IM_XE40: eventCount: 0 stepFeatures: diff --git a/Trigger/TriggerCommon/TrigEDMConfig/python/TriggerEDMRun3.py b/Trigger/TriggerCommon/TrigEDMConfig/python/TriggerEDMRun3.py index 0b01bc2d5ddf86e03efa22fc49db7e439c0c41a9..0a69fe4096e14ae4fd73e41213f07b965ad3dd8c 100644 --- a/Trigger/TriggerCommon/TrigEDMConfig/python/TriggerEDMRun3.py +++ b/Trigger/TriggerCommon/TrigEDMConfig/python/TriggerEDMRun3.py @@ -504,10 +504,10 @@ TriggerHLTListRun3 = [ #('xAOD::TauJetContainer#HLT_TrigTauRecMerged_CaloOnlyMVA', 'BS ESD AODFULL AODSLIM AODVERYSLIM', 'Tau', 'inViews:TAUCaloMVAViews'), #('xAOD::TauJetAuxContainer#HLT_TrigTauRecMerged_CaloOnlyMVAAux.', 'BS ESD AODFULL AODSLIM AODVERYSLIM', 'Tau'), - ('xAOD::TauJetContainer#HLT_TrigTauRecMerged_MVA', 'BS ESD AODFULL AODSLIM AODVERYSLIM', 'Tau', 'inViews:TAUMVAViews,TAUEFViews'), + ('xAOD::TauJetContainer#HLT_TrigTauRecMerged_MVA', 'BS ESD AODFULL AODSLIM AODVERYSLIM', 'Tau', 'inViews:TAUMVAViews'), ('xAOD::TauJetAuxContainer#HLT_TrigTauRecMerged_MVAAux.', 'BS ESD AODFULL AODSLIM AODVERYSLIM', 'Tau'), - ('xAOD::TauJetContainer#HLT_TrigTauRecMerged_Precision', 'BS ESD AODFULL AODSLIM AODVERYSLIM', 'Tau', 'inViews:TAUFTFIdViews,TAUFTFTrackViews,TAUTrackTwoViews'), + ('xAOD::TauJetContainer#HLT_TrigTauRecMerged_Precision', 'BS ESD AODFULL AODSLIM AODVERYSLIM', 'Tau', 'inViews:TAUFTFIdViews,TAUFTFTrackViews,TAUTrackTwoViews,TAUEFViews'), ('xAOD::TauJetAuxContainer#HLT_TrigTauRecMerged_PrecisionAux.', 'BS ESD AODFULL AODSLIM AODVERYSLIM', 'Tau'), ('xAOD::TauJetContainer#HLT_TrigTauRecMerged_Presel', 'BS ESD AODFULL AODSLIM AODVERYSLIM', 'Tau', 'inViews:TAUFTFTrackViews'), @@ -518,9 +518,9 @@ TriggerHLTListRun3 = [ ('xAOD::CaloClusterTrigAuxContainer#HLT_TopoCaloClustersLCAux.nCells' ,'BS ESD AODFULL', 'Tau'), # tau tracks - ('xAOD::TauTrackContainer#HLT_tautrack_MVA', 'BS ESD AODFULL AODSLIM AODVERYSLIM', 'Tau', 'inViews:TAUMVAViews,TAUEFViews'), + ('xAOD::TauTrackContainer#HLT_tautrack_MVA', 'BS ESD AODFULL AODSLIM AODVERYSLIM', 'Tau', 'inViews:TAUMVAViews'), ('xAOD::TauTrackAuxContainer#HLT_tautrack_MVAAux.', 'BS ESD AODFULL AODSLIM AODVERYSLIM', 'Tau'), - ('xAOD::TauTrackContainer#HLT_tautrack_Precision', 'BS ESD AODFULL AODSLIM AODVERYSLIM', 'Tau', 'inViews:TAUFTFIdViews,TAUFTFTrackViews'), + ('xAOD::TauTrackContainer#HLT_tautrack_Precision', 'BS ESD AODFULL AODSLIM AODVERYSLIM', 'Tau', 'inViews:TAUFTFIdViews,TAUFTFTrackViews,TAUEFViews'), ('xAOD::TauTrackAuxContainer#HLT_tautrack_PrecisionAux.', 'BS ESD AODFULL AODSLIM AODVERYSLIM', 'Tau'), ('xAOD::TauTrackContainer#HLT_tautrack_Presel', 'BS ESD AODFULL AODSLIM AODVERYSLIM', 'Tau', 'inViews:TAUFTFTrackViews'), ('xAOD::TauTrackAuxContainer#HLT_tautrack_PreselAux.', 'BS ESD AODFULL AODSLIM AODVERYSLIM', 'Tau'), diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py index 3c45b0687c189b8eb9887089826d50d0c74d5c4e..20e2ce80a08c6be742e92a48f715d33f5ce399db 100644 --- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py +++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py @@ -520,19 +520,10 @@ def setupMenu(): ChainProp(name="HLT_tau25_perf_tracktwoEF_L1TAU12IM", groups=SingleTauGroup), ChainProp(name="HLT_tau25_perf_tracktwoMVA_L1TAU12IM", groups=SingleTauGroup), ChainProp(name="HLT_tau25_perf_tracktwoMVABDT_L1TAU12IM", groups=SingleTauGroup), - ChainProp(name="HLT_tau25_looseRNN_track_L1TAU12IM", groups=SingleTauGroup), - ChainProp(name="HLT_tau25_looseRNN_tracktwo_L1TAU12IM", groups=SingleTauGroup), - ChainProp(name="HLT_tau25_looseRNN_tracktwoEF_L1TAU12IM", groups=SingleTauGroup), ChainProp(name="HLT_tau25_looseRNN_tracktwoMVA_L1TAU12IM", groups=SingleTauGroup), ChainProp(name="HLT_tau25_looseRNN_tracktwoMVABDT_L1TAU12IM", groups=SingleTauGroup), - ChainProp(name="HLT_tau25_mediumRNN_track_L1TAU12IM", groups=SingleTauGroup), - ChainProp(name="HLT_tau25_mediumRNN_tracktwo_L1TAU12IM", groups=SingleTauGroup), - ChainProp(name="HLT_tau25_mediumRNN_tracktwoEF_L1TAU12IM", groups=SingleTauGroup), ChainProp(name="HLT_tau25_mediumRNN_tracktwoMVA_L1TAU12IM", groups=SingleTauGroup), ChainProp(name="HLT_tau25_mediumRNN_tracktwoMVABDT_L1TAU12IM", groups=SingleTauGroup), - ChainProp(name="HLT_tau25_tightRNN_track_L1TAU12IM", groups=SingleTauGroup), - ChainProp(name="HLT_tau25_tightRNN_tracktwo_L1TAU12IM", groups=SingleTauGroup), - ChainProp(name="HLT_tau25_tightRNN_tracktwoEF_L1TAU12IM", groups=SingleTauGroup), ChainProp(name="HLT_tau25_tightRNN_tracktwoMVA_L1TAU12IM", groups=SingleTauGroup), ChainProp(name="HLT_tau25_tightRNN_tracktwoMVABDT_L1TAU12IM", groups=SingleTauGroup), ChainProp(name="HLT_tau25_medium1_track_L1TAU12IM", groups=SingleTauGroup), @@ -549,19 +540,10 @@ def setupMenu(): ChainProp(name="HLT_tau35_perf_tracktwoEF_L1TAU12IM", groups=SingleTauGroup), ChainProp(name="HLT_tau35_perf_tracktwoMVA_L1TAU12IM", groups=SingleTauGroup), ChainProp(name="HLT_tau35_perf_tracktwoMVABDT_L1TAU12IM", groups=SingleTauGroup), - ChainProp(name="HLT_tau35_looseRNN_track_L1TAU12IM", groups=SingleTauGroup), - ChainProp(name="HLT_tau35_looseRNN_tracktwo_L1TAU12IM", groups=SingleTauGroup), - ChainProp(name="HLT_tau35_looseRNN_tracktwoEF_L1TAU12IM", groups=SingleTauGroup), ChainProp(name="HLT_tau35_looseRNN_tracktwoMVA_L1TAU12IM", groups=SingleTauGroup), ChainProp(name="HLT_tau35_looseRNN_tracktwoMVABDT_L1TAU12IM", groups=SingleTauGroup), - ChainProp(name="HLT_tau35_mediumRNN_track_L1TAU12IM", groups=SingleTauGroup), - ChainProp(name="HLT_tau35_mediumRNN_tracktwo_L1TAU12IM", groups=SingleTauGroup), - ChainProp(name="HLT_tau35_mediumRNN_tracktwoEF_L1TAU12IM", groups=SingleTauGroup), ChainProp(name="HLT_tau35_mediumRNN_tracktwoMVA_L1TAU12IM", groups=SingleTauGroup), ChainProp(name="HLT_tau35_mediumRNN_tracktwoMVABDT_L1TAU12IM", groups=SingleTauGroup), - ChainProp(name="HLT_tau35_tightRNN_track_L1TAU12IM", groups=SingleTauGroup), - ChainProp(name="HLT_tau35_tightRNN_tracktwo_L1TAU12IM", groups=SingleTauGroup), - ChainProp(name="HLT_tau35_tightRNN_tracktwoEF_L1TAU12IM", groups=SingleTauGroup), ChainProp(name="HLT_tau35_tightRNN_tracktwoMVA_L1TAU12IM", groups=SingleTauGroup), ChainProp(name="HLT_tau35_tightRNN_tracktwoMVABDT_L1TAU12IM", groups=SingleTauGroup), ChainProp(name="HLT_tau160_ptonly_L1TAU100", groups=SingleTauGroup), @@ -575,17 +557,11 @@ def setupMenu(): ChainProp(name="HLT_tau160_perf_tracktwoEF_L1TAU100", groups=SingleTauGroup), ChainProp(name="HLT_tau160_perf_tracktwoMVA_L1TAU100", groups=SingleTauGroup), ChainProp(name="HLT_tau160_perf_tracktwoMVABDT_L1TAU100", groups=SingleTauGroup), - ChainProp(name="HLT_tau160_mediumRNN_track_L1TAU100", groups=SingleTauGroup), - ChainProp(name="HLT_tau160_mediumRNN_tracktwo_L1TAU100", groups=SingleTauGroup), - ChainProp(name="HLT_tau160_mediumRNN_tracktwoEF_L1TAU100", groups=SingleTauGroup), ChainProp(name="HLT_tau160_mediumRNN_tracktwoMVABDT_L1TAU100", groups=SingleTauGroup), ChainProp(name="HLT_tau160_medium1_track_L1TAU100", groups=SingleTauGroup), ChainProp(name="HLT_tau160_medium1_tracktwo_L1TAU100", groups=SingleTauGroup), ChainProp(name="HLT_tau160_medium1_tracktwoEF_L1TAU100", groups=SingleTauGroup), ChainProp(name="HLT_tau200_ptonly_L1TAU100", groups=SingleTauGroup), - ChainProp(name="HLT_tau200_mediumRNN_track_L1TAU100", groups=SingleTauGroup), - ChainProp(name="HLT_tau200_mediumRNN_tracktwo_L1TAU100", groups=SingleTauGroup), - ChainProp(name="HLT_tau200_mediumRNN_tracktwoEF_L1TAU100", groups=SingleTauGroup), ChainProp(name="HLT_tau200_mediumRNN_tracktwoMVA_L1TAU100", groups=PrimaryLegGroup+SingleTauGroup), ChainProp(name="HLT_tau200_mediumRNN_tracktwoMVABDT_L1TAU100", groups=SingleTauGroup), ChainProp(name="HLT_tau200_medium1_track_L1TAU100", groups=SingleTauGroup), diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Tau/TauRecoSequences.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Tau/TauRecoSequences.py index 8a088f6653cf72a014522eaeacde49457edb585d..fa06e9188cb3cc24d3f8d588b011b9fdd4fd1b65 100644 --- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Tau/TauRecoSequences.py +++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Tau/TauRecoSequences.py @@ -130,6 +130,10 @@ def _algoTauPrecision(inputRoIs, tracks, step): elif "Track" in step: algo.Key_trigTauTrackInputContainer = "HLT_tautrack_Presel" algo.Key_trigTauJetInputContainer = "HLT_TrigTauRecMerged_Presel" + elif "EF" in step: + algo.Key_trigTauTrackInputContainer = "HLT_tautrack_dummy" + algo.Key_trigTauJetInputContainer = "HLT_TrigTauRecMerged_CaloOnly" + algo.Key_trigTauJetOutputContainer = recordable("HLT_TrigTauRecMerged_Precision") algo.Key_trigTauTrackOutputContainer = recordable("HLT_tautrack_Precision") return algo @@ -137,8 +141,6 @@ def _algoTauPrecision(inputRoIs, tracks, step): def _algoTauPrecisionMVA(inputRoIs, tracks, step): from TrigTauRec.TrigTauRecConfigMT import TrigTauRecMerged_TauPrecisionMVA algo = TrigTauRecMerged_TauPrecisionMVA(name= "TrigTauRecMerged_TauPrecisionMVA", doMVATES=True, doTrackBDT=False, doRNN=True) - if "EF" in step: - algo = TrigTauRecMerged_TauPrecisionMVA(name= "TrigTauRecMerged_TauPrecision"+step, doMVATES=False, doTrackBDT=False, doRNN=True) algo.RoIInputKey = inputRoIs algo.L1RoIKey = "HLT_TAURoI" algo.clustersKey = "" @@ -283,10 +285,10 @@ def tauIdSequence( RoIs, name): tauPrecisionAlg = _algoTauPrecision(inputRoIs = RoIs, tracks = IDTrigConfig.PT.tracksPT(), step = "TrackTwo") ViewVerifyId.DataObjects += [( 'xAOD::TauTrackContainer' , 'StoreGateSvc+HLT_tautrack_Presel'), ( 'xAOD::TauJetContainer' , 'StoreGateSvc+HLT_TrigTauRecMerged_Presel' )] + elif "EF" in name: + tauPrecisionAlg = _algoTauPrecision(inputRoIs = RoIs, tracks = IDTrigConfig.PT.tracksPT(), step = "EF") elif "MVA" in name: tauPrecisionAlg = _algoTauPrecisionMVA(inputRoIs = RoIs, tracks = IDTrigConfig.PT.tracksPT(), step = "PrecisionMVA") - elif "EF" in name: - tauPrecisionAlg = _algoTauPrecisionMVA(inputRoIs = RoIs, tracks = IDTrigConfig.PT.tracksPT(), step = "EF") tauIdSequence += tauPrecisionAlg