diff --git a/Trigger/TrigTools/TrigInDetConfig/python/TrigTrackingPassFlags.py b/Trigger/TrigTools/TrigInDetConfig/python/TrigTrackingPassFlags.py
index 75ef6b43d580a6e38580edb64e663054d79378b0..b9e11987d9957e5eacd08b1aa233432bd4e4dd5d 100644
--- a/Trigger/TrigTools/TrigInDetConfig/python/TrigTrackingPassFlags.py
+++ b/Trigger/TrigTools/TrigInDetConfig/python/TrigTrackingPassFlags.py
@@ -176,7 +176,7 @@ def createTrigTrackingPassFlags(mode="InDet"):
 
   flags.addFlag(f'{category}.doGPU', False)
   #TODO: remove when decision made
-  flags.addFlag(f'{category}.fixSeedPhi', False)
+  flags.addFlag(f'{category}.fixSeedPhi', True)
 
   return flags
 
diff --git a/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref b/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref
index c04f5a1be6c70b0fc59180000be5ba1ae54cbb7a..2f008d31413e9ec89d7cbf23702b8588fc6ac521 100644
--- a/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref
+++ b/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref
@@ -103,12 +103,10 @@ HLT_2e5_lhmedium_j70_j50a_j0_DJMASS900j50_L1MJJ-500-NFF:
   stepCounts:
     0: 1
     1: 1
-    2: 1
   stepFeatures:
     0: 2
     1: 2
-    2: 3
-    3: 1
+    2: 1
 HLT_2e5_lhmedium_j70_j50a_j0_DJMASS900j50_L1jMJJ-500-NFF:
   eventCount: 0
   stepCounts:
@@ -118,75 +116,75 @@ HLT_2e5_lhmedium_j70_j50a_j0_DJMASS900j50_L1jMJJ-500-NFF:
   stepFeatures:
     0: 3
     1: 2
-    2: 5
+    2: 3
     3: 1
 HLT_2e5_lhvloose_bBeeM6000_L14J15:
   eventCount: 0
   stepCounts:
     0: 9
     1: 9
-    2: 9
-    3: 3
-    4: 3
-    5: 3
+    2: 7
+    3: 2
+    4: 2
+    5: 2
   stepFeatures:
     0: 31
     1: 27
-    2: 48
-    3: 12
-    4: 7
-    5: 7
+    2: 41
+    3: 9
+    4: 5
+    5: 5
     6: 3
 HLT_2e5_lhvloose_bBeeM6000_L1All:
   eventCount: 0
   stepCounts:
     0: 10
     1: 10
-    2: 10
-    3: 3
-    4: 3
-    5: 3
+    2: 8
+    3: 2
+    4: 2
+    5: 2
   stepFeatures:
     0: 35
     1: 29
-    2: 53
-    3: 13
-    4: 7
-    5: 7
+    2: 45
+    3: 10
+    4: 5
+    5: 5
     6: 3
 HLT_2e5_lhvloose_bBeeM6000_L1BKeePrescaled:
   eventCount: 0
   stepCounts:
     0: 9
     1: 9
-    2: 9
-    3: 3
-    4: 3
-    5: 3
+    2: 7
+    3: 2
+    4: 2
+    5: 2
   stepFeatures:
     0: 33
     1: 27
-    2: 48
-    3: 12
-    4: 7
-    5: 7
+    2: 41
+    3: 9
+    4: 5
+    5: 5
     6: 3
 HLT_2e5_lhvloose_bBeeM6000_L1BKeePrimary:
   eventCount: 0
   stepCounts:
     0: 10
     1: 10
-    2: 10
-    3: 3
-    4: 3
-    5: 3
+    2: 8
+    3: 2
+    4: 2
+    5: 2
   stepFeatures:
     0: 35
     1: 29
-    2: 53
-    3: 13
-    4: 7
-    5: 7
+    2: 45
+    3: 10
+    4: 5
+    5: 5
     6: 3
 HLT_2e5_lhvloose_bBeeM6000_L1BPH-0M9-EM7-EM5_MU5VF:
   eventCount: 0
@@ -199,7 +197,7 @@ HLT_2e5_lhvloose_bBeeM6000_L1eEM26M:
   stepFeatures:
     0: 6
     1: 4
-    2: 10
+    2: 6
     3: 2
 HLT_2g10_loose_L1eEM9_mu20_L1MU14FCH:
   eventCount: 0
@@ -3209,17 +3207,17 @@ HLT_e100_lhvloose_L1eEM26M:
 HLT_e100_lhvloose_L1eEM28M:
   eventCount: 0
 HLT_e10_etcut_L1eEM9:
-  eventCount: 19
+  eventCount: 18
   stepCounts:
     0: 20
     1: 20
-    2: 20
-    3: 19
+    2: 19
+    3: 18
   stepFeatures:
     0: 79
     1: 79
-    2: 357
-    3: 69
+    2: 337
+    3: 68
 HLT_e10_lhmedium_ivarloose_j70_j50a_j0_DJMASS900j50_L1MJJ-500-NFF:
   eventCount: 0
 HLT_e10_lhmedium_ivarloose_j70_j50a_j0_DJMASS900j50_L1jMJJ-500-NFF:
@@ -3237,7 +3235,7 @@ HLT_e10_lhvloose_L1eEM9:
   stepFeatures:
     0: 12
     1: 12
-    2: 28
+    2: 26
     3: 8
     4: 8
     5: 8
@@ -3322,7 +3320,7 @@ HLT_e14_lhtight_e4_etcut_1invmAB5_L1JPSI-1M5-eEM15:
   stepFeatures:
     0: 57
     1: 19
-    2: 86
+    2: 84
     3: 22
     4: 2
     5: 2
@@ -3400,7 +3398,7 @@ HLT_e14_lhvloose_L1EM10VH:
   stepFeatures:
     0: 7
     1: 7
-    2: 14
+    2: 15
     3: 6
     4: 6
     5: 6
@@ -3418,23 +3416,23 @@ HLT_e14_lhvloose_L1eEM12L:
   stepFeatures:
     0: 5
     1: 5
-    2: 12
+    2: 13
     3: 5
     4: 5
     5: 5
     6: 4
 HLT_e15_etcut_L1eEM9:
-  eventCount: 18
+  eventCount: 17
   stepCounts:
     0: 19
     1: 19
-    2: 19
-    3: 18
+    2: 18
+    3: 17
   stepFeatures:
     0: 67
     1: 67
-    2: 315
-    3: 45
+    2: 300
+    3: 44
 HLT_e17_lhloose_mu14_L1eEM18L_MU8F:
   eventCount: 1
   stepCounts:
@@ -3495,7 +3493,7 @@ HLT_e20_etcut_L1eEM18M:
   stepFeatures:
     0: 4
     1: 4
-    2: 14
+    2: 15
     3: 4
 HLT_e20_idperf_loose_lrtloose_L1eEM18L:
   eventCount: 3
@@ -3524,7 +3522,7 @@ HLT_e20_lhtight_ivarloose_L12eEM9:
   stepFeatures:
     0: 4
     1: 4
-    2: 8
+    2: 9
     3: 4
     4: 4
     5: 4
@@ -3544,7 +3542,7 @@ HLT_e20_lhvloose_L1eEM18L:
   stepFeatures:
     0: 3
     1: 3
-    2: 6
+    2: 7
     3: 3
     4: 3
     5: 3
@@ -3565,7 +3563,7 @@ HLT_e24_lhmedium_ivarloose_tau20_mediumRNN_tracktwoMVA_03dRAB_L1eEM26M:
   stepFeatures:
     0: 20
     1: 17
-    2: 20
+    2: 21
     3: 17
     4: 5
     5: 1
@@ -3579,7 +3577,7 @@ HLT_e24_lhmedium_ivarloose_tau20_mediumRNN_tracktwoMVA_03dRAB_L1eEM28M:
   stepFeatures:
     0: 14
     1: 11
-    2: 14
+    2: 15
     3: 11
     4: 2
 HLT_e24_lhtight_ivarloose_L1eEM26M:
@@ -3595,7 +3593,7 @@ HLT_e24_lhtight_ivarloose_L1eEM26M:
   stepFeatures:
     0: 3
     1: 3
-    2: 6
+    2: 7
     3: 3
     4: 3
     5: 3
@@ -3616,7 +3614,7 @@ HLT_e25_etcut_L1eEM18M:
   stepFeatures:
     0: 4
     1: 4
-    2: 14
+    2: 15
     3: 4
 HLT_e25_mergedtight_g35_medium_90invmAB_02dRAB_L12eEM24L:
   eventCount: 0
@@ -3633,7 +3631,7 @@ HLT_e26_dnntight_ivarloose_L1eEM26M:
   stepFeatures:
     0: 3
     1: 3
-    2: 6
+    2: 7
     3: 3
     4: 3
     5: 3
@@ -3648,7 +3646,7 @@ HLT_e26_etcut_L1eEM26M:
   stepFeatures:
     0: 4
     1: 4
-    2: 14
+    2: 15
     3: 4
 HLT_e26_idperf_loose_L1eEM26M:
   eventCount: 3
@@ -3703,7 +3701,7 @@ HLT_e26_lhmedium_mu8noL1_L1eEM26M:
   stepFeatures:
     0: 3
     1: 3
-    2: 6
+    2: 7
     3: 3
     4: 3
     5: 3
@@ -3721,7 +3719,7 @@ HLT_e26_lhtight_L1eEM26:
   stepFeatures:
     0: 4
     1: 4
-    2: 8
+    2: 9
     3: 4
     4: 4
     5: 4
@@ -3739,7 +3737,7 @@ HLT_e26_lhtight_L1eEM26L:
   stepFeatures:
     0: 3
     1: 3
-    2: 6
+    2: 7
     3: 3
     4: 3
     5: 3
@@ -3757,7 +3755,7 @@ HLT_e26_lhtight_L1eEM26M:
   stepFeatures:
     0: 3
     1: 3
-    2: 6
+    2: 7
     3: 3
     4: 3
     5: 3
@@ -3775,7 +3773,7 @@ HLT_e26_lhtight_L1eEM26T:
   stepFeatures:
     0: 2
     1: 2
-    2: 5
+    2: 6
     3: 2
     4: 2
     5: 2
@@ -3792,7 +3790,7 @@ HLT_e26_lhtight_e14_etcut_L1eEM26M:
   stepFeatures:
     0: 15
     1: 13
-    2: 60
+    2: 59
     3: 8
     4: 1
     5: 1
@@ -3812,7 +3810,7 @@ HLT_e26_lhtight_e14_etcut_probe_50invmAB130_L1eEM26M:
   stepFeatures:
     0: 3
     1: 3
-    2: 6
+    2: 7
     3: 3
     4: 3
     5: 3
@@ -3834,7 +3832,7 @@ HLT_e26_lhtight_e14_idperf_tight_nogsf_probe_50invmAB130_L1eEM26M:
   stepFeatures:
     0: 3
     1: 3
-    2: 6
+    2: 7
     3: 3
     4: 3
     5: 3
@@ -3853,7 +3851,7 @@ HLT_e26_lhtight_e14_idperf_tight_probe_50invmAB130_L1eEM26M:
   stepFeatures:
     0: 3
     1: 3
-    2: 6
+    2: 7
     3: 3
     4: 3
     5: 3
@@ -3875,7 +3873,7 @@ HLT_e26_lhtight_ivarloose_2j20_0eta290_020jvt_boffperf_pf_ftf_L1eEM26M:
   stepFeatures:
     0: 3
     1: 3
-    2: 6
+    2: 7
     3: 3
     4: 3
     5: 3
@@ -3898,7 +3896,7 @@ HLT_e26_lhtight_ivarloose_2j20_roiftf_preselj20_L1eEM26M:
   stepFeatures:
     0: 3
     1: 3
-    2: 6
+    2: 7
     3: 3
     4: 3
     5: 3
@@ -3918,7 +3916,7 @@ HLT_e26_lhtight_ivarloose_L1eEM26:
   stepFeatures:
     0: 4
     1: 4
-    2: 8
+    2: 9
     3: 4
     4: 4
     5: 4
@@ -3936,7 +3934,7 @@ HLT_e26_lhtight_ivarloose_L1eEM26L:
   stepFeatures:
     0: 3
     1: 3
-    2: 6
+    2: 7
     3: 3
     4: 3
     5: 3
@@ -3954,7 +3952,7 @@ HLT_e26_lhtight_ivarloose_L1eEM26M:
   stepFeatures:
     0: 3
     1: 3
-    2: 6
+    2: 7
     3: 3
     4: 3
     5: 3
@@ -3972,7 +3970,7 @@ HLT_e26_lhtight_ivarloose_L1eEM26T:
   stepFeatures:
     0: 2
     1: 2
-    2: 5
+    2: 6
     3: 2
     4: 2
     5: 2
@@ -3990,7 +3988,7 @@ HLT_e26_lhtight_ivarloose_e12_lhloose_probe_L1eEM26M:
   stepFeatures:
     0: 3
     1: 3
-    2: 6
+    2: 7
     3: 3
     4: 3
     5: 3
@@ -4009,7 +4007,7 @@ HLT_e26_lhtight_ivarloose_e12_lhvloose_probe_L1eEM26M:
   stepFeatures:
     0: 3
     1: 3
-    2: 6
+    2: 7
     3: 3
     4: 3
     5: 3
@@ -4031,7 +4029,7 @@ HLT_e26_lhtight_ivarloose_e14_etcut_probe_L1eEM26M:
   stepFeatures:
     0: 3
     1: 3
-    2: 6
+    2: 7
     3: 3
     4: 3
     5: 3
@@ -4053,7 +4051,7 @@ HLT_e26_lhtight_ivarloose_e14_idperf_tight_probe_L1eEM26M:
   stepFeatures:
     0: 3
     1: 3
-    2: 6
+    2: 7
     3: 3
     4: 3
     5: 3
@@ -4072,7 +4070,7 @@ HLT_e26_lhtight_ivarloose_e14_lhtight_probe_L1eEM26M:
   stepFeatures:
     0: 3
     1: 3
-    2: 6
+    2: 7
     3: 3
     4: 3
     5: 3
@@ -4091,7 +4089,7 @@ HLT_e26_lhtight_ivarloose_e15_idperf_tight_probe_L1eEM26M:
   stepFeatures:
     0: 3
     1: 3
-    2: 6
+    2: 7
     3: 3
     4: 3
     5: 3
@@ -4110,7 +4108,7 @@ HLT_e26_lhtight_ivarloose_e17_lhloose_probe_L1eEM26M:
   stepFeatures:
     0: 3
     1: 3
-    2: 6
+    2: 7
     3: 3
     4: 3
     5: 3
@@ -4129,7 +4127,7 @@ HLT_e26_lhtight_ivarloose_e17_lhmedium_probe_L1eEM26M:
   stepFeatures:
     0: 3
     1: 3
-    2: 6
+    2: 7
     3: 3
     4: 3
     5: 3
@@ -4148,7 +4146,7 @@ HLT_e26_lhtight_ivarloose_e17_lhvloose_probe_L1eEM26M:
   stepFeatures:
     0: 3
     1: 3
-    2: 6
+    2: 7
     3: 3
     4: 3
     5: 3
@@ -4167,7 +4165,7 @@ HLT_e26_lhtight_ivarloose_e20_lhtight_ivarloose_probe_L1eEM26M:
   stepFeatures:
     0: 3
     1: 3
-    2: 6
+    2: 7
     3: 3
     4: 3
     5: 3
@@ -4186,7 +4184,7 @@ HLT_e26_lhtight_ivarloose_e24_lhvloose_probe_L1eEM26M:
   stepFeatures:
     0: 3
     1: 3
-    2: 6
+    2: 7
     3: 3
     4: 3
     5: 3
@@ -4205,7 +4203,7 @@ HLT_e26_lhtight_ivarloose_e26_lhmedium_probe_L1eEM26M:
   stepFeatures:
     0: 3
     1: 3
-    2: 6
+    2: 7
     3: 3
     4: 3
     5: 3
@@ -4224,7 +4222,7 @@ HLT_e26_lhtight_ivarloose_e26_lhtight_probe_L1eEM26M:
   stepFeatures:
     0: 3
     1: 3
-    2: 6
+    2: 7
     3: 3
     4: 3
     5: 3
@@ -4243,7 +4241,7 @@ HLT_e26_lhtight_ivarloose_e30_lhloose_nopix_lrtmedium_probe_L1eEM26M:
   stepFeatures:
     0: 3
     1: 3
-    2: 6
+    2: 7
     3: 3
     4: 3
     5: 3
@@ -4262,7 +4260,7 @@ HLT_e26_lhtight_ivarloose_e30_lhloose_nopix_probe_L1eEM26M:
   stepFeatures:
     0: 3
     1: 3
-    2: 6
+    2: 7
     3: 3
     4: 3
     5: 3
@@ -4285,14 +4283,14 @@ HLT_e26_lhtight_ivarloose_e4_etcut_probe_L1eEM26M:
   stepFeatures:
     0: 3
     1: 3
-    2: 6
+    2: 7
     3: 3
     4: 3
     5: 3
     6: 1
     7: 10
     8: 10
-    9: 29
+    9: 25
     10: 6
 HLT_e26_lhtight_ivarloose_e5_idperf_loose_lrtloose_probe_L1eEM26M:
   eventCount: 1
@@ -4312,7 +4310,7 @@ HLT_e26_lhtight_ivarloose_e5_idperf_loose_lrtloose_probe_L1eEM26M:
   stepFeatures:
     0: 3
     1: 3
-    2: 6
+    2: 7
     3: 3
     4: 3
     5: 3
@@ -4341,14 +4339,14 @@ HLT_e26_lhtight_ivarloose_e5_lhtight_noringer_probe_L1eEM26M:
   stepFeatures:
     0: 3
     1: 3
-    2: 6
+    2: 7
     3: 3
     4: 3
     5: 3
     6: 1
     7: 5
     8: 5
-    9: 12
+    9: 10
     10: 2
     11: 2
     12: 2
@@ -4369,14 +4367,14 @@ HLT_e26_lhtight_ivarloose_e5_lhtight_probe_L1eEM26M:
   stepFeatures:
     0: 3
     1: 3
-    2: 6
+    2: 7
     3: 3
     4: 3
     5: 3
     6: 1
     7: 2
     8: 2
-    9: 5
+    9: 3
     10: 1
 HLT_e26_lhtight_ivarloose_e7_lhmedium_probe_L1eEM26M:
   eventCount: 0
@@ -4394,14 +4392,14 @@ HLT_e26_lhtight_ivarloose_e7_lhmedium_probe_L1eEM26M:
   stepFeatures:
     0: 3
     1: 3
-    2: 6
+    2: 7
     3: 3
     4: 3
     5: 3
     6: 1
     7: 2
     8: 2
-    9: 5
+    9: 3
     10: 1
 HLT_e26_lhtight_ivarloose_e9_etcut_probe_L1eEM26M:
   eventCount: 0
@@ -4419,14 +4417,14 @@ HLT_e26_lhtight_ivarloose_e9_etcut_probe_L1eEM26M:
   stepFeatures:
     0: 3
     1: 3
-    2: 6
+    2: 7
     3: 3
     4: 3
     5: 3
     6: 1
     7: 7
     8: 7
-    9: 25
+    9: 23
     10: 1
 HLT_e26_lhtight_ivarloose_e9_lhtight_probe_L1eEM26M:
   eventCount: 0
@@ -4441,7 +4439,7 @@ HLT_e26_lhtight_ivarloose_e9_lhtight_probe_L1eEM26M:
   stepFeatures:
     0: 3
     1: 3
-    2: 6
+    2: 7
     3: 3
     4: 3
     5: 3
@@ -4460,7 +4458,7 @@ HLT_e26_lhtight_ivarloose_e9_lhvloose_probe_L1eEM26M:
   stepFeatures:
     0: 3
     1: 3
-    2: 6
+    2: 7
     3: 3
     4: 3
     5: 3
@@ -4481,7 +4479,7 @@ HLT_e26_lhtight_ivarloose_j20_pf_ftf_L1eEM26M:
   stepFeatures:
     0: 3
     1: 3
-    2: 6
+    2: 7
     3: 3
     4: 3
     5: 3
@@ -4504,7 +4502,7 @@ HLT_e26_lhtight_ivarloose_mu22noL1_2j20_0eta290_020jvt_bdl1d85_pf_ftf_L1eEM26M:
   stepFeatures:
     0: 3
     1: 3
-    2: 6
+    2: 7
     3: 3
     4: 3
     5: 3
@@ -4528,7 +4526,7 @@ HLT_e26_lhtight_ivarloose_mu22noL1_2j20_0eta290_020jvt_bgn185_pf_ftf_L1eEM26M:
   stepFeatures:
     0: 3
     1: 3
-    2: 6
+    2: 7
     3: 3
     4: 3
     5: 3
@@ -4552,7 +4550,7 @@ HLT_e26_lhtight_ivarloose_mu22noL1_j20_0eta290_020jvt_boffperf_pf_ftf_L1eEM26M:
   stepFeatures:
     0: 3
     1: 3
-    2: 6
+    2: 7
     3: 3
     4: 3
     5: 3
@@ -4575,7 +4573,7 @@ HLT_e26_lhtight_ivarloose_mu22noL1_j20_roiftf_preselj20_L1eEM26M:
   stepFeatures:
     0: 3
     1: 3
-    2: 6
+    2: 7
     3: 3
     4: 3
     5: 3
@@ -4594,7 +4592,7 @@ HLT_e26_lhtight_ivarloose_nogsf_L1eEM26M:
   stepFeatures:
     0: 3
     1: 3
-    2: 6
+    2: 7
     3: 3
     4: 3
     5: 1
@@ -4611,7 +4609,7 @@ HLT_e26_lhtight_ivarloose_noringer_L1eEM26M:
   stepFeatures:
     0: 3
     1: 3
-    2: 6
+    2: 7
     3: 3
     4: 3
     5: 3
@@ -4649,7 +4647,7 @@ HLT_e26_lhtight_ivarloose_tau20_mediumRNN_tracktwoMVA_probe_L1TAU12IM_03dRAB_L1e
   stepFeatures:
     0: 3
     1: 3
-    2: 6
+    2: 7
     3: 3
     4: 3
     5: 3
@@ -4675,7 +4673,7 @@ HLT_e26_lhtight_ivarloose_tau20_mediumRNN_tracktwoMVA_probe_L1TAU8_03dRAB_L1eEM2
   stepFeatures:
     0: 3
     1: 3
-    2: 6
+    2: 7
     3: 3
     4: 3
     5: 3
@@ -4701,7 +4699,7 @@ HLT_e26_lhtight_ivarloose_tau20_mediumRNN_tracktwoMVA_probe_L1cTAU20M_03dRAB_L1e
   stepFeatures:
     0: 3
     1: 3
-    2: 6
+    2: 7
     3: 3
     4: 3
     5: 3
@@ -4727,7 +4725,7 @@ HLT_e26_lhtight_ivarloose_tau20_mediumRNN_tracktwoMVA_probe_L1eTAU12_03dRAB_L1eE
   stepFeatures:
     0: 3
     1: 3
-    2: 6
+    2: 7
     3: 3
     4: 3
     5: 3
@@ -4753,7 +4751,7 @@ HLT_e26_lhtight_ivarloose_tau25_mediumRNN_tracktwoMVA_probe_L1TAU12IM_03dRAB_L1e
   stepFeatures:
     0: 3
     1: 3
-    2: 6
+    2: 7
     3: 3
     4: 3
     5: 3
@@ -4779,7 +4777,7 @@ HLT_e26_lhtight_ivarloose_tau25_mediumRNN_tracktwoMVA_probe_L1cTAU20M_03dRAB_L1e
   stepFeatures:
     0: 3
     1: 3
-    2: 6
+    2: 7
     3: 3
     4: 3
     5: 3
@@ -4805,7 +4803,7 @@ HLT_e26_lhtight_ivarloose_tau30_mediumRNN_tracktwoMVA_probe_L1TAU20IM_03dRAB_L1e
   stepFeatures:
     0: 3
     1: 3
-    2: 6
+    2: 7
     3: 3
     4: 3
     5: 3
@@ -4831,7 +4829,7 @@ HLT_e26_lhtight_ivarloose_tau30_mediumRNN_tracktwoMVA_probe_L1cTAU20M_03dRAB_L1e
   stepFeatures:
     0: 3
     1: 3
-    2: 6
+    2: 7
     3: 3
     4: 3
     5: 3
@@ -4857,7 +4855,7 @@ HLT_e26_lhtight_ivarloose_tau35_mediumRNN_tracktwoMVA_probe_L1TAU20IM_03dRAB_L1e
   stepFeatures:
     0: 3
     1: 3
-    2: 6
+    2: 7
     3: 3
     4: 3
     5: 3
@@ -4883,7 +4881,7 @@ HLT_e26_lhtight_ivarloose_tau35_mediumRNN_tracktwoMVA_probe_L1cTAU30M_03dRAB_L1e
   stepFeatures:
     0: 3
     1: 3
-    2: 6
+    2: 7
     3: 3
     4: 3
     5: 3
@@ -4909,7 +4907,7 @@ HLT_e26_lhtight_ivarloose_tau40_mediumRNN_tracktwoMVA_probe_L1TAU25IM_03dRAB_L1e
   stepFeatures:
     0: 3
     1: 3
-    2: 6
+    2: 7
     3: 3
     4: 3
     5: 3
@@ -4935,7 +4933,7 @@ HLT_e26_lhtight_ivarloose_tau40_mediumRNN_tracktwoMVA_probe_L1cTAU35M_03dRAB_L1e
   stepFeatures:
     0: 3
     1: 3
-    2: 6
+    2: 7
     3: 3
     4: 3
     5: 3
@@ -4961,7 +4959,7 @@ HLT_e26_lhtight_ivarloose_tau60_mediumRNN_tracktwoLLP_probe_L1TAU40_03dRAB_L1eEM
   stepFeatures:
     0: 3
     1: 3
-    2: 6
+    2: 7
     3: 3
     4: 3
     5: 3
@@ -4987,7 +4985,7 @@ HLT_e26_lhtight_ivarloose_tau60_mediumRNN_tracktwoLLP_probe_L1eTAU60_03dRAB_L1eE
   stepFeatures:
     0: 3
     1: 3
-    2: 6
+    2: 7
     3: 3
     4: 3
     5: 3
@@ -5013,7 +5011,7 @@ HLT_e26_lhtight_ivarloose_tau60_mediumRNN_tracktwoMVA_probe_L1TAU40_03dRAB_L1eEM
   stepFeatures:
     0: 3
     1: 3
-    2: 6
+    2: 7
     3: 3
     4: 3
     5: 3
@@ -5039,7 +5037,7 @@ HLT_e26_lhtight_ivarloose_tau60_mediumRNN_tracktwoMVA_probe_L1eTAU60_03dRAB_L1eE
   stepFeatures:
     0: 3
     1: 3
-    2: 6
+    2: 7
     3: 3
     4: 3
     5: 3
@@ -5165,7 +5163,7 @@ HLT_e26_lhtight_ivarmedium_L1eEM26M:
   stepFeatures:
     0: 3
     1: 3
-    2: 6
+    2: 7
     3: 3
     4: 3
     5: 3
@@ -5183,7 +5181,7 @@ HLT_e26_lhtight_ivartight_L1eEM26M:
   stepFeatures:
     0: 3
     1: 3
-    2: 6
+    2: 7
     3: 3
     4: 3
     5: 3
@@ -5200,7 +5198,7 @@ HLT_e28_dnntight_ivarloose_L1eEM28M:
   stepFeatures:
     0: 2
     1: 2
-    2: 5
+    2: 6
     3: 2
     4: 2
     5: 2
@@ -5257,7 +5255,7 @@ HLT_e28_lhmedium_mu8noL1_L1eEM28M:
   stepFeatures:
     0: 2
     1: 2
-    2: 5
+    2: 6
     3: 2
     4: 2
     5: 2
@@ -5275,7 +5273,7 @@ HLT_e28_lhtight_L1eEM26M:
   stepFeatures:
     0: 3
     1: 3
-    2: 6
+    2: 7
     3: 2
     4: 2
     5: 2
@@ -5293,7 +5291,7 @@ HLT_e28_lhtight_L1eEM28M:
   stepFeatures:
     0: 2
     1: 2
-    2: 5
+    2: 6
     3: 2
     4: 2
     5: 2
@@ -5325,7 +5323,7 @@ HLT_e28_lhtight_e14_etcut_probe_50invmAB130_L1eEM28M:
   stepFeatures:
     0: 2
     1: 2
-    2: 5
+    2: 6
     3: 2
     4: 2
     5: 2
@@ -5347,7 +5345,7 @@ HLT_e28_lhtight_e14_idperf_tight_nogsf_probe_50invmAB130_L1eEM28M:
   stepFeatures:
     0: 2
     1: 2
-    2: 5
+    2: 6
     3: 2
     4: 2
     5: 2
@@ -5366,7 +5364,7 @@ HLT_e28_lhtight_e14_idperf_tight_probe_50invmAB130_L1eEM28M:
   stepFeatures:
     0: 2
     1: 2
-    2: 5
+    2: 6
     3: 2
     4: 2
     5: 2
@@ -5388,7 +5386,7 @@ HLT_e28_lhtight_ivarloose_2j20_0eta290_020jvt_boffperf_pf_ftf_L1eEM28M:
   stepFeatures:
     0: 2
     1: 2
-    2: 5
+    2: 6
     3: 2
     4: 2
     5: 2
@@ -5411,7 +5409,7 @@ HLT_e28_lhtight_ivarloose_2j20_roiftf_preselj20_L1eEM28M:
   stepFeatures:
     0: 2
     1: 2
-    2: 5
+    2: 6
     3: 2
     4: 2
     5: 2
@@ -5431,7 +5429,7 @@ HLT_e28_lhtight_ivarloose_L1eEM28M:
   stepFeatures:
     0: 2
     1: 2
-    2: 5
+    2: 6
     3: 2
     4: 2
     5: 2
@@ -5449,7 +5447,7 @@ HLT_e28_lhtight_ivarloose_e12_lhloose_probe_L1eEM28M:
   stepFeatures:
     0: 2
     1: 2
-    2: 5
+    2: 6
     3: 2
     4: 2
     5: 2
@@ -5468,7 +5466,7 @@ HLT_e28_lhtight_ivarloose_e12_lhvloose_probe_L1eEM28M:
   stepFeatures:
     0: 2
     1: 2
-    2: 5
+    2: 6
     3: 2
     4: 2
     5: 2
@@ -5490,7 +5488,7 @@ HLT_e28_lhtight_ivarloose_e14_etcut_probe_L1eEM28M:
   stepFeatures:
     0: 2
     1: 2
-    2: 5
+    2: 6
     3: 2
     4: 2
     5: 2
@@ -5512,7 +5510,7 @@ HLT_e28_lhtight_ivarloose_e14_idperf_tight_probe_L1eEM28M:
   stepFeatures:
     0: 2
     1: 2
-    2: 5
+    2: 6
     3: 2
     4: 2
     5: 2
@@ -5531,7 +5529,7 @@ HLT_e28_lhtight_ivarloose_e14_lhtight_probe_L1eEM28M:
   stepFeatures:
     0: 2
     1: 2
-    2: 5
+    2: 6
     3: 2
     4: 2
     5: 2
@@ -5550,7 +5548,7 @@ HLT_e28_lhtight_ivarloose_e15_idperf_tight_probe_L1eEM28M:
   stepFeatures:
     0: 2
     1: 2
-    2: 5
+    2: 6
     3: 2
     4: 2
     5: 2
@@ -5569,7 +5567,7 @@ HLT_e28_lhtight_ivarloose_e17_lhloose_probe_L1eEM28M:
   stepFeatures:
     0: 2
     1: 2
-    2: 5
+    2: 6
     3: 2
     4: 2
     5: 2
@@ -5588,7 +5586,7 @@ HLT_e28_lhtight_ivarloose_e17_lhmedium_probe_L1eEM28M:
   stepFeatures:
     0: 2
     1: 2
-    2: 5
+    2: 6
     3: 2
     4: 2
     5: 2
@@ -5607,7 +5605,7 @@ HLT_e28_lhtight_ivarloose_e17_lhvloose_probe_L1eEM28M:
   stepFeatures:
     0: 2
     1: 2
-    2: 5
+    2: 6
     3: 2
     4: 2
     5: 2
@@ -5626,7 +5624,7 @@ HLT_e28_lhtight_ivarloose_e20_lhtight_ivarloose_probe_L1eEM28M:
   stepFeatures:
     0: 2
     1: 2
-    2: 5
+    2: 6
     3: 2
     4: 2
     5: 2
@@ -5645,7 +5643,7 @@ HLT_e28_lhtight_ivarloose_e24_lhvloose_probe_L1eEM28M:
   stepFeatures:
     0: 2
     1: 2
-    2: 5
+    2: 6
     3: 2
     4: 2
     5: 2
@@ -5664,7 +5662,7 @@ HLT_e28_lhtight_ivarloose_e26_lhmedium_probe_L1eEM28M:
   stepFeatures:
     0: 2
     1: 2
-    2: 5
+    2: 6
     3: 2
     4: 2
     5: 2
@@ -5683,7 +5681,7 @@ HLT_e28_lhtight_ivarloose_e26_lhtight_probe_L1eEM28M:
   stepFeatures:
     0: 2
     1: 2
-    2: 5
+    2: 6
     3: 2
     4: 2
     5: 2
@@ -5702,7 +5700,7 @@ HLT_e28_lhtight_ivarloose_e28_lhtight_probe_L1eEM28M:
   stepFeatures:
     0: 2
     1: 2
-    2: 5
+    2: 6
     3: 2
     4: 2
     5: 2
@@ -5721,7 +5719,7 @@ HLT_e28_lhtight_ivarloose_e30_lhloose_nopix_lrtmedium_probe_L1eEM28M:
   stepFeatures:
     0: 2
     1: 2
-    2: 5
+    2: 6
     3: 2
     4: 2
     5: 2
@@ -5740,7 +5738,7 @@ HLT_e28_lhtight_ivarloose_e30_lhloose_nopix_probe_L1eEM28M:
   stepFeatures:
     0: 2
     1: 2
-    2: 5
+    2: 6
     3: 2
     4: 2
     5: 2
@@ -5763,14 +5761,14 @@ HLT_e28_lhtight_ivarloose_e4_etcut_probe_L1eEM28M:
   stepFeatures:
     0: 2
     1: 2
-    2: 5
+    2: 6
     3: 2
     4: 2
     5: 2
     6: 1
     7: 10
     8: 10
-    9: 29
+    9: 25
     10: 6
 HLT_e28_lhtight_ivarloose_e5_idperf_loose_lrtloose_probe_L1eEM28M:
   eventCount: 1
@@ -5790,7 +5788,7 @@ HLT_e28_lhtight_ivarloose_e5_idperf_loose_lrtloose_probe_L1eEM28M:
   stepFeatures:
     0: 2
     1: 2
-    2: 5
+    2: 6
     3: 2
     4: 2
     5: 2
@@ -5819,14 +5817,14 @@ HLT_e28_lhtight_ivarloose_e5_lhtight_noringer_probe_L1eEM28M:
   stepFeatures:
     0: 2
     1: 2
-    2: 5
+    2: 6
     3: 2
     4: 2
     5: 2
     6: 1
     7: 5
     8: 5
-    9: 12
+    9: 10
     10: 2
     11: 2
     12: 2
@@ -5847,14 +5845,14 @@ HLT_e28_lhtight_ivarloose_e5_lhtight_probe_L1eEM28M:
   stepFeatures:
     0: 2
     1: 2
-    2: 5
+    2: 6
     3: 2
     4: 2
     5: 2
     6: 1
     7: 2
     8: 2
-    9: 5
+    9: 3
     10: 1
 HLT_e28_lhtight_ivarloose_e7_lhmedium_probe_L1eEM28M:
   eventCount: 0
@@ -5872,14 +5870,14 @@ HLT_e28_lhtight_ivarloose_e7_lhmedium_probe_L1eEM28M:
   stepFeatures:
     0: 2
     1: 2
-    2: 5
+    2: 6
     3: 2
     4: 2
     5: 2
     6: 1
     7: 2
     8: 2
-    9: 5
+    9: 3
     10: 1
 HLT_e28_lhtight_ivarloose_e9_etcut_probe_L1eEM28M:
   eventCount: 0
@@ -5897,14 +5895,14 @@ HLT_e28_lhtight_ivarloose_e9_etcut_probe_L1eEM28M:
   stepFeatures:
     0: 2
     1: 2
-    2: 5
+    2: 6
     3: 2
     4: 2
     5: 2
     6: 1
     7: 7
     8: 7
-    9: 25
+    9: 23
     10: 1
 HLT_e28_lhtight_ivarloose_e9_lhtight_probe_L1eEM28M:
   eventCount: 0
@@ -5919,7 +5917,7 @@ HLT_e28_lhtight_ivarloose_e9_lhtight_probe_L1eEM28M:
   stepFeatures:
     0: 2
     1: 2
-    2: 5
+    2: 6
     3: 2
     4: 2
     5: 2
@@ -5938,7 +5936,7 @@ HLT_e28_lhtight_ivarloose_e9_lhvloose_probe_L1eEM28M:
   stepFeatures:
     0: 2
     1: 2
-    2: 5
+    2: 6
     3: 2
     4: 2
     5: 2
@@ -5959,7 +5957,7 @@ HLT_e28_lhtight_ivarloose_j20_pf_ftf_L1eEM28M:
   stepFeatures:
     0: 2
     1: 2
-    2: 5
+    2: 6
     3: 2
     4: 2
     5: 2
@@ -5982,7 +5980,7 @@ HLT_e28_lhtight_ivarloose_mu22noL1_2j20_0eta290_020jvt_bdl1d85_pf_ftf_L1eEM28M:
   stepFeatures:
     0: 2
     1: 2
-    2: 5
+    2: 6
     3: 2
     4: 2
     5: 2
@@ -6006,7 +6004,7 @@ HLT_e28_lhtight_ivarloose_mu22noL1_2j20_0eta290_020jvt_bgn185_pf_ftf_L1eEM28M:
   stepFeatures:
     0: 2
     1: 2
-    2: 5
+    2: 6
     3: 2
     4: 2
     5: 2
@@ -6030,7 +6028,7 @@ HLT_e28_lhtight_ivarloose_mu22noL1_j20_0eta290_020jvt_boffperf_pf_ftf_L1eEM28M:
   stepFeatures:
     0: 2
     1: 2
-    2: 5
+    2: 6
     3: 2
     4: 2
     5: 2
@@ -6053,7 +6051,7 @@ HLT_e28_lhtight_ivarloose_mu22noL1_j20_roiftf_preselj20_L1eEM28M:
   stepFeatures:
     0: 2
     1: 2
-    2: 5
+    2: 6
     3: 2
     4: 2
     5: 2
@@ -6073,7 +6071,7 @@ HLT_e28_lhtight_ivarloose_noringer_L1eEM26M:
   stepFeatures:
     0: 3
     1: 3
-    2: 6
+    2: 7
     3: 2
     4: 2
     5: 2
@@ -6091,7 +6089,7 @@ HLT_e28_lhtight_ivarloose_noringer_L1eEM28M:
   stepFeatures:
     0: 2
     1: 2
-    2: 5
+    2: 6
     3: 2
     4: 2
     5: 2
@@ -6129,7 +6127,7 @@ HLT_e28_lhtight_ivarloose_tau20_mediumRNN_tracktwoMVA_probe_L1TAU12IM_03dRAB_L1e
   stepFeatures:
     0: 2
     1: 2
-    2: 5
+    2: 6
     3: 2
     4: 2
     5: 2
@@ -6155,7 +6153,7 @@ HLT_e28_lhtight_ivarloose_tau20_mediumRNN_tracktwoMVA_probe_L1TAU8_03dRAB_L1eEM2
   stepFeatures:
     0: 2
     1: 2
-    2: 5
+    2: 6
     3: 2
     4: 2
     5: 2
@@ -6181,7 +6179,7 @@ HLT_e28_lhtight_ivarloose_tau20_mediumRNN_tracktwoMVA_probe_L1cTAU20M_03dRAB_L1e
   stepFeatures:
     0: 2
     1: 2
-    2: 5
+    2: 6
     3: 2
     4: 2
     5: 2
@@ -6207,7 +6205,7 @@ HLT_e28_lhtight_ivarloose_tau20_mediumRNN_tracktwoMVA_probe_L1eTAU12_03dRAB_L1eE
   stepFeatures:
     0: 2
     1: 2
-    2: 5
+    2: 6
     3: 2
     4: 2
     5: 2
@@ -6233,7 +6231,7 @@ HLT_e28_lhtight_ivarloose_tau25_mediumRNN_tracktwoMVA_probe_L1TAU12IM_03dRAB_L1e
   stepFeatures:
     0: 2
     1: 2
-    2: 5
+    2: 6
     3: 2
     4: 2
     5: 2
@@ -6259,7 +6257,7 @@ HLT_e28_lhtight_ivarloose_tau25_mediumRNN_tracktwoMVA_probe_L1cTAU20M_03dRAB_L1e
   stepFeatures:
     0: 2
     1: 2
-    2: 5
+    2: 6
     3: 2
     4: 2
     5: 2
@@ -6285,7 +6283,7 @@ HLT_e28_lhtight_ivarloose_tau30_mediumRNN_tracktwoMVA_probe_L1TAU20IM_03dRAB_L1e
   stepFeatures:
     0: 2
     1: 2
-    2: 5
+    2: 6
     3: 2
     4: 2
     5: 2
@@ -6311,7 +6309,7 @@ HLT_e28_lhtight_ivarloose_tau30_mediumRNN_tracktwoMVA_probe_L1cTAU20M_03dRAB_L1e
   stepFeatures:
     0: 2
     1: 2
-    2: 5
+    2: 6
     3: 2
     4: 2
     5: 2
@@ -6337,7 +6335,7 @@ HLT_e28_lhtight_ivarloose_tau35_mediumRNN_tracktwoMVA_probe_L1TAU20IM_03dRAB_L1e
   stepFeatures:
     0: 2
     1: 2
-    2: 5
+    2: 6
     3: 2
     4: 2
     5: 2
@@ -6363,7 +6361,7 @@ HLT_e28_lhtight_ivarloose_tau35_mediumRNN_tracktwoMVA_probe_L1cTAU30M_03dRAB_L1e
   stepFeatures:
     0: 2
     1: 2
-    2: 5
+    2: 6
     3: 2
     4: 2
     5: 2
@@ -6389,7 +6387,7 @@ HLT_e28_lhtight_ivarloose_tau40_mediumRNN_tracktwoMVA_probe_L1TAU25IM_03dRAB_L1e
   stepFeatures:
     0: 2
     1: 2
-    2: 5
+    2: 6
     3: 2
     4: 2
     5: 2
@@ -6415,7 +6413,7 @@ HLT_e28_lhtight_ivarloose_tau40_mediumRNN_tracktwoMVA_probe_L1cTAU35M_03dRAB_L1e
   stepFeatures:
     0: 2
     1: 2
-    2: 5
+    2: 6
     3: 2
     4: 2
     5: 2
@@ -6441,7 +6439,7 @@ HLT_e28_lhtight_ivarloose_tau60_mediumRNN_tracktwoLLP_probe_L1TAU40_03dRAB_L1eEM
   stepFeatures:
     0: 2
     1: 2
-    2: 5
+    2: 6
     3: 2
     4: 2
     5: 2
@@ -6467,7 +6465,7 @@ HLT_e28_lhtight_ivarloose_tau60_mediumRNN_tracktwoLLP_probe_L1eTAU60_03dRAB_L1eE
   stepFeatures:
     0: 2
     1: 2
-    2: 5
+    2: 6
     3: 2
     4: 2
     5: 2
@@ -6493,7 +6491,7 @@ HLT_e28_lhtight_ivarloose_tau60_mediumRNN_tracktwoMVA_probe_L1TAU40_03dRAB_L1eEM
   stepFeatures:
     0: 2
     1: 2
-    2: 5
+    2: 6
     3: 2
     4: 2
     5: 2
@@ -6519,7 +6517,7 @@ HLT_e28_lhtight_ivarloose_tau60_mediumRNN_tracktwoMVA_probe_L1eTAU60_03dRAB_L1eE
   stepFeatures:
     0: 2
     1: 2
-    2: 5
+    2: 6
     3: 2
     4: 2
     5: 2
@@ -6645,7 +6643,7 @@ HLT_e28_lhtight_ivarmedium_L1eEM28M:
   stepFeatures:
     0: 2
     1: 2
-    2: 5
+    2: 6
     3: 2
     4: 2
     5: 2
@@ -6663,7 +6661,7 @@ HLT_e28_lhtight_ivartight_L1eEM28M:
   stepFeatures:
     0: 2
     1: 2
-    2: 5
+    2: 6
     3: 2
     4: 2
     5: 2
@@ -6682,7 +6680,7 @@ HLT_e30_etcut_L1eEM18M:
   stepFeatures:
     0: 4
     1: 4
-    2: 14
+    2: 15
     3: 3
 HLT_e30_idperf_loose_lrtloose_L1eEM26M:
   eventCount: 2
@@ -6724,7 +6722,7 @@ HLT_e30_lhloose_nopix_lrtmedium_L1eEM26M:
   stepFeatures:
     0: 3
     1: 3
-    2: 9
+    2: 8
     3: 2
     4: 2
     5: 2
@@ -6740,7 +6738,7 @@ HLT_e30_lhloose_nopix_lrtmedium_L1eEM28M:
   stepFeatures:
     0: 2
     1: 2
-    2: 8
+    2: 7
     3: 2
     4: 2
     5: 2
@@ -6770,7 +6768,7 @@ HLT_e30_lhtight_ivarloose_noringer_L1eEM28M:
   stepFeatures:
     0: 2
     1: 2
-    2: 5
+    2: 6
     3: 2
     4: 2
     5: 2
