diff --git a/Calorimeter/CaloTools/python/CaloNoiseCondAlgConfig.py b/Calorimeter/CaloTools/python/CaloNoiseCondAlgConfig.py
index 1085677524742b2c18818083071924ad10dd66e9..70edd00ca1f64fd044b0af3668eacd06465d85aa 100644
--- a/Calorimeter/CaloTools/python/CaloNoiseCondAlgConfig.py
+++ b/Calorimeter/CaloTools/python/CaloNoiseCondAlgConfig.py
@@ -9,7 +9,7 @@ from AthenaConfiguration.AccumulatorCache import AccumulatorCache
 
 @AccumulatorCache
 def CaloNoiseCondAlgCfg(flags, noisetype="totalNoise"):
-    if noisetype not in ("electronicNoise","pileupNoise","totalNoise"):
+    if noisetype not in ("electronicNoise","pileupNoise","totalNoise","electronicNoiseNoHV"):
         raise RuntimeError("Requested noise of unknown type %s" % noisetype)
 
     noiseAlgName="Calo_"+noisetype+"Alg"
@@ -109,12 +109,14 @@ def CaloNoiseCondAlgCfg(flags, noisetype="totalNoise"):
             result.merge(addFolders(flags,"/TILE/OFL02/NOISE/CELL","TILE_OFL",className="CondAttrListCollection"))
 
 
-            if flags.LAr.doHVCorr:
-                log.info("Run2 & doLArHVCorr=True: Will rescale noise automatically for HV trips")
+            if flags.LAr.doHVCorr and noisetype != "electronicNoiseNoHV":
+                log.info("Run 2/3 & doLArHVCorr=True: Will rescale noise automatically for HV trips")
                 theCaloNoiseAlg.useHVCorr=True
                 from LArCalibUtils.LArHVScaleConfig import LArHVScaleCfg
                 result.merge(LArHVScaleCfg(flags))
                 pass
+            else:
+                theCaloNoiseAlg.useHVCorr=False        
             pass
         else: #COMP200 case:
             log.info("Configuring CaloNoiseCondAlg for Run1 real data processing")
diff --git a/Calorimeter/CaloTools/src/CaloNoiseCondAlg.cxx b/Calorimeter/CaloTools/src/CaloNoiseCondAlg.cxx
index e5116eb658d50b1ded9150e3e65cc7fc55db9466..c2f93a23a48cfe248ad0a55f72002d88bc6b77d3 100644
--- a/Calorimeter/CaloTools/src/CaloNoiseCondAlg.cxx
+++ b/Calorimeter/CaloTools/src/CaloNoiseCondAlg.cxx
@@ -33,24 +33,29 @@ StatusCode CaloNoiseCondAlg::initialize() {
     ATH_MSG_INFO("Will compute electronic noise");
     m_noiseType=CaloNoise::ELEC;
   }
-  else if (noiseKey=="pileupNoise") {
+  else if (noiseKey == "electronicNoiseNoHV") {
+    ATH_MSG_INFO("Will compute electronic noise without HV corrections");
+    m_noiseType = CaloNoise::ELEC;
+    if (m_useHVCorr) {
+        ATH_MSG_WARNING("Inconsistent configuration, set useHVCorr=False");
+        m_useHVCorr=false;
+    }
+  } 
+  else if (noiseKey == "pileupNoise") {
     ATH_MSG_INFO("Will compute pileup noise");
     m_noiseType=CaloNoise::PILEUP;
     if (m_useHVCorr) {
       ATH_MSG_INFO("Disabling HV correction, only pile-up noise");
     }
     m_useHVCorr=false;
-  }
-  else if (noiseKey=="totalNoise") {
+  } else if (noiseKey == "totalNoise") {
     m_noiseType=CaloNoise::TOTAL;
     ATH_MSG_INFO("Will compute total (electronic + pileup)  noise");
-  }
-  else {
+  } else {
     ATH_MSG_ERROR("Unexpected noise key given: " <<  noiseKey << ". Expeced 'electronicNoise' or 'pileupNoise' or 'totalNoise'.");
     return StatusCode::FAILURE;
   }
 
-
   ATH_CHECK( m_hvCorrKey.initialize(m_useHVCorr) );
 
   const bool doLumiFolderInit = m_lumi0 < 0 && m_noiseType!=CaloNoise::ELEC;
diff --git a/Control/AthenaConfiguration/python/TestDefaults.py b/Control/AthenaConfiguration/python/TestDefaults.py
index cd32b6896e2c69ab60abc7996ce3a81b84a54c66..99bdc4f7b526cd51dc5fc0a8387114c61ca136fd 100644
--- a/Control/AthenaConfiguration/python/TestDefaults.py
+++ b/Control/AthenaConfiguration/python/TestDefaults.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2025 CERN for the benefit of the ATLAS collaboration
 # Files for use in configuration unit tests
 
 # These samples can be access via shell script through commands such as:
@@ -11,7 +11,11 @@ class defaultTestFiles:
     EVNT = [f"{d}/CampaignInputs/mc23/EVNT/mc23_13p6TeV.601229.PhPy8EG_A14_ttbar_hdamp258p75_SingleLep.evgen.EVNT.e8514/EVNT.32288062._002040.pool.root.1"]
 
     HITS_RUN2 = [f"{d}/Tier0ChainTests/mc16_13TeV.410470.PhPy8EG_A14_ttbar_hdamp258p75_nonallhad.simul.HITS.e6337_s3681/HITS.25836812._004813.pool.root.1"] #MC20
-    HITS_RUN3 = [f"{d}/CampaignInputs/mc23/HITS/mc23_13p6TeV.601229.PhPy8EG_A14_ttbar_hdamp258p75_SingleLep.simul.HITS.e8514_s4162/100events.HITS.pool.root"] #MC23a
+    HITS_RUN3_2022 = [f"{d}/CampaignInputs/mc23/HITS/mc23_13p6TeV.601229.PhPy8EG_A14_ttbar_hdamp258p75_SingleLep.simul.HITS.e8514_s4162/100events.HITS.pool.root"] #MC23a
+    HITS_RUN3_2023 = [f"{d}/CampaignInputs/mc23/HITS/mc23_13p6TeV.601229.PhPy8EG_A14_ttbar_hdamp258p75_SingleLep.merge.HITS.e8514_e8528_s4159/100events.HITS.pool.root"] #MC23d
+    HITS_RUN3_2024 = HITS_RUN3_2022 # Temporary back-compatibility [f"{d}/CampaignInputs/mc23/HITS/mc23_13p6TeV.601229.PhPy8EG_A14_ttbar_hdamp258p75_SingleLep.merge.HITS.e8514_e8528_s4369/100events.HITS.pool.root"] #MC23e
+    HITS_RUN3_HI = HITS_RUN3_2022 # Temporary back-compatibility
+    HITS_RUN3 = HITS_RUN3_2022 # Temporary back-compatibility
     HITS_RUN4 = [f"{d}/PhaseIIUpgrade/HITS/ATLAS-P2-RUN4-03-00-00/mc21_14TeV.601229.PhPy8EG_A14_ttbar_hdamp258p75_SingleLep.simul.HITS.e8481_s4149/HITS.33605501._000106.pool.root.1"]
     HITS_RUN2_MINBIAS_HIGH = [
         f"{d}/Tier0ChainTests/mc16_13TeV.800831.Py8EG_minbias_inelastic_highjetphotonlepton.simul.HITS_FILT.e8341_s3687_s3704/HITS_FILT.26106512._000149.pool.root.1",
@@ -43,7 +47,10 @@ class defaultTestFiles:
     RDO_RUN3 = [f"{d}/CampaignInputs/mc23/RDO/mc23_13p6TeV.801451.Py8EG_A3_NNPDF23LO_minbias_ND.recon.RDO.e8486_e8528_s4232_s4114_r15112/300events_RDO.39752217._004082.pool.root.1"] #low-mu minbias sample
     RDO_RUN4 = [f"{d}/PhaseIIUpgrade/RDO/ATLAS-P2-RUN4-03-00-00/mc21_14TeV.601229.PhPy8EG_A14_ttbar_hdamp258p75_SingleLep.recon.RDO.e8481_s4149_r14700/RDO.33629020._000047.pool.root.1"]
     RDO_BKG_RUN2 = [f"{d}/OverlayTests/PresampledPileUp/22.0/Run2/large/mc20_13TeV.900149.PG_single_nu_Pt50.digit.RDO.e8307_s3482_s3136_d1715/RDO.26811908._031801.pool.root.1"]
-    RDO_BKG_RUN3 = [f"{d}/CampaignInputs/mc23/RDO_BKG/mc23_13p6TeV.900149.PG_single_nu_Pt50.merge.RDO.e8514_e8528_s4112_d1865_d1858/100events.RDO.pool.root"]
+    RDO_BKG_RUN3_2022 = [f"{d}/CampaignInputs/mc23/RDO_BKG/mc23_13p6TeV.900149.PG_single_nu_Pt50.merge.RDO.e8514_e8528_s4112_d1865_d1858/100events.RDO.pool.root"] #mc23a
+    RDO_BKG_RUN3_2023 = [f"{d}/CampaignInputs/mc23/RDO_BKG/mc23_13p6TeV.900149.PG_single_nu_Pt50.merge.RDO.e8514_e8528_s4153_d1907_d1908/100events.RDO.pool.root"] #mc23d
+    RDO_BKG_RUN3_2024 = RDO_BKG_RUN3_2022 # Temporary Back-compatibility
+    RDO_BKG_RUN3 = RDO_BKG_RUN3_2022 # Temporary Back-compatibility
     RDO_BKG_RUN4 = [f"{d}/PhaseIIUpgrade/RDO_BKG/ATLAS-P2-RUN4-03-00-00/RUN4_presampling.mu200.withSuperCell.50events.RDO.pool.root"]
 
     ESD_RUN2_MC = [f"{d}/RecExRecoTest/mc16_13TeV.361022.Pythia8EvtGen_A14NNPDF23LO_jetjet_JZ2W.recon.ESD.e3668_s3170_r10572_homeMade.pool.root"] # MC16 TODO Update to MC20
diff --git a/Control/StoreGate/StoreGate/ReadCondHandle.h b/Control/StoreGate/StoreGate/ReadCondHandle.h
index 8e0455f6e951b0113eb7b90bc1f0b668f7443e5f..3910e46097f15cc60c7823e034787fb6b2c9d6c5 100644
--- a/Control/StoreGate/StoreGate/ReadCondHandle.h
+++ b/Control/StoreGate/StoreGate/ReadCondHandle.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2025 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef STOREGATE_READCONDHANDLE_H
@@ -53,6 +53,10 @@ namespace SG {
     ReadCondHandle(const SG::ReadCondHandleKey<T>& key);
     ReadCondHandle(const SG::ReadCondHandleKey<T>& key, 
                    const EventContext& ctx);
+
+    ReadCondHandle(SG::ReadCondHandleKey<T>&& key) = delete; // Not allowed from a temporary.
+    ReadCondHandle(SG::ReadCondHandleKey<T>&& key, 
+                   const EventContext& ctx) = delete; // Not allowed from a temporary.
     
     ~ReadCondHandle() {};
     
diff --git a/Control/StoreGate/StoreGate/ReadDecorHandle.h b/Control/StoreGate/StoreGate/ReadDecorHandle.h
index fece1bcaf06c8d3ad273853b67e80d871bd2032a..72a58ef1a0594001620a88f32b546e094f10b75b 100644
--- a/Control/StoreGate/StoreGate/ReadDecorHandle.h
+++ b/Control/StoreGate/StoreGate/ReadDecorHandle.h
@@ -1,6 +1,6 @@
 // This file's extension implies that it's C, but it's really -*- C++ -*-.
 /*
- * Copyright (C) 2002-2023 CERN for the benefit of the ATLAS collaboration.
+ * Copyright (C) 2002-2025 CERN for the benefit of the ATLAS collaboration.
  */
 /**
  * @file StoreGate/ReadDecorHandle.h
@@ -133,7 +133,13 @@ public:
   explicit ReadDecorHandle (const ReadDecorHandleKey<T>& key,
                             const EventContext& ctx);
 
-  
+
+  // Disallow initialization from a temporary Key object.
+  explicit ReadDecorHandle (SG::ReadDecorHandleKey<T>&& key) = delete; // Not allowed from a temporary.
+  explicit ReadDecorHandle (SG::ReadDecorHandleKey<T>&& key, 
+                            const EventContext& ctx) = delete; // Not allowed from a temporary.
+
+
   /**
    * @brief Copy constructor.
    */
diff --git a/Control/StoreGate/StoreGate/ReadHandle.h b/Control/StoreGate/StoreGate/ReadHandle.h
index 8ae39d142b2743087deaa1961184d173663b8bbe..5f78d2fa258caf3bdbda869cb78e728a7dc79ed7 100644
--- a/Control/StoreGate/StoreGate/ReadHandle.h
+++ b/Control/StoreGate/StoreGate/ReadHandle.h
@@ -1,10 +1,7 @@
 // This file's extension implies that it's C, but it's really -*- C++ -*-.
-
 /*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2025 CERN for the benefit of the ATLAS collaboration
 */
-
-// $Id: ReadHandle.h 797637 2017-02-17 02:32:11Z ssnyder $
 /**
  * @file StoreGate/ReadHandle.h
  * @author S. Binet, P. Calafiura, scott snyder <snyder@bnl.gov>
@@ -89,7 +86,7 @@ public:
 
 
   /**
-   * @brief Constructor with full arguments.
+   * @brief Constructor specifying the key as a string.
    * @param sgkey StoreGate key of the referenced object.
    * @param storename Name of the referenced event store.
    */
@@ -97,6 +94,26 @@ public:
                       const std::string& storename = StoreID::storeName(StoreID::EVENT_STORE));
 
 
+  /**
+   * @brief Constructor specifying the key as a string, with context.
+   * @param sgkey StoreGate key of the referenced object.
+   * @param ctx The event context.
+   */
+  explicit ReadHandle(const std::string& sgkey,
+                      const EventContext& ctx);
+
+
+  /**
+   * @brief Constructor specifying the key as a string, with context.
+   * @param sgkey StoreGate key of the referenced object.
+   * @param storename Name of the referenced event store.
+   * @param ctx The event context.
+   */
+  explicit ReadHandle(const std::string& sgkey,
+                      const std::string& storename,
+                      const EventContext& ctx);
+
+
   /**
    * @brief Constructor from a ReadHandleKey.
    * @param key The key object holding the clid/key/store.
@@ -131,6 +148,12 @@ public:
   explicit ReadHandle (SG::DataProxy* proxy);
 
 
+  // Disallow initialization from a temporary Key object.
+  explicit ReadHandle (SG::ReadHandleKey<T>&& key) = delete; // Not allowed from a temporary.
+  explicit ReadHandle (SG::ReadHandleKey<T>&& key, 
+                       const EventContext& ctx) = delete; // Not allowed from a temporary.
+
+
   /**
    * @brief Copy constructor.
    */
diff --git a/Control/StoreGate/StoreGate/ReadHandle.icc b/Control/StoreGate/StoreGate/ReadHandle.icc
index c67c76e39d37b96e3566b6c3a7136c55d478b032..74503ac4e72d69666b6c5fae4a1696e8c50b7d20 100644
--- a/Control/StoreGate/StoreGate/ReadHandle.icc
+++ b/Control/StoreGate/StoreGate/ReadHandle.icc
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2025 CERN for the benefit of the ATLAS collaboration
 */
 
 // $Id: ReadHandle.icc 797637 2017-02-17 02:32:11Z ssnyder $
@@ -41,7 +41,7 @@ ReadHandle<T>::ReadHandle()
 
 
 /**
- * @brief Constructor with full arguments.
+ * @brief Constructor specifying the key as a string.
  * @param sgkey StoreGate key of the referenced object.
  * @param storename Name of the referenced event store.
  */
@@ -50,7 +50,38 @@ inline
 ReadHandle<T>::ReadHandle(const std::string& sgkey, 
                           const std::string& storename /*= "StoreGateSvc"*/)
   : VarHandleBase( ClassID_traits<T>::ID(),
-                   sgkey, Gaudi::DataHandle::Reader, storename )
+                   sgkey, Gaudi::DataHandle::Reader, storename, nullptr )
+{
+}
+
+
+/**
+ * @brief Constructor specifying the key as a string, with context.
+ * @param sgkey StoreGate key of the referenced object.
+ * @param ctx The event context.
+ */
+template <class T>
+inline
+ReadHandle<T>::ReadHandle(const std::string& sgkey,
+                          const EventContext& ctx)
+  : ReadHandle(sgkey, StoreID::storeName(StoreID::EVENT_STORE), ctx)
+{
+}
+
+
+/**
+ * @brief Constructor specifying the key as a string, with context.
+ * @param sgkey StoreGate key of the referenced object.
+ * @param storename Name of the referenced event store.
+ * @param ctx The event context.
+ */
+template <class T>
+inline
+ReadHandle<T>::ReadHandle(const std::string& sgkey,
+                          const std::string& storename,
+                          const EventContext& ctx)
+  : VarHandleBase( ClassID_traits<T>::ID(),
+                   sgkey, Gaudi::DataHandle::Reader, storename, &ctx )
 {
 }
 
diff --git a/Control/StoreGate/StoreGate/ReadMetaHandle.h b/Control/StoreGate/StoreGate/ReadMetaHandle.h
index 8a76c252f68a6d51d783a4b15e9a969ef1353b55..f9f14ee32b04d14948b92a2da26c7e2404730790 100644
--- a/Control/StoreGate/StoreGate/ReadMetaHandle.h
+++ b/Control/StoreGate/StoreGate/ReadMetaHandle.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2025 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef STOREGATE_READMETAHANDLE_H
@@ -37,6 +37,10 @@ namespace SG {
     ReadMetaHandle(const SG::ReadMetaHandleKey<T>& key
 		   , const EventContext& ctx);
     
+    ReadMetaHandle(SG::ReadMetaHandleKey<T>&& key) = delete; // Not allowed from a temporary.
+    ReadMetaHandle(SG::ReadMetaHandleKey<T>&& key, 
+                   const EventContext& ctx) = delete; // Not allowed from a temporary.
+
     ~ReadMetaHandle() {};
     
     const_pointer_type retrieve();
diff --git a/Control/StoreGate/StoreGate/ThinningHandle.h b/Control/StoreGate/StoreGate/ThinningHandle.h
index 66a3f510ed723ab5e06e0e9001126b1be39249ce..01994ad2e8503d6571a697b4f04d84bb8107174d 100644
--- a/Control/StoreGate/StoreGate/ThinningHandle.h
+++ b/Control/StoreGate/StoreGate/ThinningHandle.h
@@ -1,6 +1,6 @@
 // This file's extension implies that it's C, but it's really -*- C++ -*-.
 /*
-  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2025 CERN for the benefit of the ATLAS collaboration
 */
 /**
  * @file StoreGate/ThinningHandle.h
@@ -116,6 +116,11 @@ public:
       ThinningHandleBase (key.decisionHandleKey(), key.key(), ctx)
   {
   }
+
+  // Disallow initialization from a temporary Key object.
+  explicit ThinningHandle (SG::ThinningHandleKey<T>&& key) = delete; // Not allowed from a temporary.
+  explicit ThinningHandle (SG::ThinningHandleKey<T>&& key, 
+                           const EventContext& ctx) = delete; // Not allowed from a temporary.
 };
 
 
diff --git a/Control/StoreGate/StoreGate/TypelessWriteHandle.h b/Control/StoreGate/StoreGate/TypelessWriteHandle.h
index 9d71f7c428b22686368f99af3f02e32d09ddfcb0..49983b0feaca94612c86b220f039a08915b3b250 100644
--- a/Control/StoreGate/StoreGate/TypelessWriteHandle.h
+++ b/Control/StoreGate/StoreGate/TypelessWriteHandle.h
@@ -1,6 +1,6 @@
 // This file's extension implies that it's C, but it's really -*- C++ -*-.
 /*
- * Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration.
+ * Copyright (C) 2002-2025 CERN for the benefit of the ATLAS collaboration.
  */
 /**
  * @file StoreGate/TypelessWriteHandle.h
@@ -49,6 +49,10 @@ public:
                                 const EventContext& ctx);
 
   
+  // Disallow initialization from a temporary Key object.
+  explicit TypelessWriteHandle (SG::TypelessWriteHandleKey&& key) = delete; // Not allowed from a temporary.
+
+
   /**
    * @brief Can the handle be successfully dereferenced?
    *
diff --git a/Control/StoreGate/StoreGate/UpdateHandle.h b/Control/StoreGate/StoreGate/UpdateHandle.h
index 2195bdfa72e861a824f1d2991db2b440cd378863..14dbed2671d0291f775b3ca34009eccbcda88686 100644
--- a/Control/StoreGate/StoreGate/UpdateHandle.h
+++ b/Control/StoreGate/StoreGate/UpdateHandle.h
@@ -1,10 +1,7 @@
 // This file's extension implies that it's C, but it's really -*- C++ -*-.
-
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2025 CERN for the benefit of the ATLAS collaboration
 */
-
-// $Id: UpdateHandle.h 797637 2017-02-17 02:32:11Z ssnyder $
 /**
  * @file StoreGate/UpdateHandle.h
  * @author S. Binet, P. Calafiura, scott snyder <snyder@bnl.gov>
@@ -120,7 +117,7 @@ namespace SG {
 
 
     /**
-     * @brief Constructor with full arguments.
+     * @brief Constructor specifying the key as a string.
      * @param sgkey StoreGate key of the referenced object.
      * @param storename Name of the referenced event store.
      */
@@ -128,6 +125,26 @@ namespace SG {
                  const std::string& storename = StoreID::storeName(StoreID::EVENT_STORE));
 
 
+    /**
+     * @brief Constructor specifying the key as a string, with context.
+     * @param sgkey StoreGate key of the referenced object.
+     * @param ctx The event context.
+     */
+    explicit UpdateHandle(const std::string& sgkey,
+                          const EventContext& ctx);
+
+
+    /**
+     * @brief Constructor specifying the key as a string, with context.
+     * @param sgkey StoreGate key of the referenced object.
+     * @param storename Name of the referenced event store.
+     * @param ctx The event context.
+     */
+    explicit UpdateHandle(const std::string& sgkey,
+                          const std::string& storename,
+                          const EventContext& ctx);
+
+
     /**
      * @brief Constructor from an UpdateHandleKey.
      * @param key The key object holding the clid/key/store.
@@ -152,6 +169,12 @@ namespace SG {
     explicit UpdateHandle (const UpdateHandleKey<T>& key,const EventContext& ctx);
 
 
+    // Disallow initialization from a temporary Key object.
+    explicit UpdateHandle (SG::UpdateHandleKey<T>&& key) = delete; // Not allowed from a temporary.
+    explicit UpdateHandle (SG::UpdateHandleKey<T>&& key, 
+                           const EventContext& ctx) = delete; // Not allowed from a temporary.
+
+
     /**
      * @brief Copy constructor.
      */
diff --git a/Control/StoreGate/StoreGate/UpdateHandle.icc b/Control/StoreGate/StoreGate/UpdateHandle.icc
index ae5ce6992ee7acaf2520b9cd1a34d6118c5c259d..500b5f8a29301a1b0c47308990a553777a30b57f 100644
--- a/Control/StoreGate/StoreGate/UpdateHandle.icc
+++ b/Control/StoreGate/StoreGate/UpdateHandle.icc
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2025 CERN for the benefit of the ATLAS collaboration
 */
 
 // $Id: UpdateHandle.icc 797637 2017-02-17 02:32:11Z ssnyder $
@@ -36,7 +36,7 @@ UpdateHandle<T>::UpdateHandle()
 
 
 /**
- * @brief Constructor with full arguments.
+ * @brief Constructor specifying the key as a string.
  * @param sgkey StoreGate key of the referenced object.
  * @param storename Name of the referenced event store.
  */
@@ -45,7 +45,38 @@ inline
 UpdateHandle<T>::UpdateHandle(const std::string& sgkey,
                               const std::string& storename /*= "StoreGateSvc"*/)
   : VarHandleBase( ClassID_traits<T>::ID(),
-                   sgkey, Gaudi::DataHandle::Reader, storename )
+                   sgkey, Gaudi::DataHandle::Reader, storename, nullptr )
+{
+}
+
+
+/**
+ * @brief Constructor specifying the key as a string, with context.
+ * @param sgkey StoreGate key of the referenced object.
+ * @param ctx The event context.
+ */
+template <class T>
+inline
+UpdateHandle<T>::UpdateHandle(const std::string& sgkey,
+                              const EventContext& ctx)
+  : UpdateHandle(sgkey, StoreID::storeName(StoreID::EVENT_STORE), ctx)
+{
+}
+
+
+/**
+ * @brief Constructor specifying the key as a string, with context.
+ * @param sgkey StoreGate key of the referenced object.
+ * @param storename Name of the referenced event store.
+ * @param ctx The event context.
+ */
+template <class T>
+inline
+UpdateHandle<T>::UpdateHandle(const std::string& sgkey,
+                              const std::string& storename,
+                              const EventContext& ctx)
+  : VarHandleBase( ClassID_traits<T>::ID(),
+                   sgkey, Gaudi::DataHandle::Reader, storename, &ctx )
 {
 }
 
diff --git a/Control/StoreGate/StoreGate/VarHandleBase.h b/Control/StoreGate/StoreGate/VarHandleBase.h
index d3174f8dcdcb5fc4c8fd7eb002392dd63acd6230..4dc870aaf5debf88720733aef72fdcf767c1e7ce 100644
--- a/Control/StoreGate/StoreGate/VarHandleBase.h
+++ b/Control/StoreGate/StoreGate/VarHandleBase.h
@@ -1,7 +1,7 @@
 // This file's extension implies that it's C, but it's really -*- C++ -*-.
 
 /*
-  Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2025 CERN for the benefit of the ATLAS collaboration
 */
 /**
  * @file StoreGate/VarHandleBase.h
@@ -102,11 +102,13 @@ namespace SG {
      * @param sgkey StoreGate key of the referenced object.
      * @param mode Mode of this handle (read/write/update).
      * @param storename Name of the referenced event store.
+     * @param ctx The event context to use, or nullptr.
      */
     explicit VarHandleBase(CLID clid,
                            const std::string& sgkey,
                            Gaudi::DataHandle::Mode mode,
-                           const std::string& storename = StoreID::storeName(StoreID::EVENT_STORE));
+                           const std::string& storename,
+                           const EventContext* ctx);
 
 
     /**
diff --git a/Control/StoreGate/StoreGate/VarHandleBase.icc b/Control/StoreGate/StoreGate/VarHandleBase.icc
index 5bf91139ccf261e3f6e6f70cbe827120ec875247..c717a932efe0c323de8125ed2515907670cd3cc9 100644
--- a/Control/StoreGate/StoreGate/VarHandleBase.icc
+++ b/Control/StoreGate/StoreGate/VarHandleBase.icc
@@ -1,8 +1,6 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2025 CERN for the benefit of the ATLAS collaboration
 */
-
-// $Id$
 /**
  * @file StoreGate/VarHandleBase.icc
  * @author scott snyder <snyder@bnl.gov>
diff --git a/Control/StoreGate/StoreGate/WriteCondHandle.h b/Control/StoreGate/StoreGate/WriteCondHandle.h
index 53deb7aab480305f750755c4f7db0b5a3304cc7e..bcd0480ffa7b1b529c4147b27ddc6af2d5636812 100644
--- a/Control/StoreGate/StoreGate/WriteCondHandle.h
+++ b/Control/StoreGate/StoreGate/WriteCondHandle.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2025 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef STOREGATE_WRITECONDHANDLE_H
@@ -35,6 +35,10 @@ namespace SG {
     WriteCondHandle(const WriteCondHandleKey<T>& key);
     WriteCondHandle(const WriteCondHandleKey<T>& key, const EventContext& ctx);
     
+    WriteCondHandle(SG::WriteCondHandleKey<T>&& key) = delete; // Not allowed from a temporary.
+    WriteCondHandle(SG::WriteCondHandleKey<T>&& key, 
+                    const EventContext& ctx) = delete; // Not allowed from a temporary.
+
     ~WriteCondHandle() {};   
 
     const std::string& key() const { return m_hkey.key(); }
diff --git a/Control/StoreGate/StoreGate/WriteDecorHandle.h b/Control/StoreGate/StoreGate/WriteDecorHandle.h
index 914f307d65e7a98ef2d172800112af8bf812259d..de9137b06ff35533c12d92a70fced653eca27681 100644
--- a/Control/StoreGate/StoreGate/WriteDecorHandle.h
+++ b/Control/StoreGate/StoreGate/WriteDecorHandle.h
@@ -1,6 +1,6 @@
 // This file's extension implies that it's C, but it's really -*- C++ -*-.
 /*
- * Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration.
+ * Copyright (C) 2002-2025 CERN for the benefit of the ATLAS collaboration.
  */
 /**
  * @file StoreGate/WriteDecorHandle.h
@@ -139,6 +139,13 @@ public:
   explicit WriteDecorHandle (const WriteDecorHandleKey<T>& key,
                              const EventContext& ctx);
 
+
+  // Disallow initialization from a temporary Key object.
+  explicit WriteDecorHandle (SG::WriteDecorHandleKey<T>&& key) = delete; // Not allowed from a temporary.
+  explicit WriteDecorHandle (SG::WriteDecorHandleKey<T>&& key, 
+                             const EventContext& ctx) = delete; // Not allowed from a temporary.
+
+
   /**
    * @brief Copy constructor.
    */
diff --git a/Control/StoreGate/StoreGate/WriteHandle.h b/Control/StoreGate/StoreGate/WriteHandle.h
index 2b83afe7fee9ca7100742ddf143e24fa001b9030..462ab440d4015202bc618363728b635347f15ed4 100644
--- a/Control/StoreGate/StoreGate/WriteHandle.h
+++ b/Control/StoreGate/StoreGate/WriteHandle.h
@@ -1,10 +1,7 @@
 // This file's extension implies that it's C, but it's really -*- C++ -*-.
-
 /*
-  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2025 CERN for the benefit of the ATLAS collaboration
 */
-
-// $Id: WriteHandle.h 797637 2017-02-17 02:32:11Z ssnyder $
 /**
  * @file StoreGate/WriteHandle.h
  * @author S. Binet, P. Calafiura, scott snyder <snyder@bnl.gov>
@@ -95,7 +92,7 @@ public:
 
 
   /**
-   * @brief Constructor with full arguments.
+   * @brief Constructor specifying the key as a string.
    * @param sgkey StoreGate key of the referenced object.
    * @param storename Name of the referenced event store.
    */
@@ -103,6 +100,26 @@ public:
                        const std::string& storename = StoreID::storeName(StoreID::EVENT_STORE));
 
 
+  /**
+   * @brief Constructor specifying the key as a string, with context.
+   * @param sgkey StoreGate key of the referenced object.
+   * @param ctx The event context.
+   */
+  explicit WriteHandle(const std::string& sgkey,
+                       const EventContext& ctx);
+
+
+  /**
+   * @brief Constructor specifying the key as a string, with context.
+   * @param sgkey StoreGate key of the referenced object.
+   * @param storename Name of the referenced event store.
+   * @param ctx The event context.
+   */
+  explicit WriteHandle(const std::string& sgkey,
+                       const std::string& storename,
+                       const EventContext& ctx);
+
+
   /**
    * @brief Constructor from a WriteHandleKey.
    * @param key The key object holding the clid/key/store.
@@ -127,6 +144,12 @@ public:
   explicit WriteHandle (const WriteHandleKey<T>& key, const EventContext& ctx);
 
   
+  // Disallow initialization from a temporary Key object.
+  explicit WriteHandle (SG::WriteHandleKey<T>&& key) = delete; // Not allowed from a temporary.
+  explicit WriteHandle (SG::WriteHandleKey<T>&& key, 
+                        const EventContext& ctx) = delete; // Not allowed from a temporary.
+
+
   /**
    * @brief Copy constructor.
    */
diff --git a/Control/StoreGate/StoreGate/WriteHandle.icc b/Control/StoreGate/StoreGate/WriteHandle.icc
index b819d5943427e3d58e1d7578002c266f74bbb528..f30c042564a6f5da9aa9ef5e9fd874f004357c1b 100644
--- a/Control/StoreGate/StoreGate/WriteHandle.icc
+++ b/Control/StoreGate/StoreGate/WriteHandle.icc
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2023 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2025 CERN for the benefit of the ATLAS collaboration
 */
 /**
  * @file StoreGate/WriteHandle.icc
@@ -40,7 +40,7 @@ WriteHandle<T>::WriteHandle()
 
 
 /**
- * @brief Constructor with full arguments.
+ * @brief Constructor specifying the key as a string.
  * @param sgkey StoreGate key of the referenced object.
  * @param storename Name of the referenced event store.
  */
@@ -49,7 +49,38 @@ inline
 WriteHandle<T>::WriteHandle (const std::string& sgkey,
                              const std::string& storename /* ="StoreGateSvc"*/)
   : VarHandleBase (ClassID_traits<T>::ID(), sgkey,
-                   Gaudi::DataHandle::Writer, storename)
+                   Gaudi::DataHandle::Writer, storename, nullptr)
+{
+}
+
+
+/**
+ * @brief Constructor specifying the key as a string, with context.
+ * @param sgkey StoreGate key of the referenced object.
+ * @param ctx The event context.
+ */
+template <class T>
+inline
+WriteHandle<T>::WriteHandle(const std::string& sgkey,
+                            const EventContext& ctx)
+  : WriteHandle(sgkey, StoreID::storeName(StoreID::EVENT_STORE), ctx)
+{
+}
+
+
+/**
+ * @brief Constructor specifying the key as a string, with context.
+ * @param sgkey StoreGate key of the referenced object.
+ * @param storename Name of the referenced event store.
+ * @param ctx The event context.
+ */
+template <class T>
+inline
+WriteHandle<T>::WriteHandle(const std::string& sgkey,
+                            const std::string& storename,
+                            const EventContext& ctx)
+  : VarHandleBase( ClassID_traits<T>::ID(),
+                   sgkey, Gaudi::DataHandle::Writer, storename, &ctx )
 {
 }
 
diff --git a/Control/StoreGate/src/VarHandleBase.cxx b/Control/StoreGate/src/VarHandleBase.cxx
index daef73f1c5100499d03607f730911832acb41acf..f51415108b01afd8e6908449611dea414020bd3b 100644
--- a/Control/StoreGate/src/VarHandleBase.cxx
+++ b/Control/StoreGate/src/VarHandleBase.cxx
@@ -1,7 +1,7 @@
 ///////////////////////// -*- C++ -*- /////////////////////////////
 
 /*
-  Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2025 CERN for the benefit of the ATLAS collaboration
 */
 
 // VarHandleBase.cxx 
@@ -132,11 +132,13 @@ namespace SG {
    * @param sgkey StoreGate key of the referenced object.
    * @param mode Mode of this handle (read/write/update).
    * @param storename Name of the referenced event store.
+   * @param ctx The event context to use, or nullptr.
    */
   VarHandleBase::VarHandleBase(CLID clid,
                                const std::string& sgkey,
                                Gaudi::DataHandle::Mode mode,
-                               const std::string& storename) :  
+                               const std::string& storename,
+                               const EventContext* ctx) :  
     IResetable(),
     m_ptr(NULL),
     m_proxy(NULL),
@@ -146,6 +148,10 @@ namespace SG {
     m_key (m_ownedKey.get())
   {
     m_ownedKey->setOwningHandle (this);
+
+    if (ctx && !setStoreFromHandle(ctx)) {
+      throw SG::ExcHandleInitError (clid, sgkey, storename);
+    }
   }
 
 
diff --git a/Control/StoreGate/test/ReadHandle_test.cxx b/Control/StoreGate/test/ReadHandle_test.cxx
index 001f8e5d7b5196484564bfb547ce2f46db1c1ec5..66cd18281ce364d5a95b50bb2f1baf936c75eb8c 100644
--- a/Control/StoreGate/test/ReadHandle_test.cxx
+++ b/Control/StoreGate/test/ReadHandle_test.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2025 CERN for the benefit of the ATLAS collaboration
 */
 /**
  * @file StoreGate/test/ReadHandle_test.cxx
@@ -91,6 +91,20 @@ void test1()
     k7.initialize().ignore();
     EXPECT_EXCEPTION (SG::ExcUninitKey, SG::ReadHandle<MyObj> h7 (k7, ctx5));
   }
+
+  SG::ReadHandle<MyObj> h8 ("foo", ctx5);
+  assert (h8.clid() == MyCLID);
+  assert (h8.key() == "foo");
+  assert (h8.storeHandle().name() == "StoreGateSvc");
+  assert (h8.mode() == Gaudi::DataHandle::Reader);
+  assert (h8.store() == "TestStore");
+
+  SG::ReadHandle<MyObj> h9 ("foo", "OtherStore", ctx5);
+  assert (h9.clid() == MyCLID);
+  assert (h9.key() == "foo");
+  assert (h9.storeHandle().name() == "OtherStore");
+  assert (h9.mode() == Gaudi::DataHandle::Reader);
+  assert (h9.store() == "OtherStore_Impl");
 }
 
 
diff --git a/Control/StoreGate/test/UpdateHandle_test.cxx b/Control/StoreGate/test/UpdateHandle_test.cxx
index e6dbeb62bfaf35cc262d6da2b6dd8046c984d0e0..6c98ed46ba970c44fff187eaa14c28e0f5eb21e4 100644
--- a/Control/StoreGate/test/UpdateHandle_test.cxx
+++ b/Control/StoreGate/test/UpdateHandle_test.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2025 CERN for the benefit of the ATLAS collaboration
 */
 /**
  * @file StoreGate/test/UpdateHandle_test.cxx
@@ -89,6 +89,20 @@ void test1()
     k7.initialize().ignore();
     EXPECT_EXCEPTION (SG::ExcUninitKey, SG::UpdateHandle<MyObj> h7 (k7, ctx5));
   }
+
+  SG::UpdateHandle<MyObj> h8 ("foo", ctx5);
+  assert (h8.clid() == MyCLID);
+  assert (h8.key() == "foo");
+  assert (h8.storeHandle().name() == "StoreGateSvc");
+  assert (h8.mode() == Gaudi::DataHandle::Reader);
+  assert (h8.store() == "TestStore");
+
+  SG::UpdateHandle<MyObj> h9 ("foo", "OtherStore", ctx5);
+  assert (h9.clid() == MyCLID);
+  assert (h9.key() == "foo");
+  assert (h9.storeHandle().name() == "OtherStore");
+  assert (h9.mode() == Gaudi::DataHandle::Reader);
+  assert (h9.store() == "OtherStore_Impl");
 }
 
 
diff --git a/Control/StoreGate/test/VarHandleBase_test.cxx b/Control/StoreGate/test/VarHandleBase_test.cxx
index 8e59c5b3ba10a5f786a10ae03320420e03ed5510..27a353870a9c140d9903bb405b8984220a715fad 100644
--- a/Control/StoreGate/test/VarHandleBase_test.cxx
+++ b/Control/StoreGate/test/VarHandleBase_test.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2025 CERN for the benefit of the ATLAS collaboration
 */
 /**
  * @file StoreGate/test/VarHandleBase_test.cxx
@@ -66,7 +66,7 @@ void test1()
   assert (h1.m_store == nullptr);
   assert (h1.vhKey().owningHandle() == &h1);
 
-  TestHandle h2 (1234, "foo", Gaudi::DataHandle::Writer, "FooSvc");
+  TestHandle h2 (1234, "foo", Gaudi::DataHandle::Writer, "FooSvc", nullptr);
   assert (h2.clid() == 1234);
   assert (h2.key() == "foo");
   assert (h2.name() == "foo");
@@ -125,6 +125,9 @@ void test1()
     k7.initialize().ignore();
     EXPECT_EXCEPTION (SG::ExcUninitKey, TestHandle h7 (k7, &ctx5));
   }
+
+  TestHandle h8 (1234, "foo", Gaudi::DataHandle::Writer, "StoreGateSvc", &ctx5);
+  assert (h8.m_store == &dumstore);
 }
 
 
@@ -141,7 +144,7 @@ void test2()
   SGTest::TestStore testStore;
   proxy->setStore (&testStore);
 
-  TestHandle h1 (293847295, "foo", Gaudi::DataHandle::Writer, "FooSvc");
+  TestHandle h1 (293847295, "foo", Gaudi::DataHandle::Writer, "FooSvc", nullptr);
   assert (h1.store() == "FooSvc");
   assert (h1.setProxyDict (&testStore).isSuccess());
   assert (h1.store() == "TestStore");
@@ -275,7 +278,7 @@ void test3()
 
   SGTest::TestStore store;
 
-  TestHandle h1 (293847295, "foo", Gaudi::DataHandle::Writer, "FooSvc");
+  TestHandle h1 (293847295, "foo", Gaudi::DataHandle::Writer, "FooSvc", nullptr);
   assert (!h1.isPresent());
 
   assert (h1.setProxyDict (&store).isSuccess());
@@ -309,14 +312,14 @@ void test4()
 {
   std::cout << "test4\n";
 
-  TestHandle h1 (293847295, "foo", Gaudi::DataHandle::Writer, "FooSvc");
+  TestHandle h1 (293847295, "foo", Gaudi::DataHandle::Writer, "FooSvc", nullptr);
   assert (h1.initialize().isFailure());
 
   SGTest::TestStore store;
   assert (h1.setProxyDict (&store).isSuccess());
   assert (h1.setState().isSuccess()); // ok because it's a writer.
 
-  TestHandle h2 (293847295, "foo", Gaudi::DataHandle::Reader, "FooSvc");
+  TestHandle h2 (293847295, "foo", Gaudi::DataHandle::Reader, "FooSvc", nullptr);
   assert (h2.setProxyDict (&store).isSuccess());
   assert (h2.setState().isFailure());
   store.record (new MyObj, "foo");
@@ -334,11 +337,11 @@ void test4()
   assert (!h2.isInitialized());
   assert (h2.m_store == 0);
 
-  TestHandle h3 (293847295, "", Gaudi::DataHandle::Writer, "FooSvc");
+  TestHandle h3 (293847295, "", Gaudi::DataHandle::Writer, "FooSvc", nullptr);
   assert (h3.initialize().isFailure());
   assert (h3.initialize(false).isSuccess());
 
-  TestHandle h4 (293847295, "foo", Gaudi::DataHandle::Writer, "FooSvc");
+  TestHandle h4 (293847295, "foo", Gaudi::DataHandle::Writer, "FooSvc", nullptr);
   assert (h4.key() == "foo");
   assert (h4.initialize(false).isSuccess());
   assert (h4.key() == "");
@@ -351,7 +354,7 @@ void test5()
   std::cout << "test5\n";
   SGTest::TestStore testStore;
 
-  TestHandle h1 (293847295, "foo", Gaudi::DataHandle::Writer, "FooSvc");
+  TestHandle h1 (293847295, "foo", Gaudi::DataHandle::Writer, "FooSvc", nullptr);
   auto obj = std::make_unique<MyObj>();
   //MyObj* objptr = obj.get();
   auto taddr = std::make_unique<SG::TransientAddress> (293847295, "foo");
@@ -377,7 +380,7 @@ void test6()
   std::cout << "test6\n";
   SGTest::TestStore testStore;
 
-  TestHandle h1 (293847295, "foo", Gaudi::DataHandle::Writer, "FooSvc");
+  TestHandle h1 (293847295, "foo", Gaudi::DataHandle::Writer, "FooSvc", nullptr);
 
   SG::DataProxy* proxy1 = nullptr;
   assert (h1.setState(proxy1).isFailure());
@@ -439,7 +442,7 @@ void test7()
   std::unique_ptr<MyObj> obj;
   MyObj* objptr = nullptr;
 
-  TestHandle h1 (293847295, "foo", Gaudi::DataHandle::Writer, "FooSvc");
+  TestHandle h1 (293847295, "foo", Gaudi::DataHandle::Writer, "FooSvc", nullptr);
   obj = std::make_unique<MyObj>();
   objptr = obj.get();
   assert (h1.record_impl (std::unique_ptr<DataObject>(SG::asStorable(std::move(obj))),
@@ -455,7 +458,7 @@ void test7()
   MyObj* fooptr = objptr;
   assert (h1.m_ptr == fooptr);
 
-  TestHandle h2 (293847295, "foo", Gaudi::DataHandle::Writer, "FooSvc");
+  TestHandle h2 (293847295, "foo", Gaudi::DataHandle::Writer, "FooSvc", nullptr);
   assert (h2.setProxyDict (&testStore).isSuccess());
   obj = std::make_unique<MyObj>();
   objptr = obj.get();
@@ -484,7 +487,7 @@ void test7()
   assert (h2.m_ptr == fooptr);
   assert (h2.isConst());
 
-  TestHandle h3 (293847295, "", Gaudi::DataHandle::Writer, "FooSvc");
+  TestHandle h3 (293847295, "", Gaudi::DataHandle::Writer, "FooSvc", nullptr);
   assert (h3.setProxyDict (&testStore).isSuccess());
   obj = std::make_unique<MyObj>();
   objptr = obj.get();
@@ -500,7 +503,7 @@ void test8()
   std::cout << "test8\n";
   SGTest::TestStore testStore;
 
-  TestHandle h1 (293847295, "foo", Gaudi::DataHandle::Writer, "FooSvc");
+  TestHandle h1 (293847295, "foo", Gaudi::DataHandle::Writer, "FooSvc", nullptr);
   assert (h1.setProxyDict (&testStore).isSuccess());
 
   auto obj = std::make_unique<MyObj>();
@@ -519,7 +522,7 @@ void test8()
   assert (h1.typeless_dataPointer_impl(false) == nullptr);
   assert (h1.typeless_dataPointer_impl(true) == nullptr);
 
-  TestHandle h2 (293847295, "bar", Gaudi::DataHandle::Writer, "FooSvc");
+  TestHandle h2 (293847295, "bar", Gaudi::DataHandle::Writer, "FooSvc", nullptr);
   assert (h2.setProxyDict (&testStore).isSuccess());
   obj = std::make_unique<MyObj>();
   MyObj* objptr = obj.get();
@@ -534,7 +537,7 @@ void test8()
   SG::sgkey_t sgkey = testStore.stringToKey ("fee", 293847295);
   testStore.m_kmap[sgkey] = testStore.proxy (293847296, "fee");
 
-  TestHandle h3 (293847295, "fee", Gaudi::DataHandle::Writer, "FooSvc");
+  TestHandle h3 (293847295, "fee", Gaudi::DataHandle::Writer, "FooSvc", nullptr);
   assert (h3.setProxyDict (&testStore).isSuccess());
   assert (h3.typeless_dataPointer_impl(false) == nullptr);
   assert (h3.typeless_dataPointer_impl(true) == nullptr);
@@ -555,11 +558,11 @@ void test9()
 {
   std::cout << "test9\n";
 
-  TestHandle h1 (293847295, "foo", Gaudi::DataHandle::Writer, "FooSvc");
+  TestHandle h1 (293847295, "foo", Gaudi::DataHandle::Writer, "FooSvc", nullptr);
   std::cout << h1 << "\n";
 
   assert (h1 == h1);
-  TestHandle h2 (293847295, "foe", Gaudi::DataHandle::Writer, "FooSvc");
+  TestHandle h2 (293847295, "foe", Gaudi::DataHandle::Writer, "FooSvc", nullptr);
   assert (h1 != h2);
 }
 
@@ -575,7 +578,7 @@ void test10()
   std::unique_ptr<MyObj> obj;
   MyObj* objptr = nullptr;
 
-  TestHandle h1 (293847295, "foo", Gaudi::DataHandle::Writer, "FooSvc");
+  TestHandle h1 (293847295, "foo", Gaudi::DataHandle::Writer, "FooSvc", nullptr);
   obj = std::make_unique<MyObj>();
   objptr = obj.get();
   EXPECT_EXCEPTION (GaudiException,
@@ -598,7 +601,9 @@ void test10()
   MyObj* fooptr = objptr;
   assert (newptr == fooptr);
 
-  TestHandle h2 (293847295, "foo", Gaudi::DataHandle::Writer);
+  TestHandle h2 (293847295, "foo", Gaudi::DataHandle::Writer,
+                 StoreID::storeName(StoreID::EVENT_STORE),
+                 nullptr);
   assert (h2.setProxyDict (&testStore).isSuccess());
   obj = std::make_unique<MyObj>();
   objptr = obj.get();
@@ -636,7 +641,7 @@ void test10()
                         false, true, store);
   assert (newptr == objptr);
 
-  TestHandle h3 (293847295, "", Gaudi::DataHandle::Writer, "FooSvc");
+  TestHandle h3 (293847295, "", Gaudi::DataHandle::Writer, "FooSvc", nullptr);
   assert (h3.setProxyDict (&testStore).isSuccess());
   obj = std::make_unique<MyObj>();
   objptr = obj.get();
@@ -654,15 +659,15 @@ void test11()
 
   SGTest::TestStore store;
 
-  TestHandle h1 (293847295, "", Gaudi::DataHandle::Writer, "FooSvc");
+  TestHandle h1 (293847295, "", Gaudi::DataHandle::Writer, "FooSvc", nullptr);
   assert (h1.get_impl(nullptr, false) == nullptr);
   assert (h1.get_impl(nullptr, true) == nullptr);
 
-  TestHandle h2 (293847295, "", Gaudi::DataHandle::Reader, "FooSvc");
+  TestHandle h2 (293847295, "", Gaudi::DataHandle::Reader, "FooSvc", nullptr);
   assert (h2.get_impl(nullptr, false) == nullptr);
   assert (h2.get_impl(nullptr, true) == nullptr);
 
-  TestHandle h3 (293847295, "foo", Gaudi::DataHandle::Reader, "FooSvc");
+  TestHandle h3 (293847295, "foo", Gaudi::DataHandle::Reader, "FooSvc", nullptr);
   EXPECT_EXCEPTION (GaudiException, h3.get_impl(nullptr, false));
   assert (h3.setProxyDict (&store).isSuccess());
 
@@ -673,7 +678,9 @@ void test11()
   assert (h3.get_impl(nullptr, false) == foo);
   assert (h3.get_impl(nullptr, true) == foo);
 
-  TestHandle h4 (293847295, "foo", Gaudi::DataHandle::Reader);
+  TestHandle h4 (293847295, "foo", Gaudi::DataHandle::Reader,
+                 StoreID::storeName(StoreID::EVENT_STORE),
+                 nullptr);
   SGTest::TestStore store2;
   MyObj* foo2 = new MyObj;
   store2.record (foo2, "foo");
@@ -693,7 +700,7 @@ void test12()
   std::cout << "test12\n";
 
   SGTest::TestStore testStore;
-  TestHandle h1 (293847295, "foo", Gaudi::DataHandle::Writer, "FooSvc");
+  TestHandle h1 (293847295, "foo", Gaudi::DataHandle::Writer, "FooSvc", nullptr);
   assert (h1.symLink_impl (293847295, "bar").isFailure()); 
   assert (h1.setProxyDict (&testStore).isSuccess());
   assert (h1.symLink_impl (293847295, "bar").isFailure()); 
diff --git a/Control/StoreGate/test/WriteHandle_test.cxx b/Control/StoreGate/test/WriteHandle_test.cxx
index 31e280c389a44a33fef349ae2b8c1154f714f663..897c02e08b0c0ea26b1c079a026522291b27fae9 100644
--- a/Control/StoreGate/test/WriteHandle_test.cxx
+++ b/Control/StoreGate/test/WriteHandle_test.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2025 CERN for the benefit of the ATLAS collaboration
 */
 /**
  * @file StoreGate/test/WriteHandle_test.cxx
@@ -169,6 +169,20 @@ void test1()
     k7.initialize().ignore();
     EXPECT_EXCEPTION (SG::ExcUninitKey, SG::WriteHandle<MyObj> h7 (k7, ctx5));
   }
+
+  SG::WriteHandle<MyObj> h8 ("foo", ctx5);
+  assert (h8.clid() == MyCLID);
+  assert (h8.key() == "foo");
+  assert (h8.storeHandle().name() == "StoreGateSvc");
+  assert (h8.mode() == Gaudi::DataHandle::Writer);
+  assert (h8.store() == "TestStore");
+
+  SG::WriteHandle<MyObj> h9 ("foo", "OtherStore", ctx5);
+  assert (h9.clid() == MyCLID);
+  assert (h9.key() == "foo");
+  assert (h9.storeHandle().name() == "OtherStore");
+  assert (h9.mode() == Gaudi::DataHandle::Writer);
+  assert (h9.store() == "OtherStore_Impl");
 }
 
 
diff --git a/DataQuality/DataQualityConfigurations/config/AFP/collisions_run.config b/DataQuality/DataQualityConfigurations/config/AFP/collisions_run.config
index 3b9c0ef32bba1fcda4f47a815294c8cdb80e12f4..5b52d19cf0165d267eeb5f600f97208ebbd97a43 100644
--- a/DataQuality/DataQualityConfigurations/config/AFP/collisions_run.config
+++ b/DataQuality/DataQualityConfigurations/config/AFP/collisions_run.config
@@ -271,6 +271,7 @@ dir AFP {
 			display = LogZ,Draw=COLZ
 			dir (?P<station>(far|near)[AC]side) {
 				regex = 1
+				algorithm = AFPSiTEfficiency
 				output = AFP/SiT/Efficiency/${station}
 				hist Efficiency_(?P=station)_P[0123] {
 				}
@@ -780,6 +781,12 @@ algorithm AFPToFEfficiency {
 	thresholds = AFPToFEfficiencyThreshold
 }
 
+algorithm AFPSiTEfficiency {
+	libname = libdqm_algorithms.so
+	name = AFP_SiTEfficiency
+	thresholds = AFPSiTEfficiencyThreshold
+}
+
 ############################################################
 # Thresholds
 ############################################################
@@ -829,3 +836,10 @@ thresholds AFPToFEfficiencyThreshold {
 		error = 3
 	}
 }
+
+thresholds AFPSiTEfficiencyThreshold {
+	limits NEfficiency {
+		warning = 85
+		error = 60
+	}
+}
\ No newline at end of file
diff --git a/DataQuality/DataQualityConfigurations/config/InDetAlignment/collisions_run.config b/DataQuality/DataQualityConfigurations/config/InDetAlignment/collisions_run.config
index 70921a7bedfb6005967193a8cb42b144d48433fd..20766da9254afc9ee0cf99db81438bbaa67d1be0 100644
--- a/DataQuality/DataQualityConfigurations/config/InDetAlignment/collisions_run.config
+++ b/DataQuality/DataQualityConfigurations/config/InDetAlignment/collisions_run.config
@@ -1042,8 +1042,8 @@ algorithm IDAlign_PixResYGaussFit {
   name = Simple_gaus_Fit
   #  name = Simple_doublegaus_Fit
   thresholds = IDAlign_PixResYGaussThresholds
-  xmin = -0.4
-  xmax = 0.4
+  xmin = -0.3
+  xmax = 0.3
   MinStat = 1000
   reference = stream=physics_Main:CentrallyManagedReferences_Main;CentrallyManagedReferences
 }
@@ -1053,8 +1053,8 @@ algorithm IDAlign_PixEcaResXGaussFit {
   # only simple gaus, double gaus would cause undefined status for other plots
   #  name = Simple_doublegaus_Fit
   thresholds = IDAlign_PixEcaResXGaussThresholds
-  xmin = -0.1
-  xmax = 0.1
+  xmin = -0.05
+  xmax = 0.05
   MinStat = 1000
   reference = stream=physics_Main:CentrallyManagedReferences_Main;CentrallyManagedReferences
 }
@@ -1064,8 +1064,8 @@ algorithm IDAlign_PixEccResXGaussFit {
   name = Simple_gaus_Fit
   #  name = Simple_doublegaus_Fit
   thresholds = IDAlign_PixEccResXGaussThresholds
-  xmin = -0.1
-  xmax = 0.1
+  xmin = -0.05
+  xmax = 0.05
   MinStat = 1000
   reference = stream=physics_Main:CentrallyManagedReferences_Main;CentrallyManagedReferences
 }
@@ -1074,8 +1074,8 @@ algorithm IDAlign_PixEcaResYGaussFit {
   name = Simple_gaus_Fit
   #  name = Simple_doublegaus_Fit
   thresholds = IDAlign_PixEcaResYGaussThresholds
-  xmin = -0.5
-  xmax = 0.5
+  xmin = -0.3
+  xmax = 0.3
   MinStat = 1000
   reference = stream=physics_Main:CentrallyManagedReferences_Main;CentrallyManagedReferences
 }
@@ -1085,8 +1085,8 @@ algorithm IDAlign_PixEccResYGaussFit {
   name = Simple_gaus_Fit
   #  name = Simple_doublegaus_Fit
   thresholds = IDAlign_PixEccResYGaussThresholds
-  xmin = -0.5
-  xmax = 0.5
+  xmin = -0.3
+  xmax = 0.3
   MinStat = 1000
   reference = stream=physics_Main:CentrallyManagedReferences_Main;CentrallyManagedReferences
 }
@@ -1097,8 +1097,8 @@ algorithm IDAlign_SctBarrelXGaussFit {
   # doublegaus would cause undefined status for other plots (e.g pix_b_residualx), but ok for itself !
   #  name = Simple_doublegaus_Fit
   thresholds = IDAlign_SctResXGaussThresholds
-  xmin = -0.08
-  xmax = 0.08
+  xmin = -0.05
+  xmax = 0.05
   MinStat = 1000
   reference = stream=physics_Main:CentrallyManagedReferences_Main;CentrallyManagedReferences
 }
@@ -1108,8 +1108,8 @@ algorithm IDAlign_SctEcaXGaussFit {
   name = Simple_gaus_Fit
   #  name = Simple_doublegaus_Fit
   thresholds = IDAlign_SctEcaXGaussThresholds
-  xmin = -0.5
-  xmax = 0.5
+  xmin = -0.07
+  xmax = 0.07
   MinStat = 1000
   reference = stream=physics_Main:CentrallyManagedReferences_Main;CentrallyManagedReferences
 }
@@ -1119,8 +1119,8 @@ algorithm IDAlign_SctEccXGaussFit {
   name = Simple_gaus_Fit
   #  name = Simple_doublegaus_Fit
   thresholds = IDAlign_SctEccXGaussThresholds
-  xmin = -0.5
-  xmax = 0.5
+  xmin = -0.07
+  xmax = 0.07
   MinStat = 1000
   reference = stream=physics_Main:CentrallyManagedReferences_Main;CentrallyManagedReferences
 }
diff --git a/DataQuality/DataQualityConfigurations/config/InDetAlignment/heavyions_run.config b/DataQuality/DataQualityConfigurations/config/InDetAlignment/heavyions_run.config
index 0ff84060062e93db31cc6ed6f8258ce3495228c8..74b0f6de0ec5f2168f6b386c2eb63e6af68dc79b 100644
--- a/DataQuality/DataQualityConfigurations/config/InDetAlignment/heavyions_run.config
+++ b/DataQuality/DataQualityConfigurations/config/InDetAlignment/heavyions_run.config
@@ -867,8 +867,8 @@ algorithm IDAlign_PixResYGaussFit {
   name = Simple_gaus_Fit
   #  name = Simple_doublegaus_Fit
   thresholds = IDAlign_PixResYGaussThresholds
-  xmin = -0.5
-  xmax = 0.5
+  xmin = -0.3
+  xmax = 0.3
   MinStat = 1000
   reference = CentrallyManagedReferences
 }
@@ -878,8 +878,8 @@ algorithm IDAlign_PixEcaResXGaussFit {
   # only simple gaus, double gaus would cause undefined status for other plots
   #  name = Simple_doublegaus_Fit
   thresholds = IDAlign_PixEcaResXGaussThresholds
-  xmin = -0.1
-  xmax = 0.1
+  xmin = -0.05
+  xmax = 0.05
   MinStat = 1000
   reference = CentrallyManagedReferences
 }
@@ -889,8 +889,8 @@ algorithm IDAlign_PixEccResXGaussFit {
   name = Simple_gaus_Fit
   #  name = Simple_doublegaus_Fit
   thresholds = IDAlign_PixEccResXGaussThresholds
-  xmin = -0.1
-  xmax = 0.1
+  xmin = -0.05
+  xmax = 0.05
   MinStat = 1000
   reference = CentrallyManagedReferences
 }
@@ -899,8 +899,8 @@ algorithm IDAlign_PixEcaResYGaussFit {
   name = Simple_gaus_Fit
   #  name = Simple_doublegaus_Fit
   thresholds = IDAlign_PixEcaResYGaussThresholds
-  xmin = -0.5
-  xmax = 0.5
+  xmin = -0.3
+  xmax = 0.3
   MinStat = 1000
   reference = CentrallyManagedReferences
 }
@@ -910,8 +910,8 @@ algorithm IDAlign_PixEccResYGaussFit {
   name = Simple_gaus_Fit
   #  name = Simple_doublegaus_Fit
   thresholds = IDAlign_PixEccResYGaussThresholds
-  xmin = -0.5
-  xmax = 0.5
+  xmin = -0.3
+  xmax = 0.3
   MinStat = 1000
   reference = CentrallyManagedReferences
 }
@@ -922,8 +922,8 @@ algorithm IDAlign_SctBarrelXGaussFit {
   # doublegaus would cause undefined status for other plots (e.g pix_b_residualx), but ok for itself !
   #  name = Simple_doublegaus_Fit
   thresholds = IDAlign_SctResXGaussThresholds
-  xmin = -0.08
-  xmax = 0.08
+  xmin = -0.05
+  xmax = 0.05
   MinStat = 1000
   reference = CentrallyManagedReferences
 }
@@ -933,8 +933,8 @@ algorithm IDAlign_SctEcaXGaussFit {
   name = Simple_gaus_Fit
   #  name = Simple_doublegaus_Fit
   thresholds = IDAlign_SctEcaXGaussThresholds
-  xmin = -0.5
-  xmax = 0.5
+  xmin = -0.07
+  xmax = 0.07
   MinStat = 1000
   reference = CentrallyManagedReferences
 }
@@ -944,8 +944,8 @@ algorithm IDAlign_SctEccXGaussFit {
   name = Simple_gaus_Fit
   #  name = Simple_doublegaus_Fit
   thresholds = IDAlign_SctEccXGaussThresholds
-  xmin = -0.5
-  xmax = 0.5
+  xmin = -0.07
+  xmax = 0.07
   MinStat = 1000
   reference = CentrallyManagedReferences
 }
diff --git a/DataQuality/DataQualityConfigurations/config/InDetGlobal/collisions_minutes10.config b/DataQuality/DataQualityConfigurations/config/InDetGlobal/collisions_minutes10.config
deleted file mode 100644
index 6712bccbae73dc24d2e6418e83eb8fea9e30b7da..0000000000000000000000000000000000000000
--- a/DataQuality/DataQualityConfigurations/config/InDetGlobal/collisions_minutes10.config
+++ /dev/null
@@ -1,192 +0,0 @@
-# **********************************************************************
-# $Id: collisions_minutes10.config 766394 2016-08-04 11:27:37Z kastanas $
-# **********************************************************************
-
-output top_level {
-	output InnerDetector {
-		output Global {
-			output Hits {
-			}
-			output Track {
-			}
-			output TIDE {
-			}
-		}
-	}
-}
-
-dir InDetGlobal {
-	dir Hits {
-		hist Trk_nIBLhits_eta_phi {
-			algorithm = GatherData
-			output = InnerDetector/Global/Hits
-		}
-		hist Trk_nPIXhits_eta_phi {
-			algorithm = ID_PIX_hits_ls
-			output = InnerDetector/Global/Hits
-		}
-		hist Trk_nSCThits_eta_phi {
-			algorithm = ID_SCT_hits_ls
-			output = InnerDetector/Global/Hits
-		}
-		hist Trk_nPixHoles_eta_phi {
-			algorithm = GatherData
-			output = InnerDetector/Global/Hits
-		}
-		hist Trk_nSCTHoles_eta_phi {
-			algorithm = GatherData
-			output = InnerDetector/Global/Hits
-		}
-		hist Trk_nTRThits_eta_phi {
-			algorithm = ID_TRT_hits_ls
-			output = InnerDetector/Global/Hits
-		}
-		hist Trk_nPIXdisabled_eta_phi {
-			algorithm = ID_PIX_disabled_ls
-			output = InnerDetector/Global/Hits
-		}
-		hist Trk_nSCTdisabled_eta_phi {
-			algorithm = ID_SCT_disabled_ls
-			output = InnerDetector/Global/Hits
-		}
-		hist Trk_nPixSplit_eta_phi {
-			algorithm = GatherData
-			output = InnerDetector/Global/Hits
-		}
-		hist Trk_nPixShared_eta_phi {
-			algorithm = GatherData
-			output = InnerDetector/Global/Hits
-		}
-		hist Trk_nSCTShared_eta_phi {
-			algorithm = GatherData
-			output = InnerDetector/Global/Hits
-		}
-		hist Trk_jetassoc_d0_dr {
-			algorithm = GatherData
-			output = InnerDetector/Global/TIDE
-		}
-		hist Trk_jetassoc_z0_dr {
-			algorithm = GatherData
-			output = InnerDetector/Global/TIDE
-		}
-		hist Trk_jetassoc_shared_pix_dr {
-			algorithm = GatherData
-			output = InnerDetector/Global/TIDE
-		}
-		hist Trk_jetassoc_split_pix_dr {
-			algorithm = GatherData
-			output = InnerDetector/Global/TIDE
-		}
-	}
-	dir Track {
-		hist COMB_eta_phi {
-			algorithm = Histogram_Not_Empty
-			output = InnerDetector/Global/Track
-		}
-		hist Trk_LoosePrimary_eta_phi_ratio {
-			algorithm = Histogram_Not_Empty
-			output = InnerDetector/Global/Track
-		}
-		hist Trk_Tight_eta_phi_ratio {
-			algorithm = Histogram_Not_Empty
-			output = InnerDetector/Global/Track
-		}
-		hist Trk_noBLhit_eta_phi_ratio {
-			algorithm = ID_BL_missing_ls
-			output = InnerDetector/Global/Track
-		}
-		hist Trk_noIBLhit_eta_phi_ratio {
-			algorithm = ID_IBL_missing_ls
-			output = InnerDetector/Global/Track
-		}
-		hist Trk_noTRText_eta_phi_ratio {
-			algorithm = ID_TRT_missing_ls
-			output = InnerDetector/Global/Track
-		}
-	}
-
-}
-
-algorithm IDGL_BinsDiff {
-	name = BinsDiffByStrips
-	thresholds = IDGL_Bins_thresh
-	SigmaThresh = 2
-	libname = libdqm_algorithms.so
-}
-
-thresholds IDGL_Bins_thresh {
-	limits MaxDeviation {
-		warning = 4
-		error = 5
-	}
-}
-
-
-algorithm ID_PIX_hits_ls {
-	name = Bins_LessThan_Threshold
-	libname = libdqm_algorithms.so
-	BinThreshold = 3
-	thresholds = ID_etaphi_frac_Thresh_ls
-}
-
-algorithm ID_SCT_hits_ls {
-	name = Bins_LessThan_Threshold
-	libname = libdqm_algorithms.so
-	BinThreshold = 7
-	thresholds = ID_etaphi_frac_Thresh_ls
-}
-
-algorithm ID_TRT_hits_ls {
-	name = Bins_LessThan_Threshold
-	libname = libdqm_algorithms.so
-	BinThreshold = 10
-	thresholds = ID_etaphi_frac_Thresh_ls
-	xmax = 1.9
-	xmin = -1.9
-}
-
-algorithm ID_PIX_disabled_ls {
-	name = Bins_GreaterThan_Threshold
-	libname = libdqm_algorithms.so
-	BinThreshold = 2
-	thresholds = ID_etaphi_frac_Thresh_ls
-}
-
-algorithm ID_SCT_disabled_ls {
-	name = Bins_GreaterThan_Threshold
-	libname = libdqm_algorithms.so
-	BinThreshold = 2
-	thresholds = ID_etaphi_frac_Thresh_ls
-}
-
-algorithm ID_IBL_missing_ls {
-	name = Bins_GreaterThan_Threshold
-	libname = libdqm_algorithms.so
-	BinThreshold = 0.2
-	thresholds = ID_etaphi_frac_Thresh_ls
-}
-
-algorithm ID_BL_missing_ls {
-	name = Bins_GreaterThan_Threshold
-	libname = libdqm_algorithms.so
-	BinThreshold = 0.16
-	thresholds = ID_etaphi_frac_Thresh_ls
-}
-
-algorithm ID_TRT_missing_ls {
-	name = Bins_GreaterThan_Threshold
-	libname = libdqm_algorithms.so
-	BinThreshold = 0.23
-	thresholds = ID_etaphi_frac_Thresh_ls
-}
-
-#############
-# Thresholds
-#############
-
-thresholds ID_etaphi_frac_Thresh_ls {
-	limits NBins {
-		warning = 125
-		error = 250
-	}
-}
diff --git a/DataQuality/DataQualityUtils/src/MonitoringFile.cxx b/DataQuality/DataQualityUtils/src/MonitoringFile.cxx
index 4a6aad56c09fbd428eb1c166dccd65ca436fa513..0bf51dbb303b4f0bb94aa6a069e0a65826dd0a0f 100644
--- a/DataQuality/DataQualityUtils/src/MonitoringFile.cxx
+++ b/DataQuality/DataQualityUtils/src/MonitoringFile.cxx
@@ -115,7 +115,7 @@ namespace dqutils {
     
       std::string name;
       std::unique_ptr<TObject> obj;
-      std::array<std::string, 3> metadata;
+      std::array<std::string, 3> metadata{"unset","","<default>"};
       std::clock_t cpuSum = 0;
       void (*mergeMethod)(TObject* a, const TObject* b) = nullptr;
       void merge(TObject* other); 
@@ -206,9 +206,11 @@ namespace dqutils {
     }
 
     for (const auto& [key, h] : histos) {
-      metadatamap[key] = h.metadata;
+      if (h.metadata[0]!="unset") //Ignore dummy-metadata (eg HLTMon use-case)
+	  metadatamap[key] = h.metadata;
     }
 
+    if (metadatamap.empty()) return; //Do not write empty metadata tree
     std::string interval, chain, merge;
     char histname[1024];  // FIXME, no idea why this works only in this old-fashioned way
     std::unique_ptr<TTree> mdTree = std::make_unique<TTree>("metadata", "Monitoring Metadata");
@@ -343,10 +345,6 @@ namespace dqutils {
       return; //quasi null-operation
     HIST* a1 = (dynamic_cast<HIST*>(a));
     const HIST* b1 = dynamic_cast<const HIST*>(b);
-    if ((!b1) or (!a1)){
-      std::cout << "ERROR in identical: Objects not of type HIST" << std::endl;
-      return;
-    }
     dqutils::MonitoringFile::merge_identical(*a1, *b1);
     return;
   }
@@ -389,10 +387,6 @@ namespace dqutils {
 
   void merge_TTree(TObject * a, const TObject* b) {
     TTree* a1 = dynamic_cast<TTree*>(a);
-    if (!a1){
-      std::cout << "ERROR in merge_TTree: Object not of type TTree" << std::endl;
-      return;
-    }
     const TTree* b1 = dynamic_cast<const TTree*>(b);
     TTree* b2 = const_cast<TTree*>(b1);
     TList listT;
@@ -409,12 +403,12 @@ namespace dqutils {
       return;
     }
 
-    if (!fillMD(mdTree)) {
-      std::cout << "ERROR while adding " << nameIn << ", no metadata found" << std::endl;
-      obj = nullptr;
-      return;
+    if (mdTree) {
+      fillMD(mdTree);
+    }
+    else {
+      s_dbg(VERBOSE,"No matadata found for " + name +", use defaults");
     }
-
     const std::string& howToMerge = metadata[2];
     s_dbg(VERBOSE, "Name: " + name + " mergeMethod=" + howToMerge);
 
@@ -488,7 +482,7 @@ namespace dqutils {
 
       s_dbg(VERBOSE, "Found name " + name + ", classname=" + classname);
 
-      const std::string newName = dirName + "/" + name;
+      const std::string newName = dirName.empty() ? name : dirName + "/" + name;
       auto itDir = m_data.find(dirName);
 
       if (classname.starts_with("TH") || classname.starts_with("TProfile") || classname.starts_with("TEfficiency") || classname == "TTree") {
@@ -520,10 +514,7 @@ namespace dqutils {
             // Metadata tree not yet read in this directory
             md.reset((TTree*)dir->Get("metadata"));
           }
-          if (!md) {
-            std::cout << "ERROR: Did not find metadata tree in directory " << dir->GetPath() << std::endl;
-            continue;
-          }
+	  
           std::unique_ptr<TObject> obj{key->ReadObj()};
           TTree* treeObj = dynamic_cast<TTree*>(obj.get());
           if (treeObj) {
@@ -846,7 +837,7 @@ namespace dqutils {
       return -1;
     }
     std::cout << "Working on file 1/" << nFiles << ": " << files[0] << std::endl;
-    std::string runDir;
+    std::string runDir, runDirFwd;
     const std::regex runDirPattern("run_[0-9]*");
     TIter next(in1->GetListOfKeys());
     TKey* key;
@@ -859,15 +850,24 @@ namespace dqutils {
           runDir = name;
       }
     }
-    std::cout << "Found run directory " << runDir << std::endl;
+    if (runDir.empty()) {
+      std::cout << "No run-directory found, start with '/'" << std::endl;
+      runDir="/";
+      runDirFwd="";
+    }
+    else {
+      std::cout << "Found run directory " << runDir << std::endl;
+      runDirFwd=runDir;
+    }
 
-    TDirectory* dir(dynamic_cast<TDirectory*>(in1->Get(runDir.c_str())));
+    
+    TDirectory* dir(dynamic_cast<TDirectory*>(in1->GetDirectory(runDir.c_str())));
     if (!dir) {
       std::cout << "ERROR, can't access directory  " << runDir;
       return -1;
     }
 
-    hc.addDirectory(dir, runDir, files[0]);
+    hc.addDirectory(dir, runDirFwd, files[0]);
 
     // Close first input file
     in1->Delete("");
@@ -881,13 +881,8 @@ namespace dqutils {
         std::cout << "ERROR, could not open input file " << files[i] << std::endl;
         return -1;
       }
-      auto pDir = dynamic_cast<TDirectory*>(in->Get(runDir.c_str()));
-      if (!pDir){
-        std::cout << "ERROR, could not cast ptr to TDirectory " << std::endl;
-        return -1;
-      }
-      TDirectory* dir(dynamic_cast<TDirectory*>(in->Get(runDir.c_str())));
-      hc.addDirectory(dir, runDir, files[i]);
+      TDirectory* dir(dynamic_cast<TDirectory*>(in->GetDirectory(runDir.c_str())));
+      hc.addDirectory(dir, runDirFwd, files[i]);
       in->Delete("");
       in->Close();
     }
@@ -912,7 +907,7 @@ namespace dqutils {
         std::cout << "Merging/copying directory " << dir << std::endl;
         for (const std::string& fName : filenames) {
           std::unique_ptr<TFile> in(TFile::Open(fName.c_str()));
-          if (!in1) {
+          if (in1) {
             std::cout << "ERROR, could not open input file " << fName << std::endl;
             return -1;
           }
diff --git a/DataQuality/dqm_algorithms/dqm_algorithms/AFP_SiTEfficiency.h b/DataQuality/dqm_algorithms/dqm_algorithms/AFP_SiTEfficiency.h
new file mode 100644
index 0000000000000000000000000000000000000000..8b28ea4f59ba3c3fe69b97abfa1872c9292462d7
--- /dev/null
+++ b/DataQuality/dqm_algorithms/dqm_algorithms/AFP_SiTEfficiency.h
@@ -0,0 +1,33 @@
+/*
+  Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
+*/
+
+#ifndef DQM_Algorithms_AFP_SiTEfficiency_H
+#define DQM_Algorithms_AFP_SiTEfficiency_H
+
+#include <dqm_core/Algorithm.h>
+#include <dqm_core/AlgorithmConfig.h>
+#include <dqm_core/Result.h>
+
+#include <TObject.h>
+
+#include <map>
+#include <ostream>
+#include <string>
+#include <utility>
+#include <vector>
+
+namespace dqm_algorithms {
+    class AFP_SiTEfficiency : public dqm_core::Algorithm {
+      public:
+        AFP_SiTEfficiency();
+        ~AFP_SiTEfficiency();
+
+        AFP_SiTEfficiency* clone() override;
+        dqm_core::Result* execute( const std::string& name, const TObject& object, const dqm_core::AlgorithmConfig& config ) override;
+        void printDescriptionTo( std::ostream& out ) override;
+
+    };
+} // namespace dqm_algorithms
+
+#endif // DQM_Algorithms_AFP_SiTEfficiency_H
diff --git a/DataQuality/dqm_algorithms/dqm_algorithms/dqm_algorithmsDict.h b/DataQuality/dqm_algorithms/dqm_algorithms/dqm_algorithmsDict.h
index bc070a80961c5ef1d1fddb2e07ae9d43eb5eb453..e13409ca9a512002845ff511bc90938fa34f6ede 100644
--- a/DataQuality/dqm_algorithms/dqm_algorithms/dqm_algorithmsDict.h
+++ b/DataQuality/dqm_algorithms/dqm_algorithms/dqm_algorithmsDict.h
@@ -18,6 +18,7 @@
 #include "dqm_algorithms/AFP_LBsOutOfRange.h"
 #include "dqm_algorithms/AFP_ToFSiTCorrCheck.h"
 #include "dqm_algorithms/AFP_ToFEfficiency.h"
+#include "dqm_algorithms/AFP_SiTEfficiency.h"
 #include "dqm_algorithms/All_Bins_Filled.h"
 #include "dqm_algorithms/AveragePrint.h"
 #include "dqm_algorithms/BasicGraphCheck.h"
diff --git a/DataQuality/dqm_algorithms/dqm_algorithms/selection.xml b/DataQuality/dqm_algorithms/dqm_algorithms/selection.xml
index e9d1904c5bbade94bc4cf1beac00551a8b834245..a84ad4287d7b62632d6d7e12302e4b522cef664b 100644
--- a/DataQuality/dqm_algorithms/dqm_algorithms/selection.xml
+++ b/DataQuality/dqm_algorithms/dqm_algorithms/selection.xml
@@ -13,6 +13,7 @@
   <class name="dqm_algorithms::AFP_LBsOutOfRange"/>
   <class name="dqm_algorithms::AFP_ToFSiTCorrCheck"/>
   <class name="dqm_algorithms::AFP_ToFEfficiency"/>
+  <class name="dqm_algorithms::AFP_SiTEfficiency"/>
   <class name="dqm_algorithms::All_Bins_Filled"/>
   <class name="dqm_algorithms::AveragePrint"/>
   <class name="dqm_algorithms::BasicGraphCheck"/>
diff --git a/DataQuality/dqm_algorithms/src/AFP_SiTEfficiency.cxx b/DataQuality/dqm_algorithms/src/AFP_SiTEfficiency.cxx
new file mode 100644
index 0000000000000000000000000000000000000000..bf2b21a9d88649e2f1897705b2d229767cfb4976
--- /dev/null
+++ b/DataQuality/dqm_algorithms/src/AFP_SiTEfficiency.cxx
@@ -0,0 +1,74 @@
+/*
+  Copyright (C) 2002-2025 CERN for the benefit of the ATLAS collaboration
+*/
+
+#include "dqm_algorithms/AFP_SiTEfficiency.h"
+
+#include <dqm_algorithms/tools/AlgorithmHelper.h>
+#include <dqm_core/AlgorithmManager.h>
+#include "dqm_core/AlgorithmConfig.h"
+#include <dqm_core/exceptions.h>
+
+#include <TDirectory.h>
+#include <TH1.h>
+#include <TH2.h>
+#include <TEfficiency.h>
+#include <TFile.h>
+
+namespace {
+    static dqm_algorithms::AFP_SiTEfficiency instance;
+}
+
+dqm_algorithms::AFP_SiTEfficiency::AFP_SiTEfficiency() {
+    dqm_core::AlgorithmManager::instance().registerAlgorithm( "AFP_SiTEfficiency", this );
+}
+
+dqm_algorithms::AFP_SiTEfficiency::~AFP_SiTEfficiency() {
+}
+
+dqm_algorithms::AFP_SiTEfficiency*
+dqm_algorithms::AFP_SiTEfficiency::clone() {
+    return new AFP_SiTEfficiency();
+}
+
+dqm_core::Result*
+dqm_algorithms::AFP_SiTEfficiency::execute( const std::string& name,
+                                            const TObject& object,
+                                            const dqm_core::AlgorithmConfig& config ) {
+    if ( !object.IsA()->InheritsFrom( "TEfficiency" ) ) {
+        throw dqm_core::BadConfig( ERS_HERE, name, "does not inherit from TEfficiency" );
+    }
+
+    auto histogram = static_cast<const TEfficiency*>( &object );
+
+    auto gthreshold = static_cast<uint32_t>( dqm_algorithms::tools::GetFromMap( "NEfficiency", config.getGreenThresholds() ) );
+    auto rthreshold = static_cast<uint32_t>( dqm_algorithms::tools::GetFromMap( "NEfficiency", config.getRedThresholds() ) );
+    float efficiency = 0;
+
+    TH1* h_total = histogram->GetCopyTotalHisto();
+    TH1* h_passed = histogram->GetCopyPassedHisto();
+
+    float n_total = float ( h_total->GetEntries() );
+    float n_passed = float ( h_passed->GetEntries() );
+    efficiency = n_passed/n_total*100;
+
+    auto result = new dqm_core::Result();
+
+    // publish problematic bins
+    result->tags_[ "Plane efficiency = " ] = efficiency;
+
+    if ( efficiency == 0 )
+        result->status_ = dqm_core::Result::Undefined;
+    else if ( efficiency > gthreshold )
+        result->status_ = dqm_core::Result::Green;
+    else if ( ( efficiency <= gthreshold ) && (efficiency > rthreshold) )
+        result->status_ = dqm_core::Result::Yellow;
+    else 
+        result->status_ = dqm_core::Result::Red;
+
+    return result;
+}
+
+void dqm_algorithms::AFP_SiTEfficiency::printDescriptionTo( std::ostream& out ) {
+    out << "AFP_SiTEfficiency: Print out if general plane efficiency is less than limit"<< std::endl;
+}
diff --git a/DataQuality/dqm_algorithms/src/L1Calo_BinsDiffFromStripMedian.cxx b/DataQuality/dqm_algorithms/src/L1Calo_BinsDiffFromStripMedian.cxx
index e1ad8feda8bc3290306b17f2f16a67d0c96f7f07..9642279e5be5426f9ee591255328be2b47a58b42 100644
--- a/DataQuality/dqm_algorithms/src/L1Calo_BinsDiffFromStripMedian.cxx
+++ b/DataQuality/dqm_algorithms/src/L1Calo_BinsDiffFromStripMedian.cxx
@@ -60,7 +60,7 @@ dqm_algorithms::L1Calo_BinsDiffFromStripMedian::execute(const std::string &  nam
         throw dqm_core::BadConfig( ERS_HERE, name, "does not inherit from TH1" );
     }
 
-    const double minstat = dqm_algorithms::tools::GetFirstFromMap( "MinStat", config.getParameters(), -1);
+    const double minstat = dqm_algorithms::tools::GetFirstFromMap( "MinStat", config.getParameters(), 100);
     const double ignoreBelow = dqm_algorithms::tools::GetFirstFromMap( "IgnoreBelow", config.getParameters(), 0);
     const double probThreshold = dqm_algorithms::tools::GetFirstFromMap( "ProbThreshold", config.getParameters(), 0.01);
     const int publishDetail = dqm_algorithms::tools::GetFirstFromMap( "PublishDetail", config.getParameters(), 0x10/*publish status code - since saw some inconsistencies in webdisplay on local testing. Should plan to set to 0 in future*/);
@@ -102,6 +102,7 @@ dqm_algorithms::L1Calo_BinsDiffFromStripMedian::execute(const std::string &  nam
 
     if ( histogram->GetEntries() < minstat ) {
         dqm_core::Result *result = new dqm_core::Result(dqm_core::Result::Undefined);
+        result->status_ = dqm_core::Result::Yellow; // will treat almost-empty histograms as a warning .... shifter should think if this is expected
         result->tags_["InsufficientEntries"] = histogram->GetEntries();
         return result;
     }
@@ -109,6 +110,8 @@ dqm_algorithms::L1Calo_BinsDiffFromStripMedian::execute(const std::string &  nam
 
     std::vector<int> range=dqm_algorithms::tools::GetBinRange(histogram, config.getParameters());
 
+    std::set<int> filledRows; // will only look for dead strips once all rows are filled
+
     // compute medians, means, variances, k-test probabilities
     std::vector<double> stripsMedian;
     std::vector<double> stripsAvg;
@@ -122,6 +125,7 @@ dqm_algorithms::L1Calo_BinsDiffFromStripMedian::execute(const std::string &  nam
         for ( int j = range[2]; j <= range[3]; ++j ) {
             if (histogram->GetBinContent(i,j) < ignoreBelow) continue;
             float binvalue = histogram->GetBinContent(i,j);
+            if(binvalue>0) filledRows.insert(j); // used to veto running deadstrip tests on sparsely populated plots
             onestrip.push_back(binvalue);
             stripSum += binvalue;
             //stripSum2 += binvalue*binvalue;
@@ -140,8 +144,15 @@ dqm_algorithms::L1Calo_BinsDiffFromStripMedian::execute(const std::string &  nam
         // also compute Kolmogorov test probability vs a same-size dataset generated from a gaussian with the strip mean and variance
         if(stripsVariance.back() > 0) {
             std::vector<double> stripRef;
-            for (size_t i = 0; i < onestrip.size(); i++)
-                stripRef.push_back(r.Gaus(stripsAvg.back(), std::sqrt(stripsVariance.back())));
+            for (size_t i = 0; i < onestrip.size(); i++) {
+                // use possion for variances less than 100 (corresponding ~ to averages fewer than 100)
+                // otherwise switch to gaussian
+                double nextVal = 0;
+                do {
+                    nextVal = (stripsVariance.back()>=100) ? r.Gaus(stripsAvg.back(), std::sqrt(stripsVariance.back())) : r.Poisson(stripsAvg.back());
+                } while(nextVal<ignoreBelow);
+                stripRef.push_back(nextVal);
+            }
             std::sort(stripRef.begin(),stripRef.end());
             stripsProb.push_back(  TMath::KolmogorovTest(onestrip.size(),&onestrip[0],stripRef.size(),&stripRef[0],"")  );
         } else {
@@ -164,10 +175,12 @@ dqm_algorithms::L1Calo_BinsDiffFromStripMedian::execute(const std::string &  nam
     }
 
 
+    bool testDeadStrips = (filledRows.size() == size_t(range[3]-range[2]+1));
+
 
     std::map<std::string,int> counts;
     // ensure all counts defined, even if will end up being 0
-    counts["NDeadStrip"]=0;
+    counts["NDeadStrip"]= (testDeadStrips) ? 0 : -1; // use -1 to flag not running this test
     counts["NDead"]=0;
     counts["NWrongKnown"]=0;
     counts["NConsecUnlikelyStrip"]=0;
@@ -178,12 +191,16 @@ dqm_algorithms::L1Calo_BinsDiffFromStripMedian::execute(const std::string &  nam
     // publish deadstrips (whole strip is 0), and unlikely strips
     int nUnlikelyStrips = 0;
     for(size_t i = 0;i<stripsVariance.size();i++) {
-        if (stripsN.at(i) > 0 && stripsVariance.at(i) == 0 && stripsAvg.at(i) == 0) {
-            result->tags_[TString::Format("_DeadStrip%02ld", i+1).Data()] = histogram->GetXaxis()->GetBinCenter(range[0] + i);
-            counts["NDeadStrip"]++;
+        if (testDeadStrips && stripsVariance.at(i) == 0 && stripsAvg.at(i) == 0) {
+            // only dead if at least one of the neighbour strips has enough entries in it
+            if( (i>0 && (stripsAvg.at(i-1)*stripsN.at(i-1))>=minstat) || (i<stripsVariance.size()-1 && (stripsAvg.at(i+1)*stripsN.at(i+1))>=minstat)) {
+                result->tags_[TString::Format("_DeadStrip%02ld", i+1).Data()] = histogram->GetXaxis()->GetBinCenter(range[0] + i);
+                counts["NDeadStrip"]++;
+            }
+
         }
         if (stripsProb.at(i) < probThreshold) {
-            result->tags_[TString::Format("_UnlikelyStrip%02ld", i+1).Data()] = stripsProb.at(i);
+            result->tags_[TString::Format("_UnlikelyStrip%02ld", i+1).Data()] = -log(stripsProb.at(i));
             nUnlikelyStrips++;
             if(nUnlikelyStrips > counts["NConsecUnlikelyStrip"]) counts["NConsecUnlikelyStrip"] = nUnlikelyStrips;
         } else {
@@ -220,7 +237,7 @@ dqm_algorithms::L1Calo_BinsDiffFromStripMedian::execute(const std::string &  nam
             // loop through cuts, assign bin to one of the ranges, and report if not a known bin
             double classCut = 0;
             for(auto& [cut,k] : orderedCuts) {
-                if( (cut < 0 && bin.m_outstandingRatio < cut) || (cut > 0 && bin.m_outstandingRatio > cut) ) {
+                if( (cut < 0 && bin.m_outstandingRatio < cut) || (cut > 0 && bin.m_outstandingRatio > cut && bin.m_value>=minstat) ) {
                     classCut = cut;
                     if(knownBins[k].find({bin.m_ix,bin.m_iy})==knownBins[k].end()) {
                         result->tags_[TString::Format("_%s(%d,%d)", k.c_str(), bin.m_ix,
@@ -291,10 +308,10 @@ void dqm_algorithms::L1Calo_BinsDiffFromStripMedian::printDescription(std::ostre
   out<<"L1Calo_BinsDiffFromStripMedian: Calculates strip median and then find out bins which are aliens "<<std::endl;
   out<<"Specify cuts with parameters named <cutName>Cut will generate a result of form Nxxx" << std::endl;
   out<<"Specify known anomalies with Known<cutName> string argument - note any leading non-numeric char will be stripped" << std::endl;
-  out<<"Special results are: NDead (number of 0 bins below most negative cut), NDeadStrip (strips that are all 0), NConsecUnlikelyStrip (most consecutive strips that are below ProbThreshold)" << std::endl;
+  out<<"Special results are: NDead (number of 0 bins below most negative cut), NDeadStrip (strips that are all 0 .. will be -1 if not got an entry in every row of plot), NConsecUnlikelyStrip (most consecutive strips that are below ProbThreshold)" << std::endl;
   out<<"Thresholds can be set on any of the results\n"<<std::endl;
   
-  out<<"Optional Parameter: MinStat: Minimum histogram statistics needed to perform Algorithm"<<std::endl;
+  out<<"Optional Parameter: MinStat: Minimum histogram statistics needed to perform Algorithm, also min entries for warm/hot spots (cuts > 0), and min entries in neighbour strip to declare a strip dead"<<std::endl;
   out<<"Optional Parameter: IgnoreBelow: values below which the bins wont be considered (default 0)"<<std::endl;
   out<<"Optional Parameter: ProbThreshold: cutoff for strip k-test probabilities for strip to be considered unlikely (default 0.05)"<<std::endl;
   out<<"Optional Parameter: PublishDetail: Bitmask of what extra info to publish about strips. Starting with MSB: AlgStatusCode,Zeros,Noise,Prob,StdDev,Median (default 000000)"<<std::endl;
diff --git a/ForwardDetectors/AFP/Run3AFPMonitoring/python/Run3AFPExampleMonitorAlgorithm.py b/ForwardDetectors/AFP/Run3AFPMonitoring/python/Run3AFPExampleMonitorAlgorithm.py
index 071f512f0072ffad9ce14d0ceb4bee1bf539f285..f20ad7a273c54ca6a11fa158925a8fe1e564fc3b 100644
--- a/ForwardDetectors/AFP/Run3AFPMonitoring/python/Run3AFPExampleMonitorAlgorithm.py
+++ b/ForwardDetectors/AFP/Run3AFPMonitoring/python/Run3AFPExampleMonitorAlgorithm.py
@@ -234,10 +234,10 @@ if __name__=='__main__':
     # Set the Athena configuration flags
     from AthenaConfiguration.AllConfigFlags import initConfigFlags
     flags = initConfigFlags()
-    #flags.Input.Files = ['/eos/user/v/vlysenko/DQ/testing/data24_13p6TeV/data24_13p6TeV.00484780.physics_Main.merge.AOD.f1514_m2248._lb0793._0003.1']
-    flags.Input.Files = ['/eos/user/l/lvicenik/afp_data/data24_13p6TeV/data24_13p6TeV.00484780.physics_Main.merge.AOD.f1514_m2248._lb0793._0003.1']
+    flags.Input.Files = ['/eos/user/v/vlysenko/DQ/testing/data24_13p6TeV/data24_13p6TeV.00484780.physics_Main.merge.AOD.f1514_m2248._lb0793._0003.1']
+    #flags.Input.Files = ['/eos/user/l/lvicenik/afp_data/data24_13p6TeV/data24_13p6TeV.00484780.physics_Main.merge.AOD.f1514_m2248._lb0793._0003.1']
     flags.Input.isMC = False
-    flags.Output.HISTFileName = 'clean-AFPTest-24.root'
+    flags.Output.HISTFileName = 'dqm-AFPTest-24.root'
     
 
     flags.Concurrency.NumThreads=10
diff --git a/ForwardDetectors/ZDC/ZDC_GeoM/src/ZDC_DetFactory.cxx b/ForwardDetectors/ZDC/ZDC_GeoM/src/ZDC_DetFactory.cxx
index 243a2dd089a5d8b4e1c26770acda47186be20178..d1eac9e9eae085e22081e660f7cffc6ce055a173 100644
--- a/ForwardDetectors/ZDC/ZDC_GeoM/src/ZDC_DetFactory.cxx
+++ b/ForwardDetectors/ZDC/ZDC_GeoM/src/ZDC_DetFactory.cxx
@@ -174,10 +174,13 @@ void ZDC_DetFactory::buildMaterials(StoredMaterialManager *materialManager){
 
     // Absorption length index of fused silica derrived from 
     // https://www.heraeus.com/media/media/hca/doc_hca/products_and_solutions_8/optics/Data_and_Properties_Optics_fused_silica_EN.pdf
-    double silica_ABSL[nEntries];
-    for(int i=0; i<nEntries-2; ++i)
-        silica_ABSL[i] = 302.163 * cm;
-    silica_ABSL[nEntries - 1] = silica_ABSL[nEntries - 2] = 204.542 * cm;
+    double silica_ABSL[] = {1.786e+04 * cm, 1.556e+04 * cm, 1.982e+04 * cm, 2.369e+04 * cm, 2.046e+04 * cm, 1.595e+04 * cm, 1.582e+04 * cm,
+        1.420e+04 * cm, 1.279e+04 * cm, 1.545e+04 * cm, 1.498e+04 * cm, 1.358e+04 * cm, 1.824e+04 * cm, 2.320e+04 * cm,
+        3.736e+04 * cm, 2.155e+04 * cm, 1.718e+04 * cm, 1.871e+04 * cm, 2.286e+04 * cm, 3.597e+04 * cm, 4.358e+04 * cm,
+        2.751e+04 * cm, 1.967e+04 * cm, 1.743e+04 * cm, 1.425e+04 * cm, 1.198e+04 * cm, 1.371e+04 * cm, 1.911e+04 * cm,
+        4.413e+04 * cm, 4.002e+04 * cm, 2.621e+04 * cm, 1.420e+04 * cm, 1.085e+04 * cm, 1.020e+04 * cm, 1.090e+04 * cm,
+        1.267e+04 * cm, 1.369e+04 * cm, 1.427e+04 * cm, 1.484e+04 * cm, 1.480e+04 * cm, 1.443e+04 * cm, 1.274e+04 * cm,
+        1.242e+04 * cm, 1.212e+04 * cm, 1.232e+04 * cm, 1.251e+04 * cm, 1.168e+04 * cm, 1.052e+04 * cm, 1.197e+04 * cm, 8.355e+03 * cm};
 
     GeoMaterialPropertiesTable *silicaCoreMPT = new GeoMaterialPropertiesTable();
     silicaCoreMPT->AddProperty("RINDEX"   , photonEnergy, silica_RIND, nEntries); // index of refraction
diff --git a/ForwardDetectors/ZDC/ZdcNtuple/Root/ZdcNtuple.cxx b/ForwardDetectors/ZDC/ZdcNtuple/Root/ZdcNtuple.cxx
index cc09c1ed3e43a71b0035e1bf858146e5ba9465b9..7a1829958337febba2df4197275c0d754b61c554 100644
--- a/ForwardDetectors/ZDC/ZdcNtuple/Root/ZdcNtuple.cxx
+++ b/ForwardDetectors/ZDC/ZdcNtuple/Root/ZdcNtuple.cxx
@@ -217,6 +217,8 @@ StatusCode ZdcNtuple :: initialize ()
 	  m_outputTree->Branch("zdc_ZdcTruthParticlePy",&t_ZdcTruthParticlePy);
 	  m_outputTree->Branch("zdc_ZdcTruthParticlePz",&t_ZdcTruthParticlePz);
 	  m_outputTree->Branch("zdc_ZdcTruthParticleEnergy",&t_ZdcTruthParticleEnergy);
+	  m_outputTree->Branch("zdc_ZdcTruthParticlePid",&t_ZdcTruthParticlePid);
+	  m_outputTree->Branch("zdc_ZdcTruthParticleStatus",&t_ZdcTruthParticleStatus);
 	}
       }
     if (enableRPD)
@@ -1097,6 +1099,8 @@ void ZdcNtuple::processMCEventCollection(){
   t_ZdcTruthParticlePy.clear();
   t_ZdcTruthParticlePz.clear();
   t_ZdcTruthParticleEnergy.clear();
+  t_ZdcTruthParticlePid.clear();
+  t_ZdcTruthParticleStatus.clear();
 
   /******************************************
    * Sort the particles into sides and add
@@ -1122,6 +1126,8 @@ void ZdcNtuple::processMCEventCollection(){
         t_ZdcTruthParticlePy.push_back(particle->momentum().y());
         t_ZdcTruthParticlePz.push_back(particle->momentum().z());
         t_ZdcTruthParticleEnergy.push_back(particle->momentum().e());
+        t_ZdcTruthParticlePid.push_back(particle->pid());
+        t_ZdcTruthParticleStatus.push_back(particle->status());
       } // end loop over particles
     }// end loop over vertices
   }// end loop over HepMC events
diff --git a/ForwardDetectors/ZDC/ZdcNtuple/ZdcNtuple/ZdcNtuple.h b/ForwardDetectors/ZDC/ZdcNtuple/ZdcNtuple/ZdcNtuple.h
index a227e8a2946337d434aed326f2e347608bb2c0be..8c7a6da348fb6bb4b2c897b387e8fbe793b7f649 100644
--- a/ForwardDetectors/ZDC/ZdcNtuple/ZdcNtuple/ZdcNtuple.h
+++ b/ForwardDetectors/ZDC/ZdcNtuple/ZdcNtuple/ZdcNtuple.h
@@ -208,7 +208,9 @@ public:
   std::vector< float > t_ZdcTruthParticlePy;
   std::vector< float > t_ZdcTruthParticlePz;
   std::vector< float > t_ZdcTruthParticleEnergy;
-
+  std::vector< int > t_ZdcTruthParticlePid;
+  std::vector< int > t_ZdcTruthParticleStatus;
+  
   float t_ZdcModuleAmp[2][4];
   float t_ZdcModuleTime[2][4];
   float t_ZdcModuleFitAmp[2][4];
diff --git a/InnerDetector/InDetRecTools/InDetGNNHardScatterSelection/src/VertexDecoratorAlg.cxx b/InnerDetector/InDetRecTools/InDetGNNHardScatterSelection/src/VertexDecoratorAlg.cxx
index 0db3d3e2f0caadb427f1039658e8f52dc0655487..8377920d1352a33627dd5a48f8baba72a0d06c29 100644
--- a/InnerDetector/InDetRecTools/InDetGNNHardScatterSelection/src/VertexDecoratorAlg.cxx
+++ b/InnerDetector/InDetRecTools/InDetGNNHardScatterSelection/src/VertexDecoratorAlg.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2025 CERN for the benefit of the ATLAS collaboration
 */
 
 #include "VertexDecoratorAlg.h"
@@ -211,8 +211,7 @@ namespace InDetGNNHardScatterSelection
 
       dec_ntrk(*vertex) = number_tracks;
 
-      static const SG::AuxElement::Decorator<float> acc_sumPt("sumPt");
-      if(not acc_sumPt.isAvailable(*vertex)){
+      if(!dec_sumPt.isAvailable()){
         dec_sumPt(*vertex) = sumPt;
       }
       dec_chi2Over_ndf(*vertex) = vertex->chiSquared() / vertex->numberDoF();
diff --git a/LArCalorimeter/LArMonitoring/python/LArCoverageAlg.py b/LArCalorimeter/LArMonitoring/python/LArCoverageAlg.py
index 51c3e8a275155b8ac8f75f8a0edbf35ae9bce83c..f31a0f82a37a7491c895ca711749eada9cb4572e 100644
--- a/LArCalorimeter/LArMonitoring/python/LArCoverageAlg.py
+++ b/LArCalorimeter/LArMonitoring/python/LArCoverageAlg.py
@@ -58,7 +58,7 @@ def LArCoverageConfigCore(helper, algoinstance,flags):
 
     #Configure the CaloNoise
     from CaloTools.CaloNoiseCondAlgConfig import CaloNoiseCondAlgCfg
-    helper.resobj.merge(CaloNoiseCondAlgCfg(flags, noisetype="electronicNoise"))
+    helper.resobj.merge(CaloNoiseCondAlgCfg(flags, noisetype="electronicNoiseNoHV"))
 
     #-- caloNoise groups --
     caloNoiseToolArrayEM = helper.addArray([nLayers],larCoverageAlg,caloNoiseToolGroupName+"EM",topPath='/')
diff --git a/LArCalorimeter/LArMonitoring/python/LArSCvsRawChannelMonAlg.py b/LArCalorimeter/LArMonitoring/python/LArSCvsRawChannelMonAlg.py
new file mode 100644
index 0000000000000000000000000000000000000000..25ee018894e5bf14759a9f5ebb76afa9c44c4a16
--- /dev/null
+++ b/LArCalorimeter/LArMonitoring/python/LArSCvsRawChannelMonAlg.py
@@ -0,0 +1,130 @@
+# Copyright (C) 2002-2025 CERN for the benefit of the ATLAS collaboration
+
+
+from AthenaConfiguration.ComponentFactory import CompFactory
+from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
+from LArByteStream.LArRawDataReadingConfig import LArRawDataReadingCfg
+from LArByteStream.LArRawSCDataReadingConfig import LArRawSCDataReadingCfg
+from AthenaConfiguration.MainServicesConfig import MainServicesCfg
+from LArCabling.LArCablingConfig import LArOnOffIdMappingCfg, LArOnOffIdMappingSCCfg
+
+
+def LArSCvsRawChannelMonAlgCfg(flags):
+    acc=ComponentAccumulator()    
+    from LArBadChannelTool.LArBadChannelConfig import LArBadChannelCfg
+    acc.merge(LArBadChannelCfg(flags))
+    acc.merge(LArBadChannelCfg(flags,isSC=True))
+    
+    acc.merge(LArOnOffIdMappingCfg(flags))
+    acc.merge(LArOnOffIdMappingSCCfg(flags))
+    acc.merge(LArRawSCDataReadingCfg(flags))
+    
+    from CaloRec.CaloBCIDAvgAlgConfig import CaloBCIDAvgAlgCfg
+    acc.merge(CaloBCIDAvgAlgCfg(flags))
+
+    if flags.Input.isMC is False and not flags.Common.isOnline:
+       from LumiBlockComps.LuminosityCondAlgConfig import  LuminosityCondAlgCfg
+       acc.merge(LuminosityCondAlgCfg(flags))
+       from LumiBlockComps.LBDurationCondAlgConfig import  LBDurationCondAlgCfg
+       acc.merge(LBDurationCondAlgCfg(flags))
+
+    from AthenaMonitoring.AthMonitorCfgHelper import AthMonitorCfgHelper
+    helper = AthMonitorCfgHelper(flags,'LArSuperCellMonAlgCfg')
+    acc.merge(LArSCvsRawChannelMonConfigCore(helper, flags))
+
+    return acc
+
+
+def LArSCvsRawChannelMonConfigCore(helper, flags, algname="LArSCvsRawChannelMon"):
+
+
+    alg= helper.addAlgorithm(CompFactory.LArSCvsRawChannelMonAlg,algname)
+    
+
+    GroupName="LArSCvsRawGroup"
+    alg.MonGroupName = GroupName
+    alg.SCEnergyCut=90
+    alg.ProblemsToMask=["deadReadout","deadPhys"]
+    cellMonGroup = helper.addGroup(alg,GroupName,'LArSCvsRawChannelMon')
+
+
+    partGroup = helper.addArray([alg.LayerNames], alg, 'LArSCvsRawChannelMon', topPath='LArSCvsRawChannelMon/PerLayer')
+
+    from LArMonitoring.GlobalVariables import lArDQGlobals
+        
+    
+    for pName in alg.PartitionNames:
+        cellMonGroup.defineHistogram(f"scEne_{pName},eneSum_{pName};h_SCEne_vs_RawChannelEne_{pName}",
+                                 title=f'Super Cell energy vs sum of RawChannel energies ({pName}) ;SC [MeV]; Sum [MeV]',
+                                 type='TH2F', path="",
+                                 xbins = 100, xmin=0,xmax=50000,
+                                 ybins = 100, ymin=0,ymax=50000)
+
+
+
+    for lName in alg.LayerNames:
+        Side = lName[-1]
+        if "HEC" in lName:
+            Sampling = "0"
+            Part = lName[:-1]
+        else:
+            Sampling = lName[-2]
+            Part = lName[:-2]
+        if Part == "FCAL": 
+            Part = "FCal"
+        if Sampling == "P": 
+            Sampling = "0"
+        print(lName, "part", Part, "side", Side, "sampling", Sampling)
+        partxbins=lArDQGlobals.SuperCell_Variables["etaRange"][Part][Side][Sampling]
+        partybins=lArDQGlobals.SuperCell_Variables["phiRange"][Part][Side][Sampling]
+        
+
+        partGroup.defineHistogram('part_eta,part_phi,part_eneFrac; Coverage_SCEne_div_cellEne_coverage_test',
+                                  title='SC energy / sum of cell energy',
+                                  type="TProfile2D",
+                                  xbins=partxbins,
+                                  ybins=partybins,
+                                  path='Coverage',
+                                  pattern=[(lName)])
+        
+        partGroup.defineHistogram("part_scEne,part_eneSum;h_SCEne_vs_RawChannelEne",
+                                 title=f'Super Cell energy vs sum of RawChannel energies ({lName}) ;SC [MeV]; Sum [MeV]',
+                                  type='TH2F', 
+                                  xbins = 100, xmin=0,xmax=50000,
+                                  ybins = 100, ymin=0,ymax=50000,
+                                  pattern=[(lName)])
+        
+
+
+
+        
+        
+    return helper.result()
+    
+if __name__=="__main__":
+
+    from AthenaConfiguration.AllConfigFlags import initConfigFlags
+    flags=initConfigFlags()
+    from AthenaCommon.Logging import log
+    from AthenaCommon.Constants import DEBUG
+    log.setLevel(DEBUG)
+    from AthenaConfiguration.TestDefaults import defaultGeometryTags
+
+    flags.LAr.doAlign=False
+    flags.Input.Files = ["data24_13p6TeV.00481893.physics_Main.daq.RAW._lb1058._SFO-17._0002.data",]
+    flags.GeoModel.AtlasVersion=defaultGeometryTags.RUN3
+    flags.Output.HISTFileName = 'LArSuperCellvsRC.root'
+    flags.Exec.FPE=-1
+    flags.fillFromArgs()
+    flags.lock()
+
+    acc = MainServicesCfg( flags )
+    acc.merge(LArRawDataReadingCfg(flags))
+
+    acc.merge(LArSCvsRawChannelMonAlgCfg(flags))
+    acc.getService("AvalancheSchedulerSvc").ShowDataDependencies=True
+    alg=acc.getEventAlgo("LArSCvsRawChannelMon")
+    alg.EnableLumi=False
+    alg.TrigDecisionTool=""
+    alg.WarnOffenders=True
+    acc.run()
diff --git a/LArCalorimeter/LArMonitoring/src/LArCoverageAlg.h b/LArCalorimeter/LArMonitoring/src/LArCoverageAlg.h
index c80de04126359345a15c9aacea9d24449e3e92e1..48a0c1b470ce73ed40089e63f4a5dfa0640e20ee 100644
--- a/LArCalorimeter/LArMonitoring/src/LArCoverageAlg.h
+++ b/LArCalorimeter/LArMonitoring/src/LArCoverageAlg.h
@@ -85,7 +85,7 @@ class LArCoverageAlg: public AthMonitorAlgorithm
   SG::ReadCondHandleKey<LArOnOffIdMapping> m_cablingKey{this,"CablingKey","LArOnOffIdMap","SG Key of LArOnOffIdMapping object"};
 
   /** Key for CaloNoise */
-  SG::ReadCondHandleKey<CaloNoise> m_noiseCDOKey{this,"CaloNoiseKey","electronicNoise","SG Key of CaloNoise data object"};
+  SG::ReadCondHandleKey<CaloNoise> m_noiseCDOKey{this,"CaloNoiseKey","electronicNoiseNoHV","SG Key of CaloNoise data object"};
 
   /** Handle to bad-channel tools */
   Gaudi::Property<std::vector<std::string> > m_problemsToMask{this,"ProblemsToMask",{}, "Bad-Channel categories to mask"}; 
diff --git a/MuonSpectrometer/MuonConfig/python/MuonGeometryConfig.py b/MuonSpectrometer/MuonConfig/python/MuonGeometryConfig.py
index ae27fe7a01b9fc10616638d8a76c6b85174f66f1..2639fb148861e9bc67c81184e3430f08aabe05f8 100644
--- a/MuonSpectrometer/MuonConfig/python/MuonGeometryConfig.py
+++ b/MuonSpectrometer/MuonConfig/python/MuonGeometryConfig.py
@@ -148,15 +148,13 @@ def NswAsBuiltCondAlgCfg(flags, name = "NswAsBuiltCondAlg", **kwargs):
 
     kwargs.setdefault("ReadMmAsBuiltParamsKey","/MUONALIGN/ASBUILTPARAMS/MM")
     #kwargs.setdefault("ReadSTgcAsBuiltParamsKey","/MUONALIGN/ASBUILTPARAMS/STGC") # This is the folder that sould be used once the as builts are validated, so keep it here but commented out
-    kwargs.setdefault("ReadSTgcAsBuiltParamsKey","") # for now diable the reading of sTGC as build from the conditions database
-    
+    kwargs.setdefault("ReadSTgcAsBuiltParamsKey","") # disable the stgc part of NswAsBuilt, proper code cleanup will follow
+
+
     ##TODO: remove hard-coded tag once the global tag is ready
     from IOVDbSvc.IOVDbSvcConfig import addFolders
     if(not (kwargs["MicroMegaJSON"] or not kwargs["ReadMmAsBuiltParamsKey"]) ) : # no need to add the folder if we are reading a json file anyhow
         result.merge(addFolders( flags, kwargs["ReadMmAsBuiltParamsKey"]  , 'MUONALIGN_OFL', className='CondAttrListCollection', tag='MuonAlignAsBuiltParamsMm-RUN3-01-00'))
-    ### Disable the STGC as-built parameters (Keep the path if we want to add later fully validated As-built)
-    if(not (kwargs["sTgcJSON"] or not kwargs["ReadSTgcAsBuiltParamsKey"])): # no need to add the folder if we are reading a json file anyhow
-        result.merge(addFolders( flags, kwargs["ReadSTgcAsBuiltParamsKey"], 'MUONALIGN_OFL', className='CondAttrListCollection', tag='MUONALIGN_STG_ASBUILT-001-03'))
     the_alg = CompFactory.NswAsBuiltCondAlg(name, **kwargs)
     result.addCondAlgo(the_alg, primary = True)     
     return result
@@ -167,10 +165,10 @@ def sTGCAsBuiltCondAlg2Cfg(flags, name = "sTGCAsBuiltCondAlg2", **kwargs):
     if flags.GeoModel.Run < LHCPeriod.Run3 or not flags.Muon.Align.UsesTGCAsBuild2:
         return result
     kwargs.setdefault("readFromJSON","")
-    if not kwargs["readFromJSON"] and False: # for now only allow reading from json since there is no database content available
-        kwargs.setdefault("ReadKey","/MUONALIGN/ASBUILTPARAMS/STGC") # This is the folder that sould be used once the as builts are validated, so keep it here but commented out
+    if not kwargs["readFromJSON"]:
+        kwargs.setdefault("ReadKey","/MUONALIGN/ASBUILTPARAMS/STGC")
         from IOVDbSvc.IOVDbSvcConfig import addFolders
-        result.merge(addFolders( flags, kwargs["ReadKey"], 'MUONALIGN_OFL', className='CondAttrListCollection', tag=''))
+        result.merge(addFolders( flags, kwargs["ReadKey"], 'MUONALIGN_OFL', className='CondAttrListCollection'))
     the_alg = CompFactory.sTGCAsBuiltCondAlg2(name,**kwargs)
     result.addCondAlgo(the_alg, primary=True)
     return result
diff --git a/Reconstruction/RecExample/RecJobTransformTests/test/test_data22_900GV_splash.sh b/Reconstruction/RecExample/RecJobTransformTests/test/test_data22_900GV_splash.sh
index 73e8332954c000f7672f14e3713f0f2dc9d12094..17c054ae4dc054349502d8e364c44d7756d9d9fd 100755
--- a/Reconstruction/RecExample/RecJobTransformTests/test/test_data22_900GV_splash.sh
+++ b/Reconstruction/RecExample/RecJobTransformTests/test/test_data22_900GV_splash.sh
@@ -9,8 +9,15 @@
 # TODO update following ATLASRECTS-8054
 export ATHENA_CORE_NUMBER=8
 #Monitoring is disabled because it tries to use the trigger information, which is disabled.
-Reco_tf.py --CA --multithreaded --inputBSFile /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/RecJobTransformTests/data22_900GeV/data22_900GeV.00423110.physics_Main.daq.RAW/data22_900GeV.00423110.physics_Main.daq.RAW._lb0274._SFO-14._0001.data --maxEvents=300 --conditionsTag="CONDBR2-BLKPA-2022-15" --geometryVersion="ATLAS-R3S-2021-03-01-00" --outputESDFile myESD.pool.root --outputAODFile myAOD.pool.root --\
-outputHISTFile myHist.root
+conditionsTag=$(python -c "from AthenaConfiguration.TestDefaults import defaultConditionsTags; print(defaultConditionsTags.RUN3_DATA22)")
+Reco_tf.py --multithreaded \
+	   --inputBSFile /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/RecJobTransformTests/data22_900GeV/data22_900GeV.00423110.physics_Main.daq.RAW/data22_900GeV.00423110.physics_Main.daq.RAW._lb0274._SFO-14._0001.data \
+	   --maxEvents=300 \
+	   --conditionsTag=$conditionsTag \
+	   --geometryVersion="ATLAS-R3S-2021-03-01-00"\
+	   --outputESDFile myESD.pool.root \
+	   --outputAODFile myAOD.pool.root \
+	   --outputHISTFile myHist.root
 
 RES=$?
 echo "art-result: $RES Reco"
diff --git a/Reconstruction/RecExample/RecJobTransformTests/test/test_mc23_heavy_ion.sh b/Reconstruction/RecExample/RecJobTransformTests/test/test_mc23_heavy_ion.sh
index e9085bb75e41cd1d5496d27ee6a4176a5ed88486..46b9730381d863e741bbf70d5be4cca4d2818bf8 100755
--- a/Reconstruction/RecExample/RecJobTransformTests/test/test_mc23_heavy_ion.sh
+++ b/Reconstruction/RecExample/RecJobTransformTests/test/test_mc23_heavy_ion.sh
@@ -8,7 +8,7 @@
 
 # TODO update following ATLASRECTS-8054
 export ATHENA_CORE_NUMBER=8
-INPUTFILE=$(python -c "from AthenaConfiguration.TestDefaults import defaultTestFiles; print(defaultTestFiles.HITS_RUN3[0])")
+INPUTFILE=$(python -c "from AthenaConfiguration.TestDefaults import defaultTestFiles; print(defaultTestFiles.HITS_RUN3_HI[0])")
 CONDTAG=$(python -c "from AthenaConfiguration.TestDefaults import defaultConditionsTags; print(defaultConditionsTags.RUN3_MC)")
 
 Reco_tf.py --CA "all:True" --multithreaded --maxEvents=20 --autoConfiguration 'everything' \
diff --git a/Reconstruction/RecExample/RecJobTransformTests/test/test_mc23a_13p6TeV.sh b/Reconstruction/RecExample/RecJobTransformTests/test/test_mc23a_13p6TeV.sh
index 7774cbb14304e4452f4fac020c8bef0dc91d36bc..23e74757c98fff420759c36d5f811f21e422ae99 100755
--- a/Reconstruction/RecExample/RecJobTransformTests/test/test_mc23a_13p6TeV.sh
+++ b/Reconstruction/RecExample/RecJobTransformTests/test/test_mc23a_13p6TeV.sh
@@ -8,10 +8,10 @@
 # art-include: 24.0/Athena
 
 export ATHENA_CORE_NUMBER=8
-INPUTFILE=$(python -c "from AthenaConfiguration.TestDefaults import defaultTestFiles; print(defaultTestFiles.HITS_RUN3[0])")
+INPUTFILE=$(python -c "from AthenaConfiguration.TestDefaults import defaultTestFiles; print(defaultTestFiles.HITS_RUN3_2022[0])")
 CONDTAG=$(python -c "from AthenaConfiguration.TestDefaults import defaultConditionsTags; print(defaultConditionsTags.RUN3_MC)")
 GEOTAG=$(python -c "from AthenaConfiguration.TestDefaults import defaultGeometryTags; print(defaultGeometryTags.RUN3)")
-BKGFILE=$(python -c "from AthenaConfiguration.TestDefaults import defaultTestFiles; print(defaultTestFiles.RDO_BKG_RUN3[0])")
+BKGFILE=$(python -c "from AthenaConfiguration.TestDefaults import defaultTestFiles; print(defaultTestFiles.RDO_BKG_RUN3_2022[0])")
 
 Reco_tf.py --CA "default:True" "RDOtoRDOTrigger:False" \
            --multithreaded --maxEvents=300 \
diff --git a/Reconstruction/RecExample/RecJobTransformTests/test/test_mc23d_13p6TeV.sh b/Reconstruction/RecExample/RecJobTransformTests/test/test_mc23d_13p6TeV.sh
index 14725abc997539670d641c03a5a64496f1d64081..709e5867f1f10db5580b828d14f517869f513019 100755
--- a/Reconstruction/RecExample/RecJobTransformTests/test/test_mc23d_13p6TeV.sh
+++ b/Reconstruction/RecExample/RecJobTransformTests/test/test_mc23d_13p6TeV.sh
@@ -8,10 +8,10 @@
 # art-include: 24.0/Athena
 
 export ATHENA_CORE_NUMBER=8
-INPUTFILE=$(python -c "from AthenaConfiguration.TestDefaults import defaultTestFiles; print(defaultTestFiles.HITS_RUN3[0])")
+INPUTFILE=$(python -c "from AthenaConfiguration.TestDefaults import defaultTestFiles; print(defaultTestFiles.HITS_RUN3_2023[0])")
 CONDTAG=$(python -c "from AthenaConfiguration.TestDefaults import defaultConditionsTags; print(defaultConditionsTags.RUN3_MC)")
 GEOTAG=$(python -c "from AthenaConfiguration.TestDefaults import defaultGeometryTags; print(defaultGeometryTags.RUN3)")
-BKGFILE=$(python -c "from AthenaConfiguration.TestDefaults import defaultTestFiles; print(defaultTestFiles.RDO_BKG_RUN3[0])")
+BKGFILE=$(python -c "from AthenaConfiguration.TestDefaults import defaultTestFiles; print(defaultTestFiles.RDO_BKG_RUN3_2023[0])")
 
 #TODO update input files from mc23d campaign when available
 
diff --git a/Reconstruction/eflowRec/src/PFTrackPreselAlg.cxx b/Reconstruction/eflowRec/src/PFTrackPreselAlg.cxx
index 88cb344401697496485be012d6b01cb7772b35e3..d9af3ca4fdf99170eee504fe82860b97eb397685 100644
--- a/Reconstruction/eflowRec/src/PFTrackPreselAlg.cxx
+++ b/Reconstruction/eflowRec/src/PFTrackPreselAlg.cxx
@@ -1,17 +1,14 @@
 /*
-  Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2025 CERN for the benefit of the ATLAS collaboration
 */
 
 #include "PFTrackPreselAlg.h"
 #include "StoreGate/ReadHandle.h"
 #include "StoreGate/WriteHandle.h"
+#include "StoreGate/WriteDecorHandle.h"
 #include "AthContainers/ConstDataVector.h"
 #include <memory>
 
-namespace {
-  const SG::AuxElement::Decorator<char> decPass("passPFTrackPresel");
-}
-
 PFTrackPreselAlg::PFTrackPreselAlg(const std::string& name, ISvcLocator* pSvcLocator)
   : AthReentrantAlgorithm(name, pSvcLocator)
 {
@@ -23,7 +20,12 @@ StatusCode PFTrackPreselAlg::initialize()
 {
   ATH_CHECK( m_inputTracksKey.initialize() );
   ATH_CHECK( m_outputTracksKey.initialize() );
+
+  m_outputDecorKey = m_inputTracksKey.key()+"."+m_outputDecorKey.key();
+  ATH_CHECK( m_outputDecorKey.initialize() );
+
   ATH_CHECK( m_trackSelTool.retrieve() );
+
   return StatusCode::SUCCESS;
 }
 
@@ -35,6 +37,9 @@ StatusCode PFTrackPreselAlg::execute(const EventContext &ctx) const
     ATH_MSG_ERROR("Failed to retrieve " << m_inputTracksKey);
     return StatusCode::FAILURE;
   }
+
+  SG::WriteDecorHandle<xAOD::TrackParticleContainer, char> decPass(m_outputDecorKey, ctx);
+
   auto output = std::make_unique<ConstDataVector<xAOD::TrackParticleContainer>>(SG::VIEW_ELEMENTS);
   for (const xAOD::TrackParticle* itrk : *input)
   {
@@ -48,5 +53,6 @@ StatusCode PFTrackPreselAlg::execute(const EventContext &ctx) const
   }
   auto outputHandle = SG::makeHandle(m_outputTracksKey, ctx);
   ATH_CHECK(outputHandle.put(std::move(output)) != nullptr);
+
   return StatusCode::SUCCESS;
 }
diff --git a/Reconstruction/eflowRec/src/PFTrackPreselAlg.h b/Reconstruction/eflowRec/src/PFTrackPreselAlg.h
index 3d3d923dceaeef7981b156d8ee149b63c1a49cdc..217a1c907d58d0b22104b1ef951028a6729d5592 100644
--- a/Reconstruction/eflowRec/src/PFTrackPreselAlg.h
+++ b/Reconstruction/eflowRec/src/PFTrackPreselAlg.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2025 CERN for the benefit of the ATLAS collaboration
 */
 #ifndef EFLOWREC_PFTRACKPRESELALG_H
 #define EFLOWREC_PFTRACKPRESELALG_H
@@ -7,6 +7,7 @@
 #include "AthenaBaseComps/AthReentrantAlgorithm.h"
 #include "StoreGate/ReadHandleKey.h"
 #include "StoreGate/WriteHandleKey.h"
+#include "StoreGate/WriteDecorHandleKey.h"
 #include "xAODTracking/TrackParticleContainer.h"
 #include "GaudiKernel/ToolHandle.h"
 #include "InDetTrackSelectionTool/IInDetTrackSelectionTool.h"
@@ -31,6 +32,8 @@ class PFTrackPreselAlg : public AthReentrantAlgorithm {
       this, "InputTracks", "", "The input track selection"};
     SG::WriteHandleKey<xAOD::TrackParticleContainer> m_outputTracksKey{
       this, "OutputTracks", "", "The output preselected track collection"};
+    SG::WriteDecorHandleKey<xAOD::TrackParticleContainer> m_outputDecorKey{
+      this, "OutputDecor" , "passPFTrackPresel", "Output decoration"};
     ToolHandle<InDet::IInDetTrackSelectionTool> m_trackSelTool{
       this, "TrackSelTool", "", "The track selection tool"};
     Gaudi::Property<float> m_upperPtCut{
diff --git a/Simulation/Overlay/OverlayConfiguration/python/OverlayTestHelpers.py b/Simulation/Overlay/OverlayConfiguration/python/OverlayTestHelpers.py
index 35dfbdfac89d7b0f01690ff64d5366d9dd78bc7f..4442fc397a2685bb91a1611b31e5c8239015d406 100644
--- a/Simulation/Overlay/OverlayConfiguration/python/OverlayTestHelpers.py
+++ b/Simulation/Overlay/OverlayConfiguration/python/OverlayTestHelpers.py
@@ -68,8 +68,8 @@ def overlayTestFlags(flags, args):
             from Campaigns import MC20e
             MC20e(flags)
         elif args.run is LHCPeriod.Run3:
-            flags.Input.Files = defaultTestFiles.RDO_BKG_RUN3
-            flags.Input.SecondaryFiles = defaultTestFiles.HITS_RUN3
+            flags.Input.Files = defaultTestFiles.RDO_BKG_RUN3_2022
+            flags.Input.SecondaryFiles = defaultTestFiles.HITS_RUN3_2022
             flags.IOVDb.GlobalTag = defaultConditionsTags.RUN3_MC
             from Campaigns import MC23a
             MC23a(flags)
diff --git a/Simulation/Tests/DigitizationTestsMT/test/test_Digi_tf_mc23d_presampling_variable_MP.sh b/Simulation/Tests/DigitizationTestsMT/test/test_Digi_tf_mc23d_presampling_variable_MP.sh
new file mode 100755
index 0000000000000000000000000000000000000000..6605fdb2b58731a9ef0f70fea2db03071bd97f82
--- /dev/null
+++ b/Simulation/Tests/DigitizationTestsMT/test/test_Digi_tf_mc23d_presampling_variable_MP.sh
@@ -0,0 +1,63 @@
+#!/bin/bash
+#
+# art-description: Run a digitization example of mc23d presampling
+# art-type: grid
+# art-architecture:  '#x86_64-intel'
+# art-memory: 4096
+# art-athena-mt: 8
+# art-include: 24.0/Athena
+# art-include: main/Athena
+# art-output: mc23d_presampling.VarBS.RDO.pool.root
+# art-output: log.*
+# art-output: DigiPUConfig*
+
+if [ -z ${ATLAS_REFERENCE_DATA+x} ]; then
+  ATLAS_REFERENCE_DATA="/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art"
+fi
+
+Events=100
+DigiOutFileName="mc23d_presampling.VarBS.RDO.pool.root"
+HSHitsFile="${ATLAS_REFERENCE_DATA}/CampaignInputs/mc23/HITS/mc23_13p6TeV.900149.PG_single_nu_Pt50.simul.HITS.e8514_e8528_s4153/10000events.HITS.pool.root"
+HighPtMinbiasHitsFiles1="${ATLAS_REFERENCE_DATA}/CampaignInputs/mc23/HITS/mc23_13p6TeV.800831.Py8EG_minbias_inelastic_highjetphotonlepton.merge.HITS.e8514_e8528_s4154_s4120/*"
+HighPtMinbiasHitsFiles2="${ATLAS_REFERENCE_DATA}/CampaignInputs/mc23/HITS/mc23_13p6TeV.800831.Py8EG_minbias_inelastic_highjetphotonlepton.merge.HITS.e8514_e8528_s4155_s4120/*"
+HighPtMinbiasHitsFiles3="${ATLAS_REFERENCE_DATA}/CampaignInputs/mc23/HITS/mc23_13p6TeV.800831.Py8EG_minbias_inelastic_highjetphotonlepton.merge.HITS.e8514_e8528_s4156_s4120/*"
+HighPtMinbiasHitsFiles4="${ATLAS_REFERENCE_DATA}/CampaignInputs/mc23/HITS/mc23_13p6TeV.800831.Py8EG_minbias_inelastic_highjetphotonlepton.merge.HITS.e8514_e8528_s4157_s4120/*"
+LowPtMinbiasHitsFiles1="${ATLAS_REFERENCE_DATA}/CampaignInputs/mc23/HITS/mc23_13p6TeV.900311.Epos_minbias_inelastic_lowjetphoton.merge.HITS.e8514_e8528_s4154_s4120/*"
+LowPtMinbiasHitsFiles2="${ATLAS_REFERENCE_DATA}/CampaignInputs/mc23/HITS/mc23_13p6TeV.900311.Epos_minbias_inelastic_lowjetphoton.merge.HITS.e8514_e8528_s4155_s4120/*"
+LowPtMinbiasHitsFiles3="${ATLAS_REFERENCE_DATA}/CampaignInputs/mc23/HITS/mc23_13p6TeV.900311.Epos_minbias_inelastic_lowjetphoton.merge.HITS.e8514_e8528_s4156_s4120/*"
+LowPtMinbiasHitsFiles4="${ATLAS_REFERENCE_DATA}/CampaignInputs/mc23/HITS/mc23_13p6TeV.900311.Epos_minbias_inelastic_lowjetphoton.merge.HITS.e8514_e8528_s4157_s4120/*"
+geometry=$(python -c "from AthenaConfiguration.TestDefaults import defaultGeometryTags; print(defaultGeometryTags.RUN3)")
+conditions=$(python -c "from AthenaConfiguration.TestDefaults import defaultConditionsTags; print(defaultConditionsTags.RUN3_MC)")
+Digi_tf.py \
+     --inputHITSFile ${HSHitsFile} \
+     --outputRDOFile ${DigiOutFileName} \
+     --inputHighPtMinbiasHitsFile ${HighPtMinbiasHitsFiles1} \
+     --inputHighPtMinbiasHitsFile ${HighPtMinbiasHitsFiles2} \
+     --inputHighPtMinbiasHitsFile ${HighPtMinbiasHitsFiles3} \
+     --inputHighPtMinbiasHitsFile ${HighPtMinbiasHitsFiles4} \
+     --inputLowPtMinbiasHitsFile ${LowPtMinbiasHitsFiles1} \
+     --inputLowPtMinbiasHitsFile ${LowPtMinbiasHitsFiles2} \
+     --inputLowPtMinbiasHitsFile ${LowPtMinbiasHitsFiles3} \
+     --inputLowPtMinbiasHitsFile ${LowPtMinbiasHitsFiles4} \
+     --multiprocess \
+     --PileUpPresampling True \
+     --conditionsTag "default:${conditions}" \
+     --geometryVersion "default:${geometry}" \
+     --digiSeedOffset1 170 --digiSeedOffset2 170 \
+     --digiSteeringConf 'StandardSignalOnlyTruth' \
+     --postInclude 'all:PyJobTransforms.UseFrontier' \
+     --preInclude 'HITtoRDO:Campaigns.MC23d' \
+     --splitConfig "HITtoRDO:Campaigns.BeamspotSplitMC23d" \
+     --skipEvents 0 \
+     --jobNumber 568 \
+     --maxEvents ${Events} \
+     --AMITag d1907 \
+     --skipEvents 0
+
+rc=$?
+status=$rc
+echo "art-result: $rc digiCA"
+
+# Initially we are just interested in whether the job still runs
+
+exit $status
diff --git a/TileCalorimeter/TileCalib/TileCalibBlobObjs/TileCalibBlobObjs/TileBchPrbs.h b/TileCalorimeter/TileCalib/TileCalibBlobObjs/TileCalibBlobObjs/TileBchPrbs.h
index 6317d3e6c77cc92436ff4e900327900037c8810b..0b897c5ab87a37d840001d84cbb31fedbe7dac63 100644
--- a/TileCalorimeter/TileCalib/TileCalibBlobObjs/TileCalibBlobObjs/TileBchPrbs.h
+++ b/TileCalorimeter/TileCalib/TileCalibBlobObjs/TileCalibBlobObjs/TileBchPrbs.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2025 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef TILECALIBBLOBOBJS_TILEBCHPRBS_H
@@ -45,6 +45,7 @@ class TileBchPrbs
     NoCis                      = 1103,
     BadCis                     = 1104,
     IgnoredByDQV               = 1105,
+    HalfGain                   = 1106,
 
     //=============================
     //=== Channel
diff --git a/TileCalorimeter/TileCalib/TileCalibBlobObjs/src/TileBchDecoder.cxx b/TileCalorimeter/TileCalib/TileCalibBlobObjs/src/TileBchDecoder.cxx
index 37d53a3bae105b9f1785c4feed4fd2a924ab7087..05e903906060b59af20eb704194fdccd43c4f189 100644
--- a/TileCalorimeter/TileCalib/TileCalibBlobObjs/src/TileBchDecoder.cxx
+++ b/TileCalorimeter/TileCalib/TileCalibBlobObjs/src/TileBchDecoder.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2025 CERN for the benefit of the ATLAS collaboration
 */
 
 #include "TileCalibBlobObjs/TileBchDecoder.h"
@@ -105,6 +105,7 @@ TileBchDecoder::init_BitPat_ofl01()
   m_bitToPrbAdc[12] = TileBchPrbs::SevereStuckBit;
   m_bitToPrbAdc[13] = TileBchPrbs::SevereDataCorruption;
   m_bitToPrbAdc[14] = TileBchPrbs::IgnoredByDQV;
+  m_bitToPrbAdc[15] = TileBchPrbs::HalfGain;
 
   //=== initialize problem to word/bit map
   initPrbToBit();
diff --git a/TileCalorimeter/TileCalib/TileCalibBlobObjs/src/TileBchPrbs.cxx b/TileCalorimeter/TileCalib/TileCalibBlobObjs/src/TileBchPrbs.cxx
index 650cdc3b72037581b5ae702bd4bd80d0a06cd645..5b24ad11635791e14ea6cb5520dbcc4addb943cb 100644
--- a/TileCalorimeter/TileCalib/TileCalibBlobObjs/src/TileBchPrbs.cxx
+++ b/TileCalorimeter/TileCalib/TileCalibBlobObjs/src/TileBchPrbs.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2025 CERN for the benefit of the ATLAS collaboration
 */
 
 
@@ -41,6 +41,7 @@ TileBchPrbs::initPrbDesc()
   prbNames[TileBchPrbs::NoCis                  ] = "No CIS calibration";
   prbNames[TileBchPrbs::BadCis                 ] = "Bad CIS calibration";
   prbNames[TileBchPrbs::IgnoredByDQV           ] = "Ignored by DQV";
+  prbNames[TileBchPrbs::HalfGain               ] = "Half gain";
 
   //=== channel
   prbNames[TileBchPrbs::GeneralMaskChannel     ] = "Channel masked (unspecified)";
diff --git a/Tools/Tier0ChainTests/test/test_bulkProcessing_calib.sh b/Tools/Tier0ChainTests/test/test_bulkProcessing_calib.sh
index 0963d5e3e387ab18dcfe8d2fbf86ef33cbb69344..b7af0529bb44fa2c0c01278296f2cd30dafe822c 100755
--- a/Tools/Tier0ChainTests/test/test_bulkProcessing_calib.sh
+++ b/Tools/Tier0ChainTests/test/test_bulkProcessing_calib.sh
@@ -10,6 +10,7 @@
 # temporary preExec override due to ATLASRECTS-7502
 # TODO update following ATLASRECTS-8054
 
+conditionsTag=$(python -c "from AthenaConfiguration.TestDefaults import defaultConditionsTags; print(defaultConditionsTags.RUN3_DATA22)")
 Reco_tf.py  \
 --AMI f1328  \
 --preExec="flags.DQ.useTrigger=False; flags.DQ.triggerDataAvailable=False; flags.DQ.Steering.doHLTMon=False; flags.DQ.Steering.doTauMon=False;" \
@@ -17,7 +18,7 @@ Reco_tf.py  \
 --outputAODFile="AOD.pool.root" \
 --outputESDFile="ESD.pool.root" \
 --outputHISTFile="HIST.root" \
---conditionsTag="CONDBR2-BLKPA-2022-15" \
+--conditionsTag=$conditionsTag \
 --imf False
 
 rc1=$?
diff --git a/Tools/Tier0ChainTests/test/test_bulkProcessing_cosmic.sh b/Tools/Tier0ChainTests/test/test_bulkProcessing_cosmic.sh
index b02ca36ee668cd8d1403a0f2185e38ae7e65c1f4..6cfe7adf353cafe1d7e03854116192a6ee3a1caa 100755
--- a/Tools/Tier0ChainTests/test/test_bulkProcessing_cosmic.sh
+++ b/Tools/Tier0ChainTests/test/test_bulkProcessing_cosmic.sh
@@ -10,6 +10,7 @@
 # temporary preExec override due to ATLASRECTS-7502
 # TODO update following ATLASRECTS-8054
 
+conditionsTag=$(python -c "from AthenaConfiguration.TestDefaults import defaultConditionsTags; print(defaultConditionsTags.RUN3_DATA22)")
 Reco_tf.py  \
 --AMI f1328  \
 --preExec="flags.DQ.Steering.doTauMon=False;" \
@@ -17,7 +18,7 @@ Reco_tf.py  \
 --outputAODFile="AOD.pool.root" \
 --outputESDFile="ESD.pool.root" \
 --outputHISTFile="HIST.root" \
---conditionsTag="CONDBR2-BLKPA-2022-15" \
+--conditionsTag=$conditionsTag \
 --imf False
 
 rc1=$?
diff --git a/Tools/Tier0ChainTests/test/test_bulkProcessing_data22.sh b/Tools/Tier0ChainTests/test/test_bulkProcessing_data22.sh
index 510be0b3c9284347e6478687b409b6ad81f9faee..c1892240db324f704e4195440afd98369f292236 100755
--- a/Tools/Tier0ChainTests/test/test_bulkProcessing_data22.sh
+++ b/Tools/Tier0ChainTests/test/test_bulkProcessing_data22.sh
@@ -7,6 +7,9 @@
 # art-include: 24.0/Athena
 # art-athena-mt: 8
 
+# TODO update following ATLASRECTS-8054
+
+conditionsTag=$(python -c "from AthenaConfiguration.TestDefaults import defaultConditionsTags; print(defaultConditionsTags.RUN3_DATA22)")
 Reco_tf.py \
 --AMI f1328  \
 --inputBSFile="/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0ChainTests/TCT_Run3/data22_13p6TeV.00437548.physics_Main.daq.RAW._lb1044._SFO-15._0002.data" \
@@ -22,7 +25,7 @@ Reco_tf.py \
 --outputDAOD_L1CALO1File="myDAOD_L1CALO1.pool.root" \
 --outputDESDM_PHOJETFile="myDESDM_PHOJET.pool.root" \
 --outputDRAW_TAULHFile="myDRAW_TAULH.data" \
---conditionsTag="CONDBR2-BLKPA-2022-15" \
+--conditionsTag=$conditionsTag \
 --imf False
 
 rc1=$?
diff --git a/Tools/Tier0ChainTests/test/test_bulkProcessing_data22_900GeV.sh b/Tools/Tier0ChainTests/test/test_bulkProcessing_data22_900GeV.sh
index 6526d542ac548c64289567463fcaea0817f84b1e..e87609f4c668b2fdd5900390348f560466176c2c 100755
--- a/Tools/Tier0ChainTests/test/test_bulkProcessing_data22_900GeV.sh
+++ b/Tools/Tier0ChainTests/test/test_bulkProcessing_data22_900GeV.sh
@@ -9,13 +9,14 @@
 
 # TODO update following ATLASRECTS-8054
 
+conditionsTag=$(python -c "from AthenaConfiguration.TestDefaults import defaultConditionsTags; print(defaultConditionsTags.RUN3_DATA22)")
 Reco_tf.py  \
 --AMI f1328  \
 --inputBSFile="/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0ChainTests/TCT_Run3/data22_900GeV.00424070.express_express.merge.RAW._lb0100._SFO-ALL._0001.1" \
 --outputAODFile="AOD.pool.root" \
 --outputESDFile="ESD.pool.root" \
 --outputHISTFile="HIST.root" \
---conditionsTag="CONDBR2-BLKPA-2022-15" \
+--conditionsTag=$conditionsTag \
 --imf False
 
 rc1=$?
diff --git a/Tools/Tier0ChainTests/test/test_bulkProcessing_data23.sh b/Tools/Tier0ChainTests/test/test_bulkProcessing_data23.sh
index 69decb7ce0f7685dcd5903686cfcc54a82a2ba63..53babbadbd5133e8fa4822ea5d2135280095331a 100755
--- a/Tools/Tier0ChainTests/test/test_bulkProcessing_data23.sh
+++ b/Tools/Tier0ChainTests/test/test_bulkProcessing_data23.sh
@@ -7,6 +7,9 @@
 # art-include: 24.0/Athena
 # art-athena-mt: 8
 
+# TODO update following ATLASRECTS-8054
+
+conditionsTag=$(python -c "from AthenaConfiguration.TestDefaults import defaultConditionsTags; print(defaultConditionsTags.RUN3_DATA23)")
 Reco_tf.py \
 --AMI f1350  \
 --inputBSFile="/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/CampaignInputs/data23/RAW/data23_13p6TeV.00452463.physics_Main.daq.RAW/540events.data23_13p6TeV.00452463.physics_Main.daq.RAW._lb0514._SFO-16._0004.data" \
@@ -21,7 +24,7 @@ Reco_tf.py \
 --outputDAOD_L1CALO1File="myDAOD_L1CALO1.pool.root" \
 --outputDESDM_PHOJETFile="myDESDM_PHOJET.pool.root" \
 --outputDRAW_TAULHFile="myDRAW_TAULH.data" \
---conditionsTag="CONDBR2-BLKPA-2023-05" \
+--conditionsTag=$conditionsTag \
 --imf False
 
 rc1=$?
diff --git a/Tools/Tier0ChainTests/test/test_bulkProcessing_hi23_upc.sh b/Tools/Tier0ChainTests/test/test_bulkProcessing_hi23_upc.sh
index a390698c6d19d1ce7dfad98e98be4fbf41578351..d902794b920cd8de511760da83efccc6d01b5e34 100755
--- a/Tools/Tier0ChainTests/test/test_bulkProcessing_hi23_upc.sh
+++ b/Tools/Tier0ChainTests/test/test_bulkProcessing_hi23_upc.sh
@@ -9,6 +9,7 @@
 
 # TODO update following ATLASRECTS-8054
 
+conditionsTag=$(python -c "from AthenaConfiguration.TestDefaults import defaultConditionsTags; print(defaultConditionsTags.RUN3_DATA23)")
 Reco_tf.py  \
 --AMI f1406 \
 --inputBSFile="/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0ChainTests/TCT_Run3/data23_hi.00462107.physics_UPC.daq.RAW._lb0500._SFO-14._0002.data" \
@@ -16,7 +17,7 @@ Reco_tf.py  \
 --outputESDFile="ESD.pool.root" \
 --outputHISTFile="HIST.root" \
 --maxEvents=1500 \
---conditionsTag="CONDBR2-BLKPA-2022-15" \
+--conditionsTag=$conditionsTag \
 --imf False
 
 rc1=$?
diff --git a/Tools/Tier0ChainTests/test/test_bulkProcessing_splashes.sh b/Tools/Tier0ChainTests/test/test_bulkProcessing_splashes.sh
index 6694b6af050dee9d8cf232eedab3691e5d8b8b61..2dea150b263d5904a378fa7d8645b0fe92d9dd44 100755
--- a/Tools/Tier0ChainTests/test/test_bulkProcessing_splashes.sh
+++ b/Tools/Tier0ChainTests/test/test_bulkProcessing_splashes.sh
@@ -9,13 +9,14 @@
 
 # TODO update following ATLASRECTS-8054
 
+conditionsTag=$(python -c "from AthenaConfiguration.TestDefaults import defaultConditionsTags; print(defaultConditionsTags.RUN3_DATA22)")
 Reco_tf.py  \
 --AMI f1328  \
 --inputBSFile="/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0ChainTests/TCT_Run3/data22_comm.00420624.express_express.merge.RAW._lb1054._SFO-ALL._0001.1" \
 --outputAODFile="AOD.pool.root" \
 --outputESDFile="ESD.pool.root" \
 --outputHISTFile="HIST.root" \
---conditionsTag="CONDBR2-BLKPA-2022-15" \
+--conditionsTag=$conditionsTag \
 --imf False
 
 rc1=$?
diff --git a/Tools/Tier0ChainTests/test/test_drawProcessing_data23.sh b/Tools/Tier0ChainTests/test/test_drawProcessing_data23.sh
index a4561467726df8b1997d21e027a08de3e148d1af..11bc023953d9e9b1bd23142df6cd93347355444b 100755
--- a/Tools/Tier0ChainTests/test/test_drawProcessing_data23.sh
+++ b/Tools/Tier0ChainTests/test/test_drawProcessing_data23.sh
@@ -7,13 +7,16 @@
 # art-include: 24.0/Athena
 # art-athena-mt: 8
 
+# TODO update following ATLASRECTS-8054
+
+conditionsTag=$(python -c "from AthenaConfiguration.TestDefaults import defaultConditionsTags; print(defaultConditionsTags.RUN3_DATA23)")
 Reco_tf.py \
 --AMI f1350  \
 --inputBSFile="/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/CampaignInputs/data23/DRAW_EGZ/data23_13p6TeV.00456714.physics_Main.merge.DRAW_EGZ.f1370_m2193/312events.data23_13p6TeV.00456714.physics_Main.merge.DRAW_EGZ.f1370_m2193._0602.1" \
 --outputDESDM_ALLCELLSFile="myDESDM_EGZ.pool.root" \
 --outputDAOD_L1CALO1File="myDAOD_L1CALO1EGZ.pool.root" \
 --maxEvents 75 \
---conditionsTag="CONDBR2-BLKPA-2022-15" \
+--conditionsTag=$conditionsTag \
 --imf False
 rc1=$?
 echo "art-result: $rc1 Reco DRAW_EGZ"
@@ -24,7 +27,7 @@ Reco_tf.py \
 --outputAODFile="myDAOD_ZMUMU.pool.root" \
 --outputDAOD_L1CALO1File="myDAOD_L1CALO1ZMM.pool.root" \
 --maxEvents 75 \
---conditionsTag="CONDBR2-BLKPA-2022-15" \
+--conditionsTag=$conditionsTag \
 --imf False
 rc2=$?
 echo "art-result: $rc2 Reco DRAW_ZMUMU"
diff --git a/Tools/TrfTestsART/test/test_trf_data22_hybrid_ca.sh b/Tools/TrfTestsART/test/test_trf_data22_hybrid_ca.sh
index 39d62af4b617cb36cc838b66db9b91166a361186..07c58af3ba82d82412a19b2ada890b955864d088 100755
--- a/Tools/TrfTestsART/test/test_trf_data22_hybrid_ca.sh
+++ b/Tools/TrfTestsART/test/test_trf_data22_hybrid_ca.sh
@@ -6,7 +6,7 @@
 # art-include: 24.0/Athena
 # art-athena-mt: 8
 
-conditions=$(python -c "from AthenaConfiguration.TestDefaults import defaultConditionsTags; print(defaultConditionsTags.RUN3_DATA22")
+conditionsTag=$(python -c "from AthenaConfiguration.TestDefaults import defaultConditionsTags; print(defaultConditionsTags.RUN3_DATA22)")
 timeout 64800 Reco_tf.py \
   --inputBSFile=/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0ChainTests/TCT_Run3/data22_13p6TeV.00431493.physics_Main.daq.RAW._lb0525._SFO-16._0001.data \
   --outputAODFile=myAOD.pool.root \
@@ -18,7 +18,7 @@ timeout 64800 Reco_tf.py \
   --athenaopts="--nprocs=2 --threads=4" \
   --preExec 'flags.Exec.FPE=10' \
   --autoConfiguration="everything" \
-  --conditionsTag "${conditions}" \
+  --conditionsTag "all:${conditionsTag}" \
   --geometryVersion="all:ATLAS-R3S-2021-03-00-00" \
   --runNumber="431493" \
   --maxEvents='100'
diff --git a/Tools/TrfTestsART/test/test_trf_data22_mt_ca.sh b/Tools/TrfTestsART/test/test_trf_data22_mt_ca.sh
index 6c940ca61f4d880f1154b74db7e42202b54a087a..47288ae2c67a2b9e5130549480b36732d258b268 100755
--- a/Tools/TrfTestsART/test/test_trf_data22_mt_ca.sh
+++ b/Tools/TrfTestsART/test/test_trf_data22_mt_ca.sh
@@ -6,7 +6,7 @@
 # art-include: 24.0/Athena
 # art-athena-mt: 8
 
-conditions=$(python -c "from AthenaConfiguration.TestDefaults import defaultConditionsTags; print(defaultConditionsTags.RUN3_DATA22)")
+conditionsTag=$(python -c "from AthenaConfiguration.TestDefaults import defaultConditionsTags; print(defaultConditionsTags.RUN3_DATA22)")
 timeout 64800 Reco_tf.py \
   --inputBSFile=/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0ChainTests/TCT_Run3/data22_13p6TeV.00431493.physics_Main.daq.RAW._lb0525._SFO-16._0001.data \
   --outputAODFile=myAOD.pool.root \
@@ -18,7 +18,7 @@ timeout 64800 Reco_tf.py \
   --multithreaded='True' \
   --preExec 'flags.Exec.FPE=10' \
   --autoConfiguration="everything" \
-  --conditionsTag "${conditions}" \
+  --conditionsTag "all:${conditionsTag}" \
   --geometryVersion="all:ATLAS-R3S-2021-03-00-00" \
   --runNumber="431493" \
   --maxEvents='-1'
diff --git a/Tools/TrfTestsART/test/test_trf_data23_mt_ca.sh b/Tools/TrfTestsART/test/test_trf_data23_mt_ca.sh
index 13e459965a5c2ae42ee158c9e49f64563254af5b..f9737ef278eecbe01d84eb6b7660fab5b9a2898a 100755
--- a/Tools/TrfTestsART/test/test_trf_data23_mt_ca.sh
+++ b/Tools/TrfTestsART/test/test_trf_data23_mt_ca.sh
@@ -6,7 +6,7 @@
 # art-include: 24.0/Athena
 # art-athena-mt: 8
 
-conditions=$(python -c "from AthenaConfiguration.TestDefaults import defaultConditionsTags; print(defaultConditionsTags.RUN3_DATA23)")
+conditionsTag=$(python -c "from AthenaConfiguration.TestDefaults import defaultConditionsTags; print(defaultConditionsTags.RUN3_DATA23)")
 timeout 64800 Reco_tf.py \
   --inputBSFile=/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/CampaignInputs/data23/RAW/data23_13p6TeV.00452463.physics_Main.daq.RAW/540events.data23_13p6TeV.00452463.physics_Main.daq.RAW._lb0514._SFO-16._0004.data \
   --outputAODFile="myAOD.pool.root" \
@@ -21,7 +21,7 @@ timeout 64800 Reco_tf.py \
   --multithreaded='True' \
   --preExec 'flags.Exec.FPE=10' \
   --autoConfiguration="everything" \
-  --conditionsTag "${conditions}" \
+  --conditionsTag "all:${conditionsTag}" \
   --geometryVersion="all:ATLAS-R3S-2021-03-02-00" \
   --maxEvents='-1'
 
diff --git a/Tracking/TrkTools/TrkMaterialProvider/src/TrkMaterialProviderTool.cxx b/Tracking/TrkTools/TrkMaterialProvider/src/TrkMaterialProviderTool.cxx
index a873f038602c43f5a5c53e0fa9c84d6a47ea3970..1802b97b59a3b91f43edb48872903e5bcc677ae8 100644
--- a/Tracking/TrkTools/TrkMaterialProvider/src/TrkMaterialProviderTool.cxx
+++ b/Tracking/TrkTools/TrkMaterialProvider/src/TrkMaterialProviderTool.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2025 CERN for the benefit of the ATLAS collaboration
 */
 
 #include "TrkMaterialProviderTool.h"
@@ -39,8 +39,6 @@ void myLocal_resetTrack(Trk::Track& track )
 Trk::TrkMaterialProviderTool::TrkMaterialProviderTool(const std::string& t, const std::string& n, const IInterface* p)
   :	AthAlgTool(t,n,p),
 	m_DetID(nullptr),
-	m_calorimeterVolume(nullptr),
-	m_indetVolume(nullptr),
 	m_maxNTracksIso(2),
 	m_paramPtCut(15.0*Gaudi::Units::GeV),
 	m_useCaloEnergyMeasurement(true),
@@ -100,13 +98,13 @@ Trk::TrkMaterialProviderTool::initialize()
 
   ATH_CHECK(m_trackingVolumesSvc.retrieve());
 
-  m_calorimeterVolume = new Trk::Volume(m_trackingVolumesSvc->volume(Trk::ITrackingVolumesSvc::MuonSpectrometerEntryLayer));
+  m_calorimeterVolume = std::make_unique<Trk::Volume>(m_trackingVolumesSvc->volume(Trk::ITrackingVolumesSvc::MuonSpectrometerEntryLayer));
   if(!m_calorimeterVolume) {
     ATH_MSG_ERROR("Unable to retrieve MuonSpectrometerEntryLayer volume");
     return StatusCode::FAILURE;
   }
 
-  m_indetVolume = new Trk::Volume(m_trackingVolumesSvc->volume(Trk::ITrackingVolumesSvc::CalorimeterEntryLayer));
+  m_indetVolume = std::make_unique<Trk::Volume>(m_trackingVolumesSvc->volume(Trk::ITrackingVolumesSvc::CalorimeterEntryLayer));
   if(!m_indetVolume) {
     ATH_MSG_ERROR("Unable to retrieve CalorimeterEntryLayer volume");
     return StatusCode::FAILURE;
diff --git a/Tracking/TrkTools/TrkMaterialProvider/src/TrkMaterialProviderTool.h b/Tracking/TrkTools/TrkMaterialProvider/src/TrkMaterialProviderTool.h
index 1e11e86787b7a006adbbe2ae8a2e863c8fe55e0e..413ffe920e5623125f65fcf67b4bf75b6181dea5 100644
--- a/Tracking/TrkTools/TrkMaterialProvider/src/TrkMaterialProviderTool.h
+++ b/Tracking/TrkTools/TrkMaterialProvider/src/TrkMaterialProviderTool.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2025 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef TrkMaterialProviderTool_H
@@ -36,6 +36,8 @@
 #include "MuidInterfaces/IMuidCaloEnergyParam.h"
 #include "MuidInterfaces/IMuidTrackIsolation.h"
 
+#include<memory>
+
 namespace Trk {
   class Surface;
 }
@@ -211,8 +213,8 @@ namespace Trk{
 	"MuonCaloEnergyTool", ""};
 
     const AtlasDetectorID *m_DetID;
-    const Trk::Volume* m_calorimeterVolume;
-    const Trk::Volume* m_indetVolume;
+    std::unique_ptr<Trk::Volume> m_calorimeterVolume;
+    std::unique_ptr<Trk::Volume> m_indetVolume;
 
     // Read handle for conditions object to get the field cache
     SG::ReadCondHandleKey<AtlasFieldCacheCondObj> m_fieldCacheCondObjInputKey {this, "AtlasFieldCacheCondObj", "fieldCondObj",
diff --git a/Trigger/TrigAlgorithms/TrigGenericAlgs/src/EndOfEventROIConfirmerAlg.cxx b/Trigger/TrigAlgorithms/TrigGenericAlgs/src/EndOfEventROIConfirmerAlg.cxx
index 5bab0825440778b418d3a2b101f297c814dfeeef..3bedfcd3ae914299022caa7ad55a74b6a1d9ce80 100644
--- a/Trigger/TrigAlgorithms/TrigGenericAlgs/src/EndOfEventROIConfirmerAlg.cxx
+++ b/Trigger/TrigAlgorithms/TrigGenericAlgs/src/EndOfEventROIConfirmerAlg.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2025 CERN for the benefit of the ATLAS collaboration
 */
 
 
@@ -20,8 +20,12 @@ StatusCode EndOfEventROIConfirmerAlg::initialize() {
 StatusCode EndOfEventROIConfirmerAlg::execute(const EventContext& context) const {
   ATH_MSG_DEBUG( "EndOfEventROIConfirmerAlg::execute()" );
 
+  SG::ReadHandleKey<TrigRoiDescriptorCollection> rhk("temp");
+  ATH_CHECK( rhk.initialize() );
+
   for (const auto& whk : m_writeHandleKeyArray_ROIs) {
-    SG::ReadHandle<TrigRoiDescriptorCollection> readHandle( whk.key() );
+    rhk = whk.key();  // update the key
+    auto readHandle = SG::makeHandle(rhk, context);
     if ( readHandle.isValid() ) {
       ATH_MSG_DEBUG( "The " << whk.key() << " already present - this chain must have run as part of the trigger in this event" );
     } else {
diff --git a/Trigger/TrigAlgorithms/TrigT2CaloCommon/src/TrigCaloDataAccessSvc.cxx b/Trigger/TrigAlgorithms/TrigT2CaloCommon/src/TrigCaloDataAccessSvc.cxx
index 673412306d46a0df25cf5302f042f774be0de19c..6985fe1ed1fc087b5d06833f0353200e4184811d 100644
--- a/Trigger/TrigAlgorithms/TrigT2CaloCommon/src/TrigCaloDataAccessSvc.cxx
+++ b/Trigger/TrigAlgorithms/TrigT2CaloCommon/src/TrigCaloDataAccessSvc.cxx
@@ -64,6 +64,7 @@ StatusCode TrigCaloDataAccessSvc::finalize() {
       cache->d0cells->clear();
       delete cache->d0cells;
       cache->lastFSEvent = 0xFFFFFFFF;
+      for (unsigned int i : m_insertedCells) delete cache->fullcont->at(i);
       delete cache->fullcont;
   } // end of for slots
   } // end of m_lateInitDone
@@ -156,7 +157,7 @@ StatusCode TrigCaloDataAccessSvc::loadCollections ( const EventContext& context,
           const std::vector<TileCellCollection*>::const_iterator it =
                   (tilecell->find(requestHashIDs[i]));
           TileCellCollection* col = *it;
-          if ( col == NULL ) continue;
+          if ( col == nullptr ) continue;
           TileCellCollection::const_iterator itt = (*it)->begin();
           TileCellCollection::const_iterator End = (*it)->end();
           for (;itt!=End;++itt){
@@ -476,6 +477,8 @@ unsigned int TrigCaloDataAccessSvc::lateInit(const EventContext& context) { // n
 		  } else {
 			 cachefullcont->at(i) = new LArCell(el,0,0,0,(CaloGain::CaloGain)0);
 		  }
+
+		  if (slot==0) m_insertedCells.push_back(i);
                 }
         }
 
@@ -597,7 +600,7 @@ unsigned int TrigCaloDataAccessSvc::convertROBs( const EventContext& context,
           const std::vector<TileCellCollection*>::const_iterator it =
                   (tilecell->find(rIds[i]));
           TileCellCollection* col = *it;
-          if ( robFrags1.size()!=0 && col != NULL ) {
+          if ( robFrags1.size()!=0 && col != nullptr ) {
             size_t roddatasize = robFrags1[0]->rod_ndata();
             // insert data into vector (to be removed soon)
             if (roddatasize < 3) {
diff --git a/Trigger/TrigAlgorithms/TrigT2CaloCommon/src/TrigCaloDataAccessSvc.h b/Trigger/TrigAlgorithms/TrigT2CaloCommon/src/TrigCaloDataAccessSvc.h
index 3b94a04a70235ac8622ea289e55326199e760ce9..9702aa806b2264bfc99cea8cf33407ca4b1aa702 100644
--- a/Trigger/TrigAlgorithms/TrigT2CaloCommon/src/TrigCaloDataAccessSvc.h
+++ b/Trigger/TrigAlgorithms/TrigT2CaloCommon/src/TrigCaloDataAccessSvc.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2025 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef TrigT2CaloCommon_TrigCaloDataAccessSvc_h
@@ -140,6 +140,8 @@ class TrigCaloDataAccessSvc : public extends<AthService, ITrigCaloDataAccessSvc>
     unsigned int lastFSEvent;
   };
 
+  // cells created in lateInit which must be deleted in finalize
+  std::vector<unsigned int> m_insertedCells;
   
   SG::SlotSpecificObj< HLTCaloEventCache > m_hLTCaloSlot;
 
@@ -199,5 +201,3 @@ class TrigCaloDataAccessSvc : public extends<AthService, ITrigCaloDataAccessSvc>
 
 
 #endif
-
-
diff --git a/Trigger/TrigEvent/TrigRoiConversion/src/RoiWriter.cxx b/Trigger/TrigEvent/TrigRoiConversion/src/RoiWriter.cxx
index 4a714ac0d08fd920098f8cba1d9130779c037194..8173fc753f54d0615954f888772745f4e78a246d 100644
--- a/Trigger/TrigEvent/TrigRoiConversion/src/RoiWriter.cxx
+++ b/Trigger/TrigEvent/TrigRoiConversion/src/RoiWriter.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2025 CERN for the benefit of the ATLAS collaboration
 */
 //
 //   @file    RoiWriter.cxx
@@ -30,7 +30,7 @@ RoiWriter::RoiWriter( const std::string& name, ISvcLocator* pSvcLocator )
    : AthReentrantAlgorithm( name, pSvcLocator ) {
 }
 
-StatusCode RoiWriter::execute(const EventContext& /*ctx*/) const {
+StatusCode RoiWriter::execute(const EventContext& ctx) const {
 
    ATH_MSG_DEBUG( "In execute()..." );
 
@@ -43,16 +43,23 @@ StatusCode RoiWriter::execute(const EventContext& /*ctx*/) const {
 
    bool just_dandy = true;
 
+   // Create handle keys for use in the loop:
+   SG::ReadHandleKey< TrigRoiDescriptorCollection > rhk("temp");
+   SG::WriteHandleKey< xAOD::RoiDescriptorStore >   whk("temp");
+   ATH_CHECK( rhk.initialize() && whk.initialize() );
+
    // Loop over these container(s):
    for( const std::string& key : keys ) {
+      // Update key to read from:
+      rhk = key;
 
       // Construct the key of the new container:
-      const std::string newKey = ( ( key.find( prefix ) == 0 ) ?
-                                   ( newPrefix + key.substr( prefix.size() ) ) :
-                                   key );
+      whk = ( ( key.find( prefix ) == 0 ) ?
+              ( newPrefix + key.substr( prefix.size() ) ) :
+              key );
 
-      SG::ReadHandle< TrigRoiDescriptorCollection > rh(key);
-      SG::WriteHandle< xAOD::RoiDescriptorStore >   wh(newKey);
+      auto rh = SG::makeHandle(rhk, ctx);
+      auto wh = SG::makeHandle(whk, ctx);
 
       /// check object actually points to something - make sure that we do all
       /// collections that we can, and not barf on the first one that might fail  
diff --git a/Trigger/TrigHypothesis/TrigHLTJetHypo/python/TrigJetHypoMonitoringConfig.py b/Trigger/TrigHypothesis/TrigHLTJetHypo/python/TrigJetHypoMonitoringConfig.py
index 6d21b926e8e3a87db9027c9bacb7f2ec6e3f8bf9..e8621a565c1d18eebc7ad22b473168bf60f20dcd 100644
--- a/Trigger/TrigHypothesis/TrigHLTJetHypo/python/TrigJetHypoMonitoringConfig.py
+++ b/Trigger/TrigHypothesis/TrigHLTJetHypo/python/TrigJetHypoMonitoringConfig.py
@@ -22,6 +22,12 @@ def TrigJetHypoToolMonitoring(flags, histPath, histFlags):
         montool.defineHistogram('dipz_z', title='DIPZ z;z (mm)', xbins=100, xmin=-50, xmax=50, path='EXPERT', type='TH1F' )
         montool.defineHistogram('dipz_negLogSigma2', title='DIPZ negLogSigma2;negLogSigma2', xbins=100, xmin=-20, xmax=5, path='EXPERT', type='TH1F' )
         montool.defineHistogram('NJets', title='Jet multiplicity;N(jets)', xbins=30, xmin=-0.5, xmax=29.5, path='EXPERT', type='TH1F' )   
+    if ('a10sd' in histFlags):
+        montool.defineHistogram("GN2Xv01_phbb", title='GN2X_phbb; p_{Hbb}', xbins=50, xmin=0, xmax=1, path='EXPERT', type='TH1F')
+        montool.defineHistogram("GN2Xv01_phcc", title='GN2X_phcc; p_{Hcc}', xbins=50, xmin=0, xmax=1, path='EXPERT', type='TH1F')
+        montool.defineHistogram("GN2Xv01_ptop", title='GN2X_ptop; p_{top}', xbins=50, xmin=0, xmax=1, path='EXPERT', type='TH1F')
+        montool.defineHistogram("GN2Xv01_pqcd", title='GN2X_pqcd; p_{QCD}', xbins=50, xmin=0, xmax=1, path='EXPERT', type='TH1F')
+        montool.defineHistogram("GN2Xv01_discriminant", title='GN2Xv01 discriminant (fcc=0, ftop=0.25); GN2Xv01 discriminant', xbins=50, xmin=-30, xmax=30, path='EXPERT', type='TH1F')
     return montool
 
 
@@ -41,4 +47,4 @@ def TrigJetCRHypoToolMonitoring(histPath):
     montool.defineHistogram('jet_tr_pt', title="Jet track pt;tr_pt",  xbins = default_bin_count, xmin=0, xmax=1000, path='EXPERT', type='TH1F')
     montool.defineHistogram('jet_tr_DR', title="Jet track dr;track dr", xbins = default_bin_count, xmin=0, xmax=1, path='EXPERT', type='TH1F')
 
-    return montool
\ No newline at end of file
+    return montool
diff --git a/Trigger/TrigHypothesis/TrigHLTJetHypo/python/scenario_simple.py b/Trigger/TrigHypothesis/TrigHLTJetHypo/python/scenario_simple.py
index 59497588363e489dcab998399372a9ae93b3a819..d006f9989c655e0da546f9007cf38464f38656de 100644
--- a/Trigger/TrigHypothesis/TrigHLTJetHypo/python/scenario_simple.py
+++ b/Trigger/TrigHypothesis/TrigHLTJetHypo/python/scenario_simple.py
@@ -144,10 +144,10 @@ def get_condition_args_from_chainpart(cp):
                 #This dictionary maps the bdips efficiency into the WP cut to be applied to the DIPS output
                 gn2x_WPs = {
                     '':   float('-inf'),
-                    '60': 3.1077,
-                    '70': 2.2998,
-                    '80': 1.2486,
-                    '90': -0.4298,
+                    '79': 3.1077,
+                    '86': 2.2998,
+                    '91': 1.2486,
+                    '96': -0.4298,
                 }
 
                 assert (values[0] in gn2x_WPs.keys()),f"The efficiency of the specified gn2x cut \'{v}\' can not be found in the WP dictionary. Please add or remove the WP from the dips WP dictionary."
diff --git a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigJetHypoTool.cxx b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigJetHypoTool.cxx
index 27b7f1e3412353c5545f57ea7b926642081caaea..8a8c5fd2aba8f8513756306c6ba42a8034a02dd3 100644
--- a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigJetHypoTool.cxx
+++ b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigJetHypoTool.cxx
@@ -202,7 +202,26 @@ TrigJetHypoTool::decide(const xAOD::JetContainer* jets,
     j->getAttribute("dipz20231122_negLogSigma2", this_negLogSigma2);
     auto mon_dipz_z = Monitored::Scalar( "dipz_z", this_z);
     auto mon_dipz_negLogSigma2 = Monitored::Scalar( "dipz_negLogSigma2", this_negLogSigma2);    
-    auto monitor_group_passingjets = Monitored::Group( m_monTool, mon_jetEt, mon_jetEta, mon_jetPhi , mon_dipz_z, mon_dipz_negLogSigma2);
+    float this_GN2X_phbb{999.}, this_GN2X_phcc{999.}, this_GN2X_pqcd{999.}, this_GN2X_ptop{999.};
+    j->getAttribute("GN2Xv01_phbb", this_GN2X_phbb);
+    j->getAttribute("GN2Xv01_phcc", this_GN2X_phcc);
+    j->getAttribute("GN2Xv01_ptop", this_GN2X_ptop);
+    j->getAttribute("GN2Xv01_pqcd", this_GN2X_pqcd);
+    auto mon_GN2X_phbb = Monitored::Scalar("GN2Xv01_phbb", this_GN2X_phbb);
+    auto mon_GN2X_phcc = Monitored::Scalar("GN2Xv01_phcc", this_GN2X_phcc);
+    auto mon_GN2X_ptop = Monitored::Scalar("GN2Xv01_ptop", this_GN2X_ptop);
+    auto mon_GN2X_pqcd = Monitored::Scalar("GN2Xv01_pqcd", this_GN2X_pqcd);
+    float this_GN2X_discriminant{999.};
+    if (this_GN2X_phbb > 0.){
+        float top_frac{0.25};
+        float denom = this_GN2X_pqcd*(1. - top_frac) + this_GN2X_ptop * top_frac;
+        if (denom > 0.){
+            this_GN2X_discriminant = log(this_GN2X_phbb/denom);
+        }
+    }
+    auto mon_GN2X_discriminant = Monitored::Scalar("GN2Xv01_discriminant", this_GN2X_discriminant);
+    auto monitor_group_passingjets = Monitored::Group( m_monTool, mon_jetEt, mon_jetEta, mon_jetPhi , mon_dipz_z, mon_dipz_negLogSigma2, mon_jetMass, mon_GN2X_phbb, mon_GN2X_phcc, mon_GN2X_ptop, mon_GN2X_pqcd, mon_GN2X_discriminant);
+
   }
   //monitor the passing jets for each leg (there should only be one per chain!)
   auto legInds = jetCollector.legInds();
diff --git a/Trigger/TrigSteer/TrigOutputHandling/src/HLTEDMCreator.cxx b/Trigger/TrigSteer/TrigOutputHandling/src/HLTEDMCreator.cxx
index 3ed868eafa53b9f6a230eee2f750b2dbf4ced8ff..8c10a3990c7056317fde6e63aaacee7e21dc808a 100644
--- a/Trigger/TrigSteer/TrigOutputHandling/src/HLTEDMCreator.cxx
+++ b/Trigger/TrigSteer/TrigOutputHandling/src/HLTEDMCreator.cxx
@@ -1,6 +1,6 @@
 
 /*
-  Copyright (C) 2002-2023 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2025 CERN for the benefit of the ATLAS collaboration
 */
 
 
@@ -263,7 +263,7 @@ StatusCode  HLTEDMCreator::viewsMerge( ViewContainer const& views, const SG::Rea
 }
 
  
-StatusCode HLTEDMCreator::fixLinks() const {
+StatusCode HLTEDMCreator::fixLinks( EventContext const& context ) const {
   if ( m_fixLinks.value().empty() ) {
     ATH_MSG_DEBUG("fixLinks: No collections defined for this tool");
     return StatusCode::SUCCESS;
@@ -273,6 +273,11 @@ StatusCode HLTEDMCreator::fixLinks() const {
 
   // Do the remapping
   int writeHandleArrayIndex = -1;
+
+  // Create a HandleKey that we can re-use during the loop (slightly better performance)
+  SG::ReadHandleKey<xAOD::TrigCompositeContainer> readHandleKey("temp");
+  ATH_CHECK( readHandleKey.initialize() );
+
   for ( const auto& writeHandleKey: m_TrigCompositeContainer ) {
     // Check if we are re-mapping this handle
     const bool doFixLinks = std::any_of(m_fixLinks.begin(), m_fixLinks.end(), [&](const std::string& s) { return s == writeHandleKey.key(); } );
@@ -285,17 +290,21 @@ StatusCode HLTEDMCreator::fixLinks() const {
     ++writeHandleArrayIndex;
 
     ATH_MSG_DEBUG("Fixing links: confirm collection is there: " << writeHandleKey.key() << ", write handle array index: " << writeHandleArrayIndex);
-    SG::ReadHandle<xAOD::TrigCompositeContainer> readHandle( writeHandleKey.key() );
+    // Update key name
+    readHandleKey = writeHandleKey.key();
+    auto readHandle = SG::makeHandle(readHandleKey, context);
     if ( not readHandle.isValid() ) { // object missing, this is now an error as we should have literally just created it
-      ATH_MSG_ERROR("  Collection is not present. " << writeHandleKey.key() << " should have been created by createIfMissing.");
+      ATH_MSG_ERROR("Collection is not present. " << readHandleKey.key() << " should have been created by createIfMissing.");
       return StatusCode::FAILURE;
     }
 
     ATH_MSG_DEBUG("Collection exists with size " << readHandle->size() << " Decision objects" );
     ATH_MSG_DEBUG("Adding decorations: " << m_remapLinkColKeys.at( writeHandleArrayIndex ).key() << " and " << m_remapLinkColIndices.at( writeHandleArrayIndex ).key() );
     
-    SG::WriteDecorHandle<xAOD::TrigCompositeContainer, std::vector<SG::sgkey_t> > keyDecor( m_remapLinkColKeys.at( writeHandleArrayIndex ) );
-    SG::WriteDecorHandle<xAOD::TrigCompositeContainer, std::vector<xAOD::TrigComposite::index_type> > indexDecor( m_remapLinkColIndices.at( writeHandleArrayIndex ) );
+    SG::WriteDecorHandle<xAOD::TrigCompositeContainer, std::vector<SG::sgkey_t> >
+      keyDecor(m_remapLinkColKeys.at( writeHandleArrayIndex ), context );
+    SG::WriteDecorHandle<xAOD::TrigCompositeContainer, std::vector<xAOD::TrigComposite::index_type> >
+      indexDecor( m_remapLinkColIndices.at( writeHandleArrayIndex ), context );
 
     // Examine each input TC
     int decisionObjectIndex = -1;
@@ -349,15 +358,26 @@ StatusCode HLTEDMCreator::fixLinks() const {
 template<typename T, typename STORE, typename G, typename M>
 StatusCode HLTEDMCreator::createIfMissing( const EventContext& context, const ConstHandlesGroup<T>& handles, G& generator, M merger ) const {
 
+  // Declare a ReadHandleKey that we can re-use during the loop for reading.
+  SG::ReadHandleKey<T> rhk("temp");
+
+  // Same for the Aux store. If there is none (void) this would not compile
+  // so we just define a dummy RHK, which will never be used, of type T again.
+  using AuxType = std::conditional_t<std::is_void_v<STORE>, T, STORE>;
+  SG::ReadHandleKey<AuxType> rhkAux("temp");
+
+  ATH_CHECK( rhk.initialize() && rhkAux.initialize() );
+
   for (size_t i = 0; i < handles.out.size(); ++i) {
-    SG::WriteHandleKey<T> writeHandleKey = handles.out.at(i);
+    const SG::WriteHandleKey<T>& whk = handles.out.at(i);
+    rhk = whk.key();  // set the RHK to the same key as the WHK
 
     if ( handles.views.empty() ) { // no merging will be needed
       // Note: This is correct. We are testing if we can read, and if we cannot then we write.
       // What we write will either be a dummy (empty) container, or be populated from N in-View collections.
-      SG::ReadHandle<T> readHandle( writeHandleKey.key() );
+      auto readHandle = SG::makeHandle( rhk, context );
       if ( readHandle.isValid() ) {
-        ATH_MSG_VERBOSE( writeHandleKey.key() << " is already present" );
+        ATH_MSG_VERBOSE( rhk.key() << " is already present" );
         generator.create(false, false);
 
         // For xAOD types we need to ensure there is an Aux store. This can happen if the
@@ -365,15 +385,17 @@ StatusCode HLTEDMCreator::createIfMissing( const EventContext& context, const Co
         // The TriggerEDMDeserialiserAlg will already have created a DataLink to the Aux store
         // for the interface container. Now we just need to create an empty Aux store.
         if constexpr (!std::is_void_v<STORE>) {
-          SG::ReadHandle<STORE> readAuxHandle( writeHandleKey.key() + "Aux." );
+          rhkAux = rhk.key() + "Aux.";
+          auto readAuxHandle = SG::makeHandle(rhkAux, context);
           if ( !readAuxHandle.isValid() ) {
-            SG::WriteHandle<STORE> writeAuxHandle( writeHandleKey.key() + "Aux." );
-            ATH_MSG_DEBUG("Creating missing Aux store for " << writeHandleKey.key());
+            // This is rare so we just create a WH as needed:
+            SG::WriteHandle<STORE> writeAuxHandle( rhkAux.key(), context );
+            ATH_MSG_DEBUG("Creating missing Aux store for " << rhk.key());
             ATH_CHECK( writeAuxHandle.record(std::make_unique<STORE>()) );
           }
         }
       } else {
-        ATH_MSG_DEBUG( writeHandleKey.key() << " is missing, creating it" );
+        ATH_MSG_DEBUG( rhk.key() << " is missing, creating it" );
         generator.create(true, true);
       }
 
@@ -388,28 +410,27 @@ StatusCode HLTEDMCreator::createIfMissing( const EventContext& context, const Co
       if ( handles.out.size() == 1  ) {
       	generator.create(true, true);
       } else  {
-        const bool doCreate = i == 0 or handles.out.at(i-1).key() != handles.out.at(i).key();
-        const bool doRecord = i == handles.out.size()-1 or handles.out.at(i+1).key() != handles.out.at(i).key();
+        const bool doCreate = i == 0 or handles.out.at(i-1).key() != whk.key();
+        const bool doRecord = i == handles.out.size()-1 or handles.out.at(i+1).key() != whk.key();
         ATH_MSG_DEBUG( "Instructing generator " <<  (doCreate ? "to" : "NOT TO") <<  " create collection and " << (doRecord ? "to" : "NOT TO") << " record collection in this iteration");
         generator.create(doCreate, doRecord);
       }
 
-      SG::ReadHandleKey<ViewContainer> viewsReadHandleKey = handles.views.at(i);
+      const SG::ReadHandleKey<ViewContainer>& viewsReadHandleKey = handles.views.at(i);
       ATH_MSG_DEBUG("Will be trying to merge from the " << viewsReadHandleKey.key() << " view container into that output");
 
       auto viewsHandle = SG::makeHandle( viewsReadHandleKey, context );
       if ( viewsHandle.isValid() ) {
-        SG::ReadHandleKey<T> inViewReadHandleKey = handles.in.at(i);
+        const SG::ReadHandleKey<T>& inViewReadHandleKey = handles.in.at(i);
         ATH_MSG_DEBUG("Will be merging from " << viewsHandle->size() << " views using in-view key " << inViewReadHandleKey.key() );
         ATH_CHECK( (this->*merger)( *viewsHandle, inViewReadHandleKey , context, *generator.data.get() ) );
       } else {
-        ATH_MSG_DEBUG("Views " << viewsReadHandleKey.key() << " are missing. Will leave " << writeHandleKey.key() << " output collection empty.");
+        ATH_MSG_DEBUG("Views " << viewsReadHandleKey.key() << " are missing. Will leave " << whk.key() << " output collection empty.");
       }
 
       // Also consider probe variants of each EventView.
       // Not every container will have a corresponding set of (typically) lower-pT probe ROIs, but it's safer to always test.
-      static const std::string probe_suffix = "_probe";
-      const std::string viewsReadHandleKeyProbe = viewsReadHandleKey.key() + probe_suffix;
+      const std::string viewsReadHandleKeyProbe = viewsReadHandleKey.key() + "_probe";
       ATH_MSG_VERBOSE("Will try to merge from the " << viewsReadHandleKeyProbe <<  " view container into that output");
 
       // Falling back to direct SG access here to avoid uninitiated key errors. This is safe to do in the context of the Trigger ControlFlow.
@@ -419,7 +440,7 @@ StatusCode HLTEDMCreator::createIfMissing( const EventContext& context, const Co
         ATH_CHECK(evtStore()->retrieve(viewsContainer_probe, viewsReadHandleKeyProbe));
       }
       if ( viewsContainer_probe ) {
-        SG::ReadHandleKey<T> inViewReadHandleKey = handles.in.at(i);
+        const SG::ReadHandleKey<T>& inViewReadHandleKey = handles.in.at(i);
         ATH_MSG_DEBUG("Will be merging from " << viewsContainer_probe->size() << " probe views using in-view key " << inViewReadHandleKey.key() );
         ATH_CHECK( (this->*merger)( *viewsContainer_probe, inViewReadHandleKey , context, *generator.data.get() ) );
       } else {
@@ -428,7 +449,7 @@ StatusCode HLTEDMCreator::createIfMissing( const EventContext& context, const Co
 
     }
 
-    auto writeHandle = SG::makeHandle( writeHandleKey, context );
+    auto writeHandle = SG::makeHandle( whk, context );
     ATH_CHECK( generator.record( writeHandle ) );
   }
 
@@ -505,7 +526,7 @@ StatusCode HLTEDMCreator::createOutput(const EventContext& context) const {
   CREATE_XAOD( MuonRoIContainer, MuonRoIAuxContainer );
 
   // After view collections are merged, need to update collection links
-  ATH_CHECK( fixLinks() );
+  ATH_CHECK( fixLinks(context) );
   
 #undef CREATE_XAOD
 
diff --git a/Trigger/TrigSteer/TrigOutputHandling/src/HLTEDMCreator.h b/Trigger/TrigSteer/TrigOutputHandling/src/HLTEDMCreator.h
index 833a93bebba449397024fec9bada6fbf48498f1d..3d4b6740b3ac4ab5408d1aacd9e29f9ed4491a91 100644
--- a/Trigger/TrigSteer/TrigOutputHandling/src/HLTEDMCreator.h
+++ b/Trigger/TrigSteer/TrigOutputHandling/src/HLTEDMCreator.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2023 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2025 CERN for the benefit of the ATLAS collaboration
 */
 #ifndef TRIGOUTPUTHANDLING_HLTEDMCREATOR_H
 #define TRIGOUTPUTHANDLING_HLTEDMCREATOR_H 1
@@ -223,7 +223,7 @@ class HLTEDMCreator: public extends<AthAlgTool, IHLTOutputTool>  {
     const SG::ReadHandleKeyArray< ViewContainer >& views;
   };
 
-  StatusCode fixLinks() const;
+  StatusCode fixLinks( EventContext const& context ) const;
 
   template<typename T, typename STORE, typename G, typename M >
     StatusCode createIfMissing( const EventContext& context, const ConstHandlesGroup<T>& handles, 
diff --git a/Trigger/TrigT1/TrigT1CaloMonitoring/python/EfexInputMonitorAlgorithm.py b/Trigger/TrigT1/TrigT1CaloMonitoring/python/EfexInputMonitorAlgorithm.py
index 32353b2d3da4e313ef3d41524ef129c37abfb46a..9928d783bd0dcbe26157b110ecff296ba07ddbc8 100644
--- a/Trigger/TrigT1/TrigT1CaloMonitoring/python/EfexInputMonitorAlgorithm.py
+++ b/Trigger/TrigT1/TrigT1CaloMonitoring/python/EfexInputMonitorAlgorithm.py
@@ -95,7 +95,7 @@ def EfexInputMonitoringConfig(flags):
     for layer in ["ecal","hcal"]:
         helper.defineHistogram(f'TowerEta,TowerPhi;h_dataTowers_{layer}_hot_EtaPhiMap',title=f'{layer.upper()} SuperCells >= 500MeV;#eta;#phi',
                                cutmask="AboveCut",
-                               path="Expert/Inputs/eFEX",
+                               paths=["Expert/Inputs/eFEX","Shifter/Inputs/eFEX"],
                                hanConfig={"algorithm":f"Efex_{layer}_hot_etaPhiMapOutliers","description":f"Check <a href='./detail/h_dataTowers_{layer}_hot_posVsLBN'>detail plot</a> to get timeseries for each location"},
                                fillGroup=layer,
                                type='TH2I',
diff --git a/Trigger/TrigT1/TrigT1CaloMonitoring/share/L1CaloPhase1Monitoring.py b/Trigger/TrigT1/TrigT1CaloMonitoring/share/L1CaloPhase1Monitoring.py
index a38d4107656848633789f7534b24330c21eec649..ba57f3405851f7f8334d0dc3733f9325f3e47873 100644
--- a/Trigger/TrigT1/TrigT1CaloMonitoring/share/L1CaloPhase1Monitoring.py
+++ b/Trigger/TrigT1/TrigT1CaloMonitoring/share/L1CaloPhase1Monitoring.py
@@ -95,7 +95,7 @@ parser.add_argument('--lumiBlock',default=None,help="specify to select a lumiBlo
 parser.add_argument('--evtNumber',default=None,nargs="+",type=int,help="specify to select an evtNumber")
 parser.add_argument('--stream',default="*",help="stream to lookup files in")
 parser.add_argument('--fexReadoutFilter',action='store_true',help="If specified, will skip events without fexReadout")
-parser.add_argument('--dbOverrides',default=None,nargs="+",type=str,help="specify overrides of COOL database folders in form <folder>=<dbPath>, example: /TRIGGER/L1Calo/V1/Calibration/EfexEnergyCalib=mytest.db ")
+parser.add_argument('--dbOverrides',default=None,nargs="+",type=str,help="specify overrides of COOL database folders in form <folder>=<dbPath> or <folder>:<tag>[=<dbPath>] to override a tag, example: /TRIGGER/L1Calo/V1/Calibration/EfexEnergyCalib=mytest.db ")
 parser.add_argument('--postConfig',default=[],nargs="+",type=str,help="specify component properties to apply at the end of the config")
 args = flags.fillFromArgs(parser=parser)
 if args.runNumber is not None:
@@ -399,14 +399,23 @@ if type(args.dbOverrides)==list:
   #cfg.merge( addOverride(flags, folder="/TRIGGER/L1Calo/V1/Calibration/EfexNoiseCuts", db="sqlite://;schema=/afs/cern.ch/user/w/will/calib.sqlite;dbname=L1CALO",tag="" ) )
   for override in args.dbOverrides:
     print(override)
-    folderName,dbPath = override.split("=",1)
+    folderName,dbPath = override.split("=",1) if "=" in override else (override,"")
     if folderName == "": raise ValueError("Cannot parse dbOverride: " + override)
-    if ";dbname=" not in dbPath: dbPath += ";dbname=CONDBR2"
-    dbPath,dbInst = dbPath.split(";dbname=")
-    if not os.path.exists(dbPath): raise ValueError("dbOverride file doesn't exist: " + dbPath)
+    db = ""
+    if dbPath != "":
+      if ";dbname=" not in dbPath: dbPath += ";dbname=CONDBR2"
+      dbPath,dbInst = dbPath.split(";dbname=")
+      if not os.path.exists(dbPath): raise ValueError("dbOverride file doesn't exist: " + dbPath)
+      db = f"sqlite://;schema={dbPath};dbname={dbInst}"
+    tag = ""
+    if ":" in folderName:
+      folderName,tag = folderName.split(":",1)
     if folderName[0] != "/": folderName = "/TRIGGER/L1Calo/V1/Calibration/" + folderName
-    log.info(" ".join(("Overriding COOL folder:",folderName,dbPath,dbInst)))
-    cfg.merge( addOverride(flags,folder=folderName,db=f"sqlite://;schema={dbPath};dbname={dbInst}",tag=""))
+    log.info(" ".join(("Overriding COOL folder:",folderName,db,tag)))
+    if db=="":
+      cfg.merge( addOverride(flags,folder=folderName,tag=tag))
+    else:
+      cfg.merge( addOverride(flags,folder=folderName,db=db,tag=tag))
 
 
 # configure output AOD if requested
diff --git a/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref b/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref
index a17afb7aa16165110721b0d0cce3aa700ae0d7a5..f82115fde57140d98e5d47366cf98c5950654a2a 100644
--- a/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref
+++ b/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref
@@ -430,6 +430,10 @@ HLT_2e12_lhloose_mu10_L12eEM10L_MU8F:
   eventCount: 0
   stepFeatures:
     0: 2
+HLT_2e17_dnnloose_L12eEM18M:
+  eventCount: 0
+  stepFeatures:
+    0: 2
 HLT_2e17_idperf_loose_L12eEM18M:
   eventCount: 0
   stepFeatures:
@@ -462,6 +466,10 @@ HLT_2e17_lhvloose_g50_loose_probe_L12eEM18M:
   eventCount: 0
   stepFeatures:
     0: 2
+HLT_2e24_dnnloose_L12eEM24L:
+  eventCount: 0
+  stepFeatures:
+    0: 1
 HLT_2e24_lhvloose_L12eEM24L:
   eventCount: 0
   stepFeatures:
@@ -488,6 +496,8 @@ HLT_2e24_lhvloose_g50_loose_probe_L12eEM24L:
     0: 1
 HLT_2e5_lhmedium_j70_j50a_j0_DJMASS900j50_L1jMJJ-500-NFF:
   eventCount: 0
+  stepFeatures:
+    0: 1
 HLT_2e5_lhvloose_L1eEM5_bBeeM6000_L1All:
   eventCount: 0
   stepCounts:
@@ -587,17 +597,17 @@ HLT_2g10_loose_EgammaPEBTLA_L12DR15-M70-2eEM9L:
 HLT_2g10_loose_L1eEM9_mu20_L1MU14FCH:
   eventCount: 0
   stepCounts:
-    0: 3
+    0: 4
   stepFeatures:
-    0: 15
-    1: 4
+    0: 24
+    1: 6
 HLT_2g10_loose_L1eEM9_mu23_L1MU18VFCH:
   eventCount: 0
   stepCounts:
-    0: 3
+    0: 4
   stepFeatures:
-    0: 15
-    1: 4
+    0: 24
+    1: 6
 HLT_2g10_medium_EgammaPEBTLA_L12DR15-M70-2eEM9L:
   eventCount: 0
   stepCounts:
@@ -606,9 +616,19 @@ HLT_2g10_medium_EgammaPEBTLA_L12DR15-M70-2eEM9L:
     0: 3
     1: 1
 HLT_2g13_loose_EgammaPEBTLA_L113DR25-25M70-2eEM12L:
-  eventCount: 0
-  stepFeatures:
+  eventCount: 1
+  stepCounts:
     0: 1
+    1: 1
+    2: 1
+    3: 1
+    4: 1
+  stepFeatures:
+    0: 2
+    1: 2
+    2: 2
+    3: 2
+    4: 2
 HLT_2g13_loose_EgammaPEBTLA_L12DR15-0M30-2eEM12L:
   eventCount: 0
 HLT_2g13_loose_EgammaPEBTLA_L12DR15-M70-2eEM12L:
@@ -619,9 +639,17 @@ HLT_2g13_loose_EgammaPEBTLA_L12DR15-M70-2eEM12L:
     0: 2
     1: 1
 HLT_2g13_loose_L113DR25-25M70-2eEM12L:
-  eventCount: 0
-  stepFeatures:
+  eventCount: 1
+  stepCounts:
     0: 1
+    1: 1
+    2: 1
+    3: 1
+  stepFeatures:
+    0: 2
+    1: 2
+    2: 2
+    3: 2
 HLT_2g13_loose_L12DR15-0M30-2eEM12L:
   eventCount: 0
 HLT_2g13_medium_EgammaPEBTLA_L12DR15-M70-2eEM12L:
@@ -634,32 +662,38 @@ HLT_2g13_medium_EgammaPEBTLA_L12DR15-M70-2eEM12L:
 HLT_2g15_loose_25dphiAA_invmAA80_L12eEM9:
   eventCount: 0
   stepCounts:
-    0: 11
-    1: 1
-    2: 1
-  stepFeatures:
-    0: 32
-    1: 8
+    0: 15
+    1: 2
     2: 2
-    3: 1
+  stepFeatures:
+    0: 39
+    1: 11
+    2: 4
+    3: 2
 HLT_2g15_loose_25dphiAA_invmAA80_L1DPHI-M70-2eEM15M:
   eventCount: 0
 HLT_2g15_tight_25dphiAA_L12eEM9:
   eventCount: 0
   stepCounts:
-    0: 9
+    0: 13
+    1: 1
+    2: 1
   stepFeatures:
-    0: 28
-    1: 7
+    0: 35
+    1: 10
+    2: 2
 HLT_2g15_tight_25dphiAA_L1DPHI-M70-2eEM15M:
   eventCount: 0
 HLT_2g15_tight_25dphiAA_invmAA80_L12eEM9:
   eventCount: 0
   stepCounts:
-    0: 9
+    0: 13
+    1: 1
+    2: 1
   stepFeatures:
-    0: 28
-    1: 7
+    0: 35
+    1: 10
+    2: 2
 HLT_2g15_tight_25dphiAA_invmAA80_L1DPHI-M70-2eEM15M:
   eventCount: 0
 HLT_2g15_tight_L1DPHI-M70-2eEM15M:
@@ -685,13 +719,6 @@ HLT_2g20_tight_icaloloose_L12eEM18M:
   stepFeatures:
     0: 3
     1: 1
-HLT_2g20_tight_icaloloose_ringer_L12eEM18M:
-  eventCount: 0
-  stepCounts:
-    0: 1
-  stepFeatures:
-    0: 3
-    1: 1
 HLT_2g22_tight_L12eEM18M:
   eventCount: 0
   stepCounts:
@@ -707,13 +734,17 @@ HLT_2g22_tight_L1eEM9_EMPTY:
   eventCount: 0
 HLT_2g22_tight_L1eEM9_UNPAIRED_ISO:
   eventCount: 0
-HLT_2g22_tight_ringer_L12eEM18M:
+HLT_2g22_tight_noringer_L12eEM18M:
   eventCount: 0
   stepCounts:
-    0: 1
+    0: 2
+    1: 2
+    2: 1
   stepFeatures:
-    0: 3
-    1: 1
+    0: 5
+    1: 4
+    2: 3
+    3: 1
 HLT_2g25_loose_g15_loose_L12eEM24L:
   eventCount: 0
   stepFeatures:
@@ -722,10 +753,6 @@ HLT_2g50_loose_L12eEM24L:
   eventCount: 0
   stepFeatures:
     0: 2
-HLT_2g50_loose_ringer_L12eEM24L:
-  eventCount: 0
-  stepFeatures:
-    0: 2
 HLT_2g50_tight_L12eEM9_EMPTY:
   eventCount: 0
 HLT_2g50_tight_L1eEM15_EMPTY:
@@ -735,31 +762,40 @@ HLT_2g50_tight_L1eEM9_EMPTY:
 HLT_2g50_tight_L1eEM9_UNPAIRED_ISO:
   eventCount: 0
 HLT_2g9_loose_25dphiAA_invmAA80_L12eEM9:
-  eventCount: 0
+  eventCount: 1
   stepCounts:
-    0: 11
-    1: 7
-    2: 7
+    0: 17
+    1: 11
+    2: 11
+    3: 1
   stepFeatures:
-    0: 33
-    1: 21
-    2: 21
-    3: 4
+    0: 66
+    1: 41
+    2: 40
+    3: 10
 HLT_2g9_loose_25dphiAA_invmAA80_L1DPHI-M70-2eEM9:
-  eventCount: 0
+  eventCount: 1
   stepCounts:
-    0: 3
-    1: 3
-    2: 3
+    0: 5
+    1: 4
+    2: 4
+    3: 1
   stepFeatures:
-    0: 8
-    1: 6
-    2: 6
-    3: 2
+    0: 19
+    1: 13
+    2: 12
+    3: 4
 HLT_2g9_loose_25dphiAA_invmAA80_L1DPHI-M70-2eEM9L:
   eventCount: 0
-  stepFeatures:
+  stepCounts:
     0: 1
+    1: 1
+    2: 1
+  stepFeatures:
+    0: 3
+    1: 3
+    2: 4
+    3: 1
 HLT_2j100_2timeSig15_L1jJ90:
   eventCount: 0
 HLT_2j100_2timeSig_L1jJ90:
@@ -807,21 +843,21 @@ HLT_2j175_mb_afprec_afpdijet_L1jJ160:
     0: 4
     1: 2
 HLT_2j20_2j20_0eta290_boffperf_pf_ftf_presel2c20XX2c20b85_PhysicsTLA_L1jJ85p0ETA21_3jJ40p0ETA25:
-  eventCount: 9
+  eventCount: 10
   stepCounts:
-    0: 11
-    1: 9
-    2: 9
-    3: 9
-    4: 9
-    5: 9
+    0: 12
+    1: 10
+    2: 10
+    3: 10
+    4: 10
+    5: 10
   stepFeatures:
-    0: 22
-    1: 18
-    2: 107
-    3: 53
-    4: 107
-    5: 18
+    0: 24
+    1: 20
+    2: 117
+    3: 58
+    4: 117
+    5: 20
 HLT_2j20_2j20_0eta290_boffperf_pf_ftf_presel2j25XX2j25b85_PhysicsTLA_L14jJ40p0ETA25:
   eventCount: 3
   stepCounts:
@@ -839,109 +875,109 @@ HLT_2j20_2j20_0eta290_boffperf_pf_ftf_presel2j25XX2j25b85_PhysicsTLA_L14jJ40p0ET
     4: 25
     5: 6
 HLT_2j20_2j20_pf_ftf_presel1c20XX2c20bgtwo85_PhysicsTLA_L1jJ85p0ETA21_3jJ40p0ETA25:
-  eventCount: 6
+  eventCount: 7
   stepCounts:
-    0: 14
-    1: 8
-    2: 6
-    3: 6
-    4: 6
+    0: 15
+    1: 9
+    2: 7
+    3: 7
+    4: 7
   stepFeatures:
-    0: 28
-    1: 16
-    2: 64
-    3: 64
-    4: 12
+    0: 30
+    1: 18
+    2: 74
+    3: 74
+    4: 14
 HLT_2j20_2j20_pf_ftf_presel2c20XX2c20b80_PhysicsTLA_L1jJ85p0ETA21_3jJ40p0ETA25:
-  eventCount: 6
+  eventCount: 7
   stepCounts:
-    0: 11
-    1: 6
-    2: 6
-    3: 6
-    4: 6
+    0: 12
+    1: 7
+    2: 7
+    3: 7
+    4: 7
   stepFeatures:
-    0: 22
-    1: 12
-    2: 62
-    3: 62
-    4: 12
+    0: 24
+    1: 14
+    2: 72
+    3: 72
+    4: 14
 HLT_2j20_2j20_pf_ftf_presel2c20XX2c20b82_PhysicsTLA_L1jJ85p0ETA21_3jJ40p0ETA25:
-  eventCount: 6
+  eventCount: 7
   stepCounts:
-    0: 11
-    1: 6
-    2: 6
-    3: 6
-    4: 6
+    0: 12
+    1: 7
+    2: 7
+    3: 7
+    4: 7
   stepFeatures:
-    0: 22
-    1: 12
-    2: 62
-    3: 62
-    4: 12
+    0: 24
+    1: 14
+    2: 72
+    3: 72
+    4: 14
 HLT_2j20_2j20_pf_ftf_presel2c20XX2c20b85_DarkJetPEBTLA_L1jJ85p0ETA21_3jJ40p0ETA25:
-  eventCount: 9
+  eventCount: 10
   stepCounts:
-    0: 11
-    1: 9
-    2: 9
-    3: 9
+    0: 12
+    1: 10
+    2: 10
+    3: 10
   stepFeatures:
-    0: 22
-    1: 18
-    2: 108
-    3: 108
+    0: 24
+    1: 20
+    2: 118
+    3: 118
 HLT_2j20_2j20_pf_ftf_presel2c20XX2c20b85_L1jJ85p0ETA21_3jJ40p0ETA25:
-  eventCount: 9
+  eventCount: 10
   stepCounts:
-    0: 11
-    1: 9
-    2: 9
+    0: 12
+    1: 10
+    2: 10
   stepFeatures:
-    0: 22
-    1: 18
-    2: 108
+    0: 24
+    1: 20
+    2: 118
 HLT_2j20_2j20_pf_ftf_presel2c20XX2c20b85_PhysicsTLA_L1jJ85p0ETA21_3jJ40p0ETA25:
-  eventCount: 9
+  eventCount: 10
   stepCounts:
-    0: 11
-    1: 9
-    2: 9
-    3: 9
-    4: 9
+    0: 12
+    1: 10
+    2: 10
+    3: 10
+    4: 10
   stepFeatures:
-    0: 22
-    1: 18
-    2: 108
-    3: 108
-    4: 18
+    0: 24
+    1: 20
+    2: 118
+    3: 118
+    4: 20
 HLT_2j20_2j20_pf_ftf_presel2c20XX2c20bgtwo85_FTagPEBTLA_L1jJ85p0ETA21_3jJ40p0ETA25:
-  eventCount: 6
+  eventCount: 7
   stepCounts:
-    0: 11
-    1: 6
-    2: 6
-    3: 6
+    0: 12
+    1: 7
+    2: 7
+    3: 7
   stepFeatures:
-    0: 22
-    1: 12
-    2: 64
-    3: 64
+    0: 24
+    1: 14
+    2: 74
+    3: 74
 HLT_2j20_2j20_pf_ftf_presel2c20XX2c20bgtwo85_PhysicsTLA_L1jJ85p0ETA21_3jJ40p0ETA25:
-  eventCount: 6
+  eventCount: 7
   stepCounts:
-    0: 11
-    1: 6
-    2: 6
-    3: 6
-    4: 6
+    0: 12
+    1: 7
+    2: 7
+    3: 7
+    4: 7
   stepFeatures:
-    0: 22
-    1: 12
-    2: 64
-    3: 64
-    4: 12
+    0: 24
+    1: 14
+    2: 74
+    3: 74
+    4: 14
 HLT_2j20_2j20_pf_ftf_presel2j25XX2j25b85_PhysicsTLA_L14jJ40p0ETA25:
   eventCount: 3
   stepCounts:
@@ -1025,11 +1061,11 @@ HLT_2j250c_j120c_pf_ftf_presel2j180XXj80_L1jJ160:
     0: 1
   stepFeatures:
     0: 2
-HLT_2j260_a10sd_cssk_70bgntwox_pf_jes_ftf_presel2j225_L1SC111-CjJ40:
+HLT_2j260_a10sd_cssk_86bgntwox_pf_jes_ftf_presel2j225_L1SC111-CjJ40:
   eventCount: 0
-HLT_2j260_a10sd_cssk_70bgntwox_pf_jes_ftf_presel2j225_L1gLJ140p0ETA25:
+HLT_2j260_a10sd_cssk_86bgntwox_pf_jes_ftf_presel2j225_L1gLJ140p0ETA25:
   eventCount: 0
-HLT_2j260_a10sd_cssk_70bgntwox_pf_jes_ftf_presel2j225_L1jJ160:
+HLT_2j260_a10sd_cssk_86bgntwox_pf_jes_ftf_presel2j225_L1jJ160:
   eventCount: 0
 HLT_2j330_35smcINF_a10sd_cssk_pf_jes_ftf_presel2j225_L1SC111-CjJ40:
   eventCount: 0
@@ -1194,53 +1230,53 @@ HLT_2j35c_nnJvtv1_bgn260_2j35c_nnJvtv1_pf_ftf_presel2j25XX2j25bgtwo85_L14jJ40p0E
     2: 24
     3: 4
 HLT_2j40c_020jvt_j25c_020jvt_j20c_020jvt_SHARED_2j20c_020jvt_bgn277_pf_ftf_presel1c20XX2c20bgtwo85_L13jJ40p0ETA25:
-  eventCount: 5
+  eventCount: 6
   stepCounts:
-    0: 15
-    1: 9
-    2: 7
-    3: 5
+    0: 16
+    1: 10
+    2: 8
+    3: 6
   stepFeatures:
-    0: 60
-    1: 36
-    2: 127
-    3: 14
+    0: 64
+    1: 40
+    2: 141
+    3: 16
 HLT_2j40c_020jvt_j25c_020jvt_j20c_020jvt_SHARED_2j20c_020jvt_bgn277_pf_ftf_presel2c20XX2c20bgtwo85_L13jJ40p0ETA25:
-  eventCount: 5
+  eventCount: 6
   stepCounts:
-    0: 12
-    1: 7
-    2: 7
-    3: 5
+    0: 13
+    1: 8
+    2: 8
+    3: 6
   stepFeatures:
-    0: 48
-    1: 28
-    2: 127
-    3: 14
+    0: 52
+    1: 32
+    2: 141
+    3: 16
 HLT_2j40c_020jvt_j25c_020jvt_j20c_020jvt_SHARED_2j20c_020jvt_bgn280_pf_ftf_presel1c20XX2c20bgtwo85_L13jJ40p0ETA25:
-  eventCount: 5
+  eventCount: 6
   stepCounts:
-    0: 15
-    1: 9
-    2: 7
-    3: 5
+    0: 16
+    1: 10
+    2: 8
+    3: 6
   stepFeatures:
-    0: 60
-    1: 36
-    2: 127
-    3: 14
+    0: 64
+    1: 40
+    2: 141
+    3: 16
 HLT_2j40c_020jvt_j25c_020jvt_j20c_020jvt_SHARED_2j20c_020jvt_bgn280_pf_ftf_presel2c20XX2c20bgtwo85_L13jJ40p0ETA25:
-  eventCount: 5
+  eventCount: 6
   stepCounts:
-    0: 12
-    1: 7
-    2: 7
-    3: 5
+    0: 13
+    1: 8
+    2: 8
+    3: 6
   stepFeatures:
-    0: 48
-    1: 28
-    2: 127
-    3: 14
+    0: 52
+    1: 32
+    2: 141
+    3: 16
 HLT_2j45_0eta290_020jvt_bgn160_2j45_pf_ftf_presel2j25XX2j25b85_L14J15p0ETA25:
   eventCount: 0
   stepCounts:
@@ -1438,77 +1474,77 @@ HLT_2j50_0eta290_nnJvtv1_bgn260_2j50_pf_ftf_presel2j25XX2j25bgtwo85_L14jJ40p0ETA
     2: 8
     3: 1
 HLT_2j50c_020jvt_j25c_020jvt_j20c_020jvt_SHARED_2j20c_020jvt_bgn177_pf_ftf_presel1c20XX2c20bgtwo85_L13jJ40p0ETA25:
-  eventCount: 6
+  eventCount: 7
   stepCounts:
-    0: 15
-    1: 9
-    2: 7
-    3: 6
+    0: 16
+    1: 10
+    2: 8
+    3: 7
   stepFeatures:
-    0: 60
-    1: 36
-    2: 122
-    3: 15
+    0: 64
+    1: 40
+    2: 136
+    3: 17
 HLT_2j50c_020jvt_j25c_020jvt_j20c_020jvt_SHARED_2j20c_020jvt_bgn177_pf_ftf_presel2c20XX2c20b85_L13jJ40p0ETA25:
+  eventCount: 7
+  stepCounts:
+    0: 13
+    1: 11
+    2: 11
+    3: 7
+  stepFeatures:
+    0: 52
+    1: 44
+    2: 209
+    3: 20
+HLT_2j50c_020jvt_j25c_020jvt_j20c_020jvt_SHARED_2j20c_020jvt_bgn277_pf_ftf_presel1c20XX2c20bgtwo85_L13jJ40p0ETA25:
   eventCount: 6
   stepCounts:
-    0: 12
+    0: 16
     1: 10
-    2: 10
+    2: 8
     3: 6
   stepFeatures:
-    0: 48
+    0: 64
     1: 40
-    2: 195
-    3: 18
-HLT_2j50c_020jvt_j25c_020jvt_j20c_020jvt_SHARED_2j20c_020jvt_bgn277_pf_ftf_presel1c20XX2c20bgtwo85_L13jJ40p0ETA25:
-  eventCount: 5
-  stepCounts:
-    0: 15
-    1: 9
-    2: 7
-    3: 5
-  stepFeatures:
-    0: 60
-    1: 36
-    2: 122
-    3: 14
+    2: 136
+    3: 16
 HLT_2j50c_020jvt_j25c_020jvt_j20c_020jvt_SHARED_2j20c_020jvt_bgn277_pf_ftf_presel2c20XX2c20bgtwo85_L13jJ40p0ETA25:
-  eventCount: 5
+  eventCount: 6
   stepCounts:
-    0: 12
-    1: 7
-    2: 7
-    3: 5
+    0: 13
+    1: 8
+    2: 8
+    3: 6
   stepFeatures:
-    0: 48
-    1: 28
-    2: 122
-    3: 14
+    0: 52
+    1: 32
+    2: 136
+    3: 16
 HLT_2j50c_020jvt_j25c_020jvt_j20c_020jvt_SHARED_2j20c_020jvt_bgn280_pf_ftf_presel1c20XX2c20bgtwo85_L13jJ40p0ETA25:
-  eventCount: 5
+  eventCount: 6
   stepCounts:
-    0: 15
-    1: 9
-    2: 7
-    3: 5
+    0: 16
+    1: 10
+    2: 8
+    3: 6
   stepFeatures:
-    0: 60
-    1: 36
-    2: 122
-    3: 14
+    0: 64
+    1: 40
+    2: 136
+    3: 16
 HLT_2j50c_020jvt_j25c_020jvt_j20c_020jvt_SHARED_2j20c_020jvt_bgn280_pf_ftf_presel2c20XX2c20bgtwo85_L13jJ40p0ETA25:
-  eventCount: 5
+  eventCount: 6
   stepCounts:
-    0: 12
-    1: 7
-    2: 7
-    3: 5
+    0: 13
+    1: 8
+    2: 8
+    3: 6
   stepFeatures:
-    0: 48
-    1: 28
-    2: 122
-    3: 14
+    0: 52
+    1: 32
+    2: 136
+    3: 16
 HLT_2j55_0eta290_020jvt_bgn160_2j55_pf_ftf_presel2j25XX2j25b85_L14J15p0ETA25:
   eventCount: 0
   stepCounts:
@@ -2873,27 +2909,27 @@ HLT_3j200_pf_ftf_presel3j150_L1gJ400p0ETA25:
 HLT_3j200_pf_ftf_presel3j150_L1jJ160:
   eventCount: 0
 HLT_3j20_1j20_pf_ftf_presel3c20XX1c20bgtwo85_L1jJ85p0ETA21_3jJ40p0ETA25:
-  eventCount: 10
+  eventCount: 11
   stepCounts:
-    0: 11
-    1: 11
-    2: 10
+    0: 12
+    1: 12
+    2: 11
   stepFeatures:
-    0: 22
-    1: 22
-    2: 118
+    0: 24
+    1: 24
+    2: 128
 HLT_3j20c_pf_ftf_presel3c30_PhysicsTLA_L1jJ85p0ETA21_3jJ40p0ETA25:
-  eventCount: 14
+  eventCount: 15
   stepCounts:
-    0: 14
-    1: 14
-    2: 14
-    3: 14
+    0: 15
+    1: 15
+    2: 15
+    3: 15
   stepFeatures:
-    0: 14
-    1: 69
-    2: 69
-    3: 14
+    0: 15
+    1: 73
+    2: 73
+    3: 15
 HLT_3j20c_pf_ftf_presel3c40_PhysicsTLA_L1jJ85p0ETA21_3jJ40p0ETA25:
   eventCount: 13
   stepCounts:
@@ -3050,33 +3086,33 @@ HLT_3j60_0eta290_020jvt_bgn177_pf_ftf_presel3j45b95_L13J35p0ETA23:
 HLT_3j60_0eta290_020jvt_bgn177_pf_ftf_presel3j45b95_L13jJ70p0ETA23:
   eventCount: 0
   stepCounts:
-    0: 4
+    0: 6
     1: 2
     2: 2
   stepFeatures:
-    0: 4
+    0: 6
     1: 2
     2: 6
     3: 3
 HLT_3j60_0eta290_020jvt_bgn277_pf_ftf_presel3j45bgtwo95_L13jJ70p0ETA23:
   eventCount: 0
   stepCounts:
-    0: 4
+    0: 6
     1: 1
     2: 1
   stepFeatures:
-    0: 4
+    0: 6
     1: 1
     2: 3
     3: 2
 HLT_3j60_0eta290_nnJvtv1_bgn277_pf_ftf_presel3j45bgtwo95_L13jJ70p0ETA23:
   eventCount: 0
   stepCounts:
-    0: 4
+    0: 6
     1: 1
     2: 1
   stepFeatures:
-    0: 4
+    0: 6
     1: 1
     2: 3
     3: 2
@@ -3094,11 +3130,11 @@ HLT_3j65_0eta290_020jvt_bgn177_pf_ftf_presel3j45b95_L13J35p0ETA23:
 HLT_3j65_0eta290_020jvt_bgn177_pf_ftf_presel3j45b95_L13jJ70p0ETA23:
   eventCount: 0
   stepCounts:
-    0: 4
+    0: 6
     1: 2
     2: 1
   stepFeatures:
-    0: 4
+    0: 6
     1: 2
     2: 3
     3: 2
@@ -3167,15 +3203,15 @@ HLT_4j20c_L14jJ40p0ETA25:
   stepFeatures:
     0: 29
 HLT_4j25_PhysicsTLA_L1jJ85p0ETA21_3jJ40p0ETA25:
-  eventCount: 11
+  eventCount: 12
   stepCounts:
-    0: 11
-    1: 11
-    2: 11
+    0: 12
+    1: 12
+    2: 12
   stepFeatures:
-    0: 57
-    1: 57
-    2: 11
+    0: 62
+    1: 62
+    2: 12
 HLT_4j35_0eta290_020jvt_bgn177_pf_ftf_presel4j25b95_L14J15p0ETA25:
   eventCount: 0
   stepCounts:
@@ -3738,6 +3774,20 @@ HLT_e10_etcut_L1eEM9:
     3: 62
 HLT_e10_lhmedium_ivarloose_j70_j50a_j0_DJMASS900j50_L1jMJJ-500-NFF:
   eventCount: 0
+  stepCounts:
+    0: 1
+    1: 1
+    2: 1
+    3: 1
+    4: 1
+    5: 1
+  stepFeatures:
+    0: 1
+    1: 1
+    2: 3
+    3: 1
+    4: 1
+    5: 1
 HLT_e10_lhvloose_L1eEM9:
   eventCount: 6
   stepCounts:
@@ -3823,7 +3873,7 @@ HLT_e12_lhloose_L1eEM10L_2mu10_L12MU8F:
 HLT_e12_lhtight_mu11_dRAB15_invmAB10_L1LFV-eEM10L-MU8VF:
   eventCount: 0
 HLT_e140_dnnloose_L1eEM26M:
-  eventCount: 1
+  eventCount: 0
   stepCounts:
     0: 1
     1: 1
@@ -3831,7 +3881,6 @@ HLT_e140_dnnloose_L1eEM26M:
     3: 1
     4: 1
     5: 1
-    6: 1
   stepFeatures:
     0: 1
     1: 1
@@ -3839,9 +3888,8 @@ HLT_e140_dnnloose_L1eEM26M:
     3: 1
     4: 1
     5: 1
-    6: 1
 HLT_e140_dnnloose_L1eEM28M:
-  eventCount: 1
+  eventCount: 0
   stepCounts:
     0: 1
     1: 1
@@ -3849,7 +3897,6 @@ HLT_e140_dnnloose_L1eEM28M:
     3: 1
     4: 1
     5: 1
-    6: 1
   stepFeatures:
     0: 1
     1: 1
@@ -3857,7 +3904,6 @@ HLT_e140_dnnloose_L1eEM28M:
     3: 1
     4: 1
     5: 1
-    6: 1
 HLT_e140_lhloose_L1eEM26M:
   eventCount: 1
   stepCounts:
@@ -4236,6 +4282,10 @@ HLT_e20_lhvloose_L1eEM18L:
     4: 5
     5: 5
     6: 4
+HLT_e24_dnnloose_2e12_dnnloose_L1eEM24L_3eEM12L:
+  eventCount: 0
+  stepFeatures:
+    0: 1
 HLT_e24_lhmedium_g12_loose_g12_loose_02dRAB_02dRAC_02dRBC_L1eEM24L_3eEM12L:
   eventCount: 0
   stepFeatures:
@@ -4386,7 +4436,7 @@ HLT_e25_mergedtight_g35_medium_90invmAB_02dRAB_L12eEM24L:
     5: 2
     6: 1
 HLT_e26_dnntight_ivarloose_L1eEM26M:
-  eventCount: 2
+  eventCount: 1
   stepCounts:
     0: 5
     1: 5
@@ -4394,7 +4444,7 @@ HLT_e26_dnntight_ivarloose_L1eEM26M:
     3: 5
     4: 5
     5: 5
-    6: 2
+    6: 1
   stepFeatures:
     0: 5
     1: 5
@@ -4402,7 +4452,45 @@ HLT_e26_dnntight_ivarloose_L1eEM26M:
     3: 5
     4: 5
     5: 5
-    6: 2
+    6: 1
+HLT_e26_dnntight_ivarloose_e17_dnnloose_probe_L1eEM26M:
+  eventCount: 0
+  stepCounts:
+    0: 5
+    1: 5
+    2: 5
+    3: 5
+    4: 5
+    5: 5
+    6: 1
+  stepFeatures:
+    0: 5
+    1: 5
+    2: 5
+    3: 5
+    4: 5
+    5: 5
+    6: 1
+    7: 1
+HLT_e26_dnntight_ivarloose_e30_dnnloose_nopix_lrtmedium_probe_L1eEM26M:
+  eventCount: 0
+  stepCounts:
+    0: 5
+    1: 5
+    2: 5
+    3: 5
+    4: 5
+    5: 5
+    6: 1
+  stepFeatures:
+    0: 5
+    1: 5
+    2: 5
+    3: 5
+    4: 5
+    5: 5
+    6: 1
+    7: 1
 HLT_e26_etcut_L1eEM26M:
   eventCount: 7
   stepCounts:
@@ -6424,7 +6512,7 @@ HLT_e26_lhtight_ivartight_L1eEM26M:
     5: 5
     6: 3
 HLT_e28_dnntight_ivarloose_L1eEM28M:
-  eventCount: 2
+  eventCount: 1
   stepCounts:
     0: 5
     1: 5
@@ -6432,7 +6520,7 @@ HLT_e28_dnntight_ivarloose_L1eEM28M:
     3: 5
     4: 5
     5: 5
-    6: 2
+    6: 1
   stepFeatures:
     0: 5
     1: 5
@@ -6440,7 +6528,7 @@ HLT_e28_dnntight_ivarloose_L1eEM28M:
     3: 5
     4: 5
     5: 5
-    6: 2
+    6: 1
 HLT_e28_idperf_loose_L1eEM28M:
   eventCount: 5
   stepCounts:
@@ -8577,6 +8665,22 @@ HLT_e50_etcut_L1eEM28M:
     1: 8
     2: 33
     3: 8
+HLT_e5_dnntight_e9_etcut_1invmAB5_L1JPSI-1M5-eEM9:
+  eventCount: 0
+  stepCounts:
+    0: 4
+    1: 4
+    2: 2
+    3: 2
+    4: 2
+    5: 2
+  stepFeatures:
+    0: 32
+    1: 27
+    2: 79
+    3: 12
+    4: 4
+    5: 4
 HLT_e5_etcut_L1eEM5:
   eventCount: 20
   stepCounts:
@@ -8861,6 +8965,20 @@ HLT_e5_lhvloose_e3_lhvloose_bBeeM6000_L1eEM26M:
     6: 4
 HLT_e5_lhvloose_j70_j50a_j0_DJMASS1000j50_xe50_tcpufit_L1jMJJ-500-NFF:
   eventCount: 0
+  stepCounts:
+    0: 1
+    1: 1
+    2: 1
+    3: 1
+    4: 1
+    5: 1
+  stepFeatures:
+    0: 1
+    1: 1
+    2: 3
+    3: 1
+    4: 1
+    5: 1
 HLT_e5_nopid_L1eEM5:
   eventCount: 20
   stepCounts:
@@ -8898,7 +9016,7 @@ HLT_e5_nopid_lrtloose_L1eEM5:
     5: 105
     6: 91
 HLT_e60_dnnmedium_L1eEM26M:
-  eventCount: 1
+  eventCount: 0
   stepCounts:
     0: 2
     1: 2
@@ -8906,7 +9024,6 @@ HLT_e60_dnnmedium_L1eEM26M:
     3: 2
     4: 2
     5: 2
-    6: 1
   stepFeatures:
     0: 2
     1: 2
@@ -8914,9 +9031,8 @@ HLT_e60_dnnmedium_L1eEM26M:
     3: 2
     4: 2
     5: 2
-    6: 1
 HLT_e60_dnnmedium_L1eEM28M:
-  eventCount: 1
+  eventCount: 0
   stepCounts:
     0: 2
     1: 2
@@ -8924,7 +9040,6 @@ HLT_e60_dnnmedium_L1eEM28M:
     3: 2
     4: 2
     5: 2
-    6: 1
   stepFeatures:
     0: 2
     1: 2
@@ -8932,7 +9047,6 @@ HLT_e60_dnnmedium_L1eEM28M:
     3: 2
     4: 2
     5: 2
-    6: 1
 HLT_e60_etcut_L1eEM26M:
   eventCount: 4
   stepCounts:
@@ -9421,17 +9535,17 @@ HLT_g100_loose_L1eEM28M:
     2: 1
     3: 1
 HLT_g10_loose_L1eEM9:
-  eventCount: 6
+  eventCount: 7
   stepCounts:
-    0: 17
-    1: 9
-    2: 9
-    3: 6
+    0: 19
+    1: 12
+    2: 11
+    3: 7
   stepFeatures:
-    0: 33
-    1: 11
-    2: 12
-    3: 6
+    0: 67
+    1: 18
+    2: 18
+    3: 10
 HLT_g120_loose_L1eEM26M:
   eventCount: 1
   stepCounts:
@@ -9469,12 +9583,19 @@ HLT_g120_loose_ringer_L1eEM26M:
     2: 1
     3: 1
 HLT_g13_loose_g10_loose_EgammaPEBTLA_L113DR25-25M70-eEM12LeEM9L:
-  eventCount: 0
+  eventCount: 1
   stepCounts:
     0: 1
+    1: 1
+    2: 1
+    3: 1
+    4: 1
   stepFeatures:
-    0: 3
-    1: 2
+    0: 9
+    1: 4
+    2: 4
+    3: 4
+    4: 4
 HLT_g13_loose_g10_loose_EgammaPEBTLA_L12DR15-0M30-eEM12LeEM9L:
   eventCount: 0
 HLT_g140_loose_L1eEM26M:
@@ -9501,7 +9622,7 @@ HLT_g140_loose_L1eEM28M:
     1: 1
     2: 1
     3: 1
-HLT_g140_loose_ringer_L1eEM26M:
+HLT_g140_loose_noringer_L1eEM26M:
   eventCount: 1
   stepCounts:
     0: 2
@@ -9613,41 +9734,29 @@ HLT_g15_loose_L1eEM10L_2mu10_msonly_L1MU3V_EMPTY:
 HLT_g15_loose_L1eEM10L_2mu10_msonly_L1MU3V_UNPAIRED_ISO:
   eventCount: 0
 HLT_g15_loose_L1eEM12L:
-  eventCount: 5
+  eventCount: 6
   stepCounts:
-    0: 7
-    1: 7
-    2: 7
-    3: 5
+    0: 9
+    1: 9
+    2: 8
+    3: 6
   stepFeatures:
-    0: 8
-    1: 7
-    2: 7
-    3: 5
+    0: 11
+    1: 10
+    2: 9
+    3: 6
 HLT_g15_tight_L1eEM12L:
-  eventCount: 4
-  stepCounts:
-    0: 7
-    1: 7
-    2: 7
-    3: 4
-  stepFeatures:
-    0: 8
-    1: 7
-    2: 7
-    3: 4
-HLT_g15_tight_ringer_L1eEM12L:
-  eventCount: 4
+  eventCount: 5
   stepCounts:
-    0: 7
-    1: 7
-    2: 7
-    3: 4
+    0: 9
+    1: 9
+    2: 8
+    3: 5
   stepFeatures:
-    0: 8
-    1: 7
-    2: 7
-    3: 4
+    0: 11
+    1: 10
+    2: 9
+    3: 5
 HLT_g20_loose_L1eEM18L:
   eventCount: 5
   stepCounts:
@@ -9816,20 +9925,6 @@ HLT_g20_tight_icaloloose_j40_j35a_j25a_j25_j20c_j0_DJMASS300j35_pf_ftf_L1eEM22M_
     3: 1
     4: 1
     5: 6
-HLT_g20_tight_icaloloose_ringer_L1eEM18M:
-  eventCount: 4
-  stepCounts:
-    0: 6
-    1: 6
-    2: 6
-    3: 4
-    4: 4
-  stepFeatures:
-    0: 7
-    1: 6
-    2: 6
-    3: 4
-    4: 4
 HLT_g20_tight_j35_0eta290_020jvt_bgn177_3j35a_j0_DJMASS500j35_pf_ftf_L1eEM22M_jMJJ-300:
   eventCount: 0
   stepCounts:
@@ -9878,18 +9973,6 @@ HLT_g20_tight_probe_L1eEM18M_2mu14_L12MU8F:
     0: 1
   stepFeatures:
     0: 4
-HLT_g20_tight_ringer_L1eEM18M:
-  eventCount: 4
-  stepCounts:
-    0: 6
-    1: 6
-    2: 6
-    3: 4
-  stepFeatures:
-    0: 7
-    1: 6
-    2: 6
-    3: 4
 HLT_g22_tight_L1eEM18M:
   eventCount: 4
   stepCounts:
@@ -9908,18 +9991,6 @@ HLT_g22_tight_probe_L1eEM18M_2mu14_L12MU8F:
     0: 1
   stepFeatures:
     0: 4
-HLT_g22_tight_ringer_L1eEM18M:
-  eventCount: 4
-  stepCounts:
-    0: 6
-    1: 6
-    2: 5
-    3: 4
-  stepFeatures:
-    0: 7
-    1: 6
-    2: 5
-    3: 4
 HLT_g24_tight_icaloloose_j40c_j30c_j24c_03dRAB35_03dRAC35_15dRBC45_50invmBC130_pf_ftf_L1eEM26M:
   eventCount: 2
   stepCounts:
@@ -9990,18 +10061,18 @@ HLT_g25_loose_L1eEM24L:
     1: 5
     2: 5
     3: 5
-HLT_g25_loose_ringer_L1eEM24L:
-  eventCount: 5
+HLT_g25_loose_noringer_L1eEM24L:
+  eventCount: 6
   stepCounts:
-    0: 6
-    1: 5
-    2: 5
-    3: 5
+    0: 8
+    1: 8
+    2: 8
+    3: 6
   stepFeatures:
-    0: 6
-    1: 5
-    2: 5
-    3: 5
+    0: 10
+    1: 9
+    2: 9
+    3: 6
 HLT_g25_loose_xe40_cell_xe50_tcpufit_18dphiAB_18dphiAC_80mTAC_L1eEM26M:
   eventCount: 0
   stepCounts:
@@ -10298,20 +10369,8 @@ HLT_g25_medium_probe_L1eEM24L_2mu14_L12MU8F:
   eventCount: 0
   stepFeatures:
     0: 4
-HLT_g25_medium_ringer_L1eEM24L:
-  eventCount: 4
-  stepCounts:
-    0: 6
-    1: 5
-    2: 5
-    3: 4
-  stepFeatures:
-    0: 6
-    1: 5
-    2: 5
-    3: 4
-HLT_g25_medium_tau25_dikaonmass_tracktwoMVA_50invmAB_L1eEM26M:
-  eventCount: 0
+HLT_g25_medium_tau25_dikaonmass_tracktwoMVA_50invmAB_L1eEM26M:
+  eventCount: 0
   stepCounts:
     0: 5
     1: 4
@@ -11263,10 +11322,17 @@ HLT_g35_medium_g25_medium_L1eEM9_EMPTY:
   eventCount: 0
 HLT_g35_medium_g25_medium_L1eEM9_UNPAIRED_ISO:
   eventCount: 0
-HLT_g35_medium_g25_medium_ringer_L12eEM24L:
+HLT_g35_medium_g25_medium_noringer_L12eEM24L:
   eventCount: 0
+  stepCounts:
+    0: 2
+    1: 1
+    2: 1
   stepFeatures:
-    0: 4
+    0: 6
+    1: 4
+    2: 3
+    3: 2
 HLT_g35_medium_j35_0eta290_020jvt_bgn177_3j35a_j0_DJMASS700j35_pf_ftf_presela20b85XX3a20_L1eEM26M:
   eventCount: 0
   stepCounts:
@@ -11363,22 +11429,22 @@ HLT_g35_medium_j35_0eta290_nnJvtv1_bgn277_3j35a_j0_DJMASS700j35_pf_ftf_presela20
     3: 4
     4: 12
     5: 12
-HLT_g35_medium_probe_L1eEM24L_2mu14_L12MU8F:
-  eventCount: 0
-  stepFeatures:
-    0: 4
-HLT_g35_medium_ringer_L1eEM24L:
+HLT_g35_medium_noringer_L1eEM24L:
   eventCount: 4
   stepCounts:
-    0: 5
-    1: 4
-    2: 4
+    0: 7
+    1: 7
+    2: 7
     3: 4
   stepFeatures:
-    0: 5
-    1: 4
-    2: 4
+    0: 9
+    1: 8
+    2: 8
     3: 4
+HLT_g35_medium_probe_L1eEM24L_2mu14_L12MU8F:
+  eventCount: 0
+  stepFeatures:
+    0: 4
 HLT_g35_medium_tau25_dikaonmass_tracktwoMVA_L1eTAU20_50invmAB_L1eEM26M:
   eventCount: 0
   stepCounts:
@@ -12848,18 +12914,6 @@ HLT_g50_loose_probe_L1eEM24L_2mu14_L12MU8F:
   eventCount: 0
   stepFeatures:
     0: 4
-HLT_g50_loose_ringer_L1eEM24L:
-  eventCount: 3
-  stepCounts:
-    0: 4
-    1: 3
-    2: 3
-    3: 3
-  stepFeatures:
-    0: 4
-    1: 3
-    2: 3
-    3: 3
 HLT_g50_loose_xe40_cell_xe70_pfopufit_80mTAC_L1eEM26M:
   eventCount: 0
   stepCounts:
@@ -13353,31 +13407,31 @@ HLT_g60_tight_noiso_3j25_pf_ftf_PhysicsTLA_L1eEM28M:
     7: 5
     8: 2
 HLT_g7_loose_EgammaPEBTLA_L1eEM5:
-  eventCount: 6
+  eventCount: 8
   stepCounts:
-    0: 17
-    1: 15
-    2: 15
-    3: 6
-    4: 6
+    0: 20
+    1: 19
+    2: 19
+    3: 8
+    4: 8
   stepFeatures:
-    0: 35
-    1: 26
-    2: 42
-    3: 6
-    4: 6
+    0: 102
+    1: 59
+    2: 73
+    3: 12
+    4: 12
 HLT_g7_loose_L1eEM5:
-  eventCount: 6
+  eventCount: 8
   stepCounts:
-    0: 17
-    1: 15
-    2: 15
-    3: 6
+    0: 20
+    1: 19
+    2: 19
+    3: 8
   stepFeatures:
-    0: 35
-    1: 26
-    2: 42
-    3: 6
+    0: 102
+    1: 59
+    2: 73
+    3: 12
 HLT_g80_loose_L1eEM26M:
   eventCount: 1
   stepCounts:
@@ -13711,25 +13765,25 @@ HLT_j0_Z219XX6c20_roiftf_presel6c20_L14jJ40:
     0: 2
     1: 10
 HLT_j0_j0_pf_ftf_presel2c20XX2c20b85_L1jJ85p0ETA21_3jJ40p0ETA25:
-  eventCount: 9
+  eventCount: 10
   stepCounts:
-    0: 11
-    1: 9
-    2: 9
+    0: 12
+    1: 10
+    2: 10
   stepFeatures:
-    0: 22
-    1: 18
-    2: 126
+    0: 24
+    1: 20
+    2: 136
 HLT_j0_j0_pf_ftf_preselZ120XX2c20XX2c20b85_L1jJ85p0ETA21_3jJ40p0ETA25:
-  eventCount: 9
+  eventCount: 10
   stepCounts:
-    0: 11
-    1: 9
-    2: 9
+    0: 12
+    1: 10
+    2: 10
   stepFeatures:
-    0: 22
-    1: 18
-    2: 126
+    0: 24
+    1: 20
+    2: 136
 HLT_j0_perf_L1RD0_FILLED:
   eventCount: 20
   stepCounts:
@@ -13753,13 +13807,13 @@ HLT_j0_perf_pf_subjesgscIS_ftf_L1RD0_FILLED:
     0: 20
     1: 20
 HLT_j0_pf_ftf_L1jJ85p0ETA21_3jJ40p0ETA25:
-  eventCount: 14
+  eventCount: 15
   stepCounts:
-    0: 14
-    1: 14
+    0: 15
+    1: 15
   stepFeatures:
-    0: 14
-    1: 86
+    0: 15
+    1: 91
 HLT_j0_pf_ftf_presel5c20_PhysicsTLA_L14jJ40:
   eventCount: 3
   stepCounts:
@@ -13797,15 +13851,15 @@ HLT_j0_pf_ftf_presel6c25_PhysicsTLA_L14jJ40:
     2: 11
     3: 1
 HLT_j0_pf_ftf_preselZ120XX4c20_L1jJ85p0ETA21_3jJ40p0ETA25:
-  eventCount: 11
+  eventCount: 12
   stepCounts:
-    0: 11
-    1: 11
-    2: 11
+    0: 12
+    1: 12
+    2: 12
   stepFeatures:
-    0: 11
-    1: 11
-    2: 75
+    0: 12
+    1: 12
+    2: 80
 HLT_j0_pf_ftf_preselZ124XX5c20_PhysicsTLA_L14jJ40:
   eventCount: 2
   stepCounts:
@@ -13835,15 +13889,15 @@ HLT_j0_pf_ftf_preselZ134XX5c20_PhysicsTLA_L14jJ40:
     3: 17
     4: 2
 HLT_j0_pf_ftf_preselZ138MAXMULT5cXX4c20_L1jJ85p0ETA21_3jJ40p0ETA25:
-  eventCount: 11
+  eventCount: 12
   stepCounts:
-    0: 11
-    1: 11
-    2: 11
+    0: 12
+    1: 12
+    2: 12
   stepFeatures:
-    0: 11
-    1: 11
-    2: 75
+    0: 12
+    1: 12
+    2: 80
 HLT_j0_pf_ftf_preselZ142XX5c20_PhysicsTLA_L14jJ40:
   eventCount: 3
   stepCounts:
@@ -13901,23 +13955,23 @@ HLT_j0_pf_ftf_preselZ219XX6c20_PhysicsTLA_L14jJ40:
     3: 11
     4: 1
 HLT_j0_pf_ftf_preselZ84XX3c20_L1jJ85p0ETA21_3jJ40p0ETA25:
-  eventCount: 12
+  eventCount: 13
   stepCounts:
-    0: 14
-    1: 12
-    2: 12
+    0: 15
+    1: 13
+    2: 13
   stepFeatures:
-    0: 14
-    1: 12
-    2: 77
+    0: 15
+    1: 13
+    2: 82
 HLT_j0_roiftf_presel3c30_L1jJ85p0ETA21_3jJ40p0ETA25:
-  eventCount: 14
+  eventCount: 15
   stepCounts:
-    0: 14
-    1: 14
+    0: 15
+    1: 15
   stepFeatures:
-    0: 14
-    1: 80
+    0: 15
+    1: 85
 HLT_j0_roiftf_presel3c40_L1jJ85p0ETA21_3jJ40p0ETA25:
   eventCount: 13
   stepCounts:
@@ -14106,35 +14160,35 @@ HLT_j110_L1jJ60:
     0: 8
   stepFeatures:
     0: 12
-HLT_j110_a10sd_cssk_60bgntwox_pf_jes_ftf_preselj80_L1jJ60:
+HLT_j110_a10sd_cssk_79bgntwox_pf_jes_ftf_preselj80_L1jJ60:
   eventCount: 0
   stepCounts:
-    0: 10
+    0: 11
   stepFeatures:
-    0: 10
-HLT_j110_a10sd_cssk_70bgntwox_pf_jes_ftf_preselj80_L1jJ60:
+    0: 11
+HLT_j110_a10sd_cssk_86bgntwox_pf_jes_ftf_preselj80_L1jJ60:
   eventCount: 4
   stepCounts:
-    0: 10
+    0: 11
     1: 4
   stepFeatures:
-    0: 10
+    0: 11
     1: 5
-HLT_j110_a10sd_cssk_80bgntwox_pf_jes_ftf_preselj80_L1jJ60:
+HLT_j110_a10sd_cssk_91bgntwox_pf_jes_ftf_preselj80_L1jJ60:
   eventCount: 6
   stepCounts:
-    0: 10
+    0: 11
     1: 6
   stepFeatures:
-    0: 10
+    0: 11
     1: 10
-HLT_j110_a10sd_cssk_90bgntwox_pf_jes_ftf_preselj80_L1jJ60:
+HLT_j110_a10sd_cssk_96bgntwox_pf_jes_ftf_preselj80_L1jJ60:
   eventCount: 8
   stepCounts:
-    0: 10
+    0: 11
     1: 8
   stepFeatures:
-    0: 10
+    0: 11
     1: 12
 HLT_j110_a10sd_cssk_pf_jes_ftf_preselj80_L1gLJ80p0ETA25:
   eventCount: 11
@@ -14145,13 +14199,13 @@ HLT_j110_a10sd_cssk_pf_jes_ftf_preselj80_L1gLJ80p0ETA25:
     0: 11
     1: 18
 HLT_j110_a10sd_cssk_pf_jes_ftf_preselj80_L1jJ60:
-  eventCount: 10
+  eventCount: 11
   stepCounts:
-    0: 10
-    1: 10
+    0: 11
+    1: 11
   stepFeatures:
-    0: 10
-    1: 17
+    0: 11
+    1: 18
 HLT_j110_a10sd_cssk_pf_jes_ftf_preselj80_L1jLJ80:
   eventCount: 6
   stepCounts:
@@ -14167,11 +14221,11 @@ HLT_j110_a10t_lcw_jes_L1gLJ80p0ETA25:
   stepFeatures:
     0: 17
 HLT_j110_a10t_lcw_jes_L1jJ60:
-  eventCount: 12
+  eventCount: 13
   stepCounts:
-    0: 12
+    0: 13
   stepFeatures:
-    0: 16
+    0: 17
 HLT_j110_a10t_lcw_jes_L1jLJ80:
   eventCount: 6
   stepCounts:
@@ -14181,10 +14235,10 @@ HLT_j110_a10t_lcw_jes_L1jLJ80:
 HLT_j110_pf_ftf_preselj80_L1jJ60:
   eventCount: 8
   stepCounts:
-    0: 12
+    0: 13
     1: 8
   stepFeatures:
-    0: 12
+    0: 13
     1: 12
 HLT_j110f_L1jJ60p30ETA49:
   eventCount: 0
@@ -14354,103 +14408,103 @@ HLT_j175_0eta290_020jvt_bgn160_j60_0eta290_020jvt_bgn160_pf_ftf_preselj140b85XXj
     1: 8
     2: 13
     3: 6
-HLT_j175_35smcINF_60bgntwox_j175_35smcINF_a10sd_cssk_pf_jes_ftf_preselj140_L1SC111-CjJ40:
+HLT_j175_35smcINF_79bgntwox_j175_35smcINF_a10sd_cssk_pf_jes_ftf_preselj140_L1SC111-CjJ40:
   eventCount: 0
   stepCounts:
     0: 3
   stepFeatures:
     0: 6
-HLT_j175_35smcINF_60bgntwox_j175_35smcINF_a10sd_cssk_pf_jes_ftf_preselj140_L1gLJ140p0ETA25:
+HLT_j175_35smcINF_79bgntwox_j175_35smcINF_a10sd_cssk_pf_jes_ftf_preselj140_L1gLJ140p0ETA25:
   eventCount: 0
   stepCounts:
     0: 3
   stepFeatures:
     0: 6
-HLT_j175_35smcINF_60bgntwox_j175_35smcINF_a10sd_cssk_pf_jes_ftf_preselj140_L1jJ160:
+HLT_j175_35smcINF_79bgntwox_j175_35smcINF_a10sd_cssk_pf_jes_ftf_preselj140_L1jJ160:
   eventCount: 0
   stepCounts:
     0: 3
   stepFeatures:
     0: 6
-HLT_j175_35smcINF_70bgntwox_j175_35smcINF_a10sd_cssk_pf_jes_ftf_preselj140_L1SC111-CjJ40:
+HLT_j175_35smcINF_86bgntwox_j175_35smcINF_a10sd_cssk_pf_jes_ftf_preselj140_L1SC111-CjJ40:
   eventCount: 0
   stepCounts:
     0: 3
   stepFeatures:
     0: 6
-HLT_j175_35smcINF_70bgntwox_j175_35smcINF_a10sd_cssk_pf_jes_ftf_preselj140_L1gLJ140p0ETA25:
+HLT_j175_35smcINF_86bgntwox_j175_35smcINF_a10sd_cssk_pf_jes_ftf_preselj140_L1gLJ140p0ETA25:
   eventCount: 0
   stepCounts:
     0: 3
   stepFeatures:
     0: 6
-HLT_j175_35smcINF_70bgntwox_j175_35smcINF_a10sd_cssk_pf_jes_ftf_preselj140_L1jJ160:
+HLT_j175_35smcINF_86bgntwox_j175_35smcINF_a10sd_cssk_pf_jes_ftf_preselj140_L1jJ160:
   eventCount: 0
   stepCounts:
     0: 3
   stepFeatures:
     0: 6
-HLT_j175_35smcINF_70bgntwox_j175_35smcINF_a10sd_cssk_pf_jes_ftf_preselj160_L1gLJ140p0ETA25:
+HLT_j175_35smcINF_86bgntwox_j175_35smcINF_a10sd_cssk_pf_jes_ftf_preselj160_L1gLJ140p0ETA25:
   eventCount: 0
   stepCounts:
     0: 3
   stepFeatures:
     0: 6
-HLT_j175_35smcINF_70bgntwox_j175_35smcINF_a10sd_cssk_pf_jes_ftf_preselj180_L1gLJ140p0ETA25:
+HLT_j175_35smcINF_86bgntwox_j175_35smcINF_a10sd_cssk_pf_jes_ftf_preselj180_L1gLJ140p0ETA25:
   eventCount: 0
   stepCounts:
     0: 3
   stepFeatures:
     0: 6
-HLT_j175_35smcINF_70bgntwox_j175_35smcINF_a10sd_cssk_pf_jes_ftf_preselj200_L1gLJ140p0ETA25:
+HLT_j175_35smcINF_86bgntwox_j175_35smcINF_a10sd_cssk_pf_jes_ftf_preselj200_L1gLJ140p0ETA25:
   eventCount: 0
   stepCounts:
     0: 2
   stepFeatures:
     0: 4
-HLT_j175_35smcINF_70bgntwox_j260_35smcINF_a10sd_cssk_pf_jes_ftf_preselj140_L1gLJ140p0ETA25:
+HLT_j175_35smcINF_86bgntwox_j260_35smcINF_a10sd_cssk_pf_jes_ftf_preselj140_L1gLJ140p0ETA25:
   eventCount: 0
   stepCounts:
     0: 3
   stepFeatures:
     0: 6
-HLT_j175_35smcINF_70bgntwox_j260_35smcINF_a10sd_cssk_pf_jes_ftf_preselj160_L1gLJ140p0ETA25:
+HLT_j175_35smcINF_86bgntwox_j260_35smcINF_a10sd_cssk_pf_jes_ftf_preselj160_L1gLJ140p0ETA25:
   eventCount: 0
   stepCounts:
     0: 3
   stepFeatures:
     0: 6
-HLT_j175_35smcINF_70bgntwox_j260_35smcINF_a10sd_cssk_pf_jes_ftf_preselj180_L1gLJ140p0ETA25:
+HLT_j175_35smcINF_86bgntwox_j260_35smcINF_a10sd_cssk_pf_jes_ftf_preselj180_L1gLJ140p0ETA25:
   eventCount: 0
   stepCounts:
     0: 3
   stepFeatures:
     0: 6
-HLT_j175_35smcINF_70bgntwox_j260_35smcINF_a10sd_cssk_pf_jes_ftf_preselj200_L1gLJ140p0ETA25:
+HLT_j175_35smcINF_86bgntwox_j260_35smcINF_a10sd_cssk_pf_jes_ftf_preselj200_L1gLJ140p0ETA25:
   eventCount: 0
   stepCounts:
     0: 2
   stepFeatures:
     0: 4
-HLT_j175_35smcINF_80bgntwox_j175_35smcINF_a10sd_cssk_pf_jes_ftf_preselj140_L1SC111-CjJ40:
+HLT_j175_35smcINF_91bgntwox_j175_35smcINF_a10sd_cssk_pf_jes_ftf_preselj140_L1SC111-CjJ40:
   eventCount: 0
   stepCounts:
     0: 3
   stepFeatures:
     0: 6
-HLT_j175_35smcINF_80bgntwox_j175_35smcINF_a10sd_cssk_pf_jes_ftf_preselj140_L1gLJ140p0ETA25:
+HLT_j175_35smcINF_91bgntwox_j175_35smcINF_a10sd_cssk_pf_jes_ftf_preselj140_L1gLJ140p0ETA25:
   eventCount: 0
   stepCounts:
     0: 3
   stepFeatures:
     0: 6
-HLT_j175_35smcINF_80bgntwox_j175_35smcINF_a10sd_cssk_pf_jes_ftf_preselj140_L1jJ160:
+HLT_j175_35smcINF_91bgntwox_j175_35smcINF_a10sd_cssk_pf_jes_ftf_preselj140_L1jJ160:
   eventCount: 0
   stepCounts:
     0: 3
   stepFeatures:
     0: 6
-HLT_j175_35smcINF_a10sd_cssk_70bgntwox_pf_jes_ftf_preselj140_L1SC111-CjJ40:
+HLT_j175_35smcINF_a10sd_cssk_86bgntwox_pf_jes_ftf_preselj140_L1SC111-CjJ40:
   eventCount: 1
   stepCounts:
     0: 3
@@ -14458,7 +14512,7 @@ HLT_j175_35smcINF_a10sd_cssk_70bgntwox_pf_jes_ftf_preselj140_L1SC111-CjJ40:
   stepFeatures:
     0: 3
     1: 1
-HLT_j175_35smcINF_a10sd_cssk_70bgntwox_pf_jes_ftf_preselj140_L1gLJ140p0ETA25:
+HLT_j175_35smcINF_a10sd_cssk_86bgntwox_pf_jes_ftf_preselj140_L1gLJ140p0ETA25:
   eventCount: 1
   stepCounts:
     0: 3
@@ -14466,7 +14520,7 @@ HLT_j175_35smcINF_a10sd_cssk_70bgntwox_pf_jes_ftf_preselj140_L1gLJ140p0ETA25:
   stepFeatures:
     0: 3
     1: 1
-HLT_j175_35smcINF_a10sd_cssk_70bgntwox_pf_jes_ftf_preselj140_L1jJ160:
+HLT_j175_35smcINF_a10sd_cssk_86bgntwox_pf_jes_ftf_preselj140_L1jJ160:
   eventCount: 1
   stepCounts:
     0: 3
@@ -14486,31 +14540,31 @@ HLT_j175_L1jJ90:
     0: 3
   stepFeatures:
     0: 5
-HLT_j175_a10sd_cssk_60bgntwox_pf_jes_ftf_preselj140_L1SC111-CjJ40:
+HLT_j175_a10sd_cssk_79bgntwox_pf_jes_ftf_preselj140_L1SC111-CjJ40:
   eventCount: 0
   stepCounts:
     0: 3
   stepFeatures:
     0: 3
-HLT_j175_a10sd_cssk_60bgntwox_pf_jes_ftf_preselj140_L1gLJ140p0ETA25:
+HLT_j175_a10sd_cssk_79bgntwox_pf_jes_ftf_preselj140_L1gLJ140p0ETA25:
   eventCount: 0
   stepCounts:
     0: 3
   stepFeatures:
     0: 3
-HLT_j175_a10sd_cssk_60bgntwox_pf_jes_ftf_preselj140_L1jJ160:
+HLT_j175_a10sd_cssk_79bgntwox_pf_jes_ftf_preselj140_L1jJ160:
   eventCount: 0
   stepCounts:
     0: 3
   stepFeatures:
     0: 3
-HLT_j175_a10sd_cssk_60bgntwox_pf_jes_ftf_preselj140_L1jJ90:
+HLT_j175_a10sd_cssk_79bgntwox_pf_jes_ftf_preselj140_L1jJ90:
   eventCount: 0
   stepCounts:
     0: 3
   stepFeatures:
     0: 3
-HLT_j175_a10sd_cssk_70bgntwox_pf_jes_ftf_preselj140_L1SC111-CjJ40:
+HLT_j175_a10sd_cssk_86bgntwox_pf_jes_ftf_preselj140_L1SC111-CjJ40:
   eventCount: 2
   stepCounts:
     0: 3
@@ -14518,7 +14572,7 @@ HLT_j175_a10sd_cssk_70bgntwox_pf_jes_ftf_preselj140_L1SC111-CjJ40:
   stepFeatures:
     0: 3
     1: 2
-HLT_j175_a10sd_cssk_70bgntwox_pf_jes_ftf_preselj140_L1gLJ140p0ETA25:
+HLT_j175_a10sd_cssk_86bgntwox_pf_jes_ftf_preselj140_L1gLJ140p0ETA25:
   eventCount: 2
   stepCounts:
     0: 3
@@ -14526,7 +14580,7 @@ HLT_j175_a10sd_cssk_70bgntwox_pf_jes_ftf_preselj140_L1gLJ140p0ETA25:
   stepFeatures:
     0: 3
     1: 2
-HLT_j175_a10sd_cssk_70bgntwox_pf_jes_ftf_preselj140_L1jJ160:
+HLT_j175_a10sd_cssk_86bgntwox_pf_jes_ftf_preselj140_L1jJ160:
   eventCount: 2
   stepCounts:
     0: 3
@@ -14534,7 +14588,7 @@ HLT_j175_a10sd_cssk_70bgntwox_pf_jes_ftf_preselj140_L1jJ160:
   stepFeatures:
     0: 3
     1: 2
-HLT_j175_a10sd_cssk_70bgntwox_pf_jes_ftf_preselj140_L1jJ90:
+HLT_j175_a10sd_cssk_86bgntwox_pf_jes_ftf_preselj140_L1jJ90:
   eventCount: 2
   stepCounts:
     0: 3
@@ -14542,7 +14596,7 @@ HLT_j175_a10sd_cssk_70bgntwox_pf_jes_ftf_preselj140_L1jJ90:
   stepFeatures:
     0: 3
     1: 2
-HLT_j175_a10sd_cssk_80bgntwox_pf_jes_ftf_preselj140_L1SC111-CjJ40:
+HLT_j175_a10sd_cssk_91bgntwox_pf_jes_ftf_preselj140_L1SC111-CjJ40:
   eventCount: 2
   stepCounts:
     0: 3
@@ -14550,7 +14604,7 @@ HLT_j175_a10sd_cssk_80bgntwox_pf_jes_ftf_preselj140_L1SC111-CjJ40:
   stepFeatures:
     0: 3
     1: 3
-HLT_j175_a10sd_cssk_80bgntwox_pf_jes_ftf_preselj140_L1gLJ140p0ETA25:
+HLT_j175_a10sd_cssk_91bgntwox_pf_jes_ftf_preselj140_L1gLJ140p0ETA25:
   eventCount: 2
   stepCounts:
     0: 3
@@ -14558,7 +14612,7 @@ HLT_j175_a10sd_cssk_80bgntwox_pf_jes_ftf_preselj140_L1gLJ140p0ETA25:
   stepFeatures:
     0: 3
     1: 3
-HLT_j175_a10sd_cssk_80bgntwox_pf_jes_ftf_preselj140_L1jJ160:
+HLT_j175_a10sd_cssk_91bgntwox_pf_jes_ftf_preselj140_L1jJ160:
   eventCount: 2
   stepCounts:
     0: 3
@@ -14566,7 +14620,7 @@ HLT_j175_a10sd_cssk_80bgntwox_pf_jes_ftf_preselj140_L1jJ160:
   stepFeatures:
     0: 3
     1: 3
-HLT_j175_a10sd_cssk_80bgntwox_pf_jes_ftf_preselj140_L1jJ90:
+HLT_j175_a10sd_cssk_91bgntwox_pf_jes_ftf_preselj140_L1jJ90:
   eventCount: 2
   stepCounts:
     0: 3
@@ -14574,7 +14628,7 @@ HLT_j175_a10sd_cssk_80bgntwox_pf_jes_ftf_preselj140_L1jJ90:
   stepFeatures:
     0: 3
     1: 3
-HLT_j175_a10sd_cssk_90bgntwox_pf_jes_ftf_preselj140_L1SC111-CjJ40:
+HLT_j175_a10sd_cssk_96bgntwox_pf_jes_ftf_preselj140_L1SC111-CjJ40:
   eventCount: 3
   stepCounts:
     0: 3
@@ -14582,7 +14636,7 @@ HLT_j175_a10sd_cssk_90bgntwox_pf_jes_ftf_preselj140_L1SC111-CjJ40:
   stepFeatures:
     0: 3
     1: 4
-HLT_j175_a10sd_cssk_90bgntwox_pf_jes_ftf_preselj140_L1gLJ140p0ETA25:
+HLT_j175_a10sd_cssk_96bgntwox_pf_jes_ftf_preselj140_L1gLJ140p0ETA25:
   eventCount: 3
   stepCounts:
     0: 3
@@ -14590,7 +14644,7 @@ HLT_j175_a10sd_cssk_90bgntwox_pf_jes_ftf_preselj140_L1gLJ140p0ETA25:
   stepFeatures:
     0: 3
     1: 4
-HLT_j175_a10sd_cssk_90bgntwox_pf_jes_ftf_preselj140_L1jJ160:
+HLT_j175_a10sd_cssk_96bgntwox_pf_jes_ftf_preselj140_L1jJ160:
   eventCount: 3
   stepCounts:
     0: 3
@@ -14598,7 +14652,7 @@ HLT_j175_a10sd_cssk_90bgntwox_pf_jes_ftf_preselj140_L1jJ160:
   stepFeatures:
     0: 3
     1: 4
-HLT_j175_a10sd_cssk_90bgntwox_pf_jes_ftf_preselj140_L1jJ90:
+HLT_j175_a10sd_cssk_96bgntwox_pf_jes_ftf_preselj140_L1jJ90:
   eventCount: 3
   stepCounts:
     0: 3
@@ -15020,6 +15074,20 @@ HLT_j20_calratiovar_roiftf_preselj20emf24_L1LLPDPHI-jXE40-jJ40:
 HLT_j20_calratiovar_roiftf_preselj20emf24_L1LLPNODPHI-jXE40-jJ40:
   eventCount: 0
 HLT_j20_j20_pf_ftf_presel3c20XX1c20bgtwo85_PhysicsTLA_L13jJ40p0ETA25:
+  eventCount: 13
+  stepCounts:
+    0: 13
+    1: 13
+    2: 13
+    3: 13
+    4: 13
+  stepFeatures:
+    0: 26
+    1: 26
+    2: 146
+    3: 146
+    4: 26
+HLT_j20_j20_pf_ftf_presel3c20XX1c20bgtwo85_PhysicsTLA_L1jJ85p0ETA21_3jJ40p0ETA25:
   eventCount: 12
   stepCounts:
     0: 12
@@ -15030,23 +15098,9 @@ HLT_j20_j20_pf_ftf_presel3c20XX1c20bgtwo85_PhysicsTLA_L13jJ40p0ETA25:
   stepFeatures:
     0: 24
     1: 24
-    2: 136
-    3: 136
+    2: 134
+    3: 134
     4: 24
-HLT_j20_j20_pf_ftf_presel3c20XX1c20bgtwo85_PhysicsTLA_L1jJ85p0ETA21_3jJ40p0ETA25:
-  eventCount: 11
-  stepCounts:
-    0: 11
-    1: 11
-    2: 11
-    3: 11
-    4: 11
-  stepFeatures:
-    0: 22
-    1: 22
-    2: 124
-    3: 124
-    4: 22
 HLT_j20_j20_pf_ftf_preselj140XX2j45_PhysicsTLA_L13jJ40p0ETA25:
   eventCount: 5
   stepCounts:
@@ -15072,29 +15126,29 @@ HLT_j20_j20_pf_ftf_preselj140XX2j45_PhysicsTLA_L1jJ85p0ETA21_3jJ40p0ETA25:
     2: 46
     3: 10
 HLT_j20_j20_pf_ftf_preselj80XX2j45_PhysicsTLA_L13jJ40p0ETA25:
-  eventCount: 10
+  eventCount: 11
   stepCounts:
-    0: 10
-    1: 10
-    2: 10
-    3: 10
+    0: 11
+    1: 11
+    2: 11
+    3: 11
   stepFeatures:
-    0: 20
-    1: 92
-    2: 92
-    3: 20
+    0: 22
+    1: 102
+    2: 102
+    3: 22
 HLT_j20_j20_pf_ftf_preselj80XX2j45_PhysicsTLA_L1jJ85p0ETA21_3jJ40p0ETA25:
-  eventCount: 10
+  eventCount: 11
   stepCounts:
-    0: 10
-    1: 10
-    2: 10
-    3: 10
+    0: 11
+    1: 11
+    2: 11
+    3: 11
   stepFeatures:
-    0: 20
-    1: 92
-    2: 92
-    3: 20
+    0: 22
+    1: 102
+    2: 102
+    3: 22
 HLT_j20_pf_ftf_preselcHT450_DarkJetPEBTLA_L1HT190-jJ40s5pETA21:
   eventCount: 3
   stepCounts:
@@ -15467,77 +15521,77 @@ HLT_j25f_L1RD0_FILLED:
     0: 1
   stepFeatures:
     0: 1
-HLT_j260_35smcINF_60bgntwox_j260_35smcINF_a10sd_cssk_pf_jes_ftf_presel2j225_L1SC111-CjJ40:
+HLT_j260_35smcINF_79bgntwox_j260_35smcINF_a10sd_cssk_pf_jes_ftf_presel2j225_L1SC111-CjJ40:
   eventCount: 0
-HLT_j260_35smcINF_60bgntwox_j260_35smcINF_a10sd_cssk_pf_jes_ftf_presel2j225_L1gLJ140p0ETA25:
+HLT_j260_35smcINF_79bgntwox_j260_35smcINF_a10sd_cssk_pf_jes_ftf_presel2j225_L1gLJ140p0ETA25:
   eventCount: 0
-HLT_j260_35smcINF_60bgntwox_j260_35smcINF_a10sd_cssk_pf_jes_ftf_presel2j225_L1jJ160:
+HLT_j260_35smcINF_79bgntwox_j260_35smcINF_a10sd_cssk_pf_jes_ftf_presel2j225_L1jJ160:
   eventCount: 0
-HLT_j260_35smcINF_70bgntwox_j175_35smcINF_a10sd_cssk_pf_jes_ftf_preselj140_L1gLJ140p0ETA25:
+HLT_j260_35smcINF_86bgntwox_j175_35smcINF_a10sd_cssk_pf_jes_ftf_preselj140_L1gLJ140p0ETA25:
   eventCount: 0
   stepCounts:
     0: 3
   stepFeatures:
     0: 6
-HLT_j260_35smcINF_70bgntwox_j175_35smcINF_a10sd_cssk_pf_jes_ftf_preselj160_L1gLJ140p0ETA25:
+HLT_j260_35smcINF_86bgntwox_j175_35smcINF_a10sd_cssk_pf_jes_ftf_preselj160_L1gLJ140p0ETA25:
   eventCount: 0
   stepCounts:
     0: 3
   stepFeatures:
     0: 6
-HLT_j260_35smcINF_70bgntwox_j175_35smcINF_a10sd_cssk_pf_jes_ftf_preselj180_L1gLJ140p0ETA25:
+HLT_j260_35smcINF_86bgntwox_j175_35smcINF_a10sd_cssk_pf_jes_ftf_preselj180_L1gLJ140p0ETA25:
   eventCount: 0
   stepCounts:
     0: 3
   stepFeatures:
     0: 6
-HLT_j260_35smcINF_70bgntwox_j175_35smcINF_a10sd_cssk_pf_jes_ftf_preselj200_L1gLJ140p0ETA25:
+HLT_j260_35smcINF_86bgntwox_j175_35smcINF_a10sd_cssk_pf_jes_ftf_preselj200_L1gLJ140p0ETA25:
   eventCount: 0
   stepCounts:
     0: 2
   stepFeatures:
     0: 4
-HLT_j260_35smcINF_70bgntwox_j260_35smcINF_a10sd_cssk_pf_jes_ftf_presel2j225_L1SC111-CjJ40:
+HLT_j260_35smcINF_86bgntwox_j260_35smcINF_a10sd_cssk_pf_jes_ftf_presel2j225_L1SC111-CjJ40:
   eventCount: 0
-HLT_j260_35smcINF_70bgntwox_j260_35smcINF_a10sd_cssk_pf_jes_ftf_presel2j225_L1gLJ140p0ETA25:
+HLT_j260_35smcINF_86bgntwox_j260_35smcINF_a10sd_cssk_pf_jes_ftf_presel2j225_L1gLJ140p0ETA25:
   eventCount: 0
-HLT_j260_35smcINF_70bgntwox_j260_35smcINF_a10sd_cssk_pf_jes_ftf_presel2j225_L1jJ160:
+HLT_j260_35smcINF_86bgntwox_j260_35smcINF_a10sd_cssk_pf_jes_ftf_presel2j225_L1jJ160:
   eventCount: 0
-HLT_j260_35smcINF_70bgntwox_j260_35smcINF_a10sd_cssk_pf_jes_ftf_preselj140_L1gLJ140p0ETA25:
+HLT_j260_35smcINF_86bgntwox_j260_35smcINF_a10sd_cssk_pf_jes_ftf_preselj140_L1gLJ140p0ETA25:
   eventCount: 0
   stepCounts:
     0: 3
   stepFeatures:
     0: 6
-HLT_j260_35smcINF_70bgntwox_j260_35smcINF_a10sd_cssk_pf_jes_ftf_preselj160_L1gLJ140p0ETA25:
+HLT_j260_35smcINF_86bgntwox_j260_35smcINF_a10sd_cssk_pf_jes_ftf_preselj160_L1gLJ140p0ETA25:
   eventCount: 0
   stepCounts:
     0: 3
   stepFeatures:
     0: 6
-HLT_j260_35smcINF_70bgntwox_j260_35smcINF_a10sd_cssk_pf_jes_ftf_preselj180_L1gLJ140p0ETA25:
+HLT_j260_35smcINF_86bgntwox_j260_35smcINF_a10sd_cssk_pf_jes_ftf_preselj180_L1gLJ140p0ETA25:
   eventCount: 0
   stepCounts:
     0: 3
   stepFeatures:
     0: 6
-HLT_j260_35smcINF_70bgntwox_j260_35smcINF_a10sd_cssk_pf_jes_ftf_preselj200_L1gLJ140p0ETA25:
+HLT_j260_35smcINF_86bgntwox_j260_35smcINF_a10sd_cssk_pf_jes_ftf_preselj200_L1gLJ140p0ETA25:
   eventCount: 0
   stepCounts:
     0: 2
   stepFeatures:
     0: 4
-HLT_j260_35smcINF_80bgntwox_j260_35smcINF_a10sd_cssk_pf_jes_ftf_presel2j225_L1SC111-CjJ40:
+HLT_j260_35smcINF_91bgntwox_j260_35smcINF_a10sd_cssk_pf_jes_ftf_presel2j225_L1SC111-CjJ40:
   eventCount: 0
-HLT_j260_35smcINF_80bgntwox_j260_35smcINF_a10sd_cssk_pf_jes_ftf_presel2j225_L1gLJ140p0ETA25:
+HLT_j260_35smcINF_91bgntwox_j260_35smcINF_a10sd_cssk_pf_jes_ftf_presel2j225_L1gLJ140p0ETA25:
   eventCount: 0
-HLT_j260_35smcINF_80bgntwox_j260_35smcINF_a10sd_cssk_pf_jes_ftf_presel2j225_L1jJ160:
+HLT_j260_35smcINF_91bgntwox_j260_35smcINF_a10sd_cssk_pf_jes_ftf_presel2j225_L1jJ160:
   eventCount: 0
-HLT_j260_70bgntwox_j260_a10sd_cssk_pf_jes_ftf_presel2j225_L1SC111-CjJ40:
+HLT_j260_86bgntwox_j260_a10sd_cssk_pf_jes_ftf_presel2j225_L1SC111-CjJ40:
   eventCount: 0
-HLT_j260_70bgntwox_j260_a10sd_cssk_pf_jes_ftf_presel2j225_L1gLJ140p0ETA25:
+HLT_j260_86bgntwox_j260_a10sd_cssk_pf_jes_ftf_presel2j225_L1gLJ140p0ETA25:
   eventCount: 0
-HLT_j260_70bgntwox_j260_a10sd_cssk_pf_jes_ftf_presel2j225_L1jJ160:
+HLT_j260_86bgntwox_j260_a10sd_cssk_pf_jes_ftf_presel2j225_L1jJ160:
   eventCount: 0
 HLT_j260_L1jJ125:
   eventCount: 1
@@ -15545,31 +15599,31 @@ HLT_j260_L1jJ125:
     0: 1
   stepFeatures:
     0: 1
-HLT_j260_a10sd_cssk_60bgntwox_pf_jes_ftf_preselj200_L1SC111-CjJ40:
+HLT_j260_a10sd_cssk_79bgntwox_pf_jes_ftf_preselj200_L1SC111-CjJ40:
   eventCount: 0
   stepCounts:
     0: 2
   stepFeatures:
     0: 2
-HLT_j260_a10sd_cssk_60bgntwox_pf_jes_ftf_preselj200_L1gLJ140p0ETA25:
+HLT_j260_a10sd_cssk_79bgntwox_pf_jes_ftf_preselj200_L1gLJ140p0ETA25:
   eventCount: 0
   stepCounts:
     0: 2
   stepFeatures:
     0: 2
-HLT_j260_a10sd_cssk_60bgntwox_pf_jes_ftf_preselj200_L1jJ125:
+HLT_j260_a10sd_cssk_79bgntwox_pf_jes_ftf_preselj200_L1jJ125:
   eventCount: 0
   stepCounts:
     0: 2
   stepFeatures:
     0: 2
-HLT_j260_a10sd_cssk_60bgntwox_pf_jes_ftf_preselj200_L1jJ160:
+HLT_j260_a10sd_cssk_79bgntwox_pf_jes_ftf_preselj200_L1jJ160:
   eventCount: 0
   stepCounts:
     0: 2
   stepFeatures:
     0: 2
-HLT_j260_a10sd_cssk_70bgntwox_pf_jes_ftf_preselj200_L1SC111-CjJ40:
+HLT_j260_a10sd_cssk_86bgntwox_pf_jes_ftf_preselj200_L1SC111-CjJ40:
   eventCount: 1
   stepCounts:
     0: 2
@@ -15577,7 +15631,7 @@ HLT_j260_a10sd_cssk_70bgntwox_pf_jes_ftf_preselj200_L1SC111-CjJ40:
   stepFeatures:
     0: 2
     1: 1
-HLT_j260_a10sd_cssk_70bgntwox_pf_jes_ftf_preselj200_L1gLJ140p0ETA25:
+HLT_j260_a10sd_cssk_86bgntwox_pf_jes_ftf_preselj200_L1gLJ140p0ETA25:
   eventCount: 1
   stepCounts:
     0: 2
@@ -15585,7 +15639,7 @@ HLT_j260_a10sd_cssk_70bgntwox_pf_jes_ftf_preselj200_L1gLJ140p0ETA25:
   stepFeatures:
     0: 2
     1: 1
-HLT_j260_a10sd_cssk_70bgntwox_pf_jes_ftf_preselj200_L1jJ125:
+HLT_j260_a10sd_cssk_86bgntwox_pf_jes_ftf_preselj200_L1jJ125:
   eventCount: 1
   stepCounts:
     0: 2
@@ -15593,7 +15647,7 @@ HLT_j260_a10sd_cssk_70bgntwox_pf_jes_ftf_preselj200_L1jJ125:
   stepFeatures:
     0: 2
     1: 1
-HLT_j260_a10sd_cssk_70bgntwox_pf_jes_ftf_preselj200_L1jJ160:
+HLT_j260_a10sd_cssk_86bgntwox_pf_jes_ftf_preselj200_L1jJ160:
   eventCount: 1
   stepCounts:
     0: 2
@@ -15601,7 +15655,7 @@ HLT_j260_a10sd_cssk_70bgntwox_pf_jes_ftf_preselj200_L1jJ160:
   stepFeatures:
     0: 2
     1: 1
-HLT_j260_a10sd_cssk_80bgntwox_pf_jes_ftf_preselj200_L1SC111-CjJ40:
+HLT_j260_a10sd_cssk_91bgntwox_pf_jes_ftf_preselj200_L1SC111-CjJ40:
   eventCount: 2
   stepCounts:
     0: 2
@@ -15609,7 +15663,7 @@ HLT_j260_a10sd_cssk_80bgntwox_pf_jes_ftf_preselj200_L1SC111-CjJ40:
   stepFeatures:
     0: 2
     1: 2
-HLT_j260_a10sd_cssk_80bgntwox_pf_jes_ftf_preselj200_L1gLJ140p0ETA25:
+HLT_j260_a10sd_cssk_91bgntwox_pf_jes_ftf_preselj200_L1gLJ140p0ETA25:
   eventCount: 2
   stepCounts:
     0: 2
@@ -15617,7 +15671,7 @@ HLT_j260_a10sd_cssk_80bgntwox_pf_jes_ftf_preselj200_L1gLJ140p0ETA25:
   stepFeatures:
     0: 2
     1: 2
-HLT_j260_a10sd_cssk_80bgntwox_pf_jes_ftf_preselj200_L1jJ125:
+HLT_j260_a10sd_cssk_91bgntwox_pf_jes_ftf_preselj200_L1jJ125:
   eventCount: 2
   stepCounts:
     0: 2
@@ -15625,7 +15679,7 @@ HLT_j260_a10sd_cssk_80bgntwox_pf_jes_ftf_preselj200_L1jJ125:
   stepFeatures:
     0: 2
     1: 2
-HLT_j260_a10sd_cssk_80bgntwox_pf_jes_ftf_preselj200_L1jJ160:
+HLT_j260_a10sd_cssk_91bgntwox_pf_jes_ftf_preselj200_L1jJ160:
   eventCount: 2
   stepCounts:
     0: 2
@@ -15633,7 +15687,7 @@ HLT_j260_a10sd_cssk_80bgntwox_pf_jes_ftf_preselj200_L1jJ160:
   stepFeatures:
     0: 2
     1: 2
-HLT_j260_a10sd_cssk_90bgntwox_pf_jes_ftf_preselj200_L1SC111-CjJ40:
+HLT_j260_a10sd_cssk_96bgntwox_pf_jes_ftf_preselj200_L1SC111-CjJ40:
   eventCount: 2
   stepCounts:
     0: 2
@@ -15641,7 +15695,7 @@ HLT_j260_a10sd_cssk_90bgntwox_pf_jes_ftf_preselj200_L1SC111-CjJ40:
   stepFeatures:
     0: 2
     1: 2
-HLT_j260_a10sd_cssk_90bgntwox_pf_jes_ftf_preselj200_L1gLJ140p0ETA25:
+HLT_j260_a10sd_cssk_96bgntwox_pf_jes_ftf_preselj200_L1gLJ140p0ETA25:
   eventCount: 2
   stepCounts:
     0: 2
@@ -15649,7 +15703,7 @@ HLT_j260_a10sd_cssk_90bgntwox_pf_jes_ftf_preselj200_L1gLJ140p0ETA25:
   stepFeatures:
     0: 2
     1: 2
-HLT_j260_a10sd_cssk_90bgntwox_pf_jes_ftf_preselj200_L1jJ125:
+HLT_j260_a10sd_cssk_96bgntwox_pf_jes_ftf_preselj200_L1jJ125:
   eventCount: 2
   stepCounts:
     0: 2
@@ -15657,7 +15711,7 @@ HLT_j260_a10sd_cssk_90bgntwox_pf_jes_ftf_preselj200_L1jJ125:
   stepFeatures:
     0: 2
     1: 2
-HLT_j260_a10sd_cssk_90bgntwox_pf_jes_ftf_preselj200_L1jJ160:
+HLT_j260_a10sd_cssk_96bgntwox_pf_jes_ftf_preselj200_L1jJ160:
   eventCount: 2
   stepCounts:
     0: 2
@@ -15826,25 +15880,25 @@ HLT_j300_3timeSig_L1jJ160:
 HLT_j300f_L1jJ125p30ETA49:
   eventCount: 0
 HLT_j30_0eta290_020jvt_boffperf_pf_ftf_L1jJ50:
-  eventCount: 19
+  eventCount: 20
   stepCounts:
-    0: 19
-    1: 19
-    2: 19
+    0: 20
+    1: 20
+    2: 20
   stepFeatures:
-    0: 19
-    1: 76
-    2: 76
+    0: 20
+    1: 78
+    2: 78
 HLT_j30_0eta290_nnJvtv1_boffperf_pf_ftf_L1jJ50:
-  eventCount: 19
+  eventCount: 20
   stepCounts:
-    0: 19
-    1: 19
-    2: 19
+    0: 20
+    1: 20
+    2: 20
   stepFeatures:
-    0: 19
-    1: 76
-    2: 76
+    0: 20
+    1: 78
+    2: 78
 HLT_j30_CLEANllp_momemfrac006_calratio_L1eTAU140:
   eventCount: 0
 HLT_j30_CLEANllp_momemfrac006_calratio_L1eTAU40HT:
@@ -15975,19 +16029,19 @@ HLT_j360_L1gJ100p0ETA25:
   eventCount: 0
 HLT_j360_L1jJ160:
   eventCount: 0
-HLT_j360_a10sd_cssk_60bgntwox_pf_jes_ftf_preselj225_L1jJ160:
+HLT_j360_a10sd_cssk_79bgntwox_pf_jes_ftf_preselj225_L1jJ160:
   eventCount: 0
   stepCounts:
     0: 1
   stepFeatures:
     0: 1
-HLT_j360_a10sd_cssk_70bgntwox_pf_jes_ftf_preselj225_L1jJ160:
+HLT_j360_a10sd_cssk_86bgntwox_pf_jes_ftf_preselj225_L1jJ160:
   eventCount: 0
   stepCounts:
     0: 1
   stepFeatures:
     0: 1
-HLT_j360_a10sd_cssk_80bgntwox_pf_jes_ftf_preselj225_L1jJ160:
+HLT_j360_a10sd_cssk_91bgntwox_pf_jes_ftf_preselj225_L1jJ160:
   eventCount: 1
   stepCounts:
     0: 1
@@ -15995,7 +16049,7 @@ HLT_j360_a10sd_cssk_80bgntwox_pf_jes_ftf_preselj225_L1jJ160:
   stepFeatures:
     0: 1
     1: 1
-HLT_j360_a10sd_cssk_90bgntwox_pf_jes_ftf_preselj225_L1jJ160:
+HLT_j360_a10sd_cssk_96bgntwox_pf_jes_ftf_preselj225_L1jJ160:
   eventCount: 1
   stepCounts:
     0: 1
@@ -16094,53 +16148,53 @@ HLT_j400_pf_ftf_preselj225_L1jJ180:
   stepFeatures:
     0: 2
 HLT_j40c_020jvt_2j25c_020jvt_j20c_020jvt_SHARED_2j20c_020jvt_bgn277_pf_ftf_presel1c20XX2c20bgtwo85_L13jJ40p0ETA25:
-  eventCount: 5
+  eventCount: 6
   stepCounts:
-    0: 15
-    1: 9
-    2: 7
-    3: 5
+    0: 16
+    1: 10
+    2: 8
+    3: 6
   stepFeatures:
-    0: 60
-    1: 36
-    2: 127
-    3: 14
+    0: 64
+    1: 40
+    2: 141
+    3: 16
 HLT_j40c_020jvt_2j25c_020jvt_j20c_020jvt_SHARED_2j20c_020jvt_bgn277_pf_ftf_presel2c20XX2c20bgtwo85_L13jJ40p0ETA25:
-  eventCount: 5
+  eventCount: 6
   stepCounts:
-    0: 12
-    1: 7
-    2: 7
-    3: 5
+    0: 13
+    1: 8
+    2: 8
+    3: 6
   stepFeatures:
-    0: 48
-    1: 28
-    2: 127
-    3: 14
+    0: 52
+    1: 32
+    2: 141
+    3: 16
 HLT_j40c_020jvt_2j25c_020jvt_j20c_020jvt_SHARED_2j20c_020jvt_bgn280_pf_ftf_presel1c20XX2c20bgtwo85_L13jJ40p0ETA25:
-  eventCount: 5
+  eventCount: 6
   stepCounts:
-    0: 15
-    1: 9
-    2: 7
-    3: 5
+    0: 16
+    1: 10
+    2: 8
+    3: 6
   stepFeatures:
-    0: 60
-    1: 36
-    2: 127
-    3: 14
+    0: 64
+    1: 40
+    2: 141
+    3: 16
 HLT_j40c_020jvt_2j25c_020jvt_j20c_020jvt_SHARED_2j20c_020jvt_bgn280_pf_ftf_presel2c20XX2c20bgtwo85_L13jJ40p0ETA25:
-  eventCount: 5
+  eventCount: 6
   stepCounts:
-    0: 12
-    1: 7
-    2: 7
-    3: 5
+    0: 13
+    1: 8
+    2: 8
+    3: 6
   stepFeatures:
-    0: 48
-    1: 28
-    2: 127
-    3: 14
+    0: 52
+    1: 32
+    2: 141
+    3: 16
 ? HLT_j40c_020jvt_j28c_020jvt_j20c_020jvt_j20c_020jvt_SHARED_2j20c_020jvt_bgn177_pf_ftf_presel2c20XX2c20b85_L1MU8F_2jJ40_jJ50
 : eventCount: 3
   stepCounts:
@@ -16201,25 +16255,25 @@ HLT_j420_L1jJ160:
   eventCount: 0
 HLT_j420_L1jJ180:
   eventCount: 0
-HLT_j420_a10sd_cssk_60bgntwox_pf_jes_ftf_preselj225_L1jJ160:
+HLT_j420_a10sd_cssk_79bgntwox_pf_jes_ftf_preselj225_L1jJ160:
   eventCount: 0
   stepCounts:
     0: 1
   stepFeatures:
     0: 1
-HLT_j420_a10sd_cssk_70bgntwox_pf_jes_ftf_preselj225_L1jJ160:
+HLT_j420_a10sd_cssk_86bgntwox_pf_jes_ftf_preselj225_L1jJ160:
   eventCount: 0
   stepCounts:
     0: 1
   stepFeatures:
     0: 1
-HLT_j420_a10sd_cssk_80bgntwox_pf_jes_ftf_preselj225_L1jJ160:
+HLT_j420_a10sd_cssk_91bgntwox_pf_jes_ftf_preselj225_L1jJ160:
   eventCount: 0
   stepCounts:
     0: 1
   stepFeatures:
     0: 1
-HLT_j420_a10sd_cssk_90bgntwox_pf_jes_ftf_preselj225_L1jJ160:
+HLT_j420_a10sd_cssk_96bgntwox_pf_jes_ftf_preselj225_L1jJ160:
   eventCount: 0
   stepCounts:
     0: 1
@@ -16310,25 +16364,25 @@ HLT_j45_020jvt_pf_ftf_preselj20_L1RD0_FILLED:
     0: 20
     1: 60
 HLT_j45_0eta290_020jvt_boffperf_pf_ftf_L1jJ50:
-  eventCount: 19
+  eventCount: 20
   stepCounts:
-    0: 19
-    1: 19
-    2: 19
+    0: 20
+    1: 20
+    2: 20
   stepFeatures:
-    0: 19
-    1: 58
-    2: 58
+    0: 20
+    1: 59
+    2: 59
 HLT_j45_0eta290_nnJvtv1_boffperf_pf_ftf_L1jJ50:
-  eventCount: 19
+  eventCount: 20
   stepCounts:
-    0: 19
-    1: 19
-    2: 19
+    0: 20
+    1: 20
+    2: 20
   stepFeatures:
-    0: 19
-    1: 58
-    2: 58
+    0: 20
+    1: 59
+    2: 59
 HLT_j45_L1RD0_FILLED:
   eventCount: 20
   stepCounts:
@@ -16393,25 +16447,25 @@ HLT_j460_a10r_L1jJ160:
   eventCount: 0
 HLT_j460_a10r_L1jLJ140:
   eventCount: 0
-HLT_j460_a10sd_cssk_60bgntwox_pf_jes_ftf_preselj225_L1jJ160:
+HLT_j460_a10sd_cssk_79bgntwox_pf_jes_ftf_preselj225_L1jJ160:
   eventCount: 0
   stepCounts:
     0: 1
   stepFeatures:
     0: 1
-HLT_j460_a10sd_cssk_70bgntwox_pf_jes_ftf_preselj225_L1jJ160:
+HLT_j460_a10sd_cssk_86bgntwox_pf_jes_ftf_preselj225_L1jJ160:
   eventCount: 0
   stepCounts:
     0: 1
   stepFeatures:
     0: 1
-HLT_j460_a10sd_cssk_80bgntwox_pf_jes_ftf_preselj225_L1jJ160:
+HLT_j460_a10sd_cssk_91bgntwox_pf_jes_ftf_preselj225_L1jJ160:
   eventCount: 0
   stepCounts:
     0: 1
   stepFeatures:
     0: 1
-HLT_j460_a10sd_cssk_90bgntwox_pf_jes_ftf_preselj225_L1jJ160:
+HLT_j460_a10sd_cssk_96bgntwox_pf_jes_ftf_preselj225_L1jJ160:
   eventCount: 0
   stepCounts:
     0: 1
@@ -16520,53 +16574,53 @@ HLT_j50_0eta290_020jvt_bgn270_2j45f_pf_ftf_preselj45XX2f40_L1jJ55p0ETA23_2jJ40p3
 HLT_j50_0eta290_nnJvtv1_bgn270_2j45f_pf_ftf_preselj45XX2f40_L1jJ55p0ETA23_2jJ40p30ETA49:
   eventCount: 0
 HLT_j50c_020jvt_2j25c_020jvt_j20c_020jvt_SHARED_2j20c_020jvt_bgn277_pf_ftf_presel1c20XX2c20bgtwo85_L13jJ40p0ETA25:
-  eventCount: 5
+  eventCount: 6
   stepCounts:
-    0: 15
-    1: 9
-    2: 7
-    3: 5
+    0: 16
+    1: 10
+    2: 8
+    3: 6
   stepFeatures:
-    0: 60
-    1: 36
-    2: 122
-    3: 14
+    0: 64
+    1: 40
+    2: 136
+    3: 16
 HLT_j50c_020jvt_2j25c_020jvt_j20c_020jvt_SHARED_2j20c_020jvt_bgn277_pf_ftf_presel2c20XX2c20bgtwo85_L13jJ40p0ETA25:
-  eventCount: 5
+  eventCount: 6
   stepCounts:
-    0: 12
-    1: 7
-    2: 7
-    3: 5
+    0: 13
+    1: 8
+    2: 8
+    3: 6
   stepFeatures:
-    0: 48
-    1: 28
-    2: 122
-    3: 14
+    0: 52
+    1: 32
+    2: 136
+    3: 16
 HLT_j50c_020jvt_2j25c_020jvt_j20c_020jvt_SHARED_2j20c_020jvt_bgn280_pf_ftf_presel1c20XX2c20bgtwo85_L13jJ40p0ETA25:
-  eventCount: 5
+  eventCount: 6
   stepCounts:
-    0: 15
-    1: 9
-    2: 7
-    3: 5
+    0: 16
+    1: 10
+    2: 8
+    3: 6
   stepFeatures:
-    0: 60
-    1: 36
-    2: 122
-    3: 14
+    0: 64
+    1: 40
+    2: 136
+    3: 16
 HLT_j50c_020jvt_2j25c_020jvt_j20c_020jvt_SHARED_2j20c_020jvt_bgn280_pf_ftf_presel2c20XX2c20bgtwo85_L13jJ40p0ETA25:
-  eventCount: 5
+  eventCount: 6
   stepCounts:
-    0: 12
-    1: 7
-    2: 7
-    3: 5
+    0: 13
+    1: 8
+    2: 8
+    3: 6
   stepFeatures:
-    0: 48
-    1: 28
-    2: 122
-    3: 14
+    0: 52
+    1: 32
+    2: 136
+    3: 16
 HLT_j520_L1jJ160:
   eventCount: 0
 HLT_j520_ftf_preselj225_L1jJ160:
@@ -16686,17 +16740,17 @@ HLT_j60_L1jJ90:
   stepFeatures:
     0: 22
 HLT_j60_j45_j25_j20_pf_ftf_preselc60XXc45XXc25XXc20_PhysicsTLA_L1jJ85p0ETA21_3jJ40p0ETA25:
-  eventCount: 7
+  eventCount: 8
   stepCounts:
-    0: 11
-    1: 10
-    2: 7
-    3: 7
+    0: 12
+    1: 11
+    2: 8
+    3: 8
   stepFeatures:
-    0: 44
-    1: 172
-    2: 172
-    3: 28
+    0: 48
+    1: 187
+    2: 187
+    3: 32
 HLT_j60_pf_ftf_preselj50_L1jJ50:
   eventCount: 19
   stepCounts:
@@ -16709,82 +16763,94 @@ HLT_j60f_L1jJ50p30ETA49:
   eventCount: 0
 HLT_j65a_j45a_2j35a_SHARED_2j35_0eta290_020jvt_bgn170_j0_DJMASS1000j50_pf_ftf_presela60XXa40XX2a25_L1jMJJ-500-NFF:
   eventCount: 0
+  stepCounts:
+    0: 1
+  stepFeatures:
+    0: 5
 HLT_j65a_j45a_2j35a_SHARED_2j35_0eta290_020jvt_bgn270_j0_DJMASS1000j50_pf_ftf_presela60XXa40XX2a25_L1jMJJ-500-NFF:
   eventCount: 0
+  stepCounts:
+    0: 1
+  stepFeatures:
+    0: 5
 HLT_j65a_j45a_2j35a_SHARED_2j35_0eta290_nnJvtv1_bgn270_j0_DJMASS1000j50_pf_ftf_presela60XXa40XX2a25_L1jMJJ-500-NFF:
   eventCount: 0
+  stepCounts:
+    0: 1
+  stepFeatures:
+    0: 5
 ? HLT_j65c_020jvt_j40c_020jvt_j25c_020jvt_j20c_020jvt_SHARED_j20c_020jvt_bgn285_pf_ftf_presel2c20XX1c20bgtwo80XX1c20gntau80_L1jJ85p0ETA21_3jJ40p0ETA25
-: eventCount: 9
+: eventCount: 10
   stepCounts:
-    0: 11
-    1: 9
-    2: 9
-    3: 9
+    0: 12
+    1: 10
+    2: 10
+    3: 10
   stepFeatures:
-    0: 55
-    1: 45
-    2: 203
-    3: 17
+    0: 60
+    1: 50
+    2: 218
+    3: 19
 ? HLT_j65c_020jvt_j40c_020jvt_j25c_020jvt_j20c_020jvt_SHARED_j20c_020jvt_bgn285_pf_ftf_presel2c20XX1c20bgtwo82XX1c20gntau80_L1jJ85p0ETA21_3jJ40p0ETA25
-: eventCount: 9
+: eventCount: 10
   stepCounts:
-    0: 11
-    1: 9
-    2: 9
-    3: 9
+    0: 12
+    1: 10
+    2: 10
+    3: 10
   stepFeatures:
-    0: 55
-    1: 45
-    2: 203
-    3: 17
+    0: 60
+    1: 50
+    2: 218
+    3: 19
 ? HLT_j65c_020jvt_j40c_020jvt_j25c_020jvt_j20c_020jvt_SHARED_j20c_020jvt_bgn285_pf_ftf_presel2c20XX1c20bgtwo82XX1c20gntau85_L1jJ85p0ETA21_3jJ40p0ETA25
-: eventCount: 9
+: eventCount: 10
   stepCounts:
-    0: 11
-    1: 9
-    2: 9
-    3: 9
+    0: 12
+    1: 10
+    2: 10
+    3: 10
   stepFeatures:
-    0: 55
-    1: 45
-    2: 203
-    3: 17
+    0: 60
+    1: 50
+    2: 218
+    3: 19
 ? HLT_j65c_020jvt_j40c_020jvt_j25c_020jvt_j20c_020jvt_SHARED_j20c_020jvt_bgn285_pf_ftf_presel2c20XX1c20bgtwo85XX1c20gntau85_L1jJ85p0ETA21_3jJ40p0ETA25
-: eventCount: 9
+: eventCount: 10
   stepCounts:
-    0: 11
-    1: 9
-    2: 9
-    3: 9
+    0: 12
+    1: 10
+    2: 10
+    3: 10
   stepFeatures:
-    0: 55
-    1: 45
-    2: 203
-    3: 17
+    0: 60
+    1: 50
+    2: 218
+    3: 19
 ? HLT_j65c_020jvt_j40c_020jvt_j25c_020jvt_j20c_020jvt_SHARED_j20c_020jvt_bgn285_pf_ftf_presel2c20XX1c20bgtwo85XX1c20gntau90_L1jJ85p0ETA21_3jJ40p0ETA25
-: eventCount: 9
-  stepCounts:
-    0: 11
-    1: 9
-    2: 9
-    3: 9
-  stepFeatures:
-    0: 55
-    1: 45
-    2: 203
-    3: 17
-? HLT_j65c_020jvt_j40c_020jvt_j25c_020jvt_j20c_020jvt_SHARED_j20c_020jvt_bgn285_pf_ftf_presel3c20XX1c20bgtwo85_L1jJ85p0ETA21_3jJ40p0ETA25
 : eventCount: 10
   stepCounts:
-    0: 11
-    1: 11
+    0: 12
+    1: 10
     2: 10
     3: 10
   stepFeatures:
-    0: 55
-    1: 55
-    2: 222
+    0: 60
+    1: 50
+    2: 218
     3: 19
+? HLT_j65c_020jvt_j40c_020jvt_j25c_020jvt_j20c_020jvt_SHARED_j20c_020jvt_bgn285_pf_ftf_presel3c20XX1c20bgtwo85_L1jJ85p0ETA21_3jJ40p0ETA25
+: eventCount: 11
+  stepCounts:
+    0: 12
+    1: 12
+    2: 11
+    3: 11
+  stepFeatures:
+    0: 60
+    1: 60
+    2: 237
+    3: 21
 HLT_j70_0eta290_020jvt_bgn160_3j70_pf_ftf_preselj50b85XX3j50_L14jJ50:
   eventCount: 0
   stepCounts:
@@ -16813,10 +16879,16 @@ HLT_j70_j50a_j0_DJMASS1000j50dphi200x400deta_L1jMJJ-500-NFF:
   eventCount: 0
 HLT_j70_j50a_j0_DJMASS1000j50dphi240_xe90_tcpufit_xe50_cell_L1jMJJ-500-NFF:
   eventCount: 0
+  stepFeatures:
+    0: 2
 HLT_j70a_j50a_2j35a_SHARED_2j35_0eta290_020jvt_bgn170_j0_DJMASS1000j50_pf_ftf_presela60XXa40XX2a25_L1MJJ-500-NFF:
   eventCount: 0
 HLT_j70a_j50a_2j35a_SHARED_2j35_0eta290_020jvt_bgn170_j0_DJMASS1000j50_pf_ftf_presela60XXa40XX2a25_L1jMJJ-500-NFF:
   eventCount: 0
+  stepCounts:
+    0: 1
+  stepFeatures:
+    0: 5
 HLT_j75_0eta290_020jvt_bgn160_3j75_pf_ftf_preselj50b85XX3j50_L14jJ50:
   eventCount: 0
   stepCounts:
@@ -16898,15 +16970,15 @@ HLT_j75_0eta290_nnJvtv1_bgn270_j55_0eta290_nnJvtv1_bgn285_j45f_pf_ftf_preselj60X
     2: 18
     3: 4
 HLT_j75c_020jvt_j50c_020jvt_j25c_020jvt_j20c_020jvt_SHARED_2j20c_020jvt_bgn177_pf_ftf_L1jJ85p0ETA21_3jJ40p0ETA25:
-  eventCount: 5
+  eventCount: 6
   stepCounts:
-    0: 14
-    1: 7
-    2: 5
+    0: 15
+    1: 8
+    2: 6
   stepFeatures:
-    0: 70
-    1: 142
-    2: 14
+    0: 75
+    1: 157
+    2: 16
 ? HLT_j75c_020jvt_j50c_020jvt_j25c_020jvt_j20c_020jvt_SHARED_2j20c_020jvt_bgn177_pf_ftf_presel2c20XX2c20b80_L1MU8F_2jJ40_jJ50
 : eventCount: 1
   stepCounts:
@@ -16920,17 +16992,17 @@ HLT_j75c_020jvt_j50c_020jvt_j25c_020jvt_j20c_020jvt_SHARED_2j20c_020jvt_bgn177_p
     2: 18
     3: 2
 ? HLT_j75c_020jvt_j50c_020jvt_j25c_020jvt_j20c_020jvt_SHARED_2j20c_020jvt_bgn177_pf_ftf_presel2c20XX2c20b80_L1jJ85p0ETA21_3jJ40p0ETA25
-: eventCount: 5
+: eventCount: 6
   stepCounts:
-    0: 11
-    1: 6
-    2: 5
-    3: 5
+    0: 12
+    1: 7
+    2: 6
+    3: 6
   stepFeatures:
-    0: 55
-    1: 30
-    2: 95
-    3: 12
+    0: 60
+    1: 35
+    2: 110
+    3: 14
 ? HLT_j75c_020jvt_j50c_020jvt_j25c_020jvt_j20c_020jvt_SHARED_2j20c_020jvt_bgn177_pf_ftf_presel2c20XX2c20b82_L1MU8F_2jJ40_jJ50
 : eventCount: 1
   stepCounts:
@@ -16944,17 +17016,17 @@ HLT_j75c_020jvt_j50c_020jvt_j25c_020jvt_j20c_020jvt_SHARED_2j20c_020jvt_bgn177_p
     2: 18
     3: 2
 ? HLT_j75c_020jvt_j50c_020jvt_j25c_020jvt_j20c_020jvt_SHARED_2j20c_020jvt_bgn177_pf_ftf_presel2c20XX2c20b82_L1jJ85p0ETA21_3jJ40p0ETA25
-: eventCount: 5
+: eventCount: 6
   stepCounts:
-    0: 11
-    1: 6
-    2: 5
-    3: 5
+    0: 12
+    1: 7
+    2: 6
+    3: 6
   stepFeatures:
-    0: 55
-    1: 30
-    2: 95
-    3: 12
+    0: 60
+    1: 35
+    2: 110
+    3: 14
 ? HLT_j75c_020jvt_j50c_020jvt_j25c_020jvt_j20c_020jvt_SHARED_2j20c_020jvt_bgn177_pf_ftf_presel2c20XX2c20b85_L1MU8F_2jJ40_jJ50
 : eventCount: 1
   stepCounts:
@@ -16968,65 +17040,65 @@ HLT_j75c_020jvt_j50c_020jvt_j25c_020jvt_j20c_020jvt_SHARED_2j20c_020jvt_bgn177_p
     2: 18
     3: 2
 ? HLT_j75c_020jvt_j50c_020jvt_j25c_020jvt_j20c_020jvt_SHARED_2j20c_020jvt_bgn177_pf_ftf_presel2c20XX2c20b85_L1jJ85p0ETA21_3jJ40p0ETA25
-: eventCount: 5
-  stepCounts:
-    0: 11
-    1: 9
-    2: 7
-    3: 5
-  stepFeatures:
-    0: 55
-    1: 45
-    2: 142
-    3: 14
-? HLT_j75c_020jvt_j50c_020jvt_j25c_020jvt_j20c_020jvt_SHARED_2j20c_020jvt_bgn177_pf_ftf_preselZ116MAXMULT20cXX4c20_L1jJ85p0ETA21_3jJ40p0ETA25
-: eventCount: 5
+: eventCount: 6
   stepCounts:
-    0: 11
+    0: 12
     1: 10
-    2: 7
-    3: 5
+    2: 8
+    3: 6
   stepFeatures:
-    0: 55
+    0: 60
     1: 50
-    2: 142
-    3: 14
-? HLT_j75c_020jvt_j50c_020jvt_j25c_020jvt_j20c_020jvt_SHARED_2j20c_020jvt_bgn177_pf_ftf_preselZ120XX4c20_L1jJ85p0ETA21_3jJ40p0ETA25
-: eventCount: 5
+    2: 157
+    3: 16
+? HLT_j75c_020jvt_j50c_020jvt_j25c_020jvt_j20c_020jvt_SHARED_2j20c_020jvt_bgn177_pf_ftf_preselZ116MAXMULT20cXX4c20_L1jJ85p0ETA21_3jJ40p0ETA25
+: eventCount: 6
   stepCounts:
-    0: 11
+    0: 12
     1: 11
-    2: 7
-    3: 5
+    2: 8
+    3: 6
   stepFeatures:
-    0: 55
+    0: 60
     1: 55
-    2: 142
-    3: 14
+    2: 157
+    3: 16
+? HLT_j75c_020jvt_j50c_020jvt_j25c_020jvt_j20c_020jvt_SHARED_2j20c_020jvt_bgn177_pf_ftf_preselZ120XX4c20_L1jJ85p0ETA21_3jJ40p0ETA25
+: eventCount: 6
+  stepCounts:
+    0: 12
+    1: 12
+    2: 8
+    3: 6
+  stepFeatures:
+    0: 60
+    1: 60
+    2: 157
+    3: 16
 ? HLT_j75c_020jvt_j50c_020jvt_j25c_020jvt_j20c_020jvt_SHARED_2j20c_020jvt_bgn177_pf_ftf_preselZ128XX2c20XX2c20b85_L1jJ85p0ETA21_3jJ40p0ETA25
-: eventCount: 5
+: eventCount: 6
   stepCounts:
-    0: 11
-    1: 9
-    2: 7
-    3: 5
+    0: 12
+    1: 10
+    2: 8
+    3: 6
   stepFeatures:
-    0: 55
-    1: 45
-    2: 142
-    3: 14
+    0: 60
+    1: 50
+    2: 157
+    3: 16
 ? HLT_j75c_020jvt_j50c_020jvt_j25c_020jvt_j20c_020jvt_SHARED_2j20c_020jvt_bgn177_pf_ftf_preselZ138XX4c20_L1jJ85p0ETA21_3jJ40p0ETA25
-: eventCount: 5
+: eventCount: 6
   stepCounts:
-    0: 11
-    1: 11
-    2: 7
-    3: 5
+    0: 12
+    1: 12
+    2: 8
+    3: 6
   stepFeatures:
-    0: 55
-    1: 55
-    2: 142
-    3: 14
+    0: 60
+    1: 60
+    2: 157
+    3: 16
 ? HLT_j75c_020jvt_j50c_020jvt_j25c_020jvt_j20c_020jvt_SHARED_2j20c_020jvt_bgn277_pf_ftf_presel1c20XX2c20bgtwo85_L1MU8F_2jJ40_jJ50
 : eventCount: 1
   stepCounts:
@@ -17040,17 +17112,17 @@ HLT_j75c_020jvt_j50c_020jvt_j25c_020jvt_j20c_020jvt_SHARED_2j20c_020jvt_bgn177_p
     2: 18
     3: 2
 ? HLT_j75c_020jvt_j50c_020jvt_j25c_020jvt_j20c_020jvt_SHARED_2j20c_020jvt_bgn277_pf_ftf_presel1c20XX2c20bgtwo85_L1jJ85p0ETA21_3jJ40p0ETA25
-: eventCount: 3
+: eventCount: 4
   stepCounts:
-    0: 14
-    1: 8
-    2: 5
-    3: 3
+    0: 15
+    1: 9
+    2: 6
+    3: 4
   stepFeatures:
-    0: 70
-    1: 40
-    2: 95
-    3: 10
+    0: 75
+    1: 45
+    2: 110
+    3: 12
 ? HLT_j75c_020jvt_j50c_020jvt_j25c_020jvt_j20c_020jvt_SHARED_2j20c_020jvt_bgn277_pf_ftf_presel2c20XX2c20bgtwo85_L1MU8F_2jJ40_jJ50
 : eventCount: 1
   stepCounts:
@@ -17064,17 +17136,17 @@ HLT_j75c_020jvt_j50c_020jvt_j25c_020jvt_j20c_020jvt_SHARED_2j20c_020jvt_bgn177_p
     2: 18
     3: 2
 ? HLT_j75c_020jvt_j50c_020jvt_j25c_020jvt_j20c_020jvt_SHARED_2j20c_020jvt_bgn277_pf_ftf_presel2c20XX2c20bgtwo85_L1jJ85p0ETA21_3jJ40p0ETA25
-: eventCount: 3
+: eventCount: 4
   stepCounts:
-    0: 11
-    1: 6
-    2: 5
-    3: 3
+    0: 12
+    1: 7
+    2: 6
+    3: 4
   stepFeatures:
-    0: 55
-    1: 30
-    2: 95
-    3: 10
+    0: 60
+    1: 35
+    2: 110
+    3: 12
 ? HLT_j75c_020jvt_j50c_020jvt_j25c_020jvt_j20c_020jvt_SHARED_2j20c_020jvt_bgn280_pf_ftf_presel1c20XX2c20bgtwo85_L1MU8F_2jJ40_jJ50
 : eventCount: 1
   stepCounts:
@@ -17088,17 +17160,17 @@ HLT_j75c_020jvt_j50c_020jvt_j25c_020jvt_j20c_020jvt_SHARED_2j20c_020jvt_bgn177_p
     2: 18
     3: 2
 ? HLT_j75c_020jvt_j50c_020jvt_j25c_020jvt_j20c_020jvt_SHARED_2j20c_020jvt_bgn280_pf_ftf_presel1c20XX2c20bgtwo85_L1jJ85p0ETA21_3jJ40p0ETA25
-: eventCount: 3
+: eventCount: 4
   stepCounts:
-    0: 14
-    1: 8
-    2: 5
-    3: 3
+    0: 15
+    1: 9
+    2: 6
+    3: 4
   stepFeatures:
-    0: 70
-    1: 40
-    2: 95
-    3: 10
+    0: 75
+    1: 45
+    2: 110
+    3: 12
 ? HLT_j75c_020jvt_j50c_020jvt_j25c_020jvt_j20c_020jvt_SHARED_2j20c_020jvt_bgn280_pf_ftf_presel2c20XX2c20bgtwo85_L1MU8F_2jJ40_jJ50
 : eventCount: 1
   stepCounts:
@@ -17112,137 +17184,137 @@ HLT_j75c_020jvt_j50c_020jvt_j25c_020jvt_j20c_020jvt_SHARED_2j20c_020jvt_bgn177_p
     2: 18
     3: 2
 ? HLT_j75c_020jvt_j50c_020jvt_j25c_020jvt_j20c_020jvt_SHARED_2j20c_020jvt_bgn280_pf_ftf_presel2c20XX2c20bgtwo85_L1jJ85p0ETA21_3jJ40p0ETA25
-: eventCount: 3
+: eventCount: 4
   stepCounts:
-    0: 11
-    1: 6
-    2: 5
-    3: 3
+    0: 12
+    1: 7
+    2: 6
+    3: 4
   stepFeatures:
-    0: 55
-    1: 30
-    2: 95
-    3: 10
+    0: 60
+    1: 35
+    2: 110
+    3: 12
 ? HLT_j75c_020jvt_j50c_020jvt_j25c_020jvt_j20c_020jvt_SHARED_3j20c_020jvt_bgn182_pf_ftf_presel2c20XX2c20b80_L1jJ85p0ETA21_3jJ40p0ETA25
 : eventCount: 1
   stepCounts:
-    0: 11
-    1: 6
-    2: 5
+    0: 12
+    1: 7
+    2: 6
     3: 1
   stepFeatures:
-    0: 55
-    1: 30
-    2: 95
-    3: 12
+    0: 60
+    1: 35
+    2: 110
+    3: 14
 ? HLT_j75c_020jvt_j50c_020jvt_j25c_020jvt_j20c_020jvt_SHARED_3j20c_020jvt_bgn182_pf_ftf_presel2c20XX2c20b82_L1jJ85p0ETA21_3jJ40p0ETA25
 : eventCount: 1
   stepCounts:
-    0: 11
-    1: 6
-    2: 5
+    0: 12
+    1: 7
+    2: 6
     3: 1
   stepFeatures:
-    0: 55
-    1: 30
-    2: 95
-    3: 12
+    0: 60
+    1: 35
+    2: 110
+    3: 14
 ? HLT_j75c_020jvt_j50c_020jvt_j25c_020jvt_j20c_020jvt_SHARED_3j20c_020jvt_bgn182_pf_ftf_presel2c20XX2c20b85_L1jJ85p0ETA21_3jJ40p0ETA25
 : eventCount: 1
   stepCounts:
-    0: 11
-    1: 9
-    2: 7
+    0: 12
+    1: 10
+    2: 8
     3: 1
   stepFeatures:
-    0: 55
-    1: 45
-    2: 142
-    3: 14
+    0: 60
+    1: 50
+    2: 157
+    3: 16
 ? HLT_j75c_020jvt_j50c_020jvt_j25c_020jvt_j20c_020jvt_SHARED_3j20c_020jvt_bgn282_pf_ftf_presel1c20XX2c20bgtwo85_L1jJ85p0ETA21_3jJ40p0ETA25
 : eventCount: 1
   stepCounts:
-    0: 14
-    1: 8
-    2: 5
+    0: 15
+    1: 9
+    2: 6
     3: 1
   stepFeatures:
-    0: 70
-    1: 40
-    2: 95
-    3: 11
+    0: 75
+    1: 45
+    2: 110
+    3: 13
 ? HLT_j75c_020jvt_j50c_020jvt_j25c_020jvt_j20c_020jvt_SHARED_3j20c_020jvt_bgn282_pf_ftf_presel2c20XX2c20bgtwo85_L1jJ85p0ETA21_3jJ40p0ETA25
 : eventCount: 1
   stepCounts:
-    0: 11
-    1: 6
-    2: 5
+    0: 12
+    1: 7
+    2: 6
     3: 1
   stepFeatures:
-    0: 55
-    1: 30
-    2: 95
-    3: 11
+    0: 60
+    1: 35
+    2: 110
+    3: 13
 HLT_j75c_020jvt_j50c_020jvt_j25c_020jvt_j20c_020jvt_boffperf_pf_ftf_presel1c20XX2c20bgtwo85_L1jJ85p0ETA21_3jJ40p0ETA25:
-  eventCount: 5
+  eventCount: 6
   stepCounts:
-    0: 14
-    1: 8
-    2: 5
-    3: 5
+    0: 15
+    1: 9
+    2: 6
+    3: 6
   stepFeatures:
-    0: 56
-    1: 32
-    2: 71
-    3: 24
+    0: 60
+    1: 36
+    2: 82
+    3: 28
 HLT_j75c_020jvt_j50c_020jvt_j25c_020jvt_j20c_020jvt_boffperf_pf_ftf_presel2c20XX2c20b80_L1jJ85p0ETA21_3jJ40p0ETA25:
-  eventCount: 5
+  eventCount: 6
   stepCounts:
-    0: 11
-    1: 6
-    2: 5
-    3: 5
+    0: 12
+    1: 7
+    2: 6
+    3: 6
   stepFeatures:
-    0: 44
-    1: 24
-    2: 71
-    3: 24
+    0: 48
+    1: 28
+    2: 82
+    3: 28
 HLT_j75c_020jvt_j50c_020jvt_j25c_020jvt_j20c_020jvt_boffperf_pf_ftf_presel2c20XX2c20b82_L1jJ85p0ETA21_3jJ40p0ETA25:
-  eventCount: 5
+  eventCount: 6
   stepCounts:
-    0: 11
-    1: 6
-    2: 5
-    3: 5
+    0: 12
+    1: 7
+    2: 6
+    3: 6
   stepFeatures:
-    0: 44
-    1: 24
-    2: 71
-    3: 24
+    0: 48
+    1: 28
+    2: 82
+    3: 28
 HLT_j75c_020jvt_j50c_020jvt_j25c_020jvt_j20c_020jvt_boffperf_pf_ftf_presel2c20XX2c20b85_L1jJ85p0ETA21_3jJ40p0ETA25:
-  eventCount: 7
+  eventCount: 8
   stepCounts:
-    0: 11
-    1: 9
-    2: 7
-    3: 7
+    0: 12
+    1: 10
+    2: 8
+    3: 8
   stepFeatures:
-    0: 44
-    1: 36
-    2: 105
-    3: 37
+    0: 48
+    1: 40
+    2: 116
+    3: 41
 HLT_j75c_020jvt_j50c_020jvt_j25c_020jvt_j20c_020jvt_boffperf_pf_ftf_presel2c20XX2c20bgtwo85_L1jJ85p0ETA21_3jJ40p0ETA25:
-  eventCount: 5
+  eventCount: 6
   stepCounts:
-    0: 11
-    1: 6
-    2: 5
-    3: 5
+    0: 12
+    1: 7
+    2: 6
+    3: 6
   stepFeatures:
-    0: 44
-    1: 24
-    2: 71
-    3: 24
+    0: 48
+    1: 28
+    2: 82
+    3: 28
 HLT_j75c_j55_j45f_SHARED_2j45_0eta290_020jvt_bgn160_pf_ftf_preselc60XXj45XXf40_L1jJ80p0ETA25_2jJ55_jJ50p30ETA49:
   eventCount: 0
 HLT_j75c_j55_j45f_SHARED_2j45_0eta290_020jvt_bgn260_pf_ftf_preselc60XXj45XXf40_L1jJ80p0ETA25_2jJ55_jJ50p30ETA49:
@@ -17262,17 +17334,17 @@ HLT_j75c_j55_j45f_SHARED_2j45_0eta290_nnJvtv1_bgn260_pf_ftf_preselc60XXj45XXf40_
     2: 18
     3: 2
 ? HLT_j75c_nnJvtv1_j50c_nnJvtv1_j25c_nnJvtv1_j20c_nnJvtv1_SHARED_2j20c_nnJvtv1_bgn277_pf_ftf_presel1c20XX2c20bgtwo85_L1jJ85p0ETA21_3jJ40p0ETA25
-: eventCount: 3
+: eventCount: 4
   stepCounts:
-    0: 14
-    1: 8
-    2: 5
-    3: 3
+    0: 15
+    1: 9
+    2: 6
+    3: 4
   stepFeatures:
-    0: 70
-    1: 40
-    2: 95
-    3: 10
+    0: 75
+    1: 45
+    2: 110
+    3: 12
 ? HLT_j75c_nnJvtv1_j50c_nnJvtv1_j25c_nnJvtv1_j20c_nnJvtv1_SHARED_2j20c_nnJvtv1_bgn277_pf_ftf_presel2c20XX2c20bgtwo85_L1MU8F_2jJ40_jJ50
 : eventCount: 1
   stepCounts:
@@ -17286,17 +17358,17 @@ HLT_j75c_j55_j45f_SHARED_2j45_0eta290_nnJvtv1_bgn260_pf_ftf_preselc60XXj45XXf40_
     2: 18
     3: 2
 ? HLT_j75c_nnJvtv1_j50c_nnJvtv1_j25c_nnJvtv1_j20c_nnJvtv1_SHARED_2j20c_nnJvtv1_bgn277_pf_ftf_presel2c20XX2c20bgtwo85_L1jJ85p0ETA21_3jJ40p0ETA25
-: eventCount: 3
+: eventCount: 4
   stepCounts:
-    0: 11
-    1: 6
-    2: 5
-    3: 3
+    0: 12
+    1: 7
+    2: 6
+    3: 4
   stepFeatures:
-    0: 55
-    1: 30
-    2: 95
-    3: 10
+    0: 60
+    1: 35
+    2: 110
+    3: 12
 ? HLT_j75c_nnJvtv1_j50c_nnJvtv1_j25c_nnJvtv1_j20c_nnJvtv1_SHARED_2j20c_nnJvtv1_bgn280_pf_ftf_presel1c20XX2c20bgtwo85_L1MU8F_2jJ40_jJ50
 : eventCount: 1
   stepCounts:
@@ -17310,17 +17382,17 @@ HLT_j75c_j55_j45f_SHARED_2j45_0eta290_nnJvtv1_bgn260_pf_ftf_preselc60XXj45XXf40_
     2: 18
     3: 2
 ? HLT_j75c_nnJvtv1_j50c_nnJvtv1_j25c_nnJvtv1_j20c_nnJvtv1_SHARED_2j20c_nnJvtv1_bgn280_pf_ftf_presel1c20XX2c20bgtwo85_L1jJ85p0ETA21_3jJ40p0ETA25
-: eventCount: 3
+: eventCount: 4
   stepCounts:
-    0: 14
-    1: 8
-    2: 5
-    3: 3
+    0: 15
+    1: 9
+    2: 6
+    3: 4
   stepFeatures:
-    0: 70
-    1: 40
-    2: 95
-    3: 10
+    0: 75
+    1: 45
+    2: 110
+    3: 12
 ? HLT_j75c_nnJvtv1_j50c_nnJvtv1_j25c_nnJvtv1_j20c_nnJvtv1_SHARED_2j20c_nnJvtv1_bgn280_pf_ftf_presel2c20XX2c20bgtwo85_L1MU8F_2jJ40_jJ50
 : eventCount: 1
   stepCounts:
@@ -17334,65 +17406,65 @@ HLT_j75c_j55_j45f_SHARED_2j45_0eta290_nnJvtv1_bgn260_pf_ftf_preselc60XXj45XXf40_
     2: 18
     3: 2
 ? HLT_j75c_nnJvtv1_j50c_nnJvtv1_j25c_nnJvtv1_j20c_nnJvtv1_SHARED_2j20c_nnJvtv1_bgn280_pf_ftf_presel2c20XX2c20bgtwo85_L1jJ85p0ETA21_3jJ40p0ETA25
-: eventCount: 3
+: eventCount: 4
   stepCounts:
-    0: 11
-    1: 6
-    2: 5
-    3: 3
+    0: 12
+    1: 7
+    2: 6
+    3: 4
   stepFeatures:
-    0: 55
-    1: 30
-    2: 95
-    3: 10
+    0: 60
+    1: 35
+    2: 110
+    3: 12
 ? HLT_j75c_nnJvtv1_j50c_nnJvtv1_j25c_nnJvtv1_j20c_nnJvtv1_SHARED_3j20c_nnJvtv1_bgn282_pf_ftf_presel1c20XX2c20bgtwo85_L1jJ85p0ETA21_3jJ40p0ETA25
 : eventCount: 1
   stepCounts:
-    0: 14
-    1: 8
-    2: 5
+    0: 15
+    1: 9
+    2: 6
     3: 1
   stepFeatures:
-    0: 70
-    1: 40
-    2: 95
-    3: 11
+    0: 75
+    1: 45
+    2: 110
+    3: 13
 ? HLT_j75c_nnJvtv1_j50c_nnJvtv1_j25c_nnJvtv1_j20c_nnJvtv1_SHARED_3j20c_nnJvtv1_bgn282_pf_ftf_presel2c20XX2c20bgtwo85_L1jJ85p0ETA21_3jJ40p0ETA25
 : eventCount: 1
   stepCounts:
-    0: 11
-    1: 6
-    2: 5
+    0: 12
+    1: 7
+    2: 6
     3: 1
   stepFeatures:
-    0: 55
-    1: 30
-    2: 95
-    3: 11
+    0: 60
+    1: 35
+    2: 110
+    3: 13
 HLT_j75c_nnJvtv1_j50c_nnJvtv1_j25c_nnJvtv1_j20c_nnJvtv1_boffperf_pf_ftf_presel1c20XX2c20bgtwo85_L1jJ85p0ETA21_3jJ40p0ETA25:
-  eventCount: 5
+  eventCount: 6
   stepCounts:
-    0: 14
-    1: 8
-    2: 5
-    3: 5
+    0: 15
+    1: 9
+    2: 6
+    3: 6
   stepFeatures:
-    0: 56
-    1: 32
-    2: 71
-    3: 24
+    0: 60
+    1: 36
+    2: 82
+    3: 28
 HLT_j75c_nnJvtv1_j50c_nnJvtv1_j25c_nnJvtv1_j20c_nnJvtv1_boffperf_pf_ftf_presel2c20XX2c20bgtwo85_L1jJ85p0ETA21_3jJ40p0ETA25:
-  eventCount: 5
+  eventCount: 6
   stepCounts:
-    0: 11
-    1: 6
-    2: 5
-    3: 5
+    0: 12
+    1: 7
+    2: 6
+    3: 6
   stepFeatures:
-    0: 44
-    1: 24
-    2: 71
-    3: 24
+    0: 48
+    1: 28
+    2: 82
+    3: 28
 HLT_j80_0eta290_020jvt_bgn160_pf_ftf_xe60_cell_L12jJ90_jXE80:
   eventCount: 2
   stepCounts:
@@ -17438,17 +17510,17 @@ HLT_j80_0eta290_nnJvtv1_boffperf_pf_ftf_L1jJ90:
     2: 18
     3: 2
 ? HLT_j80c_020jvt_j55c_020jvt_j28c_020jvt_j20c_020jvt_SHARED_2j20c_020jvt_bgn177_pf_ftf_presel2c20XX2c20b80_L1jJ85p0ETA21_3jJ40p0ETA25
-: eventCount: 5
+: eventCount: 6
   stepCounts:
-    0: 11
-    1: 6
-    2: 5
-    3: 5
+    0: 12
+    1: 7
+    2: 6
+    3: 6
   stepFeatures:
-    0: 55
-    1: 30
-    2: 93
-    3: 12
+    0: 60
+    1: 35
+    2: 108
+    3: 14
 ? HLT_j80c_020jvt_j55c_020jvt_j28c_020jvt_j20c_020jvt_SHARED_2j20c_020jvt_bgn177_pf_ftf_presel2c20XX2c20b82_L1MU8F_2jJ40_jJ50
 : eventCount: 1
   stepCounts:
@@ -17462,17 +17534,17 @@ HLT_j80_0eta290_nnJvtv1_boffperf_pf_ftf_L1jJ90:
     2: 18
     3: 2
 ? HLT_j80c_020jvt_j55c_020jvt_j28c_020jvt_j20c_020jvt_SHARED_2j20c_020jvt_bgn177_pf_ftf_presel2c20XX2c20b82_L1jJ85p0ETA21_3jJ40p0ETA25
-: eventCount: 5
+: eventCount: 6
   stepCounts:
-    0: 11
-    1: 6
-    2: 5
-    3: 5
+    0: 12
+    1: 7
+    2: 6
+    3: 6
   stepFeatures:
-    0: 55
-    1: 30
-    2: 93
-    3: 12
+    0: 60
+    1: 35
+    2: 108
+    3: 14
 ? HLT_j80c_020jvt_j55c_020jvt_j28c_020jvt_j20c_020jvt_SHARED_2j20c_020jvt_bgn177_pf_ftf_presel2c20XX2c20b85_L1MU8F_2jJ40_jJ50
 : eventCount: 1
   stepCounts:
@@ -17486,89 +17558,89 @@ HLT_j80_0eta290_nnJvtv1_boffperf_pf_ftf_L1jJ90:
     2: 18
     3: 2
 ? HLT_j80c_020jvt_j55c_020jvt_j28c_020jvt_j20c_020jvt_SHARED_2j20c_020jvt_bgn177_pf_ftf_presel2c20XX2c20b85_L1jJ85p0ETA21_3jJ40p0ETA25
-: eventCount: 5
+: eventCount: 6
   stepCounts:
-    0: 11
-    1: 9
-    2: 6
-    3: 5
+    0: 12
+    1: 10
+    2: 7
+    3: 6
   stepFeatures:
-    0: 55
-    1: 45
-    2: 112
-    3: 13
+    0: 60
+    1: 50
+    2: 127
+    3: 15
 ? HLT_j80c_020jvt_j55c_020jvt_j28c_020jvt_j20c_020jvt_SHARED_3j20c_020jvt_bgn182_pf_ftf_presel2c20XX2c20b80_L1jJ85p0ETA21_3jJ40p0ETA25
 : eventCount: 1
   stepCounts:
-    0: 11
-    1: 6
-    2: 5
+    0: 12
+    1: 7
+    2: 6
     3: 1
   stepFeatures:
-    0: 55
-    1: 30
-    2: 93
-    3: 12
+    0: 60
+    1: 35
+    2: 108
+    3: 14
 ? HLT_j80c_020jvt_j55c_020jvt_j28c_020jvt_j20c_020jvt_SHARED_3j20c_020jvt_bgn182_pf_ftf_presel2c20XX2c20b82_L1jJ85p0ETA21_3jJ40p0ETA25
 : eventCount: 1
   stepCounts:
-    0: 11
-    1: 6
-    2: 5
+    0: 12
+    1: 7
+    2: 6
     3: 1
   stepFeatures:
-    0: 55
-    1: 30
-    2: 93
-    3: 12
+    0: 60
+    1: 35
+    2: 108
+    3: 14
 ? HLT_j80c_020jvt_j55c_020jvt_j28c_020jvt_j20c_020jvt_SHARED_3j20c_020jvt_bgn182_pf_ftf_presel2c20XX2c20b85_L1jJ85p0ETA21_3jJ40p0ETA25
 : eventCount: 1
   stepCounts:
-    0: 11
-    1: 9
-    2: 6
+    0: 12
+    1: 10
+    2: 7
     3: 1
   stepFeatures:
-    0: 55
-    1: 45
-    2: 112
-    3: 13
+    0: 60
+    1: 50
+    2: 127
+    3: 15
 HLT_j80c_020jvt_j55c_020jvt_j28c_020jvt_j20c_020jvt_boffperf_pf_ftf_presel2c20XX2c20b80_L1jJ85p0ETA21_3jJ40p0ETA25:
-  eventCount: 5
-  stepCounts:
-    0: 11
-    1: 6
-    2: 5
-    3: 5
-  stepFeatures:
-    0: 44
-    1: 24
-    2: 69
-    3: 24
-HLT_j80c_020jvt_j55c_020jvt_j28c_020jvt_j20c_020jvt_boffperf_pf_ftf_presel2c20XX2c20b82_L1jJ85p0ETA21_3jJ40p0ETA25:
-  eventCount: 5
+  eventCount: 6
   stepCounts:
-    0: 11
-    1: 6
-    2: 5
-    3: 5
+    0: 12
+    1: 7
+    2: 6
+    3: 6
   stepFeatures:
-    0: 44
-    1: 24
-    2: 69
-    3: 24
-HLT_j80c_020jvt_j55c_020jvt_j28c_020jvt_j20c_020jvt_boffperf_pf_ftf_presel2c20XX2c20b85_L1jJ85p0ETA21_3jJ40p0ETA25:
+    0: 48
+    1: 28
+    2: 80
+    3: 28
+HLT_j80c_020jvt_j55c_020jvt_j28c_020jvt_j20c_020jvt_boffperf_pf_ftf_presel2c20XX2c20b82_L1jJ85p0ETA21_3jJ40p0ETA25:
   eventCount: 6
   stepCounts:
-    0: 11
-    1: 9
+    0: 12
+    1: 7
     2: 6
     3: 6
   stepFeatures:
-    0: 44
-    1: 36
-    2: 83
-    3: 29
+    0: 48
+    1: 28
+    2: 80
+    3: 28
+HLT_j80c_020jvt_j55c_020jvt_j28c_020jvt_j20c_020jvt_boffperf_pf_ftf_presel2c20XX2c20b85_L1jJ85p0ETA21_3jJ40p0ETA25:
+  eventCount: 7
+  stepCounts:
+    0: 12
+    1: 10
+    2: 7
+    3: 7
+  stepFeatures:
+    0: 48
+    1: 40
+    2: 94
+    3: 33
 HLT_j80c_j60_j45f_SHARED_2j45_0eta290_020jvt_bgn160_pf_ftf_preselc60XXj45XXf40_L1jJ80p0ETA25_2jJ55_jJ50p30ETA49:
   eventCount: 0
 HLT_j85_L1gJ20p0ETA25:
@@ -18831,19 +18903,6 @@ HLT_mu14_ivarloose_tau25_mediumRNN_tracktwoMVA_03dRAB_L1MU8F_cTAU20M_3jJ30:
     2: 11
     3: 11
     4: 3
-HLT_mu14_ivarloose_tau35_mediumGNTau_03dRAB_L1MU8F_cTAU30M:
-  eventCount: 0
-  stepCounts:
-    0: 5
-    1: 3
-    2: 3
-    3: 3
-  stepFeatures:
-    0: 17
-    1: 13
-    2: 10
-    3: 10
-    4: 3
 HLT_mu14_ivarloose_tau35_mediumGNTau_03dRAB_L1cTAU30M_3DR35-MU8F-eTAU30:
   eventCount: 0
   stepCounts:
@@ -25055,6 +25114,17 @@ HLT_mu4_j45_0eta290_nnJvtv1_boffperf_pf_ftf_dRAB04_L1MU3V_jJ40:
     6: 20
 HLT_mu4_j70_j50a_j0_DJMASS1000j50_xe50_tcpufit_L1jMJJ-500-NFF:
   eventCount: 0
+  stepCounts:
+    0: 1
+    1: 1
+    2: 1
+    3: 1
+  stepFeatures:
+    0: 1
+    1: 1
+    2: 1
+    3: 1
+    4: 1
 HLT_mu4_l2io_L1MU3V:
   eventCount: 8
   stepCounts:
@@ -26830,13 +26900,13 @@ HLT_noalg_L1jJ40:
 HLT_noalg_L1jJ40p30ETA49:
   eventCount: 2
 HLT_noalg_L1jJ50:
-  eventCount: 19
+  eventCount: 20
 HLT_noalg_L1jJ500:
   eventCount: 0
 HLT_noalg_L1jJ50p30ETA49:
   eventCount: 1
 HLT_noalg_L1jJ60:
-  eventCount: 16
+  eventCount: 17
 HLT_noalg_L1jJ60p30ETA49:
   eventCount: 0
 HLT_noalg_L1jJ90:
@@ -26910,54 +26980,54 @@ HLT_tau0_mediumGNTau_tau0_mediumGNTau_03dRAB_L1cTAU30M_2cTAU20M_DR-eTAU30eTAU20-
 HLT_tau0_mediumRNN_tracktwoMVA_tau0_mediumRNN_tracktwoMVA_03dRAB_L14jJ30p0ETA24_0DETA24-eTAU30eTAU12:
   eventCount: 0
   stepCounts:
-    0: 6
-    1: 6
-    2: 6
-    3: 6
+    0: 7
+    1: 7
+    2: 7
+    3: 7
   stepFeatures:
-    0: 47
-    1: 47
-    2: 47
-    3: 47
+    0: 51
+    1: 51
+    2: 51
+    3: 51
     4: 2
 HLT_tau0_mediumRNN_tracktwoMVA_tau0_mediumRNN_tracktwoMVA_03dRAB_L14jJ30p0ETA24_0DETA24_10DPHI99-eTAU30eTAU12:
   eventCount: 0
   stepCounts:
-    0: 6
-    1: 6
-    2: 6
-    3: 6
+    0: 7
+    1: 7
+    2: 7
+    3: 7
   stepFeatures:
-    0: 47
-    1: 47
-    2: 47
-    3: 47
+    0: 51
+    1: 51
+    2: 51
+    3: 51
     4: 2
 HLT_tau0_mediumRNN_tracktwoMVA_tau0_mediumRNN_tracktwoMVA_03dRAB_L14jJ30p0ETA24_0DETA24_4DPHI99-eTAU30eTAU12:
   eventCount: 0
   stepCounts:
-    0: 6
-    1: 6
-    2: 6
-    3: 6
+    0: 7
+    1: 7
+    2: 7
+    3: 7
   stepFeatures:
-    0: 47
-    1: 47
-    2: 47
-    3: 47
+    0: 51
+    1: 51
+    2: 51
+    3: 51
     4: 2
 HLT_tau0_mediumRNN_tracktwoMVA_tau0_mediumRNN_tracktwoMVA_03dRAB_L14jJ30p0ETA24_0DETA24_4DPHI99-eTAU30eTAU20:
   eventCount: 0
   stepCounts:
-    0: 6
-    1: 6
-    2: 6
-    3: 6
+    0: 7
+    1: 7
+    2: 7
+    3: 7
   stepFeatures:
-    0: 42
-    1: 42
-    2: 42
-    3: 42
+    0: 46
+    1: 46
+    2: 46
+    3: 46
     4: 2
 HLT_tau0_mediumRNN_tracktwoMVA_tau0_mediumRNN_tracktwoMVA_03dRAB_L1cTAU30M_2cTAU20M_4jJ30p0ETA25:
   eventCount: 0
@@ -27705,7 +27775,7 @@ HLT_tau20_mediumGNTau_L1eTAU12:
 HLT_tau20_mediumGNTau_probe_L1eTAU12_j110_pf_ftf_preselj80_03dRAB_L1jJ60:
   eventCount: 2
   stepCounts:
-    0: 12
+    0: 13
     1: 8
     2: 8
     3: 8
@@ -27713,7 +27783,7 @@ HLT_tau20_mediumGNTau_probe_L1eTAU12_j110_pf_ftf_preselj80_03dRAB_L1jJ60:
     5: 8
     6: 2
   stepFeatures:
-    0: 12
+    0: 13
     1: 12
     2: 26
     3: 26
@@ -28135,51 +28205,51 @@ HLT_tau20_mediumRNN_tracktwoMVA_L1eTAU12:
 ? HLT_tau20_mediumRNN_tracktwoMVA_probe_L1eTAU12_2j40c_020jvt_j25c_020jvt_j20c_020jvt_SHARED_j20c_020jvt_bgn285_pf_ftf_presel3c20XX1c20bgtwo85_L13jJ40p0ETA25
 : eventCount: 5
   stepCounts:
-    0: 12
-    1: 12
-    2: 11
-    3: 11
-    4: 11
-    5: 11
-    6: 11
-    7: 11
+    0: 13
+    1: 13
+    2: 12
+    3: 12
+    4: 12
+    5: 12
+    6: 12
+    7: 12
     8: 5
   stepFeatures:
-    0: 48
-    1: 48
-    2: 221
-    3: 21
-    4: 39
-    5: 39
-    6: 39
-    7: 39
+    0: 52
+    1: 52
+    2: 235
+    3: 23
+    4: 41
+    5: 41
+    6: 41
+    7: 41
     8: 5
 ? HLT_tau20_mediumRNN_tracktwoMVA_probe_L1eTAU12_j50c_020jvt_j40c_020jvt_j25c_020jvt_j20c_020jvt_SHARED_j20c_020jvt_bgn285_pf_ftf_presel3c20XX1c20bgtwo85_L13jJ40p0ETA25
 : eventCount: 5
   stepCounts:
-    0: 12
-    1: 12
-    2: 11
-    3: 11
-    4: 11
-    5: 11
-    6: 11
-    7: 11
+    0: 13
+    1: 13
+    2: 12
+    3: 12
+    4: 12
+    5: 12
+    6: 12
+    7: 12
     8: 5
   stepFeatures:
-    0: 60
-    1: 60
-    2: 256
-    3: 21
-    4: 39
-    5: 39
-    6: 39
-    7: 39
+    0: 65
+    1: 65
+    2: 273
+    3: 23
+    4: 41
+    5: 41
+    6: 41
+    7: 41
     8: 5
 HLT_tau20_mediumRNN_tracktwoMVA_probe_j110_pf_ftf_preselj80_03dRAB_L1jJ60:
   eventCount: 2
   stepCounts:
-    0: 12
+    0: 13
     1: 8
     2: 8
     3: 8
@@ -28187,7 +28257,7 @@ HLT_tau20_mediumRNN_tracktwoMVA_probe_j110_pf_ftf_preselj80_03dRAB_L1jJ60:
     5: 8
     6: 2
   stepFeatures:
-    0: 12
+    0: 13
     1: 12
     2: 26
     3: 26
@@ -29003,118 +29073,96 @@ HLT_tau25_mediumGNTau_probe_L1cTAU20M_xe75_cell_xe100_pfopufit_L1jXE110:
 ? HLT_tau25_mediumGNTau_probe_L1eTAU12_j65c_020jvt_j40c_020jvt_j25c_020jvt_j20c_020jvt_SHARED_j20c_020jvt_bgn285_pf_ftf_presel2c20XX1c20bgtwo80XX1c20gntau80_L1jJ85p0ETA21_3jJ40p0ETA25
 : eventCount: 5
   stepCounts:
-    0: 11
-    1: 9
-    2: 9
-    3: 9
-    4: 9
-    5: 9
-    6: 9
-    7: 9
+    0: 12
+    1: 10
+    2: 10
+    3: 10
+    4: 10
+    5: 10
+    6: 10
+    7: 10
     8: 5
   stepFeatures:
-    0: 55
-    1: 45
-    2: 203
-    3: 17
-    4: 30
-    5: 30
-    6: 30
-    7: 30
+    0: 60
+    1: 50
+    2: 218
+    3: 19
+    4: 32
+    5: 32
+    6: 32
+    7: 32
     8: 5
 ? HLT_tau25_mediumGNTau_probe_L1eTAU12_j65c_020jvt_j40c_020jvt_j25c_020jvt_j20c_020jvt_SHARED_j20c_020jvt_bgn285_pf_ftf_presel2c20XX1c20bgtwo82XX1c20gntau80_L1jJ85p0ETA21_3jJ40p0ETA25
 : eventCount: 5
   stepCounts:
-    0: 11
-    1: 9
-    2: 9
-    3: 9
-    4: 9
-    5: 9
-    6: 9
-    7: 9
+    0: 12
+    1: 10
+    2: 10
+    3: 10
+    4: 10
+    5: 10
+    6: 10
+    7: 10
     8: 5
   stepFeatures:
-    0: 55
-    1: 45
-    2: 203
-    3: 17
-    4: 30
-    5: 30
-    6: 30
-    7: 30
+    0: 60
+    1: 50
+    2: 218
+    3: 19
+    4: 32
+    5: 32
+    6: 32
+    7: 32
     8: 5
 ? HLT_tau25_mediumGNTau_probe_L1eTAU12_j65c_020jvt_j40c_020jvt_j25c_020jvt_j20c_020jvt_SHARED_j20c_020jvt_bgn285_pf_ftf_presel2c20XX1c20bgtwo82XX1c20gntau85_L1jJ85p0ETA21_3jJ40p0ETA25
-: eventCount: 5
-  stepCounts:
-    0: 11
-    1: 9
-    2: 9
-    3: 9
-    4: 9
-    5: 9
-    6: 9
-    7: 9
-    8: 5
-  stepFeatures:
-    0: 55
-    1: 45
-    2: 203
-    3: 17
-    4: 30
-    5: 30
-    6: 30
-    7: 30
-    8: 5
-? HLT_tau25_mediumGNTau_probe_L1eTAU12_j65c_020jvt_j40c_020jvt_j25c_020jvt_j20c_020jvt_SHARED_j20c_020jvt_bgn285_pf_ftf_presel2c20XX1c20bgtwo85XX1c20gntau85_L1jJ85p0ETA21_3jJ40p0ETA25
-: eventCount: 5
-  stepCounts:
-    0: 11
-    1: 9
-    2: 9
-    3: 9
-    4: 9
-    5: 9
-    6: 9
-    7: 9
+: eventCount: 5
+  stepCounts:
+    0: 12
+    1: 10
+    2: 10
+    3: 10
+    4: 10
+    5: 10
+    6: 10
+    7: 10
     8: 5
   stepFeatures:
-    0: 55
-    1: 45
-    2: 203
-    3: 17
-    4: 30
-    5: 30
-    6: 30
-    7: 30
+    0: 60
+    1: 50
+    2: 218
+    3: 19
+    4: 32
+    5: 32
+    6: 32
+    7: 32
     8: 5
-? HLT_tau25_mediumGNTau_probe_L1eTAU12_j65c_020jvt_j40c_020jvt_j25c_020jvt_j20c_020jvt_SHARED_j20c_020jvt_bgn285_pf_ftf_presel2c20XX1c20bgtwo85XX1c20gntau90_L1jJ85p0ETA21_3jJ40p0ETA25
+? HLT_tau25_mediumGNTau_probe_L1eTAU12_j65c_020jvt_j40c_020jvt_j25c_020jvt_j20c_020jvt_SHARED_j20c_020jvt_bgn285_pf_ftf_presel2c20XX1c20bgtwo85XX1c20gntau85_L1jJ85p0ETA21_3jJ40p0ETA25
 : eventCount: 5
   stepCounts:
-    0: 11
-    1: 9
-    2: 9
-    3: 9
-    4: 9
-    5: 9
-    6: 9
-    7: 9
+    0: 12
+    1: 10
+    2: 10
+    3: 10
+    4: 10
+    5: 10
+    6: 10
+    7: 10
     8: 5
   stepFeatures:
-    0: 55
-    1: 45
-    2: 203
-    3: 17
-    4: 30
-    5: 30
-    6: 30
-    7: 30
+    0: 60
+    1: 50
+    2: 218
+    3: 19
+    4: 32
+    5: 32
+    6: 32
+    7: 32
     8: 5
-? HLT_tau25_mediumGNTau_probe_L1eTAU12_j65c_020jvt_j40c_020jvt_j25c_020jvt_j20c_020jvt_SHARED_j20c_020jvt_bgn285_pf_ftf_presel3c20XX1c20bgtwo85_L1jJ85p0ETA21_3jJ40p0ETA25
+? HLT_tau25_mediumGNTau_probe_L1eTAU12_j65c_020jvt_j40c_020jvt_j25c_020jvt_j20c_020jvt_SHARED_j20c_020jvt_bgn285_pf_ftf_presel2c20XX1c20bgtwo85XX1c20gntau90_L1jJ85p0ETA21_3jJ40p0ETA25
 : eventCount: 5
   stepCounts:
-    0: 11
-    1: 11
+    0: 12
+    1: 10
     2: 10
     3: 10
     4: 10
@@ -29123,14 +29171,36 @@ HLT_tau25_mediumGNTau_probe_L1cTAU20M_xe75_cell_xe100_pfopufit_L1jXE110:
     7: 10
     8: 5
   stepFeatures:
-    0: 55
-    1: 55
-    2: 222
+    0: 60
+    1: 50
+    2: 218
     3: 19
-    4: 34
-    5: 34
-    6: 34
-    7: 34
+    4: 32
+    5: 32
+    6: 32
+    7: 32
+    8: 5
+? HLT_tau25_mediumGNTau_probe_L1eTAU12_j65c_020jvt_j40c_020jvt_j25c_020jvt_j20c_020jvt_SHARED_j20c_020jvt_bgn285_pf_ftf_presel3c20XX1c20bgtwo85_L1jJ85p0ETA21_3jJ40p0ETA25
+: eventCount: 5
+  stepCounts:
+    0: 12
+    1: 12
+    2: 11
+    3: 11
+    4: 11
+    5: 11
+    6: 11
+    7: 11
+    8: 5
+  stepFeatures:
+    0: 60
+    1: 60
+    2: 237
+    3: 21
+    4: 36
+    5: 36
+    6: 36
+    7: 36
     8: 5
 HLT_tau25_mediumGNTau_probe_L1eTAU20M_xe65_cell_xe100_pfopufit_L1jXE100:
   eventCount: 1
@@ -29255,6 +29325,16 @@ HLT_tau25_mediumGNTau_tau20_mediumGNTau_02dRAB10_L1cTAU20M_DR-eTAU20eTAU12-jJ40:
     4: 5
 HLT_tau25_mediumGNTau_tau20_mediumGNTau_03dRAB_j70_j50a_j0_DJMASS900j50_L1jMJJ-500-NFF:
   eventCount: 0
+  stepCounts:
+    0: 1
+    1: 1
+    2: 1
+    3: 1
+  stepFeatures:
+    0: 6
+    1: 6
+    2: 6
+    3: 6
 HLT_tau25_mediumRNN_trackLRT_L1cTAU20M:
   eventCount: 4
   stepCounts:
@@ -29352,27 +29432,49 @@ HLT_tau25_mediumRNN_tracktwoMVA_L1jTAU20:
 ? HLT_tau25_mediumRNN_tracktwoMVA_probe_L1eTAU12_2j40c_020jvt_j25c_020jvt_j20c_020jvt_SHARED_j20c_020jvt_bgn285_pf_ftf_presel3c20XX1c20bgtwo85_L13jJ40p0ETA25
 : eventCount: 4
   stepCounts:
-    0: 12
-    1: 12
-    2: 11
-    3: 11
-    4: 11
-    5: 11
-    6: 11
-    7: 11
+    0: 13
+    1: 13
+    2: 12
+    3: 12
+    4: 12
+    5: 12
+    6: 12
+    7: 12
     8: 4
   stepFeatures:
-    0: 48
-    1: 48
-    2: 221
-    3: 21
-    4: 37
-    5: 37
-    6: 37
-    7: 37
+    0: 52
+    1: 52
+    2: 235
+    3: 23
+    4: 39
+    5: 39
+    6: 39
+    7: 39
     8: 4
 ? HLT_tau25_mediumRNN_tracktwoMVA_probe_L1eTAU12_j50c_020jvt_j40c_020jvt_j25c_020jvt_j20c_020jvt_SHARED_j20c_020jvt_bgn285_pf_ftf_presel3c20XX1c20bgtwo85_L13jJ40p0ETA25
 : eventCount: 4
+  stepCounts:
+    0: 13
+    1: 13
+    2: 12
+    3: 12
+    4: 12
+    5: 12
+    6: 12
+    7: 12
+    8: 4
+  stepFeatures:
+    0: 65
+    1: 65
+    2: 273
+    3: 23
+    4: 39
+    5: 39
+    6: 39
+    7: 39
+    8: 4
+? HLT_tau25_mediumRNN_tracktwoMVA_probe_L1eTAU12_j65c_020jvt_j40c_020jvt_j25c_020jvt_j20c_020jvt_SHARED_j20c_020jvt_bgn185_pf_ftf_presel3c20XX1c20bgtwo85_L1jJ85p0ETA21_3jJ40p0ETA25
+: eventCount: 3
   stepCounts:
     0: 12
     1: 12
@@ -29382,22 +29484,22 @@ HLT_tau25_mediumRNN_tracktwoMVA_L1jTAU20:
     5: 11
     6: 11
     7: 11
-    8: 4
+    8: 3
   stepFeatures:
     0: 60
     1: 60
-    2: 256
-    3: 21
-    4: 37
-    5: 37
-    6: 37
-    7: 37
-    8: 4
-? HLT_tau25_mediumRNN_tracktwoMVA_probe_L1eTAU12_j65c_020jvt_j40c_020jvt_j25c_020jvt_j20c_020jvt_SHARED_j20c_020jvt_bgn185_pf_ftf_presel3c20XX1c20bgtwo85_L1jJ85p0ETA21_3jJ40p0ETA25
+    2: 237
+    3: 22
+    4: 36
+    5: 36
+    6: 36
+    7: 36
+    8: 3
+? HLT_tau25_mediumRNN_tracktwoMVA_probe_L1eTAU12_j65c_020jvt_j40c_020jvt_j25c_020jvt_j20c_020jvt_SHARED_j20c_020jvt_bgn285_pf_ftf_presel2c20XX1c20bgtwo80XX1c20gntau80_L1jJ85p0ETA21_3jJ40p0ETA25
 : eventCount: 3
   stepCounts:
-    0: 11
-    1: 11
+    0: 12
+    1: 10
     2: 10
     3: 10
     4: 10
@@ -29406,130 +29508,86 @@ HLT_tau25_mediumRNN_tracktwoMVA_L1jTAU20:
     7: 10
     8: 3
   stepFeatures:
-    0: 55
-    1: 55
-    2: 222
-    3: 20
-    4: 34
-    5: 34
-    6: 34
-    7: 34
-    8: 3
-? HLT_tau25_mediumRNN_tracktwoMVA_probe_L1eTAU12_j65c_020jvt_j40c_020jvt_j25c_020jvt_j20c_020jvt_SHARED_j20c_020jvt_bgn285_pf_ftf_presel2c20XX1c20bgtwo80XX1c20gntau80_L1jJ85p0ETA21_3jJ40p0ETA25
-: eventCount: 3
-  stepCounts:
-    0: 11
-    1: 9
-    2: 9
-    3: 9
-    4: 9
-    5: 9
-    6: 9
-    7: 9
-    8: 3
-  stepFeatures:
-    0: 55
-    1: 45
-    2: 203
-    3: 17
-    4: 30
-    5: 30
-    6: 30
-    7: 30
+    0: 60
+    1: 50
+    2: 218
+    3: 19
+    4: 32
+    5: 32
+    6: 32
+    7: 32
     8: 3
 ? HLT_tau25_mediumRNN_tracktwoMVA_probe_L1eTAU12_j65c_020jvt_j40c_020jvt_j25c_020jvt_j20c_020jvt_SHARED_j20c_020jvt_bgn285_pf_ftf_presel2c20XX1c20bgtwo82XX1c20gntau80_L1jJ85p0ETA21_3jJ40p0ETA25
 : eventCount: 3
   stepCounts:
-    0: 11
-    1: 9
-    2: 9
-    3: 9
-    4: 9
-    5: 9
-    6: 9
-    7: 9
+    0: 12
+    1: 10
+    2: 10
+    3: 10
+    4: 10
+    5: 10
+    6: 10
+    7: 10
     8: 3
   stepFeatures:
-    0: 55
-    1: 45
-    2: 203
-    3: 17
-    4: 30
-    5: 30
-    6: 30
-    7: 30
+    0: 60
+    1: 50
+    2: 218
+    3: 19
+    4: 32
+    5: 32
+    6: 32
+    7: 32
     8: 3
 ? HLT_tau25_mediumRNN_tracktwoMVA_probe_L1eTAU12_j65c_020jvt_j40c_020jvt_j25c_020jvt_j20c_020jvt_SHARED_j20c_020jvt_bgn285_pf_ftf_presel2c20XX1c20bgtwo82XX1c20gntau85_L1jJ85p0ETA21_3jJ40p0ETA25
 : eventCount: 3
   stepCounts:
-    0: 11
-    1: 9
-    2: 9
-    3: 9
-    4: 9
-    5: 9
-    6: 9
-    7: 9
+    0: 12
+    1: 10
+    2: 10
+    3: 10
+    4: 10
+    5: 10
+    6: 10
+    7: 10
     8: 3
   stepFeatures:
-    0: 55
-    1: 45
-    2: 203
-    3: 17
-    4: 30
-    5: 30
-    6: 30
-    7: 30
+    0: 60
+    1: 50
+    2: 218
+    3: 19
+    4: 32
+    5: 32
+    6: 32
+    7: 32
     8: 3
 ? HLT_tau25_mediumRNN_tracktwoMVA_probe_L1eTAU12_j65c_020jvt_j40c_020jvt_j25c_020jvt_j20c_020jvt_SHARED_j20c_020jvt_bgn285_pf_ftf_presel2c20XX1c20bgtwo85XX1c20gntau85_L1jJ85p0ETA21_3jJ40p0ETA25
 : eventCount: 3
   stepCounts:
-    0: 11
-    1: 9
-    2: 9
-    3: 9
-    4: 9
-    5: 9
-    6: 9
-    7: 9
-    8: 3
-  stepFeatures:
-    0: 55
-    1: 45
-    2: 203
-    3: 17
-    4: 30
-    5: 30
-    6: 30
-    7: 30
-    8: 3
-? HLT_tau25_mediumRNN_tracktwoMVA_probe_L1eTAU12_j65c_020jvt_j40c_020jvt_j25c_020jvt_j20c_020jvt_SHARED_j20c_020jvt_bgn285_pf_ftf_presel2c20XX1c20bgtwo85XX1c20gntau90_L1jJ85p0ETA21_3jJ40p0ETA25
-: eventCount: 3
-  stepCounts:
-    0: 11
-    1: 9
-    2: 9
-    3: 9
-    4: 9
-    5: 9
-    6: 9
-    7: 9
+    0: 12
+    1: 10
+    2: 10
+    3: 10
+    4: 10
+    5: 10
+    6: 10
+    7: 10
     8: 3
   stepFeatures:
-    0: 55
-    1: 45
-    2: 203
-    3: 17
-    4: 30
-    5: 30
-    6: 30
-    7: 30
+    0: 60
+    1: 50
+    2: 218
+    3: 19
+    4: 32
+    5: 32
+    6: 32
+    7: 32
     8: 3
-? HLT_tau25_mediumRNN_tracktwoMVA_probe_L1eTAU12_j65c_020jvt_j40c_020jvt_j25c_020jvt_j20c_020jvt_SHARED_j20c_020jvt_bgn285_pf_ftf_presel3c20XX1c20bgtwo85_L1jJ85p0ETA21_3jJ40p0ETA25
+? HLT_tau25_mediumRNN_tracktwoMVA_probe_L1eTAU12_j65c_020jvt_j40c_020jvt_j25c_020jvt_j20c_020jvt_SHARED_j20c_020jvt_bgn285_pf_ftf_presel2c20XX1c20bgtwo85XX1c20gntau90_L1jJ85p0ETA21_3jJ40p0ETA25
 : eventCount: 3
   stepCounts:
-    0: 11
-    1: 11
+    0: 12
+    1: 10
     2: 10
     3: 10
     4: 10
@@ -29538,130 +29596,130 @@ HLT_tau25_mediumRNN_tracktwoMVA_L1jTAU20:
     7: 10
     8: 3
   stepFeatures:
-    0: 55
-    1: 55
-    2: 222
+    0: 60
+    1: 50
+    2: 218
     3: 19
-    4: 34
-    5: 34
-    6: 34
-    7: 34
+    4: 32
+    5: 32
+    6: 32
+    7: 32
     8: 3
-? HLT_tau25_mediumRNN_tracktwoMVA_probe_L1eTAU12_j65c_nnJvtv1_j40c_nnJvtv1_j25c_nnJvtv1_j20c_nnJvtv1_SHARED_j20c_nnJvtv1_bgn285_pf_ftf_presel2c20XX1c20bgtwo80XX1c20gntau80_L1jJ85p0ETA21_3jJ40p0ETA25
+? HLT_tau25_mediumRNN_tracktwoMVA_probe_L1eTAU12_j65c_020jvt_j40c_020jvt_j25c_020jvt_j20c_020jvt_SHARED_j20c_020jvt_bgn285_pf_ftf_presel3c20XX1c20bgtwo85_L1jJ85p0ETA21_3jJ40p0ETA25
 : eventCount: 3
   stepCounts:
-    0: 11
-    1: 9
-    2: 9
-    3: 9
-    4: 9
-    5: 9
-    6: 9
-    7: 9
+    0: 12
+    1: 12
+    2: 11
+    3: 11
+    4: 11
+    5: 11
+    6: 11
+    7: 11
     8: 3
   stepFeatures:
-    0: 55
-    1: 45
-    2: 203
-    3: 17
-    4: 30
-    5: 30
-    6: 30
-    7: 30
+    0: 60
+    1: 60
+    2: 237
+    3: 21
+    4: 36
+    5: 36
+    6: 36
+    7: 36
     8: 3
-? HLT_tau25_mediumRNN_tracktwoMVA_probe_L1eTAU12_j65c_nnJvtv1_j40c_nnJvtv1_j25c_nnJvtv1_j20c_nnJvtv1_SHARED_j20c_nnJvtv1_bgn285_pf_ftf_presel2c20XX1c20bgtwo82XX1c20gntau80_L1jJ85p0ETA21_3jJ40p0ETA25
+? HLT_tau25_mediumRNN_tracktwoMVA_probe_L1eTAU12_j65c_nnJvtv1_j40c_nnJvtv1_j25c_nnJvtv1_j20c_nnJvtv1_SHARED_j20c_nnJvtv1_bgn285_pf_ftf_presel2c20XX1c20bgtwo80XX1c20gntau80_L1jJ85p0ETA21_3jJ40p0ETA25
 : eventCount: 3
   stepCounts:
-    0: 11
-    1: 9
-    2: 9
-    3: 9
-    4: 9
-    5: 9
-    6: 9
-    7: 9
+    0: 12
+    1: 10
+    2: 10
+    3: 10
+    4: 10
+    5: 10
+    6: 10
+    7: 10
     8: 3
   stepFeatures:
-    0: 55
-    1: 45
-    2: 203
-    3: 17
-    4: 30
-    5: 30
-    6: 30
-    7: 30
+    0: 60
+    1: 50
+    2: 218
+    3: 19
+    4: 32
+    5: 32
+    6: 32
+    7: 32
     8: 3
-? HLT_tau25_mediumRNN_tracktwoMVA_probe_L1eTAU12_j65c_nnJvtv1_j40c_nnJvtv1_j25c_nnJvtv1_j20c_nnJvtv1_SHARED_j20c_nnJvtv1_bgn285_pf_ftf_presel2c20XX1c20bgtwo82XX1c20gntau85_L1jJ85p0ETA21_3jJ40p0ETA25
+? HLT_tau25_mediumRNN_tracktwoMVA_probe_L1eTAU12_j65c_nnJvtv1_j40c_nnJvtv1_j25c_nnJvtv1_j20c_nnJvtv1_SHARED_j20c_nnJvtv1_bgn285_pf_ftf_presel2c20XX1c20bgtwo82XX1c20gntau80_L1jJ85p0ETA21_3jJ40p0ETA25
 : eventCount: 3
   stepCounts:
-    0: 11
-    1: 9
-    2: 9
-    3: 9
-    4: 9
-    5: 9
-    6: 9
-    7: 9
+    0: 12
+    1: 10
+    2: 10
+    3: 10
+    4: 10
+    5: 10
+    6: 10
+    7: 10
     8: 3
   stepFeatures:
-    0: 55
-    1: 45
-    2: 203
-    3: 17
-    4: 30
-    5: 30
-    6: 30
-    7: 30
+    0: 60
+    1: 50
+    2: 218
+    3: 19
+    4: 32
+    5: 32
+    6: 32
+    7: 32
     8: 3
-? HLT_tau25_mediumRNN_tracktwoMVA_probe_L1eTAU12_j65c_nnJvtv1_j40c_nnJvtv1_j25c_nnJvtv1_j20c_nnJvtv1_SHARED_j20c_nnJvtv1_bgn285_pf_ftf_presel2c20XX1c20bgtwo85XX1c20gntau85_L1jJ85p0ETA21_3jJ40p0ETA25
+? HLT_tau25_mediumRNN_tracktwoMVA_probe_L1eTAU12_j65c_nnJvtv1_j40c_nnJvtv1_j25c_nnJvtv1_j20c_nnJvtv1_SHARED_j20c_nnJvtv1_bgn285_pf_ftf_presel2c20XX1c20bgtwo82XX1c20gntau85_L1jJ85p0ETA21_3jJ40p0ETA25
 : eventCount: 3
   stepCounts:
-    0: 11
-    1: 9
-    2: 9
-    3: 9
-    4: 9
-    5: 9
-    6: 9
-    7: 9
+    0: 12
+    1: 10
+    2: 10
+    3: 10
+    4: 10
+    5: 10
+    6: 10
+    7: 10
     8: 3
   stepFeatures:
-    0: 55
-    1: 45
-    2: 203
-    3: 17
-    4: 30
-    5: 30
-    6: 30
-    7: 30
+    0: 60
+    1: 50
+    2: 218
+    3: 19
+    4: 32
+    5: 32
+    6: 32
+    7: 32
     8: 3
-? HLT_tau25_mediumRNN_tracktwoMVA_probe_L1eTAU12_j65c_nnJvtv1_j40c_nnJvtv1_j25c_nnJvtv1_j20c_nnJvtv1_SHARED_j20c_nnJvtv1_bgn285_pf_ftf_presel2c20XX1c20bgtwo85XX1c20gntau90_L1jJ85p0ETA21_3jJ40p0ETA25
+? HLT_tau25_mediumRNN_tracktwoMVA_probe_L1eTAU12_j65c_nnJvtv1_j40c_nnJvtv1_j25c_nnJvtv1_j20c_nnJvtv1_SHARED_j20c_nnJvtv1_bgn285_pf_ftf_presel2c20XX1c20bgtwo85XX1c20gntau85_L1jJ85p0ETA21_3jJ40p0ETA25
 : eventCount: 3
   stepCounts:
-    0: 11
-    1: 9
-    2: 9
-    3: 9
-    4: 9
-    5: 9
-    6: 9
-    7: 9
+    0: 12
+    1: 10
+    2: 10
+    3: 10
+    4: 10
+    5: 10
+    6: 10
+    7: 10
     8: 3
   stepFeatures:
-    0: 55
-    1: 45
-    2: 203
-    3: 17
-    4: 30
-    5: 30
-    6: 30
-    7: 30
+    0: 60
+    1: 50
+    2: 218
+    3: 19
+    4: 32
+    5: 32
+    6: 32
+    7: 32
     8: 3
-? HLT_tau25_mediumRNN_tracktwoMVA_probe_L1eTAU12_j65c_nnJvtv1_j40c_nnJvtv1_j25c_nnJvtv1_j20c_nnJvtv1_SHARED_j20c_nnJvtv1_bgn285_pf_ftf_presel3c20XX1c20bgtwo85_L1jJ85p0ETA21_3jJ40p0ETA25
+? HLT_tau25_mediumRNN_tracktwoMVA_probe_L1eTAU12_j65c_nnJvtv1_j40c_nnJvtv1_j25c_nnJvtv1_j20c_nnJvtv1_SHARED_j20c_nnJvtv1_bgn285_pf_ftf_presel2c20XX1c20bgtwo85XX1c20gntau90_L1jJ85p0ETA21_3jJ40p0ETA25
 : eventCount: 3
   stepCounts:
-    0: 11
-    1: 11
+    0: 12
+    1: 10
     2: 10
     3: 10
     4: 10
@@ -29670,14 +29728,36 @@ HLT_tau25_mediumRNN_tracktwoMVA_L1jTAU20:
     7: 10
     8: 3
   stepFeatures:
-    0: 55
-    1: 55
-    2: 222
+    0: 60
+    1: 50
+    2: 218
     3: 19
-    4: 34
-    5: 34
-    6: 34
-    7: 34
+    4: 32
+    5: 32
+    6: 32
+    7: 32
+    8: 3
+? HLT_tau25_mediumRNN_tracktwoMVA_probe_L1eTAU12_j65c_nnJvtv1_j40c_nnJvtv1_j25c_nnJvtv1_j20c_nnJvtv1_SHARED_j20c_nnJvtv1_bgn285_pf_ftf_presel3c20XX1c20bgtwo85_L1jJ85p0ETA21_3jJ40p0ETA25
+: eventCount: 3
+  stepCounts:
+    0: 12
+    1: 12
+    2: 11
+    3: 11
+    4: 11
+    5: 11
+    6: 11
+    7: 11
+    8: 3
+  stepFeatures:
+    0: 60
+    1: 60
+    2: 237
+    3: 21
+    4: 36
+    5: 36
+    6: 36
+    7: 36
     8: 3
 HLT_tau25_mediumRNN_tracktwoMVA_probe_L1eTAU20M_xe65_cell_xe100_pfopufit_L1jXE100:
   eventCount: 1
@@ -30044,6 +30124,16 @@ HLT_tau25_mediumRNN_tracktwoMVA_tau20_mediumRNN_tracktwoMVA_03dRAB_L1cTAU30M_2cT
     4: 2
 HLT_tau25_mediumRNN_tracktwoMVA_tau20_mediumRNN_tracktwoMVA_03dRAB_j70_j50a_j0_DJMASS900j50_L1jMJJ-500-NFF:
   eventCount: 0
+  stepCounts:
+    0: 1
+    1: 1
+    2: 1
+    3: 1
+  stepFeatures:
+    0: 6
+    1: 6
+    2: 6
+    3: 6
 HLT_tau25_mediumRNN_tracktwoMVA_tau25_mediumRNN_tracktwoMVA_03dRAB30_L1cTAU30M_2cTAU20M_DR-eTAU30eTAU20-jJ55:
   eventCount: 0
   stepCounts:
@@ -30251,28 +30341,28 @@ HLT_tau30_mediumGNTau_tau20_mediumGNTau_03dRAB30_L1cTAU30M_2cTAU20M_DR-eTAU30eTA
 HLT_tau30_mediumGNTau_tau20_mediumGNTau_03dRAB_L14jJ30p0ETA24_0DETA24-eTAU30eTAU12:
   eventCount: 0
   stepCounts:
-    0: 6
-    1: 6
-    2: 6
-    3: 6
+    0: 7
+    1: 7
+    2: 7
+    3: 7
   stepFeatures:
-    0: 43
-    1: 43
-    2: 43
-    3: 43
+    0: 47
+    1: 47
+    2: 47
+    3: 47
     4: 6
 HLT_tau30_mediumGNTau_tau20_mediumGNTau_03dRAB_L1cTAU20M_cTAU12M_4jJ30p0ETA24_0DETA24-eTAU30eTAU12:
   eventCount: 0
   stepCounts:
-    0: 5
-    1: 5
-    2: 5
-    3: 5
+    0: 6
+    1: 6
+    2: 6
+    3: 6
   stepFeatures:
-    0: 30
-    1: 28
-    2: 28
-    3: 28
+    0: 34
+    1: 32
+    2: 32
+    3: 32
     4: 6
 HLT_tau30_mediumGNTau_tau20_mediumGNTau_03dRAB_L1cTAU30M_2cTAU20M:
   eventCount: 0
@@ -30316,41 +30406,41 @@ HLT_tau30_mediumRNN_tracktwoMVA_tau20_mediumRNN_tracktwoMVA_03dRAB30_L1cTAU30M_2
 HLT_tau30_mediumRNN_tracktwoMVA_tau20_mediumRNN_tracktwoMVA_03dRAB30_L1cTAU30M_2cTAU20M_DR-eTAU30eTAU20-jJ30:
   eventCount: 0
   stepCounts:
-    0: 10
-    1: 10
-    2: 10
-    3: 10
+    0: 11
+    1: 11
+    2: 11
+    3: 11
   stepFeatures:
-    0: 54
-    1: 52
-    2: 52
-    3: 52
+    0: 58
+    1: 56
+    2: 56
+    3: 56
     4: 6
 HLT_tau30_mediumRNN_tracktwoMVA_tau20_mediumRNN_tracktwoMVA_03dRAB30_L1cTAU30M_2cTAU20M_DR-eTAU30eTAU20-jJ40:
   eventCount: 0
-  stepCounts:
-    0: 10
-    1: 10
-    2: 10
-    3: 10
+  stepCounts:
+    0: 11
+    1: 11
+    2: 11
+    3: 11
   stepFeatures:
-    0: 54
-    1: 52
-    2: 52
-    3: 52
+    0: 58
+    1: 56
+    2: 56
+    3: 56
     4: 6
 HLT_tau30_mediumRNN_tracktwoMVA_tau20_mediumRNN_tracktwoMVA_03dRAB30_L1cTAU30M_2cTAU20M_DR-eTAU30eTAU20-jJ50:
   eventCount: 0
   stepCounts:
-    0: 10
-    1: 10
-    2: 10
-    3: 10
+    0: 11
+    1: 11
+    2: 11
+    3: 11
   stepFeatures:
-    0: 54
-    1: 52
-    2: 52
-    3: 52
+    0: 58
+    1: 56
+    2: 56
+    3: 56
     4: 6
 HLT_tau30_mediumRNN_tracktwoMVA_tau20_mediumRNN_tracktwoMVA_03dRAB30_L1cTAU30M_2cTAU20M_DR-eTAU30eTAU20-jJ55:
   eventCount: 0
@@ -30368,119 +30458,119 @@ HLT_tau30_mediumRNN_tracktwoMVA_tau20_mediumRNN_tracktwoMVA_03dRAB30_L1cTAU30M_2
 HLT_tau30_mediumRNN_tracktwoMVA_tau20_mediumRNN_tracktwoMVA_03dRAB30_L1jJ85p0ETA21_3jJ40p0ETA25:
   eventCount: 0
   stepCounts:
-    0: 12
-    1: 12
-    2: 12
-    3: 12
+    0: 13
+    1: 13
+    2: 13
+    3: 13
   stepFeatures:
-    0: 64
-    1: 60
-    2: 60
-    3: 60
+    0: 68
+    1: 64
+    2: 64
+    3: 64
     4: 6
 HLT_tau30_mediumRNN_tracktwoMVA_tau20_mediumRNN_tracktwoMVA_03dRAB_L14jJ30p0ETA24_0DETA24-eTAU30eTAU12:
   eventCount: 0
   stepCounts:
-    0: 6
-    1: 6
-    2: 6
-    3: 6
+    0: 7
+    1: 7
+    2: 7
+    3: 7
   stepFeatures:
-    0: 43
-    1: 43
-    2: 43
-    3: 43
+    0: 47
+    1: 47
+    2: 47
+    3: 47
     4: 2
 HLT_tau30_mediumRNN_tracktwoMVA_tau20_mediumRNN_tracktwoMVA_03dRAB_L14jJ30p0ETA24_0DETA24_10DPHI99-eTAU30eTAU12:
   eventCount: 0
   stepCounts:
-    0: 6
-    1: 6
-    2: 6
-    3: 6
+    0: 7
+    1: 7
+    2: 7
+    3: 7
   stepFeatures:
-    0: 43
-    1: 43
-    2: 43
-    3: 43
+    0: 47
+    1: 47
+    2: 47
+    3: 47
     4: 2
 HLT_tau30_mediumRNN_tracktwoMVA_tau20_mediumRNN_tracktwoMVA_03dRAB_L14jJ30p0ETA24_0DETA24_4DPHI99-eTAU30eTAU12:
   eventCount: 0
   stepCounts:
-    0: 6
-    1: 6
-    2: 6
-    3: 6
+    0: 7
+    1: 7
+    2: 7
+    3: 7
   stepFeatures:
-    0: 43
-    1: 43
-    2: 43
-    3: 43
+    0: 47
+    1: 47
+    2: 47
+    3: 47
     4: 2
 HLT_tau30_mediumRNN_tracktwoMVA_tau20_mediumRNN_tracktwoMVA_03dRAB_L14jJ30p0ETA24_0DETA24_4DPHI99-eTAU30eTAU20:
   eventCount: 0
   stepCounts:
-    0: 6
-    1: 6
-    2: 6
-    3: 6
+    0: 7
+    1: 7
+    2: 7
+    3: 7
   stepFeatures:
-    0: 43
-    1: 43
-    2: 43
-    3: 43
+    0: 47
+    1: 47
+    2: 47
+    3: 47
     4: 2
 HLT_tau30_mediumRNN_tracktwoMVA_tau20_mediumRNN_tracktwoMVA_03dRAB_L1cTAU20M_cTAU12M_4jJ30p0ETA24_0DETA24-eTAU30eTAU12:
   eventCount: 0
   stepCounts:
-    0: 5
-    1: 5
-    2: 5
-    3: 5
+    0: 6
+    1: 6
+    2: 6
+    3: 6
   stepFeatures:
-    0: 30
-    1: 28
-    2: 28
-    3: 28
+    0: 34
+    1: 32
+    2: 32
+    3: 32
     4: 2
 ? HLT_tau30_mediumRNN_tracktwoMVA_tau20_mediumRNN_tracktwoMVA_03dRAB_L1cTAU20M_cTAU12M_4jJ30p0ETA24_0DETA24_10DPHI99-eTAU30eTAU12
 : eventCount: 0
   stepCounts:
-    0: 5
-    1: 5
-    2: 5
-    3: 5
+    0: 6
+    1: 6
+    2: 6
+    3: 6
   stepFeatures:
-    0: 30
-    1: 28
-    2: 28
-    3: 28
+    0: 34
+    1: 32
+    2: 32
+    3: 32
     4: 2
 ? HLT_tau30_mediumRNN_tracktwoMVA_tau20_mediumRNN_tracktwoMVA_03dRAB_L1cTAU20M_cTAU12M_4jJ30p0ETA24_0DETA24_4DPHI99-eTAU30eTAU12
 : eventCount: 0
   stepCounts:
-    0: 5
-    1: 5
-    2: 5
-    3: 5
+    0: 6
+    1: 6
+    2: 6
+    3: 6
   stepFeatures:
-    0: 30
-    1: 28
-    2: 28
-    3: 28
+    0: 34
+    1: 32
+    2: 32
+    3: 32
     4: 2
 ? HLT_tau30_mediumRNN_tracktwoMVA_tau20_mediumRNN_tracktwoMVA_03dRAB_L1cTAU20M_cTAU12M_4jJ30p0ETA24_0DETA24_4DPHI99-eTAU30eTAU20
 : eventCount: 0
   stepCounts:
-    0: 5
-    1: 5
-    2: 5
-    3: 5
+    0: 6
+    1: 6
+    2: 6
+    3: 6
   stepFeatures:
-    0: 30
-    1: 28
-    2: 28
-    3: 28
+    0: 34
+    1: 32
+    2: 32
+    3: 32
     4: 2
 HLT_tau30_mediumRNN_tracktwoMVA_tau20_mediumRNN_tracktwoMVA_03dRAB_L1cTAU30M_2cTAU20M:
   eventCount: 0
@@ -30503,7 +30593,7 @@ HLT_tau30_mediumRNN_tracktwoMVA_tau20_mediumRNN_tracktwoMVA_03dRAB_L1cTAU30M_2cT
     2: 14
     3: 14
   stepFeatures:
-    0: 67
+    0: 69
     1: 67
     2: 67
     3: 67
@@ -30524,15 +30614,15 @@ HLT_tau30_mediumRNN_tracktwoMVA_tau20_mediumRNN_tracktwoMVA_03dRAB_L1cTAU30M_2cT
 HLT_tau30_mediumRNN_tracktwoMVA_tau20_mediumRNN_tracktwoMVA_03dRAB_L1jJ85p0ETA21_3jJ40p0ETA25:
   eventCount: 0
   stepCounts:
-    0: 12
-    1: 12
-    2: 12
-    3: 12
+    0: 13
+    1: 13
+    2: 13
+    3: 13
   stepFeatures:
-    0: 64
-    1: 60
-    2: 60
-    3: 60
+    0: 68
+    1: 64
+    2: 64
+    3: 64
     4: 6
 HLT_tau30_mediumRNN_tracktwoMVA_tau25_mediumRNN_tracktwoMVA_03dRAB30_L1cTAU30M_2cTAU20M_DR-eTAU30eTAU20-jJ55:
   eventCount: 0
@@ -31250,41 +31340,41 @@ HLT_tau35_mediumRNN_tracktwoMVA_tau25_mediumRNN_tracktwoMVA_03dRAB30_L1cTAU30M_2
 HLT_tau35_mediumRNN_tracktwoMVA_tau25_mediumRNN_tracktwoMVA_03dRAB30_L1cTAU30M_2cTAU20M_DR-eTAU30eTAU20-jJ30:
   eventCount: 0
   stepCounts:
-    0: 10
-    1: 10
-    2: 10
-    3: 10
+    0: 11
+    1: 11
+    2: 11
+    3: 11
   stepFeatures:
-    0: 53
-    1: 51
-    2: 51
-    3: 51
+    0: 57
+    1: 55
+    2: 55
+    3: 55
     4: 6
 HLT_tau35_mediumRNN_tracktwoMVA_tau25_mediumRNN_tracktwoMVA_03dRAB30_L1cTAU30M_2cTAU20M_DR-eTAU30eTAU20-jJ40:
   eventCount: 0
   stepCounts:
-    0: 10
-    1: 10
-    2: 10
-    3: 10
+    0: 11
+    1: 11
+    2: 11
+    3: 11
   stepFeatures:
-    0: 53
-    1: 51
-    2: 51
-    3: 51
+    0: 57
+    1: 55
+    2: 55
+    3: 55
     4: 6
 HLT_tau35_mediumRNN_tracktwoMVA_tau25_mediumRNN_tracktwoMVA_03dRAB30_L1cTAU30M_2cTAU20M_DR-eTAU30eTAU20-jJ50:
   eventCount: 0
   stepCounts:
-    0: 10
-    1: 10
-    2: 10
-    3: 10
+    0: 11
+    1: 11
+    2: 11
+    3: 11
   stepFeatures:
-    0: 53
-    1: 51
-    2: 51
-    3: 51
+    0: 57
+    1: 55
+    2: 55
+    3: 55
     4: 6
 HLT_tau35_mediumRNN_tracktwoMVA_tau25_mediumRNN_tracktwoMVA_03dRAB30_L1cTAU30M_2cTAU20M_DR-eTAU30eTAU20-jJ55:
   eventCount: 0
@@ -31320,7 +31410,7 @@ HLT_tau35_mediumRNN_tracktwoMVA_tau25_mediumRNN_tracktwoMVA_03dRAB_L1cTAU30M_2cT
     2: 13
     3: 13
   stepFeatures:
-    0: 65
+    0: 67
     1: 63
     2: 63
     3: 63
@@ -31640,15 +31730,15 @@ HLT_tau40_mediumGNTau_tau35_mediumGNTau_03dRAB_L1cTAU35M_2cTAU30M:
 HLT_tau40_mediumGNTau_tau35_mediumGNTau_03dRAB_L1cTAU35M_2cTAU30M_2jJ55_3jJ50:
   eventCount: 0
   stepCounts:
-    0: 9
-    1: 9
-    2: 9
-    3: 9
+    0: 10
+    1: 10
+    2: 10
+    3: 10
   stepFeatures:
-    0: 44
-    1: 44
-    2: 44
-    3: 44
+    0: 47
+    1: 47
+    2: 47
+    3: 47
     4: 10
 HLT_tau40_mediumGNTau_tau35_mediumGNTau_03dRAB_L1eTAU35M_2eTAU30M:
   eventCount: 0
@@ -31921,15 +32011,15 @@ HLT_tau40_mediumRNN_tracktwoMVA_tau35_mediumRNN_tracktwoMVA_03dRAB_L1cTAU35M_2cT
 HLT_tau40_mediumRNN_tracktwoMVA_tau35_mediumRNN_tracktwoMVA_03dRAB_L1cTAU35M_2cTAU30M_2jJ55_3jJ50:
   eventCount: 0
   stepCounts:
-    0: 9
-    1: 9
-    2: 9
-    3: 9
+    0: 10
+    1: 10
+    2: 10
+    3: 10
   stepFeatures:
-    0: 44
-    1: 44
-    2: 44
-    3: 44
+    0: 47
+    1: 47
+    2: 47
+    3: 47
     4: 6
 HLT_tau40_mediumRNN_tracktwoMVA_tau35_mediumRNN_tracktwoMVA_03dRAB_L1eTAU35M_2eTAU30M:
   eventCount: 0
diff --git a/Trigger/TrigValidation/TrigInDetValidation/python/TrigInDetArtSteps.py b/Trigger/TrigValidation/TrigInDetValidation/python/TrigInDetArtSteps.py
index c816b7fcb2ed176a4770b79f75382a9e1fc2ef25..8d1f9d584f327fc09c02bca6eea7b13f337b8d7a 100644
--- a/Trigger/TrigValidation/TrigInDetValidation/python/TrigInDetArtSteps.py
+++ b/Trigger/TrigValidation/TrigInDetValidation/python/TrigInDetArtSteps.py
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2025 CERN for the benefit of the ATLAS collaboration
 #
 
 '''
@@ -16,6 +16,7 @@ from TrigValTools.TrigValSteering.Step import Step
 from TrigValTools.TrigValSteering.CheckSteps import RefComparisonStep
 from TrigValTools.TrigValSteering.Common import find_file
 from AthenaCommon.Utils.unixtools import FindFile
+from AthenaConfiguration.TestDefaults import defaultConditionsTags
 
 ##################################################
 # Exec (athena) steps for Reco_tf
@@ -204,7 +205,7 @@ class TrigTZReco(ExecStep):
         self.max_events = -1
         self.args = '--inputBSFile=' + find_file('*.physics_Main*._athenaHLT*.data')  # output of the previous step
         self.args += ' --outputAODFile=AOD.pool.root'
-        self.args += ' --conditionsTag=\'CONDBR2-BLKPA-2023-05\' --geometryVersion=\'ATLAS-R3S-2021-03-02-00\''
+        self.args += f' --conditionsTag="{defaultConditionsTags.RUN3_DATA23}" --geometryVersion=\'ATLAS-R3S-2021-03-02-00\''
         self.args += ' --preExec="{:s}"'.format(tzrecoPreExec)
         self.args += ' --CA'
 
diff --git a/Trigger/TrigValidation/TrigInDetValidation/utils/TrigInDetArtSteps.py.pre b/Trigger/TrigValidation/TrigInDetValidation/utils/TrigInDetArtSteps.py.pre
index 8a7446146374d90294f1b609af85f13349aac80c..e8ac4305a13d87a3e4143c5abbf1d7dd1876bc2a 100644
--- a/Trigger/TrigValidation/TrigInDetValidation/utils/TrigInDetArtSteps.py.pre
+++ b/Trigger/TrigValidation/TrigInDetValidation/utils/TrigInDetArtSteps.py.pre
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2025 CERN for the benefit of the ATLAS collaboration
 #
 
 '''
@@ -16,6 +16,7 @@ from TrigValTools.TrigValSteering.Step import Step
 from TrigValTools.TrigValSteering.CheckSteps import RefComparisonStep
 from TrigValTools.TrigValSteering.Common import find_file
 from AthenaCommon.Utils.unixtools import FindFile
+from AthenaConfiguration.TestDefaults import defaultConditionsTags
 
 ##################################################
 # Exec (athena) steps for Reco_tf
@@ -262,7 +263,7 @@ class TrigTZReco(ExecStep):
         self.max_events = -1
         self.args = '--inputBSFile=' + find_file('*.physics_Main*._athenaHLT*.data')  # output of the previous step
         self.args += ' --outputAODFile=AOD.pool.root'
-        self.args += ' --conditionsTag=\'CONDBR2-BLKPA-2023-05\' --geometryVersion=\'ATLAS-R3S-2021-03-02-00\''
+        self.args += f' --conditionsTag="{defaultConditionsTags.RUN3_DATA23}" --geometryVersion=\'ATLAS-R3S-2021-03-02-00\''
         self.args += ' --preExec="{:s}"'.format(tzrecoPreExec)
         self.args += ' --CA'
 
diff --git a/Trigger/TrigValidation/TrigP1Test/share/ref_v1Dev_decodeBS_build.ref b/Trigger/TrigValidation/TrigP1Test/share/ref_v1Dev_decodeBS_build.ref
index fe4bf7a8813c3bc27a0ccd0f6b6f82cf187a2f68..a5d13c04ba2d4cbae71e48102edd826ddd9f573b 100644
--- a/Trigger/TrigValidation/TrigP1Test/share/ref_v1Dev_decodeBS_build.ref
+++ b/Trigger/TrigValidation/TrigP1Test/share/ref_v1Dev_decodeBS_build.ref
@@ -386,6 +386,8 @@ HLT_10j40_pf_ftf_presel7j30_L14jJ40:
   eventCount: 0
 HLT_2e12_lhloose_mu10_L12eEM10L_MU8F:
   eventCount: 0
+HLT_2e17_dnnloose_L12eEM18M:
+  eventCount: 0
 HLT_2e17_idperf_loose_L12eEM18M:
   eventCount: 0
 HLT_2e17_idperf_loose_nogsf_L12eEM18M:
@@ -402,6 +404,8 @@ HLT_2e17_lhvloose_g35_medium_probe_L12eEM18M:
   eventCount: 0
 HLT_2e17_lhvloose_g50_loose_probe_L12eEM18M:
   eventCount: 0
+HLT_2e24_dnnloose_L12eEM24L:
+  eventCount: 0
 HLT_2e24_lhvloose_L12eEM24L:
   eventCount: 0
 HLT_2e24_lhvloose_g20_tight_probe_L12eEM24L:
@@ -522,26 +526,28 @@ HLT_2g13_medium_EgammaPEBTLA_L12DR15-M70-2eEM12L:
 HLT_2g15_loose_25dphiAA_invmAA80_L12eEM9:
   eventCount: 0
   stepCounts:
-    0: 2
+    0: 3
   stepFeatures:
-    0: 7
-    1: 2
+    0: 10
+    1: 3
 HLT_2g15_loose_25dphiAA_invmAA80_L1DPHI-M70-2eEM15M:
   eventCount: 0
 HLT_2g15_tight_25dphiAA_L12eEM9:
   eventCount: 0
   stepCounts:
-    0: 1
+    0: 2
   stepFeatures:
-    0: 5
+    0: 7
+    1: 1
 HLT_2g15_tight_25dphiAA_L1DPHI-M70-2eEM15M:
   eventCount: 0
 HLT_2g15_tight_25dphiAA_invmAA80_L12eEM9:
   eventCount: 0
   stepCounts:
-    0: 1
+    0: 2
   stepFeatures:
-    0: 5
+    0: 7
+    1: 1
 HLT_2g15_tight_25dphiAA_invmAA80_L1DPHI-M70-2eEM15M:
   eventCount: 0
 HLT_2g15_tight_L1DPHI-M70-2eEM15M:
@@ -552,8 +558,6 @@ HLT_2g20_medium_L12eEM18L:
   eventCount: 0
 HLT_2g20_tight_icaloloose_L12eEM18M:
   eventCount: 0
-HLT_2g20_tight_icaloloose_ringer_L12eEM18M:
-  eventCount: 0
 HLT_2g22_tight_L12eEM18M:
   eventCount: 0
 HLT_2g22_tight_L12eEM9_EMPTY:
@@ -564,14 +568,12 @@ HLT_2g22_tight_L1eEM9_EMPTY:
   eventCount: 0
 HLT_2g22_tight_L1eEM9_UNPAIRED_ISO:
   eventCount: 0
-HLT_2g22_tight_ringer_L12eEM18M:
+HLT_2g22_tight_noringer_L12eEM18M:
   eventCount: 0
 HLT_2g25_loose_g15_loose_L12eEM24L:
   eventCount: 0
 HLT_2g50_loose_L12eEM24L:
   eventCount: 0
-HLT_2g50_loose_ringer_L12eEM24L:
-  eventCount: 0
 HLT_2g50_tight_L12eEM9_EMPTY:
   eventCount: 0
 HLT_2g50_tight_L1eEM15_EMPTY:
@@ -583,18 +585,24 @@ HLT_2g50_tight_L1eEM9_UNPAIRED_ISO:
 HLT_2g9_loose_25dphiAA_invmAA80_L12eEM9:
   eventCount: 0
   stepCounts:
-    0: 2
-    1: 2
-    2: 2
-  stepFeatures:
     0: 7
-    1: 4
-    2: 5
+    1: 5
+    2: 4
+  stepFeatures:
+    0: 19
+    1: 11
+    2: 11
     3: 1
 HLT_2g9_loose_25dphiAA_invmAA80_L1DPHI-M70-2eEM9:
   eventCount: 0
+  stepCounts:
+    0: 3
+    1: 2
+    2: 1
   stepFeatures:
-    0: 1
+    0: 9
+    1: 5
+    2: 4
 HLT_2g9_loose_25dphiAA_invmAA80_L1DPHI-M70-2eEM9L:
   eventCount: 0
 HLT_2j100_2timeSig15_L1jJ90:
@@ -684,11 +692,11 @@ HLT_2j250c_j120c_ftf_presel2j180XXj80_L1jJ160:
   eventCount: 0
 HLT_2j250c_j120c_pf_ftf_presel2j180XXj80_L1jJ160:
   eventCount: 0
-HLT_2j260_a10sd_cssk_70bgntwox_pf_jes_ftf_presel2j225_L1SC111-CjJ40:
+HLT_2j260_a10sd_cssk_86bgntwox_pf_jes_ftf_presel2j225_L1SC111-CjJ40:
   eventCount: 0
-HLT_2j260_a10sd_cssk_70bgntwox_pf_jes_ftf_presel2j225_L1gLJ140p0ETA25:
+HLT_2j260_a10sd_cssk_86bgntwox_pf_jes_ftf_presel2j225_L1gLJ140p0ETA25:
   eventCount: 0
-HLT_2j260_a10sd_cssk_70bgntwox_pf_jes_ftf_presel2j225_L1jJ160:
+HLT_2j260_a10sd_cssk_86bgntwox_pf_jes_ftf_presel2j225_L1jJ160:
   eventCount: 0
 HLT_2j330_35smcINF_a10sd_cssk_pf_jes_ftf_presel2j225_L1SC111-CjJ40:
   eventCount: 0
@@ -1796,6 +1804,8 @@ HLT_e20_lhvloose_L1eEM18L:
     3: 1
     4: 1
     5: 1
+HLT_e24_dnnloose_2e12_dnnloose_L1eEM24L_3eEM12L:
+  eventCount: 0
 HLT_e24_lhmedium_g12_loose_g12_loose_02dRAB_02dRAC_02dRBC_L1eEM24L_3eEM12L:
   eventCount: 0
 HLT_e24_lhmedium_g25_medium_02dRAB_L12eEM24L:
@@ -1932,6 +1942,38 @@ HLT_e26_dnntight_ivarloose_L1eEM26M:
     3: 1
     4: 1
     5: 1
+HLT_e26_dnntight_ivarloose_e17_dnnloose_probe_L1eEM26M:
+  eventCount: 0
+  stepCounts:
+    0: 1
+    1: 1
+    2: 1
+    3: 1
+    4: 1
+    5: 1
+  stepFeatures:
+    0: 1
+    1: 1
+    2: 1
+    3: 1
+    4: 1
+    5: 1
+HLT_e26_dnntight_ivarloose_e30_dnnloose_nopix_lrtmedium_probe_L1eEM26M:
+  eventCount: 0
+  stepCounts:
+    0: 1
+    1: 1
+    2: 1
+    3: 1
+    4: 1
+    5: 1
+  stepFeatures:
+    0: 1
+    1: 1
+    2: 1
+    3: 1
+    4: 1
+    5: 1
 HLT_e26_etcut_L1eEM26M:
   eventCount: 7
   stepCounts:
@@ -4518,6 +4560,10 @@ HLT_e50_etcut_L1eEM28M:
     1: 3
     2: 11
     3: 3
+HLT_e5_dnntight_e9_etcut_1invmAB5_L1JPSI-1M5-eEM9:
+  eventCount: 0
+  stepFeatures:
+    0: 6
 HLT_e5_etcut_L1eEM5:
   eventCount: 22
   stepCounts:
@@ -5005,14 +5051,14 @@ HLT_g100_loose_L1eEM28M:
 HLT_g10_loose_L1eEM9:
   eventCount: 3
   stepCounts:
-    0: 9
-    1: 7
-    2: 7
+    0: 16
+    1: 9
+    2: 9
     3: 3
   stepFeatures:
-    0: 12
-    1: 7
-    2: 7
+    0: 27
+    1: 11
+    2: 10
     3: 3
 HLT_g120_loose_L1eEM26M:
   eventCount: 0
@@ -5028,7 +5074,7 @@ HLT_g140_loose_L1eEM26M:
   eventCount: 0
 HLT_g140_loose_L1eEM28M:
   eventCount: 0
-HLT_g140_loose_ringer_L1eEM26M:
+HLT_g140_loose_noringer_L1eEM26M:
   eventCount: 0
 HLT_g140_loose_tau20_mediumGNTau_probe_L1eTAU12_03dRAB_L1eEM26M:
   eventCount: 0
@@ -5049,37 +5095,25 @@ HLT_g15_loose_L1eEM10L_2mu10_msonly_L1MU3V_UNPAIRED_ISO:
 HLT_g15_loose_L1eEM12L:
   eventCount: 3
   stepCounts:
-    0: 6
-    1: 6
+    0: 7
+    1: 7
     2: 6
     3: 3
   stepFeatures:
-    0: 6
-    1: 6
+    0: 7
+    1: 7
     2: 6
     3: 3
 HLT_g15_tight_L1eEM12L:
   eventCount: 1
   stepCounts:
-    0: 4
-    1: 4
-    2: 4
-    3: 1
-  stepFeatures:
-    0: 4
-    1: 4
-    2: 4
-    3: 1
-HLT_g15_tight_ringer_L1eEM12L:
-  eventCount: 1
-  stepCounts:
-    0: 4
-    1: 4
+    0: 5
+    1: 5
     2: 4
     3: 1
   stepFeatures:
-    0: 4
-    1: 4
+    0: 5
+    1: 5
     2: 4
     3: 1
 HLT_g20_loose_L1eEM18L:
@@ -5178,20 +5212,6 @@ HLT_g20_tight_icaloloose_j40_j35a_j20c_j0_DJMASS300j35_pf_ftf_L1eEM22M_jMJJ-300:
   eventCount: 0
 HLT_g20_tight_icaloloose_j40_j35a_j25a_j25_j20c_j0_DJMASS300j35_pf_ftf_L1eEM22M_jMJJ-300:
   eventCount: 0
-HLT_g20_tight_icaloloose_ringer_L1eEM18M:
-  eventCount: 1
-  stepCounts:
-    0: 4
-    1: 4
-    2: 4
-    3: 1
-    4: 1
-  stepFeatures:
-    0: 4
-    1: 4
-    2: 4
-    3: 1
-    4: 1
 HLT_g20_tight_j35_0eta290_020jvt_bgn177_3j35a_j0_DJMASS500j35_pf_ftf_L1eEM22M_jMJJ-300:
   eventCount: 0
 HLT_g20_tight_j35_0eta290_020jvt_bgn277_3j35a_j0_DJMASS500j35_pf_ftf_L1eEM22M_jMJJ-300:
@@ -5200,18 +5220,6 @@ HLT_g20_tight_j35_0eta290_nnJvtv1_bgn277_3j35a_j0_DJMASS500j35_pf_ftf_L1eEM22M_j
   eventCount: 0
 HLT_g20_tight_probe_L1eEM18M_2mu14_L12MU8F:
   eventCount: 0
-HLT_g20_tight_ringer_L1eEM18M:
-  eventCount: 1
-  stepCounts:
-    0: 4
-    1: 4
-    2: 4
-    3: 1
-  stepFeatures:
-    0: 4
-    1: 4
-    2: 4
-    3: 1
 HLT_g22_tight_L1eEM18M:
   eventCount: 1
   stepCounts:
@@ -5226,18 +5234,6 @@ HLT_g22_tight_L1eEM18M:
     3: 1
 HLT_g22_tight_probe_L1eEM18M_2mu14_L12MU8F:
   eventCount: 0
-HLT_g22_tight_ringer_L1eEM18M:
-  eventCount: 1
-  stepCounts:
-    0: 4
-    1: 4
-    2: 4
-    3: 1
-  stepFeatures:
-    0: 4
-    1: 4
-    2: 4
-    3: 1
 HLT_g24_tight_icaloloose_j40c_j30c_j24c_03dRAB35_03dRAC35_15dRBC45_50invmBC130_pf_ftf_L1eEM26M:
   eventCount: 0
   stepCounts:
@@ -5305,17 +5301,17 @@ HLT_g25_loose_L1eEM24L:
     1: 6
     2: 6
     3: 3
-HLT_g25_loose_ringer_L1eEM24L:
+HLT_g25_loose_noringer_L1eEM24L:
   eventCount: 3
   stepCounts:
-    0: 6
-    1: 6
-    2: 6
+    0: 7
+    1: 7
+    2: 7
     3: 3
   stepFeatures:
-    0: 6
-    1: 6
-    2: 6
+    0: 7
+    1: 7
+    2: 7
     3: 3
 HLT_g25_loose_xe40_cell_xe50_tcpufit_18dphiAB_18dphiAC_80mTAC_L1eEM26M:
   eventCount: 0
@@ -5551,18 +5547,6 @@ HLT_g25_medium_j35_0eta290_nnJvtv1_bgn277_3j35a_j0_DJMASS700j35_pf_ftf_presela20
     4: 3
 HLT_g25_medium_probe_L1eEM24L_2mu14_L12MU8F:
   eventCount: 0
-HLT_g25_medium_ringer_L1eEM24L:
-  eventCount: 2
-  stepCounts:
-    0: 6
-    1: 6
-    2: 6
-    3: 2
-  stepFeatures:
-    0: 6
-    1: 6
-    2: 6
-    3: 2
 HLT_g25_medium_tau25_dikaonmass_tracktwoMVA_50invmAB_L1eEM26M:
   eventCount: 0
   stepCounts:
@@ -6324,7 +6308,7 @@ HLT_g35_medium_g25_medium_L1eEM9_EMPTY:
   eventCount: 0
 HLT_g35_medium_g25_medium_L1eEM9_UNPAIRED_ISO:
   eventCount: 0
-HLT_g35_medium_g25_medium_ringer_L12eEM24L:
+HLT_g35_medium_g25_medium_noringer_L12eEM24L:
   eventCount: 0
 HLT_g35_medium_j35_0eta290_020jvt_bgn177_3j35a_j0_DJMASS700j35_pf_ftf_presela20b85XX3a20_L1eEM26M:
   eventCount: 0
@@ -6410,20 +6394,20 @@ HLT_g35_medium_j35_0eta290_nnJvtv1_bgn277_3j35a_j0_DJMASS700j35_pf_ftf_presela20
     2: 3
     3: 1
     4: 3
-HLT_g35_medium_probe_L1eEM24L_2mu14_L12MU8F:
-  eventCount: 0
-HLT_g35_medium_ringer_L1eEM24L:
+HLT_g35_medium_noringer_L1eEM24L:
   eventCount: 1
   stepCounts:
-    0: 4
-    1: 4
-    2: 3
+    0: 5
+    1: 5
+    2: 4
     3: 1
   stepFeatures:
-    0: 4
-    1: 4
-    2: 3
+    0: 5
+    1: 5
+    2: 4
     3: 1
+HLT_g35_medium_probe_L1eEM24L_2mu14_L12MU8F:
+  eventCount: 0
 HLT_g35_medium_tau25_dikaonmass_tracktwoMVA_L1eTAU20_50invmAB_L1eEM26M:
   eventCount: 0
   stepCounts:
@@ -7268,18 +7252,6 @@ HLT_g50_loose_L1eEM24L:
     3: 1
 HLT_g50_loose_probe_L1eEM24L_2mu14_L12MU8F:
   eventCount: 0
-HLT_g50_loose_ringer_L1eEM24L:
-  eventCount: 1
-  stepCounts:
-    0: 2
-    1: 2
-    2: 2
-    3: 1
-  stepFeatures:
-    0: 2
-    1: 2
-    2: 2
-    3: 1
 HLT_g50_loose_xe40_cell_xe70_pfopufit_80mTAC_L1eEM26M:
   eventCount: 0
   stepCounts:
@@ -7415,28 +7387,28 @@ HLT_g60_tight_noiso_3j25_pf_ftf_PhysicsTLA_L1eEM28M:
 HLT_g7_loose_EgammaPEBTLA_L1eEM5:
   eventCount: 3
   stepCounts:
-    0: 9
-    1: 9
-    2: 9
+    0: 25
+    1: 19
+    2: 15
     3: 3
     4: 3
   stepFeatures:
-    0: 13
-    1: 12
-    2: 13
+    0: 54
+    1: 37
+    2: 29
     3: 3
     4: 3
 HLT_g7_loose_L1eEM5:
   eventCount: 3
   stepCounts:
-    0: 9
-    1: 9
-    2: 9
+    0: 25
+    1: 19
+    2: 15
     3: 3
   stepFeatures:
-    0: 13
-    1: 12
-    2: 13
+    0: 54
+    1: 37
+    2: 29
     3: 3
 HLT_g80_loose_L1eEM26M:
   eventCount: 0
@@ -7653,11 +7625,11 @@ HLT_j100_0eta290_020jvt_bgn260_pf_ftf_xe50_cell_xe85_tcpufit_L1jXE110:
 HLT_j100_0eta290_020jvt_boffperf_pf_ftf_preselj80_L1jJ90:
   eventCount: 4
   stepCounts:
-    0: 5
+    0: 6
     1: 4
     2: 4
   stepFeatures:
-    0: 5
+    0: 6
     1: 5
     2: 5
 HLT_j100_0eta290_nnJvtv1_bgn260_pf_ftf_xe50_cell_xe85_pfopufit_L1gXEJWOJ110:
@@ -7671,11 +7643,11 @@ HLT_j100_0eta290_nnJvtv1_bgn260_pf_ftf_xe50_cell_xe85_tcpufit_L1jXE110:
 HLT_j100_0eta290_nnJvtv1_boffperf_pf_ftf_preselj80_L1jJ90:
   eventCount: 4
   stepCounts:
-    0: 5
+    0: 6
     1: 4
     2: 4
   stepFeatures:
-    0: 5
+    0: 6
     1: 5
     2: 5
 HLT_j110_L1gJ20p25ETA49:
@@ -7686,25 +7658,25 @@ HLT_j110_L1jJ60:
     0: 4
   stepFeatures:
     0: 5
-HLT_j110_a10sd_cssk_60bgntwox_pf_jes_ftf_preselj80_L1jJ60:
+HLT_j110_a10sd_cssk_79bgntwox_pf_jes_ftf_preselj80_L1jJ60:
   eventCount: 0
   stepCounts:
     0: 7
   stepFeatures:
     0: 7
-HLT_j110_a10sd_cssk_70bgntwox_pf_jes_ftf_preselj80_L1jJ60:
+HLT_j110_a10sd_cssk_86bgntwox_pf_jes_ftf_preselj80_L1jJ60:
   eventCount: 0
   stepCounts:
     0: 7
   stepFeatures:
     0: 7
-HLT_j110_a10sd_cssk_80bgntwox_pf_jes_ftf_preselj80_L1jJ60:
+HLT_j110_a10sd_cssk_91bgntwox_pf_jes_ftf_preselj80_L1jJ60:
   eventCount: 0
   stepCounts:
     0: 7
   stepFeatures:
     0: 7
-HLT_j110_a10sd_cssk_90bgntwox_pf_jes_ftf_preselj80_L1jJ60:
+HLT_j110_a10sd_cssk_96bgntwox_pf_jes_ftf_preselj80_L1jJ60:
   eventCount: 2
   stepCounts:
     0: 7
@@ -7810,79 +7782,79 @@ HLT_j175_0eta180_emergingPTF0p08dR1p2_a10sd_cssk_pf_jes_ftf_preselj225_L1jJ160:
   eventCount: 0
 HLT_j175_0eta290_020jvt_bgn160_j60_0eta290_020jvt_bgn160_pf_ftf_preselj140b85XXj45b85_L1jJ160:
   eventCount: 0
-HLT_j175_35smcINF_60bgntwox_j175_35smcINF_a10sd_cssk_pf_jes_ftf_preselj140_L1SC111-CjJ40:
+HLT_j175_35smcINF_79bgntwox_j175_35smcINF_a10sd_cssk_pf_jes_ftf_preselj140_L1SC111-CjJ40:
   eventCount: 0
-HLT_j175_35smcINF_60bgntwox_j175_35smcINF_a10sd_cssk_pf_jes_ftf_preselj140_L1gLJ140p0ETA25:
+HLT_j175_35smcINF_79bgntwox_j175_35smcINF_a10sd_cssk_pf_jes_ftf_preselj140_L1gLJ140p0ETA25:
   eventCount: 0
-HLT_j175_35smcINF_60bgntwox_j175_35smcINF_a10sd_cssk_pf_jes_ftf_preselj140_L1jJ160:
+HLT_j175_35smcINF_79bgntwox_j175_35smcINF_a10sd_cssk_pf_jes_ftf_preselj140_L1jJ160:
   eventCount: 0
-HLT_j175_35smcINF_70bgntwox_j175_35smcINF_a10sd_cssk_pf_jes_ftf_preselj140_L1SC111-CjJ40:
+HLT_j175_35smcINF_86bgntwox_j175_35smcINF_a10sd_cssk_pf_jes_ftf_preselj140_L1SC111-CjJ40:
   eventCount: 0
-HLT_j175_35smcINF_70bgntwox_j175_35smcINF_a10sd_cssk_pf_jes_ftf_preselj140_L1gLJ140p0ETA25:
+HLT_j175_35smcINF_86bgntwox_j175_35smcINF_a10sd_cssk_pf_jes_ftf_preselj140_L1gLJ140p0ETA25:
   eventCount: 0
-HLT_j175_35smcINF_70bgntwox_j175_35smcINF_a10sd_cssk_pf_jes_ftf_preselj140_L1jJ160:
+HLT_j175_35smcINF_86bgntwox_j175_35smcINF_a10sd_cssk_pf_jes_ftf_preselj140_L1jJ160:
   eventCount: 0
-HLT_j175_35smcINF_70bgntwox_j175_35smcINF_a10sd_cssk_pf_jes_ftf_preselj160_L1gLJ140p0ETA25:
+HLT_j175_35smcINF_86bgntwox_j175_35smcINF_a10sd_cssk_pf_jes_ftf_preselj160_L1gLJ140p0ETA25:
   eventCount: 0
-HLT_j175_35smcINF_70bgntwox_j175_35smcINF_a10sd_cssk_pf_jes_ftf_preselj180_L1gLJ140p0ETA25:
+HLT_j175_35smcINF_86bgntwox_j175_35smcINF_a10sd_cssk_pf_jes_ftf_preselj180_L1gLJ140p0ETA25:
   eventCount: 0
-HLT_j175_35smcINF_70bgntwox_j175_35smcINF_a10sd_cssk_pf_jes_ftf_preselj200_L1gLJ140p0ETA25:
+HLT_j175_35smcINF_86bgntwox_j175_35smcINF_a10sd_cssk_pf_jes_ftf_preselj200_L1gLJ140p0ETA25:
   eventCount: 0
-HLT_j175_35smcINF_70bgntwox_j260_35smcINF_a10sd_cssk_pf_jes_ftf_preselj140_L1gLJ140p0ETA25:
+HLT_j175_35smcINF_86bgntwox_j260_35smcINF_a10sd_cssk_pf_jes_ftf_preselj140_L1gLJ140p0ETA25:
   eventCount: 0
-HLT_j175_35smcINF_70bgntwox_j260_35smcINF_a10sd_cssk_pf_jes_ftf_preselj160_L1gLJ140p0ETA25:
+HLT_j175_35smcINF_86bgntwox_j260_35smcINF_a10sd_cssk_pf_jes_ftf_preselj160_L1gLJ140p0ETA25:
   eventCount: 0
-HLT_j175_35smcINF_70bgntwox_j260_35smcINF_a10sd_cssk_pf_jes_ftf_preselj180_L1gLJ140p0ETA25:
+HLT_j175_35smcINF_86bgntwox_j260_35smcINF_a10sd_cssk_pf_jes_ftf_preselj180_L1gLJ140p0ETA25:
   eventCount: 0
-HLT_j175_35smcINF_70bgntwox_j260_35smcINF_a10sd_cssk_pf_jes_ftf_preselj200_L1gLJ140p0ETA25:
+HLT_j175_35smcINF_86bgntwox_j260_35smcINF_a10sd_cssk_pf_jes_ftf_preselj200_L1gLJ140p0ETA25:
   eventCount: 0
-HLT_j175_35smcINF_80bgntwox_j175_35smcINF_a10sd_cssk_pf_jes_ftf_preselj140_L1SC111-CjJ40:
+HLT_j175_35smcINF_91bgntwox_j175_35smcINF_a10sd_cssk_pf_jes_ftf_preselj140_L1SC111-CjJ40:
   eventCount: 0
-HLT_j175_35smcINF_80bgntwox_j175_35smcINF_a10sd_cssk_pf_jes_ftf_preselj140_L1gLJ140p0ETA25:
+HLT_j175_35smcINF_91bgntwox_j175_35smcINF_a10sd_cssk_pf_jes_ftf_preselj140_L1gLJ140p0ETA25:
   eventCount: 0
-HLT_j175_35smcINF_80bgntwox_j175_35smcINF_a10sd_cssk_pf_jes_ftf_preselj140_L1jJ160:
+HLT_j175_35smcINF_91bgntwox_j175_35smcINF_a10sd_cssk_pf_jes_ftf_preselj140_L1jJ160:
   eventCount: 0
-HLT_j175_35smcINF_a10sd_cssk_70bgntwox_pf_jes_ftf_preselj140_L1SC111-CjJ40:
+HLT_j175_35smcINF_a10sd_cssk_86bgntwox_pf_jes_ftf_preselj140_L1SC111-CjJ40:
   eventCount: 0
-HLT_j175_35smcINF_a10sd_cssk_70bgntwox_pf_jes_ftf_preselj140_L1gLJ140p0ETA25:
+HLT_j175_35smcINF_a10sd_cssk_86bgntwox_pf_jes_ftf_preselj140_L1gLJ140p0ETA25:
   eventCount: 0
-HLT_j175_35smcINF_a10sd_cssk_70bgntwox_pf_jes_ftf_preselj140_L1jJ160:
+HLT_j175_35smcINF_a10sd_cssk_86bgntwox_pf_jes_ftf_preselj140_L1jJ160:
   eventCount: 0
 HLT_j175_L1gJ50p0ETA25:
   eventCount: 0
 HLT_j175_L1jJ90:
   eventCount: 0
-HLT_j175_a10sd_cssk_60bgntwox_pf_jes_ftf_preselj140_L1SC111-CjJ40:
+HLT_j175_a10sd_cssk_79bgntwox_pf_jes_ftf_preselj140_L1SC111-CjJ40:
   eventCount: 0
-HLT_j175_a10sd_cssk_60bgntwox_pf_jes_ftf_preselj140_L1gLJ140p0ETA25:
+HLT_j175_a10sd_cssk_79bgntwox_pf_jes_ftf_preselj140_L1gLJ140p0ETA25:
   eventCount: 0
-HLT_j175_a10sd_cssk_60bgntwox_pf_jes_ftf_preselj140_L1jJ160:
+HLT_j175_a10sd_cssk_79bgntwox_pf_jes_ftf_preselj140_L1jJ160:
   eventCount: 0
-HLT_j175_a10sd_cssk_60bgntwox_pf_jes_ftf_preselj140_L1jJ90:
+HLT_j175_a10sd_cssk_79bgntwox_pf_jes_ftf_preselj140_L1jJ90:
   eventCount: 0
-HLT_j175_a10sd_cssk_70bgntwox_pf_jes_ftf_preselj140_L1SC111-CjJ40:
+HLT_j175_a10sd_cssk_86bgntwox_pf_jes_ftf_preselj140_L1SC111-CjJ40:
   eventCount: 0
-HLT_j175_a10sd_cssk_70bgntwox_pf_jes_ftf_preselj140_L1gLJ140p0ETA25:
+HLT_j175_a10sd_cssk_86bgntwox_pf_jes_ftf_preselj140_L1gLJ140p0ETA25:
   eventCount: 0
-HLT_j175_a10sd_cssk_70bgntwox_pf_jes_ftf_preselj140_L1jJ160:
+HLT_j175_a10sd_cssk_86bgntwox_pf_jes_ftf_preselj140_L1jJ160:
   eventCount: 0
-HLT_j175_a10sd_cssk_70bgntwox_pf_jes_ftf_preselj140_L1jJ90:
+HLT_j175_a10sd_cssk_86bgntwox_pf_jes_ftf_preselj140_L1jJ90:
   eventCount: 0
-HLT_j175_a10sd_cssk_80bgntwox_pf_jes_ftf_preselj140_L1SC111-CjJ40:
+HLT_j175_a10sd_cssk_91bgntwox_pf_jes_ftf_preselj140_L1SC111-CjJ40:
   eventCount: 0
-HLT_j175_a10sd_cssk_80bgntwox_pf_jes_ftf_preselj140_L1gLJ140p0ETA25:
+HLT_j175_a10sd_cssk_91bgntwox_pf_jes_ftf_preselj140_L1gLJ140p0ETA25:
   eventCount: 0
-HLT_j175_a10sd_cssk_80bgntwox_pf_jes_ftf_preselj140_L1jJ160:
+HLT_j175_a10sd_cssk_91bgntwox_pf_jes_ftf_preselj140_L1jJ160:
   eventCount: 0
-HLT_j175_a10sd_cssk_80bgntwox_pf_jes_ftf_preselj140_L1jJ90:
+HLT_j175_a10sd_cssk_91bgntwox_pf_jes_ftf_preselj140_L1jJ90:
   eventCount: 0
-HLT_j175_a10sd_cssk_90bgntwox_pf_jes_ftf_preselj140_L1SC111-CjJ40:
+HLT_j175_a10sd_cssk_96bgntwox_pf_jes_ftf_preselj140_L1SC111-CjJ40:
   eventCount: 0
-HLT_j175_a10sd_cssk_90bgntwox_pf_jes_ftf_preselj140_L1gLJ140p0ETA25:
+HLT_j175_a10sd_cssk_96bgntwox_pf_jes_ftf_preselj140_L1gLJ140p0ETA25:
   eventCount: 0
-HLT_j175_a10sd_cssk_90bgntwox_pf_jes_ftf_preselj140_L1jJ160:
+HLT_j175_a10sd_cssk_96bgntwox_pf_jes_ftf_preselj140_L1jJ160:
   eventCount: 0
-HLT_j175_a10sd_cssk_90bgntwox_pf_jes_ftf_preselj140_L1jJ90:
+HLT_j175_a10sd_cssk_96bgntwox_pf_jes_ftf_preselj140_L1jJ90:
   eventCount: 0
 HLT_j175_a10sd_cssk_pf_jes_ftf_preselj140_L1gLJ100p0ETA25:
   eventCount: 0
@@ -8047,15 +8019,15 @@ HLT_j20_PhysicsTLA_L1HT190-jJ40s5pETA21:
 HLT_j20_PhysicsTLA_L1jJ160:
   eventCount: 0
 HLT_j20_PhysicsTLA_L1jJ90_DETA20-jJ90J:
-  eventCount: 1
+  eventCount: 3
   stepCounts:
-    0: 1
-    1: 1
-    2: 1
-  stepFeatures:
     0: 3
     1: 3
-    2: 1
+    2: 3
+  stepFeatures:
+    0: 14
+    1: 14
+    2: 3
 HLT_j20_calratiovar_roiftf_preselj20emf24_L1LLPDPHI-jXE40-jJ40:
   eventCount: 0
 HLT_j20_calratiovar_roiftf_preselj20emf24_L1LLPNODPHI-jXE40-jJ40:
@@ -8226,79 +8198,79 @@ HLT_j25f_L1RD0_FILLED:
     0: 2
   stepFeatures:
     0: 2
-HLT_j260_35smcINF_60bgntwox_j260_35smcINF_a10sd_cssk_pf_jes_ftf_presel2j225_L1SC111-CjJ40:
+HLT_j260_35smcINF_79bgntwox_j260_35smcINF_a10sd_cssk_pf_jes_ftf_presel2j225_L1SC111-CjJ40:
   eventCount: 0
-HLT_j260_35smcINF_60bgntwox_j260_35smcINF_a10sd_cssk_pf_jes_ftf_presel2j225_L1gLJ140p0ETA25:
+HLT_j260_35smcINF_79bgntwox_j260_35smcINF_a10sd_cssk_pf_jes_ftf_presel2j225_L1gLJ140p0ETA25:
   eventCount: 0
-HLT_j260_35smcINF_60bgntwox_j260_35smcINF_a10sd_cssk_pf_jes_ftf_presel2j225_L1jJ160:
+HLT_j260_35smcINF_79bgntwox_j260_35smcINF_a10sd_cssk_pf_jes_ftf_presel2j225_L1jJ160:
   eventCount: 0
-HLT_j260_35smcINF_70bgntwox_j175_35smcINF_a10sd_cssk_pf_jes_ftf_preselj140_L1gLJ140p0ETA25:
+HLT_j260_35smcINF_86bgntwox_j175_35smcINF_a10sd_cssk_pf_jes_ftf_preselj140_L1gLJ140p0ETA25:
   eventCount: 0
-HLT_j260_35smcINF_70bgntwox_j175_35smcINF_a10sd_cssk_pf_jes_ftf_preselj160_L1gLJ140p0ETA25:
+HLT_j260_35smcINF_86bgntwox_j175_35smcINF_a10sd_cssk_pf_jes_ftf_preselj160_L1gLJ140p0ETA25:
   eventCount: 0
-HLT_j260_35smcINF_70bgntwox_j175_35smcINF_a10sd_cssk_pf_jes_ftf_preselj180_L1gLJ140p0ETA25:
+HLT_j260_35smcINF_86bgntwox_j175_35smcINF_a10sd_cssk_pf_jes_ftf_preselj180_L1gLJ140p0ETA25:
   eventCount: 0
-HLT_j260_35smcINF_70bgntwox_j175_35smcINF_a10sd_cssk_pf_jes_ftf_preselj200_L1gLJ140p0ETA25:
+HLT_j260_35smcINF_86bgntwox_j175_35smcINF_a10sd_cssk_pf_jes_ftf_preselj200_L1gLJ140p0ETA25:
   eventCount: 0
-HLT_j260_35smcINF_70bgntwox_j260_35smcINF_a10sd_cssk_pf_jes_ftf_presel2j225_L1SC111-CjJ40:
+HLT_j260_35smcINF_86bgntwox_j260_35smcINF_a10sd_cssk_pf_jes_ftf_presel2j225_L1SC111-CjJ40:
   eventCount: 0
-HLT_j260_35smcINF_70bgntwox_j260_35smcINF_a10sd_cssk_pf_jes_ftf_presel2j225_L1gLJ140p0ETA25:
+HLT_j260_35smcINF_86bgntwox_j260_35smcINF_a10sd_cssk_pf_jes_ftf_presel2j225_L1gLJ140p0ETA25:
   eventCount: 0
-HLT_j260_35smcINF_70bgntwox_j260_35smcINF_a10sd_cssk_pf_jes_ftf_presel2j225_L1jJ160:
+HLT_j260_35smcINF_86bgntwox_j260_35smcINF_a10sd_cssk_pf_jes_ftf_presel2j225_L1jJ160:
   eventCount: 0
-HLT_j260_35smcINF_70bgntwox_j260_35smcINF_a10sd_cssk_pf_jes_ftf_preselj140_L1gLJ140p0ETA25:
+HLT_j260_35smcINF_86bgntwox_j260_35smcINF_a10sd_cssk_pf_jes_ftf_preselj140_L1gLJ140p0ETA25:
   eventCount: 0
-HLT_j260_35smcINF_70bgntwox_j260_35smcINF_a10sd_cssk_pf_jes_ftf_preselj160_L1gLJ140p0ETA25:
+HLT_j260_35smcINF_86bgntwox_j260_35smcINF_a10sd_cssk_pf_jes_ftf_preselj160_L1gLJ140p0ETA25:
   eventCount: 0
-HLT_j260_35smcINF_70bgntwox_j260_35smcINF_a10sd_cssk_pf_jes_ftf_preselj180_L1gLJ140p0ETA25:
+HLT_j260_35smcINF_86bgntwox_j260_35smcINF_a10sd_cssk_pf_jes_ftf_preselj180_L1gLJ140p0ETA25:
   eventCount: 0
-HLT_j260_35smcINF_70bgntwox_j260_35smcINF_a10sd_cssk_pf_jes_ftf_preselj200_L1gLJ140p0ETA25:
+HLT_j260_35smcINF_86bgntwox_j260_35smcINF_a10sd_cssk_pf_jes_ftf_preselj200_L1gLJ140p0ETA25:
   eventCount: 0
-HLT_j260_35smcINF_80bgntwox_j260_35smcINF_a10sd_cssk_pf_jes_ftf_presel2j225_L1SC111-CjJ40:
+HLT_j260_35smcINF_91bgntwox_j260_35smcINF_a10sd_cssk_pf_jes_ftf_presel2j225_L1SC111-CjJ40:
   eventCount: 0
-HLT_j260_35smcINF_80bgntwox_j260_35smcINF_a10sd_cssk_pf_jes_ftf_presel2j225_L1gLJ140p0ETA25:
+HLT_j260_35smcINF_91bgntwox_j260_35smcINF_a10sd_cssk_pf_jes_ftf_presel2j225_L1gLJ140p0ETA25:
   eventCount: 0
-HLT_j260_35smcINF_80bgntwox_j260_35smcINF_a10sd_cssk_pf_jes_ftf_presel2j225_L1jJ160:
+HLT_j260_35smcINF_91bgntwox_j260_35smcINF_a10sd_cssk_pf_jes_ftf_presel2j225_L1jJ160:
   eventCount: 0
-HLT_j260_70bgntwox_j260_a10sd_cssk_pf_jes_ftf_presel2j225_L1SC111-CjJ40:
+HLT_j260_86bgntwox_j260_a10sd_cssk_pf_jes_ftf_presel2j225_L1SC111-CjJ40:
   eventCount: 0
-HLT_j260_70bgntwox_j260_a10sd_cssk_pf_jes_ftf_presel2j225_L1gLJ140p0ETA25:
+HLT_j260_86bgntwox_j260_a10sd_cssk_pf_jes_ftf_presel2j225_L1gLJ140p0ETA25:
   eventCount: 0
-HLT_j260_70bgntwox_j260_a10sd_cssk_pf_jes_ftf_presel2j225_L1jJ160:
+HLT_j260_86bgntwox_j260_a10sd_cssk_pf_jes_ftf_presel2j225_L1jJ160:
   eventCount: 0
 HLT_j260_L1jJ125:
   eventCount: 0
-HLT_j260_a10sd_cssk_60bgntwox_pf_jes_ftf_preselj200_L1SC111-CjJ40:
+HLT_j260_a10sd_cssk_79bgntwox_pf_jes_ftf_preselj200_L1SC111-CjJ40:
   eventCount: 0
-HLT_j260_a10sd_cssk_60bgntwox_pf_jes_ftf_preselj200_L1gLJ140p0ETA25:
+HLT_j260_a10sd_cssk_79bgntwox_pf_jes_ftf_preselj200_L1gLJ140p0ETA25:
   eventCount: 0
-HLT_j260_a10sd_cssk_60bgntwox_pf_jes_ftf_preselj200_L1jJ125:
+HLT_j260_a10sd_cssk_79bgntwox_pf_jes_ftf_preselj200_L1jJ125:
   eventCount: 0
-HLT_j260_a10sd_cssk_60bgntwox_pf_jes_ftf_preselj200_L1jJ160:
+HLT_j260_a10sd_cssk_79bgntwox_pf_jes_ftf_preselj200_L1jJ160:
   eventCount: 0
-HLT_j260_a10sd_cssk_70bgntwox_pf_jes_ftf_preselj200_L1SC111-CjJ40:
+HLT_j260_a10sd_cssk_86bgntwox_pf_jes_ftf_preselj200_L1SC111-CjJ40:
   eventCount: 0
-HLT_j260_a10sd_cssk_70bgntwox_pf_jes_ftf_preselj200_L1gLJ140p0ETA25:
+HLT_j260_a10sd_cssk_86bgntwox_pf_jes_ftf_preselj200_L1gLJ140p0ETA25:
   eventCount: 0
-HLT_j260_a10sd_cssk_70bgntwox_pf_jes_ftf_preselj200_L1jJ125:
+HLT_j260_a10sd_cssk_86bgntwox_pf_jes_ftf_preselj200_L1jJ125:
   eventCount: 0
-HLT_j260_a10sd_cssk_70bgntwox_pf_jes_ftf_preselj200_L1jJ160:
+HLT_j260_a10sd_cssk_86bgntwox_pf_jes_ftf_preselj200_L1jJ160:
   eventCount: 0
-HLT_j260_a10sd_cssk_80bgntwox_pf_jes_ftf_preselj200_L1SC111-CjJ40:
+HLT_j260_a10sd_cssk_91bgntwox_pf_jes_ftf_preselj200_L1SC111-CjJ40:
   eventCount: 0
-HLT_j260_a10sd_cssk_80bgntwox_pf_jes_ftf_preselj200_L1gLJ140p0ETA25:
+HLT_j260_a10sd_cssk_91bgntwox_pf_jes_ftf_preselj200_L1gLJ140p0ETA25:
   eventCount: 0
-HLT_j260_a10sd_cssk_80bgntwox_pf_jes_ftf_preselj200_L1jJ125:
+HLT_j260_a10sd_cssk_91bgntwox_pf_jes_ftf_preselj200_L1jJ125:
   eventCount: 0
-HLT_j260_a10sd_cssk_80bgntwox_pf_jes_ftf_preselj200_L1jJ160:
+HLT_j260_a10sd_cssk_91bgntwox_pf_jes_ftf_preselj200_L1jJ160:
   eventCount: 0
-HLT_j260_a10sd_cssk_90bgntwox_pf_jes_ftf_preselj200_L1SC111-CjJ40:
+HLT_j260_a10sd_cssk_96bgntwox_pf_jes_ftf_preselj200_L1SC111-CjJ40:
   eventCount: 0
-HLT_j260_a10sd_cssk_90bgntwox_pf_jes_ftf_preselj200_L1gLJ140p0ETA25:
+HLT_j260_a10sd_cssk_96bgntwox_pf_jes_ftf_preselj200_L1gLJ140p0ETA25:
   eventCount: 0
-HLT_j260_a10sd_cssk_90bgntwox_pf_jes_ftf_preselj200_L1jJ125:
+HLT_j260_a10sd_cssk_96bgntwox_pf_jes_ftf_preselj200_L1jJ125:
   eventCount: 0
-HLT_j260_a10sd_cssk_90bgntwox_pf_jes_ftf_preselj200_L1jJ160:
+HLT_j260_a10sd_cssk_96bgntwox_pf_jes_ftf_preselj200_L1jJ160:
   eventCount: 0
 HLT_j260_a10sd_cssk_pf_jes_ftf_preselj200_L1jJ125:
   eventCount: 0
@@ -8478,13 +8450,13 @@ HLT_j360_L1gJ100p0ETA25:
   eventCount: 0
 HLT_j360_L1jJ160:
   eventCount: 0
-HLT_j360_a10sd_cssk_60bgntwox_pf_jes_ftf_preselj225_L1jJ160:
+HLT_j360_a10sd_cssk_79bgntwox_pf_jes_ftf_preselj225_L1jJ160:
   eventCount: 0
-HLT_j360_a10sd_cssk_70bgntwox_pf_jes_ftf_preselj225_L1jJ160:
+HLT_j360_a10sd_cssk_86bgntwox_pf_jes_ftf_preselj225_L1jJ160:
   eventCount: 0
-HLT_j360_a10sd_cssk_80bgntwox_pf_jes_ftf_preselj225_L1jJ160:
+HLT_j360_a10sd_cssk_91bgntwox_pf_jes_ftf_preselj225_L1jJ160:
   eventCount: 0
-HLT_j360_a10sd_cssk_90bgntwox_pf_jes_ftf_preselj225_L1jJ160:
+HLT_j360_a10sd_cssk_96bgntwox_pf_jes_ftf_preselj225_L1jJ160:
   eventCount: 0
 HLT_j360_a10sd_cssk_pf_jes_ftf_preselj225_L1SC111-CjJ40:
   eventCount: 0
@@ -8566,13 +8538,13 @@ HLT_j420_L1jJ160:
   eventCount: 0
 HLT_j420_L1jJ180:
   eventCount: 0
-HLT_j420_a10sd_cssk_60bgntwox_pf_jes_ftf_preselj225_L1jJ160:
+HLT_j420_a10sd_cssk_79bgntwox_pf_jes_ftf_preselj225_L1jJ160:
   eventCount: 0
-HLT_j420_a10sd_cssk_70bgntwox_pf_jes_ftf_preselj225_L1jJ160:
+HLT_j420_a10sd_cssk_86bgntwox_pf_jes_ftf_preselj225_L1jJ160:
   eventCount: 0
-HLT_j420_a10sd_cssk_80bgntwox_pf_jes_ftf_preselj225_L1jJ160:
+HLT_j420_a10sd_cssk_91bgntwox_pf_jes_ftf_preselj225_L1jJ160:
   eventCount: 0
-HLT_j420_a10sd_cssk_90bgntwox_pf_jes_ftf_preselj225_L1jJ160:
+HLT_j420_a10sd_cssk_96bgntwox_pf_jes_ftf_preselj225_L1jJ160:
   eventCount: 0
 HLT_j420_a10sd_cssk_pf_jes_ftf_preselj225_L1SC111-CjJ40:
   eventCount: 0
@@ -8698,13 +8670,13 @@ HLT_j460_a10r_L1jJ160:
   eventCount: 0
 HLT_j460_a10r_L1jLJ140:
   eventCount: 0
-HLT_j460_a10sd_cssk_60bgntwox_pf_jes_ftf_preselj225_L1jJ160:
+HLT_j460_a10sd_cssk_79bgntwox_pf_jes_ftf_preselj225_L1jJ160:
   eventCount: 0
-HLT_j460_a10sd_cssk_70bgntwox_pf_jes_ftf_preselj225_L1jJ160:
+HLT_j460_a10sd_cssk_86bgntwox_pf_jes_ftf_preselj225_L1jJ160:
   eventCount: 0
-HLT_j460_a10sd_cssk_80bgntwox_pf_jes_ftf_preselj225_L1jJ160:
+HLT_j460_a10sd_cssk_91bgntwox_pf_jes_ftf_preselj225_L1jJ160:
   eventCount: 0
-HLT_j460_a10sd_cssk_90bgntwox_pf_jes_ftf_preselj225_L1jJ160:
+HLT_j460_a10sd_cssk_96bgntwox_pf_jes_ftf_preselj225_L1jJ160:
   eventCount: 0
 HLT_j460_a10sd_cssk_pf_jes_ftf_preselj225_L1SC111-CjJ40:
   eventCount: 0
@@ -8803,25 +8775,25 @@ HLT_j55c_xe50_cell_L1jJ60_EMPTY:
 HLT_j55c_xe50_cell_L1jJ60_FIRSTEMPTY:
   eventCount: 0
 HLT_j60_0eta290_020jvt_boffperf_pf_ftf_L1jJ90:
-  eventCount: 5
+  eventCount: 7
   stepCounts:
-    0: 5
-    1: 5
-    2: 5
+    0: 7
+    1: 7
+    2: 7
   stepFeatures:
-    0: 5
-    1: 9
-    2: 9
+    0: 7
+    1: 12
+    2: 12
 HLT_j60_0eta290_nnJvtv1_boffperf_pf_ftf_L1jJ90:
-  eventCount: 5
+  eventCount: 7
   stepCounts:
-    0: 5
-    1: 5
-    2: 5
+    0: 7
+    1: 7
+    2: 7
   stepFeatures:
-    0: 5
-    1: 9
-    2: 9
+    0: 7
+    1: 12
+    2: 12
 HLT_j60_L1gJ20p0ETA25:
   eventCount: 12
   stepCounts:
@@ -8835,11 +8807,11 @@ HLT_j60_L1jJ50:
   stepFeatures:
     0: 17
 HLT_j60_L1jJ90:
-  eventCount: 5
+  eventCount: 7
   stepCounts:
-    0: 5
+    0: 7
   stepFeatures:
-    0: 9
+    0: 12
 HLT_j60_j45_j25_j20_pf_ftf_preselc60XXc45XXc25XXc20_PhysicsTLA_L1jJ85p0ETA21_3jJ40p0ETA25:
   eventCount: 0
 HLT_j60_pf_ftf_preselj50_L1jJ50:
@@ -9085,25 +9057,25 @@ HLT_j80_0eta290_020jvt_bgn160_pf_ftf_xe60_cell_L12jJ90_jXE80:
 HLT_j80_0eta290_020jvt_bgn170_j60_0eta290_020jvt_bgn185_j45f_pf_ftf_preselj60XXj45XXf40_L1jJ80p0ETA25_2jJ55_jJ50p30ETA49:
   eventCount: 0
 HLT_j80_0eta290_020jvt_boffperf_pf_ftf_L1jJ90:
-  eventCount: 5
+  eventCount: 6
   stepCounts:
-    0: 5
-    1: 5
-    2: 5
-  stepFeatures:
-    0: 5
+    0: 7
     1: 6
     2: 6
+  stepFeatures:
+    0: 7
+    1: 7
+    2: 7
 HLT_j80_0eta290_nnJvtv1_boffperf_pf_ftf_L1jJ90:
-  eventCount: 5
+  eventCount: 6
   stepCounts:
-    0: 5
-    1: 5
-    2: 5
-  stepFeatures:
-    0: 5
+    0: 7
     1: 6
     2: 6
+  stepFeatures:
+    0: 7
+    1: 7
+    2: 7
 ? HLT_j80c_020jvt_j55c_020jvt_j28c_020jvt_j20c_020jvt_SHARED_2j20c_020jvt_bgn177_pf_ftf_presel2c20XX2c20b80_L1MU8F_2jJ40_jJ50
 : eventCount: 0
   stepCounts:
@@ -9155,11 +9127,11 @@ HLT_j85_L1jJ50:
   stepFeatures:
     0: 8
 HLT_j85_L1jJ90:
-  eventCount: 5
+  eventCount: 6
   stepCounts:
-    0: 5
-  stepFeatures:
     0: 6
+  stepFeatures:
+    0: 7
 HLT_j85_a10sd_cssk_pf_jes_ftf_preselj50_L1jJ50:
   eventCount: 9
   stepCounts:
@@ -9539,10 +9511,6 @@ HLT_mu14_ivarloose_tau25_mediumGNTau_03dRAB_L1MU8F_cTAU20M_3jJ30:
   eventCount: 0
 HLT_mu14_ivarloose_tau25_mediumRNN_tracktwoMVA_03dRAB_L1MU8F_cTAU20M_3jJ30:
   eventCount: 0
-HLT_mu14_ivarloose_tau35_mediumGNTau_03dRAB_L1MU8F_cTAU30M:
-  eventCount: 0
-  stepFeatures:
-    0: 1
 HLT_mu14_ivarloose_tau35_mediumGNTau_03dRAB_L1cTAU30M_3DR35-MU8F-eTAU30:
   eventCount: 0
   stepFeatures:
@@ -12072,7 +12040,7 @@ HLT_noalg_L1jJ60:
 HLT_noalg_L1jJ60p30ETA49:
   eventCount: 0
 HLT_noalg_L1jJ90:
-  eventCount: 5
+  eventCount: 7
 HLT_noalg_L1jJ90p30ETA49:
   eventCount: 0
 HLT_noalg_L1jLJ120:
diff --git a/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1Cosmic_T0Mon_build.py b/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1Cosmic_T0Mon_build.py
index 09777fc06c08fe740c2130d637409986ce3314ee..fb2c9d36d40ec256f97ef06ee43a142a4566d54d 100755
--- a/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1Cosmic_T0Mon_build.py
+++ b/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1Cosmic_T0Mon_build.py
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2025 CERN for the benefit of the ATLAS collaboration
 
 # art-description: Test of cosmic P1+Tier0 workflow, runs athenaHLT with Cosmic_run3_v1 menu followed by offline reco and monitoring
 # art-type: build
@@ -8,6 +8,7 @@
 
 from TrigValTools.TrigValSteering import Test, ExecStep, CheckSteps
 from TrigValTools.TrigValSteering.Common import find_file
+from AthenaConfiguration.TestDefaults import defaultConditionsTags
 
 # Specify trigger menu once here:
 triggermenu = 'Cosmic_run3_v1'
@@ -69,7 +70,7 @@ tzreco.args = '--inputBSFile=' + find_file('*.physics_Main*._athenaHLT*.data')
 tzreco.args += ' --outputAODFile=AOD.pool.root'
 tzreco.args += ' --outputHISTFile=ExampleMonitorOutput.root'
 tzreco.args += ' --geometryVersion=\'ATLAS-R3S-2021-03-02-00\''
-tzreco.args += ' --conditionsTag=\'CONDBR2-BLKPA-2023-05\''
+tzreco.args += f' --conditionsTag="{defaultConditionsTags.RUN3_DATA23}"'
 tzreco.args += ' --preExec="{:s}"'.format(tzrecoPreExec)
 
 # The full test
diff --git a/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1Cosmic_T0Mon_grid.py b/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1Cosmic_T0Mon_grid.py
index 3d9b612da60cb41b3492f3baea227ca9c6132730..63ad2debfe774e3b1ecb0cb3d2a86e5cd3ed2bd3 100755
--- a/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1Cosmic_T0Mon_grid.py
+++ b/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1Cosmic_T0Mon_grid.py
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2025 CERN for the benefit of the ATLAS collaboration
 
 # art-description: Test of cosmic P1+Tier0 workflow, runs athenaHLT with Cosmic_run3_v1 menu followed by offline reco and monitoring
 # art-type: grid
@@ -19,6 +19,7 @@
 
 from TrigValTools.TrigValSteering import Test, ExecStep, CheckSteps
 from TrigValTools.TrigValSteering.Common import find_file
+from AthenaConfiguration.TestDefaults import defaultConditionsTags
 
 # Specify trigger menu once here:
 triggermenu = 'Cosmic_run3_v1'
@@ -82,7 +83,7 @@ tzreco.args = '--inputBSFile=' + find_file('*.physics_Main*._athenaHLT*.data')
 tzreco.args += ' --outputAODFile=AOD.pool.root'
 tzreco.args += ' --outputHISTFile=ExampleMonitorOutput.root'
 tzreco.args += ' --geometryVersion=\'ATLAS-R3S-2021-03-02-00\''
-tzreco.args += ' --conditionsTag=\'CONDBR2-BLKPA-2023-05\''
+tzreco.args += f' --conditionsTag="{defaultConditionsTags.RUN3_DATA23}"'
 tzreco.args += ' --preExec="{:s}"'.format(tzrecoPreExec)
 
 # The full test
diff --git a/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1Dev_HI_run3_build.py b/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1Dev_HI_run3_build.py
index e5956e3c4501a407a124ce9042987559c485ba8b..f59e63a0ba2c61c102c577b3d41badf2fafca5d2 100755
--- a/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1Dev_HI_run3_build.py
+++ b/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1Dev_HI_run3_build.py
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2025 CERN for the benefit of the ATLAS collaboration
 
 # art-description: Test of HI data 2023 workflow, runs athenaHLT with HI menu followed by filtering of HP stream and offline reco
 # art-type: build
@@ -8,7 +8,7 @@
 
 from TrigValTools.TrigValSteering import Test, ExecStep, CheckSteps
 from TrigValTools.TrigValSteering.Common import find_file
-
+from AthenaConfiguration.TestDefaults import defaultConditionsTags
 
 # Specify trigger menu once here:
 triggermenu = 'Dev_HI_run3_v1_TriggerValidation_prescale'
@@ -70,7 +70,7 @@ reco_hp.args += ' --outputAODFile=HP_AOD.pool.root'
 reco_hp.args += ' --outputHISTFile=hist.root'
 reco_hp.args += f' --preExec="all:{recoHPPreExec}"'
 reco_hp.args += ' --geometryVersion="ATLAS-R3S-2021-03-02-00"'
-reco_hp.args += ' --conditionsTag="CONDBR2-BLKPA-2023-05"'
+reco_hp.args += f' --conditionsTag="{defaultConditionsTags.RUN3_DATA23}"'
 reco_hp.args += ' --autoConfiguration="everything"'
 
 #====================================================================================================
@@ -94,7 +94,7 @@ reco_upc.args += ' --outputAODFile=AOD_UPC.pool.root'
 reco_upc.args += ' --outputHISTFile=hist_UPC.root'
 reco_upc.args += f' --preExec="all:{recoUPCPreExec}"'
 reco_upc.args += ' --geometryVersion="ATLAS-R3S-2021-03-02-00"'
-reco_upc.args += ' --conditionsTag="CONDBR2-BLKPA-2023-05"'
+reco_upc.args += f' --conditionsTag="{defaultConditionsTags.RUN3_DATA23}"'
 reco_upc.args += ' --autoConfiguration="everything"'
 
 # The full test
diff --git a/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1PhysP1_DAODTLAFTAGPEB_grid.py b/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1PhysP1_DAODTLAFTAGPEB_grid.py
index b9d28d51e7d7c406483139cd27e71e5806552c2f..be34b10dd3825f4d98590cdeae3a2f517fbb1e64 100755
--- a/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1PhysP1_DAODTLAFTAGPEB_grid.py
+++ b/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1PhysP1_DAODTLAFTAGPEB_grid.py
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2025 CERN for the benefit of the ATLAS collaboration
 
 # art-description: Test of P1+Tier0 workflow, runs athenaHLT with PhysicsP1_pp_run3_v1 menu followed by offline reco and monitoring (incl. EDM)
 # art-type: grid
@@ -22,6 +22,7 @@
 from TrigValTools.TrigValSteering import Test, ExecStep, CheckSteps
 from TrigValTools.TrigValSteering.Common import find_file
 from TrigAnalysisTest.TrigAnalysisSteps import add_analysis_steps
+from AthenaConfiguration.TestDefaults import defaultConditionsTags
 
 # Specify trigger menu once here:
 triggermenu = 'Dev_pp_run3_v1_HLTReprocessing_prescale'
@@ -56,7 +57,7 @@ tlareco.input = ''
 tlareco.explicit_input = True
 tlareco.args = '--inputBSFile=' + find_file('*.physics_FTagPEBTLA*._athenaHLT*.data')  # output of the previous step
 tlareco.args += ' --outputDAOD_TLAFTAGPEBFile=DAOD_TLAFTAGPEB.pool.root'
-tlareco.args += ' --conditionsTag=\'CONDBR2-BLKPA-2024-03\' --geometryVersion=\'ATLAS-R3S-2021-03-02-00\''
+tlareco.args += f' --conditionsTag="{defaultConditionsTags.RUN3_DATA}" --geometryVersion=\'ATLAS-R3S-2021-03-02-00\''
 tlareco.args += ' --preExec="{:s}"'.format(tlarecoPreExec)
 
 # The full test
diff --git a/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1PhysP1_DAODTLA_grid.py b/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1PhysP1_DAODTLA_grid.py
index 5d7522c1f191aea5e9ae3d364d3947d05ede6f27..365a76bbb0f508952b26b8adf7a30a262c684918 100755
--- a/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1PhysP1_DAODTLA_grid.py
+++ b/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1PhysP1_DAODTLA_grid.py
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2025 CERN for the benefit of the ATLAS collaboration
 
 # art-description: Test of P1+Tier0 workflow, runs athenaHLT with PhysicsP1_pp_run3_v1 menu followed by offline reco and monitoring (incl. EDM)
 # art-type: grid
@@ -22,6 +22,7 @@
 from TrigValTools.TrigValSteering import Test, ExecStep, CheckSteps
 from TrigValTools.TrigValSteering.Common import find_file
 from TrigAnalysisTest.TrigAnalysisSteps import add_analysis_steps
+from AthenaConfiguration.TestDefaults import defaultConditionsTags
 
 # Specify trigger menu once here:
 triggermenu = 'PhysicsP1_pp_run3_v1_HLTReprocessing_prescale'
@@ -56,7 +57,7 @@ tlareco.input = ''
 tlareco.explicit_input = True
 tlareco.args = '--inputBSFile=' + find_file('*.physics_TLA*._athenaHLT*.data')  # output of the previous step
 tlareco.args += ' --outputDAOD_TLAFile=DAOD_TLA.pool.root'
-tlareco.args += ' --conditionsTag=\'CONDBR2-BLKPA-2024-03\' --geometryVersion=\'ATLAS-R3S-2021-03-02-00\''
+tlareco.args += f' --conditionsTag="{defaultConditionsTags.RUN3_DATA}" --geometryVersion=\'ATLAS-R3S-2021-03-02-00\''
 tlareco.args += ' --preExec="{:s}"'.format(tlarecoPreExec)
 
 # The full test
diff --git a/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1PhysP1_HI_T0Mon_build.py b/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1PhysP1_HI_T0Mon_build.py
index 63006fe7fedea46c64052ceea8da602b54131bd6..c0489364b324bc5ca816f9141d983458f626de79 100755
--- a/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1PhysP1_HI_T0Mon_build.py
+++ b/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1PhysP1_HI_T0Mon_build.py
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2025 CERN for the benefit of the ATLAS collaboration
 
 # art-description: Test of HI data 2023 workflow, runs athenaHLT with HI menu followed by filtering of HP stream, and offline reco with monitoring
 # art-type: build
@@ -8,7 +8,7 @@
 
 from TrigValTools.TrigValSteering import Test, ExecStep, CheckSteps
 from TrigValTools.TrigValSteering.Common import find_file
-
+from AthenaConfiguration.TestDefaults import defaultConditionsTags
 
 # Specify trigger menu once here:
 triggermenu = 'PhysicsP1_HI_run3_v1'
@@ -92,7 +92,7 @@ reco_hp.args += ' --outputAODFile=HP_AOD.pool.root'
 reco_hp.args += ' --outputHISTFile=hist.root'
 reco_hp.args += f' --preExec="all:{recoHPPreExec}; {monPreExec}"'
 reco_hp.args += ' --geometryVersion="ATLAS-R3S-2021-03-02-00"'
-reco_hp.args += ' --conditionsTag="CONDBR2-BLKPA-2023-05"'
+reco_hp.args += f' --conditionsTag="{defaultConditionsTags.RUN3_DATA23}"'
 reco_hp.args += ' --autoConfiguration="everything"'
 
 #====================================================================================================
@@ -115,7 +115,7 @@ reco_upc.args += ' --outputAODFile=AOD_UPC.pool.root'
 reco_upc.args += ' --outputHISTFile=hist_UPC.root'
 reco_upc.args += f' --preExec="all:{recoUPCPreExec}; {monPreExec}"'
 reco_upc.args += ' --geometryVersion="ATLAS-R3S-2021-03-02-00"'
-reco_upc.args += ' --conditionsTag="CONDBR2-BLKPA-2023-05"'
+reco_upc.args += f' --conditionsTag="{defaultConditionsTags.RUN3_DATA23}"'
 reco_upc.args += ' --autoConfiguration="everything"'
 
 # The full test
diff --git a/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1PhysP1_T0MonTrf_build.py b/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1PhysP1_T0MonTrf_build.py
index b019ab62fe93a55f73115269a4eff4b520dc3318..c50689e35958f776c63fa95a374a1f6ee183e410 100755
--- a/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1PhysP1_T0MonTrf_build.py
+++ b/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1PhysP1_T0MonTrf_build.py
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2025 CERN for the benefit of the ATLAS collaboration
 
 # art-description: transform test of BSRDOtoRAW + T0Reco + T0Mon, using v1PhysP1 menu
 # art-type: build
@@ -7,6 +7,7 @@
 # art-include: 24.0/Athena
 
 from TrigValTools.TrigValSteering import Test, ExecStep, CheckSteps
+from AthenaConfiguration.TestDefaults import defaultConditionsTags
 
 # Specify trigger menu once here:
 triggermenu = 'PhysicsP1_pp_run3_v1_HLTReprocessing_prescale'
@@ -62,7 +63,7 @@ tzreco.args = '--inputBSFile=RAW.pool.root'  # output of the previous step
 tzreco.args += ' --outputAODFile=AOD.pool.root'
 tzreco.args += ' --outputNTUP_TRIGRATEFile=rate.ntup.root'
 tzreco.args += ' --outputHISTFile=ExampleMonitorOutput.root'
-tzreco.args += ' --conditionsTag=\'CONDBR2-BLKPA-2024-03\' --geometryVersion=\'ATLAS-R3S-2021-03-02-00\''
+tzreco.args += f' --conditionsTag="{defaultConditionsTags.RUN3_DATA}" --geometryVersion=\'ATLAS-R3S-2021-03-02-00\''
 tzreco.args += ' --preExec="{:s}"'.format(tzrecoPreExec)
 tzreco.args += ' --CA'
 
diff --git a/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1PhysP1_T0Mon_build.py b/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1PhysP1_T0Mon_build.py
index 457546f250542396f178c215f769760908709da8..c95af6f9d6d2746677000d7150f58e9fe66f2888 100755
--- a/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1PhysP1_T0Mon_build.py
+++ b/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1PhysP1_T0Mon_build.py
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2025 CERN for the benefit of the ATLAS collaboration
 
 # art-description: Test of P1+Tier0 workflow, runs athenaHLT with PhysicsP1_pp_run3_v1 menu followed by offline reco and monitoring (incl. EDM)
 # art-type: build
@@ -9,6 +9,7 @@
 from TrigValTools.TrigValSteering import Test, ExecStep, CheckSteps
 from TrigValTools.TrigValSteering.Common import find_file
 from TrigAnalysisTest.TrigAnalysisSteps import add_analysis_steps
+from AthenaConfiguration.TestDefaults import defaultConditionsTags
 
 # Specify trigger menu once here:
 triggermenu = 'PhysicsP1_pp_run3_v1_HLTReprocessing_prescale'
@@ -67,7 +68,7 @@ tzreco.max_events = 50
 tzreco.args = '--inputBSFile=' + find_file('*.physics_Main*._athenaHLT*.data')  # output of the previous step
 tzreco.args += ' --outputAODFile=AOD.pool.root'
 tzreco.args += ' --outputHISTFile=ExampleMonitorOutput.root'
-tzreco.args += ' --conditionsTag=\'CONDBR2-BLKPA-2024-03\' --geometryVersion=\'ATLAS-R3S-2021-03-02-00\''
+tzreco.args += f' --conditionsTag="{defaultConditionsTags.RUN3_DATA}" --geometryVersion=\'ATLAS-R3S-2021-03-02-00\''
 tzreco.args += ' --preExec="{:s}"'.format(tzrecoPreExec)
 
 # The full test
diff --git a/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1PhysP1_T0Mon_grid.py b/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1PhysP1_T0Mon_grid.py
index d31f94409dda1c234b69177a7d48cb083c2e355d..d6c3c9adec2496820ff580e606b06a5a22e00647 100755
--- a/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1PhysP1_T0Mon_grid.py
+++ b/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1PhysP1_T0Mon_grid.py
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2025 CERN for the benefit of the ATLAS collaboration
 
 # art-description: Test of P1+Tier0 workflow, runs athenaHLT with PhysicsP1_pp_run3_v1 menu followed by offline reco, DAOD production, monitoring and analysis step for EDM monitoring
 # art-type: grid
@@ -20,6 +20,7 @@
 from TrigValTools.TrigValSteering import Test, ExecStep, CheckSteps
 from TrigValTools.TrigValSteering.Common import find_file
 from TrigAnalysisTest.TrigAnalysisSteps import add_analysis_steps
+from AthenaConfiguration.TestDefaults import defaultConditionsTags
 
 # Specify trigger menu once here:
 triggermenu = 'PhysicsP1_pp_run3_v1_HLTReprocessing_prescale'
@@ -77,7 +78,7 @@ tzreco.explicit_input = True
 tzreco.args = '--inputBSFile=' + find_file('*.physics_Main*._athenaHLT*.data')  # output of the previous step
 tzreco.args += ' --outputAODFile=AOD.pool.root'
 tzreco.args += ' --outputHISTFile=ExampleMonitorOutput.root'
-tzreco.args += ' --conditionsTag=\'CONDBR2-BLKPA-2024-03\' --geometryVersion=\'ATLAS-R3S-2021-03-02-00\''
+tzreco.args += f' --conditionsTag="{defaultConditionsTags.RUN3_DATA}" --geometryVersion=\'ATLAS-R3S-2021-03-02-00\''
 tzreco.args += ' --preExec="{:s}"'.format(tzrecoPreExec)
 
 aod2daod = ExecStep.ExecStep('AODtoDAOD')
diff --git a/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1PhysP1_lowMu_T0Mon_build.py b/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1PhysP1_lowMu_T0Mon_build.py
index 32917fef70360017cdcd615f2768a188f2c6cda6..7fea603f7e39e48ab0e728e206e215586870a4e0 100755
--- a/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1PhysP1_lowMu_T0Mon_build.py
+++ b/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1PhysP1_lowMu_T0Mon_build.py
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2025 CERN for the benefit of the ATLAS collaboration
 
 # art-description: Test of P1+Tier0 workflow, runs athenaHLT with PhysicsP1_pp_lowMu_run3_v1 menu followed by offline reco and monitoring
 # art-type: build
@@ -9,6 +9,7 @@
 from TrigValTools.TrigValSteering import Test, ExecStep, CheckSteps
 from TrigValTools.TrigValSteering.Common import find_file
 from TrigAnalysisTest.TrigAnalysisSteps import add_analysis_steps
+from AthenaConfiguration.TestDefaults import defaultConditionsTags
 
 # Specify trigger menu once here:
 triggermenu = 'PhysicsP1_pp_lowMu_run3_v1'
@@ -66,7 +67,7 @@ tzreco.max_events = 50
 tzreco.args = '--inputBSFile=' + find_file('*.physics_Main*._athenaHLT*.data')  # output of the previous step
 tzreco.args += ' --outputAODFile=AOD.pool.root'
 tzreco.args += ' --outputHISTFile=ExampleMonitorOutput.root'
-tzreco.args += ' --conditionsTag=\'CONDBR2-BLKPA-2024-03\' --geometryVersion=\'ATLAS-R3S-2021-03-02-00\''
+tzreco.args += f' --conditionsTag="{defaultConditionsTags.RUN3_DATA}" --geometryVersion=\'ATLAS-R3S-2021-03-02-00\''
 tzreco.args += ' --preExec="{:s}"'.format(tzrecoPreExec)
 
 # The full test
diff --git a/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1PhysP1_noL1Sim_DB_UpDownRun_build.py b/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1PhysP1_noL1Sim_DB_UpDownRun_build.py
index 6732d91a8109ed321f725fcb34f1a5d254e4a5f3..621fb4fc1d1f229c14048d45e408bf7a69751182 100755
--- a/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1PhysP1_noL1Sim_DB_UpDownRun_build.py
+++ b/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1PhysP1_noL1Sim_DB_UpDownRun_build.py
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Copyright (C) 2002-2023 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2025 CERN for the benefit of the ATLAS collaboration
 
 # art-description: Trigger athenaHLT test of DB upload (inlcuding duplicate), download and running.
 # art-type: build
@@ -14,7 +14,7 @@ genJSON = ExecStep.ExecStep("GenJSON")
 genJSON.type = 'athenaHLT'
 genJSON.job_options = 'TriggerJobOpts.runHLT'
 genJSON.input = 'data'
-genJSON.flags = ['Trigger.triggerMenuSetup="PhysicsP1_pp_run3_v1_HLTReprocessing_prescale"','Trigger.L1.errorOnMissingTOB=False','Trigger.Offline.SA.Muon.runCommissioningChain=True']
+genJSON.flags = ['Trigger.triggerMenuSetup="PhysicsP1_pp_run3_v1_HLTReprocessing_prescale"','Trigger.L1.errorOnMissingTOB=False']
 genJSON.args = ' -M --dump-config-exit'
 genJSON.perfmon = False
 genJSON.fpe_auditor = False
diff --git a/Trigger/TrigValidation/TriggerTest/share/ref_mc_v1DevHI_build.ref b/Trigger/TrigValidation/TriggerTest/share/ref_mc_v1DevHI_build.ref
index d9f7d9baec80e124672c968028d4e43cf5a1ff12..60cd04dcdff88090fdb7cf3e69b1d3c3d65c6ef6 100644
--- a/Trigger/TrigValidation/TriggerTest/share/ref_mc_v1DevHI_build.ref
+++ b/Trigger/TrigValidation/TriggerTest/share/ref_mc_v1DevHI_build.ref
@@ -16,13 +16,13 @@ HLT_2e20_loose_nogsf_ion_L12eEM18:
 HLT_2g15_loose_L12eEM12:
   eventCount: 0
   stepCounts:
-    0: 11
-    1: 1
+    0: 16
+    1: 3
     2: 1
   stepFeatures:
-    0: 33
-    1: 8
-    2: 2
+    0: 48
+    1: 15
+    2: 4
     3: 1
 HLT_2g15_loose_ion_L12eEM12:
   eventCount: 1
@@ -289,15 +289,15 @@ HLT_e50_etcut_ion_L1eEM26:
 HLT_g10_loose_L1eEM9_VjTE200:
   eventCount: 0
   stepCounts:
-    0: 1
-  stepFeatures:
     0: 2
+  stepFeatures:
+    0: 4
 HLT_g10_medium_L1eEM9_VjTE200:
   eventCount: 0
   stepCounts:
-    0: 1
-  stepFeatures:
     0: 2
+  stepFeatures:
+    0: 4
 HLT_g13_etcut_ion_L1eEM12:
   eventCount: 17
   stepCounts:
@@ -390,7 +390,7 @@ HLT_g20_loose_L1eEM15:
     2: 10
     3: 6
   stepFeatures:
-    0: 32
+    0: 36
     1: 13
     2: 12
     3: 6
@@ -993,11 +993,11 @@ HLT_j75_ion_L1jJ50:
   stepFeatures:
     0: 29
 HLT_j75_ion_L1jJ60:
-  eventCount: 14
+  eventCount: 15
   stepCounts:
-    0: 14
+    0: 15
   stepFeatures:
-    0: 28
+    0: 29
 HLT_j80f_ion_L1jJ60p30ETA49:
   eventCount: 0
 HLT_j85_ion_L1jJ50:
@@ -2380,9 +2380,9 @@ HLT_noalg_L1gXEJWOJ100:
 HLT_noalg_L1jJ40:
   eventCount: 20
 HLT_noalg_L1jJ50:
-  eventCount: 19
+  eventCount: 20
 HLT_noalg_L1jJ60:
-  eventCount: 16
+  eventCount: 17
 HLT_noalg_L1jTAU1:
   eventCount: 20
 HLT_noalg_L1jTE10:
diff --git a/Trigger/TriggerCommon/TrigEDMConfig/python/TriggerEDMRun3.py b/Trigger/TriggerCommon/TrigEDMConfig/python/TriggerEDMRun3.py
index ecb92f4ddc696958df6eb6d328fbef05b2a9b902..9e64d0f6fada67bb21254ea93e674ab103d13a56 100644
--- a/Trigger/TriggerCommon/TrigEDMConfig/python/TriggerEDMRun3.py
+++ b/Trigger/TriggerCommon/TrigEDMConfig/python/TriggerEDMRun3.py
@@ -247,7 +247,7 @@ varToRemoveFromAODSLIM = [
     ]
 # Detailed NNJvt input variables
 for var in ['RPtTrkPt500', 'DTrackWidthPt1000', 'DNumTrkPt1000', 'DRPtTrkPt500', 'SumPtTrkOrderedTrackWidthPt1000', 'SumPtTrkOrderedNumTrkPt1000']:
-    varToRemoveFromAODSLIM.append((var, 'HLT_AntiKt4EMPFlowJets_subresgscIS_ftfAux', ''))
+    varToRemoveFromAODSLIM.append((var, 'HLT_AntiKt4EMPFlowJets_subresjesgscIS_ftfAux', 'HLT_AntiKt4EMTopoJets_subresjesgscIS_ftfAux'))
 
 
 
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Egamma/TrigEgammaConfigFlags.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Egamma/TrigEgammaConfigFlags.py
index c8f329a311d6ad1041fa1cdff4c7d78dfc7ba594..b01ab17d0079bc832f52640e7bb18183003a62d7 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Egamma/TrigEgammaConfigFlags.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Egamma/TrigEgammaConfigFlags.py
@@ -12,9 +12,9 @@ def createTrigEgammaConfigFlags():
     flags.addFlag('Trigger.egamma.electronNoGSFNoPixPidVersion', 'ElectronPhotonSelectorTools/trigger/rel21_20232105/')
     flags.addFlag('Trigger.egamma.electronHIPidVersion'        , 'ElectronPhotonSelectorTools/trigger/rel22_20210611/')
     flags.addFlag('Trigger.egamma.photonPidVersion'            , 'ElectronPhotonSelectorTools/trigger/rel22_20210611/')
-    flags.addFlag('Trigger.egamma.dnnVersion'                  , 'ElectronPhotonSelectorTools/trigger/rel22_20230405_LHinput/')
+    flags.addFlag('Trigger.egamma.dnnVersion'                  , 'ElectronPhotonSelectorTools/trigger/R22_20241216_OfflineTargets/')
     flags.addFlag('Trigger.egamma.ringerVersion'               , 'RingerSelectorTools/trigger/Run3_20230316_v1')
-    flags.addFlag('Trigger.egamma.photonRingerVersion'         , 'ElectronPhotonSelectorTools/trigger/rel23_20241210')
+    flags.addFlag('Trigger.egamma.photonRingerVersion'         , 'ElectronPhotonSelectorTools/trigger/rel23_20250321')
     flags.addFlag('Trigger.egamma.electronRingerFastElectronVersion'         , 'ElectronPhotonSelectorTools/trigger/rel24_20250205')
 
 
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Menu/Dev_pp_run3_v1.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Menu/Dev_pp_run3_v1.py
index 6b43999419bcd00ed8b69e6bfda0a36a81d994a9..5b64d74f92e2939c7c07e3142863a5633b2a273a 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Menu/Dev_pp_run3_v1.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Menu/Dev_pp_run3_v1.py
@@ -21,7 +21,6 @@ from .Physics_pp_run3_v1 import (PhysicsStream,
                                  MultiBjetGroup,
                                  SingleTauGroup,
                                  MultiTauGroup,
-                                 SinglePhotonGroup,
                                  MultiPhotonGroup,
                                  TauPhotonGroup,
                                  TauJetGroup,
@@ -171,8 +170,6 @@ def getDevSignatures():
         ChainProp(name='HLT_g50_medium_g20_medium_L12eEM18M', l1SeedThresholds=['eEM18M','eEM18M'], groups=SupportPhIGroup+MultiPhotonGroup),
         ChainProp(name='HLT_g50_medium_g20_medium_L12eEM18L', l1SeedThresholds=['eEM18L','eEM18L'], groups=SupportPhIGroup+MultiPhotonGroup),
 
-        # ATR-29062      
-        ChainProp(name='HLT_g15_tight_ringer_L1eEM12L', groups=SinglePhotonGroup+DevGroup, monGroups=['egammaMon:shifter']),
 
     ]
 
@@ -247,13 +244,10 @@ def getDevSignatures():
         ChainProp(name='HLT_6j20c_020jvt_pf_ftf_preselZ219XX6c20_PhysicsTLA_L14jJ40', l1SeedThresholds=['FSNOSEED'], stream=['TLA'], groups=PrimaryPhIGroup+MultiJetGroup, monGroups=['tlaMon:shifter']),
         ChainProp(name='HLT_6j20_pf_ftf_preselZ219XX6c20_PhysicsTLA_L14jJ40', l1SeedThresholds=['FSNOSEED'], stream=['TLA'], groups=PrimaryPhIGroup+MultiJetGroup, monGroups=['tlaMon:shifter']), 
         ChainProp(name='HLT_j0_pf_ftf_preselZ219XX6c20_PhysicsTLA_L14jJ40', l1SeedThresholds=['FSNOSEED'], stream=['TLA'], groups=PrimaryPhIGroup+MultiJetGroup, monGroups=['tlaMon:shifter']),
-        ChainProp(name='HLT_6j20c_020jvt_pf_ftf_preselZ197XX6c20_PhysicsTLA_L14jJ40', l1SeedThresholds=['FSNOSEED'], stream=['TLA'], groups=PrimaryPhIGroup+MultiJetGroup, monGroups=['tlaMon:shifter']),        
         ChainProp(name='HLT_6j20_pf_ftf_preselZ197XX6c20_PhysicsTLA_L14jJ40', l1SeedThresholds=['FSNOSEED'], stream=['TLA'], groups=PrimaryPhIGroup+MultiJetGroup, monGroups=['tlaMon:shifter']),
         ChainProp(name='HLT_j0_pf_ftf_preselZ197XX6c20_PhysicsTLA_L14jJ40', l1SeedThresholds=['FSNOSEED'], stream=['TLA'], groups=PrimaryPhIGroup+MultiJetGroup, monGroups=['tlaMon:shifter']),
-        ChainProp(name='HLT_6j20c_020jvt_pf_ftf_preselZ182XX6c20_PhysicsTLA_L14jJ40', l1SeedThresholds=['FSNOSEED'], stream=['TLA'], groups=PrimaryPhIGroup+MultiJetGroup, monGroups=['tlaMon:shifter']),    
         ChainProp(name='HLT_6j20_pf_ftf_preselZ182XX6c20_PhysicsTLA_L14jJ40', l1SeedThresholds=['FSNOSEED'], stream=['TLA'], groups=PrimaryPhIGroup+MultiJetGroup, monGroups=['tlaMon:shifter']),
         ChainProp(name='HLT_j0_pf_ftf_preselZ182XX6c20_PhysicsTLA_L14jJ40', l1SeedThresholds=['FSNOSEED'], stream=['TLA'], groups=PrimaryPhIGroup+MultiJetGroup, monGroups=['tlaMon:shifter']),
-        ChainProp(name='HLT_6j20c_020jvt_pf_ftf_preselZ142XX5c20_PhysicsTLA_L14jJ40', l1SeedThresholds=['FSNOSEED'], stream=['TLA'], groups=PrimaryPhIGroup+MultiJetGroup, monGroups=['tlaMon:shifter']), 
         ChainProp(name='HLT_6j20_pf_ftf_preselZ142XX5c20_PhysicsTLA_L14jJ40', l1SeedThresholds=['FSNOSEED'], stream=['TLA'], groups=PrimaryPhIGroup+MultiJetGroup, monGroups=['tlaMon:shifter']), 
         ChainProp(name='HLT_j0_pf_ftf_preselZ142XX5c20_PhysicsTLA_L14jJ40', l1SeedThresholds=['FSNOSEED'], stream=['TLA'], groups=PrimaryPhIGroup+MultiJetGroup, monGroups=['tlaMon:shifter']),
         ChainProp(name='HLT_6j20c_020jvt_pf_ftf_preselZ134XX5c20_PhysicsTLA_L14jJ40', l1SeedThresholds=['FSNOSEED'], stream=['TLA'], groups=PrimaryPhIGroup+MultiJetGroup, monGroups=['tlaMon:shifter']), 
@@ -404,99 +398,99 @@ def getDevSignatures():
     chains['Bjet'] = [
         
         # Test chain for X to bb tagging
-        ChainProp(name='HLT_j110_a10sd_cssk_60bgntwox_pf_jes_ftf_preselj80_L1jJ60', groups=DevGroup+SingleBjetGroup, l1SeedThresholds=['FSNOSEED']),
-        ChainProp(name='HLT_j175_a10sd_cssk_60bgntwox_pf_jes_ftf_preselj140_L1jJ90', groups=DevGroup+SingleBjetGroup, l1SeedThresholds=['FSNOSEED']),
-        ChainProp(name='HLT_j175_a10sd_cssk_60bgntwox_pf_jes_ftf_preselj140_L1jJ160', groups=DevGroup+SingleBjetGroup, l1SeedThresholds=['FSNOSEED']),
-        ChainProp(name='HLT_j175_a10sd_cssk_60bgntwox_pf_jes_ftf_preselj140_L1gLJ140p0ETA25', groups=DevGroup+SingleBjetGroup, l1SeedThresholds=['FSNOSEED']),
-        ChainProp(name='HLT_j175_a10sd_cssk_60bgntwox_pf_jes_ftf_preselj140_L1SC111-CjJ40', groups=DevGroup+SingleBjetGroup, l1SeedThresholds=['FSNOSEED']),
-        ChainProp(name='HLT_j175_35smcINF_60bgntwox_j175_35smcINF_a10sd_cssk_pf_jes_ftf_preselj140_L1jJ160', groups=DevGroup+MultiBjetGroup, l1SeedThresholds=2*['FSNOSEED']),
-        ChainProp(name='HLT_j175_35smcINF_60bgntwox_j175_35smcINF_a10sd_cssk_pf_jes_ftf_preselj140_L1gLJ140p0ETA25', groups=DevGroup+MultiBjetGroup, l1SeedThresholds=2*['FSNOSEED']),
-        ChainProp(name='HLT_j175_35smcINF_60bgntwox_j175_35smcINF_a10sd_cssk_pf_jes_ftf_preselj140_L1SC111-CjJ40', groups=DevGroup+MultiBjetGroup, l1SeedThresholds=2*['FSNOSEED']),
-        ChainProp(name='HLT_j260_a10sd_cssk_60bgntwox_pf_jes_ftf_preselj200_L1jJ125', groups=DevGroup+SingleBjetGroup, l1SeedThresholds=['FSNOSEED']),
-        ChainProp(name='HLT_j260_a10sd_cssk_60bgntwox_pf_jes_ftf_preselj200_L1jJ160', groups=DevGroup+SingleBjetGroup, l1SeedThresholds=['FSNOSEED']),
-        ChainProp(name='HLT_j260_a10sd_cssk_60bgntwox_pf_jes_ftf_preselj200_L1gLJ140p0ETA25', groups=DevGroup+SingleBjetGroup, l1SeedThresholds=['FSNOSEED']),
-        ChainProp(name='HLT_j260_a10sd_cssk_60bgntwox_pf_jes_ftf_preselj200_L1SC111-CjJ40', groups=DevGroup+SingleBjetGroup, l1SeedThresholds=['FSNOSEED']),
-        ChainProp(name='HLT_j260_35smcINF_60bgntwox_j260_35smcINF_a10sd_cssk_pf_jes_ftf_presel2j225_L1jJ160', groups=DevGroup+MultiBjetGroup, l1SeedThresholds=2*['FSNOSEED']),
-        ChainProp(name='HLT_j260_35smcINF_60bgntwox_j260_35smcINF_a10sd_cssk_pf_jes_ftf_presel2j225_L1gLJ140p0ETA25', groups=DevGroup+MultiBjetGroup, l1SeedThresholds=2*['FSNOSEED']),
-        ChainProp(name='HLT_j260_35smcINF_60bgntwox_j260_35smcINF_a10sd_cssk_pf_jes_ftf_presel2j225_L1SC111-CjJ40', groups=DevGroup+MultiBjetGroup, l1SeedThresholds=2*['FSNOSEED']),
-        ChainProp(name='HLT_j360_a10sd_cssk_60bgntwox_pf_jes_ftf_preselj225_L1jJ160', groups=DevGroup+SingleBjetGroup, l1SeedThresholds=['FSNOSEED']),
-        ChainProp(name='HLT_j420_a10sd_cssk_60bgntwox_pf_jes_ftf_preselj225_L1jJ160', groups=DevGroup+SingleBjetGroup, l1SeedThresholds=['FSNOSEED']),
-        ChainProp(name='HLT_j460_a10sd_cssk_60bgntwox_pf_jes_ftf_preselj225_L1jJ160', groups=DevGroup+SingleBjetGroup, l1SeedThresholds=['FSNOSEED']),
-
-        ChainProp(name='HLT_j110_a10sd_cssk_70bgntwox_pf_jes_ftf_preselj80_L1jJ60', groups=DevGroup+SingleBjetGroup, l1SeedThresholds=['FSNOSEED']),
-        ChainProp(name='HLT_j175_a10sd_cssk_70bgntwox_pf_jes_ftf_preselj140_L1jJ90', groups=DevGroup+SingleBjetGroup, l1SeedThresholds=['FSNOSEED']),
-        ChainProp(name='HLT_j175_a10sd_cssk_70bgntwox_pf_jes_ftf_preselj140_L1jJ160', groups=DevGroup+SingleBjetGroup, l1SeedThresholds=['FSNOSEED']),
-        ChainProp(name='HLT_j175_35smcINF_a10sd_cssk_70bgntwox_pf_jes_ftf_preselj140_L1jJ160', groups=DevGroup+SingleBjetGroup, l1SeedThresholds=['FSNOSEED']),
-        ChainProp(name='HLT_j175_a10sd_cssk_70bgntwox_pf_jes_ftf_preselj140_L1gLJ140p0ETA25', groups=DevGroup+SingleBjetGroup, l1SeedThresholds=['FSNOSEED']),
-        ChainProp(name='HLT_j175_35smcINF_a10sd_cssk_70bgntwox_pf_jes_ftf_preselj140_L1gLJ140p0ETA25', groups=DevGroup+SingleBjetGroup, l1SeedThresholds=['FSNOSEED']),
-        ChainProp(name='HLT_j175_a10sd_cssk_70bgntwox_pf_jes_ftf_preselj140_L1SC111-CjJ40', groups=DevGroup+SingleBjetGroup, l1SeedThresholds=['FSNOSEED']),
-        ChainProp(name='HLT_j175_35smcINF_a10sd_cssk_70bgntwox_pf_jes_ftf_preselj140_L1SC111-CjJ40', groups=DevGroup+SingleBjetGroup, l1SeedThresholds=['FSNOSEED']),
-        ChainProp(name='HLT_j175_35smcINF_70bgntwox_j175_35smcINF_a10sd_cssk_pf_jes_ftf_preselj140_L1jJ160', groups=DevGroup+MultiBjetGroup, l1SeedThresholds=2*['FSNOSEED']),
-        ChainProp(name='HLT_j175_35smcINF_70bgntwox_j175_35smcINF_a10sd_cssk_pf_jes_ftf_preselj140_L1gLJ140p0ETA25', groups=DevGroup+MultiBjetGroup, l1SeedThresholds=2*['FSNOSEED']),
-        ChainProp(name='HLT_j175_35smcINF_70bgntwox_j175_35smcINF_a10sd_cssk_pf_jes_ftf_preselj140_L1SC111-CjJ40', groups=DevGroup+MultiBjetGroup, l1SeedThresholds=2*['FSNOSEED']),
-        ChainProp(name='HLT_j260_35smcINF_70bgntwox_j260_35smcINF_a10sd_cssk_pf_jes_ftf_preselj140_L1gLJ140p0ETA25', groups=DevGroup+MultiBjetGroup, l1SeedThresholds=2*['FSNOSEED']),
-        ChainProp(name='HLT_j260_35smcINF_70bgntwox_j175_35smcINF_a10sd_cssk_pf_jes_ftf_preselj140_L1gLJ140p0ETA25', groups=DevGroup+MultiBjetGroup, l1SeedThresholds=2*['FSNOSEED']),
-        ChainProp(name='HLT_j175_35smcINF_70bgntwox_j260_35smcINF_a10sd_cssk_pf_jes_ftf_preselj140_L1gLJ140p0ETA25', groups=DevGroup+MultiBjetGroup, l1SeedThresholds=2*['FSNOSEED']),
-        ChainProp(name='HLT_j175_35smcINF_70bgntwox_j175_35smcINF_a10sd_cssk_pf_jes_ftf_preselj160_L1gLJ140p0ETA25', groups=DevGroup+MultiBjetGroup, l1SeedThresholds=2*['FSNOSEED']),
-        ChainProp(name='HLT_j260_35smcINF_70bgntwox_j260_35smcINF_a10sd_cssk_pf_jes_ftf_preselj160_L1gLJ140p0ETA25', groups=DevGroup+MultiBjetGroup, l1SeedThresholds=2*['FSNOSEED']),
-        ChainProp(name='HLT_j260_35smcINF_70bgntwox_j175_35smcINF_a10sd_cssk_pf_jes_ftf_preselj160_L1gLJ140p0ETA25', groups=DevGroup+MultiBjetGroup, l1SeedThresholds=2*['FSNOSEED']),
-        ChainProp(name='HLT_j175_35smcINF_70bgntwox_j260_35smcINF_a10sd_cssk_pf_jes_ftf_preselj160_L1gLJ140p0ETA25', groups=DevGroup+MultiBjetGroup, l1SeedThresholds=2*['FSNOSEED']),
-        ChainProp(name='HLT_j175_35smcINF_70bgntwox_j175_35smcINF_a10sd_cssk_pf_jes_ftf_preselj180_L1gLJ140p0ETA25', groups=DevGroup+MultiBjetGroup, l1SeedThresholds=2*['FSNOSEED']),
-        ChainProp(name='HLT_j260_35smcINF_70bgntwox_j260_35smcINF_a10sd_cssk_pf_jes_ftf_preselj180_L1gLJ140p0ETA25', groups=DevGroup+MultiBjetGroup, l1SeedThresholds=2*['FSNOSEED']),
-        ChainProp(name='HLT_j260_35smcINF_70bgntwox_j175_35smcINF_a10sd_cssk_pf_jes_ftf_preselj180_L1gLJ140p0ETA25', groups=DevGroup+MultiBjetGroup, l1SeedThresholds=2*['FSNOSEED']),
-        ChainProp(name='HLT_j175_35smcINF_70bgntwox_j260_35smcINF_a10sd_cssk_pf_jes_ftf_preselj180_L1gLJ140p0ETA25', groups=DevGroup+MultiBjetGroup, l1SeedThresholds=2*['FSNOSEED']),
-        ChainProp(name='HLT_j175_35smcINF_70bgntwox_j175_35smcINF_a10sd_cssk_pf_jes_ftf_preselj200_L1gLJ140p0ETA25', groups=DevGroup+MultiBjetGroup, l1SeedThresholds=2*['FSNOSEED']),
-        ChainProp(name='HLT_j260_35smcINF_70bgntwox_j260_35smcINF_a10sd_cssk_pf_jes_ftf_preselj200_L1gLJ140p0ETA25', groups=DevGroup+MultiBjetGroup, l1SeedThresholds=2*['FSNOSEED']),
-        ChainProp(name='HLT_j260_35smcINF_70bgntwox_j175_35smcINF_a10sd_cssk_pf_jes_ftf_preselj200_L1gLJ140p0ETA25', groups=DevGroup+MultiBjetGroup, l1SeedThresholds=2*['FSNOSEED'], monGroups=['bJetMon:t0']),
-        ChainProp(name='HLT_j175_35smcINF_70bgntwox_j260_35smcINF_a10sd_cssk_pf_jes_ftf_preselj200_L1gLJ140p0ETA25', groups=DevGroup+MultiBjetGroup, l1SeedThresholds=2*['FSNOSEED'], monGroups=['bJetMon:t0']),
-        ChainProp(name='HLT_j260_a10sd_cssk_70bgntwox_pf_jes_ftf_preselj200_L1jJ125', groups=DevGroup+SingleBjetGroup, l1SeedThresholds=['FSNOSEED']),
-        ChainProp(name='HLT_j260_a10sd_cssk_70bgntwox_pf_jes_ftf_preselj200_L1jJ160', groups=DevGroup+SingleBjetGroup, l1SeedThresholds=['FSNOSEED']),
-        ChainProp(name='HLT_2j260_a10sd_cssk_70bgntwox_pf_jes_ftf_presel2j225_L1jJ160', groups=DevGroup+MultiBjetGroup, l1SeedThresholds=['FSNOSEED']),
-        ChainProp(name='HLT_j260_70bgntwox_j260_a10sd_cssk_pf_jes_ftf_presel2j225_L1jJ160', groups=DevGroup+MultiBjetGroup, l1SeedThresholds=2*['FSNOSEED']),
-        ChainProp(name='HLT_j260_a10sd_cssk_70bgntwox_pf_jes_ftf_preselj200_L1gLJ140p0ETA25', groups=DevGroup+SingleBjetGroup, l1SeedThresholds=['FSNOSEED']),
-        ChainProp(name='HLT_2j260_a10sd_cssk_70bgntwox_pf_jes_ftf_presel2j225_L1gLJ140p0ETA25', groups=DevGroup+MultiBjetGroup, l1SeedThresholds=['FSNOSEED']),
-        ChainProp(name='HLT_j260_70bgntwox_j260_a10sd_cssk_pf_jes_ftf_presel2j225_L1gLJ140p0ETA25', groups=DevGroup+MultiBjetGroup, l1SeedThresholds=['FSNOSEED', 'FSNOSEED']),
-        ChainProp(name='HLT_j260_a10sd_cssk_70bgntwox_pf_jes_ftf_preselj200_L1SC111-CjJ40', groups=DevGroup+SingleBjetGroup, l1SeedThresholds=['FSNOSEED']),
-        ChainProp(name='HLT_2j260_a10sd_cssk_70bgntwox_pf_jes_ftf_presel2j225_L1SC111-CjJ40', groups=DevGroup+MultiBjetGroup, l1SeedThresholds=['FSNOSEED']),
-        ChainProp(name='HLT_j260_70bgntwox_j260_a10sd_cssk_pf_jes_ftf_presel2j225_L1SC111-CjJ40', groups=DevGroup+MultiBjetGroup, l1SeedThresholds=2*['FSNOSEED']),
-        ChainProp(name='HLT_j260_35smcINF_70bgntwox_j260_35smcINF_a10sd_cssk_pf_jes_ftf_presel2j225_L1jJ160', groups=DevGroup+MultiBjetGroup, l1SeedThresholds=2*['FSNOSEED']),
-        ChainProp(name='HLT_j260_35smcINF_70bgntwox_j260_35smcINF_a10sd_cssk_pf_jes_ftf_presel2j225_L1gLJ140p0ETA25', groups=DevGroup+MultiBjetGroup, l1SeedThresholds=2*['FSNOSEED']),
-        ChainProp(name='HLT_j260_35smcINF_70bgntwox_j260_35smcINF_a10sd_cssk_pf_jes_ftf_presel2j225_L1SC111-CjJ40', groups=DevGroup+MultiBjetGroup, l1SeedThresholds=2*['FSNOSEED']),
-        ChainProp(name='HLT_j360_a10sd_cssk_70bgntwox_pf_jes_ftf_preselj225_L1jJ160', groups=DevGroup+SingleBjetGroup, l1SeedThresholds=['FSNOSEED']),
-        ChainProp(name='HLT_j420_a10sd_cssk_70bgntwox_pf_jes_ftf_preselj225_L1jJ160', groups=DevGroup+SingleBjetGroup, l1SeedThresholds=['FSNOSEED']),
-        ChainProp(name='HLT_j460_a10sd_cssk_70bgntwox_pf_jes_ftf_preselj225_L1jJ160', groups=DevGroup+SingleBjetGroup, l1SeedThresholds=['FSNOSEED']),
-
-        ChainProp(name='HLT_j110_a10sd_cssk_80bgntwox_pf_jes_ftf_preselj80_L1jJ60', groups=DevGroup+SingleBjetGroup, l1SeedThresholds=['FSNOSEED']),
-        ChainProp(name='HLT_j175_a10sd_cssk_80bgntwox_pf_jes_ftf_preselj140_L1jJ90', groups=DevGroup+SingleBjetGroup, l1SeedThresholds=['FSNOSEED']),
-        ChainProp(name='HLT_j175_a10sd_cssk_80bgntwox_pf_jes_ftf_preselj140_L1jJ160', groups=DevGroup+SingleBjetGroup, l1SeedThresholds=['FSNOSEED']),
-        ChainProp(name='HLT_j175_a10sd_cssk_80bgntwox_pf_jes_ftf_preselj140_L1gLJ140p0ETA25', groups=DevGroup+SingleBjetGroup, l1SeedThresholds=['FSNOSEED']),
-        ChainProp(name='HLT_j175_a10sd_cssk_80bgntwox_pf_jes_ftf_preselj140_L1SC111-CjJ40', groups=DevGroup+SingleBjetGroup, l1SeedThresholds=['FSNOSEED']),
-        ChainProp(name='HLT_j175_35smcINF_80bgntwox_j175_35smcINF_a10sd_cssk_pf_jes_ftf_preselj140_L1jJ160', groups=DevGroup+MultiBjetGroup, l1SeedThresholds=2*['FSNOSEED']),
-        ChainProp(name='HLT_j175_35smcINF_80bgntwox_j175_35smcINF_a10sd_cssk_pf_jes_ftf_preselj140_L1gLJ140p0ETA25', groups=DevGroup+MultiBjetGroup, l1SeedThresholds=2*['FSNOSEED']),
-        ChainProp(name='HLT_j175_35smcINF_80bgntwox_j175_35smcINF_a10sd_cssk_pf_jes_ftf_preselj140_L1SC111-CjJ40', groups=DevGroup+MultiBjetGroup, l1SeedThresholds=2*['FSNOSEED']),
-        ChainProp(name='HLT_j260_a10sd_cssk_80bgntwox_pf_jes_ftf_preselj200_L1jJ125', groups=DevGroup+SingleBjetGroup, l1SeedThresholds=['FSNOSEED']),
-        ChainProp(name='HLT_j260_a10sd_cssk_80bgntwox_pf_jes_ftf_preselj200_L1jJ160', groups=DevGroup+SingleBjetGroup, l1SeedThresholds=['FSNOSEED']),
-        ChainProp(name='HLT_j260_a10sd_cssk_80bgntwox_pf_jes_ftf_preselj200_L1gLJ140p0ETA25', groups=DevGroup+SingleBjetGroup, l1SeedThresholds=['FSNOSEED']),
-        ChainProp(name='HLT_j260_a10sd_cssk_80bgntwox_pf_jes_ftf_preselj200_L1SC111-CjJ40', groups=DevGroup+SingleBjetGroup, l1SeedThresholds=['FSNOSEED']),
-        ChainProp(name='HLT_j260_35smcINF_80bgntwox_j260_35smcINF_a10sd_cssk_pf_jes_ftf_presel2j225_L1jJ160', groups=DevGroup+MultiBjetGroup, l1SeedThresholds=2*['FSNOSEED']),
-        ChainProp(name='HLT_j260_35smcINF_80bgntwox_j260_35smcINF_a10sd_cssk_pf_jes_ftf_presel2j225_L1gLJ140p0ETA25', groups=DevGroup+MultiBjetGroup, l1SeedThresholds=2*['FSNOSEED']),
-        ChainProp(name='HLT_j260_35smcINF_80bgntwox_j260_35smcINF_a10sd_cssk_pf_jes_ftf_presel2j225_L1SC111-CjJ40', groups=DevGroup+MultiBjetGroup, l1SeedThresholds=2*['FSNOSEED']),
-        ChainProp(name='HLT_j360_a10sd_cssk_80bgntwox_pf_jes_ftf_preselj225_L1jJ160', groups=DevGroup+SingleBjetGroup, l1SeedThresholds=['FSNOSEED']),
-        ChainProp(name='HLT_j420_a10sd_cssk_80bgntwox_pf_jes_ftf_preselj225_L1jJ160', groups=DevGroup+SingleBjetGroup, l1SeedThresholds=['FSNOSEED']),
-        ChainProp(name='HLT_j460_a10sd_cssk_80bgntwox_pf_jes_ftf_preselj225_L1jJ160', groups=DevGroup+SingleBjetGroup, l1SeedThresholds=['FSNOSEED']),
-
-        ChainProp(name='HLT_j110_a10sd_cssk_90bgntwox_pf_jes_ftf_preselj80_L1jJ60', groups=DevGroup+SingleBjetGroup, l1SeedThresholds=['FSNOSEED']),
-        ChainProp(name='HLT_j175_a10sd_cssk_90bgntwox_pf_jes_ftf_preselj140_L1jJ90', groups=DevGroup+SingleBjetGroup, l1SeedThresholds=['FSNOSEED']),
-        ChainProp(name='HLT_j175_a10sd_cssk_90bgntwox_pf_jes_ftf_preselj140_L1jJ160', groups=DevGroup+SingleBjetGroup, l1SeedThresholds=['FSNOSEED']),
-        ChainProp(name='HLT_j175_a10sd_cssk_90bgntwox_pf_jes_ftf_preselj140_L1gLJ140p0ETA25', groups=DevGroup+SingleBjetGroup, l1SeedThresholds=['FSNOSEED']),
-        ChainProp(name='HLT_j175_a10sd_cssk_90bgntwox_pf_jes_ftf_preselj140_L1SC111-CjJ40', groups=DevGroup+SingleBjetGroup, l1SeedThresholds=['FSNOSEED']),
-        ChainProp(name='HLT_j260_a10sd_cssk_90bgntwox_pf_jes_ftf_preselj200_L1jJ125', groups=DevGroup+SingleBjetGroup, l1SeedThresholds=['FSNOSEED']),
-        ChainProp(name='HLT_j260_a10sd_cssk_90bgntwox_pf_jes_ftf_preselj200_L1jJ160', groups=DevGroup+SingleBjetGroup, l1SeedThresholds=['FSNOSEED']),
-        ChainProp(name='HLT_j260_a10sd_cssk_90bgntwox_pf_jes_ftf_preselj200_L1gLJ140p0ETA25', groups=DevGroup+SingleBjetGroup, l1SeedThresholds=['FSNOSEED']),
-        ChainProp(name='HLT_j260_a10sd_cssk_90bgntwox_pf_jes_ftf_preselj200_L1SC111-CjJ40', groups=DevGroup+SingleBjetGroup, l1SeedThresholds=['FSNOSEED']),
-        ChainProp(name='HLT_j360_a10sd_cssk_90bgntwox_pf_jes_ftf_preselj225_L1jJ160', groups=DevGroup+SingleBjetGroup, l1SeedThresholds=['FSNOSEED']),
-        ChainProp(name='HLT_j420_a10sd_cssk_90bgntwox_pf_jes_ftf_preselj225_L1jJ160', groups=DevGroup+SingleBjetGroup, l1SeedThresholds=['FSNOSEED']),
-        ChainProp(name='HLT_j460_a10sd_cssk_90bgntwox_pf_jes_ftf_preselj225_L1jJ160', groups=DevGroup+SingleBjetGroup, l1SeedThresholds=['FSNOSEED']),
+        ChainProp(name='HLT_j110_a10sd_cssk_79bgntwox_pf_jes_ftf_preselj80_L1jJ60', groups=DevGroup+SingleBjetGroup, l1SeedThresholds=['FSNOSEED']),
+        ChainProp(name='HLT_j175_a10sd_cssk_79bgntwox_pf_jes_ftf_preselj140_L1jJ90', groups=DevGroup+SingleBjetGroup, l1SeedThresholds=['FSNOSEED']),
+        ChainProp(name='HLT_j175_a10sd_cssk_79bgntwox_pf_jes_ftf_preselj140_L1jJ160', groups=DevGroup+SingleBjetGroup, l1SeedThresholds=['FSNOSEED']),
+        ChainProp(name='HLT_j175_a10sd_cssk_79bgntwox_pf_jes_ftf_preselj140_L1gLJ140p0ETA25', groups=DevGroup+SingleBjetGroup, l1SeedThresholds=['FSNOSEED']),
+        ChainProp(name='HLT_j175_a10sd_cssk_79bgntwox_pf_jes_ftf_preselj140_L1SC111-CjJ40', groups=DevGroup+SingleBjetGroup, l1SeedThresholds=['FSNOSEED']),
+        ChainProp(name='HLT_j175_35smcINF_79bgntwox_j175_35smcINF_a10sd_cssk_pf_jes_ftf_preselj140_L1jJ160', groups=DevGroup+MultiBjetGroup, l1SeedThresholds=2*['FSNOSEED']),
+        ChainProp(name='HLT_j175_35smcINF_79bgntwox_j175_35smcINF_a10sd_cssk_pf_jes_ftf_preselj140_L1gLJ140p0ETA25', groups=DevGroup+MultiBjetGroup, l1SeedThresholds=2*['FSNOSEED']),
+        ChainProp(name='HLT_j175_35smcINF_79bgntwox_j175_35smcINF_a10sd_cssk_pf_jes_ftf_preselj140_L1SC111-CjJ40', groups=DevGroup+MultiBjetGroup, l1SeedThresholds=2*['FSNOSEED']),
+        ChainProp(name='HLT_j260_a10sd_cssk_79bgntwox_pf_jes_ftf_preselj200_L1jJ125', groups=DevGroup+SingleBjetGroup, l1SeedThresholds=['FSNOSEED']),
+        ChainProp(name='HLT_j260_a10sd_cssk_79bgntwox_pf_jes_ftf_preselj200_L1jJ160', groups=DevGroup+SingleBjetGroup, l1SeedThresholds=['FSNOSEED']),
+        ChainProp(name='HLT_j260_a10sd_cssk_79bgntwox_pf_jes_ftf_preselj200_L1gLJ140p0ETA25', groups=DevGroup+SingleBjetGroup, l1SeedThresholds=['FSNOSEED']),
+        ChainProp(name='HLT_j260_a10sd_cssk_79bgntwox_pf_jes_ftf_preselj200_L1SC111-CjJ40', groups=DevGroup+SingleBjetGroup, l1SeedThresholds=['FSNOSEED']),
+        ChainProp(name='HLT_j260_35smcINF_79bgntwox_j260_35smcINF_a10sd_cssk_pf_jes_ftf_presel2j225_L1jJ160', groups=DevGroup+MultiBjetGroup, l1SeedThresholds=2*['FSNOSEED']),
+        ChainProp(name='HLT_j260_35smcINF_79bgntwox_j260_35smcINF_a10sd_cssk_pf_jes_ftf_presel2j225_L1gLJ140p0ETA25', groups=DevGroup+MultiBjetGroup, l1SeedThresholds=2*['FSNOSEED']),
+        ChainProp(name='HLT_j260_35smcINF_79bgntwox_j260_35smcINF_a10sd_cssk_pf_jes_ftf_presel2j225_L1SC111-CjJ40', groups=DevGroup+MultiBjetGroup, l1SeedThresholds=2*['FSNOSEED']),
+        ChainProp(name='HLT_j360_a10sd_cssk_79bgntwox_pf_jes_ftf_preselj225_L1jJ160', groups=DevGroup+SingleBjetGroup, l1SeedThresholds=['FSNOSEED']),
+        ChainProp(name='HLT_j420_a10sd_cssk_79bgntwox_pf_jes_ftf_preselj225_L1jJ160', groups=DevGroup+SingleBjetGroup, l1SeedThresholds=['FSNOSEED']),
+        ChainProp(name='HLT_j460_a10sd_cssk_79bgntwox_pf_jes_ftf_preselj225_L1jJ160', groups=DevGroup+SingleBjetGroup, l1SeedThresholds=['FSNOSEED']),
+
+        ChainProp(name='HLT_j110_a10sd_cssk_86bgntwox_pf_jes_ftf_preselj80_L1jJ60', groups=DevGroup+SingleBjetGroup, l1SeedThresholds=['FSNOSEED']),
+        ChainProp(name='HLT_j175_a10sd_cssk_86bgntwox_pf_jes_ftf_preselj140_L1jJ90', groups=DevGroup+SingleBjetGroup, l1SeedThresholds=['FSNOSEED']),
+        ChainProp(name='HLT_j175_a10sd_cssk_86bgntwox_pf_jes_ftf_preselj140_L1jJ160', groups=DevGroup+SingleBjetGroup, l1SeedThresholds=['FSNOSEED']),
+        ChainProp(name='HLT_j175_35smcINF_a10sd_cssk_86bgntwox_pf_jes_ftf_preselj140_L1jJ160', groups=DevGroup+SingleBjetGroup, l1SeedThresholds=['FSNOSEED']),
+        ChainProp(name='HLT_j175_a10sd_cssk_86bgntwox_pf_jes_ftf_preselj140_L1gLJ140p0ETA25', groups=DevGroup+SingleBjetGroup, l1SeedThresholds=['FSNOSEED']),
+        ChainProp(name='HLT_j175_35smcINF_a10sd_cssk_86bgntwox_pf_jes_ftf_preselj140_L1gLJ140p0ETA25', groups=DevGroup+SingleBjetGroup, l1SeedThresholds=['FSNOSEED']),
+        ChainProp(name='HLT_j175_a10sd_cssk_86bgntwox_pf_jes_ftf_preselj140_L1SC111-CjJ40', groups=DevGroup+SingleBjetGroup, l1SeedThresholds=['FSNOSEED']),
+        ChainProp(name='HLT_j175_35smcINF_a10sd_cssk_86bgntwox_pf_jes_ftf_preselj140_L1SC111-CjJ40', groups=DevGroup+SingleBjetGroup, l1SeedThresholds=['FSNOSEED']),
+        ChainProp(name='HLT_j175_35smcINF_86bgntwox_j175_35smcINF_a10sd_cssk_pf_jes_ftf_preselj140_L1jJ160', groups=DevGroup+MultiBjetGroup, l1SeedThresholds=2*['FSNOSEED']),
+        ChainProp(name='HLT_j175_35smcINF_86bgntwox_j175_35smcINF_a10sd_cssk_pf_jes_ftf_preselj140_L1gLJ140p0ETA25', groups=DevGroup+MultiBjetGroup, l1SeedThresholds=2*['FSNOSEED']),
+        ChainProp(name='HLT_j175_35smcINF_86bgntwox_j175_35smcINF_a10sd_cssk_pf_jes_ftf_preselj140_L1SC111-CjJ40', groups=DevGroup+MultiBjetGroup, l1SeedThresholds=2*['FSNOSEED']),
+        ChainProp(name='HLT_j260_35smcINF_86bgntwox_j260_35smcINF_a10sd_cssk_pf_jes_ftf_preselj140_L1gLJ140p0ETA25', groups=DevGroup+MultiBjetGroup, l1SeedThresholds=2*['FSNOSEED']),
+        ChainProp(name='HLT_j260_35smcINF_86bgntwox_j175_35smcINF_a10sd_cssk_pf_jes_ftf_preselj140_L1gLJ140p0ETA25', groups=DevGroup+MultiBjetGroup, l1SeedThresholds=2*['FSNOSEED']),
+        ChainProp(name='HLT_j175_35smcINF_86bgntwox_j260_35smcINF_a10sd_cssk_pf_jes_ftf_preselj140_L1gLJ140p0ETA25', groups=DevGroup+MultiBjetGroup, l1SeedThresholds=2*['FSNOSEED']),
+        ChainProp(name='HLT_j175_35smcINF_86bgntwox_j175_35smcINF_a10sd_cssk_pf_jes_ftf_preselj160_L1gLJ140p0ETA25', groups=DevGroup+MultiBjetGroup, l1SeedThresholds=2*['FSNOSEED']),
+        ChainProp(name='HLT_j260_35smcINF_86bgntwox_j260_35smcINF_a10sd_cssk_pf_jes_ftf_preselj160_L1gLJ140p0ETA25', groups=DevGroup+MultiBjetGroup, l1SeedThresholds=2*['FSNOSEED']),
+        ChainProp(name='HLT_j260_35smcINF_86bgntwox_j175_35smcINF_a10sd_cssk_pf_jes_ftf_preselj160_L1gLJ140p0ETA25', groups=DevGroup+MultiBjetGroup, l1SeedThresholds=2*['FSNOSEED']),
+        ChainProp(name='HLT_j175_35smcINF_86bgntwox_j260_35smcINF_a10sd_cssk_pf_jes_ftf_preselj160_L1gLJ140p0ETA25', groups=DevGroup+MultiBjetGroup, l1SeedThresholds=2*['FSNOSEED']),
+        ChainProp(name='HLT_j175_35smcINF_86bgntwox_j175_35smcINF_a10sd_cssk_pf_jes_ftf_preselj180_L1gLJ140p0ETA25', groups=DevGroup+MultiBjetGroup, l1SeedThresholds=2*['FSNOSEED']),
+        ChainProp(name='HLT_j260_35smcINF_86bgntwox_j260_35smcINF_a10sd_cssk_pf_jes_ftf_preselj180_L1gLJ140p0ETA25', groups=DevGroup+MultiBjetGroup, l1SeedThresholds=2*['FSNOSEED']),
+        ChainProp(name='HLT_j260_35smcINF_86bgntwox_j175_35smcINF_a10sd_cssk_pf_jes_ftf_preselj180_L1gLJ140p0ETA25', groups=DevGroup+MultiBjetGroup, l1SeedThresholds=2*['FSNOSEED']),
+        ChainProp(name='HLT_j175_35smcINF_86bgntwox_j260_35smcINF_a10sd_cssk_pf_jes_ftf_preselj180_L1gLJ140p0ETA25', groups=DevGroup+MultiBjetGroup, l1SeedThresholds=2*['FSNOSEED']),
+        ChainProp(name='HLT_j175_35smcINF_86bgntwox_j175_35smcINF_a10sd_cssk_pf_jes_ftf_preselj200_L1gLJ140p0ETA25', groups=DevGroup+MultiBjetGroup, l1SeedThresholds=2*['FSNOSEED']),
+        ChainProp(name='HLT_j260_35smcINF_86bgntwox_j260_35smcINF_a10sd_cssk_pf_jes_ftf_preselj200_L1gLJ140p0ETA25', groups=DevGroup+MultiBjetGroup, l1SeedThresholds=2*['FSNOSEED'], monGroups=['jetMon:online']),
+        ChainProp(name='HLT_j260_35smcINF_86bgntwox_j175_35smcINF_a10sd_cssk_pf_jes_ftf_preselj200_L1gLJ140p0ETA25', groups=DevGroup+MultiBjetGroup, l1SeedThresholds=2*['FSNOSEED'], monGroups=['jetMon:online', 'bJetMon:t0']),
+        ChainProp(name='HLT_j175_35smcINF_86bgntwox_j260_35smcINF_a10sd_cssk_pf_jes_ftf_preselj200_L1gLJ140p0ETA25', groups=DevGroup+MultiBjetGroup, l1SeedThresholds=2*['FSNOSEED'], monGroups=['jetMon:online', 'bJetMon:t0']),
+        ChainProp(name='HLT_j260_a10sd_cssk_86bgntwox_pf_jes_ftf_preselj200_L1jJ125', groups=DevGroup+SingleBjetGroup, l1SeedThresholds=['FSNOSEED']),
+        ChainProp(name='HLT_j260_a10sd_cssk_86bgntwox_pf_jes_ftf_preselj200_L1jJ160', groups=DevGroup+SingleBjetGroup, l1SeedThresholds=['FSNOSEED']),
+        ChainProp(name='HLT_2j260_a10sd_cssk_86bgntwox_pf_jes_ftf_presel2j225_L1jJ160', groups=DevGroup+MultiBjetGroup, l1SeedThresholds=['FSNOSEED']),
+        ChainProp(name='HLT_j260_86bgntwox_j260_a10sd_cssk_pf_jes_ftf_presel2j225_L1jJ160', groups=DevGroup+MultiBjetGroup, l1SeedThresholds=2*['FSNOSEED']),
+        ChainProp(name='HLT_j260_a10sd_cssk_86bgntwox_pf_jes_ftf_preselj200_L1gLJ140p0ETA25', groups=DevGroup+SingleBjetGroup, l1SeedThresholds=['FSNOSEED']),
+        ChainProp(name='HLT_2j260_a10sd_cssk_86bgntwox_pf_jes_ftf_presel2j225_L1gLJ140p0ETA25', groups=DevGroup+MultiBjetGroup, l1SeedThresholds=['FSNOSEED']),
+        ChainProp(name='HLT_j260_86bgntwox_j260_a10sd_cssk_pf_jes_ftf_presel2j225_L1gLJ140p0ETA25', groups=DevGroup+MultiBjetGroup, l1SeedThresholds=['FSNOSEED', 'FSNOSEED']),
+        ChainProp(name='HLT_j260_a10sd_cssk_86bgntwox_pf_jes_ftf_preselj200_L1SC111-CjJ40', groups=DevGroup+SingleBjetGroup, l1SeedThresholds=['FSNOSEED']),
+        ChainProp(name='HLT_2j260_a10sd_cssk_86bgntwox_pf_jes_ftf_presel2j225_L1SC111-CjJ40', groups=DevGroup+MultiBjetGroup, l1SeedThresholds=['FSNOSEED']),
+        ChainProp(name='HLT_j260_86bgntwox_j260_a10sd_cssk_pf_jes_ftf_presel2j225_L1SC111-CjJ40', groups=DevGroup+MultiBjetGroup, l1SeedThresholds=2*['FSNOSEED']),
+        ChainProp(name='HLT_j260_35smcINF_86bgntwox_j260_35smcINF_a10sd_cssk_pf_jes_ftf_presel2j225_L1jJ160', groups=DevGroup+MultiBjetGroup, l1SeedThresholds=2*['FSNOSEED']),
+        ChainProp(name='HLT_j260_35smcINF_86bgntwox_j260_35smcINF_a10sd_cssk_pf_jes_ftf_presel2j225_L1gLJ140p0ETA25', groups=DevGroup+MultiBjetGroup, l1SeedThresholds=2*['FSNOSEED']),
+        ChainProp(name='HLT_j260_35smcINF_86bgntwox_j260_35smcINF_a10sd_cssk_pf_jes_ftf_presel2j225_L1SC111-CjJ40', groups=DevGroup+MultiBjetGroup, l1SeedThresholds=2*['FSNOSEED']),
+        ChainProp(name='HLT_j360_a10sd_cssk_86bgntwox_pf_jes_ftf_preselj225_L1jJ160', groups=DevGroup+SingleBjetGroup, l1SeedThresholds=['FSNOSEED']),
+        ChainProp(name='HLT_j420_a10sd_cssk_86bgntwox_pf_jes_ftf_preselj225_L1jJ160', groups=DevGroup+SingleBjetGroup, l1SeedThresholds=['FSNOSEED']),
+        ChainProp(name='HLT_j460_a10sd_cssk_86bgntwox_pf_jes_ftf_preselj225_L1jJ160', groups=DevGroup+SingleBjetGroup, l1SeedThresholds=['FSNOSEED']),
+
+        ChainProp(name='HLT_j110_a10sd_cssk_91bgntwox_pf_jes_ftf_preselj80_L1jJ60', groups=DevGroup+SingleBjetGroup, l1SeedThresholds=['FSNOSEED']),
+        ChainProp(name='HLT_j175_a10sd_cssk_91bgntwox_pf_jes_ftf_preselj140_L1jJ90', groups=DevGroup+SingleBjetGroup, l1SeedThresholds=['FSNOSEED']),
+        ChainProp(name='HLT_j175_a10sd_cssk_91bgntwox_pf_jes_ftf_preselj140_L1jJ160', groups=DevGroup+SingleBjetGroup, l1SeedThresholds=['FSNOSEED']),
+        ChainProp(name='HLT_j175_a10sd_cssk_91bgntwox_pf_jes_ftf_preselj140_L1gLJ140p0ETA25', groups=DevGroup+SingleBjetGroup, l1SeedThresholds=['FSNOSEED']),
+        ChainProp(name='HLT_j175_a10sd_cssk_91bgntwox_pf_jes_ftf_preselj140_L1SC111-CjJ40', groups=DevGroup+SingleBjetGroup, l1SeedThresholds=['FSNOSEED']),
+        ChainProp(name='HLT_j175_35smcINF_91bgntwox_j175_35smcINF_a10sd_cssk_pf_jes_ftf_preselj140_L1jJ160', groups=DevGroup+MultiBjetGroup, l1SeedThresholds=2*['FSNOSEED']),
+        ChainProp(name='HLT_j175_35smcINF_91bgntwox_j175_35smcINF_a10sd_cssk_pf_jes_ftf_preselj140_L1gLJ140p0ETA25', groups=DevGroup+MultiBjetGroup, l1SeedThresholds=2*['FSNOSEED']),
+        ChainProp(name='HLT_j175_35smcINF_91bgntwox_j175_35smcINF_a10sd_cssk_pf_jes_ftf_preselj140_L1SC111-CjJ40', groups=DevGroup+MultiBjetGroup, l1SeedThresholds=2*['FSNOSEED']),
+        ChainProp(name='HLT_j260_a10sd_cssk_91bgntwox_pf_jes_ftf_preselj200_L1jJ125', groups=DevGroup+SingleBjetGroup, l1SeedThresholds=['FSNOSEED']),
+        ChainProp(name='HLT_j260_a10sd_cssk_91bgntwox_pf_jes_ftf_preselj200_L1jJ160', groups=DevGroup+SingleBjetGroup, l1SeedThresholds=['FSNOSEED']),
+        ChainProp(name='HLT_j260_a10sd_cssk_91bgntwox_pf_jes_ftf_preselj200_L1gLJ140p0ETA25', groups=DevGroup+SingleBjetGroup, l1SeedThresholds=['FSNOSEED']),
+        ChainProp(name='HLT_j260_a10sd_cssk_91bgntwox_pf_jes_ftf_preselj200_L1SC111-CjJ40', groups=DevGroup+SingleBjetGroup, l1SeedThresholds=['FSNOSEED']),
+        ChainProp(name='HLT_j260_35smcINF_91bgntwox_j260_35smcINF_a10sd_cssk_pf_jes_ftf_presel2j225_L1jJ160', groups=DevGroup+MultiBjetGroup, l1SeedThresholds=2*['FSNOSEED']),
+        ChainProp(name='HLT_j260_35smcINF_91bgntwox_j260_35smcINF_a10sd_cssk_pf_jes_ftf_presel2j225_L1gLJ140p0ETA25', groups=DevGroup+MultiBjetGroup, l1SeedThresholds=2*['FSNOSEED']),
+        ChainProp(name='HLT_j260_35smcINF_91bgntwox_j260_35smcINF_a10sd_cssk_pf_jes_ftf_presel2j225_L1SC111-CjJ40', groups=DevGroup+MultiBjetGroup, l1SeedThresholds=2*['FSNOSEED']),
+        ChainProp(name='HLT_j360_a10sd_cssk_91bgntwox_pf_jes_ftf_preselj225_L1jJ160', groups=DevGroup+SingleBjetGroup, l1SeedThresholds=['FSNOSEED']),
+        ChainProp(name='HLT_j420_a10sd_cssk_91bgntwox_pf_jes_ftf_preselj225_L1jJ160', groups=DevGroup+SingleBjetGroup, l1SeedThresholds=['FSNOSEED']),
+        ChainProp(name='HLT_j460_a10sd_cssk_91bgntwox_pf_jes_ftf_preselj225_L1jJ160', groups=DevGroup+SingleBjetGroup, l1SeedThresholds=['FSNOSEED']),
+
+        ChainProp(name='HLT_j110_a10sd_cssk_96bgntwox_pf_jes_ftf_preselj80_L1jJ60', groups=DevGroup+SingleBjetGroup, l1SeedThresholds=['FSNOSEED']),
+        ChainProp(name='HLT_j175_a10sd_cssk_96bgntwox_pf_jes_ftf_preselj140_L1jJ90', groups=DevGroup+SingleBjetGroup, l1SeedThresholds=['FSNOSEED']),
+        ChainProp(name='HLT_j175_a10sd_cssk_96bgntwox_pf_jes_ftf_preselj140_L1jJ160', groups=DevGroup+SingleBjetGroup, l1SeedThresholds=['FSNOSEED']),
+        ChainProp(name='HLT_j175_a10sd_cssk_96bgntwox_pf_jes_ftf_preselj140_L1gLJ140p0ETA25', groups=DevGroup+SingleBjetGroup, l1SeedThresholds=['FSNOSEED']),
+        ChainProp(name='HLT_j175_a10sd_cssk_96bgntwox_pf_jes_ftf_preselj140_L1SC111-CjJ40', groups=DevGroup+SingleBjetGroup, l1SeedThresholds=['FSNOSEED']),
+        ChainProp(name='HLT_j260_a10sd_cssk_96bgntwox_pf_jes_ftf_preselj200_L1jJ125', groups=DevGroup+SingleBjetGroup, l1SeedThresholds=['FSNOSEED']),
+        ChainProp(name='HLT_j260_a10sd_cssk_96bgntwox_pf_jes_ftf_preselj200_L1jJ160', groups=DevGroup+SingleBjetGroup, l1SeedThresholds=['FSNOSEED']),
+        ChainProp(name='HLT_j260_a10sd_cssk_96bgntwox_pf_jes_ftf_preselj200_L1gLJ140p0ETA25', groups=DevGroup+SingleBjetGroup, l1SeedThresholds=['FSNOSEED']),
+        ChainProp(name='HLT_j260_a10sd_cssk_96bgntwox_pf_jes_ftf_preselj200_L1SC111-CjJ40', groups=DevGroup+SingleBjetGroup, l1SeedThresholds=['FSNOSEED']),
+        ChainProp(name='HLT_j360_a10sd_cssk_96bgntwox_pf_jes_ftf_preselj225_L1jJ160', groups=DevGroup+SingleBjetGroup, l1SeedThresholds=['FSNOSEED']),
+        ChainProp(name='HLT_j420_a10sd_cssk_96bgntwox_pf_jes_ftf_preselj225_L1jJ160', groups=DevGroup+SingleBjetGroup, l1SeedThresholds=['FSNOSEED']),
+        ChainProp(name='HLT_j460_a10sd_cssk_96bgntwox_pf_jes_ftf_preselj225_L1jJ160', groups=DevGroup+SingleBjetGroup, l1SeedThresholds=['FSNOSEED']),
 
         ######################################################################################################################################################################################################################################################
         #HH->bbbb
@@ -635,11 +629,8 @@ def getDevSignatures():
 
 
         # g-2 tau triggers (ATR-30638)
-        ChainProp(name='HLT_2tau50_mediumRNN_29dphiAA_L12cTAU50M_DPHI-2eTAU50', l1SeedThresholds=['cTAU50M'], groups=MultiTauGroup+DevGroup, monGroups=['tauMon:t0']),
-        ChainProp(name='HLT_2tau50_mediumGNTau_29dphiAA_L12cTAU50M_DPHI-2eTAU50', l1SeedThresholds=['cTAU50M'], groups=MultiTauGroup+DevGroup, monGroups=['tauMon:t0']),
-        ChainProp(name='HLT_tau70_mediumRNN_tau50_mediumRNN_29dphiAB_L1eTAU70_2cTAU50M_DPHI-2eTAU50', l1SeedThresholds=['eTAU70', 'cTAU50M'], groups=MultiTauGroup+DevGroup, monGroups=['tauMon:t0']),
         ChainProp(name='HLT_tau70_mediumGNTau_tau50_mediumGNTau_29dphiAB_L1eTAU70_2cTAU50M_DPHI-2eTAU50', l1SeedThresholds=['eTAU70', 'cTAU50M'], groups=MultiTauGroup+DevGroup, monGroups=['tauMon:t0']),
-
+        ChainProp(name='HLT_2tau50_mediumGNTau_29dphiAA_L12cTAU50M_DPHI-2eTAU50', l1SeedThresholds=['cTAU50M'], groups=MultiTauGroup+DevGroup, monGroups=['tauMon:t0']),
 
 
 
@@ -810,9 +801,8 @@ def getDevSignatures():
         ChainProp(name='HLT_j180_dispjet140_x3d1p_L1jJ160', groups=SingleJetGroup+UnconvTrkGroup+PrimaryPhIGroup, l1SeedThresholds=['FSNOSEED']*2),
 
         #ATR-30179
-        ChainProp(name='HLT_mu14_ivarloose_tau35_mediumRNN_tracktwoMVA_03dRAB_L1cTAU30M_3DR35-MU8F-eTAU30', l1SeedThresholds=['MU8F','cTAU30M'], stream=[PhysicsStream], groups=SupportPhIGroup+MuonTauGroup),
 
-        ChainProp(name='HLT_mu14_ivarloose_tau35_mediumGNTau_03dRAB_L1cTAU30M_3DR35-MU8F-eTAU30', l1SeedThresholds=['MU8F', 'cTAU30M'], stream=[PhysicsStream], groups=SupportPhIGroup+MuonTauGroup),
+        ChainProp(name='HLT_mu14_ivarloose_tau35_mediumGNTau_03dRAB_L1cTAU30M_3DR35-MU8F-eTAU30', l1SeedThresholds=['MU8F', 'cTAU30M'], stream=[PhysicsStream], groups=SupportPhIGroup+MuonTauGroup+Topo3Group),
 
         #ATR-30378
         ChainProp(name='HLT_mu10_j75c_020jvt_j50c_020jvt_j25c_020jvt_j20c_020jvt_SHARED_2j20c_020jvt_bgn277_pf_ftf_presel2c20XX2c20bgtwo85_dRAB04_L1BTAG-MU8FjJ40_2jJ40p0ETA25'            , l1SeedThresholds=['MU8F']+['FSNOSEED']*5,  stream=[PhysicsStream], groups=SupportPhIGroup+MultiBjetGroup),
@@ -906,7 +896,6 @@ def getDevSignatures():
         
         # Muon + Tau primaries
         ChainProp(name='HLT_mu14_ivarloose_tau25_mediumGNTau_03dRAB_L1MU8F_cTAU20M_3jJ30', l1SeedThresholds=['MU8F', 'cTAU20M'], groups=PrimaryPhIGroup+MuonTauGroup),
-        ChainProp(name='HLT_mu14_ivarloose_tau35_mediumGNTau_03dRAB_L1MU8F_cTAU30M', l1SeedThresholds=['MU8F', 'cTAU30M'], groups=PrimaryPhIGroup+MuonTauGroup),
         ChainProp(name='HLT_mu20_ivarloose_tau20_mediumGNTau_L1eTAU12_03dRAB_L1MU14FCH', l1SeedThresholds=['MU14FCH', 'eTAU12'], groups=PrimaryPhIGroup+MuonTauGroup),
         ChainProp(name='HLT_mu23_ivarloose_tau20_mediumGNTau_L1eTAU12_03dRAB_L1MU18VFCH', l1SeedThresholds=['MU18VFCH', 'eTAU12'], groups=PrimaryPhIGroup+MuonTauGroup),
 
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Menu/L1Seeds.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Menu/L1Seeds.py
index a8ed4164eb3aa6c1764e0bf37fff7d33d6fbdd05..e4b2f92d4b3d829fc47313d2d0c3ad5f759e5634 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Menu/L1Seeds.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Menu/L1Seeds.py
@@ -116,7 +116,7 @@ def getEBnoL1PSSeed(l1items, l1seedname):
             'L1_eEM24L_3eEM12L',
             'L1_4jJ40', 'L1_jJ160', 'L1_jXE100', 'L1_2jJ40_jXE110',
             'L1_eTAU140',
-            'L1_MU8F_cTAU30M', 'L1_MU14FCH', 'L1_MU18VFCH', 'L1_MU10BOM',
+            'L1_cTAU30M_3DR35-MU8F-eTAU30', 'L1_MU14FCH', 'L1_MU18VFCH', 'L1_MU10BOM',
             'L1_5jJ40p0ETA25',
             'L1_3MU5VF','L1_MU8F_2jJ40_jJ50',
             'L1_jJ55p0ETA23_2jJ40p30ETA49', 'L1_jJ125p30ETA49', 'L1_jJ80p0ETA25_2jJ55_jJ50p30ETA49',
@@ -189,7 +189,7 @@ def getL1BKeePrimary():
         'L1_MU14FCH',
         'L1_MU8F_2MU5VF',
         'L1_MU8F_eTAU30M', # legacy 'L1_MU8F_TAU20IM'
-        'L1_MU8F_cTAU30M',
+        'L1_cTAU30M_3DR35-MU8F-eTAU30',
         'L1_MU8F_eTAU20M_3jJ30', # legacy 'L1_MU8F_TAU12IM_3J12'
         'L1_MU8F_cTAU20M_3jJ30',
         'L1_jXE100', # legacy 'L1_XE50',
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Menu/MC_pp_run3_v1.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Menu/MC_pp_run3_v1.py
index 56638c5488c74dce20f02dd1f46866fdb4a99db6..d49a00ca0e36de48ee7ca1da503f27c898323ecd 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Menu/MC_pp_run3_v1.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Menu/MC_pp_run3_v1.py
@@ -39,6 +39,8 @@ from TriggerMenuMT.HLT.Menu.Physics_pp_run3_v1 import ( PhysicsStream,
                                                         LegacyTopoGroup,
                                                         BjetMETGroup,
                                                         MuonJetGroup,
+                                                        MuonTauGroup,
+
 )
 
 
@@ -165,6 +167,8 @@ def getMCSignatures():
         ChainProp(name='HLT_2j20_2j20_pf_ftf_presel2c20XX2c20b82_PhysicsTLA_L1jJ85p0ETA21_3jJ40p0ETA25', l1SeedThresholds=['FSNOSEED']*2, stream=['TLA'], groups=MultiJetGroup+SupportPhIGroup, monGroups=['tlaMon:shifter']),
         ChainProp(name='HLT_2j20_2j20_pf_ftf_presel2c20XX2c20b80_PhysicsTLA_L1jJ85p0ETA21_3jJ40p0ETA25', l1SeedThresholds=['FSNOSEED']*2, stream=['TLA'], groups=MultiJetGroup+SupportPhIGroup, monGroups=['tlaMon:shifter']),
 
+        ChainProp(name='HLT_6j20_pf_ftf_presel6c25_PhysicsTLA_L14jJ40', l1SeedThresholds=['FSNOSEED'], stream=['TLA'], groups=PrimaryPhIGroup+MultiJetGroup, monGroups=['tlaMon:shifter']),
+        
         #-- calratio/calratio+VBF ATR-28412 candidates moved to MC for now best candiate moved to physics after validation
         ChainProp(name='HLT_j30_CLEANllp_momemfrac006_calratio_L1jMJJ-500-NFF', l1SeedThresholds=['FSNOSEED'], groups=SingleJetGroup+PrimaryPhIGroup),
         ChainProp(name='HLT_j30_CLEANllp_momemfrac012_calratiormbib_L1jMJJ-500-NFF', l1SeedThresholds=['FSNOSEED'], groups=SingleJetGroup+SupportPhIGroup),
@@ -318,6 +322,11 @@ def getMCSignatures():
 
     chains['Egamma'] = [
 
+        #ATR_30971
+        ChainProp(name='HLT_g35_medium_g25_medium_noringer_L12eEM24L', groups=PrimaryPhIGroup+SinglePhotonGroup, monGroups=['egammaMon:shifter']),
+        ChainProp(name='HLT_e26_dnntight_ivarloose_e30_dnnloose_nopix_lrtmedium_probe_L1eEM26M',l1SeedThresholds=['eEM26M','PROBEeEM26M'],groups=TagAndProbePhIGroup+SingleElectronGroup),
+       
+
         #ATR-29567
         ChainProp(name='HLT_e24_lhtight_ivarloose_L1eEM24VM', groups=PrimaryPhIGroup+SingleElectronGroup),
         ChainProp(name='HLT_e26_lhtight_ivarloose_L1eEM24VM', groups=PrimaryPhIGroup+SingleElectronGroup),
@@ -357,7 +366,6 @@ def getMCSignatures():
 
         # ATR-27780
         
-        ChainProp(name='HLT_g5_nopid_L1eEM5', groups=SinglePhotonGroup+['PS:NoBulkMCProd']),
 
         #ATR-25764 - adding Photon chains with different isolation WPs
         ChainProp(name='HLT_g25_tight_icaloloose_L1eEM26M', groups=SinglePhotonGroup, monGroups=['egammaMon:shifter']),
@@ -525,6 +533,7 @@ def getMCSignatures():
         ChainProp(name='HLT_e7_lhmedium_L1eEM5_mu22_L1MU18VFCH',l1SeedThresholds=['eEM5','MU18VFCH'],  stream=[PhysicsStream], groups=PrimaryPhIGroup+EgammaMuonGroup),
         ChainProp(name='HLT_e7_lhmedium_L1eEM5_mu20_L1MU18VFCH',l1SeedThresholds=['eEM5','MU18VFCH'],  stream=[PhysicsStream], groups=PrimaryPhIGroup+EgammaMuonGroup),
 
+        ChainProp(name='HLT_mu14_ivarloose_tau35_mediumRNN_tracktwoMVA_03dRAB_L1MU8F_cTAU30M', l1SeedThresholds=['MU8F','cTAU30M'], stream=[PhysicsStream], groups=PrimaryPhIGroup+MuonTauGroup),
     ]
 
 
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Menu/Physics_pp_run3_v1.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Menu/Physics_pp_run3_v1.py
index 036772c2f414b6043843f2aaf3b097987720dc52..8a93df40e6cd23ef997e3ed104a3d1bd97bd683c 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Menu/Physics_pp_run3_v1.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Menu/Physics_pp_run3_v1.py
@@ -380,6 +380,8 @@ def setupMenu():
 
     chains['Egamma'] += [
         # Electron Chains----------
+
+
         # Phase1 eEM chains 
         ChainProp(name='HLT_e26_lhtight_ivarloose_L1eEM26M', stream=[PhysicsStream,'express'], groups=PrimaryPhIGroup+SingleElectronGroup, monGroups=['egammaMon:online','egammaMon:shifter_tp','caloMon:t0']),
         ChainProp(name='HLT_e26_lhtight_ivarloose_L1eEM26T', groups=PrimaryPhIGroup+SingleElectronGroup, monGroups=['egammaMon:shifter_tp']),
@@ -392,15 +394,22 @@ def setupMenu():
 
         # ATR-27156 Phase-1
         # dnn chains
-        # ATR-27325 Primary -> Support
-        ChainProp(name='HLT_e26_dnntight_ivarloose_L1eEM26M', groups=SupportPhIGroup+SingleElectronGroup, monGroups=['egammaMon:online','egammaMon:t0_tp']),
-        ChainProp(name='HLT_e60_dnnmedium_L1eEM26M', groups=SupportPhIGroup+SingleElectronGroup, monGroups=['egammaMon:t0_tp']),
-        ChainProp(name='HLT_e140_dnnloose_L1eEM26M', groups=SupportPhIGroup+SingleElectronGroup, monGroups=['egammaMon:t0_tp']),
+        # ATR_30971
+        ChainProp(name='HLT_e26_dnntight_ivarloose_e17_dnnloose_probe_L1eEM26M', l1SeedThresholds=['eEM26M','PROBEeEM18M'],groups=TagAndProbePhIGroup+MultiElectronGroup+['RATE:CPS_eEM26M']),
+        ChainProp(name='HLT_2e17_dnnloose_L12eEM18M', groups=PrimaryPhIGroup+MultiElectronGroup),
+        ChainProp(name='HLT_2e24_dnnloose_L12eEM24L', groups=PrimaryPhIGroup+MultiElectronGroup),
+        ChainProp(name='HLT_e5_dnntight_e9_etcut_1invmAB5_L1JPSI-1M5-eEM9', stream=[PhysicsStream,'express'], l1SeedThresholds=['eEM5','eEM9'], groups=SupportPhIGroup+MultiElectronGroup+Topo2Group+['RATE:CPS_JPSI-1M5-eEM9'], monGroups=['egammaMon:shifter_topo']),
+        ChainProp(name='HLT_e24_dnnloose_2e12_dnnloose_L1eEM24L_3eEM12L',l1SeedThresholds=['eEM24L','eEM12L'], groups=PrimaryPhIGroup+MultiElectronGroup), 
+        ChainProp(name='HLT_e26_dnntight_ivarloose_L1eEM26M', groups=PrimaryPhIGroup+SingleElectronGroup, monGroups=['egammaMon:online','egammaMon:t0_tp']),
+ChainProp(name='HLT_e60_dnnmedium_L1eEM26M', groups=PrimaryPhIGroup+SingleElectronGroup, monGroups=['egammaMon:t0_tp']),
+ChainProp(name='HLT_e140_dnnloose_L1eEM26M', groups=PrimaryPhIGroup+SingleElectronGroup, monGroups=['egammaMon:t0_tp']),
+
+
 
         # ATR-27373
-        ChainProp(name='HLT_e28_dnntight_ivarloose_L1eEM28M', groups=SupportPhIGroup+SingleElectronGroup, monGroups=['egammaMon:online','egammaMon:t0_tp']),
-        ChainProp(name='HLT_e60_dnnmedium_L1eEM28M', groups=SupportPhIGroup+SingleElectronGroup, monGroups=['egammaMon:t0_tp']),
-        ChainProp(name='HLT_e140_dnnloose_L1eEM28M', groups=SupportPhIGroup+SingleElectronGroup, monGroups=['egammaMon:t0_tp']),
+        ChainProp(name='HLT_e28_dnntight_ivarloose_L1eEM28M', groups=PrimaryPhIGroup+SingleElectronGroup, monGroups=['egammaMon:online','egammaMon:t0_tp']),
+        ChainProp(name='HLT_e60_dnnmedium_L1eEM28M', groups=PrimaryPhIGroup+SingleElectronGroup, monGroups=['egammaMon:t0_tp']),
+        ChainProp(name='HLT_e140_dnnloose_L1eEM28M', groups=PrimaryPhIGroup+SingleElectronGroup, monGroups=['egammaMon:t0_tp']),
                    
         # ATR-25512
         #ChainProp(name='HLT_e28_lhtight_ivarloose_L1eEM26T', groups=PrimaryPhIGroup+SingleElectronGroup, monGroups=['egammaMon:t0_tp']),
@@ -567,6 +576,13 @@ def setupMenu():
         ChainProp(name='HLT_g45_medium_g20_medium_L1eEM40L_2eEM18L', l1SeedThresholds=['eEM40L', 'eEM18L'], stream=[PhysicsStream], groups=PrimaryPhIGroup+MultiPhotonGroup),
         ChainProp(name='HLT_2g50_loose_L12eEM24L', groups=PrimaryPhIGroup+MultiPhotonGroup),
 
+        #ATR_30971
+        ChainProp(name='HLT_g5_nopid_L1eEM5', groups=SinglePhotonGroup+SupportPhIGroup+['RATE:CPS_eEM5']+['PS:NoBulkMCProd']),
+        ChainProp(name='HLT_g25_loose_noringer_L1eEM24L', groups=SupportPhIGroup+SinglePhotonGroup+['RATE:CPS_eEM24L']),
+        ChainProp(name='HLT_g35_medium_noringer_L1eEM24L', groups=SupportPhIGroup+SinglePhotonGroup+['RATE:CPS_eEM24L'], monGroups=['egammaMon:shifter']),
+        ChainProp(name='HLT_2g22_tight_noringer_L12eEM18M', groups=PrimaryPhIGroup+MultiPhotonGroup),
+        ChainProp(name='HLT_g140_loose_noringer_L1eEM26M', groups=PrimaryPhIGroup+SinglePhotonGroup, monGroups=['egammaMon:shifter']),
+
         # low-mass diphoton ATR-21637
         ChainProp(name='HLT_2g9_loose_25dphiAA_invmAA80_L1DPHI-M70-2eEM9', l1SeedThresholds=['eEM9'], groups=SupportPhIGroup+MultiPhotonGroup+Topo2Group),
         ChainProp(name='HLT_2g9_loose_25dphiAA_invmAA80_L1DPHI-M70-2eEM9L', l1SeedThresholds=['eEM9'], groups=EOFEgammaPhIGroup+MultiPhotonGroup+Topo2Group),
@@ -781,19 +797,6 @@ def setupMenu():
         ChainProp(name='HLT_2g50_tight_L1eEM15_EMPTY', l1SeedThresholds=['eEM15'], stream=['Late'], groups=PrimaryPhIGroup+MultiPhotonGroup),
         ChainProp(name='HLT_2g50_tight_L1eEM9_UNPAIRED_ISO', l1SeedThresholds=['eEM9'], stream=['Late'], groups=PrimaryPhIGroup+MultiPhotonGroup),
 
-        # ATR-29839: Inclusion of photon Ringer chains in the Physics Menu
-        ChainProp(name='HLT_g20_tight_icaloloose_ringer_L1eEM18M', groups=SupportPhIGroup+SinglePhotonGroup, monGroups=['egammaMon:shifter']),
-        ChainProp(name='HLT_g20_tight_ringer_L1eEM18M', groups=SupportPhIGroup+SinglePhotonGroup,monGroups=['egammaMon:shifter']),
-        ChainProp(name='HLT_g22_tight_ringer_L1eEM18M', groups=SupportPhIGroup+SinglePhotonGroup,monGroups=['egammaMon:shifter']),
-        ChainProp(name='HLT_g25_loose_ringer_L1eEM24L', groups=SupportPhIGroup+SinglePhotonGroup,monGroups=['egammaMon:shifter']),
-        ChainProp(name='HLT_g25_medium_ringer_L1eEM24L', groups=SupportPhIGroup+SinglePhotonGroup, monGroups=['egammaMon:shifter']),
-        ChainProp(name='HLT_g35_medium_ringer_L1eEM24L', groups=SupportPhIGroup+SinglePhotonGroup, monGroups=['egammaMon:shifter']),
-        ChainProp(name='HLT_g50_loose_ringer_L1eEM24L', groups=SupportPhIGroup+SinglePhotonGroup, monGroups=['egammaMon:shifter']),
-        ChainProp(name='HLT_g140_loose_ringer_L1eEM26M', groups=PrimaryPhIGroup+SinglePhotonGroup, monGroups=['egammaMon:shifter']),
-        ChainProp(name='HLT_2g20_tight_icaloloose_ringer_L12eEM18M', groups=PrimaryPhIGroup+MultiPhotonGroup, monGroups=['egammaMon:shifter']),
-        ChainProp(name='HLT_2g22_tight_ringer_L12eEM18M', groups=PrimaryPhIGroup+MultiPhotonGroup, monGroups=['egammaMon:shifter']),
-        ChainProp(name='HLT_g35_medium_g25_medium_ringer_L12eEM24L', groups=PrimaryPhIGroup+SinglePhotonGroup, monGroups=['egammaMon:shifter']),
-        ChainProp(name='HLT_2g50_loose_ringer_L12eEM24L', groups=PrimaryPhIGroup+MultiPhotonGroup, monGroups=['egammaMon:shifter']),
     ]
 
     chains['MET'] += [
@@ -1111,8 +1114,10 @@ def setupMenu():
         # ATR-25512
 
         # Multijet delayed stream
+        ChainProp(name='HLT_6j20c_020jvt_pf_ftf_preselZ142XX5c20_PhysicsTLA_L14jJ40', l1SeedThresholds=['FSNOSEED'], stream=['TLA'], groups=PrimaryPhIGroup+MultiJetGroup, monGroups=['tlaMon:shifter']), 
+        ChainProp(name='HLT_6j20c_020jvt_pf_ftf_preselZ182XX6c20_PhysicsTLA_L14jJ40', l1SeedThresholds=['FSNOSEED'], stream=['TLA'], groups=PrimaryPhIGroup+MultiJetGroup, monGroups=['tlaMon:shifter']),    
+        ChainProp(name='HLT_6j20c_020jvt_pf_ftf_preselZ197XX6c20_PhysicsTLA_L14jJ40', l1SeedThresholds=['FSNOSEED'], stream=['TLA'], groups=PrimaryPhIGroup+MultiJetGroup, monGroups=['tlaMon:shifter']),        
 
-        ChainProp(name='HLT_6j20_pf_ftf_presel6c25_PhysicsTLA_L14jJ40', l1SeedThresholds=['FSNOSEED'], stream=['TLA'], groups=PrimaryPhIGroup+MultiJetGroup, monGroups=['tlaMon:shifter']),
 
 
         ## TLA chains
@@ -1155,7 +1160,7 @@ def setupMenu():
         # Central single large-R jets
         ChainProp(name='HLT_j110_a10sd_cssk_pf_jes_ftf_preselj80_L1jJ60', l1SeedThresholds=['FSNOSEED'], groups=SingleJetGroup+SupportPhIGroup+['RATE:CPS_jJ60']),
         ChainProp(name='HLT_j110_a10t_lcw_jes_L1jJ60', l1SeedThresholds=['FSNOSEED'], groups=SingleJetGroup+SupportPhIGroup+['RATE:CPS_jJ60']),
-        ChainProp(name='HLT_j175_a10sd_cssk_pf_jes_ftf_preselj140_L1jJ90', l1SeedThresholds=['FSNOSEED'], groups=SingleJetGroup+SupportPhIGroup+['RATE:CPS_jJ90'], monGroups=['bJetMon:shifter']),
+        ChainProp(name='HLT_j175_a10sd_cssk_pf_jes_ftf_preselj140_L1jJ90', l1SeedThresholds=['FSNOSEED'], groups=SingleJetGroup+SupportPhIGroup+['RATE:CPS_jJ90'], monGroups=['bJetMon:shifter', 'jetMon:online']),
         ChainProp(name='HLT_j175_a10t_lcw_jes_L1jJ90', l1SeedThresholds=['FSNOSEED'], groups=SingleJetGroup+SupportPhIGroup+['RATE:CPS_jJ90']),
         ChainProp(name='HLT_j260_a10sd_cssk_pf_jes_ftf_preselj200_L1jJ125', l1SeedThresholds=['FSNOSEED'], groups=SingleJetGroup+SupportPhIGroup+['RATE:CPS_jJ125']),
         ChainProp(name='HLT_j260_a10t_lcw_jes_L1jJ125', l1SeedThresholds=['FSNOSEED'], groups=SingleJetGroup+SupportPhIGroup+['RATE:CPS_jJ125']),
@@ -1318,7 +1323,7 @@ def setupMenu():
 
         ChainProp(name='HLT_j110_a10sd_cssk_pf_jes_ftf_preselj80_L1gLJ80p0ETA25', l1SeedThresholds=['FSNOSEED'], groups=SingleJetGroup+SupportPhIGroup+['RATE:CPS_gLJ80p0ETA25']),
         ChainProp(name='HLT_j110_a10t_lcw_jes_L1gLJ80p0ETA25', l1SeedThresholds=['FSNOSEED'], groups=SingleJetGroup+SupportPhIGroup+['RATE:CPS_gLJ80p0ETA25']),
-        ChainProp(name='HLT_j175_a10sd_cssk_pf_jes_ftf_preselj140_L1gLJ100p0ETA25', l1SeedThresholds=['FSNOSEED'], groups=SingleJetGroup+SupportPhIGroup+['RATE:CPS_gLJ100p0ETA25'], monGroups=['bJetMon:shifter']),
+        ChainProp(name='HLT_j175_a10sd_cssk_pf_jes_ftf_preselj140_L1gLJ100p0ETA25', l1SeedThresholds=['FSNOSEED'], groups=SingleJetGroup+SupportPhIGroup+['RATE:CPS_gLJ100p0ETA25'], monGroups=['bJetMon:shifter', 'jetMon:online']),
         ChainProp(name='HLT_j175_a10t_lcw_jes_L1gLJ100p0ETA25', l1SeedThresholds=['FSNOSEED'], groups=SingleJetGroup+SupportPhIGroup+['RATE:CPS_gLJ100p0ETA25']),
 
          # low threshold single jet support chains with JVT
@@ -1570,6 +1575,13 @@ def setupMenu():
         ChainProp(name='HLT_tau40_mediumRNN_tracktwoMVA_tau35_mediumRNN_tracktwoMVA_03dRAB_L1eTAU35M_2eTAU30M', l1SeedThresholds=['eTAU35M','eTAU30M'], groups=SupportPhIGroup+MultiTauGroup),
         ChainProp(name='HLT_tau40_mediumRNN_tracktwoMVA_tau35_mediumRNN_tracktwoMVA_03dRAB_L1cTAU35M_2cTAU30M' , l1SeedThresholds=['cTAU35M','cTAU30M'], groups=SupportPhIGroup+MultiTauGroup),
 
+        
+        # g-2 tau measurement (yy -> tautau)
+        ChainProp(name='HLT_tau70_mediumRNN_tau50_mediumRNN_29dphiAB_L1eTAU70_2cTAU50M_DPHI-2eTAU50', l1SeedThresholds=['eTAU70', 'cTAU50M'], groups=PrimaryPhIGroup+MultiTauGroup+Topo3Group, monGroups=['tauMon:t0']),
+        ChainProp(name='HLT_2tau50_mediumRNN_29dphiAA_L12cTAU50M_DPHI-2eTAU50', l1SeedThresholds=['cTAU50M'], groups=EOFTauPhIGroup+MultiTauGroup+Topo3Group, monGroups=['tauMon:t0']),
+
+
+
         # displaced tau+X (ATR-21754)
         ChainProp(name="HLT_tau80_mediumRNN_tracktwoLLP_tau60_mediumRNN_tracktwoLLP_03dRAB_L1eTAU80_2eTAU60", l1SeedThresholds=['eTAU80','eTAU60'], groups=PrimaryPhIGroup+MultiTauGroup, monGroups=['tauMon:shifter'] ),
         ChainProp(name="HLT_tau80_mediumRNN_tracktwoLLP_tau60_tightRNN_tracktwoLLP_03dRAB_L1eTAU80_2eTAU60", l1SeedThresholds=['eTAU80','eTAU60'], groups=PrimaryPhIGroup+MultiTauGroup, monGroups=['tauMon:t0']),
@@ -2033,11 +2045,12 @@ def setupMenu():
         ChainProp(name='HLT_g15_loose_L1eEM10L_2mu10_msonly_L1MU3V_UNPAIRED_ISO', l1SeedThresholds=['eEM10L','MU3V'], stream=['Late'], groups=PrimaryPhIGroup+EgammaMuonGroup),
 
         # tau + muon triggers
+
+        ChainProp(name='HLT_mu14_ivarloose_tau35_mediumRNN_tracktwoMVA_03dRAB_L1cTAU30M_3DR35-MU8F-eTAU30', l1SeedThresholds=['MU8F','cTAU30M'], stream=[PhysicsStream], groups=PrimaryPhIGroup+MuonTauGroup+Topo3Group),
         ChainProp(name='HLT_mu20_ivarloose_tau20_mediumRNN_tracktwoMVA_L1eTAU12_03dRAB_L1MU14FCH', l1SeedThresholds=['MU14FCH', 'eTAU12'], stream=[PhysicsStream], groups=PrimaryPhIGroup+MuonTauGroup),
         # ATR 25512
         ChainProp(name='HLT_mu23_ivarloose_tau20_mediumRNN_tracktwoMVA_L1eTAU12_03dRAB_L1MU18VFCH', l1SeedThresholds=['MU18VFCH', 'eTAU12'], stream=[PhysicsStream], groups=PrimaryPhIGroup+MuonTauGroup),
 
-        ChainProp(name='HLT_mu14_ivarloose_tau35_mediumRNN_tracktwoMVA_03dRAB_L1MU8F_cTAU30M', l1SeedThresholds=['MU8F','cTAU30M'], stream=[PhysicsStream], groups=PrimaryPhIGroup+MuonTauGroup),
         ChainProp(name='HLT_mu14_ivarloose_tau25_mediumRNN_tracktwoMVA_03dRAB_L1MU8F_cTAU20M_3jJ30', l1SeedThresholds=['MU8F','cTAU20M'], stream=[PhysicsStream], groups=PrimaryPhIGroup+MuonTauGroup),
 
         # ATR-27546
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Menu/SignatureDicts.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Menu/SignatureDicts.py
index acfcfe161a2d06f89c8178c00666e8886d2ea339..ef00d596081e93acc8f80227121146dec4524329 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Menu/SignatureDicts.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Menu/SignatureDicts.py
@@ -459,7 +459,7 @@ JetChainParts = {
      'PTRANGE2r3',
      'MAXMULT20c',
      'MAXMULT6c',],
-    'bsel': ['95bdips','90bdips','85bdips','80bdips','77bdips','95bgnone','90bgnone','85bgnone','80bgnone','77bgnone', '60bgntwox', '70bgntwox', '80bgntwox', '90bgntwox','95bgntwo','90bgntwo','85bgntwo','80bgntwo','82bgntwo','77bgntwo','75bgntwo','60bgntwo'],
+    'bsel': ['95bdips','90bdips','85bdips','80bdips','77bdips','95bgnone','90bgnone','85bgnone','80bgnone','77bgnone', '79bgntwox', '86bgntwox', '91bgntwox', '96bgntwox','95bgntwo','90bgntwo','85bgntwo','80bgntwo','82bgntwo','77bgntwo','75bgntwo','60bgntwo'],
     'tausel': [ '75gntau' , '80gntau', '85gntau' , '90gntau' ],
     'smc'           : # "Single mass condition" -- rename?
       ['30smcINF', '35smcINF', '40smcINF', '50smcINF', '60smcINF', 'nosmc'],
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/L1CaloThresholdMapping.py b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/L1CaloThresholdMapping.py
index 14a26ed917291ea9c95aec33e8433a2cff707b05..ec1d7d8d764007ecdbf04461b637aec83f4972fa 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/L1CaloThresholdMapping.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/L1CaloThresholdMapping.py
@@ -64,28 +64,28 @@ threshold_mapping = {
         10:10,
         15:15,
         20:21,
-        30:27,
-        40:28,
-        50:33,
+        30:26,
+        40:27,
+        50:31,
         55:41,
-        60:64,
+        60:60,
         80:65,
-        90:84,
+        90:81,
         125:121,
-        140:138,
+        140:137,
         160:158,
-        180:197,
+        180:195,
         # Must be 400 to ensure threshold can be passed
         500:400,
     },
     'CjJ': { # 0ETA2[1,3,5]
         20:21,
-        30:23,
-        40:27,
+        30:22,
+        40:25,
         50:33,
         55:39,
         60:56,
-        70:59,
+        70:54,
         80:64,
         85:70,
         90:84,
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Menu/Menu_MC_pp_run3_v1.py b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Menu/Menu_MC_pp_run3_v1.py
index 4591c3ec4c8c54b46270ef14023798e279d8eb79..e6c6b280aa0d4b1f2b98b3c51e8660ddbeaa4d66 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Menu/Menu_MC_pp_run3_v1.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Menu/Menu_MC_pp_run3_v1.py
@@ -99,7 +99,7 @@ def defineMenu():
         
         # ATR-29651 - Tau+X chains using eTAU20M seeds
         'L1_eEM18M_2eTAU20M_4jJ30', 'L1_eTAU60_2eTAU20M_jXE80', 'L1_eEM18M_2eTAU20M_jXE70', 
-
+        'L1_MU8F_cTAU30M',
         # ART-28443  test eEMX{} + {{3,4jJY{}}} L1 seeds
         'L1_eEM22M_3jJ40p0ETA25',
         'L1_eEM22M_4jJ30p0ETA25',
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Menu/Menu_Physics_pp_run3_v1.py b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Menu/Menu_Physics_pp_run3_v1.py
index e1d7936b4a0437de98954b5863d8e558af6581b8..93e4d97cbb280a749b66516c9c378989b7e4a9fb 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Menu/Menu_Physics_pp_run3_v1.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Menu/Menu_Physics_pp_run3_v1.py
@@ -81,7 +81,6 @@ def defineMenu():
         'L1_MU8F_cTAU20M_3jJ30',
         'L1_eEM18M_2eTAU20M_jJ55_3jJ30',
         'L1_MU8F_eTAU30M',
-        'L1_MU8F_cTAU30M',
         'L1_eEM18M_2cTAU20M_4jJ30',
         
         # combined tau - xe