diff --git a/InnerDetector/InDetConditions/PixelConditionsAlgorithms/python/PixelConditionsConfig.py b/InnerDetector/InDetConditions/PixelConditionsAlgorithms/python/PixelConditionsConfig.py
index 036eb81c32a64aa9613c598abae64ca896fbfff8..12c245e32090dbd6d0ca53d29b607a306ffde78c 100644
--- a/InnerDetector/InDetConditions/PixelConditionsAlgorithms/python/PixelConditionsConfig.py
+++ b/InnerDetector/InDetConditions/PixelConditionsAlgorithms/python/PixelConditionsConfig.py
@@ -61,7 +61,7 @@ def PixelConfigCondAlgCfg(flags, name="PixelConfigCondAlg", **kwargs):
             FEI3BarrelHitDuplication2016 = [  False,  False,  False,  False],
             FEI3BarrelSmallHitToT2016    = [     -1,     -1,     -1,     -1],
             FEI3BarrelTimingSimTune2016  = [     -1,   2015,   2015,   2015],
-            BarrelCrossTalk2016          = [   0.30,   0.06,   0.06,   0.06],
+            BarrelCrossTalk2016          = [   0.30,   0.12,   0.12,   0.12],
             BarrelNoiseOccupancy2016     = [   5e-8,   5e-8,   5e-8,   5e-8],
             BarrelDisableProbability2016 = [   9e-3,   9e-3,   9e-3,   9e-3],
             BarrelLorentzAngleCorr2016   = [    1.0,    1.0,    1.0,    1.0],
@@ -102,7 +102,7 @@ def PixelConfigCondAlgCfg(flags, name="PixelConfigCondAlg", **kwargs):
             FEI3BarrelHitDuplication2017 = [  False,  False,  False,  False],
             FEI3BarrelSmallHitToT2017    = [     -1,     -1,     -1,     -1],
             FEI3BarrelTimingSimTune2017  = [     -1,   2018,   2018,   2018],
-            BarrelCrossTalk2017          = [   0.30,   0.06,   0.06,   0.06],
+            BarrelCrossTalk2017          = [   0.30,   0.12,   0.12,   0.12],
             BarrelNoiseOccupancy2017     = [   5e-8,   5e-8,   5e-8,   5e-8],
             BarrelDisableProbability2017 = [   9e-3,   9e-3,   9e-3,   9e-3],
             BarrelLorentzAngleCorr2017   = [    1.0,    1.0,    1.0,    1.0],
@@ -138,7 +138,7 @@ def PixelConfigCondAlgCfg(flags, name="PixelConfigCondAlg", **kwargs):
             FEI3BarrelHitDuplication2018 = [  False,  False,  False,  False],
             FEI3BarrelSmallHitToT2018    = [     -1,     -1,     -1,     -1],
             FEI3BarrelTimingSimTune2018  = [     -1,   2018,   2018,   2018],
-            BarrelCrossTalk2018          = [   0.30,   0.06,   0.06,   0.06],
+            BarrelCrossTalk2018          = [   0.30,   0.12,   0.12,   0.12],
             BarrelNoiseOccupancy2018     = [   5e-8,   5e-8,   5e-8,   5e-8],
             BarrelDisableProbability2018 = [   9e-3,   9e-3,   9e-3,   9e-3],
             BarrelLorentzAngleCorr2018   = [    1.0,    1.0,    1.0,    1.0],