@@ -6788,7 +6786,7 @@ HLT_e30_lhvloose_L1eEM26M:
   stepFeatures:
     0: 3
     1: 3
-    2: 6
+    2: 7
     3: 2
     4: 2
     5: 2
@@ -6806,7 +6804,7 @@ HLT_e30_lhvloose_L1eEM28M:
   stepFeatures:
     0: 2
     1: 2
-    2: 5
+    2: 6
     3: 2
     4: 2
     5: 2
@@ -6823,7 +6821,7 @@ HLT_e35_lhloose_nopix_lrtmedium_L1eEM26M:
   stepFeatures:
     0: 2
     1: 2
-    2: 8
+    2: 7
     3: 2
     4: 2
     5: 2
@@ -6839,7 +6837,7 @@ HLT_e35_lhloose_nopix_lrtmedium_L1eEM28M:
   stepFeatures:
     0: 2
     1: 2
-    2: 8
+    2: 7
     3: 2
     4: 2
     5: 2
@@ -6853,7 +6851,7 @@ HLT_e40_etcut_L1eEM18M:
   stepFeatures:
     0: 3
     1: 3
-    2: 13
+    2: 14
     3: 3
 HLT_e40_lhvloose_L1eEM26M:
   eventCount: 2
@@ -6868,7 +6866,7 @@ HLT_e40_lhvloose_L1eEM26M:
   stepFeatures:
     0: 2
     1: 2
-    2: 5
+    2: 6
     3: 2
     4: 2
     5: 2
@@ -6886,7 +6884,7 @@ HLT_e40_lhvloose_L1eEM28M:
   stepFeatures:
     0: 2
     1: 2
-    2: 5
+    2: 6
     3: 2
     4: 2
     5: 2
@@ -6901,7 +6899,7 @@ HLT_e50_etcut_L1eEM26M:
   stepFeatures:
     0: 3
     1: 3
-    2: 13
+    2: 14
     3: 3
 HLT_e50_etcut_L1eEM28M:
   eventCount: 3
@@ -6913,7 +6911,7 @@ HLT_e50_etcut_L1eEM28M:
   stepFeatures:
     0: 3
     1: 3
-    2: 13
+    2: 14
     3: 3
 HLT_e5_dnnloose_L1EM3:
   eventCount: 5
@@ -6928,10 +6926,10 @@ HLT_e5_dnnloose_L1EM3:
   stepFeatures:
     0: 33
     1: 33
-    2: 58
-    3: 14
-    4: 14
-    5: 14
+    2: 49
+    3: 13
+    4: 13
+    5: 13
     6: 5
 HLT_e5_dnnmedium_L1EM3:
   eventCount: 4
@@ -6946,10 +6944,10 @@ HLT_e5_dnnmedium_L1EM3:
   stepFeatures:
     0: 33
     1: 33
-    2: 58
-    3: 14
-    4: 14
-    5: 14
+    2: 49
+    3: 13
+    4: 13
+    5: 13
     6: 4
 HLT_e5_dnntight_L1EM3:
   eventCount: 3
@@ -6964,10 +6962,10 @@ HLT_e5_dnntight_L1EM3:
   stepFeatures:
     0: 32
     1: 32
-    2: 56
-    3: 13
-    4: 13
-    5: 13
+    2: 47
+    3: 12
+    4: 12
+    5: 12
     6: 3
 HLT_e5_etcut_L1EM3:
   eventCount: 20
@@ -6979,8 +6977,8 @@ HLT_e5_etcut_L1EM3:
   stepFeatures:
     0: 160
     1: 160
-    2: 518
-    3: 123
+    2: 472
+    3: 120
 HLT_e5_etcut_L1eEM5:
   eventCount: 20
   stepCounts:
@@ -6991,8 +6989,8 @@ HLT_e5_etcut_L1eEM5:
   stepFeatures:
     0: 147
     1: 147
-    2: 626
-    3: 174
+    2: 580
+    3: 172
 HLT_e5_idperf_loose_lrtloose_probe_g25_medium_L1eEM24L:
   eventCount: 1
   stepCounts:
@@ -7080,10 +7078,10 @@ HLT_e5_lhtight_L1EM3:
   stepFeatures:
     0: 32
     1: 32
-    2: 56
-    3: 13
-    4: 13
-    5: 13
+    2: 47
+    3: 12
+    4: 12
+    5: 12
     6: 3
 HLT_e5_lhtight_e14_etcut_1invmAB5_L1JPSI-1M5-EM12:
   eventCount: 0
@@ -7093,7 +7091,7 @@ HLT_e5_lhtight_e14_etcut_1invmAB5_L1JPSI-1M5-EM12:
   stepFeatures:
     0: 2
     1: 2
-    2: 6
+    2: 5
 HLT_e5_lhtight_e14_etcut_1invmAB5_L1JPSI-1M5-eEM15:
   eventCount: 0
   stepCounts:
@@ -7106,7 +7104,7 @@ HLT_e5_lhtight_e14_etcut_1invmAB5_L1JPSI-1M5-eEM15:
   stepFeatures:
     0: 28
     1: 20
-    2: 77
+    2: 74
     3: 16
     4: 5
     5: 5
@@ -7127,7 +7125,7 @@ HLT_e5_lhtight_e9_etcut_1invmAB5_L1JPSI-1M5-EM7:
   stepFeatures:
     0: 3
     1: 3
-    2: 9
+    2: 8
 HLT_e5_lhtight_e9_etcut_1invmAB5_L1JPSI-1M5-eEM9:
   eventCount: 0
   stepCounts:
@@ -7140,7 +7138,7 @@ HLT_e5_lhtight_e9_etcut_1invmAB5_L1JPSI-1M5-eEM9:
   stepFeatures:
     0: 40
     1: 26
-    2: 93
+    2: 90
     3: 26
     4: 5
     5: 5
@@ -7158,18 +7156,18 @@ HLT_e5_lhtight_noringer_L1EM3:
   stepCounts:
     0: 18
     1: 18
-    2: 17
-    3: 16
-    4: 16
-    5: 16
+    2: 16
+    3: 15
+    4: 15
+    5: 15
     6: 3
   stepFeatures:
     0: 52
     1: 52
-    2: 127
-    3: 36
-    4: 36
-    5: 36
+    2: 117
+    3: 34
+    4: 34
+    5: 34
     6: 3
 HLT_e5_lhvloose_bBeeM6000_L14J15:
   eventCount: 0
@@ -7183,10 +7181,10 @@ HLT_e5_lhvloose_bBeeM6000_L14J15:
   stepFeatures:
     0: 31
     1: 31
-    2: 54
-    3: 13
-    4: 13
-    5: 13
+    2: 47
+    3: 12
+    4: 12
+    5: 12
     6: 7
 HLT_e5_lhvloose_bBeeM6000_L1All:
   eventCount: 0
@@ -7200,10 +7198,10 @@ HLT_e5_lhvloose_bBeeM6000_L1All:
   stepFeatures:
     0: 35
     1: 35
-    2: 64
-    3: 15
-    4: 15
-    5: 15
+    2: 54
+    3: 14
+    4: 14
+    5: 14
     6: 7
 HLT_e5_lhvloose_bBeeM6000_L1BKeePrescaled:
   eventCount: 0
@@ -7217,10 +7215,10 @@ HLT_e5_lhvloose_bBeeM6000_L1BKeePrescaled:
   stepFeatures:
     0: 33
     1: 33
-    2: 59
-    3: 14
-    4: 14
-    5: 14
+    2: 50
+    3: 13
+    4: 13
+    5: 13
     6: 7
 HLT_e5_lhvloose_bBeeM6000_L1BKeePrimary:
   eventCount: 0
@@ -7234,10 +7232,10 @@ HLT_e5_lhvloose_bBeeM6000_L1BKeePrimary:
   stepFeatures:
     0: 35
     1: 35
-    2: 64
-    3: 15
-    4: 15
-    5: 15
+    2: 54
+    3: 14
+    4: 14
+    5: 14
     6: 7
 HLT_e5_lhvloose_bBeeM6000_L1BPH-0DR3-EM7J15_MU5VF:
   eventCount: 0
@@ -7251,7 +7249,7 @@ HLT_e5_lhvloose_bBeeM6000_L1BPH-0DR3-EM7J15_MU5VF:
   stepFeatures:
     0: 14
     1: 14
-    2: 23
+    2: 22
     3: 5
     4: 5
     5: 5
@@ -7268,7 +7266,7 @@ HLT_e5_lhvloose_bBeeM6000_L1eEM26M:
   stepFeatures:
     0: 6
     1: 6
-    2: 14
+    2: 11
     3: 4
     4: 4
     5: 4
@@ -7278,34 +7276,34 @@ HLT_e5_lhvloose_e3_lhvloose_bBeeM6000_L1BKeePrescaled:
   stepCounts:
     0: 10
     1: 10
-    2: 10
-    3: 5
-    4: 5
-    5: 5
+    2: 8
+    3: 4
+    4: 4
+    5: 4
   stepFeatures:
     0: 73
     1: 63
-    2: 108
-    3: 31
-    4: 22
-    5: 22
+    2: 92
+    3: 25
+    4: 18
+    5: 18
     6: 10
 HLT_e5_lhvloose_e3_lhvloose_bBeeM6000_L1BKeePrimary:
   eventCount: 0
   stepCounts:
     0: 11
     1: 11
