diff --git a/Trigger/TrigHypothesis/TrigTauHypo/python/TrigTauHypoTool.py b/Trigger/TrigHypothesis/TrigTauHypo/python/TrigTauHypoTool.py index e5bc35b4d81861901d99ba2cfd08d6f1c1f0ac1c..e32cabb329461ff314bcf9b535003045bb9b6ca6 100644 --- a/Trigger/TrigHypothesis/TrigTauHypo/python/TrigTauHypoTool.py +++ b/Trigger/TrigHypothesis/TrigTauHypo/python/TrigTauHypoTool.py @@ -110,11 +110,11 @@ thresholdsEF = { ('tightRNN', 125): TauCuts(3, 125000.0, 3), ('tightRNN', 160): TauCuts(3, 160000.0, 3), ('tightRNN', 200): TauCuts(3, 200000.0, 3), - ('perf',0) : TauCuts(3,0.,2), - ('perf',25) : TauCuts(3,25000.,2), - ('perf',35) : TauCuts(3,35000.,2), - ('perf',160) : TauCuts(3,160000.,2), - ('perf',200) : TauCuts(3,200000.,2), + ('perf',0) : TauCuts(3,0.,-1111), + ('perf',25) : TauCuts(3,25000.,-1111), + ('perf',35) : TauCuts(3,35000.,-1111), + ('perf',160) : TauCuts(3,160000.,-1111), + ('perf',200) : TauCuts(3,200000.,-1111), ('idperf',0) : TauCuts(3,0.,2), ('idperf',25) : TauCuts(3,25000.,2), ('idperf',35) : TauCuts(3,35000.,2), @@ -145,8 +145,10 @@ def TrigEFTauMVHypoToolFromDict( chainDict ): currentHypo.numTrackMin = 0 currentHypo.highptidthr = 280000. currentHypo.method = 3 - elif 'perf' in criteria: + elif 'idperf' in criteria: currentHypo.AcceptAll = True + elif 'perf' in criteria: + currentHypo.method = 0 return currentHypo @@ -205,7 +207,7 @@ def TrigL2TauHypoToolFromDict( chainDict ): currentHypo.Details = [int(-1)] currentHypo.Formulas = ['y > '+threshold+'*1000.0'] - if 'perf' in criteria: + if 'idperf' in criteria: currentHypo.AcceptAll = True return currentHypo diff --git a/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref b/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref index dab3641c303600ffad35c9106ccdec546a6a17ad..a2f3b02ea3aa722dcaae69b7a8c7c389cbbba707 100644 --- a/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref +++ b/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref @@ -2929,7 +2929,7 @@ HLT_tau0_perf_ptonly_L1TAU12: 0: 42 1: 24 2: 24 - 3: 24 + 3: 22 HLT_tau0_perf_ptonly_L1TAU60: eventCount: 3 stepCounts: @@ -3199,63 +3199,63 @@ HLT_tau25_mediumRNN_tracktwo_L1TAU12IM: 1: 14 2: 14 HLT_tau25_perf_track_L1TAU12IM: - eventCount: 11 + eventCount: 4 stepCounts: - 0: 14 - 1: 11 - 2: 11 - 3: 11 - 4: 11 + 0: 12 + 1: 9 + 2: 9 + 3: 9 + 4: 4 stepFeatures: - 0: 24 - 1: 15 - 2: 15 - 3: 15 - 4: 15 -HLT_tau25_perf_tracktwoMVABDT_L1TAU12IM: - eventCount: 12 - stepCounts: - 0: 14 - 1: 12 + 0: 22 + 1: 13 2: 12 3: 12 - 4: 12 + 4: 4 +HLT_tau25_perf_tracktwoMVABDT_L1TAU12IM: + eventCount: 10 + stepCounts: + 0: 12 + 1: 10 + 2: 10 + 3: 10 + 4: 10 stepFeatures: - 0: 24 - 1: 16 - 2: 16 - 3: 16 - 4: 16 + 0: 22 + 1: 14 + 2: 14 + 3: 14 + 4: 14 HLT_tau25_perf_tracktwoMVA_L1TAU12IM: - eventCount: 12 + eventCount: 10 stepCounts: - 0: 14 - 1: 12 - 2: 12 - 3: 12 - 4: 12 + 0: 12 + 1: 10 + 2: 10 + 3: 10 + 4: 10 stepFeatures: - 0: 24 - 1: 16 - 2: 16 - 3: 16 - 4: 16 + 0: 22 + 1: 14 + 2: 14 + 3: 14 + 4: 14 HLT_tau25_perf_tracktwo_L1TAU12IM: - eventCount: 12 + eventCount: 6 stepCounts: - 0: 14 - 1: 12 - 2: 12 - 3: 12 - 4: 12 - 5: 12 + 0: 12 + 1: 10 + 2: 10 + 3: 10 + 4: 10 + 5: 6 stepFeatures: - 0: 24 - 1: 16 - 2: 16 - 3: 16 - 4: 16 - 5: 16 + 0: 22 + 1: 14 + 2: 14 + 3: 14 + 4: 14 + 5: 6 HLT_tau25_tightRNN_track_L1TAU12IM: eventCount: 0 stepCounts: @@ -3479,63 +3479,63 @@ HLT_tau35_mediumRNN_tracktwo_L1TAU12IM: 1: 12 2: 12 HLT_tau35_perf_track_L1TAU12IM: - eventCount: 11 + eventCount: 3 stepCounts: - 0: 14 - 1: 11 - 2: 11 - 3: 11 - 4: 11 + 0: 11 + 1: 8 + 2: 8 + 3: 8 + 4: 3 stepFeatures: - 0: 24 - 1: 15 - 2: 15 - 3: 15 - 4: 15 + 0: 19 + 1: 11 + 2: 10 + 3: 10 + 4: 3 HLT_tau35_perf_tracktwoMVABDT_L1TAU12IM: - eventCount: 12 + eventCount: 9 stepCounts: - 0: 14 - 1: 12 - 2: 12 - 3: 12 - 4: 12 + 0: 11 + 1: 9 + 2: 9 + 3: 9 + 4: 9 stepFeatures: - 0: 24 - 1: 16 - 2: 16 - 3: 16 - 4: 16 + 0: 20 + 1: 13 + 2: 13 + 3: 13 + 4: 13 HLT_tau35_perf_tracktwoMVA_L1TAU12IM: - eventCount: 12 + eventCount: 9 stepCounts: - 0: 14 - 1: 12 - 2: 12 - 3: 12 - 4: 12 + 0: 11 + 1: 9 + 2: 9 + 3: 9 + 4: 9 stepFeatures: - 0: 24 - 1: 16 - 2: 16 - 3: 16 - 4: 16 + 0: 20 + 1: 13 + 2: 13 + 3: 13 + 4: 13 HLT_tau35_perf_tracktwo_L1TAU12IM: - eventCount: 12 + eventCount: 5 stepCounts: - 0: 14 + 0: 11 + 1: 9 + 2: 9 + 3: 9 + 4: 9 + 5: 5 + stepFeatures: + 0: 19 1: 12 2: 12 3: 12 4: 12 - 5: 12 - stepFeatures: - 0: 24 - 1: 16 - 2: 16 - 3: 16 - 4: 16 - 5: 16 + 5: 5 HLT_tau35_tightRNN_track_L1TAU12IM: 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 6ad6e9f21ff56d6484acf52e6b12444106d83a15..158cb4f61abac9d4cb6c54814f6d37d944fc04aa 100644 --- a/Trigger/TrigValidation/TriggerTest/share/ref_data_v1Dev_build.ref +++ b/Trigger/TrigValidation/TriggerTest/share/ref_data_v1Dev_build.ref @@ -1533,17 +1533,17 @@ HLT_sct_noise_SCTPEB_L1RD0_EMPTY: stepFeatures: 0: 20 HLT_tau0_perf_ptonly_L1TAU12: - eventCount: 4 + eventCount: 3 stepCounts: 0: 4 1: 4 2: 4 - 3: 4 + 3: 3 stepFeatures: 0: 5 1: 4 2: 4 - 3: 4 + 3: 3 HLT_tau0_perf_ptonly_L1TAU60: eventCount: 0 HLT_tau160_idperf_ptonly_L1TAU100: @@ -1803,63 +1803,63 @@ HLT_tau25_mediumRNN_tracktwo_L1TAU12IM: 1: 3 2: 3 HLT_tau25_perf_track_L1TAU12IM: - eventCount: 3 + eventCount: 1 stepCounts: 0: 3 1: 3 - 2: 3 - 3: 3 - 4: 3 + 2: 2 + 3: 2 + 4: 1 stepFeatures: 0: 4 1: 3 - 2: 3 - 3: 3 - 4: 3 + 2: 2 + 3: 2 + 4: 1 HLT_tau25_perf_tracktwoMVABDT_L1TAU12IM: - eventCount: 3 + eventCount: 2 stepCounts: 0: 3 1: 3 2: 3 3: 3 - 4: 3 + 4: 2 stepFeatures: 0: 4 1: 3 2: 3 3: 3 - 4: 3 + 4: 2 HLT_tau25_perf_tracktwoMVA_L1TAU12IM: - eventCount: 3 + eventCount: 2 stepCounts: 0: 3 1: 3 2: 3 3: 3 - 4: 3 + 4: 2 stepFeatures: 0: 4 1: 3 2: 3 3: 3 - 4: 3 + 4: 2 HLT_tau25_perf_tracktwo_L1TAU12IM: - eventCount: 3 + eventCount: 1 stepCounts: 0: 3 1: 3 2: 3 - 3: 3 - 4: 3 - 5: 3 + 3: 2 + 4: 2 + 5: 1 stepFeatures: 0: 4 1: 3 2: 3 - 3: 3 - 4: 3 - 5: 3 + 3: 2 + 4: 2 + 5: 1 HLT_tau25_tightRNN_track_L1TAU12IM: eventCount: 0 stepCounts: @@ -2075,63 +2075,63 @@ HLT_tau35_mediumRNN_tracktwo_L1TAU12IM: 1: 3 2: 3 HLT_tau35_perf_track_L1TAU12IM: - eventCount: 3 + eventCount: 1 stepCounts: 0: 3 1: 3 - 2: 3 - 3: 3 - 4: 3 + 2: 2 + 3: 2 + 4: 1 stepFeatures: 0: 4 1: 3 - 2: 3 - 3: 3 - 4: 3 + 2: 2 + 3: 2 + 4: 1 HLT_tau35_perf_tracktwoMVABDT_L1TAU12IM: - eventCount: 3 + eventCount: 2 stepCounts: 0: 3 1: 3 2: 3 3: 3 - 4: 3 + 4: 2 stepFeatures: 0: 4 1: 3 2: 3 3: 3 - 4: 3 + 4: 2 HLT_tau35_perf_tracktwoMVA_L1TAU12IM: - eventCount: 3 + eventCount: 2 stepCounts: 0: 3 1: 3 2: 3 3: 3 - 4: 3 + 4: 2 stepFeatures: 0: 4 1: 3 2: 3 3: 3 - 4: 3 + 4: 2 HLT_tau35_perf_tracktwo_L1TAU12IM: - eventCount: 3 + eventCount: 1 stepCounts: 0: 3 1: 3 2: 3 - 3: 3 - 4: 3 - 5: 3 + 3: 2 + 4: 2 + 5: 1 stepFeatures: 0: 4 1: 3 2: 3 - 3: 3 - 4: 3 - 5: 3 + 3: 2 + 4: 2 + 5: 1 HLT_tau35_tightRNN_track_L1TAU12IM: eventCount: 0 stepCounts: