diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkL1Calo/python/L1CALOCore.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkL1Calo/python/L1CALOCore.py
index 8db5fa04b08a7299f0ac7dd30dea85724789aa0c..73320aed3fea144c6f0ddbcf73e6011217cf392e 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkL1Calo/python/L1CALOCore.py
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkL1Calo/python/L1CALOCore.py
@@ -112,13 +112,11 @@ def L1CALOCoreCfg(flags, deriv='L1CALO1', **kwargs):
     # Re-simulate from LATOME
     if isNotPool:
         from L1CaloFEXSim.L1CaloFEXSimCfg import L1CaloFEXSimCfg
-        acc.merge(L1CaloFEXSimCfg(flags))
+        acc.merge(L1CaloFEXSimCfg(flags, simulateAltTau=True))
 
     # decorate the eFEX TOBs (offline copy) - must be configured to run *after* resimulation
     if flags.Trigger.L1.doeFex and isNotPool:
         from L1CaloFEXAlgos.L1CaloFEXAlgosConfig import eFexTOBDecoratorCfg
-        DecoratorAlgo = eFexTOBDecoratorCfg(flags,'eFexTOBDecorator','L1_eEMRoI_OfflineCopy','L1_eTauRoI_OfflineCopy')
-        acc.merge(DecoratorAlgo)
         DecoratorAlgoSim = eFexTOBDecoratorCfg(flags,'eFexTOBDecoratorSim','L1_eEMRoISim','L1_eTauRoISim')
         acc.merge(DecoratorAlgoSim)
 
@@ -376,10 +374,6 @@ def L1CALOCoreCfg(flags, deriv='L1CALO1', **kwargs):
     L1CaloSlimmingHelper,AllVariables = addEfexTOBs(L1CaloSlimmingHelper, AllVariables)
     L1CaloSlimmingHelper,AllVariables = addJfexTOBs(L1CaloSlimmingHelper, AllVariables)
     L1CaloSlimmingHelper,AllVariables = addGfexTOBs(L1CaloSlimmingHelper, AllVariables)
-    # TOBs from reconstruction (_OfflineCopy) - will be removed once fully commissioned
-    L1CaloSlimmingHelper,AllVariables = addEfexTOBs(L1CaloSlimmingHelper, AllVariables, "_OfflineCopy")
-    L1CaloSlimmingHelper,AllVariables = addJfexTOBs(L1CaloSlimmingHelper, AllVariables, "_OfflineCopy")
-    L1CaloSlimmingHelper,AllVariables = addGfexTOBs(L1CaloSlimmingHelper, AllVariables, "_OfflineCopy")
 
     # re-simulated 
     L1CaloSlimmingHelper,AllVariables = addEfexTOBs(L1CaloSlimmingHelper, AllVariables, "Sim")
@@ -471,24 +465,24 @@ def addEfexTOBs(slimminghelper, allVariables, postFix = ""):
          "L1_eEMRoI"+postFix+"Aux" : "xAOD::eFexEMRoIAuxContainer",
          "L1_eTauRoI"+postFix : "xAOD::eFexTauRoIContainer",
          "L1_eTauRoI"+postFix+"Aux" : "xAOD::eFexTauRoIAuxContainer",
-         "L1_eTauBDTRoI"+postFix : "xAOD::eFexTauRoIContainer",
-         "L1_eTauBDTRoI"+postFix+"Aux" : "xAOD::eFexTauRoIAuxContainer",
+         "L1_eTauRoIAlt"+postFix : "xAOD::eFexTauRoIContainer",
+         "L1_eTauRoIAlt"+postFix+"Aux" : "xAOD::eFexTauRoIAuxContainer",
          "L1_cTauRoI"+postFix : "xAOD::eFexTauRoIContainer",
          "L1_cTauRoI"+postFix+"Aux" : "xAOD::eFexTauRoIAuxContainer",
          "L1_eEMxRoI"+postFix : "xAOD::eFexEMRoIContainer",
          "L1_eEMxRoI"+postFix+"Aux" : "xAOD::eFexEMRoIAuxContainer",
          "L1_eTauxRoI"+postFix : "xAOD::eFexTauRoIContainer",
          "L1_eTauxRoI"+postFix+"Aux" : "xAOD::eFexTauRoIAuxContainer",
-         "L1_eTauBDTxRoI"+postFix : "xAOD::eFexTauRoIContainer",
-         "L1_eTauBDTxRoI"+postFix+"Aux" : "xAOD::eFexTauRoIAuxContainer"} )    
+         "L1_eTauxRoIAlt"+postFix : "xAOD::eFexTauRoIContainer",
+         "L1_eTauxRoIAlt"+postFix+"Aux" : "xAOD::eFexTauRoIAuxContainer"} )    
 
     allVariables += ["L1_eEMRoI" + postFix,
                      "L1_eTauRoI" + postFix,
-                     "L1_eTauBDTRoI" + postFix,
+                     "L1_eTauRoIAlt" + postFix,
                      "L1_cTauRoI" + postFix,
                      "L1_eEMxRoI" + postFix,
                      "L1_eTauxRoI" + postFix,
-                     "L1_eTauBDTxRoI" + postFix]
+                     "L1_eTauxRoIAlt" + postFix]
     
     return slimminghelper, allVariables
 
diff --git a/Tools/PROCTools/data/q449_AOD_content.ref b/Tools/PROCTools/data/q449_AOD_content.ref
index 17d0332f8b3b874d81275d81f7e5e6d1815fe5e0..f7229f8a6569d86484852bbefaf0d8be9f24ae10 100644
--- a/Tools/PROCTools/data/q449_AOD_content.ref
+++ b/Tools/PROCTools/data/q449_AOD_content.ref
@@ -1508,20 +1508,14 @@ L1_cTauRoI
 L1_cTauRoIAux.
 L1_eEMRoI
 L1_eEMRoIAux.
-L1_eEMRoI_OfflineCopy
-L1_eEMRoI_OfflineCopyAux.
 L1_eEMxRoI
 L1_eEMxRoIAux.
 L1_eEMxRoIOutOfTime
 L1_eEMxRoIOutOfTimeAux.
 L1_eFexDataTowers
 L1_eFexDataTowersAux.
-L1_eTauBDTRoI
-L1_eTauBDTRoIAux.
 L1_eTauRoI
 L1_eTauRoIAux.
-L1_eTauRoI_OfflineCopy
-L1_eTauRoI_OfflineCopyAux.
 L1_eTauxRoI
 L1_eTauxRoIAux.
 L1_eTauxRoIOutOfTime
@@ -1530,84 +1524,50 @@ L1_gFexDataTowers
 L1_gFexDataTowersAux.
 L1_gFexLRJetRoI
 L1_gFexLRJetRoIAux.
-L1_gFexLRJetRoI_OfflineCopy
-L1_gFexLRJetRoI_OfflineCopyAux.
 L1_gFexRhoRoI
 L1_gFexRhoRoIAux.
-L1_gFexRhoRoI_OfflineCopy
-L1_gFexRhoRoI_OfflineCopyAux.
 L1_gFexSRJetRoI
 L1_gFexSRJetRoIAux.
-L1_gFexSRJetRoI_OfflineCopy
-L1_gFexSRJetRoI_OfflineCopyAux.
 L1_gMETComponentsJwoj
 L1_gMETComponentsJwojAux.
-L1_gMETComponentsJwoj_OfflineCopy
-L1_gMETComponentsJwoj_OfflineCopyAux.
 L1_gMETComponentsNoiseCut
 L1_gMETComponentsNoiseCutAux.
-L1_gMETComponentsNoiseCut_OfflineCopy
-L1_gMETComponentsNoiseCut_OfflineCopyAux.
 L1_gMETComponentsRms
 L1_gMETComponentsRmsAux.
-L1_gMETComponentsRms_OfflineCopy
-L1_gMETComponentsRms_OfflineCopyAux.
 L1_gMHTComponentsJwoj
 L1_gMHTComponentsJwojAux.
-L1_gMHTComponentsJwoj_OfflineCopy
-L1_gMHTComponentsJwoj_OfflineCopyAux.
 L1_gMSTComponentsJwoj
 L1_gMSTComponentsJwojAux.
-L1_gMSTComponentsJwoj_OfflineCopy
-L1_gMSTComponentsJwoj_OfflineCopyAux.
 L1_gScalarEJwoj
 L1_gScalarEJwojAux.
-L1_gScalarEJwoj_OfflineCopy
-L1_gScalarEJwoj_OfflineCopyAux.
 L1_gScalarENoiseCut
 L1_gScalarENoiseCutAux.
-L1_gScalarENoiseCut_OfflineCopy
-L1_gScalarENoiseCut_OfflineCopyAux.
 L1_gScalarERms
 L1_gScalarERmsAux.
-L1_gScalarERms_OfflineCopy
-L1_gScalarERms_OfflineCopyAux.
 L1_jFexDataTowers
 L1_jFexDataTowersAux.
 L1_jFexFwdElRoI
 L1_jFexFwdElRoIAux.
-L1_jFexFwdElRoI_OfflineCopy
-L1_jFexFwdElRoI_OfflineCopyAux.
 L1_jFexFwdElxRoI
 L1_jFexFwdElxRoIAux.
 L1_jFexLRJetRoI
 L1_jFexLRJetRoIAux.
-L1_jFexLRJetRoI_OfflineCopy
-L1_jFexLRJetRoI_OfflineCopyAux.
 L1_jFexLRJetxRoI
 L1_jFexLRJetxRoIAux.
 L1_jFexMETRoI
 L1_jFexMETRoIAux.
-L1_jFexMETRoI_OfflineCopy
-L1_jFexMETRoI_OfflineCopyAux.
 L1_jFexMETxRoI
 L1_jFexMETxRoIAux.
 L1_jFexSRJetRoI
 L1_jFexSRJetRoIAux.
-L1_jFexSRJetRoI_OfflineCopy
-L1_jFexSRJetRoI_OfflineCopyAux.
 L1_jFexSRJetxRoI
 L1_jFexSRJetxRoIAux.
 L1_jFexSumETRoI
 L1_jFexSumETRoIAux.
-L1_jFexSumETRoI_OfflineCopy
-L1_jFexSumETRoI_OfflineCopyAux.
 L1_jFexSumETxRoI
 L1_jFexSumETxRoIAux.
 L1_jFexTauRoI
 L1_jFexTauRoIAux.
-L1_jFexTauRoI_OfflineCopy
-L1_jFexTauRoI_OfflineCopyAux.
 L1_jFexTauxRoI
 L1_jFexTauxRoIAux.
 LArNoisyROSummary
diff --git a/Tools/PROCTools/data/q450_AOD_content.ref b/Tools/PROCTools/data/q450_AOD_content.ref
index 96e96838e4a6f2520b615a9fcc28cb6c29fd3916..8e4c1b7b0c0c9426d497b42d3289915eb02cd749 100644
--- a/Tools/PROCTools/data/q450_AOD_content.ref
+++ b/Tools/PROCTools/data/q450_AOD_content.ref
@@ -594,8 +594,6 @@ L1_cTauRoI
 L1_cTauRoIAux.
 L1_eEMRoI
 L1_eEMRoIAux.
-L1_eEMRoI_OfflineCopy
-L1_eEMRoI_OfflineCopyAux.
 L1_eEMxRoI
 L1_eEMxRoIAux.
 L1_eEMxRoIOutOfTime
@@ -604,8 +602,6 @@ L1_eFexDataTowers
 L1_eFexDataTowersAux.
 L1_eTauRoI
 L1_eTauRoIAux.
-L1_eTauRoI_OfflineCopy
-L1_eTauRoI_OfflineCopyAux.
 L1_eTauxRoI
 L1_eTauxRoIAux.
 L1_eTauxRoIOutOfTime
@@ -614,74 +610,40 @@ L1_gFexDataTowers
 L1_gFexDataTowersAux.
 L1_gFexLRJetRoI
 L1_gFexLRJetRoIAux.
-L1_gFexLRJetRoI_OfflineCopy
-L1_gFexLRJetRoI_OfflineCopyAux.
 L1_gFexRhoRoI
 L1_gFexRhoRoIAux.
-L1_gFexRhoRoI_OfflineCopy
-L1_gFexRhoRoI_OfflineCopyAux.
 L1_gFexSRJetRoI
 L1_gFexSRJetRoIAux.
-L1_gFexSRJetRoI_OfflineCopy
-L1_gFexSRJetRoI_OfflineCopyAux.
 L1_gMETComponentsJwoj
 L1_gMETComponentsJwojAux.
-L1_gMETComponentsJwoj_OfflineCopy
-L1_gMETComponentsJwoj_OfflineCopyAux.
-L1_gMETComponentsNoiseCut_OfflineCopy
-L1_gMETComponentsNoiseCut_OfflineCopyAux.
-L1_gMETComponentsRms_OfflineCopy
-L1_gMETComponentsRms_OfflineCopyAux.
 L1_gMHTComponentsJwoj
 L1_gMHTComponentsJwojAux.
-L1_gMHTComponentsJwoj_OfflineCopy
-L1_gMHTComponentsJwoj_OfflineCopyAux.
 L1_gMSTComponentsJwoj
 L1_gMSTComponentsJwojAux.
-L1_gMSTComponentsJwoj_OfflineCopy
-L1_gMSTComponentsJwoj_OfflineCopyAux.
 L1_gScalarEJwoj
 L1_gScalarEJwojAux.
-L1_gScalarEJwoj_OfflineCopy
-L1_gScalarEJwoj_OfflineCopyAux.
-L1_gScalarENoiseCut_OfflineCopy
-L1_gScalarENoiseCut_OfflineCopyAux.
-L1_gScalarERms_OfflineCopy
-L1_gScalarERms_OfflineCopyAux.
 L1_jFexDataTowers
 L1_jFexDataTowersAux.
-L1_jFexFwdElRoI_OfflineCopy
-L1_jFexFwdElRoI_OfflineCopyAux.
 L1_jFexFwdElxRoI
 L1_jFexFwdElxRoIAux.
 L1_jFexLRJetRoI
 L1_jFexLRJetRoIAux.
-L1_jFexLRJetRoI_OfflineCopy
-L1_jFexLRJetRoI_OfflineCopyAux.
 L1_jFexLRJetxRoI
 L1_jFexLRJetxRoIAux.
 L1_jFexMETRoI
 L1_jFexMETRoIAux.
-L1_jFexMETRoI_OfflineCopy
-L1_jFexMETRoI_OfflineCopyAux.
 L1_jFexMETxRoI
 L1_jFexMETxRoIAux.
 L1_jFexSRJetRoI
 L1_jFexSRJetRoIAux.
-L1_jFexSRJetRoI_OfflineCopy
-L1_jFexSRJetRoI_OfflineCopyAux.
 L1_jFexSRJetxRoI
 L1_jFexSRJetxRoIAux.
 L1_jFexSumETRoI
 L1_jFexSumETRoIAux.
-L1_jFexSumETRoI_OfflineCopy
-L1_jFexSumETRoI_OfflineCopyAux.
 L1_jFexSumETxRoI
 L1_jFexSumETxRoIAux.
 L1_jFexTauRoI
 L1_jFexTauRoIAux.
-L1_jFexTauRoI_OfflineCopy
-L1_jFexTauRoI_OfflineCopyAux.
 L1_jFexTauxRoI
 L1_jFexTauxRoIAux.
 LArNoisyROSummary
diff --git a/Tools/PROCTools/data/q451_AOD_content.ref b/Tools/PROCTools/data/q451_AOD_content.ref
index 09ad1d77a030e74c146c870edaf7783b5e2a89f0..2b31a6c3c0e595026a0a9145a3dc804ca1d10a1b 100644
--- a/Tools/PROCTools/data/q451_AOD_content.ref
+++ b/Tools/PROCTools/data/q451_AOD_content.ref
@@ -567,8 +567,6 @@ L1_cTauRoI
 L1_cTauRoIAux.
 L1_eEMRoI
 L1_eEMRoIAux.
-L1_eEMRoI_OfflineCopy
-L1_eEMRoI_OfflineCopyAux.
 L1_eEMxRoI
 L1_eEMxRoIAux.
 L1_eEMxRoIOutOfTime
@@ -577,8 +575,6 @@ L1_eFexDataTowers
 L1_eFexDataTowersAux.
 L1_eTauRoI
 L1_eTauRoIAux.
-L1_eTauRoI_OfflineCopy
-L1_eTauRoI_OfflineCopyAux.
 L1_eTauxRoI
 L1_eTauxRoIAux.
 L1_eTauxRoIOutOfTime
@@ -587,74 +583,40 @@ L1_gFexDataTowers
 L1_gFexDataTowersAux.
 L1_gFexLRJetRoI
 L1_gFexLRJetRoIAux.
-L1_gFexLRJetRoI_OfflineCopy
-L1_gFexLRJetRoI_OfflineCopyAux.
 L1_gFexRhoRoI
 L1_gFexRhoRoIAux.
-L1_gFexRhoRoI_OfflineCopy
-L1_gFexRhoRoI_OfflineCopyAux.
 L1_gFexSRJetRoI
 L1_gFexSRJetRoIAux.
-L1_gFexSRJetRoI_OfflineCopy
-L1_gFexSRJetRoI_OfflineCopyAux.
 L1_gMETComponentsJwoj
 L1_gMETComponentsJwojAux.
-L1_gMETComponentsJwoj_OfflineCopy
-L1_gMETComponentsJwoj_OfflineCopyAux.
-L1_gMETComponentsNoiseCut_OfflineCopy
-L1_gMETComponentsNoiseCut_OfflineCopyAux.
-L1_gMETComponentsRms_OfflineCopy
-L1_gMETComponentsRms_OfflineCopyAux.
 L1_gMHTComponentsJwoj
 L1_gMHTComponentsJwojAux.
-L1_gMHTComponentsJwoj_OfflineCopy
-L1_gMHTComponentsJwoj_OfflineCopyAux.
 L1_gMSTComponentsJwoj
 L1_gMSTComponentsJwojAux.
-L1_gMSTComponentsJwoj_OfflineCopy
-L1_gMSTComponentsJwoj_OfflineCopyAux.
 L1_gScalarEJwoj
 L1_gScalarEJwojAux.
-L1_gScalarEJwoj_OfflineCopy
-L1_gScalarEJwoj_OfflineCopyAux.
-L1_gScalarENoiseCut_OfflineCopy
-L1_gScalarENoiseCut_OfflineCopyAux.
-L1_gScalarERms_OfflineCopy
-L1_gScalarERms_OfflineCopyAux.
 L1_jFexDataTowers
 L1_jFexDataTowersAux.
-L1_jFexFwdElRoI_OfflineCopy
-L1_jFexFwdElRoI_OfflineCopyAux.
 L1_jFexFwdElxRoI
 L1_jFexFwdElxRoIAux.
 L1_jFexLRJetRoI
 L1_jFexLRJetRoIAux.
-L1_jFexLRJetRoI_OfflineCopy
-L1_jFexLRJetRoI_OfflineCopyAux.
 L1_jFexLRJetxRoI
 L1_jFexLRJetxRoIAux.
 L1_jFexMETRoI
 L1_jFexMETRoIAux.
-L1_jFexMETRoI_OfflineCopy
-L1_jFexMETRoI_OfflineCopyAux.
 L1_jFexMETxRoI
 L1_jFexMETxRoIAux.
 L1_jFexSRJetRoI
 L1_jFexSRJetRoIAux.
-L1_jFexSRJetRoI_OfflineCopy
-L1_jFexSRJetRoI_OfflineCopyAux.
 L1_jFexSRJetxRoI
 L1_jFexSRJetxRoIAux.
 L1_jFexSumETRoI
 L1_jFexSumETRoIAux.
-L1_jFexSumETRoI_OfflineCopy
-L1_jFexSumETRoI_OfflineCopyAux.
 L1_jFexSumETxRoI
 L1_jFexSumETxRoIAux.
 L1_jFexTauRoI
 L1_jFexTauRoIAux.
-L1_jFexTauRoI_OfflineCopy
-L1_jFexTauRoI_OfflineCopyAux.
 L1_jFexTauxRoI
 L1_jFexTauxRoIAux.
 LArNoisyROSummary
diff --git a/Tools/WorkflowTestRunner/python/References.py b/Tools/WorkflowTestRunner/python/References.py
index 0219e3948db7abe98b8df8d5ef1f6a72c0ab08a0..261af294878fddc6a9ab14b2614d5cc2c01f93f4 100644
--- a/Tools/WorkflowTestRunner/python/References.py
+++ b/Tools/WorkflowTestRunner/python/References.py
@@ -24,7 +24,7 @@ references_map = {
     "d1912": "v1",
     # Reco
     "q442": "v43",
-    "q449": "v64",
+    "q449": "v65",
     "q452": "v1",
     "q454": "v1",
     # Derivations
diff --git a/Trigger/TrigConfiguration/TrigConfData/TrigConfData/L1ThrExtraInfo.h b/Trigger/TrigConfiguration/TrigConfData/TrigConfData/L1ThrExtraInfo.h
index 592a1d1bc425bacf0b0919a8c36f995af0ade520..cacee8253122711a85ee84db17f891bee536c2b1 100644
--- a/Trigger/TrigConfiguration/TrigConfData/TrigConfData/L1ThrExtraInfo.h
+++ b/Trigger/TrigConfiguration/TrigConfData/TrigConfData/L1ThrExtraInfo.h
@@ -277,6 +277,7 @@ namespace TrigConf {
       unsigned int ptMinToTopoCounts() const { return energyInCounts( m_ptMinToTopoMeV, resolutionMeV() ); }
       const WorkingPoints_eTAU & isolation(TrigConf::Selection::WP wp, int eta) const { return m_isolation.at(wp).at(eta); }
       const ValueWithEtaDependence<WorkingPoints_eTAU> & isolation(TrigConf::Selection::WP wp) const  { return m_isolation.at(wp); }
+      unsigned int algoVersion() const { return m_algoVersion; }
    private:
       /** Update the internal members */
       void load();
@@ -284,6 +285,7 @@ namespace TrigConf {
       unsigned int m_maxEt { 0 };
       unsigned int m_ptMinToTopoMeV{0};
       std::map<TrigConf::Selection::WP, ValueWithEtaDependence<WorkingPoints_eTAU>> m_isolation{};
+      unsigned int m_algoVersion { 0 };
    };
    std::ostream & operator<<(std::ostream & os, const TrigConf::L1ThrExtraInfo_eTAU::WorkingPoints_eTAU & iso);
 
diff --git a/Trigger/TrigConfiguration/TrigConfData/src/L1ThrExtraInfo.cxx b/Trigger/TrigConfiguration/TrigConfData/src/L1ThrExtraInfo.cxx
index 65a2358412a23ffe8470db2d7feee4bcdcc16ab7..7446ff7f83240fa7a242b2b279128a5c5e070c77 100644
--- a/Trigger/TrigConfiguration/TrigConfData/src/L1ThrExtraInfo.cxx
+++ b/Trigger/TrigConfiguration/TrigConfData/src/L1ThrExtraInfo.cxx
@@ -407,6 +407,8 @@ TrigConf::L1ThrExtraInfo_eTAU::load()
                iso.addRangeValue(WorkingPoints_eTAU(c.second), etamin, etamax, priority, /*symmetric=*/ false);
             }
          }
+      } else if (x.first == "algoVersion") {
+	 m_algoVersion = x.second.getValue<unsigned int>();
       }
    }
 }