-    2: 11
-    3: 5
-    4: 5
-    5: 5
+    2: 9
+    3: 4
+    4: 4
+    5: 4
   stepFeatures:
     0: 77
     1: 67
-    2: 118
-    3: 33
-    4: 22
-    5: 22
+    2: 100
+    3: 27
+    4: 18
+    5: 18
     6: 10
 HLT_e5_lhvloose_j70_j50a_j0_DJMASS1000j50_xe50_tcpufit_L1MJJ-500-NFF:
   eventCount: 0
@@ -7319,7 +7317,7 @@ HLT_e5_lhvloose_j70_j50a_j0_DJMASS1000j50_xe50_tcpufit_L1MJJ-500-NFF:
   stepFeatures:
     0: 2
     1: 2
-    2: 3
+    2: 1
     3: 1
     4: 1
     5: 1
@@ -7335,7 +7333,7 @@ HLT_e5_lhvloose_j70_j50a_j0_DJMASS1000j50_xe50_tcpufit_L1jMJJ-500-NFF:
   stepFeatures:
     0: 3
     1: 3
-    2: 8
+    2: 4
     3: 2
     4: 2
     5: 2
@@ -7352,11 +7350,11 @@ HLT_e5_nopid_L1eEM5:
   stepFeatures:
     0: 147
     1: 147
-    2: 626
-    3: 174
-    4: 174
-    5: 174
-    6: 140
+    2: 580
+    3: 172
+    4: 172
+    5: 172
+    6: 139
 HLT_e60_dnnmedium_L1eEM26M:
   eventCount: 0
   stepCounts:
@@ -7642,7 +7640,7 @@ HLT_e7_lhmedium_L1eEM5_mu24_L1MU14FCH:
   stepFeatures:
     0: 12
     1: 7
-    2: 8
+    2: 7
     3: 1
 HLT_e7_lhmedium_L1eEM5_mu24_L1MU18VFCH:
   eventCount: 0
@@ -7653,7 +7651,7 @@ HLT_e7_lhmedium_L1eEM5_mu24_L1MU18VFCH:
   stepFeatures:
     0: 12
     1: 7
-    2: 8
+    2: 7
     3: 1
 HLT_e7_lhmedium_mu24_L1MU14FCH:
   eventCount: 0
@@ -7664,7 +7662,7 @@ HLT_e7_lhmedium_mu24_L1MU14FCH:
   stepFeatures:
     0: 12
     1: 8
-    2: 8
+    2: 7
     3: 1
 HLT_e7_lhmedium_mu24_L1MU18VFCH:
   eventCount: 0
@@ -7675,7 +7673,7 @@ HLT_e7_lhmedium_mu24_L1MU18VFCH:
   stepFeatures:
     0: 12
     1: 8
-    2: 8
+    2: 7
     3: 1
 HLT_e80_etcut_L1eEM26M:
   eventCount: 1
@@ -7721,7 +7719,7 @@ HLT_e9_lhtight_e4_etcut_1invmAB5_L1JPSI-1M5-eEM9:
   stepFeatures:
     0: 59
     1: 30
-    2: 111
+    2: 109
     3: 33
     4: 3
     5: 3
@@ -7796,7 +7794,7 @@ HLT_e9_lhvloose_L1eEM5_mu20_mu8noL1_L1MU14FCH:
   stepFeatures:
     0: 10
     1: 4
-    2: 6
+    2: 5
     3: 2
     4: 1
     5: 1
@@ -7812,7 +7810,7 @@ HLT_e9_lhvloose_mu20_mu8noL1_L1MU14FCH:
   stepFeatures:
     0: 10
     1: 4
-    2: 6
+    2: 5
     3: 2
     4: 1
     5: 1
@@ -7824,7 +7822,7 @@ HLT_e9_lhvloose_mu23_mu8noL1_L1MU18VFCH:
   stepFeatures:
     0: 10
     1: 4
-    2: 5
+    2: 4
 HLT_fslrt0_L14J15:
   eventCount: 0
 HLT_fslrt0_L1All:
diff --git a/Trigger/TrigValidation/TrigP1Test/share/ref_v1Dev_decodeBS_build.ref b/Trigger/TrigValidation/TrigP1Test/share/ref_v1Dev_decodeBS_build.ref
index 3c299cf61eaffb908acaa6abe448116917addac4..c48c0bca42d5e79cfb6e438966ae8fa42135675f 100644
--- a/Trigger/TrigValidation/TrigP1Test/share/ref_v1Dev_decodeBS_build.ref
+++ b/Trigger/TrigValidation/TrigP1Test/share/ref_v1Dev_decodeBS_build.ref
@@ -61,52 +61,52 @@ HLT_2e5_lhvloose_bBeeM6000_L1All:
   stepCounts:
     0: 10
     1: 10
-    2: 7
-    3: 2
-    4: 2
-    5: 2
+    2: 4
+    3: 1
+    4: 1
+    5: 1
   stepFeatures:
     0: 42
     1: 28
-    2: 26
-    3: 8
-    4: 6
-    5: 6
-    6: 2
+    2: 18
+    3: 4
+    4: 2
+    5: 2
+    6: 1
 HLT_2e5_lhvloose_bBeeM6000_L1BKeePrescaled:
   eventCount: 0
   stepCounts:
     0: 3
     1: 3
-    2: 3
-    3: 2
-    4: 2
-    5: 2
+    2: 2
+    3: 1
+    4: 1
+    5: 1
   stepFeatures:
     0: 14
     1: 9
-    2: 11
-    3: 7
-    4: 6
-    5: 6
-    6: 2
+    2: 6
+    3: 3
+    4: 2
+    5: 2
+    6: 1
 HLT_2e5_lhvloose_bBeeM6000_L1BKeePrimary:
   eventCount: 0
   stepCounts:
     0: 3
     1: 3
-    2: 3
-    3: 2
-    4: 2
-    5: 2
+    2: 2
+    3: 1
+    4: 1
+    5: 1
   stepFeatures:
     0: 12
     1: 9
-    2: 11
-    3: 7
-    4: 6
-    5: 6
-    6: 2
+    2: 6
+    3: 3
+    4: 2
+    5: 2
+    6: 1
 HLT_2e5_lhvloose_bBeeM6000_L1BPH-0M9-EM7-EM5_MU5VF:
   eventCount: 0
 HLT_2e5_lhvloose_bBeeM6000_L1eEM26M:
@@ -1211,7 +1211,7 @@ HLT_e10_lhvloose_L1eEM9:
   stepFeatures:
     0: 4
     1: 4
-    2: 4
+    2: 5
     3: 3
     4: 3
     5: 3
@@ -1309,7 +1309,7 @@ HLT_e14_lhvloose_L1EM10VH:
   stepFeatures:
     0: 3
     1: 3
-    2: 2
+    2: 3
     3: 2
     4: 2
     5: 2
@@ -1325,7 +1325,7 @@ HLT_e14_lhvloose_L1eEM12L:
   stepFeatures:
     0: 3
     1: 3
-    2: 2
+    2: 3
     3: 2
     4: 2
     5: 2
@@ -2062,61 +2062,61 @@ HLT_e5_dnnloose_L1EM3:
   stepCounts:
     0: 24
     1: 24
-    2: 17
+    2: 14
     3: 8
     4: 8
     5: 8
   stepFeatures:
     0: 40
     1: 40
-    2: 34
-    3: 12
-    4: 12
-    5: 12
+    2: 25
+    3: 9
+    4: 9
+    5: 9
 HLT_e5_dnnmedium_L1EM3:
   eventCount: 0
   stepCounts:
     0: 24
     1: 24
-    2: 17
+    2: 14
     3: 8
     4: 8
     5: 8
   stepFeatures:
     0: 40
     1: 40
-    2: 34
-    3: 12
-    4: 12
-    5: 12
+    2: 25
+    3: 9
+    4: 9
+    5: 9
 HLT_e5_dnntight_L1EM3:
   eventCount: 0
   stepCounts:
     0: 23
     1: 23
-    2: 17
+    2: 13
     3: 7
     4: 7
     5: 7
   stepFeatures:
     0: 38
     1: 38
-    2: 33
-    3: 11
-    4: 11
-    5: 11
+    2: 24
+    3: 8
+    4: 8
+    5: 8
 HLT_e5_etcut_L1EM3:
   eventCount: 25
   stepCounts:
     0: 37
     1: 37
-    2: 31
+    2: 30
     3: 25
   stepFeatures:
     0: 139
     1: 139
-    2: 187
-    3: 54
+    2: 161
+    3: 51
 HLT_e5_etcut_L1eEM5:
   eventCount: 20
   stepCounts:
@@ -2127,8 +2127,8 @@ HLT_e5_etcut_L1eEM5:
   stepFeatures:
     0: 58
     1: 58
-    2: 107
-    3: 45
+    2: 102
+    3: 43
 HLT_e5_idperf_loose_lrtloose_probe_g25_medium_L1eEM24L:
   eventCount: 0
   stepCounts:
@@ -2199,17 +2199,17 @@ HLT_e5_lhtight_L1EM3:
   stepCounts:
     0: 23
     1: 23
-    2: 17
+    2: 13
     3: 7
     4: 7
     5: 7
   stepFeatures:
     0: 38
     1: 38