diff --git a/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelConfigCondAlg.h b/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelConfigCondAlg.h
index 55f4df946d9ab440268840af22fd2bf40eaa6894..9dca7e04393b4fea74b45628437d2c5aec8216b0 100644
--- a/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelConfigCondAlg.h
+++ b/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelConfigCondAlg.h
@@ -186,7 +186,7 @@ class PixelConfigCondAlg : public AthReentrantAlgorithm {
     {this, "FEI3BarrelTimingSimTune2016", {-1,2015,2015,2015}, "FEI3 timing tuning set of barrel pixel layers in 2015/2016"};
 
     Gaudi::Property<std::vector<double>> m_BarrelCrossTalk2016
-    {this, "BarrelCrossTalk2016", {0.30,0.06,0.06,0.06}, "Cross-talk fraction of barrel pixel layers in 2015/2016"};
+    {this, "BarrelCrossTalk2016", {0.30,0.12,0.12,0.12}, "Cross-talk fraction of barrel pixel layers in 2015/2016"};
 
     Gaudi::Property<std::vector<double>> m_BarrelNoiseOccupancy2016
     {this, "BarrelNoiseOccupancy2016", {5e-8,5e-8,5e-8,5e-8}, "Noise occupancy of barrel pixel layers in 2015/2016"};
@@ -289,7 +289,7 @@ class PixelConfigCondAlg : public AthReentrantAlgorithm {
     {this, "FEI3BarrelTimingSimTune2017", {-1,2018,2018,2018}, "FEI3 timing tuning set of barrel pixel layers in 2017"};
 
     Gaudi::Property<std::vector<double>> m_BarrelCrossTalk2017
-    {this, "BarrelCrossTalk2017", {0.30,0.06,0.06,0.06}, "Cross-talk fraction of barrel pixel layers in 2017"};
+    {this, "BarrelCrossTalk2017", {0.30,0.12,0.12,0.12}, "Cross-talk fraction of barrel pixel layers in 2017"};
 
     Gaudi::Property<std::vector<double>> m_BarrelNoiseOccupancy2017
     {this, "BarrelNoiseOccupancy2017", {5e-8,5e-8,5e-8,5e-8}, "Noise occupancy of barrel pixel layers in 2017"};
@@ -388,7 +388,7 @@ class PixelConfigCondAlg : public AthReentrantAlgorithm {
     {this, "FEI3BarrelTimingSimTune2018", {-1,2018,2018,2018}, "FEI3 timing tuning set of barrel pixel layers in 2018"};
 
     Gaudi::Property<std::vector<double>> m_BarrelCrossTalk2018
-    {this, "BarrelCrossTalk2018", {0.30,0.06,0.06,0.06}, "Cross-talk fraction of barrel pixel layers in 2018"};
+    {this, "BarrelCrossTalk2018", {0.30,0.12,0.12,0.12}, "Cross-talk fraction of barrel pixel layers in 2018"};
 
     Gaudi::Property<std::vector<double>> m_BarrelNoiseOccupancy2018
     {this, "BarrelNoiseOccupancy2018", {5e-8,5e-8,5e-8,5e-8}, "Noise occupancy of barrel pixel layers in 2018"};
diff --git a/InnerDetector/InDetDigitization/PixelDigitization/python/PixelDigitizationConfig.py b/InnerDetector/InDetDigitization/PixelDigitization/python/PixelDigitizationConfig.py
index c84d3df266983c9de1f37d5db504db321e82ddf5..926160070e0a5aa2dab751140f00f26c3e211e34 100644
--- a/InnerDetector/InDetDigitization/PixelDigitization/python/PixelDigitizationConfig.py
+++ b/InnerDetector/InDetDigitization/PixelDigitization/python/PixelDigitizationConfig.py
@@ -202,7 +202,7 @@ def PixelConfigCondAlg_MC():
     alg.FEI3BarrelHitDuplication2016 = [  False,  False,  False,  False]
     alg.FEI3BarrelSmallHitToT2016    = [     -1,     -1,     -1,     -1]
     alg.FEI3BarrelTimingSimTune2016  = [     -1,   2015,   2015,   2015]
-    alg.BarrelCrossTalk2016          = [   0.30,   0.06,   0.06,   0.06]
+    alg.BarrelCrossTalk2016          = [   0.30,   0.12,   0.12,   0.12]
     alg.BarrelNoiseOccupancy2016     = [   5e-8,   5e-8,   5e-8,   5e-8]
     alg.BarrelDisableProbability2016 = [   9e-3,   9e-3,   9e-3,   9e-3]
     alg.BarrelLorentzAngleCorr2016   = [    1.0,    1.0,    1.0,    1.0]
@@ -249,7 +249,7 @@ def PixelConfigCondAlg_MC():
     alg.FEI3BarrelHitDuplication2017 = [  False,  False,  False,  False]
     alg.FEI3BarrelSmallHitToT2017    = [     -1,     -1,     -1,     -1]
     alg.FEI3BarrelTimingSimTune2017  = [     -1,   2018,   2018,   2018]
-    alg.BarrelCrossTalk2017          = [   0.30,   0.06,   0.06,   0.06]
+    alg.BarrelCrossTalk2017          = [   0.30,   0.12,   0.12,   0.12]
     alg.BarrelNoiseOccupancy2017     = [   5e-8,   5e-8,   5e-8,   5e-8]
     alg.BarrelDisableProbability2017 = [   9e-3,   9e-3,   9e-3,   9e-3]
     alg.BarrelLorentzAngleCorr2017   = [    1.0,    1.0,    1.0,    1.0]
@@ -290,7 +290,7 @@ def PixelConfigCondAlg_MC():
     alg.FEI3BarrelHitDuplication2018 = [  False,  False,  False,  False]
     alg.FEI3BarrelSmallHitToT2018    = [     -1,     -1,     -1,     -1]
     alg.FEI3BarrelTimingSimTune2018  = [     -1,   2018,   2018,   2018]
-    alg.BarrelCrossTalk2018          = [   0.30,   0.06,   0.06,   0.06]
+    alg.BarrelCrossTalk2018          = [   0.30,   0.12,   0.12,   0.12]
     alg.BarrelNoiseOccupancy2018     = [   5e-8,   5e-8,   5e-8,   5e-8]
     alg.BarrelDisableProbability2018 = [   9e-3,   9e-3,   9e-3,   9e-3]
     alg.BarrelLorentzAngleCorr2018   = [    1.0,    1.0,    1.0,    1.0]
diff --git a/Tools/PROCTools/data/master_q221_AOD_digest.ref b/Tools/PROCTools/data/master_q221_AOD_digest.ref
index 3da3e871698fa75bfd27c311443466bb50032b3d..3be71b3829ddcceb2a6ab279d13f64292183bb2e 100644
--- a/Tools/PROCTools/data/master_q221_AOD_digest.ref
+++ b/Tools/PROCTools/data/master_q221_AOD_digest.ref
@@ -1,26 +1,26 @@
          run       event       nTopo   nIdTracks       nJets      nMuons       nElec   nTrueElec   nFakeElec       nPhot   nTruePhot   nFakePhot
-      284500    87473001         122         130           4           1           8           2           6           7           4           3
+      284500    87473001         122         129           4           1           8           2           6           7           4           3
       284500    87473014          83          80           6           0          10           1           9           7           5           2
       284500    87473022          38          30           4           0           4           2           2           4           3           1
       284500    87473032          30          33           4           1          10           4           6           5           2           3
-      284500    87473037          62          38           7           0          12           2          10           6           4           2
-      284500    87473040         107          96          10           1          17           1          16          10           5           5
+      284500    87473037          62          39           7           0          13           2          11           5           3           2
+      284500    87473040         107          95          10           1          17           1          16          10           5           5
       284500    87473051         140         111          11           1          16           1          15          23          16           7
       284500    87473063          62          76           5           2           7           1           6           6           4           2
-      284500    87473068          25          33           1           1           0           0           0           0           0           0
+      284500    87473068          25          34           1           1           0           0           0           0           0           0
       284500    87473075          60          87           6           0           5           0           5           6           5           1
-      284500    87473084          78          86           7           2          14           1          13           9           3           6
+      284500    87473084          78          87           7           2          14           1          13           9           3           6
       284500    87473091          41          49           3           0           4           2           2           4           2           2
       284500    87473096          66          75           3           2           3           0           3           4           3           1
       284500    87473104          64          63           6           0           6           2           4           4           3           1
-      284500    87473114          89          81           7           2          12           1          11           9           6           3
-      284500    87473121          93         100           6           3          15           4          11           9           6           3
+      284500    87473114          89          80           7           2          12           1          11           9           6           3
+      284500    87473121          93         100           6           3          15           4          11           8           6           2
       284500    87473132          84          56           9           1          12           0          12           3           3           0
       284500    87473137          94          71           8           3          15           0          15           9           9           0
       284500    87473144          78          66           7           1           8           2           6           8           6           2
-      284500    87473154          86          88           7           0          13           3          10          10           4           6
-      284500    87473162          53          52           4           0           6           0           6           3           2           1
+      284500    87473154          86          88           7           0          14           3          11           9           4           5
+      284500    87473162          53          51           4           0           7           0           7           3           2           1
       284500    87473167          77          54           6           3          14           2          12          13           8           5
       284500    87473171          77          69           8           3           4           2           2           5           4           1
-      284500    87473184          75          88           5           2           8           1           7           5           3           2
+      284500    87473184          75          87           5           2           8           1           7           5           3           2
       284500    87473192          55          52           4           1           7           4           3           5           4           1
diff --git a/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref b/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref
index dfa272a87c613634073e9363afd47e5998135ffb..40d01fee50f0a4107690bc8a087749f823630fd0 100644
--- a/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref
+++ b/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref
@@ -71,7 +71,7 @@ HLT_2g10_loose_mu20_L1MU20:
   stepFeatures:
     0: 3
     1: 3
-    2: 5
+    2: 4
 HLT_2g15_tight_dPhi15_L1DPHI-M70-2EM12I:
   eventCount: 0
 HLT_2g20_tight_L12EM15VH:
@@ -585,7 +585,7 @@ HLT_e17_lhloose_mu14_L1EM15VH_MU10:
   stepFeatures:
     0: 4
     1: 5
-    2: 6
+    2: 4
     3: 4
     4: 4
     5: 4
@@ -603,7 +603,7 @@ HLT_e17_lhvloose_nod0_L1EM15VH:
   stepFeatures:
     0: 6
     1: 7
-    2: 7
+    2: 5
     3: 5
     4: 5
 HLT_e17_lhvloose_nod0_L1EM15VHI:
@@ -617,7 +617,7 @@ HLT_e17_lhvloose_nod0_L1EM15VHI:
   stepFeatures:
     0: 5
     1: 6
-    2: 6
+    2: 4
     3: 4
     4: 4
 HLT_e20_lhmedium_e15_lhmedium_Zee_L12EM3:
@@ -649,7 +649,7 @@ HLT_e24_lhvloose_L1EM20VH:
   stepFeatures:
     0: 6
     1: 7
-    2: 7
+    2: 5
     3: 5
     4: 5
 HLT_e26_etcut_L1EM22VHI:
@@ -675,7 +675,7 @@ HLT_e26_lhloose_L1EM15VH:
   stepFeatures:
     0: 6
     1: 7
-    2: 7
+    2: 5
     3: 5
     4: 5
 HLT_e26_lhloose_L1EM22VHI:
@@ -689,7 +689,7 @@ HLT_e26_lhloose_L1EM22VHI:
   stepFeatures:
     0: 5
     1: 6
-    2: 6
+    2: 4
     3: 4
     4: 4
 HLT_e26_lhmedium_L1EM15VH:
@@ -703,7 +703,7 @@ HLT_e26_lhmedium_L1EM15VH:
   stepFeatures:
     0: 5
     1: 6
-    2: 6
+    2: 4
     3: 4
     4: 4
 HLT_e26_lhmedium_L1EM22VHI:
@@ -717,7 +717,7 @@ HLT_e26_lhmedium_L1EM22VHI:
   stepFeatures:
     0: 5
     1: 6
-    2: 6
+    2: 4
     3: 4
     4: 4
 HLT_e26_lhmedium_mu8noL1_L1EM22VHI:
@@ -733,7 +733,7 @@ HLT_e26_lhmedium_mu8noL1_L1EM22VHI:
   stepFeatures:
     0: 10
     1: 10
-    2: 10
+    2: 8
     3: 8
     4: 8
     5: 4
@@ -749,7 +749,7 @@ HLT_e26_lhtight_L1EM15VH:
   stepFeatures:
     0: 5
     1: 6
-    2: 6
+    2: 4
     3: 4
     4: 4
 HLT_e26_lhtight_L1EM22VHI:
@@ -763,7 +763,7 @@ HLT_e26_lhtight_L1EM22VHI:
   stepFeatures:
     0: 5
     1: 6
-    2: 6
+    2: 4
     3: 4
     4: 4
 HLT_e26_lhtight_gsf_L1EM22VHI:
@@ -777,7 +777,7 @@ HLT_e26_lhtight_gsf_L1EM22VHI:
   stepFeatures:
     0: 5
     1: 6
-    2: 6
+    2: 4
     3: 4
     4: 4
 HLT_e26_lhtight_ivarloose_L1EM22VHI:
@@ -791,7 +791,7 @@ HLT_e26_lhtight_ivarloose_L1EM22VHI:
   stepFeatures:
     0: 5
     1: 6
-    2: 6
+    2: 4
     3: 4
     4: 3
 HLT_e26_lhtight_ivarmedium_L1EM22VHI:
@@ -805,7 +805,7 @@ HLT_e26_lhtight_ivarmedium_L1EM22VHI:
   stepFeatures:
     0: 5
     1: 6
-    2: 6
+    2: 4
     3: 4
     4: 3
 HLT_e26_lhtight_ivartight_L1EM22VHI:
@@ -819,7 +819,7 @@ HLT_e26_lhtight_ivartight_L1EM22VHI:
   stepFeatures:
     0: 5
     1: 6
-    2: 6
+    2: 4
     3: 4
     4: 3
 HLT_e26_lhtight_nod0_L1EM22VHI:
@@ -833,7 +833,7 @@ HLT_e26_lhtight_nod0_L1EM22VHI:
   stepFeatures:
     0: 5
     1: 6
-    2: 6
+    2: 4
     3: 4
     4: 4
 HLT_e26_lhtight_nod0_L1EM24VHI:
@@ -847,7 +847,7 @@ HLT_e26_lhtight_nod0_L1EM24VHI:
   stepFeatures:
     0: 5
     1: 6
-    2: 6
+    2: 4
     3: 4
     4: 4
 HLT_e300_etcut_L1EM22VHI:
@@ -897,8 +897,8 @@ HLT_e5_lhloose_L1EM3:
   stepFeatures:
     0: 60
     1: 146
-    2: 78
-    3: 44
+    2: 81
+    3: 46
     4: 7
 HLT_e5_lhloose_noringer_L1EM3:
   eventCount: 6
@@ -911,7 +911,7 @@ HLT_e5_lhloose_noringer_L1EM3:
   stepFeatures:
     0: 56
     1: 130
-    2: 88
+    2: 84
     3: 46
     4: 7
 HLT_e5_lhmedium_L1EM3:
@@ -926,7 +926,7 @@ HLT_e5_lhmedium_L1EM3:
     0: 58
     1: 132
     2: 76
-    3: 42
+    3: 44
     4: 5
 HLT_e5_lhmedium_noringer_L1EM3:
   eventCount: 4
@@ -954,7 +954,7 @@ HLT_e5_lhtight_L1EM3:
     0: 57
     1: 129
     2: 74
-    3: 41
+    3: 43
     4: 5
 HLT_e5_lhtight_nod0_L1EM3:
   eventCount: 4
@@ -968,7 +968,7 @@ HLT_e5_lhtight_nod0_L1EM3:
     0: 57
     1: 129
     2: 74
-    3: 41
+    3: 43
     4: 5
 HLT_e5_lhtight_noringer_L1EM3:
   eventCount: 4
@@ -981,7 +981,7 @@ HLT_e5_lhtight_noringer_L1EM3:
   stepFeatures:
     0: 45
     1: 94
-    2: 60
+    2: 61
     3: 36
     4: 5
 HLT_e5_lhtight_noringer_nod0_L1EM3:
@@ -995,7 +995,7 @@ HLT_e5_lhtight_noringer_nod0_L1EM3:
   stepFeatures:
     0: 45
     1: 94
-    2: 60
+    2: 61
     3: 36
     4: 5
 HLT_e60_lhmedium_L1EM22VHI:
@@ -1009,7 +1009,7 @@ HLT_e60_lhmedium_L1EM22VHI:
   stepFeatures:
     0: 2
     1: 2
-    2: 4
+    2: 2
     3: 2
     4: 2
 HLT_e60_lhmedium_nod0_L1EM22VHI:
@@ -1023,7 +1023,7 @@ HLT_e60_lhmedium_nod0_L1EM22VHI:
   stepFeatures:
     0: 2
     1: 2
-    2: 4
+    2: 2
     3: 2
     4: 2
 HLT_e7_etcut_L1EM3:
@@ -1053,7 +1053,7 @@ HLT_e7_lhmedium_mu24_L1MU20:
   stepFeatures:
     0: 18
     1: 17
-    2: 17
+    2: 15
     3: 14
     4: 4
     5: 4
@@ -1085,7 +1085,7 @@ HLT_g12_loose_LArPEB_L1EM10VH:
   stepFeatures:
     0: 11
     1: 11
-    2: 24
+    2: 22
     3: 6
     4: 6
 HLT_g140_etcut_L1EM22VHI:
@@ -1104,7 +1104,7 @@ HLT_g20_loose_L1EM15VH:
   stepFeatures:
     0: 9
     1: 9
-    2: 17
+    2: 15
     3: 6
 HLT_g20_loose_L1EM15VHI:
   eventCount: 5
@@ -1116,7 +1116,7 @@ HLT_g20_loose_L1EM15VHI:
   stepFeatures:
     0: 6
     1: 6
-    2: 11
+    2: 9
     3: 5
 HLT_g20_loose_LArPEB_L1EM15:
   eventCount: 6
@@ -1129,7 +1129,7 @@ HLT_g20_loose_LArPEB_L1EM15:
   stepFeatures:
     0: 9
     1: 9
-    2: 17
+    2: 15
     3: 6
     4: 6
 HLT_g20_medium_L1EM15VH:
@@ -1142,7 +1142,7 @@ HLT_g20_medium_L1EM15VH:
   stepFeatures:
     0: 8
     1: 8
-    2: 15
+    2: 14
     3: 6
 HLT_g20_medium_L1EM15VHI:
   eventCount: 5
@@ -1154,7 +1154,7 @@ HLT_g20_medium_L1EM15VHI:
   stepFeatures:
     0: 6
     1: 6
-    2: 11
+    2: 9
     3: 5
 HLT_g20_tight_L1EM15VH:
   eventCount: 5
@@ -1166,7 +1166,7 @@ HLT_g20_tight_L1EM15VH:
   stepFeatures:
     0: 8
     1: 8
-    2: 15
+    2: 14
     3: 5
 HLT_g20_tight_L1EM15VHI:
   eventCount: 5
@@ -1178,7 +1178,7 @@ HLT_g20_tight_L1EM15VHI:
   stepFeatures:
     0: 6
     1: 6
-    2: 11
+    2: 9
     3: 5
 HLT_g20_tight_icaloloose_L1EM15VH:
   eventCount: 5
@@ -1190,7 +1190,7 @@ HLT_g20_tight_icaloloose_L1EM15VH:
   stepFeatures:
     0: 8
     1: 8
-    2: 15
+    2: 14
     3: 5
 HLT_g20_tight_icaloloose_L1EM15VHI:
   eventCount: 5
@@ -1202,7 +1202,7 @@ HLT_g20_tight_icaloloose_L1EM15VHI:
   stepFeatures:
     0: 6
     1: 6
-    2: 11
+    2: 9
     3: 5
 HLT_g20_tight_icalomedium_L1EM15VH:
   eventCount: 5
@@ -1214,7 +1214,7 @@ HLT_g20_tight_icalomedium_L1EM15VH:
   stepFeatures:
     0: 8
     1: 8
-    2: 15
+    2: 14
     3: 5
 HLT_g20_tight_icalomedium_L1EM15VHI:
   eventCount: 5
@@ -1226,7 +1226,7 @@ HLT_g20_tight_icalomedium_L1EM15VHI:
   stepFeatures:
     0: 6
     1: 6
-    2: 11
+    2: 9
     3: 5
 HLT_g20_tight_icalotight_L1EM15VH:
   eventCount: 0
@@ -1237,7 +1237,7 @@ HLT_g20_tight_icalotight_L1EM15VH:
   stepFeatures:
     0: 8
     1: 8
-    2: 15
+    2: 14
 HLT_g20_tight_icalotight_L1EM15VHI:
   eventCount: 0
   stepCounts:
@@ -1247,7 +1247,7 @@ HLT_g20_tight_icalotight_L1EM15VHI:
   stepFeatures:
     0: 6
     1: 6
-    2: 11
+    2: 9
 HLT_g22_tight_L1EM15VH:
   eventCount: 5
   stepCounts:
@@ -1258,7 +1258,7 @@ HLT_g22_tight_L1EM15VH:
   stepFeatures:
     0: 7
     1: 7
-    2: 12
+    2: 11
     3: 5
 HLT_g25_etcut_L1EM20VH:
   eventCount: 7
@@ -1280,7 +1280,7 @@ HLT_g25_loose_L1EM20VH:
   stepFeatures:
     0: 9
     1: 9
-    2: 17
+    2: 15
     3: 7
 HLT_g25_medium_L1EM20VH:
   eventCount: 6
@@ -1292,7 +1292,7 @@ HLT_g25_medium_L1EM20VH:
   stepFeatures:
     0: 7
     1: 7
-    2: 12
+    2: 11
     3: 6
 HLT_g25_medium_mu24_ivarmedium_L1MU20:
   eventCount: 0
@@ -1308,7 +1308,7 @@ HLT_g25_medium_mu24_ivarmedium_L1MU20:
   stepFeatures:
     0: 4
     1: 4
-    2: 6
+    2: 4
     3: 4
     4: 4
     5: 2
@@ -1324,7 +1324,7 @@ HLT_g25_tight_L1EM20VH:
   stepFeatures:
     0: 7
     1: 7
-    2: 12
+    2: 11
     3: 5
 HLT_g300_etcut_L1EM22VHI:
   eventCount: 0
@@ -1342,7 +1342,7 @@ HLT_g35_loose_mu18_L1EM24VHI:
   stepFeatures:
     0: 4
     1: 4
-    2: 6
+    2: 4
     3: 4
     4: 4
     5: 2
@@ -1359,7 +1359,7 @@ HLT_g35_tight_icalotight_mu18noL1_L1EM22VHI:
   stepFeatures:
     0: 10
     1: 10
-    2: 13
+    2: 11
 HLT_g3_loose_LArPEB_L1EM3:
   eventCount: 9
   stepCounts:
@@ -1385,7 +1385,7 @@ HLT_g40_loose_LArPEB_L1EM20VHI:
   stepFeatures:
     0: 5
     1: 5
-    2: 10
+    2: 8
     3: 5
     4: 5
 HLT_g5_etcut_L1EM3:
@@ -1408,7 +1408,7 @@ HLT_g5_loose_L1EM3:
   stepFeatures:
     0: 56
     1: 56
-    2: 103
+    2: 101
     3: 14
 HLT_g5_medium_L1EM3:
   eventCount: 9
@@ -1420,7 +1420,7 @@ HLT_g5_medium_L1EM3:
   stepFeatures:
     0: 48
     1: 48
-    2: 81
+    2: 83
     3: 12
 HLT_g5_tight_L1EM3:
   eventCount: 8
@@ -1432,7 +1432,7 @@ HLT_g5_tight_L1EM3:
   stepFeatures:
     0: 45
     1: 45
-    2: 73
+    2: 76
     3: 8
 HLT_g60_loose_LArPEB_L1EM20VHI:
   eventCount: 3
@@ -1445,7 +1445,7 @@ HLT_g60_loose_LArPEB_L1EM20VHI:
   stepFeatures:
     0: 3
     1: 3
-    2: 7
+    2: 5
     3: 3
     4: 3
 HLT_g80_loose_LArPEB_L1EM20VHI:
@@ -1570,15 +1570,15 @@ HLT_j420_subresjesgscIS_ftf_L1J100:
     0: 3
 HLT_j45_L1J15:
   eventCount: 0
-HLT_j45_csskpf_nojcalib_ftf_L1J20:
+HLT_j45_csskpf_nojcalib_ftf_L1J15:
   eventCount: 17
   stepCounts:
-    0: 19
+    0: 20
     1: 17
   stepFeatures:
-    0: 19
+    0: 20
     1: 37
-HLT_j45_cssktc_nojcalib_L1J20:
+HLT_j45_cssktc_nojcalib_L1J15:
   eventCount: 15
   stepCounts:
     0: 15
@@ -1592,75 +1592,75 @@ HLT_j45_ftf_L1J15:
   stepFeatures:
     0: 20
     1: 55
-HLT_j45_ftf_preselj20_L1J20:
+HLT_j45_ftf_preselj20_L1J15:
   eventCount: 19
   stepCounts:
-    0: 19
+    0: 20
     1: 19
   stepFeatures:
-    0: 19
+    0: 20
     1: 55
-HLT_j45_nojcalib_L1J20:
+HLT_j45_nojcalib_L1J15:
   eventCount: 17
   stepCounts:
     0: 17
   stepFeatures:
     0: 39
-HLT_j45_pf_ftf_010jvt_L1J20:
+HLT_j45_pf_ftf_010jvt_L1J15:
   eventCount: 19
   stepCounts:
-    0: 19
+    0: 20
     1: 19
   stepFeatures:
-    0: 19
+    0: 20
     1: 55
-HLT_j45_pf_ftf_020jvt_L1J20:
+HLT_j45_pf_ftf_020jvt_L1J15:
   eventCount: 19
   stepCounts:
-    0: 19
+    0: 20
     1: 19
   stepFeatures:
-    0: 19
+    0: 20
     1: 54
-HLT_j45_pf_ftf_050jvt_L1J20:
+HLT_j45_pf_ftf_050jvt_L1J15:
   eventCount: 19
   stepCounts:
-    0: 19
+    0: 20
     1: 19
   stepFeatures:
-    0: 19
+    0: 20
     1: 54
-HLT_j45_pf_ftf_L1J20:
+HLT_j45_pf_ftf_L1J15:
   eventCount: 19
   stepCounts:
-    0: 19
+    0: 20
     1: 19
   stepFeatures:
-    0: 19
+    0: 20
     1: 56
-HLT_j45_pf_ftf_preselj20_L1J20:
+HLT_j45_pf_ftf_preselj20_L1J15:
   eventCount: 19
   stepCounts:
-    0: 19
+    0: 20
     1: 19
   stepFeatures:
-    0: 19
+    0: 20
     1: 56
-HLT_j45_pf_nojcalib_ftf_L1J20:
+HLT_j45_pf_nojcalib_ftf_L1J15:
   eventCount: 18
   stepCounts:
-    0: 19
+    0: 20
     1: 18
   stepFeatures:
-    0: 19
+    0: 20
     1: 49
-HLT_j45_pf_subjesgscIS_ftf_L1J20:
+HLT_j45_pf_subjesgscIS_ftf_L1J15:
   eventCount: 19
   stepCounts:
-    0: 19
+    0: 20
     1: 19
   stepFeatures:
-    0: 19
+    0: 20
     1: 52
 HLT_j45_pf_subjesgscIS_ftf_bdl1r70_split_L1J20:
   eventCount: 14
@@ -1682,19 +1682,19 @@ HLT_j45_pf_subjesgscIS_ftf_boffperf_split_L1J20:
     0: 19
     1: 49
     2: 49
-HLT_j45_sktc_nojcalib_L1J20:
+HLT_j45_sktc_nojcalib_L1J15:
   eventCount: 15
   stepCounts:
     0: 15
   stepFeatures:
     0: 26
-HLT_j45_subjesIS_ftf_preselj20_L1J20:
+HLT_j45_subjesIS_ftf_preselj20_L1J15:
   eventCount: 19
   stepCounts:
-    0: 19
+    0: 20
     1: 19
   stepFeatures:
-    0: 19
+    0: 20
     1: 50
 HLT_j45_subjesgscIS_ftf_011jvt_L1J15:
   eventCount: 18
@@ -2222,7 +2222,7 @@ HLT_mu6_L1MU6:
     1: 12
     2: 13
     3: 13
-HLT_mu6_idperfLRT_l2lrt_L1MU6:
+HLT_mu6_LRT_idperf_l2lrt_L1MU6:
   eventCount: 10
   stepCounts:
     0: 10