diff --git a/Trigger/TrigT1/L1CaloFEX/L1CaloFEXSim/CMakeLists.txt b/Trigger/TrigT1/L1CaloFEX/L1CaloFEXSim/CMakeLists.txt
index 047976d2209b3d50c3a4dc303dc14e844d0cc375..6968b99ef5d22c11e38b203ad594af4875f4d1b9 100644
--- a/Trigger/TrigT1/L1CaloFEX/L1CaloFEXSim/CMakeLists.txt
+++ b/Trigger/TrigT1/L1CaloFEX/L1CaloFEXSim/CMakeLists.txt
@@ -47,6 +47,7 @@ atlas_add_test( L1CaloFEXSimCfg_R3data
 
 atlas_add_test( L1CaloFEXSimCfgBDTTau_R3data
                 SCRIPT python -m L1CaloFEXSim.L1CaloFEXSimCfg -i data -e -d -n 5
+                PROPERTIES TIMEOUT 300
                 PRIVATE_WORKING_DIRECTORY 
 		ENVIRONMENT "TAU_EFEX_BDT_CONFIG_PATH=${CMAKE_CURRENT_SOURCE_DIR}/data/bdt_config_v16.json"
 		POST_EXEC_SCRIPT ${CMAKE_CURRENT_SOURCE_DIR}/share/validateBDTTau.py )
diff --git a/Trigger/TrigT1/L1CaloFEX/L1CaloFEXSim/L1CaloFEXSim/eFEXSysSim.h b/Trigger/TrigT1/L1CaloFEX/L1CaloFEXSim/L1CaloFEXSim/eFEXSysSim.h
index 7007da2992f0bbdac4f299185c11a537101e8855..b3b5a0d67ffc65b9072a750d1c0ed0e3e5a348ab 100644
--- a/Trigger/TrigT1/L1CaloFEX/L1CaloFEXSim/L1CaloFEXSim/eFEXSysSim.h
+++ b/Trigger/TrigT1/L1CaloFEX/L1CaloFEXSim/L1CaloFEXSim/eFEXSysSim.h
@@ -109,13 +109,14 @@ namespace LVL1 {
     ToolHandle<IeFEXFillEDM> m_eFEXFillEDMTool {this, "eFEXFillEDMTool", "LVL1::eFEXFillEDM", "Tool to fille eFEX EDMs"};
 
     SG::ReadHandleKey<LVL1::eTowerContainer> m_eTowerContainerSGKey {this, "MyETowers", "eTowerContainer", "Input container for eTowers"};
+    SG::ReadHandleKey<TrigConf::L1Menu> m_l1MenuKey{this, "L1TriggerMenu", "DetectorStore+L1TriggerMenu","Name of the L1Menu object to read configuration from"}; 
 
     SG::WriteHandleKey< xAOD::eFexEMRoIContainer > m_eFexOutKey {this,"Key_eFexEMOutputContainer","L1_eEMRoI","Output eFexEM TOB container"};
     SG::WriteHandleKey< xAOD::eFexEMRoIContainer > m_eFexEMxTOBOutKey {this,"Key_eFexEMxTOBOutputContainer","L1_eEMxRoI","Output eFexEM xTOB container"};
-    SG::WriteHandleKey< xAOD::eFexTauRoIContainer > m_eFexTauHeuristicOutKey {this,"Key_eFexTauOutputContainer","L1_eTauRoI","Output eFexTau TOB container"};
-    SG::WriteHandleKey< xAOD::eFexTauRoIContainer > m_eFexTauHeuristicxTOBOutKey {this,"Key_eFexTauxTOBOutputContainer","L1_eTauxRoI","Output eFexTau xTOB container"};
-    SG::WriteHandleKey< xAOD::eFexTauRoIContainer > m_eFexTauBDTOutKey {this,"Key_eFexTauBDTOutputContainer","L1_eTauBDTRoI","Output eFexTau BDT TOB container"};
-    SG::WriteHandleKey< xAOD::eFexTauRoIContainer > m_eFexTauBDTxTOBOutKey {this,"Key_eFexTauBDTxTOBOutputContainer","L1_eTauBDTxRoI","Output eFexTau BDT xTOB container"};
+    SG::WriteHandleKey< xAOD::eFexTauRoIContainer > m_eFexTauActiveOutKey {this,"Key_eFexTauOutputContainer","L1_eTauRoI","Output eFexTau active (BDT/heuristic) algorithm TOB container"};
+    SG::WriteHandleKey< xAOD::eFexTauRoIContainer > m_eFexTauActivexTOBOutKey {this,"Key_eFexTauxTOBOutputContainer","L1_eTauxRoI","Output eFexTau active (BDT/heuristic) algorithm xTOB container"};
+    SG::WriteHandleKey< xAOD::eFexTauRoIContainer > m_eFexTauAltOutKey {this,"Key_eFexAltTauOutputContainer","","Output eFexTau alternative (BDT/heuristic) algorithm TOB container"};
+    SG::WriteHandleKey< xAOD::eFexTauRoIContainer > m_eFexTauAltxTOBOutKey {this,"Key_eFexAltTauxTOBOutputContainer","","Output eFexTau alternative (BDT/heuristic) algorithm xTOB container"};
     ToolHandle<IeFEXFPGATowerIdProvider> m_eFEXFPGATowerIdProviderTool {this, "eFEXFPGATowerIdProviderTool", "LVL1::eFEXFPGATowerIdProvider", "Tool that provides tower-FPGA mapping"};
     ToolHandle<IeFEXFPGA> m_eFEXFPGATool {this, "eFEXFPGATool", "LVL1::eFEXFPGA", "Tool that simulates the FPGA hardware"};
 
diff --git a/Trigger/TrigT1/L1CaloFEX/L1CaloFEXSim/python/L1CaloFEXSimCfg.py b/Trigger/TrigT1/L1CaloFEX/L1CaloFEXSim/python/L1CaloFEXSimCfg.py
index bb01175a9da4864fa86aefcf480d1573e2d2a4b8..58748fd2b8557972ad52989ed358633537a6c841 100644
--- a/Trigger/TrigT1/L1CaloFEX/L1CaloFEXSim/python/L1CaloFEXSimCfg.py
+++ b/Trigger/TrigT1/L1CaloFEX/L1CaloFEXSim/python/L1CaloFEXSimCfg.py
@@ -74,7 +74,7 @@ def TriggerTowersInputCfg(flags):
         return LVL1CaloRun2ReadBSCfg(flags)
 
 
-def L1CaloFEXSimCfg(flags, eFexTowerInputs = ["L1_eFexDataTowers","L1_eFexEmulatedTowers"],deadMaterialCorrections=True, outputSuffix=""):
+def L1CaloFEXSimCfg(flags, eFexTowerInputs = ["L1_eFexDataTowers","L1_eFexEmulatedTowers"],deadMaterialCorrections=True, outputSuffix="", simulateAltTau=False):
     from AthenaConfiguration.Enums import Format
 
     acc = ComponentAccumulator()
@@ -155,6 +155,11 @@ def L1CaloFEXSimCfg(flags, eFexTowerInputs = ["L1_eFexDataTowers","L1_eFexEmulat
         acc.addEventAlgo(eFEXInputs)
         acc.addEventAlgo(eFEX)
 
+        if simulateAltTau:
+            eFEX.eFEXSysSimTool.Key_eFexAltTauOutputContainer="L1_eTauRoIAlt"
+            eFEX.eFEXSysSimTool.Key_eFexAltTauxTOBOutputContainer="L1_eTauxRoIAlt"
+
+
     if flags.Trigger.L1.dojFex:
         
         if flags.Input.Format is not Format.POOL:
@@ -229,7 +234,8 @@ def L1CaloFEXSimCfg(flags, eFexTowerInputs = ["L1_eFexDataTowers","L1_eFexEmulat
         if flags.Trigger.L1.doeFex:
             check(eFEX.eFEXSysSimTool.Key_eFexEMOutputContainer)
             check(eFEX.eFEXSysSimTool.Key_eFexTauOutputContainer)
-            check(eFEX.eFEXSysSimTool.Key_eFexTauBDTOutputContainer)
+            if (simulateAltTau):
+                check(eFEX.eFEXSysSimTool.Key_eFexAltTauOutputContainer)
         if flags.Trigger.L1.dojFex:
             check(jFEX.jFEXSysSimTool.Key_jFexSRJetOutputContainer)
             check(jFEX.jFEXSysSimTool.Key_jFexLRJetOutputContainer)
@@ -262,10 +268,12 @@ def L1CaloFEXSimCfg(flags, eFexTowerInputs = ["L1_eFexDataTowers","L1_eFexEmulat
         if flags.Trigger.L1.doeFex:
             eFEX.eFEXSysSimTool.Key_eFexEMOutputContainer=getSimHandle("L1_eEMRoI")
             eFEX.eFEXSysSimTool.Key_eFexTauOutputContainer=getSimHandle("L1_eTauRoI")
-            eFEX.eFEXSysSimTool.Key_eFexTauBDTOutputContainer=getSimHandle("L1_eTauBDTRoI")
             eFEX.eFEXSysSimTool.Key_eFexEMxTOBOutputContainer=getSimHandle("L1_eEMxRoI")
             eFEX.eFEXSysSimTool.Key_eFexTauxTOBOutputContainer=getSimHandle("L1_eTauxRoI")
-            eFEX.eFEXSysSimTool.Key_eFexTauBDTxTOBOutputContainer=getSimHandle("L1_eTauBDTxRoI")
+            if simulateAltTau:
+                eFEX.eFEXSysSimTool.Key_eFexAltTauOutputContainer=getSimHandle("L1_eTauRoIAlt")
+                eFEX.eFEXSysSimTool.Key_eFexAltTauxTOBOutputContainer=getSimHandle("L1_eTauxRoIAlt")
+
         if flags.Trigger.L1.dojFex:
             jFEX.jFEXSysSimTool.Key_jFexSRJetOutputContainer=getSimHandle("L1_jFexSRJetRoI")
             jFEX.jFEXSysSimTool.Key_jFexLRJetOutputContainer=getSimHandle("L1_jFexLRJetRoI")
diff --git a/Trigger/TrigT1/L1CaloFEX/L1CaloFEXSim/src/eFEXSysSim.cxx b/Trigger/TrigT1/L1CaloFEX/L1CaloFEXSim/src/eFEXSysSim.cxx
index 48bd17dfffc5d89f6d67367f904ecdba8f0f50c1..20bb416cc9b31a78e3427abb32b9731a2bce60f9 100644
--- a/Trigger/TrigT1/L1CaloFEX/L1CaloFEXSim/src/eFEXSysSim.cxx
+++ b/Trigger/TrigT1/L1CaloFEX/L1CaloFEXSim/src/eFEXSysSim.cxx
@@ -18,6 +18,8 @@
 #include "StoreGate/WriteHandle.h"
 #include "StoreGate/ReadHandle.h"
 
+#include "TrigConfData/L1Menu.h"
+
 #include "xAODTrigger/eFexEMRoI.h"
 #include "xAODTrigger/eFexEMRoIContainer.h"
 #include "xAODTrigger/eFexEMRoIAuxContainer.h"
@@ -57,14 +59,16 @@ namespace LVL1 {
     ATH_CHECK( m_eFexOutKey.initialize() );
     ATH_CHECK( m_eFexEMxTOBOutKey.initialize() );
 
-    ATH_CHECK( m_eFexTauHeuristicOutKey.initialize() );
-    ATH_CHECK( m_eFexTauHeuristicxTOBOutKey.initialize() );
-    ATH_CHECK( m_eFexTauBDTOutKey.initialize() );
-    ATH_CHECK( m_eFexTauBDTxTOBOutKey.initialize() );
+    ATH_CHECK( m_eFexTauActiveOutKey.initialize() );
+    ATH_CHECK( m_eFexTauActivexTOBOutKey.initialize() );
+    ATH_CHECK( m_eFexTauAltOutKey.initialize(SG::AllowEmpty) );
+    ATH_CHECK( m_eFexTauAltxTOBOutKey.initialize(SG::AllowEmpty) );
 
     ATH_CHECK( m_eFEXFPGATowerIdProviderTool.retrieve() );
 
     ATH_CHECK( m_eFEXFPGATool.retrieve() );
+    
+    ATH_CHECK(m_l1MenuKey.initialize());
 
     return StatusCode::SUCCESS;
   }
@@ -439,9 +443,25 @@ namespace LVL1 {
     ATH_MSG_DEBUG("  write: " << outputeFexHandle.key() << " = " << "..." );
     ATH_CHECK(outputeFexHandle.record(std::move(m_eContainer),std::move(m_eAuxContainer)));
 
+    SG::ReadHandle<TrigConf::L1Menu> l1Menu (m_l1MenuKey/*, ctx*/);
+    ATH_CHECK(l1Menu.isValid());
+
+    auto & thr_eTAU = l1Menu->thrExtraInfo().eTAU();
+    int activeAlgo = thr_eTAU.algoVersion() == 0 ? xAOD::eFexTauRoI_v1::Heuristic : xAOD::eFexTauRoI_v1::BDT;
+    bool omitAltTauContainer = m_eFexTauAltxTOBOutKey.empty() || m_eFexTauAltOutKey.empty();
+
     // Repeat for Tau TOBs and xTOBs
-    ATH_CHECK(StoreTauTOBs(m_allTauHeuristicTobObjects, m_eFexTauHeuristicxTOBOutKey, m_eFexTauHeuristicOutKey));
-    ATH_CHECK(StoreTauTOBs(m_allTauBDTTobObjects, m_eFexTauBDTxTOBOutKey, m_eFexTauBDTOutKey));
+    if (activeAlgo == xAOD::eFexTauRoI_v1::Heuristic) {
+        ATH_CHECK(StoreTauTOBs(m_allTauHeuristicTobObjects, m_eFexTauActivexTOBOutKey, m_eFexTauActiveOutKey));
+        if (!omitAltTauContainer) {
+            ATH_CHECK(StoreTauTOBs(m_allTauBDTTobObjects, m_eFexTauAltxTOBOutKey, m_eFexTauAltOutKey));
+        }
+    } else if (activeAlgo == xAOD::eFexTauRoI_v1::BDT) {
+        ATH_CHECK(StoreTauTOBs(m_allTauBDTTobObjects, m_eFexTauActivexTOBOutKey, m_eFexTauActiveOutKey));
+        if (!omitAltTauContainer) {
+            ATH_CHECK(StoreTauTOBs(m_allTauHeuristicTobObjects, m_eFexTauAltxTOBOutKey, m_eFexTauAltOutKey));
+        }
+    }
 
     //Send TOBs to bytestream?
     // ToDo
diff --git a/Trigger/TrigT1/TrigT1ResultByteStream/python/TrigT1ResultByteStreamConfig.py b/Trigger/TrigT1/TrigT1ResultByteStream/python/TrigT1ResultByteStreamConfig.py
index ec360c812b7894228d46ce52de72bb340cb2d543..776a9baa604b3de6158ed8f1b5ea75e977a5a18f 100644
--- a/Trigger/TrigT1/TrigT1ResultByteStream/python/TrigT1ResultByteStreamConfig.py
+++ b/Trigger/TrigT1/TrigT1ResultByteStream/python/TrigT1ResultByteStreamConfig.py
@@ -165,15 +165,6 @@ def L1TriggerByteStreamDecoderCfg(flags, returnEDM=False):
   # Run-3 L1Calo decoding
   ########################################
   if flags.Trigger.L1.doCalo and flags.Trigger.enableL1CaloPhase1:
-    # Add a temporary flag _decodeTOBsOfflineDuringCommissioning to enable decoding TOBs in reco/monitoring jobs
-    # during commissioning of the phase-1 L1Calo system. Once the online decoding of TOBs in HLT is fully commissioned
-    # and running, the reco/monitoring jobs should always read the TOBs from HLT result instead of decoding them again,
-    # as the TOBs in HLT result are the objects linked to Trigger Decisions in the HLT Navigation and can be used for
-    # analysis and studies. The duplicated TOBs decoded offline are only needed as long as TOBs in HLT result may be
-    # missing because the decoding is not yet enabled in HLT. See ATR-26025 and ATR-26026.
-    _decodeTOBsOfflineDuringCommissioning = True  # TODO: Remove this and relevant code below once no longer needed
-    _extraOfflineTOBSuffix = '_OfflineCopy'
-
     #--------------------
     # eFex
     #--------------------
@@ -188,19 +179,6 @@ def L1TriggerByteStreamDecoderCfg(flags, returnEDM=False):
           xTOBs=False,
           multiSlice=False
         ))
-      # Reco/monitoring case with temporarily added decoding of TOBs
-      elif _decodeTOBsOfflineDuringCommissioning:
-        eFexByteStreamTool = acc.popToolsAndMerge(eFexByteStreamToolCfg(
-          flags,
-          'eFexBSDecoderTool',
-          writeBS=False,
-          TOBs=True,
-          xTOBs=True,
-          multiSlice=True,
-          decodeInputs=flags.Trigger.L1.doCaloInputs
-        ))
-        eFexByteStreamTool.eEMContainerWriteKey.Path += _extraOfflineTOBSuffix
-        eFexByteStreamTool.eTAUContainerWriteKey.Path += _extraOfflineTOBSuffix
       # Reco/monitoring case (either online but downstream from HLT, or at Tier-0) with xTOB, input tower and multi-slice decoding
       else:
         eFexByteStreamTool = acc.popToolsAndMerge(eFexByteStreamToolCfg(
@@ -250,22 +228,6 @@ def L1TriggerByteStreamDecoderCfg(flags, returnEDM=False):
         decoderTools += [jFexInputByteStreamTool]
         maybeMissingRobs += jFexInputByteStreamTool.ROBIDs  # Allow the data to be missing during commissioning of the phase-1 L1Calo (2022)
 
-      # Temporary addition of TOB decoding to reco/monitoring case:
-      if _decodeTOBsOfflineDuringCommissioning and not flags.Trigger.doHLT:
-        jFexRoiByteStreamTool_TOB = acc.popToolsAndMerge(jFexRoiByteStreamToolCfg(
-          flags,
-          'jFexBSDecoderTool_TOB',
-          writeBS=False,
-          xTOBs=False
-        ))
-        jFexRoiByteStreamTool_TOB.jJRoIContainerWriteKey.Path += _extraOfflineTOBSuffix
-        jFexRoiByteStreamTool_TOB.jLJRoIContainerWriteKey.Path += _extraOfflineTOBSuffix
-        jFexRoiByteStreamTool_TOB.jTauRoIContainerWriteKey.Path += _extraOfflineTOBSuffix
-        jFexRoiByteStreamTool_TOB.jEMRoIContainerWriteKey.Path += _extraOfflineTOBSuffix
-        jFexRoiByteStreamTool_TOB.jTERoIContainerWriteKey.Path += _extraOfflineTOBSuffix
-        jFexRoiByteStreamTool_TOB.jXERoIContainerWriteKey.Path += _extraOfflineTOBSuffix
-        decoderTools += [jFexRoiByteStreamTool_TOB]
-        maybeMissingRobs += jFexRoiByteStreamTool_TOB.ROBIDs
 
     #--------------------
     # gFex
@@ -280,26 +242,6 @@ def L1TriggerByteStreamDecoderCfg(flags, returnEDM=False):
         ))
         decoderTools += [gFexByteStreamTool]
         maybeMissingRobs += gFexByteStreamTool.ROBIDs  # Allow the data to be missing during commissioning of the phase-1 L1Calo (2022)
-      # Reco/monitoring case with temporarily added decoding of TOBs
-      elif _decodeTOBsOfflineDuringCommissioning:
-        gFexByteStreamTool_TOB = acc.popToolsAndMerge(gFexByteStreamToolCfg(
-          flags,
-          'gFexBSDecoderTool_TOB',
-          writeBS=False
-        ))
-        gFexByteStreamTool_TOB.gFexRhoOutputContainerWriteKey.Path += _extraOfflineTOBSuffix
-        gFexByteStreamTool_TOB.gFexSRJetOutputContainerWriteKey.Path += _extraOfflineTOBSuffix
-        gFexByteStreamTool_TOB.gFexLRJetOutputContainerWriteKey.Path += _extraOfflineTOBSuffix
-        gFexByteStreamTool_TOB.gScalarEJwojOutputContainerWriteKey.Path += _extraOfflineTOBSuffix
-        gFexByteStreamTool_TOB.gMETComponentsJwojOutputContainerWriteKey.Path += _extraOfflineTOBSuffix
-        gFexByteStreamTool_TOB.gMHTComponentsJwojOutputContainerWriteKey.Path += _extraOfflineTOBSuffix
-        gFexByteStreamTool_TOB.gMSTComponentsJwojOutputContainerWriteKey.Path += _extraOfflineTOBSuffix
-        gFexByteStreamTool_TOB.gMETComponentsNoiseCutOutputContainerWriteKey.Path += _extraOfflineTOBSuffix
-        gFexByteStreamTool_TOB.gMETComponentsRmsOutputContainerWriteKey.Path += _extraOfflineTOBSuffix
-        gFexByteStreamTool_TOB.gScalarENoiseCutOutputContainerWriteKey.Path += _extraOfflineTOBSuffix
-        gFexByteStreamTool_TOB.gScalarERmsOutputContainerWriteKey.Path += _extraOfflineTOBSuffix
-        decoderTools += [gFexByteStreamTool_TOB]
-        maybeMissingRobs += gFexByteStreamTool_TOB.ROBIDs
 
       # Input towers decoding
       if flags.Trigger.L1.doCaloInputs:
diff --git a/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref b/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref
index 5c5b03ab8214e5f457cab6c253050a1a649c09b8..3b4218f70a7edad6f9ffcfdb8af8280767fd1112 100644
--- a/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref
+++ b/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref
@@ -3733,20 +3733,6 @@ HLT_e17_lhmedium_ivarloose_tau25_mediumRNN_tracktwoMVA_03dRAB_L1EM15VHI_2TAU12IM
     5: 2
 HLT_e17_lhmedium_ivarloose_tau25_mediumRNN_tracktwoMVA_03dRAB_L1eEM18M_2eTAU20M_4jJ30:
   eventCount: 0
-  stepCounts:
-    0: 3
-    1: 3
-    2: 3
-    3: 3
-    4: 1
-    5: 1
-  stepFeatures:
-    0: 15
-    1: 12
-    2: 16
-    3: 12
-    4: 4
-    5: 1
 HLT_e17_lhmedium_tau25_mediumRNN_tracktwoMVA_xe50_cell_03dRAB_L1EM15VHI_2TAU12IM_XE35:
   eventCount: 0
   stepCounts:
@@ -3765,20 +3751,6 @@ HLT_e17_lhmedium_tau25_mediumRNN_tracktwoMVA_xe50_cell_03dRAB_L1EM15VHI_2TAU12IM
     5: 1
 HLT_e17_lhmedium_tau25_mediumRNN_tracktwoMVA_xe50_cell_03dRAB_L1eEM18M_2eTAU20M_jXE70:
   eventCount: 0
-  stepCounts:
-    0: 3
-    1: 3
-    2: 3
-    3: 3
-    4: 1
-    5: 1
-  stepFeatures:
-    0: 12
-    1: 12
-    2: 16
-    3: 12
-    4: 4
-    5: 1
 HLT_e20_etcut_L1eEM18M:
   eventCount: 4
   stepCounts:
@@ -3857,10 +3829,10 @@ HLT_e24_lhmedium_ivarloose_tau20_mediumRNN_tracktwoMVA_03dRAB_L1eEM26M:
     4: 1
     5: 1
   stepFeatures:
-    0: 20
-    1: 17
-    2: 21
-    3: 17
+    0: 19
+    1: 16
+    2: 20
+    3: 16
     4: 5
     5: 1
 HLT_e24_lhmedium_ivarloose_tau20_mediumRNN_tracktwoMVA_03dRAB_L1eEM28M:
@@ -3871,10 +3843,10 @@ HLT_e24_lhmedium_ivarloose_tau20_mediumRNN_tracktwoMVA_03dRAB_L1eEM28M:
     2: 2
     3: 2
   stepFeatures:
-    0: 14
-    1: 11
-    2: 15
-    3: 11
+    0: 13
+    1: 10
+    2: 14
+    3: 10
     4: 2
 HLT_e24_lhtight_ivarloose_L1eEM26M:
   eventCount: 1
@@ -5026,10 +4998,10 @@ HLT_e26_lhtight_ivarloose_tau20_mediumRNN_tracktwoMVA_probe_L1eTAU12_03dRAB_L1eE
     4: 3
     5: 3
     6: 1
-    7: 6
-    8: 6
-    9: 6
-    10: 6
+    7: 5
+    8: 5
+    9: 5
+    10: 5
 HLT_e26_lhtight_ivarloose_tau25_mediumRNN_tracktwoMVA_probe_L1TAU12IM_03dRAB_L1eEM26M:
   eventCount: 0
   stepCounts:
@@ -6532,10 +6504,10 @@ HLT_e28_lhtight_ivarloose_tau20_mediumRNN_tracktwoMVA_probe_L1eTAU12_03dRAB_L1eE
     4: 2
     5: 2
     6: 1
-    7: 6
-    8: 6
-    9: 6
-    10: 6
+    7: 5
+    8: 5
+    9: 5
+    10: 5
 HLT_e28_lhtight_ivarloose_tau25_mediumRNN_tracktwoMVA_probe_L1TAU12IM_03dRAB_L1eEM28M:
   eventCount: 0
   stepCounts:
@@ -10184,10 +10156,10 @@ HLT_g25_medium_tau25_dikaonmass_tracktwoMVA_50invmAB_L1eEM26M:
     2: 3
     3: 3
   stepFeatures:
-    0: 19
-    1: 18
-    2: 15
-    3: 15
+    0: 18
+    1: 17
+    2: 14
+    3: 14
 HLT_g25_medium_tau25_dikaonmass_tracktwoMVA_50invmAB_L1eEM28M:
   eventCount: 0
   stepCounts:
@@ -10196,10 +10168,10 @@ HLT_g25_medium_tau25_dikaonmass_tracktwoMVA_50invmAB_L1eEM28M:
     2: 2
     3: 2
   stepFeatures:
-    0: 14
-    1: 13
-    2: 10
-    3: 10
+    0: 13
+    1: 12
+    2: 9
+    3: 9
 HLT_g25_medium_tau25_dipion1_tracktwoMVA_50invmAB_L1eEM26M:
   eventCount: 0
   stepCounts:
@@ -10208,10 +10180,10 @@ HLT_g25_medium_tau25_dipion1_tracktwoMVA_50invmAB_L1eEM26M:
     2: 3
     3: 3
   stepFeatures:
-    0: 19
-    1: 18
-    2: 15
-    3: 15
+    0: 18
+    1: 17
+    2: 14
+    3: 14
 HLT_g25_medium_tau25_dipion1_tracktwoMVA_50invmAB_L1eEM28M:
   eventCount: 0
   stepCounts:
@@ -10220,10 +10192,10 @@ HLT_g25_medium_tau25_dipion1_tracktwoMVA_50invmAB_L1eEM28M:
     2: 2
     3: 2
   stepFeatures:
-    0: 14
-    1: 13
-    2: 10
-    3: 10
+    0: 13
+    1: 12
+    2: 9
+    3: 9
 HLT_g25_medium_tau25_dipion2_tracktwoMVA_50invmAB_L1eEM26M:
   eventCount: 0
   stepCounts:
@@ -10232,10 +10204,10 @@ HLT_g25_medium_tau25_dipion2_tracktwoMVA_50invmAB_L1eEM26M:
     2: 3
     3: 3
   stepFeatures:
-    0: 19
-    1: 18
-    2: 15
-    3: 15
+    0: 18
+    1: 17
+    2: 14
+    3: 14
 HLT_g25_medium_tau25_dipion2_tracktwoMVA_50invmAB_L1eEM28M:
   eventCount: 0
   stepCounts:
@@ -10244,10 +10216,10 @@ HLT_g25_medium_tau25_dipion2_tracktwoMVA_50invmAB_L1eEM28M:
     2: 2
     3: 2
   stepFeatures:
-    0: 14
-    1: 13
-    2: 10
-    3: 10
+    0: 13
+    1: 12
+    2: 9
+    3: 9
 HLT_g25_medium_tau25_kaonpi1_tracktwoMVA_50invmAB_L1eEM26M:
   eventCount: 0
   stepCounts:
@@ -10256,10 +10228,10 @@ HLT_g25_medium_tau25_kaonpi1_tracktwoMVA_50invmAB_L1eEM26M:
     2: 3
     3: 3
   stepFeatures:
-    0: 19
-    1: 18
-    2: 15
-    3: 15
+    0: 18
+    1: 17
+    2: 14
+    3: 14
 HLT_g25_medium_tau25_kaonpi1_tracktwoMVA_50invmAB_L1eEM28M:
   eventCount: 0
   stepCounts:
@@ -10268,10 +10240,10 @@ HLT_g25_medium_tau25_kaonpi1_tracktwoMVA_50invmAB_L1eEM28M:
     2: 2
     3: 2
   stepFeatures:
-    0: 14
-    1: 13
-    2: 10
-    3: 10
+    0: 13
+    1: 12
+    2: 9
+    3: 9
 HLT_g25_medium_tau25_kaonpi2_tracktwoMVA_50invmAB_L1eEM26M:
   eventCount: 0
   stepCounts:
@@ -10280,10 +10252,10 @@ HLT_g25_medium_tau25_kaonpi2_tracktwoMVA_50invmAB_L1eEM26M:
     2: 3
     3: 3
   stepFeatures:
-    0: 19
-    1: 18
-    2: 15
-    3: 15
+    0: 18
+    1: 17
+    2: 14
+    3: 14
 HLT_g25_medium_tau25_kaonpi2_tracktwoMVA_50invmAB_L1eEM28M:
   eventCount: 0
   stepCounts:
@@ -10292,10 +10264,10 @@ HLT_g25_medium_tau25_kaonpi2_tracktwoMVA_50invmAB_L1eEM28M:
     2: 2
     3: 2
   stepFeatures:
-    0: 14
-    1: 13
-    2: 10
-    3: 10
+    0: 13
+    1: 12
+    2: 9
+    3: 9
 HLT_g25_medium_tau25_singlepion_tracktwoMVA_50invmAB_L1eEM26M:
   eventCount: 0
   stepCounts:
@@ -10304,10 +10276,10 @@ HLT_g25_medium_tau25_singlepion_tracktwoMVA_50invmAB_L1eEM26M:
     2: 3
     3: 3
   stepFeatures:
-    0: 19
-    1: 18
-    2: 15
-    3: 15
+    0: 18
+    1: 17
+    2: 14
+    3: 14
 HLT_g25_medium_tau25_singlepion_tracktwoMVA_50invmAB_L1eEM28M:
   eventCount: 0
   stepCounts:
@@ -10316,10 +10288,10 @@ HLT_g25_medium_tau25_singlepion_tracktwoMVA_50invmAB_L1eEM28M:
     2: 2
     3: 2
   stepFeatures:
-    0: 14
-    1: 13
-    2: 10
-    3: 10
+    0: 13
+    1: 12
+    2: 9
+    3: 9
 HLT_g25_medium_xe35_cell_xe40_pfopufit_L1XE35:
   eventCount: 1
   stepCounts:
@@ -20263,17 +20235,6 @@ HLT_mu14_ivarloose_tau25_mediumRNN_tracktwoMVA_03dRAB_L1MU8F_TAU12IM_3J12:
     4: 3
 HLT_mu14_ivarloose_tau25_mediumRNN_tracktwoMVA_03dRAB_L1MU8F_eTAU20M_3jJ30:
   eventCount: 0
-  stepCounts:
-    0: 8
-    1: 7
-    2: 7
-    3: 7
-  stepFeatures:
-    0: 27
-    1: 26
-    2: 23
-    3: 23
-    4: 5
 HLT_mu14_ivarloose_tau35_mediumRNN_tracktwoMVA_03dRAB_L1MU8F_TAU20IM:
   eventCount: 0
   stepCounts:
@@ -20289,17 +20250,6 @@ HLT_mu14_ivarloose_tau35_mediumRNN_tracktwoMVA_03dRAB_L1MU8F_TAU20IM:
     4: 3
 HLT_mu14_ivarloose_tau35_mediumRNN_tracktwoMVA_03dRAB_L1MU8F_eTAU20M:
   eventCount: 0
-  stepCounts:
-    0: 8
-    1: 7
-    2: 7
-    3: 7
-  stepFeatures:
-    0: 25
-    1: 23
-    2: 20
-    3: 20
-    4: 5
 HLT_mu14_mu14_idperf_50invmAB130_L12MU8F:
   eventCount: 0
 HLT_mu14_mu14_idtp_idZmumu_L12MU8F:
@@ -20321,21 +20271,7 @@ HLT_mu14_tau25_mediumRNN_tracktwoMVA_xe50_cell_03dRAB_L1MU8F_TAU12IM_XE35:
     4: 1
     5: 1
 HLT_mu14_tau25_mediumRNN_tracktwoMVA_xe50_cell_03dRAB_L1MU8F_eTAU20M_jXE70:
-  eventCount: 1
-  stepCounts:
-    0: 6
-    1: 6
-    2: 6
-    3: 6
-    4: 1
-    5: 1
-  stepFeatures:
-    0: 21
-    1: 21
-    2: 21
-    3: 21
-    4: 1
-    5: 1
+  eventCount: 0
 HLT_mu20_2mu4noL1_L1MU14FCH:
   eventCount: 0
   stepCounts:
@@ -22367,47 +22303,47 @@ HLT_mu24_ivarmedium_tau60_mediumRNN_tracktwoLLP_probe_03dRAB_L1MU18VFCH:
 HLT_mu24_ivarmedium_tau60_mediumRNN_tracktwoLLP_probe_L1eTAU60_03dRAB_L1MU14FCH:
   eventCount: 0
   stepCounts:
-    0: 5
-    1: 4
-    2: 4
-    3: 4
-    4: 4
+    0: 4
+    1: 3
+    2: 3
+    3: 3
+    4: 3
+    5: 3
+    6: 3
+    7: 3
+    8: 3
+  stepFeatures:
+    0: 7
+    1: 3
+    2: 3
+    3: 3
+    4: 3
     5: 4
     6: 4
     7: 4
     8: 4
-  stepFeatures:
-    0: 7
-    1: 4
-    2: 4
-    3: 4
-    4: 4
-    5: 5
-    6: 5
-    7: 5
-    8: 5
 HLT_mu24_ivarmedium_tau60_mediumRNN_tracktwoLLP_probe_L1eTAU60_03dRAB_L1MU18VFCH:
   eventCount: 0
   stepCounts:
-    0: 5
-    1: 4
-    2: 4
-    3: 4
-    4: 4
+    0: 4
+    1: 3
+    2: 3
+    3: 3
+    4: 3
+    5: 3
+    6: 3
+    7: 3
+    8: 3
+  stepFeatures:
+    0: 7
+    1: 3
+    2: 3
+    3: 3
+    4: 3
     5: 4
     6: 4
     7: 4
     8: 4
-  stepFeatures:
-    0: 7
-    1: 4
-    2: 4
-    3: 4
-    4: 4
-    5: 5
-    6: 5
-    7: 5
-    8: 5
 HLT_mu24_ivarmedium_tau60_mediumRNN_tracktwoMVA_probe_03dRAB_L1MU14FCH:
   eventCount: 0
   stepCounts:
@@ -22455,47 +22391,47 @@ HLT_mu24_ivarmedium_tau60_mediumRNN_tracktwoMVA_probe_03dRAB_L1MU18VFCH:
 HLT_mu24_ivarmedium_tau60_mediumRNN_tracktwoMVA_probe_L1eTAU60_03dRAB_L1MU14FCH:
   eventCount: 0
   stepCounts:
-    0: 5
-    1: 4
-    2: 4
-    3: 4
-    4: 4
+    0: 4
+    1: 3
+    2: 3
+    3: 3
+    4: 3
+    5: 3
+    6: 3
+    7: 3
+    8: 3
+  stepFeatures:
+    0: 7
+    1: 3
+    2: 3
+    3: 3
+    4: 3
     5: 4
     6: 4
     7: 4
     8: 4
-  stepFeatures:
-    0: 7
-    1: 4
-    2: 4
-    3: 4
-    4: 4
-    5: 5
-    6: 5
-    7: 5
-    8: 5
 HLT_mu24_ivarmedium_tau60_mediumRNN_tracktwoMVA_probe_L1eTAU60_03dRAB_L1MU18VFCH:
   eventCount: 0
   stepCounts:
-    0: 5
-    1: 4
-    2: 4
-    3: 4
-    4: 4
+    0: 4
+    1: 3
+    2: 3
+    3: 3
+    4: 3
+    5: 3
+    6: 3
+    7: 3
+    8: 3
+  stepFeatures:
+    0: 7
+    1: 3
+    2: 3
+    3: 3
+    4: 3
     5: 4
     6: 4
     7: 4
     8: 4
-  stepFeatures:
-    0: 7
-    1: 4
-    2: 4
-    3: 4
-    4: 4
-    5: 5
-    6: 5
-    7: 5
-    8: 5
 HLT_mu24_ivarmedium_tau80_mediumRNN_tracktwoLLP_probe_03dRAB_L1MU14FCH:
   eventCount: 0
   stepCounts:
@@ -22558,10 +22494,10 @@ HLT_mu24_ivarmedium_tau80_mediumRNN_tracktwoLLP_probe_L1eTAU80_03dRAB_L1MU14FCH:
     2: 2
     3: 2
     4: 2
-    5: 2
-    6: 2
-    7: 2
-    8: 2
+    5: 3
+    6: 3
+    7: 3
+    8: 3
 HLT_mu24_ivarmedium_tau80_mediumRNN_tracktwoLLP_probe_L1eTAU80_03dRAB_L1MU18VFCH:
   eventCount: 0
   stepCounts:
@@ -22580,10 +22516,10 @@ HLT_mu24_ivarmedium_tau80_mediumRNN_tracktwoLLP_probe_L1eTAU80_03dRAB_L1MU18VFCH
     2: 2
     3: 2
     4: 2
-    5: 2
-    6: 2
-    7: 2
-    8: 2
+    5: 3
+    6: 3
+    7: 3
+    8: 3
 HLT_mu24_ivarmedium_tau80_mediumRNN_tracktwoMVA_probe_03dRAB_L1MU14FCH:
   eventCount: 0
   stepCounts:
@@ -22646,10 +22582,10 @@ HLT_mu24_ivarmedium_tau80_mediumRNN_tracktwoMVA_probe_L1eTAU80_03dRAB_L1MU14FCH:
     2: 2
     3: 2
     4: 2
-    5: 2
-    6: 2
-    7: 2
-    8: 2
+    5: 3
+    6: 3
+    7: 3
+    8: 3
 HLT_mu24_ivarmedium_tau80_mediumRNN_tracktwoMVA_probe_L1eTAU80_03dRAB_L1MU18VFCH:
   eventCount: 0
   stepCounts:
@@ -22668,10 +22604,10 @@ HLT_mu24_ivarmedium_tau80_mediumRNN_tracktwoMVA_probe_L1eTAU80_03dRAB_L1MU18VFCH
     2: 2
     3: 2
     4: 2
-    5: 2
-    6: 2
-    7: 2
-    8: 2
+    5: 3
+    6: 3
+    7: 3
+    8: 3
 HLT_mu24_ivarmedium_xe0_cell_L1MU14FCH:
   eventCount: 4
   stepCounts:
@@ -23780,10 +23716,10 @@ HLT_mu26_ivarmedium_tau100_mediumRNN_tracktwoLLP_probe_L1eTAU80_03dRAB_L1MU14FCH
     2: 2
     3: 2
     4: 2
-    5: 2
-    6: 2
-    7: 2
-    8: 2
+    5: 3
+    6: 3
+    7: 3
+    8: 3
 HLT_mu26_ivarmedium_tau160_mediumRNN_tracktwoMVA_probe_03dRAB_L1MU14FCH:
   eventCount: 0
   stepFeatures:
@@ -24583,47 +24519,47 @@ HLT_mu26_ivarmedium_tau60_mediumRNN_tracktwoLLP_probe_03dRAB_L1MU18VFCH:
 HLT_mu26_ivarmedium_tau60_mediumRNN_tracktwoLLP_probe_L1eTAU60_03dRAB_L1MU14FCH:
   eventCount: 0
   stepCounts:
-    0: 5
-    1: 4
-    2: 4
-    3: 4
-    4: 4
+    0: 4
+    1: 3
+    2: 3
+    3: 3
+    4: 3
+    5: 3
+    6: 3
+    7: 3
+    8: 3
+  stepFeatures:
+    0: 7
+    1: 3
+    2: 3
+    3: 3
+    4: 3
     5: 4
     6: 4
     7: 4
     8: 4
-  stepFeatures:
-    0: 7
-    1: 4
-    2: 4
-    3: 4
-    4: 4
-    5: 5
-    6: 5
-    7: 5
-    8: 5
 HLT_mu26_ivarmedium_tau60_mediumRNN_tracktwoLLP_probe_L1eTAU60_03dRAB_L1MU18VFCH:
   eventCount: 0
   stepCounts:
-    0: 5
-    1: 4
-    2: 4
-    3: 4
-    4: 4
+    0: 4
+    1: 3
+    2: 3
+    3: 3
+    4: 3
+    5: 3
+    6: 3
+    7: 3
+    8: 3
+  stepFeatures:
+    0: 7
+    1: 3
+    2: 3
+    3: 3
+    4: 3
     5: 4
     6: 4
     7: 4
     8: 4
-  stepFeatures:
-    0: 7
-    1: 4
-    2: 4
-    3: 4
-    4: 4
-    5: 5
-    6: 5
-    7: 5
-    8: 5
 HLT_mu26_ivarmedium_tau60_mediumRNN_tracktwoMVA_probe_03dRAB_L1MU14FCH:
   eventCount: 0
   stepCounts:
@@ -24671,47 +24607,47 @@ HLT_mu26_ivarmedium_tau60_mediumRNN_tracktwoMVA_probe_03dRAB_L1MU18VFCH:
 HLT_mu26_ivarmedium_tau60_mediumRNN_tracktwoMVA_probe_L1eTAU60_03dRAB_L1MU14FCH:
   eventCount: 0
   stepCounts:
-    0: 5
-    1: 4
-    2: 4
-    3: 4
-    4: 4
+    0: 4
+    1: 3
+    2: 3
+    3: 3
+    4: 3
+    5: 3
+    6: 3
+    7: 3
+    8: 3
+  stepFeatures:
+    0: 7
+    1: 3
+    2: 3
+    3: 3
+    4: 3
     5: 4
     6: 4
     7: 4
     8: 4
-  stepFeatures:
-    0: 7
-    1: 4
-    2: 4
-    3: 4
-    4: 4
-    5: 5
-    6: 5
-    7: 5
-    8: 5
 HLT_mu26_ivarmedium_tau60_mediumRNN_tracktwoMVA_probe_L1eTAU60_03dRAB_L1MU18VFCH:
   eventCount: 0
   stepCounts:
-    0: 5
-    1: 4
-    2: 4
-    3: 4
-    4: 4
+    0: 4
+    1: 3
+    2: 3
+    3: 3
+    4: 3
+    5: 3
+    6: 3
+    7: 3
+    8: 3
+  stepFeatures:
+    0: 7
+    1: 3
+    2: 3
+    3: 3
+    4: 3
     5: 4
     6: 4
     7: 4
     8: 4
-  stepFeatures:
-    0: 7
-    1: 4
-    2: 4
-    3: 4
-    4: 4
-    5: 5
-    6: 5
-    7: 5
-    8: 5
 HLT_mu26_ivarmedium_tau80_mediumRNN_tracktwoLLP_probe_03dRAB_L1MU14FCH:
   eventCount: 0
   stepCounts:
@@ -24774,10 +24710,10 @@ HLT_mu26_ivarmedium_tau80_mediumRNN_tracktwoLLP_probe_L1eTAU80_03dRAB_L1MU14FCH:
     2: 2
     3: 2
     4: 2
-    5: 2
-    6: 2
-    7: 2
-    8: 2
+    5: 3
+    6: 3
+    7: 3
+    8: 3
 HLT_mu26_ivarmedium_tau80_mediumRNN_tracktwoLLP_probe_L1eTAU80_03dRAB_L1MU18VFCH:
   eventCount: 0
   stepCounts:
@@ -24796,10 +24732,10 @@ HLT_mu26_ivarmedium_tau80_mediumRNN_tracktwoLLP_probe_L1eTAU80_03dRAB_L1MU18VFCH
     2: 2
     3: 2
     4: 2
-    5: 2
-    6: 2
-    7: 2
-    8: 2
+    5: 3
+    6: 3
+    7: 3
+    8: 3
 HLT_mu26_ivarmedium_tau80_mediumRNN_tracktwoMVA_probe_03dRAB_L1MU14FCH:
   eventCount: 0
   stepCounts:
@@ -24862,10 +24798,10 @@ HLT_mu26_ivarmedium_tau80_mediumRNN_tracktwoMVA_probe_L1eTAU80_03dRAB_L1MU14FCH:
     2: 2
     3: 2
     4: 2
-    5: 2
-    6: 2
-    7: 2
-    8: 2
+    5: 3
+    6: 3
+    7: 3
+    8: 3
 HLT_mu26_ivarmedium_tau80_mediumRNN_tracktwoMVA_probe_L1eTAU80_03dRAB_L1MU18VFCH:
   eventCount: 0
   stepCounts:
@@ -24884,10 +24820,10 @@ HLT_mu26_ivarmedium_tau80_mediumRNN_tracktwoMVA_probe_L1eTAU80_03dRAB_L1MU18VFCH
     2: 2
     3: 2
     4: 2
-    5: 2
-    6: 2
-    7: 2
-    8: 2
+    5: 3
+    6: 3
+    7: 3
+    8: 3
 HLT_mu26_ivarperf_L1MU14FCH:
   eventCount: 4
   stepCounts:
@@ -26522,11 +26458,11 @@ HLT_noalg_L1eTAU140:
 HLT_noalg_L1eTAU20:
   eventCount: 19
 HLT_noalg_L1eTAU20M:
-  eventCount: 19
+  eventCount: 0
 HLT_noalg_L1eTAU30:
   eventCount: 17
 HLT_noalg_L1eTAU60:
-  eventCount: 17
+  eventCount: 15
 HLT_noalg_L1eTAU80:
   eventCount: 5
 HLT_noalg_L1gJ100p0ETA25:
@@ -26688,10 +26624,10 @@ HLT_tau0_mediumRNN_tracktwoMVA_tau0_mediumRNN_tracktwoMVA_03dRAB_L12cTAU20M_10DR
     3: 9
     4: 1
   stepFeatures:
-    0: 54
-    1: 54
-    2: 54
-    3: 54
+    0: 52
+    1: 52
+    2: 52
+    3: 52
     4: 8
 HLT_tau0_mediumRNN_tracktwoMVA_tau0_mediumRNN_tracktwoMVA_03dRAB_L12cTAU20M_4DR28-eTAU30eTAU20-jJ55:
   eventCount: 1
@@ -26702,10 +26638,10 @@ HLT_tau0_mediumRNN_tracktwoMVA_tau0_mediumRNN_tracktwoMVA_03dRAB_L12cTAU20M_4DR2
     3: 10
     4: 1
   stepFeatures:
-    0: 60
-    1: 60
-    2: 60
-    3: 60
+    0: 58
+    1: 58
+    2: 58
+    3: 58
     4: 8
 HLT_tau0_mediumRNN_tracktwoMVA_tau0_mediumRNN_tracktwoMVA_03dRAB_L12cTAU20M_4DR32-eTAU30eTAU20-jJ55:
   eventCount: 1
@@ -26716,10 +26652,10 @@ HLT_tau0_mediumRNN_tracktwoMVA_tau0_mediumRNN_tracktwoMVA_03dRAB_L12cTAU20M_4DR3
     3: 10
     4: 1
   stepFeatures:
-    0: 60
-    1: 60
-    2: 60
-    3: 60
+    0: 58
+    1: 58
+    2: 58
+    3: 58
     4: 8
 HLT_tau0_mediumRNN_tracktwoMVA_tau0_mediumRNN_tracktwoMVA_03dRAB_L14jJ30p0ETA24_0DETA24-eTAU30eTAU12:
   eventCount: 1
@@ -26730,10 +26666,10 @@ HLT_tau0_mediumRNN_tracktwoMVA_tau0_mediumRNN_tracktwoMVA_03dRAB_L14jJ30p0ETA24_
     3: 16
     4: 1
   stepFeatures:
-    0: 131
-    1: 131
-    2: 131
-    3: 131
+    0: 130
+    1: 130
+    2: 130
+    3: 130
     4: 13
 HLT_tau0_mediumRNN_tracktwoMVA_tau0_mediumRNN_tracktwoMVA_03dRAB_L14jJ30p0ETA24_0DETA24_10DPHI99-eTAU30eTAU12:
   eventCount: 1
@@ -26766,13 +26702,13 @@ HLT_tau0_mediumRNN_tracktwoMVA_tau0_mediumRNN_tracktwoMVA_03dRAB_L14jJ30p0ETA24_
 HLT_tau0_mediumRNN_tracktwoMVA_tau0_mediumRNN_tracktwoMVA_03dRAB_L14jJ30p0ETA24_0DETA24_4DPHI99-eTAU30eTAU20:
   eventCount: 1
   stepCounts:
-    0: 17
-    1: 17
-    2: 17
-    3: 17
+    0: 16
+    1: 16
+    2: 16
+    3: 16
     4: 1
   stepFeatures:
-    0: 118
+    0: 120
     1: 116
     2: 116
     3: 116
@@ -26800,10 +26736,10 @@ HLT_tau0_mediumRNN_tracktwoMVA_tau0_mediumRNN_tracktwoMVA_03dRAB_L1cTAU30M_2cTAU
     3: 10
     4: 1
   stepFeatures:
-    0: 56
-    1: 56
-    2: 56
-    3: 56
+    0: 55
+    1: 55
+    2: 55
+    3: 55
     4: 7
 HLT_tau0_ptonly_L1TAU60:
   eventCount: 5
@@ -26822,13 +26758,13 @@ HLT_tau0_ptonly_L1eTAU12:
   stepCounts:
     0: 20
   stepFeatures:
-    0: 87
+    0: 86
 HLT_tau0_ptonly_L1eTAU80:
   eventCount: 5
   stepCounts:
     0: 5
   stepFeatures:
-    0: 6
+    0: 7
 HLT_tau100_mediumRNN_tracktwoLLP_tau80_mediumRNN_tracktwoLLP_03dRAB_L1TAU60_2TAU40:
   eventCount: 0
   stepCounts:
@@ -26849,10 +26785,10 @@ HLT_tau100_mediumRNN_tracktwoLLP_tau80_mediumRNN_tracktwoLLP_03dRAB_L1eTAU80_2eT
     2: 2
     3: 2
   stepFeatures:
-    0: 9
-    1: 6
-    2: 6
-    3: 6
+    0: 10
+    1: 7
+    2: 7
+    3: 7
 HLT_tau160_idperf_trackLRT_L1TAU100:
   eventCount: 1
   stepCounts:
@@ -28010,30 +27946,30 @@ HLT_tau20_mediumRNN_tracktwoMVA_probe_xe75_cell_xe100_pfopufit_L1jXE110:
 HLT_tau20_mediumRNN_tracktwoMVA_tau20_mediumRNN_tracktwoMVA_02dRAB10_L1cTAU20M_DR-eTAU20eTAU12-jJ40:
   eventCount: 1
   stepCounts:
-    0: 12
-    1: 12
-    2: 12
-    3: 12
+    0: 14
+    1: 14
+    2: 14
+    3: 14
     4: 1
   stepFeatures:
-    0: 80
-    1: 80
-    2: 80
-    3: 80
+    0: 88
+    1: 88
+    2: 88
+    3: 88
     4: 7
 HLT_tau20_mediumRNN_tracktwoMVA_tau20_mediumRNN_tracktwoMVA_03dRAB10_L1cTAU20M_DR-eTAU20eTAU12-jJ40:
   eventCount: 1
   stepCounts:
-    0: 12
-    1: 12
-    2: 12
-    3: 12
+    0: 14
+    1: 14
+    2: 14
+    3: 14
     4: 1
   stepFeatures:
-    0: 80
-    1: 80
-    2: 80
-    3: 80
+    0: 88
+    1: 88
+    2: 88
+    3: 88
     4: 7
 HLT_tau20_perf_tracktwoMVA_L1TAU8:
   eventCount: 16
@@ -28062,7 +27998,7 @@ HLT_tau20_perf_tracktwoMVA_L1eTAU12:
     1: 75
     2: 75
     3: 75
-    4: 28
+    4: 27
 ? HLT_tau20_tightRNN_tracktwoMVA_j65c_020jvt_j40c_020jvt_j25c_020jvt_j20c_020jvt_SHARED_j20c_020jvt_bgn177_pf_ftf_presel3c20XX1c20bg85_L1jJ85p0ETA21_3jJ40p0ETA25
 : eventCount: 5
   stepCounts:
@@ -28354,11 +28290,11 @@ HLT_tau25_idperf_tracktwoMVA_L1cTAU20M:
     3: 19
     4: 19
   stepFeatures:
-    0: 38
-    1: 38
-    2: 38
-    3: 38
-    4: 38
+    0: 37
+    1: 37
+    2: 37
+    3: 37
+    4: 37
 HLT_tau25_idperf_tracktwoMVA_L1eTAU20:
   eventCount: 19
   stepCounts:
@@ -28368,25 +28304,13 @@ HLT_tau25_idperf_tracktwoMVA_L1eTAU20:
     3: 19
     4: 19
   stepFeatures:
-    0: 57
-    1: 57
-    2: 57
-    3: 57
-    4: 57
+    0: 58
+    1: 58
+    2: 58
+    3: 58
+    4: 58
 HLT_tau25_idperf_tracktwoMVA_L1eTAU20M:
-  eventCount: 19
-  stepCounts:
-    0: 19
-    1: 19
-    2: 19
-    3: 19
-    4: 19
-  stepFeatures:
-    0: 49
-    1: 49
-    2: 49
-    3: 49
-    4: 49
+  eventCount: 0
 HLT_tau25_idperf_tracktwoMVA_L1jTAU20:
   eventCount: 19
   stepCounts:
@@ -28461,9 +28385,9 @@ HLT_tau25_mediumRNN_trackLRT_L1cTAU20M:
     2: 19
     3: 5
   stepFeatures:
-    0: 38
-    1: 38
-    2: 38
+    0: 37
+    1: 37
+    2: 37
     3: 6
 HLT_tau25_mediumRNN_trackLRT_L1eTAU20:
   eventCount: 5
@@ -28473,9 +28397,9 @@ HLT_tau25_mediumRNN_trackLRT_L1eTAU20:
     2: 19
     3: 5
   stepFeatures:
-    0: 57
-    1: 57
-    2: 57
+    0: 58
+    1: 58
+    2: 58
     3: 6
 HLT_tau25_mediumRNN_tracktwoLLP_L1TAU12IM:
   eventCount: 6
@@ -28500,10 +28424,10 @@ HLT_tau25_mediumRNN_tracktwoLLP_L1cTAU20M:
     3: 19
     4: 5
   stepFeatures:
-    0: 38
-    1: 38
-    2: 38
-    3: 38
+    0: 37
+    1: 37
+    2: 37
+    3: 37
     4: 6
 HLT_tau25_mediumRNN_tracktwoMVA_L1TAU12IM:
   eventCount: 3
@@ -28528,10 +28452,10 @@ HLT_tau25_mediumRNN_tracktwoMVA_L1cTAU20M:
     3: 19
     4: 3
   stepFeatures:
-    0: 38
-    1: 38
-    2: 38
-    3: 38
+    0: 37
+    1: 37
+    2: 37
+    3: 37
     4: 3
 HLT_tau25_mediumRNN_tracktwoMVA_L1eTAU20:
   eventCount: 3
@@ -28542,25 +28466,13 @@ HLT_tau25_mediumRNN_tracktwoMVA_L1eTAU20:
     3: 19
     4: 3
   stepFeatures:
-    0: 57
-    1: 57
-    2: 57
-    3: 57
+    0: 58
+    1: 58
+    2: 58
+    3: 58
     4: 3
 HLT_tau25_mediumRNN_tracktwoMVA_L1eTAU20M:
-  eventCount: 3
-  stepCounts:
-    0: 19
-    1: 19
-    2: 19
-    3: 19
-    4: 3
-  stepFeatures:
-    0: 49
-    1: 49
-    2: 49
-    3: 49
-    4: 3
+  eventCount: 0
 HLT_tau25_mediumRNN_tracktwoMVA_L1jTAU20:
   eventCount: 3
   stepCounts:
@@ -29018,16 +28930,16 @@ HLT_tau25_mediumRNN_tracktwoMVA_probe_xe75_cell_xe100_pfopufit_L1jXE110:
 HLT_tau25_mediumRNN_tracktwoMVA_tau20_mediumRNN_tracktwoMVA_02dRAB10_L1cTAU20M_DR-eTAU20eTAU12-jJ40:
   eventCount: 1
   stepCounts:
-    0: 12
-    1: 12
-    2: 12
-    3: 12
+    0: 14
+    1: 14
+    2: 14
+    3: 14
     4: 1
   stepFeatures:
-    0: 78
-    1: 78
-    2: 78
-    3: 78
+    0: 86
+    1: 86
+    2: 86
+    3: 86
     4: 6
 HLT_tau25_mediumRNN_tracktwoMVA_tau20_mediumRNN_tracktwoMVA_03dRAB30_L1DR-TAU20ITAU12I-J25:
   eventCount: 1
@@ -29052,10 +28964,10 @@ HLT_tau25_mediumRNN_tracktwoMVA_tau20_mediumRNN_tracktwoMVA_03dRAB30_L1cTAU30M_2
     3: 10
     4: 1
   stepFeatures:
-    0: 56
-    1: 56
-    2: 56
-    3: 56
+    0: 55
+    1: 55
+    2: 55
+    3: 55
     4: 7
 ? HLT_tau25_mediumRNN_tracktwoMVA_tau20_mediumRNN_tracktwoMVA_03dRAB_4j20c_020jvt_SHARED_j20c_020jvt_bgn185_pf_ftf_L1TAU20IM_2TAU12IM_4J12p0ETA25
 : eventCount: 1
@@ -29189,34 +29101,20 @@ HLT_tau25_perf_tracktwoMVA_L1TAU12IM:
     3: 27
     4: 15
 HLT_tau25_perf_tracktwoMVA_L1cTAU20M:
-  eventCount: 14
+  eventCount: 13
   stepCounts:
     0: 19
     1: 19
     2: 19
     3: 19
-    4: 14
+    4: 13
   stepFeatures:
-    0: 38
-    1: 38
-    2: 38
-    3: 38
-    4: 20
+    0: 37
+    1: 37
+    2: 37
+    3: 37
+    4: 19
 HLT_tau25_perf_tracktwoMVA_L1eTAU20:
-  eventCount: 14
-  stepCounts:
-    0: 19
-    1: 19
-    2: 19
-    3: 19
-    4: 14
-  stepFeatures:
-    0: 57
-    1: 57
-    2: 57
-    3: 57
-    4: 22
-HLT_tau25_perf_tracktwoMVA_L1eTAU20M:
   eventCount: 13
   stepCounts:
     0: 19
@@ -29225,11 +29123,13 @@ HLT_tau25_perf_tracktwoMVA_L1eTAU20M:
     3: 19
     4: 13
   stepFeatures:
-    0: 49
-    1: 49
-    2: 49
-    3: 49
-    4: 20
+    0: 58
+    1: 58
+    2: 58
+    3: 58
+    4: 21
+HLT_tau25_perf_tracktwoMVA_L1eTAU20M:
+  eventCount: 0
 HLT_tau25_perf_tracktwoMVA_L1jTAU20:
   eventCount: 14
   stepCounts:
@@ -29549,11 +29449,11 @@ HLT_tau30_idperf_tracktwoMVA_tau20_idperf_tracktwoMVA_03dRAB30_L1cTAU30M_2cTAU20
     3: 10
     4: 10
   stepFeatures:
-    0: 56
-    1: 56
-    2: 56
-    3: 56
-    4: 56
+    0: 55
+    1: 55
+    2: 55
+    3: 55
+    4: 55
 HLT_tau30_idperf_tracktwoMVA_tau20_idperf_tracktwoMVA_03dRAB_L1TAU20IM_2TAU12IM_4J12p0ETA25:
   eventCount: 7
   stepCounts:
@@ -29600,10 +29500,10 @@ HLT_tau30_idperf_tracktwoMVA_tau20_idperf_tracktwoMVA_03dRAB_L1TAU20IM_2TAU12IM_
     6: 1
     7: 1
   stepFeatures:
-    0: 56
-    1: 56
-    2: 56
-    3: 56
+    0: 55
+    1: 55
+    2: 55
+    3: 55
     4: 7
     5: 2
     6: 10
@@ -29645,10 +29545,10 @@ HLT_tau30_mediumRNN_tracktwoMVA_tau20_mediumRNN_tracktwoMVA_03dRAB30_L1cTAU30M_2
     3: 11
     4: 1
   stepFeatures:
-    0: 59
-    1: 59
-    2: 59
-    3: 59
+    0: 58
+    1: 58
+    2: 58
+    3: 58
     4: 7
 HLT_tau30_mediumRNN_tracktwoMVA_tau20_mediumRNN_tracktwoMVA_03dRAB30_L1cTAU30M_2cTAU20M_DR-eTAU30eTAU20-jJ55:
   eventCount: 1
@@ -29659,10 +29559,10 @@ HLT_tau30_mediumRNN_tracktwoMVA_tau20_mediumRNN_tracktwoMVA_03dRAB30_L1cTAU30M_2
     3: 10
     4: 1
   stepFeatures:
-    0: 56
-    1: 56
-    2: 56
-    3: 56
+    0: 55
+    1: 55
+    2: 55
+    3: 55
     4: 7
 HLT_tau30_mediumRNN_tracktwoMVA_tau20_mediumRNN_tracktwoMVA_03dRAB30_L1jJ85p0ETA21_3jJ40p0ETA25:
   eventCount: 1
@@ -29710,10 +29610,10 @@ HLT_tau30_mediumRNN_tracktwoMVA_tau20_mediumRNN_tracktwoMVA_03dRAB30_j20c_020jvt
     6: 1
     7: 1
   stepFeatures:
-    0: 56
-    1: 56
-    2: 56
-    3: 56
+    0: 55
+    1: 55
+    2: 55
+    3: 55
     4: 7
     5: 1
     6: 5
@@ -29727,10 +29627,10 @@ HLT_tau30_mediumRNN_tracktwoMVA_tau20_mediumRNN_tracktwoMVA_03dRAB_L12cTAU20M_10
     3: 9
     4: 1
   stepFeatures:
-    0: 51
-    1: 51
-    2: 51
-    3: 51
+    0: 50
+    1: 50
+    2: 50
+    3: 50
     4: 7
 HLT_tau30_mediumRNN_tracktwoMVA_tau20_mediumRNN_tracktwoMVA_03dRAB_L12cTAU20M_4DR28-eTAU30eTAU20-jJ55:
   eventCount: 1
@@ -29741,10 +29641,10 @@ HLT_tau30_mediumRNN_tracktwoMVA_tau20_mediumRNN_tracktwoMVA_03dRAB_L12cTAU20M_4D
     3: 10
     4: 1
   stepFeatures:
-    0: 57
-    1: 57
-    2: 57
-    3: 57
+    0: 56
+    1: 56
+    2: 56
+    3: 56
     4: 7
 HLT_tau30_mediumRNN_tracktwoMVA_tau20_mediumRNN_tracktwoMVA_03dRAB_L12cTAU20M_4DR32-eTAU30eTAU20-jJ55:
   eventCount: 1
@@ -29755,10 +29655,10 @@ HLT_tau30_mediumRNN_tracktwoMVA_tau20_mediumRNN_tracktwoMVA_03dRAB_L12cTAU20M_4D
     3: 10
     4: 1
   stepFeatures:
-    0: 57
-    1: 57
-    2: 57
-    3: 57
+    0: 56
+    1: 56
+    2: 56
+    3: 56
     4: 7
 HLT_tau30_mediumRNN_tracktwoMVA_tau20_mediumRNN_tracktwoMVA_03dRAB_L14jJ30p0ETA24_0DETA24-eTAU30eTAU12:
   eventCount: 1
@@ -29783,10 +29683,10 @@ HLT_tau30_mediumRNN_tracktwoMVA_tau20_mediumRNN_tracktwoMVA_03dRAB_L14jJ30p0ETA2
     3: 18
     4: 1
   stepFeatures:
-    0: 127
-    1: 127
-    2: 127
-    3: 127
+    0: 126
+    1: 126
+    2: 126
+    3: 126
     4: 9
 HLT_tau30_mediumRNN_tracktwoMVA_tau20_mediumRNN_tracktwoMVA_03dRAB_L14jJ30p0ETA24_0DETA24_4DPHI99-eTAU30eTAU12:
   eventCount: 1
@@ -29797,10 +29697,10 @@ HLT_tau30_mediumRNN_tracktwoMVA_tau20_mediumRNN_tracktwoMVA_03dRAB_L14jJ30p0ETA2
     3: 18
     4: 1
   stepFeatures:
-    0: 127
-    1: 127
-    2: 127
-    3: 127
+    0: 126
+    1: 126
+    2: 126
+    3: 126
     4: 9
 HLT_tau30_mediumRNN_tracktwoMVA_tau20_mediumRNN_tracktwoMVA_03dRAB_L14jJ30p0ETA24_0DETA24_4DPHI99-eTAU30eTAU20:
   eventCount: 1
@@ -29811,10 +29711,10 @@ HLT_tau30_mediumRNN_tracktwoMVA_tau20_mediumRNN_tracktwoMVA_03dRAB_L14jJ30p0ETA2
     3: 18
     4: 1
   stepFeatures:
-    0: 127
-    1: 127
-    2: 127
-    3: 127
+    0: 126
+    1: 126
+    2: 126
+    3: 126
     4: 9
 HLT_tau30_mediumRNN_tracktwoMVA_tau20_mediumRNN_tracktwoMVA_03dRAB_L1TAU20IM_2TAU12IM:
   eventCount: 1
@@ -29853,10 +29753,10 @@ HLT_tau30_mediumRNN_tracktwoMVA_tau20_mediumRNN_tracktwoMVA_03dRAB_L1cTAU20M_cTA
     3: 10
     4: 1
   stepFeatures:
-    0: 70
-    1: 58
-    2: 58
-    3: 58
+    0: 69
+    1: 57
+    2: 57
+    3: 57
     4: 8
 ? HLT_tau30_mediumRNN_tracktwoMVA_tau20_mediumRNN_tracktwoMVA_03dRAB_L1cTAU20M_cTAU12M_4jJ30p0ETA24_0DETA24_10DPHI99-eTAU30eTAU12
 : eventCount: 1
@@ -29867,10 +29767,10 @@ HLT_tau30_mediumRNN_tracktwoMVA_tau20_mediumRNN_tracktwoMVA_03dRAB_L1cTAU20M_cTA
     3: 11
     4: 1
   stepFeatures:
-    0: 76
-    1: 62
-    2: 62
-    3: 62
+    0: 74
+    1: 60
+    2: 60
+    3: 60
     4: 8
 ? HLT_tau30_mediumRNN_tracktwoMVA_tau20_mediumRNN_tracktwoMVA_03dRAB_L1cTAU20M_cTAU12M_4jJ30p0ETA24_0DETA24_4DPHI99-eTAU30eTAU12
 : eventCount: 1
@@ -29881,10 +29781,10 @@ HLT_tau30_mediumRNN_tracktwoMVA_tau20_mediumRNN_tracktwoMVA_03dRAB_L1cTAU20M_cTA
     3: 11
     4: 1
   stepFeatures:
-    0: 76
-    1: 62
-    2: 62
-    3: 62
+    0: 74
+    1: 60
+    2: 60
+    3: 60
     4: 8
 ? HLT_tau30_mediumRNN_tracktwoMVA_tau20_mediumRNN_tracktwoMVA_03dRAB_L1cTAU20M_cTAU12M_4jJ30p0ETA24_0DETA24_4DPHI99-eTAU30eTAU20
 : eventCount: 1
@@ -29895,10 +29795,10 @@ HLT_tau30_mediumRNN_tracktwoMVA_tau20_mediumRNN_tracktwoMVA_03dRAB_L1cTAU20M_cTA
     3: 11
     4: 1
   stepFeatures:
-    0: 76
-    1: 62
-    2: 62
-    3: 62
+    0: 74
+    1: 60
+    2: 60
+    3: 60
     4: 8
 HLT_tau30_mediumRNN_tracktwoMVA_tau20_mediumRNN_tracktwoMVA_03dRAB_L1cTAU30M_2cTAU20M_4jJ30p0ETA25:
   eventCount: 1
@@ -29909,10 +29809,10 @@ HLT_tau30_mediumRNN_tracktwoMVA_tau20_mediumRNN_tracktwoMVA_03dRAB_L1cTAU30M_2cT
     3: 10
     4: 1
   stepFeatures:
-    0: 56
-    1: 56
-    2: 56
-    3: 56
+    0: 55
+    1: 55
+    2: 55
+    3: 55
     4: 7
 HLT_tau30_mediumRNN_tracktwoMVA_tau20_mediumRNN_tracktwoMVA_03dRAB_L1jJ85p0ETA21_3jJ40p0ETA25:
   eventCount: 1
@@ -30004,11 +29904,11 @@ HLT_tau35_idperf_tracktwoMVA_L1eTAU30:
     3: 17
     4: 17
   stepFeatures:
-    0: 43
-    1: 43
-    2: 43
-    3: 43
-    4: 43
+    0: 45
+    1: 45
+    2: 45
+    3: 45
+    4: 45
 HLT_tau35_idperf_tracktwoMVA_L1jTAU30:
   eventCount: 18
   stepCounts:
@@ -30088,10 +29988,10 @@ HLT_tau35_mediumRNN_tracktwoMVA_L1eTAU30:
     3: 17
     4: 2
   stepFeatures:
-    0: 43
-    1: 43
-    2: 43
-    3: 43
+    0: 45
+    1: 45
+    2: 45
+    3: 45
     4: 2
 HLT_tau35_mediumRNN_tracktwoMVA_L1jTAU30:
   eventCount: 2
@@ -30406,10 +30306,10 @@ HLT_tau35_mediumRNN_tracktwoMVA_tau20_mediumRNN_tracktwoMVA_03dRAB30_L1cTAU30M_2
     2: 10
     3: 10
   stepFeatures:
-    0: 54
-    1: 54
-    2: 54
-    3: 54
+    0: 53
+    1: 53
+    2: 53
+    3: 53
     4: 6
 HLT_tau35_mediumRNN_tracktwoMVA_tau20_mediumRNN_tracktwoMVA_03dRAB_L1TAU20IM_2TAU12IM_4J12p0ETA25:
   eventCount: 0
@@ -30452,30 +30352,8 @@ HLT_tau35_mediumRNN_tracktwoMVA_tau25_mediumRNN_tracktwoMVA_03dRAB30_L1DR-TAU20I
     4: 3
 HLT_tau35_mediumRNN_tracktwoMVA_tau25_mediumRNN_tracktwoMVA_03dRAB30_L1cTAU30M_2cTAU20M_DR-eTAU30MeTAU20M:
   eventCount: 0
-  stepCounts:
-    0: 11
-    1: 11
-    2: 11
-    3: 11
-  stepFeatures:
-    0: 54
-    1: 54
-    2: 54
-    3: 54
-    4: 5
 HLT_tau35_mediumRNN_tracktwoMVA_tau25_mediumRNN_tracktwoMVA_03dRAB30_L1cTAU30M_2cTAU20M_DR-eTAU30MeTAU20M-jJ55:
   eventCount: 0
-  stepCounts:
-    0: 10
-    1: 10
-    2: 10
-    3: 10
-  stepFeatures:
-    0: 51
-    1: 51
-    2: 51
-    3: 51
-    4: 5
 HLT_tau35_mediumRNN_tracktwoMVA_tau25_mediumRNN_tracktwoMVA_03dRAB30_L1cTAU30M_2cTAU20M_DR-eTAU30eTAU20:
   eventCount: 0
   stepCounts:
@@ -30591,11 +30469,11 @@ HLT_tau35_perf_tracktwoMVA_L1eTAU30:
     3: 17
     4: 13
   stepFeatures:
-    0: 43
-    1: 43
-    2: 43
-    3: 43
-    4: 18
+    0: 45
+    1: 45
+    2: 45
+    3: 45
+    4: 19
 HLT_tau35_perf_tracktwoMVA_L1jTAU30:
   eventCount: 14
   stepCounts:
@@ -30923,10 +30801,10 @@ HLT_tau40_mediumRNN_tracktwoMVA_tau20_mediumRNN_tracktwoMVA_03dRAB30_L1cTAU30M_2
     2: 10
     3: 10
   stepFeatures:
-    0: 53
-    1: 53
-    2: 53
-    3: 53
+    0: 52
+    1: 52
+    2: 52
+    3: 52
     4: 5
 HLT_tau40_mediumRNN_tracktwoMVA_tau20_mediumRNN_tracktwoMVA_03dRAB_L1TAU20IM_2TAU12IM_4J12p0ETA25:
   eventCount: 0
@@ -30962,10 +30840,10 @@ HLT_tau40_mediumRNN_tracktwoMVA_tau35_mediumRNN_tracktwoMVA_03dRAB_L1cTAU35M_2cT
     2: 10
     3: 10
   stepFeatures:
-    0: 44
-    1: 44
-    2: 44
-    3: 44
+    0: 45
+    1: 45
+    2: 45
+    3: 45
     4: 3
 HLT_tau40_mediumRNN_tracktwoMVA_tau35_mediumRNN_tracktwoMVA_03dRAB_L1cTAU35M_2cTAU30M_2jJ55_3jJ50:
   eventCount: 0
@@ -30975,24 +30853,13 @@ HLT_tau40_mediumRNN_tracktwoMVA_tau35_mediumRNN_tracktwoMVA_03dRAB_L1cTAU35M_2cT
     2: 10
     3: 10
   stepFeatures:
-    0: 44
-    1: 44
-    2: 44
-    3: 44
+    0: 45
+    1: 45
+    2: 45
+    3: 45
     4: 3
 HLT_tau40_mediumRNN_tracktwoMVA_tau35_mediumRNN_tracktwoMVA_03dRAB_L1eTAU35M_2eTAU30M:
   eventCount: 0
-  stepCounts:
-    0: 13
-    1: 13
-    2: 13
-    3: 13
-  stepFeatures:
-    0: 62
-    1: 62
-    2: 62
-    3: 62
-    4: 3
 HLT_tau50_mediumRNN_tracktwoMVA_xe80_pfopufit_xe50_cell_L1XE50:
   eventCount: 0
   stepCounts:
@@ -31130,7 +30997,7 @@ HLT_tau60_mediumRNN_tracktwoLLP_probe_xe65_cell_xe100_pfopufit_L1gXEJWOJ110:
 HLT_tau60_mediumRNN_tracktwoLLP_probe_xe65_cell_xe100_pfopufit_L1jXE100:
   eventCount: 0
   stepCounts:
-    0: 4
+    0: 3
     1: 1
     2: 1
     3: 1
@@ -31146,7 +31013,7 @@ HLT_tau60_mediumRNN_tracktwoLLP_probe_xe65_cell_xe100_pfopufit_L1jXE100:
 HLT_tau60_mediumRNN_tracktwoLLP_probe_xe65_cell_xe100_pfopufit_L1jXE110:
   eventCount: 0
   stepCounts:
-    0: 4
+    0: 3
     1: 1
     2: 1
     3: 1
@@ -31200,7 +31067,7 @@ HLT_tau60_mediumRNN_tracktwoLLP_probe_xe65_cell_xe90_pfopufit_L1gXEJWOJ110:
 HLT_tau60_mediumRNN_tracktwoLLP_probe_xe65_cell_xe90_pfopufit_L1jXE100:
   eventCount: 1
   stepCounts:
-    0: 4
+    0: 3
     1: 2
     2: 2
     3: 2
@@ -31218,7 +31085,7 @@ HLT_tau60_mediumRNN_tracktwoLLP_probe_xe65_cell_xe90_pfopufit_L1jXE100:
 HLT_tau60_mediumRNN_tracktwoLLP_probe_xe65_cell_xe90_pfopufit_L1jXE110:
   eventCount: 1
   stepCounts:
-    0: 4
+    0: 3
     1: 2
     2: 2
     3: 2
@@ -31270,7 +31137,7 @@ HLT_tau60_mediumRNN_tracktwoLLP_probe_xe75_cell_xe100_pfopufit_L1gXEJWOJ110:
 HLT_tau60_mediumRNN_tracktwoLLP_probe_xe75_cell_xe100_pfopufit_L1jXE100:
   eventCount: 0
   stepCounts:
-    0: 3
+    0: 2
     1: 1
     2: 1
     3: 1
@@ -31286,7 +31153,7 @@ HLT_tau60_mediumRNN_tracktwoLLP_probe_xe75_cell_xe100_pfopufit_L1jXE100:
 HLT_tau60_mediumRNN_tracktwoLLP_probe_xe75_cell_xe100_pfopufit_L1jXE110:
   eventCount: 0
   stepCounts:
-    0: 3
+    0: 2
     1: 1
     2: 1
     3: 1
@@ -31314,15 +31181,15 @@ HLT_tau60_mediumRNN_tracktwoMVA_L1TAU40:
 HLT_tau60_mediumRNN_tracktwoMVA_L1eTAU60:
   eventCount: 0
   stepCounts:
-    0: 17
-    1: 17
-    2: 17
-    3: 17
+    0: 15
+    1: 15
+    2: 15
+    3: 15
   stepFeatures:
-    0: 22
-    1: 22
-    2: 22
-    3: 22
+    0: 19
+    1: 19
+    2: 19
+    3: 19
 HLT_tau60_mediumRNN_tracktwoMVA_probe_xe65_cell_xe100_pfopufit_L1XE50:
   eventCount: 0
   stepCounts:
@@ -31360,7 +31227,7 @@ HLT_tau60_mediumRNN_tracktwoMVA_probe_xe65_cell_xe100_pfopufit_L1gXEJWOJ110:
 HLT_tau60_mediumRNN_tracktwoMVA_probe_xe65_cell_xe100_pfopufit_L1jXE100:
   eventCount: 0
   stepCounts:
-    0: 4
+    0: 3
     1: 1
     2: 1
     3: 1
@@ -31376,7 +31243,7 @@ HLT_tau60_mediumRNN_tracktwoMVA_probe_xe65_cell_xe100_pfopufit_L1jXE100:
 HLT_tau60_mediumRNN_tracktwoMVA_probe_xe65_cell_xe100_pfopufit_L1jXE110:
   eventCount: 0
   stepCounts:
-    0: 4
+    0: 3
     1: 1
     2: 1
     3: 1
@@ -31426,7 +31293,7 @@ HLT_tau60_mediumRNN_tracktwoMVA_probe_xe65_cell_xe90_pfopufit_L1gXEJWOJ110:
 HLT_tau60_mediumRNN_tracktwoMVA_probe_xe65_cell_xe90_pfopufit_L1jXE100:
   eventCount: 0
   stepCounts:
-    0: 4
+    0: 3
     1: 2
     2: 2
     3: 2
@@ -31442,7 +31309,7 @@ HLT_tau60_mediumRNN_tracktwoMVA_probe_xe65_cell_xe90_pfopufit_L1jXE100:
 HLT_tau60_mediumRNN_tracktwoMVA_probe_xe65_cell_xe90_pfopufit_L1jXE110:
   eventCount: 0
   stepCounts:
-    0: 4
+    0: 3
     1: 2
     2: 2
     3: 2
@@ -31492,7 +31359,7 @@ HLT_tau60_mediumRNN_tracktwoMVA_probe_xe75_cell_xe100_pfopufit_L1gXEJWOJ110:
 HLT_tau60_mediumRNN_tracktwoMVA_probe_xe75_cell_xe100_pfopufit_L1jXE100:
   eventCount: 0
   stepCounts:
-    0: 3
+    0: 2
     1: 1
     2: 1
     3: 1
@@ -31508,7 +31375,7 @@ HLT_tau60_mediumRNN_tracktwoMVA_probe_xe75_cell_xe100_pfopufit_L1jXE100:
 HLT_tau60_mediumRNN_tracktwoMVA_probe_xe75_cell_xe100_pfopufit_L1jXE110:
   eventCount: 0
   stepCounts:
-    0: 3
+    0: 2
     1: 1
     2: 1
     3: 1
@@ -31536,29 +31403,18 @@ HLT_tau60_mediumRNN_tracktwoMVA_tau25_mediumRNN_tracktwoMVA_xe50_cell_03dRAB_L1T
 HLT_tau60_mediumRNN_tracktwoMVA_tau25_mediumRNN_tracktwoMVA_xe50_cell_03dRAB_L1eTAU60_2cTAU20M_jXE80:
   eventCount: 0
   stepCounts:
-    0: 7
-    1: 7
-    2: 7
-    3: 7
+    0: 6
+    1: 6
+    2: 6
+    3: 6
   stepFeatures:
-    0: 25
-    1: 25
-    2: 25
-    3: 25
+    0: 22
+    1: 22
+    2: 22
+    3: 22
     4: 2
 HLT_tau60_mediumRNN_tracktwoMVA_tau25_mediumRNN_tracktwoMVA_xe50_cell_03dRAB_L1eTAU60_2eTAU20M_jXE80:
   eventCount: 0
-  stepCounts:
-    0: 11
-    1: 11
-    2: 11
-    3: 11
-  stepFeatures:
-    0: 46
-    1: 46
-    2: 46
-    3: 46
-    4: 2
 HLT_tau80_idperf_trackLRT_L1TAU60:
   eventCount: 5
   stepCounts:
@@ -31579,10 +31435,10 @@ HLT_tau80_idperf_trackLRT_L1eTAU80:
     2: 5
     3: 5
   stepFeatures:
-    0: 5
-    1: 5
-    2: 5
-    3: 5
+    0: 6
+    1: 6
+    2: 6
+    3: 6
 HLT_tau80_idperf_tracktwoMVA_L1TAU60:
   eventCount: 5
   stepCounts:
@@ -31606,11 +31462,11 @@ HLT_tau80_idperf_tracktwoMVA_L1eTAU80:
     3: 5
     4: 5
   stepFeatures:
-    0: 5
-    1: 5
-    2: 5
-    3: 5
-    4: 5
+    0: 6
+    1: 6
+    2: 6
+    3: 6
+    4: 6
 HLT_tau80_mediumRNN_trackLRT_L1TAU60:
   eventCount: 0
   stepCounts:
@@ -31628,9 +31484,9 @@ HLT_tau80_mediumRNN_trackLRT_L1eTAU80:
     1: 5
     2: 5
   stepFeatures:
-    0: 5
-    1: 5
-    2: 5
+    0: 6
+    1: 6
+    2: 6
 HLT_tau80_mediumRNN_tracktwoLLP_probe_xe65_cell_xe100_pfopufit_L1XE50:
   eventCount: 0
   stepCounts:
@@ -31849,10 +31705,10 @@ HLT_tau80_mediumRNN_tracktwoLLP_tau60_mediumRNN_tracktwoLLP_03dRAB_L1eTAU80_2eTA
     2: 2
     3: 2
   stepFeatures:
-    0: 11
-    1: 7
-    2: 7
-    3: 7
+    0: 12
+    1: 8
+    2: 8
+    3: 8
 HLT_tau80_mediumRNN_tracktwoLLP_tau60_tightRNN_tracktwoLLP_03dRAB_L1TAU60_2TAU40:
   eventCount: 0
   stepCounts:
@@ -31873,10 +31729,10 @@ HLT_tau80_mediumRNN_tracktwoLLP_tau60_tightRNN_tracktwoLLP_03dRAB_L1eTAU80_2eTAU
     2: 2
     3: 2
   stepFeatures:
-    0: 11
-    1: 7
-    2: 7
-    3: 7
+    0: 12
+    1: 8
+    2: 8
+    3: 8
 HLT_tau80_mediumRNN_tracktwoMVA_L1TAU60:
   eventCount: 0
   stepCounts:
@@ -31897,10 +31753,10 @@ HLT_tau80_mediumRNN_tracktwoMVA_L1eTAU80:
     2: 5
     3: 5
   stepFeatures:
-    0: 5
-    1: 5
-    2: 5
-    3: 5
+    0: 6
+    1: 6
+    2: 6
+    3: 6
 HLT_tau80_mediumRNN_tracktwoMVA_probe_xe65_cell_xe100_pfopufit_L1XE50:
   eventCount: 0
   stepCounts:
@@ -32143,10 +31999,10 @@ HLT_tau80_mediumRNN_tracktwoMVA_tau60_mediumRNN_tracktwoMVA_03dRAB_L1eTAU80_2eTA
     2: 2
     3: 2
   stepFeatures:
-    0: 11
-    1: 7
-    2: 7
-    3: 7
+    0: 12
+    1: 8
+    2: 8
+    3: 8
 HLT_tau80_tightRNN_tracktwoLLP_tau60_tightRNN_tracktwoLLP_03dRAB_L1TAU60_2TAU40:
   eventCount: 0
   stepCounts:
@@ -32167,10 +32023,10 @@ HLT_tau80_tightRNN_tracktwoLLP_tau60_tightRNN_tracktwoLLP_03dRAB_L1eTAU80_2eTAU6
     2: 2
     3: 2
   stepFeatures:
-    0: 11
-    1: 7
-    2: 7
-    3: 7
+    0: 12
+    1: 8
+    2: 8
+    3: 8
 HLT_xe0_cell_L1XE50:
   eventCount: 8
   stepCounts:
diff --git a/Trigger/TrigValidation/TrigP1Test/share/ref_v1Dev_decodeBS_build.ref b/Trigger/TrigValidation/TrigP1Test/share/ref_v1Dev_decodeBS_build.ref
index 8678e004903e178483800a1a07686322bea19a09..8698726ed1f43df8741987a7f408742262ecf70b 100644
--- a/Trigger/TrigValidation/TrigP1Test/share/ref_v1Dev_decodeBS_build.ref
+++ b/Trigger/TrigValidation/TrigP1Test/share/ref_v1Dev_decodeBS_build.ref
@@ -1522,10 +1522,10 @@ HLT_e24_lhmedium_ivarloose_tau20_mediumRNN_tracktwoMVA_03dRAB_L1eEM26M:
     4: 1
     5: 1
   stepFeatures:
-    0: 4
-    1: 2
-    2: 2
-    3: 2
+    0: 5
+    1: 3
+    2: 3
+    3: 3
     4: 2
     5: 1
 HLT_e24_lhmedium_ivarloose_tau20_mediumRNN_tracktwoMVA_03dRAB_L1eEM28M:
@@ -1538,10 +1538,10 @@ HLT_e24_lhmedium_ivarloose_tau20_mediumRNN_tracktwoMVA_03dRAB_L1eEM28M:
     4: 1
     5: 1
   stepFeatures:
-    0: 4
-    1: 2
-    2: 2
-    3: 2
+    0: 5
+    1: 3
+    2: 3
+    3: 3
     4: 2
     5: 1
 HLT_e24_lhtight_ivarloose_L1eEM26M:
@@ -3434,10 +3434,10 @@ HLT_g25_medium_tau25_dikaonmass_tracktwoMVA_50invmAB_L1eEM26M:
     2: 1
     3: 1
   stepFeatures:
-    0: 5
-    1: 4
-    2: 2
-    3: 2
+    0: 6
+    1: 5
+    2: 3
+    3: 3
 HLT_g25_medium_tau25_dikaonmass_tracktwoMVA_50invmAB_L1eEM28M:
   eventCount: 0
   stepCounts:
@@ -3446,10 +3446,10 @@ HLT_g25_medium_tau25_dikaonmass_tracktwoMVA_50invmAB_L1eEM28M:
     2: 1
     3: 1
   stepFeatures:
-    0: 5
-    1: 4
-    2: 2
-    3: 2
+    0: 6
+    1: 5
+    2: 3
+    3: 3
 HLT_g25_medium_tau25_dipion1_tracktwoMVA_50invmAB_L1eEM26M:
   eventCount: 0
   stepCounts:
@@ -3458,10 +3458,10 @@ HLT_g25_medium_tau25_dipion1_tracktwoMVA_50invmAB_L1eEM26M:
     2: 1
     3: 1
   stepFeatures:
-    0: 5
-    1: 4
-    2: 2
-    3: 2
+    0: 6
+    1: 5
+    2: 3
+    3: 3
 HLT_g25_medium_tau25_dipion1_tracktwoMVA_50invmAB_L1eEM28M:
   eventCount: 0
   stepCounts:
@@ -3470,10 +3470,10 @@ HLT_g25_medium_tau25_dipion1_tracktwoMVA_50invmAB_L1eEM28M:
     2: 1
     3: 1
   stepFeatures:
-    0: 5
-    1: 4
-    2: 2
-    3: 2
+    0: 6
+    1: 5
+    2: 3
+    3: 3
 HLT_g25_medium_tau25_dipion2_tracktwoMVA_50invmAB_L1eEM26M:
   eventCount: 0
   stepCounts:
@@ -3482,10 +3482,10 @@ HLT_g25_medium_tau25_dipion2_tracktwoMVA_50invmAB_L1eEM26M:
     2: 1
     3: 1
   stepFeatures:
-    0: 5
-    1: 4
-    2: 2
-    3: 2
+    0: 6
+    1: 5
+    2: 3
+    3: 3
 HLT_g25_medium_tau25_dipion2_tracktwoMVA_50invmAB_L1eEM28M:
   eventCount: 0
   stepCounts:
@@ -3494,10 +3494,10 @@ HLT_g25_medium_tau25_dipion2_tracktwoMVA_50invmAB_L1eEM28M:
     2: 1
     3: 1
   stepFeatures:
-    0: 5
-    1: 4
-    2: 2
-    3: 2
+    0: 6
+    1: 5
+    2: 3
+    3: 3
 HLT_g25_medium_tau25_kaonpi1_tracktwoMVA_50invmAB_L1eEM26M:
   eventCount: 0
   stepCounts:
@@ -3506,10 +3506,10 @@ HLT_g25_medium_tau25_kaonpi1_tracktwoMVA_50invmAB_L1eEM26M:
     2: 1
     3: 1
   stepFeatures:
-    0: 5
-    1: 4
-    2: 2
-    3: 2
+    0: 6
+    1: 5
+    2: 3
+    3: 3
 HLT_g25_medium_tau25_kaonpi1_tracktwoMVA_50invmAB_L1eEM28M:
   eventCount: 0
   stepCounts:
@@ -3518,10 +3518,10 @@ HLT_g25_medium_tau25_kaonpi1_tracktwoMVA_50invmAB_L1eEM28M:
     2: 1
     3: 1
   stepFeatures:
-    0: 5
-    1: 4
-    2: 2
-    3: 2
+    0: 6
+    1: 5
+    2: 3
+    3: 3
 HLT_g25_medium_tau25_kaonpi2_tracktwoMVA_50invmAB_L1eEM26M:
   eventCount: 0
   stepCounts:
@@ -3530,10 +3530,10 @@ HLT_g25_medium_tau25_kaonpi2_tracktwoMVA_50invmAB_L1eEM26M:
     2: 1
     3: 1
   stepFeatures:
-    0: 5
-    1: 4
-    2: 2
-    3: 2
+    0: 6
+    1: 5
+    2: 3
+    3: 3
 HLT_g25_medium_tau25_kaonpi2_tracktwoMVA_50invmAB_L1eEM28M:
   eventCount: 0
   stepCounts:
@@ -3542,10 +3542,10 @@ HLT_g25_medium_tau25_kaonpi2_tracktwoMVA_50invmAB_L1eEM28M:
     2: 1
     3: 1
   stepFeatures:
-    0: 5
-    1: 4
-    2: 2
-    3: 2
+    0: 6
+    1: 5
+    2: 3
+    3: 3
 HLT_g25_medium_tau25_singlepion_tracktwoMVA_50invmAB_L1eEM26M:
   eventCount: 0
   stepCounts:
@@ -3554,10 +3554,10 @@ HLT_g25_medium_tau25_singlepion_tracktwoMVA_50invmAB_L1eEM26M:
     2: 1
     3: 1
   stepFeatures:
-    0: 5
-    1: 4
-    2: 2
-    3: 2
+    0: 6
+    1: 5
+    2: 3
+    3: 3
 HLT_g25_medium_tau25_singlepion_tracktwoMVA_50invmAB_L1eEM28M:
   eventCount: 0
   stepCounts:
@@ -3566,10 +3566,10 @@ HLT_g25_medium_tau25_singlepion_tracktwoMVA_50invmAB_L1eEM28M:
     2: 1
     3: 1
   stepFeatures:
-    0: 5
-    1: 4
-    2: 2
-    3: 2
+    0: 6
+    1: 5
+    2: 3
+    3: 3
 HLT_g25_medium_xe35_cell_xe40_pfopufit_L1XE35:
   eventCount: 0
 HLT_g25_medium_xe35_cell_xe40_tcpufit_L1eEM26M:
@@ -7695,8 +7695,6 @@ HLT_mu14_ivarloose_tau25_mediumRNN_tracktwoMVA_03dRAB_L1MU8F_TAU12IM_3J12:
   eventCount: 0
 HLT_mu14_ivarloose_tau25_mediumRNN_tracktwoMVA_03dRAB_L1MU8F_eTAU20M_3jJ30:
   eventCount: 0
-  stepFeatures:
-    0: 1
 HLT_mu14_ivarloose_tau35_mediumRNN_tracktwoMVA_03dRAB_L1MU8F_TAU20IM:
   eventCount: 0
   stepCounts:
@@ -7706,11 +7704,6 @@ HLT_mu14_ivarloose_tau35_mediumRNN_tracktwoMVA_03dRAB_L1MU8F_TAU20IM:
     1: 1
 HLT_mu14_ivarloose_tau35_mediumRNN_tracktwoMVA_03dRAB_L1MU8F_eTAU20M:
   eventCount: 0
-  stepCounts:
-    0: 1
-  stepFeatures:
-    0: 3
-    1: 1
 HLT_mu14_mu14_idperf_50invmAB130_L12MU8F:
   eventCount: 0
 HLT_mu14_mu14_idtp_idZmumu_L12MU8F:
@@ -7719,11 +7712,6 @@ HLT_mu14_tau25_mediumRNN_tracktwoMVA_xe50_cell_03dRAB_L1MU8F_TAU12IM_XE35:
   eventCount: 0
 HLT_mu14_tau25_mediumRNN_tracktwoMVA_xe50_cell_03dRAB_L1MU8F_eTAU20M_jXE70:
   eventCount: 0
-  stepCounts:
-    0: 1
-  stepFeatures:
-    0: 3
-    1: 1
 HLT_mu20_2mu4noL1_L1MU14FCH:
   eventCount: 0
 HLT_mu20_LRT_d0loose_L1MU14FCH:
@@ -9304,7 +9292,7 @@ HLT_noalg_L1XE60:
 HLT_noalg_L1cTAU20M:
   eventCount: 13
 HLT_noalg_L1cTAU30M:
-  eventCount: 8
+  eventCount: 9
 HLT_noalg_L1cTAU35M:
   eventCount: 7
 HLT_noalg_L1eEM12L:
@@ -9334,9 +9322,9 @@ HLT_noalg_L1eTAU140:
 HLT_noalg_L1eTAU20:
   eventCount: 13
 HLT_noalg_L1eTAU20M:
-  eventCount: 13
+  eventCount: 0
 HLT_noalg_L1eTAU30:
-  eventCount: 8
+  eventCount: 9
 HLT_noalg_L1eTAU60:
   eventCount: 3
 HLT_noalg_L1eTAU80:
@@ -9510,31 +9498,31 @@ HLT_tau0_mediumRNN_tracktwoMVA_tau0_mediumRNN_tracktwoMVA_03dRAB_L14jJ30p0ETA24_
 HLT_tau0_mediumRNN_tracktwoMVA_tau0_mediumRNN_tracktwoMVA_03dRAB_L14jJ30p0ETA24_0DETA24_10DPHI99-eTAU30eTAU12:
   eventCount: 1
   stepCounts:
-    0: 2
-    1: 2
-    2: 2
-    3: 2
+    0: 3
+    1: 3
+    2: 3
+    3: 3
     4: 1
   stepFeatures:
-    0: 10
-    1: 8
-    2: 8
-    3: 8
-    4: 4
+    0: 12
+    1: 12
+    2: 12
+    3: 12
+    4: 6
 HLT_tau0_mediumRNN_tracktwoMVA_tau0_mediumRNN_tracktwoMVA_03dRAB_L14jJ30p0ETA24_0DETA24_4DPHI99-eTAU30eTAU12:
   eventCount: 1
   stepCounts:
-    0: 2
-    1: 2
-    2: 2
-    3: 2
+    0: 3
+    1: 3
+    2: 3
+    3: 3
     4: 1
   stepFeatures:
-    0: 10
-    1: 8
-    2: 8
-    3: 8
-    4: 4
+    0: 12
+    1: 12
+    2: 12
+    3: 12
+    4: 6
 HLT_tau0_mediumRNN_tracktwoMVA_tau0_mediumRNN_tracktwoMVA_03dRAB_L14jJ30p0ETA24_0DETA24_4DPHI99-eTAU30eTAU20:
   eventCount: 1
   stepCounts:
@@ -9570,7 +9558,7 @@ HLT_tau0_ptonly_L1eTAU12:
   stepCounts:
     0: 16
   stepFeatures:
-    0: 26
+    0: 30
 HLT_tau0_ptonly_L1eTAU80:
   eventCount: 2
   stepCounts:
@@ -9724,11 +9712,11 @@ HLT_tau20_idperf_tracktwoMVA_L1eTAU12:
     3: 15
     4: 15
   stepFeatures:
-    0: 24
-    1: 24
-    2: 24
-    3: 24
-    4: 24
+    0: 27
+    1: 27
+    2: 27
+    3: 27
+    4: 27
 HLT_tau20_mediumRNN_tracktwoMVA_L1RD0_FILLED:
   eventCount: 4
   stepCounts:
@@ -9738,10 +9726,10 @@ HLT_tau20_mediumRNN_tracktwoMVA_L1RD0_FILLED:
     3: 15
     4: 4
   stepFeatures:
-    0: 24
-    1: 24
-    2: 24
-    3: 24
+    0: 27
+    1: 27
+    2: 27
+    3: 27
     4: 4
 HLT_tau20_mediumRNN_tracktwoMVA_L1TAU8:
   eventCount: 5
@@ -9766,10 +9754,10 @@ HLT_tau20_mediumRNN_tracktwoMVA_L1eTAU12:
     3: 15
     4: 4
   stepFeatures:
-    0: 24
-    1: 24
-    2: 24
-    3: 24
+    0: 27
+    1: 27
+    2: 27
+    3: 27
     4: 4
 ? HLT_tau20_mediumRNN_tracktwoMVA_j65c_020jvt_j40c_020jvt_j25c_020jvt_j20c_020jvt_SHARED_j20c_020jvt_bgn177_pf_ftf_presel3c20XX1c20bg85_L1jJ85p0ETA21_3jJ40p0ETA25
 : eventCount: 0
@@ -9803,10 +9791,10 @@ HLT_tau20_mediumRNN_tracktwoMVA_probe_j110_pf_ftf_preselj80_03dRAB_L1jJ60:
   stepFeatures:
     0: 5
     1: 1
-    2: 2
-    3: 2
-    4: 2
-    5: 2
+    2: 3
+    3: 3
+    4: 3
+    5: 3
 HLT_tau20_mediumRNN_tracktwoMVA_probe_j175_pf_ftf_preselj140_03dRAB_L1J50:
   eventCount: 0
 HLT_tau20_mediumRNN_tracktwoMVA_probe_j175_pf_ftf_preselj140_03dRAB_L1jJ90:
@@ -9824,10 +9812,10 @@ HLT_tau20_mediumRNN_tracktwoMVA_probe_j25_pf_ftf_03dRAB_L1RD0_FILLED:
   stepFeatures:
     0: 50
     1: 45
-    2: 24
-    3: 24
-    4: 24
-    5: 24
+    2: 27
+    3: 27
+    4: 27
+    5: 27
     6: 4
 HLT_tau20_mediumRNN_tracktwoMVA_probe_j260_pf_ftf_preselj200_03dRAB_L1J75:
   eventCount: 0
@@ -9846,10 +9834,10 @@ HLT_tau20_mediumRNN_tracktwoMVA_probe_j35_pf_ftf_03dRAB_L1RD0_FILLED:
   stepFeatures:
     0: 50
     1: 28
-    2: 22
-    3: 22
-    4: 22
-    5: 22
+    2: 24
+    3: 24
+    4: 24
+    5: 24
     6: 3
 HLT_tau20_mediumRNN_tracktwoMVA_probe_j360_pf_ftf_preselj225_03dRAB_L1J100:
   eventCount: 0
@@ -9894,10 +9882,10 @@ HLT_tau20_mediumRNN_tracktwoMVA_probe_j45_pf_ftf_preselj20_03dRAB_L1jJ40:
   stepFeatures:
     0: 15
     1: 23
-    2: 19
-    3: 19
-    4: 19
-    5: 19
+    2: 21
+    3: 21
+    4: 21
+    5: 21
     6: 2
 HLT_tau20_mediumRNN_tracktwoMVA_probe_j60_pf_ftf_preselj50_03dRAB_L1J20:
   eventCount: 1
@@ -9977,10 +9965,10 @@ HLT_tau20_mediumRNN_tracktwoMVA_probe_j85_pf_ftf_preselj50_03dRAB_L1jJ50:
   stepFeatures:
     0: 10
     1: 4
-    2: 8
-    3: 8
-    4: 8
-    5: 8
+    2: 9
+    3: 9
+    4: 9
+    5: 9
 HLT_tau20_mediumRNN_tracktwoMVA_probe_xe65_cell_xe100_pfopufit_L1XE50:
   eventCount: 0
 HLT_tau20_mediumRNN_tracktwoMVA_probe_xe65_cell_xe100_pfopufit_L1XE55:
@@ -10019,8 +10007,28 @@ HLT_tau20_mediumRNN_tracktwoMVA_probe_xe75_cell_xe100_pfopufit_L1jXE110:
   eventCount: 0
 HLT_tau20_mediumRNN_tracktwoMVA_tau20_mediumRNN_tracktwoMVA_02dRAB10_L1cTAU20M_DR-eTAU20eTAU12-jJ40:
   eventCount: 0
+  stepCounts:
+    0: 1
+    1: 1
+    2: 1
+    3: 1
+  stepFeatures:
+    0: 5
+    1: 5
+    2: 5
+    3: 5
 HLT_tau20_mediumRNN_tracktwoMVA_tau20_mediumRNN_tracktwoMVA_03dRAB10_L1cTAU20M_DR-eTAU20eTAU12-jJ40:
   eventCount: 0
+  stepCounts:
+    0: 1
+    1: 1
+    2: 1
+    3: 1
+  stepFeatures:
+    0: 5
+    1: 5
+    2: 5
+    3: 5
 HLT_tau20_perf_tracktwoMVA_L1TAU8:
   eventCount: 14
   stepCounts:
@@ -10044,11 +10052,11 @@ HLT_tau20_perf_tracktwoMVA_L1eTAU12:
     3: 15
     4: 14
   stepFeatures:
-    0: 24
-    1: 24
-    2: 24
-    3: 24
-    4: 20
+    0: 27
+    1: 27
+    2: 27
+    3: 27
+    4: 22
 ? HLT_tau20_tightRNN_tracktwoMVA_j65c_020jvt_j40c_020jvt_j25c_020jvt_j20c_020jvt_SHARED_j20c_020jvt_bgn177_pf_ftf_presel3c20XX1c20bg85_L1jJ85p0ETA21_3jJ40p0ETA25
 : eventCount: 0
 ? HLT_tau20_tightRNN_tracktwoMVA_j65c_020jvt_j40c_020jvt_j25c_020jvt_j20c_020jvt_SHARED_j20c_020jvt_bgn185_pf_ftf_presel3c20XX1c20bg85_L1jJ85p0ETA21_3jJ40p0ETA25
@@ -10120,11 +10128,11 @@ HLT_tau25_idperf_tracktwoMVA_L1cTAU20M:
     3: 10
     4: 10
   stepFeatures:
-    0: 13
-    1: 13
-    2: 13
-    3: 13
-    4: 13
+    0: 14
+    1: 14
+    2: 14
+    3: 14
+    4: 14
 HLT_tau25_idperf_tracktwoMVA_L1eTAU20:
   eventCount: 10
   stepCounts:
@@ -10140,19 +10148,7 @@ HLT_tau25_idperf_tracktwoMVA_L1eTAU20:
     3: 16
     4: 16
 HLT_tau25_idperf_tracktwoMVA_L1eTAU20M:
-  eventCount: 10
-  stepCounts:
-    0: 10
-    1: 10
-    2: 10
-    3: 10
-    4: 10
-  stepFeatures:
-    0: 16
-    1: 16
-    2: 16
-    3: 16
-    4: 16
+  eventCount: 0
 HLT_tau25_idperf_tracktwoMVA_L1jTAU20:
   eventCount: 12
   stepCounts:
@@ -10227,9 +10223,9 @@ HLT_tau25_mediumRNN_trackLRT_L1cTAU20M:
     2: 10
     3: 4
   stepFeatures:
-    0: 13
-    1: 13
-    2: 13
+    0: 14
+    1: 14
+    2: 14
     3: 4
 HLT_tau25_mediumRNN_trackLRT_L1eTAU20:
   eventCount: 4
@@ -10266,10 +10262,10 @@ HLT_tau25_mediumRNN_tracktwoLLP_L1cTAU20M:
     3: 10
     4: 5
   stepFeatures:
-    0: 13
-    1: 13
-    2: 13
-    3: 13
+    0: 14
+    1: 14
+    2: 14
+    3: 14
     4: 5
 HLT_tau25_mediumRNN_tracktwoMVA_L1TAU12IM:
   eventCount: 3
@@ -10294,10 +10290,10 @@ HLT_tau25_mediumRNN_tracktwoMVA_L1cTAU20M:
     3: 10
     4: 3
   stepFeatures:
-    0: 13
-    1: 13
-    2: 13
-    3: 13
+    0: 14
+    1: 14
+    2: 14
+    3: 14
     4: 3
 HLT_tau25_mediumRNN_tracktwoMVA_L1eTAU20:
   eventCount: 3
@@ -10314,19 +10310,7 @@ HLT_tau25_mediumRNN_tracktwoMVA_L1eTAU20:
     3: 16
     4: 3
 HLT_tau25_mediumRNN_tracktwoMVA_L1eTAU20M:
-  eventCount: 3
-  stepCounts:
-    0: 10
-    1: 10
-    2: 10
-    3: 10
-    4: 3
-  stepFeatures:
-    0: 16
-    1: 16
-    2: 16
-    3: 16
-    4: 3
+  eventCount: 0
 HLT_tau25_mediumRNN_tracktwoMVA_L1jTAU20:
   eventCount: 3
   stepCounts:
@@ -10401,6 +10385,16 @@ HLT_tau25_mediumRNN_tracktwoMVA_probe_xe75_cell_xe100_pfopufit_L1jXE110:
   eventCount: 0
 HLT_tau25_mediumRNN_tracktwoMVA_tau20_mediumRNN_tracktwoMVA_02dRAB10_L1cTAU20M_DR-eTAU20eTAU12-jJ40:
   eventCount: 0
+  stepCounts:
+    0: 1
+    1: 1
+    2: 1
+    3: 1
+  stepFeatures:
+    0: 4
+    1: 4
+    2: 4
+    3: 4
 HLT_tau25_mediumRNN_tracktwoMVA_tau20_mediumRNN_tracktwoMVA_03dRAB30_L1DR-TAU20ITAU12I-J25:
   eventCount: 0
 HLT_tau25_mediumRNN_tracktwoMVA_tau20_mediumRNN_tracktwoMVA_03dRAB30_L1cTAU30M_2cTAU20M_DR-eTAU30eTAU20-jJ55:
@@ -10421,10 +10415,10 @@ HLT_tau25_mediumRNN_tracktwoMVA_tau20_mediumRNN_tracktwoMVA_03dRAB_j70_j50a_j0_D
     2: 1
     3: 1
   stepFeatures:
-    0: 3
-    1: 3
-    2: 3
-    3: 3
+    0: 5
+    1: 5
+    2: 5
+    3: 5
 HLT_tau25_mediumRNN_tracktwoMVA_tau25_mediumRNN_tracktwoMVA_03dRAB30_L1DR-TAU20ITAU12I-J25:
   eventCount: 0
 HLT_tau25_mediumRNN_tracktwoMVA_tau25_mediumRNN_tracktwoMVA_03dRAB30_L1cTAU30M_2cTAU20M_DR-eTAU30eTAU20-jJ55:
@@ -10454,10 +10448,10 @@ HLT_tau25_perf_tracktwoMVA_L1cTAU20M:
     3: 10
     4: 9
   stepFeatures:
-    0: 13
-    1: 13
-    2: 13
-    3: 13
+    0: 14
+    1: 14
+    2: 14
+    3: 14
     4: 10
 HLT_tau25_perf_tracktwoMVA_L1eTAU20:
   eventCount: 9
@@ -10474,19 +10468,7 @@ HLT_tau25_perf_tracktwoMVA_L1eTAU20:
     3: 16
     4: 12
 HLT_tau25_perf_tracktwoMVA_L1eTAU20M:
-  eventCount: 9
-  stepCounts:
-    0: 10
-    1: 10
-    2: 10
-    3: 10
-    4: 9
-  stepFeatures:
-    0: 16
-    1: 16
-    2: 16
-    3: 16
-    4: 12
+  eventCount: 0
 HLT_tau25_perf_tracktwoMVA_L1jTAU20:
   eventCount: 11
   stepCounts:
@@ -10623,10 +10605,10 @@ HLT_tau30_mediumRNN_tracktwoMVA_tau20_mediumRNN_tracktwoMVA_03dRAB_L14jJ30p0ETA2
     2: 1
     3: 1
   stepFeatures:
-    0: 4
-    1: 3
-    2: 3
-    3: 3
+    0: 6
+    1: 4
+    2: 4
+    3: 4
 HLT_tau30_mediumRNN_tracktwoMVA_tau20_mediumRNN_tracktwoMVA_03dRAB_L14jJ30p0ETA24_0DETA24_4DPHI99-eTAU30eTAU12:
   eventCount: 0
   stepCounts:
@@ -10635,10 +10617,10 @@ HLT_tau30_mediumRNN_tracktwoMVA_tau20_mediumRNN_tracktwoMVA_03dRAB_L14jJ30p0ETA2
     2: 1
     3: 1
   stepFeatures:
-    0: 4
-    1: 3
-    2: 3
-    3: 3
+    0: 6
+    1: 4
+    2: 4
+    3: 4
 HLT_tau30_mediumRNN_tracktwoMVA_tau20_mediumRNN_tracktwoMVA_03dRAB_L14jJ30p0ETA24_0DETA24_4DPHI99-eTAU30eTAU20:
   eventCount: 0
   stepCounts:
@@ -10647,10 +10629,10 @@ HLT_tau30_mediumRNN_tracktwoMVA_tau20_mediumRNN_tracktwoMVA_03dRAB_L14jJ30p0ETA2
     2: 1
     3: 1
   stepFeatures:
-    0: 4
-    1: 3
-    2: 3
-    3: 3
+    0: 6
+    1: 4
+    2: 4
+    3: 4
 HLT_tau30_mediumRNN_tracktwoMVA_tau20_mediumRNN_tracktwoMVA_03dRAB_L1TAU20IM_2TAU12IM:
   eventCount: 0
   stepCounts:
@@ -10676,10 +10658,10 @@ HLT_tau30_mediumRNN_tracktwoMVA_tau20_mediumRNN_tracktwoMVA_03dRAB_L1cTAU20M_cTA
     2: 1
     3: 1
   stepFeatures:
-    0: 4
-    1: 3
-    2: 3
-    3: 3
+    0: 6
+    1: 4
+    2: 4
+    3: 4
 ? HLT_tau30_mediumRNN_tracktwoMVA_tau20_mediumRNN_tracktwoMVA_03dRAB_L1cTAU20M_cTAU12M_4jJ30p0ETA24_0DETA24_4DPHI99-eTAU30eTAU12
 : eventCount: 0
   stepCounts:
@@ -10688,10 +10670,10 @@ HLT_tau30_mediumRNN_tracktwoMVA_tau20_mediumRNN_tracktwoMVA_03dRAB_L1cTAU20M_cTA
     2: 1
     3: 1
   stepFeatures:
-    0: 4
-    1: 3
-    2: 3
-    3: 3
+    0: 6
+    1: 4
+    2: 4
+    3: 4
 ? HLT_tau30_mediumRNN_tracktwoMVA_tau20_mediumRNN_tracktwoMVA_03dRAB_L1cTAU20M_cTAU12M_4jJ30p0ETA24_0DETA24_4DPHI99-eTAU30eTAU20
 : eventCount: 0
   stepCounts:
@@ -10700,10 +10682,10 @@ HLT_tau30_mediumRNN_tracktwoMVA_tau20_mediumRNN_tracktwoMVA_03dRAB_L1cTAU20M_cTA
     2: 1
     3: 1
   stepFeatures:
-    0: 4
-    1: 3
-    2: 3
-    3: 3
+    0: 6
+    1: 4
+    2: 4
+    3: 4
 HLT_tau30_mediumRNN_tracktwoMVA_tau20_mediumRNN_tracktwoMVA_03dRAB_L1cTAU30M_2cTAU20M_4jJ30p0ETA25:
   eventCount: 0
   stepCounts:
@@ -10739,33 +10721,33 @@ HLT_tau35_idperf_tracktwoMVA_L1TAU20IM:
     3: 12
     4: 12
 HLT_tau35_idperf_tracktwoMVA_L1cTAU30M:
-  eventCount: 7
-  stepCounts:
-    0: 7
-    1: 7
-    2: 7
-    3: 7
-    4: 7
-  stepFeatures:
-    0: 10
-    1: 10
-    2: 10
-    3: 10
-    4: 10
-HLT_tau35_idperf_tracktwoMVA_L1eTAU30:
-  eventCount: 7
+  eventCount: 8
   stepCounts:
-    0: 7
-    1: 7
-    2: 7
-    3: 7
-    4: 7
+    0: 8
+    1: 8
+    2: 8
+    3: 8
+    4: 8
   stepFeatures:
     0: 11
     1: 11
     2: 11
     3: 11
     4: 11
+HLT_tau35_idperf_tracktwoMVA_L1eTAU30:
+  eventCount: 8
+  stepCounts:
+    0: 8
+    1: 8
+    2: 8
+    3: 8
+    4: 8
+  stepFeatures:
+    0: 12
+    1: 12
+    2: 12
+    3: 12
+    4: 12
 HLT_tau35_idperf_tracktwoMVA_L1jTAU30:
   eventCount: 9
   stepCounts:
@@ -10825,30 +10807,30 @@ HLT_tau35_mediumRNN_tracktwoMVA_L1TAU20IM:
 HLT_tau35_mediumRNN_tracktwoMVA_L1cTAU30M:
   eventCount: 2
   stepCounts:
-    0: 7
-    1: 7
-    2: 7
-    3: 7
+    0: 8
+    1: 8
+    2: 8
+    3: 8
     4: 2
   stepFeatures:
-    0: 10
-    1: 10
-    2: 10
-    3: 10
+    0: 11
+    1: 11
+    2: 11
+    3: 11
     4: 2
 HLT_tau35_mediumRNN_tracktwoMVA_L1eTAU30:
   eventCount: 2
   stepCounts:
-    0: 7
-    1: 7
-    2: 7
-    3: 7
+    0: 8
+    1: 8
+    2: 8
+    3: 8
     4: 2
   stepFeatures:
-    0: 11
-    1: 11
-    2: 11
-    3: 11
+    0: 12
+    1: 12
+    2: 12
+    3: 12
     4: 2
 HLT_tau35_mediumRNN_tracktwoMVA_L1jTAU30:
   eventCount: 2
@@ -10983,33 +10965,33 @@ HLT_tau35_perf_tracktwoMVA_L1TAU20IM:
     3: 12
     4: 9
 HLT_tau35_perf_tracktwoMVA_L1cTAU30M:
-  eventCount: 6
+  eventCount: 7
   stepCounts:
-    0: 7
-    1: 7
-    2: 7
-    3: 7
-    4: 6
-  stepFeatures:
-    0: 10
-    1: 10
-    2: 10
-    3: 10
+    0: 8
+    1: 8
+    2: 8
+    3: 8
     4: 7
-HLT_tau35_perf_tracktwoMVA_L1eTAU30:
-  eventCount: 6
-  stepCounts:
-    0: 7
-    1: 7
-    2: 7
-    3: 7
-    4: 6
   stepFeatures:
     0: 11
     1: 11
     2: 11
     3: 11
     4: 8
+HLT_tau35_perf_tracktwoMVA_L1eTAU30:
+  eventCount: 7
+  stepCounts:
+    0: 8
+    1: 8
+    2: 8
+    3: 8
+    4: 7
+  stepFeatures:
+    0: 12
+    1: 12
+    2: 12
+    3: 12
+    4: 9
 HLT_tau35_perf_tracktwoMVA_L1jTAU30:
   eventCount: 8
   stepCounts:
@@ -11138,16 +11120,6 @@ HLT_tau40_mediumRNN_tracktwoMVA_tau35_mediumRNN_tracktwoMVA_03dRAB_L1cTAU35M_2cT
     3: 4
 HLT_tau40_mediumRNN_tracktwoMVA_tau35_mediumRNN_tracktwoMVA_03dRAB_L1eTAU35M_2eTAU30M:
   eventCount: 0
-  stepCounts:
-    0: 4
-    1: 4
-    2: 4
-    3: 4
-  stepFeatures:
-    0: 15
-    1: 15
-    2: 15
-    3: 15
 HLT_tau50_mediumRNN_tracktwoMVA_xe80_pfopufit_xe50_cell_L1XE50:
   eventCount: 0
 HLT_tau50_mediumRNN_tracktwoMVA_xe80_pfopufit_xe50_cell_L1XE55:
diff --git a/Trigger/TriggerCommon/TrigEDMConfig/python/TriggerEDMRun3.py b/Trigger/TriggerCommon/TrigEDMConfig/python/TriggerEDMRun3.py
index 52785d3326e29956fc0348078f14f2960e828747..ebd698099af358d2dcdf39b8e2bae31fb602699b 100644
--- a/Trigger/TriggerCommon/TrigEDMConfig/python/TriggerEDMRun3.py
+++ b/Trigger/TriggerCommon/TrigEDMConfig/python/TriggerEDMRun3.py
@@ -341,8 +341,6 @@ TriggerHLTListRun3 = [
     ('xAOD::eFexEMRoIAuxContainer#L1_eEMRoIAux.thresholdPatterns',                  'BS ESD AODFULL PhysicsTLA', 'L1'),
     ('xAOD::eFexTauRoIContainer#L1_eTauRoI',                                        'BS ESD AODFULL', 'L1'),
     ('xAOD::eFexTauRoIAuxContainer#L1_eTauRoIAux.thresholdPatterns',                'BS ESD AODFULL', 'L1'),
-    ('xAOD::eFexTauRoIContainer#L1_eTauBDTRoI',                                     'BS ESD AODFULL', 'L1'),
-    ('xAOD::eFexTauRoIAuxContainer#L1_eTauBDTRoIAux.thresholdPatterns',             'BS ESD AODFULL', 'L1'),
     ('xAOD::eFexTauRoIContainer#L1_cTauRoI',                                        'BS ESD AODFULL', 'L1'),
     ('xAOD::eFexTauRoIAuxContainer#L1_cTauRoIAux.thresholdPatterns.jTauLink',       'BS ESD AODFULL', 'L1'),
 
diff --git a/release_notes.md b/release_notes.md
new file mode 100644
index 0000000000000000000000000000000000000000..443f1819d5e06e9a76c5e775cad3266329fff371
--- /dev/null
+++ b/release_notes.md
@@ -0,0 +1,3 @@
+This sweep contains the following MRs:
+ * !68717 DataQualityInterfaces - fix lark test for string parameters ~DQ
+ * !68638 Add BRAN to ZDC geometry description ~ForwardDetectors, ~Simulation