-    2: 33
-    3: 11
-    4: 11
-    5: 11
+    2: 24
+    3: 8
+    4: 8
+    5: 8
 HLT_e5_lhtight_e14_etcut_1invmAB5_L1JPSI-1M5-EM12:
   eventCount: 0
 HLT_e5_lhtight_e14_etcut_1invmAB5_L1JPSI-1M5-eEM15:
@@ -2217,17 +2217,10 @@ HLT_e5_lhtight_e14_etcut_1invmAB5_L1JPSI-1M5-eEM15:
   stepCounts:
     0: 2
     1: 2
-    2: 1
-    3: 1
-    4: 1
-    5: 1
   stepFeatures:
     0: 6
     1: 4
-    2: 9
-    3: 2
-    4: 1
-    5: 1
+    2: 7
 HLT_e5_lhtight_e14_etcut_probe_1invmAB5_L1JPSI-1M5-EM12:
   eventCount: 0
 HLT_e5_lhtight_e9_etcut_1invmAB5_L1JPSI-1M5-EM7:
@@ -2237,17 +2230,10 @@ HLT_e5_lhtight_e9_etcut_1invmAB5_L1JPSI-1M5-eEM9:
   stepCounts:
     0: 2
     1: 2
-    2: 1
-    3: 1
-    4: 1
-    5: 1
   stepFeatures:
     0: 7
     1: 5
-    2: 11
-    3: 2
-    4: 1
-    5: 1
+    2: 9
 HLT_e5_lhtight_e9_etcut_probe_1invmAB5_L1JPSI-1M5-EM7:
   eventCount: 0
 HLT_e5_lhtight_noringer_L1EM3:
@@ -2255,17 +2241,17 @@ HLT_e5_lhtight_noringer_L1EM3:
   stepCounts:
     0: 27
     1: 27
-    2: 19
-    3: 14
-    4: 14
-    5: 14
+    2: 17
+    3: 13
+    4: 13
+    5: 13
   stepFeatures:
     0: 50
     1: 50
-    2: 50
-    3: 22
-    4: 22
-    5: 22
+    2: 43
+    3: 19
+    4: 19
+    5: 19
 HLT_e5_lhvloose_bBeeM6000_L14J15:
   eventCount: 0
 HLT_e5_lhvloose_bBeeM6000_L1All:
@@ -2273,18 +2259,18 @@ HLT_e5_lhvloose_bBeeM6000_L1All:
   stepCounts:
     0: 24
     1: 24
-    2: 18
+    2: 15
     3: 8
     4: 8
     5: 8
   stepFeatures:
     0: 42
     1: 42
-    2: 38
-    3: 12
-    4: 12
-    5: 12
-    6: 2
+    2: 28
+    3: 9
+    4: 9
+    5: 9
+    6: 1
 HLT_e5_lhvloose_bBeeM6000_L1BKeePrescaled:
   eventCount: 0
   stepCounts:
@@ -2297,11 +2283,11 @@ HLT_e5_lhvloose_bBeeM6000_L1BKeePrescaled:
   stepFeatures:
     0: 14
     1: 14
-    2: 13
-    3: 7
-    4: 7
-    5: 7
-    6: 2
+    2: 8
+    3: 4
+    4: 4
+    5: 4
+    6: 1
 HLT_e5_lhvloose_bBeeM6000_L1BKeePrimary:
   eventCount: 0
   stepCounts:
@@ -2314,11 +2300,11 @@ HLT_e5_lhvloose_bBeeM6000_L1BKeePrimary:
   stepFeatures:
     0: 12
     1: 12
-    2: 12
-    3: 7
-    4: 7
-    5: 7
-    6: 2
+    2: 7
+    3: 4
+    4: 4
+    5: 4
+    6: 1
 HLT_e5_lhvloose_bBeeM6000_L1BPH-0DR3-EM7J15_MU5VF:
   eventCount: 0
   stepCounts:
@@ -2331,10 +2317,10 @@ HLT_e5_lhvloose_bBeeM6000_L1BPH-0DR3-EM7J15_MU5VF:
   stepFeatures:
     0: 8
     1: 8
-    2: 8
-    3: 5
-    4: 5
-    5: 5
+    2: 5
+    3: 3
+    4: 3
+    5: 3
     6: 1
 HLT_e5_lhvloose_bBeeM6000_L1eEM26M:
   eventCount: 0
@@ -2357,35 +2343,35 @@ HLT_e5_lhvloose_e3_lhvloose_bBeeM6000_L1BKeePrescaled:
   stepCounts:
     0: 3
     1: 3
-    2: 3
-    3: 3
-    4: 3
-    5: 3
+    2: 2
+    3: 1
+    4: 1
+    5: 1
   stepFeatures:
     0: 28
     1: 18
-    2: 22
-    3: 15
-    4: 15
-    5: 15
-    6: 5
+    2: 12
+    3: 6
+    4: 4
+    5: 4
+    6: 2
 HLT_e5_lhvloose_e3_lhvloose_bBeeM6000_L1BKeePrimary:
   eventCount: 0
   stepCounts:
     0: 3
     1: 3
-    2: 3
-    3: 3
-    4: 3
-    5: 3
+    2: 2
+    3: 1
+    4: 1
+    5: 1
   stepFeatures:
     0: 24
     1: 18
-    2: 22
-    3: 15
-    4: 15
-    5: 15
-    6: 5
+    2: 12
+    3: 6
+    4: 4
+    5: 4
+    6: 2
 HLT_e5_lhvloose_j70_j50a_j0_DJMASS1000j50_xe50_tcpufit_L1MJJ-500-NFF:
   eventCount: 0
 HLT_e5_lhvloose_j70_j50a_j0_DJMASS1000j50_xe50_tcpufit_L1jMJJ-500-NFF:
@@ -2409,11 +2395,11 @@ HLT_e5_nopid_L1eEM5:
   stepFeatures:
     0: 58
     1: 58
-    2: 107
-    3: 45
-    4: 45
-    5: 45
-    6: 39
+    2: 102
+    3: 43
+    4: 43
+    5: 43
+    6: 38
 HLT_e60_dnnmedium_L1eEM26M:
   eventCount: 0
 HLT_e60_dnnmedium_L1eEM28M:
@@ -6537,10 +6523,10 @@ HLT_j80_pf_ftf_preselj20b77_L1J20:
   eventCount: 0
   stepCounts:
     0: 11
-    1: 1
+    1: 2
   stepFeatures:
     0: 11
-    1: 1
+    1: 2
 HLT_j80_pf_ftf_preselj20b95_L1J20:
   eventCount: 5
   stepCounts:
@@ -8750,44 +8736,47 @@ HLT_tau0_mediumRNN_tracktwoMVA_tau0_mediumRNN_tracktwoMVA_03dRAB_L12cTAU20M_4DR3
 HLT_tau0_mediumRNN_tracktwoMVA_tau0_mediumRNN_tracktwoMVA_03dRAB_L14jJ30p0ETA24_0DETA24-eTAU30eTAU12:
   eventCount: 0
 HLT_tau0_mediumRNN_tracktwoMVA_tau0_mediumRNN_tracktwoMVA_03dRAB_L14jJ30p0ETA24_0DETA24_10DPHI99-eTAU30eTAU12:
-  eventCount: 0
+  eventCount: 1
   stepCounts:
     0: 2
     1: 2
     2: 2
     3: 2
+    4: 1
   stepFeatures:
     0: 10
     1: 8
     2: 8
     3: 8
-    4: 2
+    4: 4
 HLT_tau0_mediumRNN_tracktwoMVA_tau0_mediumRNN_tracktwoMVA_03dRAB_L14jJ30p0ETA24_0DETA24_4DPHI99-eTAU30eTAU12:
-  eventCount: 0
+  eventCount: 1
   stepCounts:
     0: 2
     1: 2
     2: 2
     3: 2
+    4: 1
   stepFeatures:
     0: 10
     1: 8
     2: 8
     3: 8
-    4: 2
+    4: 4
 HLT_tau0_mediumRNN_tracktwoMVA_tau0_mediumRNN_tracktwoMVA_03dRAB_L14jJ30p0ETA24_0DETA24_4DPHI99-eTAU30eTAU20:
-  eventCount: 0
+  eventCount: 1
   stepCounts:
     0: 2
     1: 2
     2: 2
     3: 2
+    4: 1
   stepFeatures:
     0: 10
     1: 8
     2: 8
     3: 8
-    4: 2
+    4: 4
 HLT_tau0_mediumRNN_tracktwoMVA_tau0_mediumRNN_tracktwoMVA_03dRAB_L1TAU20IM_2TAU12IM_4J12p0ETA25:
   eventCount: 0
 HLT_tau0_mediumRNN_tracktwoMVA_tau0_mediumRNN_tracktwoMVA_03dRAB_L1cTAU30M_2cTAU20M_DR-eTAU30eTAU20-jJ55:
@@ -9389,17 +9378,17 @@ HLT_tau25_idperf_tracktwoMVA_L1jTAU20:
     3: 19
     4: 19
 HLT_tau25_looseRNN_trackLRT_L1TAU12IM:
-  eventCount: 4
+  eventCount: 5
   stepCounts:
     0: 10
     1: 10
     2: 10
-    3: 4
+    3: 5
   stepFeatures:
     0: 14
     1: 14
     2: 14
-    3: 4
+    3: 5
 HLT_tau25_looseRNN_tracktwoLLP_L1TAU12IM:
   eventCount: 5
   stepCounts: