diff --git a/LArCalorimeter/LArOnlDbPrep/CMakeLists.txt b/LArCalorimeter/LArOnlDbPrep/CMakeLists.txt
index c35e7186ad9f2cb8a1ff774586a8a8e17c7939a4..cb2a31365bc8c92f5346d126a72fe82d7287f565 100644
--- a/LArCalorimeter/LArOnlDbPrep/CMakeLists.txt
+++ b/LArCalorimeter/LArOnlDbPrep/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
 
 # Declare the package name:
 atlas_subdir( LArOnlDbPrep )
@@ -14,7 +14,3 @@ atlas_add_component( LArOnlDbPrep
                      INCLUDE_DIRS ${COOL_INCLUDE_DIRS} ${CORAL_INCLUDE_DIRS}
                      LINK_LIBRARIES ${COOL_LIBRARIES} ${CORAL_LIBRARIES} CaloIdentifier CaloTriggerToolLib AthenaBaseComps GaudiKernel LArRecConditions LArCablingLib CaloDetDescrLib StoreGateLib AthenaPoolUtilities LArCOOLConditions LArIdentifier CaloInterfaceLib )
 
-# Install files from the package:
-atlas_install_joboptions( share/*.py )
-atlas_install_scripts( share/*.sh )
-
diff --git a/LArCalorimeter/LArOnlDbPrep/share/LArDSPGeoWeightsFill.py b/LArCalorimeter/LArOnlDbPrep/share/LArDSPGeoWeightsFill.py
deleted file mode 100644
index ea530d2e1ee0068ac566c0c129077794158d7683..0000000000000000000000000000000000000000
--- a/LArCalorimeter/LArOnlDbPrep/share/LArDSPGeoWeightsFill.py
+++ /dev/null
@@ -1,79 +0,0 @@
-fill=True
-
-import AthenaCommon.AtlasUnixGeneratorJob
-## get a handle to the default top-level algorithm sequence
-from AthenaCommon.AlgSequence import AlgSequence
-topSequence = AlgSequence()
-
-from AthenaCommon.AppMgr import ToolSvc
-
-from AthenaCommon.GlobalFlags import globalflags
-globalflags.DataSource.set_Value_and_Lock('data')
-globalflags.InputFormat.set_Value_and_Lock('bytestream')
-#globalflags.DetDescrVersion.set_Value_and_Lock('ATLAS-GEO-18-01-01')
-globalflags.DetDescrVersion.set_Value_and_Lock('ATLAS-GEO-20-00-01')
-globalflags.DetGeo.set_Value_and_Lock('commis')
-globalflags.Luminosity.set_Value_and_Lock('zero')
-
-from AthenaCommon.DetFlags import DetFlags
-DetFlags.Calo_setOn()
-DetFlags.ID_setOff()
-DetFlags.Muon_setOff()
-DetFlags.Truth_setOff()
-DetFlags.LVL1_setOff()
-DetFlags.digitize.all_setOff()
-
-#Set up GeoModel (not really needed but crashes without)
-from AtlasGeoModel import SetGeometryVersion
-from AtlasGeoModel import GeoModelInit
-
-svcMgr.IOVDbSvc.GlobalTag = "COMCOND-ES1PA-006-02"
-
-#Get identifier mapping (needed by LArConditionsContainer)
-include("LArConditionsCommon/LArIdMap_comm_jobOptions.py")
-include( "CaloConditions/CaloConditions_jobOptions.py" )
-
-# for LArBadChannelTool, instead of conddb.AddFolder below
-#include("LArConditionsCommon/LArConditionsCommon_comm_jobOptions.py") 
-
-theApp.EvtMax = 1
-#conddb.setGlobalTag("COMCOND-006-01") #For id mapping
-
-folder="/LAR/Configuration/DSPGeoWeightsFlat"
-
-fileName="DSPGeoWeigths"
-
-from CaloTools.CaloNoiseFlags import jobproperties
-jobproperties.CaloNoiseFlags.FixedLuminosity.set_Value_and_Lock(1.45*30/8)
-
-from LArOnlDbPrep.LArOnlDbPrepConf import LArGeoWeightsFill
-theLArGeoWeightsFill=LArGeoWeightsFill()
-theLArGeoWeightsFill.OutFile="dumpFile.txt"
-theLArGeoWeightsFill.Key=folder
-
-theLArGeoWeightsFill.Fill=True
-theLArGeoWeightsFill.Dump=True
-
-topSequence+=theLArGeoWeightsFill
-
-
-OutputList=[ "AthenaAttributeList#"+folder ]
-OutputTagList=[]
-
-
-from RegistrationServices.OutputConditionsAlg import OutputConditionsAlg
-theOutputConditionsAlg=OutputConditionsAlg("OutputConditionsAlg","LArGeoWeightsTemplates.pool.root",
-                                           OutputList,OutputTagList,True)
-    
-from RegistrationServices.RegistrationServicesConf import IOVRegistrationSvc
-svcMgr += IOVRegistrationSvc()
-svcMgr.IOVRegistrationSvc.RecreateFolders = False
-svcMgr.IOVRegistrationSvc.SVFolder=True
-svcMgr.IOVRegistrationSvc.OverrideNames += ["costheta","sinthetacosphi","sinthetasinphi","offlineTTid"]
-svcMgr.IOVRegistrationSvc.OverrideTypes += ["Blob16M","Blob16M","Blob16M","Blob16M"]
-svcMgr.IOVRegistrationSvc.OutputLevel=VERBOSE
-    
-svcMgr.IOVDbSvc.dbConnection  = "sqlite://;schema=DSPGeoWeights.db;dbname=CONDBR2"
-
-svcMgr.DetectorStore.Dump=True
-svcMgr.EventSelector.RunNumber=0xFFFFFF
diff --git a/LArCalorimeter/LArOnlDbPrep/share/LArDSPThresholdFillAlg.py b/LArCalorimeter/LArOnlDbPrep/share/LArDSPThresholdFillAlg.py
deleted file mode 100644
index 5767c68f274a42637c0ee11e3980852425041ce2..0000000000000000000000000000000000000000
--- a/LArCalorimeter/LArOnlDbPrep/share/LArDSPThresholdFillAlg.py
+++ /dev/null
@@ -1,165 +0,0 @@
-fill=True
-
-if 'IWscale' not in dir():
-   IWscale=0.
-
-import AthenaCommon.AtlasUnixGeneratorJob
-## get a handle to the default top-level algorithm sequence
-from AthenaCommon.AlgSequence import AlgSequence
-topSequence = AlgSequence()
-
-from AthenaCommon.AppMgr import ToolSvc
-
-from AthenaCommon.GlobalFlags import globalflags
-globalflags.DataSource.set_Value_and_Lock('data')
-globalflags.InputFormat.set_Value_and_Lock('bytestream')
-globalflags.DetDescrVersion.set_Value_and_Lock('ATLAS-R2-2015-04-00-00')
-globalflags.DetGeo.set_Value_and_Lock('commis')
-globalflags.Luminosity.set_Value_and_Lock('zero')
-globalflags.DatabaseInstance.set_Value_and_Lock('CONDBR2')
-
-from AthenaCommon.DetFlags import DetFlags
-DetFlags.Calo_setOn()
-DetFlags.ID_setOff()
-DetFlags.Muon_setOff()
-DetFlags.Truth_setOff()
-DetFlags.LVL1_setOff()
-DetFlags.digitize.all_setOff()
-
-#Set up GeoModel (not really needed but crashes without)
-from AtlasGeoModel import SetGeometryVersion
-from AtlasGeoModel import GeoModelInit
-
-svcMgr.IOVDbSvc.GlobalTag = "CONDBR2-BLKPA-2023-02"
-
-#Get identifier mapping (needed by LArConditionsContainer)
-include("LArConditionsCommon/LArIdMap_comm_jobOptions.py")
-
-# for LArBadChannelTool, instead of conddb.AddFolder below
-include("LArConditionsCommon/LArConditionsCommon_comm_jobOptions.py") 
-
-theApp.EvtMax = 1
-
-folder="/LAR/Configuration/DSPThresholdFlat/Templates"
-
-fileName=ModeType+tag
-
-setName="-".join(tag.split("-")[1:])
-
-from CaloTools.CaloNoiseFlags import jobproperties
-# in case of fixed lumi:
-#jobproperties.CaloNoiseFlags.FixedLuminosity.set_Value_and_Lock(1.45*30/8)
-# otherwise reading from folder:
-jobproperties.CaloNoiseFlags.FixedLuminosity.set_Value_and_Lock(-1.)
-
-# Turn this off before configuring CaloNoiseCondAlg.
-from CaloRec.CaloCellFlags import jobproperties
-jobproperties.CaloCellFlags.doLArHVCorr = False
-
-from CaloTools.CaloNoiseCondAlg import CaloNoiseCondAlg
-CaloNoiseCondAlg ('totalNoise')
-CaloNoiseCondAlg ('electronicNoise')
-
-conddb.addOverride("/CALO/Ofl/Noise/PileUpNoiseLumi","CALOOflNoisePileUpNoiseLumi-RUN2-UPD1-00")
-if 'pileupsqlite' in dir():
-   conddb.addMarkup("/CALO/Ofl/Noise/PileUpNoiseLumi","<db>sqlite://;schema="+pileupsqlite+";dbname=CONDBR2</db>")
-if 'noisesqlite' in dir():
-   if 'noisetag' in dir():
-      conddb.addMarkup("/LAR/NoiseOfl/CellNoise","<db>sqlite://;schema="+noisesqlite+";dbname=CONDBR2</db><tag>"+noisetag+"</tag>")
-   else:   
-      conddb.addMarkup("/LAR/NoiseOfl/CellNoise","<db>sqlite://;schema="+noisesqlite+";dbname=CONDBR2</db>")
-else:
-   if 'noisetag' in dir():
-      conddb.addOverride("/LAR/NoiseOfl/CellNoise",""+noisetag+"")
-
-if 'RunSince' not in dir():
-   RunSince=0
-
-from LArOnlDbPrep.LArOnlDbPrepConf import LArDSPThresholdFillInline
-theLArDSPThresholdFillAlg=LArDSPThresholdFillInline()
-theLArDSPThresholdFillAlg.OutputLevel=INFO
-theLArDSPThresholdFillAlg.ScaleIW=IWscale
-theLArDSPThresholdFillAlg.Key=folder
-theLArDSPThresholdFillAlg.OutFile=fileName+".txt"
-theLArDSPThresholdFillAlg.mode=ModeType
-theLArDSPThresholdFillAlg.MaskBadChannels=True
-theLArDSPThresholdFillAlg.ProblemsToMask=[
-    "highNoiseHG","highNoiseMG","highNoiseLG"
-    ]
-theLArDSPThresholdFillAlg.NameOfSet=setName
-# Set masked channel thresholds lower for diagnostics
-#theLArDSPThresholdFillAlg.MaskedtQThreshold=0.
-#theLArDSPThresholdFillAlg.MaskedsamplesThreshold=0.
-
-##if ModeType=="fixed":
-##    theLArDSPThresholdFillAlg.tQThreshold=10000
-##    theLArDSPThresholdFillAlg.samplesThreshold=10000
-if ModeType=="fixed":
-    theLArDSPThresholdFillAlg.tQThreshold=Qtval
-    theLArDSPThresholdFillAlg.samplesThreshold=Sampval
-if ModeType=="group":
-    theLArDSPThresholdFillAlg.ThresholdsPerCellGroup=["250,1000",
-                                                      "[HEC,FCAL/*/*/*/*/*] 500, 1000"]
-if ModeType=="noise":
-    theLArDSPThresholdFillAlg.sigmaNoiseSamples=Sampval
-    theLArDSPThresholdFillAlg.sigmaNoiseQt=Qtval
-    theLArDSPThresholdFillAlg.usePileupNoiseSamples=Samppileup
-    theLArDSPThresholdFillAlg.usePileupNoiseQt=Qtpileup
-
-
-if fill:
-    theLArDSPThresholdFillAlg.Fill=True
-    theLArDSPThresholdFillAlg.Dump=True
-else:
-    theLArDSPThresholdFillAlg.Fill=False
-    theLArDSPThresholdFillAlg.Dump=True
-
-topSequence+=theLArDSPThresholdFillAlg
-
-
-MessageSvc = svcMgr.MessageSvc
-MessageSvc.OutputLevel = WARNING
-
-if fill:
-    OutputList=[ "AthenaAttributeList#"+folder ]
-    OutputTagList=[tag]
-
-    WriteIOV=True
-    from RegistrationServices.OutputConditionsAlg import OutputConditionsAlg
-##    theOutputConditionsAlg=OutputConditionsAlg("OutputConditionsAlg","LArDSPthresholds_"+fileName+".pool.root",
-    theOutputConditionsAlg=OutputConditionsAlg("OutputConditionsAlg","LArDSPthresholdTemplates.pool.root",
-                                               OutputList,OutputTagList,WriteIOV)
-    
-    theOutputConditionsAlg.Run1=RunSince
-
-
-    from RegistrationServices.RegistrationServicesConf import IOVRegistrationSvc
-    svcMgr += IOVRegistrationSvc()
-    svcMgr.IOVRegistrationSvc.OutputLevel = WARNING
-    ##svcMgr.IOVRegistrationSvc.RecreateFolders = True
-    svcMgr.IOVRegistrationSvc.RecreateFolders = False
-    svcMgr.IOVRegistrationSvc.OverrideNames += ["tQThr","samplesThr","trigSumThr",]
-    svcMgr.IOVRegistrationSvc.OverrideTypes += ["Blob16M","Blob16M","Blob16M",]
-
-
-else:
-    conddb.addFolder("",folder+"<tag>"+tag+"</tag>")
-
-# For LArBadChannelTool
-conddb.addFolder(LArDB,"/LAR/BadChannels/BadChannels")
-conddb.addFolder(LArDB,"/LAR/BadChannels/MissingFEBs")
-
-svcMgr.PoolSvc.FileOpen = "update"
-svcMgr.PoolSvc.WriteCatalog="xmlcatalog_file:PoolFileCatalog_LARConfigurationDSPThresholdTemplates.xml"
-##svcMgr.PoolSvc.WriteCatalog="xmlcatalog_file:PoolFileCatalog_"+fileName+".xml"
-print(svcMgr.PoolSvc)
-
-#svcMgr.IOVDbSvc.dbConnection  = "sqlite://;schema=test.db;dbname=COMP200"
-#svcMgr.IOVDbSvc.dbConnection  = "sqlite://;schema="+fileName+".db;dbname=COMP200"
-svcMgr.IOVDbSvc.dbConnection  = "sqlite://;schema=DSPThresholdTemplates.db;dbname=CONDBR2"
-
-svcMgr.DetectorStore.Dump=True
-if 'RunNumber' in dir():
-   svcMgr.EventSelector.RunNumber=RunNumber
-else:
-   svcMgr.EventSelector.RunNumber=0xFFFFFF
diff --git a/LArCalorimeter/LArOnlDbPrep/share/LArDSPThresholdTopOptions.py b/LArCalorimeter/LArOnlDbPrep/share/LArDSPThresholdTopOptions.py
deleted file mode 100644
index 7101b5e2b468e74622991270e817f61680dcf0dd..0000000000000000000000000000000000000000
--- a/LArCalorimeter/LArOnlDbPrep/share/LArDSPThresholdTopOptions.py
+++ /dev/null
@@ -1,73 +0,0 @@
-
-tagList = ['LARConfigurationDSPThresholdFlatTemplates-Qt0-samp0',
-           'LARConfigurationDSPThresholdFlatTemplates-Qt250-samp0',
-           'LARConfigurationDSPThresholdFlatTemplates-Qt250-samp1000',
-           'LARConfigurationDSPThresholdFlatTemplates-Qt250HECFCAL500-samp1000',
-           'LARConfigurationDSPThresholdFlatTemplates-Qt10000-samp10000',
-           'LARConfigurationDSPThresholdFlatTemplates-Qt0sigma-samp50sigma',
-           'LARConfigurationDSPThresholdFlatTemplates-Qt50sigma-samp0sigma',
-           'LARConfigurationDSPThresholdFlatTemplates-Qt0.5sigma-samp0.5sigma',
-           'LARConfigurationDSPThresholdFlatTemplates-Qt1sigma-samp1sigma',
-##           'LARConfigurationDSPThresholdFlatTemplates-Qt1sigma-samp10sigma',
-           'LARConfigurationDSPThresholdFlatTemplates-Qt1.5sigma-samp1.5sigma',
-           'LARConfigurationDSPThresholdFlatTemplates-Qt2sigma-samp2sigma',
-           'LARConfigurationDSPThresholdFlatTemplates-Qt3sigma-samp1sigma',
-##           'LARConfigurationDSPThresholdFlatTemplates-Qt3sigma-samp1.5sigma',
-           'LARConfigurationDSPThresholdFlatTemplates-Qt3sigma-samp2sigma',
-           'LARConfigurationDSPThresholdFlatTemplates-Qt3sigma-samp3sigma',
-           'LARConfigurationDSPThresholdFlatTemplates-Qt3sigma-samp5sigma',
-           'LARConfigurationDSPThresholdFlatTemplates-Qt5sigma-samp5sigma',
-           'LARConfigurationDSPThresholdFlatTemplates-Qt1sigmaPileup-samp1sigmaPileup',
-           'LARConfigurationDSPThresholdFlatTemplates-Qt2sigmaPileup-samp2sigmaPileup',
-           'LARConfigurationDSPThresholdFlatTemplates-Qt2sigmaPileup-samp3sigmaPileup',
-           'LARConfigurationDSPThresholdFlatTemplates-Qt3sigmaPileup-samp4sigmaPileup',
-           'LARConfigurationDSPThresholdFlatTemplates-Qt3sigmaPileup-samp3sigmaPileup',
-           'LARConfigurationDSPThresholdFlatTemplates-Qt4sigmaPileup-samp4sigmaPileup',
-           'LARConfigurationDSPThresholdFlatTemplates-Qt5sigmaPileup-samp5sigmaPileup'
-           ]
-
-tag=tagList[tagNum]
-
-print(tag)
-
-Qtstr=tag.split("Qt")[1]
-Sampstr=tag.split("samp")[1]
-
-#print(Qtstr,Sampstr)
-
-if "sigma" in tag:
-    ModeType = "noise"
-
-    Qtpileup = False
-    Samppileup = False
-        
-    if len(Qtstr.split("sigma")) > 1:
-        print(Qtstr.split("sigma")[1])
-        if Qtstr.split("sigma")[1].find("Pileup") > -1:
-            Qtpileup = True
-
-    if len(Sampstr.split("sigma")) > 1:
-        print(Sampstr.split("sigma")[1])
-        if Sampstr.split("sigma")[1].find("Pileup") > -1:
-            Samppileup = True
-
-    print("Setting pileup noise to (Qt,Samp) = ",Qtpileup,Samppileup)
-
-    Qtstr=Qtstr.split("sigma")[0]
-    Sampstr=Sampstr.split("sigma")[0]
-    
-elif "HECFCAL" in tag:
-    ModeType = "group"
-    Qtstr="0" ## done manually
-    Sampstr="0" ## done manually
-
-else:
-    ModeType = "fixed"
-    Qtstr=Qtstr.split("-")[0]
-
-Qtval=float(Qtstr)
-Sampval=float(Sampstr)
-print(Qtval,Sampval)
-
-include("LArOnlDbPrep/LArDSPThresholdFillAlg.py")
-    
diff --git a/LArCalorimeter/LArOnlDbPrep/share/LArDSPThresholdTopOptions_mu1.py b/LArCalorimeter/LArOnlDbPrep/share/LArDSPThresholdTopOptions_mu1.py
deleted file mode 100644
index 64048dab1e4aebf6f43daa2ff5abd4044f36f765..0000000000000000000000000000000000000000
--- a/LArCalorimeter/LArOnlDbPrep/share/LArDSPThresholdTopOptions_mu1.py
+++ /dev/null
@@ -1,56 +0,0 @@
-
-tagList = [
-           'LARConfigurationDSPThresholdFlatTemplates-Qt1sigmaSmallPileup-samp1sigmaSmallPileup',
-           'LARConfigurationDSPThresholdFlatTemplates-Qt2sigmaSmallPileup-samp2sigmaSmallPileup',
-           'LARConfigurationDSPThresholdFlatTemplates-Qt2sigmaSmallPileup-samp3sigmaSmallPileup',
-           'LARConfigurationDSPThresholdFlatTemplates-Qt3sigmaSmallPileup-samp4sigmaSmallPileup',
-           'LARConfigurationDSPThresholdFlatTemplates-Qt3sigmaSmallPileup-samp3sigmaSmallPileup',
-           'LARConfigurationDSPThresholdFlatTemplates-Qt4sigmaSmallPileup-samp4sigmaSmallPileup',
-           'LARConfigurationDSPThresholdFlatTemplates-Qt5sigmaSmallPileup-samp5sigmaSmallPileup'
-           ]
-
-tag=tagList[tagNum]
-
-print tag
-
-Qtstr=tag.split("Qt")[1]
-Sampstr=tag.split("samp")[1]
-
-#print Qtstr,Sampstr
-
-if "sigma" in tag:
-    ModeType = "noise"
-
-    Qtpileup = False
-    Samppileup = False
-        
-    if len(Qtstr.split("sigma")) > 1:
-        print Qtstr.split("sigma")[1]
-        if Qtstr.split("sigma")[1].find("Pileup") > -1:
-            Qtpileup = True
-
-    if len(Sampstr.split("sigma")) > 1:
-        print Sampstr.split("sigma")[1]
-        if Sampstr.split("sigma")[1].find("Pileup") > -1:
-            Samppileup = True
-
-    print "Setting pileup noise to (Qt,Samp) = ",Qtpileup,Samppileup
-
-    Qtstr=Qtstr.split("sigma")[0]
-    Sampstr=Sampstr.split("sigma")[0]
-    
-elif "HECFCAL" in tag:
-    ModeType = "group"
-    Qtstr="0" ## done manually
-    Sampstr="0" ## done manually
-
-else:
-    ModeType = "fixed"
-    Qtstr=Qtstr.split("-")[0]
-
-Qtval=float(Qtstr)
-Sampval=float(Sampstr)
-print Qtval,Sampval
-
-include("LArOnlDbPrep/LArDSPThresholdFillAlg.py")
-    
diff --git a/LArCalorimeter/LArOnlDbPrep/share/LArDSPThresholdTopOptions_mu50.py b/LArCalorimeter/LArOnlDbPrep/share/LArDSPThresholdTopOptions_mu50.py
deleted file mode 100644
index 4c61e38bab3cf02d09419096fd9b06e826db0ba9..0000000000000000000000000000000000000000
--- a/LArCalorimeter/LArOnlDbPrep/share/LArDSPThresholdTopOptions_mu50.py
+++ /dev/null
@@ -1,56 +0,0 @@
-
-tagList = [
-           'LARConfigurationDSPThresholdFlatTemplates-Qt1sigmaMu50Pileup-samp1sigmaMu50Pileup',
-           'LARConfigurationDSPThresholdFlatTemplates-Qt2sigmaMu50Pileup-samp2sigmaMu50Pileup',
-           'LARConfigurationDSPThresholdFlatTemplates-Qt2sigmaMu50Pileup-samp3sigmaMu50Pileup',
-           'LARConfigurationDSPThresholdFlatTemplates-Qt3sigmaMu50Pileup-samp4sigmaMu50Pileup',
-           'LARConfigurationDSPThresholdFlatTemplates-Qt3sigmaMu50Pileup-samp3sigmaMu50Pileup',
-           'LARConfigurationDSPThresholdFlatTemplates-Qt4sigmaMu50Pileup-samp4sigmaMu50Pileup',
-           'LARConfigurationDSPThresholdFlatTemplates-Qt5sigmaMu50Pileup-samp5sigmaMu50Pileup'
-           ]
-
-tag=tagList[tagNum]
-
-print tag
-
-Qtstr=tag.split("Qt")[1]
-Sampstr=tag.split("samp")[1]
-
-#print Qtstr,Sampstr
-
-if "sigma" in tag:
-    ModeType = "noise"
-
-    Qtpileup = False
-    Samppileup = False
-        
-    if len(Qtstr.split("sigma")) > 1:
-        print Qtstr.split("sigma")[1]
-        if Qtstr.split("sigma")[1].find("Pileup") > -1:
-            Qtpileup = True
-
-    if len(Sampstr.split("sigma")) > 1:
-        print Sampstr.split("sigma")[1]
-        if Sampstr.split("sigma")[1].find("Pileup") > -1:
-            Samppileup = True
-
-    print "Setting pileup noise to (Qt,Samp) = ",Qtpileup,Samppileup
-
-    Qtstr=Qtstr.split("sigma")[0]
-    Sampstr=Sampstr.split("sigma")[0]
-    
-elif "HECFCAL" in tag:
-    ModeType = "group"
-    Qtstr="0" ## done manually
-    Sampstr="0" ## done manually
-
-else:
-    ModeType = "fixed"
-    Qtstr=Qtstr.split("-")[0]
-
-Qtval=float(Qtstr)
-Sampval=float(Sampstr)
-print Qtval,Sampval
-
-include("LArOnlDbPrep/LArDSPThresholdFillAlg.py")
-    
diff --git a/LArCalorimeter/LArOnlDbPrep/share/makeThresholdSet.sh b/LArCalorimeter/LArOnlDbPrep/share/makeThresholdSet.sh
deleted file mode 100755
index 1cef0c7c04438dceadceccd0cec20a6548d8ee2a..0000000000000000000000000000000000000000
--- a/LArCalorimeter/LArOnlDbPrep/share/makeThresholdSet.sh
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/bin/zsh
-
-if [[ $# > 0  ]]
-then
- Run=$1
-else 
- Run=266280
-fi 
-if [[ $# > 1 ]]
-then
- Noise=$2
-else 
- Noise=""
-fi 
-if [[ $# > 2 ]]
-then
- Pileup=$3
-else 
- Pileup=""
-fi 
-fulltag=`getCurrentFolderTag.py "COOLOFL_LAR/CONDBR2"  /LAR/NoiseOfl/CellNoise | tail -1`
-#foreach i in `seq 0 11`
-#foreach i in `seq 0 22`
-foreach i in `seq 5 22`
-#foreach i in `seq 16 22`
-    cmdline="RunNumber=$Run;RunSince=$Run;tagNum=$i;noisetag=\"$fulltag\";"
-    if [[ $Noise != "" ]]
-    then
-       cmdline+="noisesqlite=\"$Noise\";" 
-    fi
-    if [[ $Pileup != "" ]]
-    then
-       cmdline+="pileupsqlite=\"$Pileup\";"
-    fi   
-    athena.py -c "$cmdline" LArOnlDbPrep/LArDSPThresholdTopOptions.py
-end
-
-#foreach i in `seq 0 16`
-#    tagNum=$i; python LArDSPThresholdTopOptions.py
-#end
-
-##mv *.db *.txt *.xml *.root /afs/cern.ch/user/s/smajewsk/public/LAr/.
-
-##rm *.xml.BAK
diff --git a/LArCalorimeter/LArOnlDbPrep/share/makeThresholdSet_mu1.sh b/LArCalorimeter/LArOnlDbPrep/share/makeThresholdSet_mu1.sh
deleted file mode 100755
index bdad87cc4d271a82788742e4c38d70301b1a35b2..0000000000000000000000000000000000000000
--- a/LArCalorimeter/LArOnlDbPrep/share/makeThresholdSet_mu1.sh
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/bin/zsh
-
-if [[ $# > 0  ]]
-then
- Run=$1
-else 
- Run=266280
-fi 
-if [[ $# > 1 ]]
-then
- Pileup=$2
-else 
- Pileup=""
-fi 
-if [[ $# > 2 ]]
-then
- Noise=$3
-else 
- Noise=""
-fi 
-fulltag=`getCurrentFolderTag.py "COOLOFL_LAR/CONDBR2"  /LAR/NoiseOfl/CellNoise | tail -1`
-#foreach i in `seq 0 11`
-#foreach i in `seq 0 22`
-foreach i in `seq 0 6`
-#foreach i in `seq 16 22`
-    if [[ $Noise == "" ]]
-    then
-       athena.py -s -c "RunNumber=$Run;tagNum=$i;pileupsqlite=\"$Pileup\";noisetag=\"$fulltag\";RunSince=$Run" LArOnlDbPrep/LArDSPThresholdTopOptions_mu1.py
-    else   
-       athena.py -s -c "RunNumber=$Run;tagNum=$i;pileupsqlite=\"$Pileup\";noisesqlite=\"$Noise\";noisetag=\"$fulltag\";RunSince=$Run" LArOnlDbPrep/LArDSPThresholdTopOptions_mu1.py
-    fi   
-end
-
diff --git a/LArCalorimeter/LArOnlDbPrep/share/makeThresholdSet_mu50.sh b/LArCalorimeter/LArOnlDbPrep/share/makeThresholdSet_mu50.sh
deleted file mode 100755
index 6e6fd60c757248e0c20d9ead6a66e2e3762e9d73..0000000000000000000000000000000000000000
--- a/LArCalorimeter/LArOnlDbPrep/share/makeThresholdSet_mu50.sh
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/bin/zsh
-
-if [[ $# > 0  ]]
-then
- Run=$1
-else 
- Run=266280
-fi 
-if [[ $# > 1 ]]
-then
- Pileup=$2
-else 
- Pileup=""
-fi 
-if [[ $# > 2 ]]
-then
- Noise=$3
-else 
- Noise=""
-fi 
-fulltag=`getCurrentFolderTag.py "COOLOFL_LAR/CONDBR2"  /LAR/NoiseOfl/CellNoise | tail -1`
-#foreach i in `seq 0 11`
-#foreach i in `seq 0 22`
-foreach i in `seq 0 6`
-#foreach i in `seq 16 22`
-    if [[ $Noise == "" ]]
-    then
-       athena.py -s -c "RunNumber=$Run;tagNum=$i;pileupsqlite=\"$Pileup\";noisetag=\"$fulltag\";RunSince=$Run" LArOnlDbPrep/LArDSPThresholdTopOptions_mu50.py
-    else   
-       athena.py -s -c "RunNumber=$Run;tagNum=$i;pileupsqlite=\"$Pileup\";noisesqlite=\"$Noise\";noisetag=\"$fulltag\";RunSince=$Run" LArOnlDbPrep/LArDSPThresholdTopOptions_mu50.py
-    fi   
-end
-
diff --git a/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref b/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref
index 7d3543168b2aff429129d7cb41b95e43e3f6ffb9..23af83baad49068c51eb5132576c36b93c554d40 100644
--- a/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref
+++ b/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref
@@ -5551,10 +5551,10 @@ HLT_e26_lhtight_ivarloose_tau40_mediumRNN_tracktwoMVA_probe_L1cTAU35M_03dRAB_L1e
     4: 3
     5: 3
     6: 1
-    7: 2
-    8: 2
-    9: 2
-    10: 2
+    7: 1
+    8: 1
+    9: 1
+    10: 1
 HLT_e26_lhtight_ivarloose_tau60_mediumRNN_tracktwoLLP_probe_L1TAU40_03dRAB_L1eEM26M:
   eventCount: 0
   stepCounts:
@@ -7081,10 +7081,10 @@ HLT_e28_lhtight_ivarloose_tau40_mediumRNN_tracktwoMVA_probe_L1cTAU35M_03dRAB_L1e
     4: 2
     5: 2
     6: 1
-    7: 2
-    8: 2
-    9: 2
-    10: 2
+    7: 1
+    8: 1
+    9: 1
+    10: 1
 HLT_e28_lhtight_ivarloose_tau60_mediumRNN_tracktwoLLP_probe_L1TAU40_03dRAB_L1eEM28M:
   eventCount: 0
   stepCounts:
@@ -22085,8 +22085,8 @@ HLT_mu14_ivarloose_tau25_mediumRNN_tracktwoMVA_03dRAB_L1MU8F_cTAU20M_3jJ30:
     2: 7
     3: 7
   stepFeatures:
-    0: 24
-    1: 23
+    0: 23
+    1: 22
     2: 19
     3: 19
     4: 5
@@ -22106,16 +22106,16 @@ HLT_mu14_ivarloose_tau35_mediumRNN_tracktwoMVA_03dRAB_L1MU8F_TAU20IM:
 HLT_mu14_ivarloose_tau35_mediumRNN_tracktwoMVA_03dRAB_L1MU8F_cTAU30M:
   eventCount: 0
   stepCounts:
-    0: 8
-    1: 7
-    2: 7
-    3: 7
+    0: 7
+    1: 6
+    2: 6
+    3: 6
   stepFeatures:
-    0: 21
-    1: 20
-    2: 17
-    3: 17
-    4: 5
+    0: 17
+    1: 16
+    2: 14
+    3: 14
+    4: 4
 HLT_mu14_mu14_idperf_50invmAB130_L12MU8F:
   eventCount: 0
 HLT_mu14_mu14_idtp_idZmumu_L12MU8F:
@@ -24021,47 +24021,47 @@ HLT_mu24_ivarmedium_tau35_mediumRNN_tracktwoMVA_probe_03dRAB_L1MU18VFCH:
 HLT_mu24_ivarmedium_tau35_mediumRNN_tracktwoMVA_probe_L1cTAU30M_03dRAB_L1MU14FCH:
   eventCount: 0
   stepCounts:
-    0: 5
-    1: 4
-    2: 4
-    3: 4
-    4: 4
-    5: 4
-    6: 4
-    7: 4
-    8: 4
+    0: 4
+    1: 3
+    2: 3
+    3: 3
+    4: 3
+    5: 3
+    6: 3
+    7: 3
+    8: 3
   stepFeatures:
     0: 7
-    1: 4
-    2: 4
-    3: 4
-    4: 4
-    5: 4
-    6: 4
-    7: 4
-    8: 4
+    1: 3
+    2: 3
+    3: 3
+    4: 3
+    5: 3
+    6: 3
+    7: 3
+    8: 3
 HLT_mu24_ivarmedium_tau35_mediumRNN_tracktwoMVA_probe_L1cTAU30M_03dRAB_L1MU18VFCH:
   eventCount: 0
   stepCounts:
-    0: 5
-    1: 4
-    2: 4
-    3: 4
-    4: 4
-    5: 4
-    6: 4
-    7: 4
-    8: 4
+    0: 4
+    1: 3
+    2: 3
+    3: 3
+    4: 3
+    5: 3
+    6: 3
+    7: 3
+    8: 3
   stepFeatures:
     0: 7
-    1: 4
-    2: 4
-    3: 4
-    4: 4
-    5: 4
-    6: 4
-    7: 4
-    8: 4
+    1: 3
+    2: 3
+    3: 3
+    4: 3
+    5: 3
+    6: 3
+    7: 3
+    8: 3
 HLT_mu24_ivarmedium_tau40_mediumRNN_tracktwoMVA_probe_03dRAB_L1MU14FCH:
   eventCount: 0
   stepCounts:
@@ -24109,47 +24109,47 @@ HLT_mu24_ivarmedium_tau40_mediumRNN_tracktwoMVA_probe_03dRAB_L1MU18VFCH:
 HLT_mu24_ivarmedium_tau40_mediumRNN_tracktwoMVA_probe_L1cTAU35M_03dRAB_L1MU14FCH:
   eventCount: 0
   stepCounts:
-    0: 5
-    1: 4
-    2: 4
-    3: 4
-    4: 4
-    5: 4
-    6: 4
-    7: 4
-    8: 4
+    0: 1
+    1: 1
+    2: 1
+    3: 1
+    4: 1
+    5: 1
+    6: 1
+    7: 1
+    8: 1
   stepFeatures:
     0: 7
-    1: 4
-    2: 4
-    3: 4
-    4: 4
-    5: 4
-    6: 4
-    7: 4
-    8: 4
+    1: 1
+    2: 1
+    3: 1
+    4: 1
+    5: 1
+    6: 1
+    7: 1
+    8: 1
 HLT_mu24_ivarmedium_tau40_mediumRNN_tracktwoMVA_probe_L1cTAU35M_03dRAB_L1MU18VFCH:
   eventCount: 0
   stepCounts:
-    0: 5
-    1: 4
-    2: 4
-    3: 4
-    4: 4
-    5: 4
-    6: 4
-    7: 4
-    8: 4
+    0: 1
+    1: 1
+    2: 1
+    3: 1
+    4: 1
+    5: 1
+    6: 1
+    7: 1
+    8: 1
   stepFeatures:
     0: 7
-    1: 4
-    2: 4
-    3: 4
-    4: 4
-    5: 4
-    6: 4
-    7: 4
-    8: 4
+    1: 1
+    2: 1
+    3: 1
+    4: 1
+    5: 1
+    6: 1
+    7: 1
+    8: 1
 HLT_mu24_ivarmedium_tau60_mediumRNN_tracktwoLLP_probe_03dRAB_L1MU14FCH:
   eventCount: 0
   stepCounts:
@@ -26149,47 +26149,47 @@ HLT_mu26_ivarmedium_tau30_mediumRNN_tracktwoMVA_probe_L1cTAU20M_03dRAB_L1MU18VFC
 HLT_mu26_ivarmedium_tau30_mediumRNN_tracktwoMVA_probe_L1cTAU30M_03dRAB_L1MU14FCH:
   eventCount: 0
   stepCounts:
-    0: 5
-    1: 4
-    2: 4
-    3: 4
-    4: 4
-    5: 4
-    6: 4
-    7: 4
-    8: 4
+    0: 4
+    1: 3
+    2: 3
+    3: 3
+    4: 3
+    5: 3
+    6: 3
+    7: 3
+    8: 3
   stepFeatures:
     0: 7
-    1: 4
-    2: 4
-    3: 4
-    4: 4
-    5: 4
-    6: 4
-    7: 4
-    8: 4
+    1: 3
+    2: 3
+    3: 3
+    4: 3
+    5: 3
+    6: 3
+    7: 3
+    8: 3
 HLT_mu26_ivarmedium_tau30_mediumRNN_tracktwoMVA_probe_L1cTAU30M_03dRAB_L1MU18VFCH:
   eventCount: 0
   stepCounts:
-    0: 5
-    1: 4
-    2: 4
-    3: 4
-    4: 4
-    5: 4
-    6: 4
-    7: 4
-    8: 4
+    0: 4
+    1: 3
+    2: 3
+    3: 3
+    4: 3
+    5: 3
+    6: 3
+    7: 3
+    8: 3
   stepFeatures:
     0: 7
-    1: 4
-    2: 4
-    3: 4
-    4: 4
-    5: 4
-    6: 4
-    7: 4
-    8: 4
+    1: 3
+    2: 3
+    3: 3
+    4: 3
+    5: 3
+    6: 3
+    7: 3
+    8: 3
 HLT_mu26_ivarmedium_tau35_mediumRNN_tracktwoMVA_probe_03dRAB_L1MU14FCH:
   eventCount: 0
   stepCounts:
@@ -26237,47 +26237,47 @@ HLT_mu26_ivarmedium_tau35_mediumRNN_tracktwoMVA_probe_03dRAB_L1MU18VFCH:
 HLT_mu26_ivarmedium_tau35_mediumRNN_tracktwoMVA_probe_L1cTAU30M_03dRAB_L1MU14FCH:
   eventCount: 0
   stepCounts:
-    0: 5
-    1: 4
-    2: 4
-    3: 4
-    4: 4
-    5: 4
-    6: 4
-    7: 4
-    8: 4
-  stepFeatures:
-    0: 7
-    1: 4
-    2: 4
-    3: 4
-    4: 4
-    5: 4
-    6: 4
-    7: 4
-    8: 4
+    0: 4
+    1: 3
+    2: 3
+    3: 3
+    4: 3
+    5: 3
+    6: 3
+    7: 3
+    8: 3
+  stepFeatures:
+    0: 7
+    1: 3
+    2: 3
+    3: 3
+    4: 3
+    5: 3
+    6: 3
+    7: 3
+    8: 3
 HLT_mu26_ivarmedium_tau35_mediumRNN_tracktwoMVA_probe_L1cTAU30M_03dRAB_L1MU18VFCH:
   eventCount: 0
   stepCounts:
-    0: 5
-    1: 4
-    2: 4
-    3: 4
-    4: 4
-    5: 4
-    6: 4
-    7: 4
-    8: 4
+    0: 4
+    1: 3
+    2: 3
+    3: 3
+    4: 3
+    5: 3
+    6: 3
+    7: 3
+    8: 3
   stepFeatures:
     0: 7
-    1: 4
-    2: 4
-    3: 4
-    4: 4
-    5: 4
-    6: 4
-    7: 4
-    8: 4
+    1: 3
+    2: 3
+    3: 3
+    4: 3
+    5: 3
+    6: 3
+    7: 3
+    8: 3
 HLT_mu26_ivarmedium_tau40_mediumRNN_tracktwoMVA_probe_03dRAB_L1MU14FCH:
   eventCount: 0
   stepCounts:
@@ -26325,47 +26325,47 @@ HLT_mu26_ivarmedium_tau40_mediumRNN_tracktwoMVA_probe_03dRAB_L1MU18VFCH:
 HLT_mu26_ivarmedium_tau40_mediumRNN_tracktwoMVA_probe_L1cTAU35M_03dRAB_L1MU14FCH:
   eventCount: 0
   stepCounts:
-    0: 5
-    1: 4
-    2: 4
-    3: 4
-    4: 4
-    5: 4
-    6: 4
-    7: 4
-    8: 4
+    0: 1
+    1: 1
+    2: 1
+    3: 1
+    4: 1
+    5: 1
+    6: 1
+    7: 1
+    8: 1
   stepFeatures:
     0: 7
-    1: 4
-    2: 4
-    3: 4
-    4: 4
-    5: 4
-    6: 4
-    7: 4
-    8: 4
+    1: 1
+    2: 1
+    3: 1
+    4: 1
+    5: 1
+    6: 1
+    7: 1
+    8: 1
 HLT_mu26_ivarmedium_tau40_mediumRNN_tracktwoMVA_probe_L1cTAU35M_03dRAB_L1MU18VFCH:
   eventCount: 0
   stepCounts:
-    0: 5
-    1: 4
-    2: 4
-    3: 4
-    4: 4
-    5: 4
-    6: 4
-    7: 4
-    8: 4
+    0: 1
+    1: 1
+    2: 1
+    3: 1
+    4: 1
+    5: 1
+    6: 1
+    7: 1
+    8: 1
   stepFeatures:
     0: 7
-    1: 4
-    2: 4
-    3: 4
-    4: 4
-    5: 4
-    6: 4
-    7: 4
-    8: 4
+    1: 1
+    2: 1
+    3: 1
+    4: 1
+    5: 1
+    6: 1
+    7: 1
+    8: 1
 HLT_mu26_ivarmedium_tau60_mediumRNN_tracktwoLLP_probe_03dRAB_L1MU14FCH:
   eventCount: 0
   stepCounts:
@@ -28410,11 +28410,11 @@ HLT_noalg_L1XE55:
 HLT_noalg_L1XE60:
   eventCount: 6
 HLT_noalg_L1cTAU20M:
-  eventCount: 19
+  eventCount: 18
 HLT_noalg_L1cTAU30M:
-  eventCount: 17
+  eventCount: 14
 HLT_noalg_L1cTAU35M:
-  eventCount: 16
+  eventCount: 7
 HLT_noalg_L1eEM12L:
   eventCount: 7
 HLT_noalg_L1eEM18L:
@@ -28608,11 +28608,11 @@ HLT_tau0_mediumRNN_tracktwoMVA_tau0_mediumRNN_tracktwoMVA_03dRAB_L12cTAU20M_10DR
     3: 9
     4: 1
   stepFeatures:
-    0: 52
-    1: 52
-    2: 52
-    3: 52
-    4: 8
+    0: 50
+    1: 50
+    2: 50
+    3: 50
+    4: 10
 HLT_tau0_mediumRNN_tracktwoMVA_tau0_mediumRNN_tracktwoMVA_03dRAB_L12cTAU20M_4DR28-eTAU30eTAU20-jJ55:
   eventCount: 1
   stepCounts:
@@ -28622,11 +28622,11 @@ HLT_tau0_mediumRNN_tracktwoMVA_tau0_mediumRNN_tracktwoMVA_03dRAB_L12cTAU20M_4DR2
     3: 10
     4: 1
   stepFeatures:
-    0: 58
-    1: 58
-    2: 58
-    3: 58
-    4: 8
+    0: 54
+    1: 54
+    2: 54
+    3: 54
+    4: 10
 HLT_tau0_mediumRNN_tracktwoMVA_tau0_mediumRNN_tracktwoMVA_03dRAB_L12cTAU20M_4DR32-eTAU30eTAU20-jJ55:
   eventCount: 1
   stepCounts:
@@ -28636,11 +28636,11 @@ HLT_tau0_mediumRNN_tracktwoMVA_tau0_mediumRNN_tracktwoMVA_03dRAB_L12cTAU20M_4DR3
     3: 10
     4: 1
   stepFeatures:
-    0: 58
-    1: 58
-    2: 58
-    3: 58
-    4: 8
+    0: 54
+    1: 54
+    2: 54
+    3: 54
+    4: 10
 HLT_tau0_mediumRNN_tracktwoMVA_tau0_mediumRNN_tracktwoMVA_03dRAB_L14jJ30p0ETA24_0DETA24-eTAU30eTAU12:
   eventCount: 1
   stepCounts:
@@ -28714,17 +28714,17 @@ HLT_tau0_mediumRNN_tracktwoMVA_tau0_mediumRNN_tracktwoMVA_03dRAB_L1TAU20IM_2TAU1
 HLT_tau0_mediumRNN_tracktwoMVA_tau0_mediumRNN_tracktwoMVA_03dRAB_L1cTAU30M_2cTAU20M_DR-eTAU30eTAU20-jJ55:
   eventCount: 1
   stepCounts:
-    0: 10
-    1: 10
-    2: 10
-    3: 10
+    0: 9
+    1: 9
+    2: 9
+    3: 9
     4: 1
   stepFeatures:
-    0: 55
-    1: 55
-    2: 55
-    3: 55
-    4: 7
+    0: 44
+    1: 44
+    2: 44
+    3: 44
+    4: 8
 HLT_tau0_ptonly_L1TAU60:
   eventCount: 5
   stepCounts:
@@ -30032,30 +30032,30 @@ HLT_tau20_mediumRNN_tracktwoMVA_probe_xe75_cell_xe100_pfopufit_L1jXE110:
 HLT_tau20_mediumRNN_tracktwoMVA_tau20_mediumRNN_tracktwoMVA_02dRAB10_L1cTAU20M_DR-eTAU20eTAU12-jJ40:
   eventCount: 1
   stepCounts:
-    0: 14
-    1: 14
-    2: 14
-    3: 14
+    0: 13
+    1: 13
+    2: 13
+    3: 13
     4: 1
   stepFeatures:
-    0: 88
-    1: 88
-    2: 88
-    3: 88
+    0: 82
+    1: 82
+    2: 82
+    3: 82
     4: 7
 HLT_tau20_mediumRNN_tracktwoMVA_tau20_mediumRNN_tracktwoMVA_03dRAB10_L1cTAU20M_DR-eTAU20eTAU12-jJ40:
   eventCount: 1
   stepCounts:
-    0: 14
-    1: 14
-    2: 14
-    3: 14
+    0: 13
+    1: 13
+    2: 13
+    3: 13
     4: 1
   stepFeatures:
-    0: 88
-    1: 88
-    2: 88
-    3: 88
+    0: 82
+    1: 82
+    2: 82
+    3: 82
     4: 7
 HLT_tau20_perf_tracktwoMVA_L1TAU8:
   eventCount: 16
@@ -30368,19 +30368,19 @@ HLT_tau25_idperf_tracktwoMVA_L1TAU12IM:
     3: 27
     4: 27
 HLT_tau25_idperf_tracktwoMVA_L1cTAU20M:
-  eventCount: 19
+  eventCount: 18
   stepCounts:
-    0: 19
-    1: 19
-    2: 19
-    3: 19
-    4: 19
+    0: 18
+    1: 18
+    2: 18
+    3: 18
+    4: 18
   stepFeatures:
-    0: 37
-    1: 37
-    2: 37
-    3: 37
-    4: 37
+    0: 33
+    1: 33
+    2: 33
+    3: 33
+    4: 33
 HLT_tau25_idperf_tracktwoMVA_L1eTAU20:
   eventCount: 19
   stepCounts:
@@ -30476,17 +30476,17 @@ HLT_tau25_mediumRNN_trackLRT_L1TAU12IM:
     2: 27
     3: 5
 HLT_tau25_mediumRNN_trackLRT_L1cTAU20M:
-  eventCount: 5
+  eventCount: 4
   stepCounts:
-    0: 19
-    1: 19
-    2: 19
-    3: 5
+    0: 18
+    1: 18
+    2: 18
+    3: 4
   stepFeatures:
-    0: 37
-    1: 37
-    2: 37
-    3: 6
+    0: 33
+    1: 33
+    2: 33
+    3: 4
 HLT_tau25_mediumRNN_trackLRT_L1eTAU20:
   eventCount: 5
   stepCounts:
@@ -30516,17 +30516,17 @@ HLT_tau25_mediumRNN_tracktwoLLP_L1TAU12IM:
 HLT_tau25_mediumRNN_tracktwoLLP_L1cTAU20M:
   eventCount: 5
   stepCounts:
-    0: 19
-    1: 19
-    2: 19
-    3: 19
+    0: 18
+    1: 18
+    2: 18
+    3: 18
     4: 5
   stepFeatures:
-    0: 37
-    1: 37
-    2: 37
-    3: 37
-    4: 6
+    0: 33
+    1: 33
+    2: 33
+    3: 33
+    4: 5
 HLT_tau25_mediumRNN_tracktwoMVA_L1TAU12IM:
   eventCount: 3
   stepCounts:
@@ -30544,16 +30544,16 @@ HLT_tau25_mediumRNN_tracktwoMVA_L1TAU12IM:
 HLT_tau25_mediumRNN_tracktwoMVA_L1cTAU20M:
   eventCount: 3
   stepCounts:
-    0: 19
-    1: 19
-    2: 19
-    3: 19
-    4: 3
-  stepFeatures:
-    0: 37
-    1: 37
-    2: 37
-    3: 37
+    0: 18
+    1: 18
+    2: 18
+    3: 18
+    4: 3
+  stepFeatures:
+    0: 33
+    1: 33
+    2: 33
+    3: 33
     4: 3
 HLT_tau25_mediumRNN_tracktwoMVA_L1eTAU20:
   eventCount: 3
@@ -30768,10 +30768,10 @@ HLT_tau25_mediumRNN_tracktwoMVA_L1jTAU20:
     1: 80
     2: 298
     3: 27
-    4: 30
-    5: 30
-    6: 30
-    7: 30
+    4: 27
+    5: 27
+    6: 27
+    7: 27
     8: 3
 ? 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
@@ -31348,16 +31348,16 @@ HLT_tau25_mediumRNN_tracktwoMVA_probe_xe75_cell_xe100_pfopufit_L1jXE110:
 HLT_tau25_mediumRNN_tracktwoMVA_tau20_mediumRNN_tracktwoMVA_02dRAB10_L1cTAU20M_DR-eTAU20eTAU12-jJ40:
   eventCount: 1
   stepCounts:
-    0: 14
-    1: 14
-    2: 14
-    3: 14
+    0: 13
+    1: 13
+    2: 13
+    3: 13
     4: 1
   stepFeatures:
-    0: 86
-    1: 86
-    2: 86
-    3: 86
+    0: 80
+    1: 80
+    2: 80
+    3: 80
     4: 6
 HLT_tau25_mediumRNN_tracktwoMVA_tau20_mediumRNN_tracktwoMVA_03dRAB30_L1DR-TAU20ITAU12I-J25:
   eventCount: 1
@@ -31376,17 +31376,17 @@ HLT_tau25_mediumRNN_tracktwoMVA_tau20_mediumRNN_tracktwoMVA_03dRAB30_L1DR-TAU20I
 HLT_tau25_mediumRNN_tracktwoMVA_tau20_mediumRNN_tracktwoMVA_03dRAB30_L1cTAU30M_2cTAU20M_DR-eTAU30eTAU20-jJ55:
   eventCount: 1
   stepCounts:
-    0: 10
-    1: 10
-    2: 10
-    3: 10
+    0: 9
+    1: 9
+    2: 9
+    3: 9
     4: 1
   stepFeatures:
-    0: 55
-    1: 55
-    2: 55
-    3: 55
-    4: 7
+    0: 44
+    1: 44
+    2: 44
+    3: 44
+    4: 8
 ? HLT_tau25_mediumRNN_tracktwoMVA_tau20_mediumRNN_tracktwoMVA_03dRAB_4j20c_020jvt_SHARED_j20c_020jvt_bgn185_pf_ftf_L1TAU20IM_2TAU12IM_4J12p0ETA25
 : eventCount: 1
   stepCounts:
@@ -31481,15 +31481,15 @@ HLT_tau25_mediumRNN_tracktwoMVA_tau25_mediumRNN_tracktwoMVA_03dRAB30_L1DR-TAU20I
 HLT_tau25_mediumRNN_tracktwoMVA_tau25_mediumRNN_tracktwoMVA_03dRAB30_L1cTAU30M_2cTAU20M_DR-eTAU30eTAU20-jJ55:
   eventCount: 0
   stepCounts:
-    0: 10
-    1: 10
-    2: 10
-    3: 10
+    0: 9
+    1: 9
+    2: 9
+    3: 9
   stepFeatures:
-    0: 53
-    1: 53
-    2: 53
-    3: 53
+    0: 41
+    1: 41
+    2: 41
+    3: 41
     4: 6
 HLT_tau25_mediumRNN_tracktwoMVA_tau25_mediumRNN_tracktwoMVA_03dRAB_L1TAU20IM_2TAU12IM_4J12p0ETA25:
   eventCount: 0
@@ -31519,19 +31519,19 @@ HLT_tau25_perf_tracktwoMVA_L1TAU12IM:
     3: 27
     4: 15
 HLT_tau25_perf_tracktwoMVA_L1cTAU20M:
-  eventCount: 13
+  eventCount: 12
   stepCounts:
-    0: 19
-    1: 19
-    2: 19
-    3: 19
-    4: 13
+    0: 18
+    1: 18
+    2: 18
+    3: 18
+    4: 12
   stepFeatures:
-    0: 37
-    1: 37
-    2: 37
-    3: 37
-    4: 19
+    0: 33
+    1: 33
+    2: 33
+    3: 33
+    4: 17
 HLT_tau25_perf_tracktwoMVA_L1eTAU20:
   eventCount: 13
   stepCounts:
@@ -31871,19 +31871,19 @@ HLT_tau30_idperf_tracktwoMVA_tau20_idperf_tracktwoMVA_03dRAB30_L1DR-TAU20ITAU12I
     3: 25
     4: 25
 HLT_tau30_idperf_tracktwoMVA_tau20_idperf_tracktwoMVA_03dRAB30_L1cTAU30M_2cTAU20M_DR-eTAU30eTAU20-jJ55:
-  eventCount: 10
+  eventCount: 8
   stepCounts:
-    0: 10
-    1: 10
-    2: 10
-    3: 10
-    4: 10
+    0: 9
+    1: 9
+    2: 9
+    3: 9
+    4: 8
   stepFeatures:
-    0: 55
-    1: 55
-    2: 55
-    3: 55
-    4: 55
+    0: 44
+    1: 44
+    2: 44
+    3: 44
+    4: 44
 HLT_tau30_idperf_tracktwoMVA_tau20_idperf_tracktwoMVA_03dRAB_L1TAU20IM_2TAU12IM_4J12p0ETA25:
   eventCount: 7
   stepCounts:
@@ -31921,20 +31921,20 @@ HLT_tau30_idperf_tracktwoMVA_tau20_idperf_tracktwoMVA_03dRAB_L1TAU20IM_2TAU12IM_
 ? HLT_tau30_mediumRNN_tracktwoMVA_tau20_mediumRNN_tracktwoMVA_03dRAB30_4j20c_020jvt_SHARED_j20c_020jvt_bgn185_pf_ftf_L1cTAU30M_2cTAU20M_DR-eTAU30eTAU20-jJ55
 : eventCount: 1
   stepCounts:
-    0: 10
-    1: 10
-    2: 10
-    3: 10
+    0: 9
+    1: 9
+    2: 9
+    3: 9
     4: 1
     5: 1
     6: 1
     7: 1
   stepFeatures:
-    0: 55
-    1: 55
-    2: 55
-    3: 55
-    4: 7
+    0: 44
+    1: 44
+    2: 44
+    3: 44
+    4: 8
     5: 2
     6: 10
     7: 1
@@ -31969,31 +31969,31 @@ HLT_tau30_mediumRNN_tracktwoMVA_tau20_mediumRNN_tracktwoMVA_03dRAB30_L1DR-TAU20I
 HLT_tau30_mediumRNN_tracktwoMVA_tau20_mediumRNN_tracktwoMVA_03dRAB30_L1cTAU30M_2cTAU20M_DR-eTAU30eTAU20:
   eventCount: 1
   stepCounts:
-    0: 11
-    1: 11
-    2: 11
-    3: 11
+    0: 10
+    1: 10
+    2: 10
+    3: 10
     4: 1
   stepFeatures:
-    0: 58
-    1: 58
-    2: 58
-    3: 58
-    4: 7
+    0: 47
+    1: 47
+    2: 47
+    3: 47
+    4: 8
 HLT_tau30_mediumRNN_tracktwoMVA_tau20_mediumRNN_tracktwoMVA_03dRAB30_L1cTAU30M_2cTAU20M_DR-eTAU30eTAU20-jJ55:
   eventCount: 1
   stepCounts:
-    0: 10
-    1: 10
-    2: 10
-    3: 10
+    0: 9
+    1: 9
+    2: 9
+    3: 9
     4: 1
   stepFeatures:
-    0: 55
-    1: 55
-    2: 55
-    3: 55
-    4: 7
+    0: 44
+    1: 44
+    2: 44
+    3: 44
+    4: 8
 HLT_tau30_mediumRNN_tracktwoMVA_tau20_mediumRNN_tracktwoMVA_03dRAB30_L1jJ85p0ETA21_3jJ40p0ETA25:
   eventCount: 1
   stepCounts:
@@ -32031,20 +32031,20 @@ HLT_tau30_mediumRNN_tracktwoMVA_tau20_mediumRNN_tracktwoMVA_03dRAB30_j20c_020jvt
 ? HLT_tau30_mediumRNN_tracktwoMVA_tau20_mediumRNN_tracktwoMVA_03dRAB30_j20c_020jvt_bgn185_pf_ftf_L1cTAU30M_2cTAU20M_DR-eTAU30eTAU20-jJ55
 : eventCount: 1
   stepCounts:
-    0: 10
-    1: 10
-    2: 10
-    3: 10
+    0: 9
+    1: 9
+    2: 9
+    3: 9
     4: 1
     5: 1
     6: 1
     7: 1
   stepFeatures:
-    0: 55
-    1: 55
-    2: 55
-    3: 55
-    4: 7
+    0: 44
+    1: 44
+    2: 44
+    3: 44
+    4: 8
     5: 1
     6: 5
     7: 1
@@ -32057,11 +32057,11 @@ HLT_tau30_mediumRNN_tracktwoMVA_tau20_mediumRNN_tracktwoMVA_03dRAB_L12cTAU20M_10
     3: 9
     4: 1
   stepFeatures:
-    0: 50
-    1: 50
-    2: 50
-    3: 50
-    4: 7
+    0: 47
+    1: 47
+    2: 47
+    3: 47
+    4: 8
 HLT_tau30_mediumRNN_tracktwoMVA_tau20_mediumRNN_tracktwoMVA_03dRAB_L12cTAU20M_4DR28-eTAU30eTAU20-jJ55:
   eventCount: 1
   stepCounts:
@@ -32071,11 +32071,11 @@ HLT_tau30_mediumRNN_tracktwoMVA_tau20_mediumRNN_tracktwoMVA_03dRAB_L12cTAU20M_4D
     3: 10
     4: 1
   stepFeatures:
-    0: 56
-    1: 56
-    2: 56
-    3: 56
-    4: 7
+    0: 51
+    1: 51
+    2: 51
+    3: 51
+    4: 8
 HLT_tau30_mediumRNN_tracktwoMVA_tau20_mediumRNN_tracktwoMVA_03dRAB_L12cTAU20M_4DR32-eTAU30eTAU20-jJ55:
   eventCount: 1
   stepCounts:
@@ -32085,11 +32085,11 @@ HLT_tau30_mediumRNN_tracktwoMVA_tau20_mediumRNN_tracktwoMVA_03dRAB_L12cTAU20M_4D
     3: 10
     4: 1
   stepFeatures:
-    0: 56
-    1: 56
-    2: 56
-    3: 56
-    4: 7
+    0: 51
+    1: 51
+    2: 51
+    3: 51
+    4: 8
 HLT_tau30_mediumRNN_tracktwoMVA_tau20_mediumRNN_tracktwoMVA_03dRAB_L14jJ30p0ETA24_0DETA24-eTAU30eTAU12:
   eventCount: 1
   stepCounts:
@@ -32177,17 +32177,17 @@ HLT_tau30_mediumRNN_tracktwoMVA_tau20_mediumRNN_tracktwoMVA_03dRAB_L1TAU20IM_2TA
 HLT_tau30_mediumRNN_tracktwoMVA_tau20_mediumRNN_tracktwoMVA_03dRAB_L1cTAU20M_cTAU12M_4jJ30p0ETA24_0DETA24-eTAU30eTAU12:
   eventCount: 1
   stepCounts:
-    0: 10
-    1: 10
-    2: 10
-    3: 10
+    0: 11
+    1: 11
+    2: 11
+    3: 11
     4: 1
   stepFeatures:
-    0: 69
-    1: 57
-    2: 57
-    3: 57
-    4: 8
+    0: 65
+    1: 55
+    2: 55
+    3: 55
+    4: 9
 ? HLT_tau30_mediumRNN_tracktwoMVA_tau20_mediumRNN_tracktwoMVA_03dRAB_L1cTAU20M_cTAU12M_4jJ30p0ETA24_0DETA24_10DPHI99-eTAU30eTAU12
 : eventCount: 1
   stepCounts:
@@ -32197,11 +32197,11 @@ HLT_tau30_mediumRNN_tracktwoMVA_tau20_mediumRNN_tracktwoMVA_03dRAB_L1cTAU20M_cTA
     3: 11
     4: 1
   stepFeatures:
-    0: 72
-    1: 60
-    2: 60
-    3: 60
-    4: 8
+    0: 65
+    1: 55
+    2: 55
+    3: 55
+    4: 9
 ? HLT_tau30_mediumRNN_tracktwoMVA_tau20_mediumRNN_tracktwoMVA_03dRAB_L1cTAU20M_cTAU12M_4jJ30p0ETA24_0DETA24_4DPHI99-eTAU30eTAU12
 : eventCount: 1
   stepCounts:
@@ -32211,11 +32211,11 @@ HLT_tau30_mediumRNN_tracktwoMVA_tau20_mediumRNN_tracktwoMVA_03dRAB_L1cTAU20M_cTA
     3: 11
     4: 1
   stepFeatures:
-    0: 72
-    1: 60
-    2: 60
-    3: 60
-    4: 8
+    0: 65
+    1: 55
+    2: 55
+    3: 55
+    4: 9
 ? HLT_tau30_mediumRNN_tracktwoMVA_tau20_mediumRNN_tracktwoMVA_03dRAB_L1cTAU20M_cTAU12M_4jJ30p0ETA24_0DETA24_4DPHI99-eTAU30eTAU20
 : eventCount: 1
   stepCounts:
@@ -32225,39 +32225,39 @@ HLT_tau30_mediumRNN_tracktwoMVA_tau20_mediumRNN_tracktwoMVA_03dRAB_L1cTAU20M_cTA
     3: 11
     4: 1
   stepFeatures:
-    0: 72
-    1: 60
-    2: 60
-    3: 60
-    4: 8
+    0: 65
+    1: 55
+    2: 55
+    3: 55
+    4: 9
 HLT_tau30_mediumRNN_tracktwoMVA_tau20_mediumRNN_tracktwoMVA_03dRAB_L1cTAU30M_2cTAU20M:
   eventCount: 1
   stepCounts:
-    0: 11
-    1: 11
-    2: 11
-    3: 11
+    0: 10
+    1: 10
+    2: 10
+    3: 10
     4: 1
   stepFeatures:
-    0: 58
-    1: 58
-    2: 58
-    3: 58
-    4: 7
+    0: 47
+    1: 47
+    2: 47
+    3: 47
+    4: 8
 HLT_tau30_mediumRNN_tracktwoMVA_tau20_mediumRNN_tracktwoMVA_03dRAB_L1cTAU30M_2cTAU20M_4jJ30p0ETA25:
   eventCount: 1
   stepCounts:
-    0: 10
-    1: 10
-    2: 10
-    3: 10
+    0: 9
+    1: 9
+    2: 9
+    3: 9
     4: 1
   stepFeatures:
-    0: 55
-    1: 55
-    2: 55
-    3: 55
-    4: 7
+    0: 44
+    1: 44
+    2: 44
+    3: 44
+    4: 8
 HLT_tau30_mediumRNN_tracktwoMVA_tau20_mediumRNN_tracktwoMVA_03dRAB_L1jJ85p0ETA21_3jJ40p0ETA25:
   eventCount: 1
   stepCounts:
@@ -32288,15 +32288,15 @@ HLT_tau30_mediumRNN_tracktwoMVA_tau25_mediumRNN_tracktwoMVA_03dRAB30_L1DR-TAU20I
 HLT_tau30_mediumRNN_tracktwoMVA_tau25_mediumRNN_tracktwoMVA_03dRAB30_L1cTAU30M_2cTAU20M_DR-eTAU30eTAU20-jJ55:
   eventCount: 0
   stepCounts:
-    0: 10
-    1: 10
-    2: 10
-    3: 10
+    0: 9
+    1: 9
+    2: 9
+    3: 9
   stepFeatures:
-    0: 53
-    1: 53
-    2: 53
-    3: 53
+    0: 41
+    1: 41
+    2: 41
+    3: 41
     4: 6
 HLT_tau30_mediumRNN_tracktwoMVA_tau25_mediumRNN_tracktwoMVA_03dRAB_L1TAU20IM_2TAU12IM_4J12p0ETA25:
   eventCount: 0
@@ -32326,19 +32326,19 @@ HLT_tau35_idperf_tracktwoMVA_L1TAU20IM:
     3: 18
     4: 18
 HLT_tau35_idperf_tracktwoMVA_L1cTAU30M:
-  eventCount: 17
+  eventCount: 14
   stepCounts:
-    0: 17
-    1: 17
-    2: 17
-    3: 17
-    4: 17
+    0: 14
+    1: 14
+    2: 14
+    3: 14
+    4: 14
   stepFeatures:
-    0: 31
-    1: 31
-    2: 31
-    3: 31
-    4: 31
+    0: 22
+    1: 22
+    2: 22
+    3: 22
+    4: 22
 HLT_tau35_idperf_tracktwoMVA_L1eTAU30:
   eventCount: 17
   stepCounts:
@@ -32412,16 +32412,16 @@ HLT_tau35_mediumRNN_tracktwoMVA_L1TAU20IM:
 HLT_tau35_mediumRNN_tracktwoMVA_L1cTAU30M:
   eventCount: 2
   stepCounts:
-    0: 17
-    1: 17
-    2: 17
-    3: 17
+    0: 14
+    1: 14
+    2: 14
+    3: 14
     4: 2
   stepFeatures:
-    0: 31
-    1: 31
-    2: 31
-    3: 31
+    0: 22
+    1: 22
+    2: 22
+    3: 22
     4: 2
 HLT_tau35_mediumRNN_tracktwoMVA_L1eTAU30:
   eventCount: 2
@@ -32566,7 +32566,7 @@ HLT_tau35_mediumRNN_tracktwoMVA_probe_xe65_cell_xe100_pfopufit_L1XE55:
 HLT_tau35_mediumRNN_tracktwoMVA_probe_xe65_cell_xe100_pfopufit_L1gXEJWOJ100:
   eventCount: 0
   stepCounts:
-    0: 4
+    0: 3
     1: 1
     2: 1
     3: 1
@@ -32582,7 +32582,7 @@ HLT_tau35_mediumRNN_tracktwoMVA_probe_xe65_cell_xe100_pfopufit_L1gXEJWOJ100:
 HLT_tau35_mediumRNN_tracktwoMVA_probe_xe65_cell_xe100_pfopufit_L1gXEJWOJ110:
   eventCount: 0
   stepCounts:
-    0: 4
+    0: 3
     1: 1
     2: 1
     3: 1
@@ -32598,7 +32598,7 @@ HLT_tau35_mediumRNN_tracktwoMVA_probe_xe65_cell_xe100_pfopufit_L1gXEJWOJ110:
 HLT_tau35_mediumRNN_tracktwoMVA_probe_xe65_cell_xe100_pfopufit_L1jXE100:
   eventCount: 0
   stepCounts:
-    0: 4
+    0: 3
     1: 1
     2: 1
     3: 1
@@ -32614,7 +32614,7 @@ HLT_tau35_mediumRNN_tracktwoMVA_probe_xe65_cell_xe100_pfopufit_L1jXE100:
 HLT_tau35_mediumRNN_tracktwoMVA_probe_xe65_cell_xe100_pfopufit_L1jXE110:
   eventCount: 0
   stepCounts:
-    0: 4
+    0: 3
     1: 1
     2: 1
     3: 1
@@ -32662,7 +32662,7 @@ HLT_tau35_mediumRNN_tracktwoMVA_probe_xe65_cell_xe90_pfopufit_L1XE55:
 HLT_tau35_mediumRNN_tracktwoMVA_probe_xe65_cell_xe90_pfopufit_L1gXEJWOJ100:
   eventCount: 0
   stepCounts:
-    0: 4
+    0: 3
     1: 2
     2: 2
     3: 2
@@ -32678,7 +32678,7 @@ HLT_tau35_mediumRNN_tracktwoMVA_probe_xe65_cell_xe90_pfopufit_L1gXEJWOJ100:
 HLT_tau35_mediumRNN_tracktwoMVA_probe_xe65_cell_xe90_pfopufit_L1gXEJWOJ110:
   eventCount: 0
   stepCounts:
-    0: 4
+    0: 3
     1: 2
     2: 2
     3: 2
@@ -32694,7 +32694,7 @@ HLT_tau35_mediumRNN_tracktwoMVA_probe_xe65_cell_xe90_pfopufit_L1gXEJWOJ110:
 HLT_tau35_mediumRNN_tracktwoMVA_probe_xe65_cell_xe90_pfopufit_L1jXE100:
   eventCount: 0
   stepCounts:
-    0: 4
+    0: 3
     1: 2
     2: 2
     3: 2
@@ -32710,7 +32710,7 @@ HLT_tau35_mediumRNN_tracktwoMVA_probe_xe65_cell_xe90_pfopufit_L1jXE100:
 HLT_tau35_mediumRNN_tracktwoMVA_probe_xe65_cell_xe90_pfopufit_L1jXE110:
   eventCount: 0
   stepCounts:
-    0: 4
+    0: 3
     1: 2
     2: 2
     3: 2
@@ -32758,7 +32758,7 @@ HLT_tau35_mediumRNN_tracktwoMVA_probe_xe75_cell_xe100_pfopufit_L1XE55:
 HLT_tau35_mediumRNN_tracktwoMVA_probe_xe75_cell_xe100_pfopufit_L1gXEJWOJ100:
   eventCount: 0
   stepCounts:
-    0: 3
+    0: 2
     1: 1
     2: 1
     3: 1
@@ -32774,7 +32774,7 @@ HLT_tau35_mediumRNN_tracktwoMVA_probe_xe75_cell_xe100_pfopufit_L1gXEJWOJ100:
 HLT_tau35_mediumRNN_tracktwoMVA_probe_xe75_cell_xe100_pfopufit_L1gXEJWOJ110:
   eventCount: 0
   stepCounts:
-    0: 3
+    0: 2
     1: 1
     2: 1
     3: 1
@@ -32790,7 +32790,7 @@ HLT_tau35_mediumRNN_tracktwoMVA_probe_xe75_cell_xe100_pfopufit_L1gXEJWOJ110:
 HLT_tau35_mediumRNN_tracktwoMVA_probe_xe75_cell_xe100_pfopufit_L1jXE100:
   eventCount: 0
   stepCounts:
-    0: 3
+    0: 2
     1: 1
     2: 1
     3: 1
@@ -32806,7 +32806,7 @@ HLT_tau35_mediumRNN_tracktwoMVA_probe_xe75_cell_xe100_pfopufit_L1jXE100:
 HLT_tau35_mediumRNN_tracktwoMVA_probe_xe75_cell_xe100_pfopufit_L1jXE110:
   eventCount: 0
   stepCounts:
-    0: 3
+    0: 2
     1: 1
     2: 1
     3: 1
@@ -32835,16 +32835,16 @@ HLT_tau35_mediumRNN_tracktwoMVA_tau20_mediumRNN_tracktwoMVA_03dRAB30_L1DR-TAU20I
 HLT_tau35_mediumRNN_tracktwoMVA_tau20_mediumRNN_tracktwoMVA_03dRAB30_L1cTAU30M_2cTAU20M_DR-eTAU30eTAU20-jJ55:
   eventCount: 0
   stepCounts:
-    0: 10
-    1: 10
-    2: 10
-    3: 10
+    0: 9
+    1: 9
+    2: 9
+    3: 9
   stepFeatures:
-    0: 53
-    1: 53
-    2: 53
-    3: 53
-    4: 6
+    0: 42
+    1: 42
+    2: 42
+    3: 42
+    4: 7
 HLT_tau35_mediumRNN_tracktwoMVA_tau20_mediumRNN_tracktwoMVA_03dRAB_L1TAU20IM_2TAU12IM_4J12p0ETA25:
   eventCount: 0
   stepCounts:
@@ -32885,19 +32885,6 @@ HLT_tau35_mediumRNN_tracktwoMVA_tau25_mediumRNN_tracktwoMVA_03dRAB30_L1DR-TAU20I
     3: 19
     4: 3
 HLT_tau35_mediumRNN_tracktwoMVA_tau25_mediumRNN_tracktwoMVA_03dRAB30_L1cTAU30M_2cTAU20M_DR-eTAU30MeTAU20M:
-  eventCount: 0
-  stepCounts:
-    0: 11
-    1: 11
-    2: 11
-    3: 11
-  stepFeatures:
-    0: 54
-    1: 54
-    2: 54
-    3: 54
-    4: 5
-HLT_tau35_mediumRNN_tracktwoMVA_tau25_mediumRNN_tracktwoMVA_03dRAB30_L1cTAU30M_2cTAU20M_DR-eTAU30MeTAU20M-jJ55:
   eventCount: 0
   stepCounts:
     0: 10
@@ -32905,25 +32892,25 @@ HLT_tau35_mediumRNN_tracktwoMVA_tau25_mediumRNN_tracktwoMVA_03dRAB30_L1cTAU30M_2
     2: 10
     3: 10
   stepFeatures:
-    0: 51
-    1: 51
-    2: 51
-    3: 51
+    0: 42
+    1: 42
+    2: 42
+    3: 42
     4: 5
-HLT_tau35_mediumRNN_tracktwoMVA_tau25_mediumRNN_tracktwoMVA_03dRAB30_L1cTAU30M_2cTAU20M_DR-eTAU30eTAU20:
+HLT_tau35_mediumRNN_tracktwoMVA_tau25_mediumRNN_tracktwoMVA_03dRAB30_L1cTAU30M_2cTAU20M_DR-eTAU30MeTAU20M-jJ55:
   eventCount: 0
   stepCounts:
-    0: 11
-    1: 11
-    2: 11
-    3: 11
+    0: 9
+    1: 9
+    2: 9
+    3: 9
   stepFeatures:
-    0: 54
-    1: 54
-    2: 54
-    3: 54
+    0: 39
+    1: 39
+    2: 39
+    3: 39
     4: 5
-HLT_tau35_mediumRNN_tracktwoMVA_tau25_mediumRNN_tracktwoMVA_03dRAB30_L1cTAU30M_2cTAU20M_DR-eTAU30eTAU20-jJ55:
+HLT_tau35_mediumRNN_tracktwoMVA_tau25_mediumRNN_tracktwoMVA_03dRAB30_L1cTAU30M_2cTAU20M_DR-eTAU30eTAU20:
   eventCount: 0
   stepCounts:
     0: 10
@@ -32931,10 +32918,23 @@ HLT_tau35_mediumRNN_tracktwoMVA_tau25_mediumRNN_tracktwoMVA_03dRAB30_L1cTAU30M_2
     2: 10
     3: 10
   stepFeatures:
-    0: 51
-    1: 51
-    2: 51
-    3: 51
+    0: 42
+    1: 42
+    2: 42
+    3: 42
+    4: 5
+HLT_tau35_mediumRNN_tracktwoMVA_tau25_mediumRNN_tracktwoMVA_03dRAB30_L1cTAU30M_2cTAU20M_DR-eTAU30eTAU20-jJ55:
+  eventCount: 0
+  stepCounts:
+    0: 9
+    1: 9
+    2: 9
+    3: 9
+  stepFeatures:
+    0: 39
+    1: 39
+    2: 39
+    3: 39
     4: 5
 HLT_tau35_mediumRNN_tracktwoMVA_tau25_mediumRNN_tracktwoMVA_03dRAB_L1TAU20IM_2TAU12IM:
   eventCount: 0
@@ -32965,28 +32965,28 @@ HLT_tau35_mediumRNN_tracktwoMVA_tau25_mediumRNN_tracktwoMVA_03dRAB_L1TAU20IM_2TA
 HLT_tau35_mediumRNN_tracktwoMVA_tau25_mediumRNN_tracktwoMVA_03dRAB_L1cTAU30M_2cTAU20M:
   eventCount: 0
   stepCounts:
-    0: 11
-    1: 11
-    2: 11
-    3: 11
+    0: 10
+    1: 10
+    2: 10
+    3: 10
   stepFeatures:
-    0: 54
-    1: 54
-    2: 54
-    3: 54
+    0: 42
+    1: 42
+    2: 42
+    3: 42
     4: 5
 HLT_tau35_mediumRNN_tracktwoMVA_tau25_mediumRNN_tracktwoMVA_03dRAB_L1cTAU30M_2cTAU20M_4jJ30p0ETA25:
   eventCount: 0
   stepCounts:
-    0: 10
-    1: 10
-    2: 10
-    3: 10
+    0: 9
+    1: 9
+    2: 9
+    3: 9
   stepFeatures:
-    0: 51
-    1: 51
-    2: 51
-    3: 51
+    0: 39
+    1: 39
+    2: 39
+    3: 39
     4: 5
 HLT_tau35_perf_tracktwoMVA_L1TAU20IM:
   eventCount: 10
@@ -33003,19 +33003,19 @@ HLT_tau35_perf_tracktwoMVA_L1TAU20IM:
     3: 18
     4: 11
 HLT_tau35_perf_tracktwoMVA_L1cTAU30M:
-  eventCount: 13
+  eventCount: 10
   stepCounts:
-    0: 17
-    1: 17
-    2: 17
-    3: 17
-    4: 13
+    0: 14
+    1: 14
+    2: 14
+    3: 14
+    4: 10
   stepFeatures:
-    0: 31
-    1: 31
-    2: 31
-    3: 31
-    4: 17
+    0: 22
+    1: 22
+    2: 22
+    3: 22
+    4: 12
 HLT_tau35_perf_tracktwoMVA_L1eTAU30:
   eventCount: 13
   stepCounts:
@@ -33173,7 +33173,7 @@ HLT_tau40_mediumRNN_tracktwoMVA_probe_xe65_cell_xe100_pfopufit_L1XE55:
 HLT_tau40_mediumRNN_tracktwoMVA_probe_xe65_cell_xe100_pfopufit_L1gXEJWOJ100:
   eventCount: 0
   stepCounts:
-    0: 4
+    0: 3
     1: 1
     2: 1
     3: 1
@@ -33189,7 +33189,7 @@ HLT_tau40_mediumRNN_tracktwoMVA_probe_xe65_cell_xe100_pfopufit_L1gXEJWOJ100:
 HLT_tau40_mediumRNN_tracktwoMVA_probe_xe65_cell_xe100_pfopufit_L1gXEJWOJ110:
   eventCount: 0
   stepCounts:
-    0: 4
+    0: 3
     1: 1
     2: 1
     3: 1
@@ -33205,7 +33205,7 @@ HLT_tau40_mediumRNN_tracktwoMVA_probe_xe65_cell_xe100_pfopufit_L1gXEJWOJ110:
 HLT_tau40_mediumRNN_tracktwoMVA_probe_xe65_cell_xe100_pfopufit_L1jXE100:
   eventCount: 0
   stepCounts:
-    0: 4
+    0: 3
     1: 1
     2: 1
     3: 1
@@ -33221,7 +33221,7 @@ HLT_tau40_mediumRNN_tracktwoMVA_probe_xe65_cell_xe100_pfopufit_L1jXE100:
 HLT_tau40_mediumRNN_tracktwoMVA_probe_xe65_cell_xe100_pfopufit_L1jXE110:
   eventCount: 0
   stepCounts:
-    0: 4
+    0: 3
     1: 1
     2: 1
     3: 1
@@ -33269,7 +33269,7 @@ HLT_tau40_mediumRNN_tracktwoMVA_probe_xe65_cell_xe90_pfopufit_L1XE55:
 HLT_tau40_mediumRNN_tracktwoMVA_probe_xe65_cell_xe90_pfopufit_L1gXEJWOJ100:
   eventCount: 0
   stepCounts:
-    0: 4
+    0: 3
     1: 2
     2: 2
     3: 2
@@ -33285,7 +33285,7 @@ HLT_tau40_mediumRNN_tracktwoMVA_probe_xe65_cell_xe90_pfopufit_L1gXEJWOJ100:
 HLT_tau40_mediumRNN_tracktwoMVA_probe_xe65_cell_xe90_pfopufit_L1gXEJWOJ110:
   eventCount: 0
   stepCounts:
-    0: 4
+    0: 3
     1: 2
     2: 2
     3: 2
@@ -33301,7 +33301,7 @@ HLT_tau40_mediumRNN_tracktwoMVA_probe_xe65_cell_xe90_pfopufit_L1gXEJWOJ110:
 HLT_tau40_mediumRNN_tracktwoMVA_probe_xe65_cell_xe90_pfopufit_L1jXE100:
   eventCount: 0
   stepCounts:
-    0: 4
+    0: 3
     1: 2
     2: 2
     3: 2
@@ -33317,7 +33317,7 @@ HLT_tau40_mediumRNN_tracktwoMVA_probe_xe65_cell_xe90_pfopufit_L1jXE100:
 HLT_tau40_mediumRNN_tracktwoMVA_probe_xe65_cell_xe90_pfopufit_L1jXE110:
   eventCount: 0
   stepCounts:
-    0: 4
+    0: 3
     1: 2
     2: 2
     3: 2
@@ -33365,7 +33365,7 @@ HLT_tau40_mediumRNN_tracktwoMVA_probe_xe75_cell_xe100_pfopufit_L1XE55:
 HLT_tau40_mediumRNN_tracktwoMVA_probe_xe75_cell_xe100_pfopufit_L1gXEJWOJ100:
   eventCount: 0
   stepCounts:
-    0: 3
+    0: 2
     1: 1
     2: 1
     3: 1
@@ -33381,7 +33381,7 @@ HLT_tau40_mediumRNN_tracktwoMVA_probe_xe75_cell_xe100_pfopufit_L1gXEJWOJ100:
 HLT_tau40_mediumRNN_tracktwoMVA_probe_xe75_cell_xe100_pfopufit_L1gXEJWOJ110:
   eventCount: 0
   stepCounts:
-    0: 3
+    0: 2
     1: 1
     2: 1
     3: 1
@@ -33397,7 +33397,7 @@ HLT_tau40_mediumRNN_tracktwoMVA_probe_xe75_cell_xe100_pfopufit_L1gXEJWOJ110:
 HLT_tau40_mediumRNN_tracktwoMVA_probe_xe75_cell_xe100_pfopufit_L1jXE100:
   eventCount: 0
   stepCounts:
-    0: 3
+    0: 2
     1: 1
     2: 1
     3: 1
@@ -33413,7 +33413,7 @@ HLT_tau40_mediumRNN_tracktwoMVA_probe_xe75_cell_xe100_pfopufit_L1jXE100:
 HLT_tau40_mediumRNN_tracktwoMVA_probe_xe75_cell_xe100_pfopufit_L1jXE110:
   eventCount: 0
   stepCounts:
-    0: 3
+    0: 2
     1: 1
     2: 1
     3: 1
@@ -33442,16 +33442,16 @@ HLT_tau40_mediumRNN_tracktwoMVA_tau20_mediumRNN_tracktwoMVA_03dRAB30_L1DR-TAU20I
 HLT_tau40_mediumRNN_tracktwoMVA_tau20_mediumRNN_tracktwoMVA_03dRAB30_L1cTAU30M_2cTAU20M_DR-eTAU30eTAU20-jJ55:
   eventCount: 0
   stepCounts:
-    0: 10
-    1: 10
-    2: 10
-    3: 10
+    0: 9
+    1: 9
+    2: 9
+    3: 9
   stepFeatures:
-    0: 52
-    1: 52
-    2: 52
-    3: 52
-    4: 5
+    0: 41
+    1: 41
+    2: 41
+    3: 41
+    4: 6
 HLT_tau40_mediumRNN_tracktwoMVA_tau20_mediumRNN_tracktwoMVA_03dRAB_L1TAU20IM_2TAU12IM_4J12p0ETA25:
   eventCount: 0
   stepCounts:
@@ -33481,29 +33481,29 @@ HLT_tau40_mediumRNN_tracktwoMVA_tau35_mediumRNN_tracktwoMVA_03dRAB_L1TAU25IM_2TA
 HLT_tau40_mediumRNN_tracktwoMVA_tau35_mediumRNN_tracktwoMVA_03dRAB_L1cTAU35M_2cTAU30M:
   eventCount: 0
   stepCounts:
-    0: 10
-    1: 10
-    2: 10
-    3: 10
+    0: 5
+    1: 5
+    2: 5
+    3: 5
   stepFeatures:
-    0: 45
-    1: 45
-    2: 45
-    3: 45
-    4: 3
+    0: 16
+    1: 16
+    2: 16
+    3: 16
+    4: 1
 HLT_tau40_mediumRNN_tracktwoMVA_tau35_mediumRNN_tracktwoMVA_03dRAB_L1cTAU35M_2cTAU30M_2jJ55_3jJ50:
   eventCount: 0
   stepCounts:
-    0: 10
-    1: 10
-    2: 10
-    3: 10
+    0: 5
+    1: 5
+    2: 5
+    3: 5
   stepFeatures:
-    0: 45
-    1: 45
-    2: 45
-    3: 45
-    4: 3
+    0: 16
+    1: 16
+    2: 16
+    3: 16
+    4: 1
 HLT_tau40_mediumRNN_tracktwoMVA_tau35_mediumRNN_tracktwoMVA_03dRAB_L1eTAU35M_2eTAU30M:
   eventCount: 0
   stepCounts:
@@ -33544,51 +33544,51 @@ HLT_tau50_mediumRNN_tracktwoMVA_xe80_pfopufit_xe50_cell_L1XE55:
 HLT_tau50_mediumRNN_tracktwoMVA_xe80_pfopufit_xe50_cell_L1gXEJWOJ100:
   eventCount: 0
   stepCounts:
-    0: 10
-    1: 10
-    2: 10
-    3: 10
+    0: 4
+    1: 4
+    2: 4
+    3: 4
   stepFeatures:
-    0: 16
-    1: 16
-    2: 16
-    3: 16
+    0: 5
+    1: 5
+    2: 5
+    3: 5
 HLT_tau50_mediumRNN_tracktwoMVA_xe80_pfopufit_xe50_cell_L1gXEJWOJ110:
   eventCount: 0
   stepCounts:
-    0: 8
-    1: 8
-    2: 8
-    3: 8
+    0: 3
+    1: 3
+    2: 3
+    3: 3
   stepFeatures:
-    0: 10
-    1: 10
-    2: 10
-    3: 10
+    0: 3
+    1: 3
+    2: 3
+    3: 3
 HLT_tau50_mediumRNN_tracktwoMVA_xe80_pfopufit_xe50_cell_L1jXE100:
   eventCount: 0
   stepCounts:
-    0: 10
-    1: 10
-    2: 10
-    3: 10
+    0: 5
+    1: 5
+    2: 5
+    3: 5
   stepFeatures:
-    0: 15
-    1: 15
-    2: 15
-    3: 15
+    0: 5
+    1: 5
+    2: 5
+    3: 5
 HLT_tau50_mediumRNN_tracktwoMVA_xe80_pfopufit_xe50_cell_L1jXE110:
   eventCount: 0
   stepCounts:
-    0: 8
-    1: 8
-    2: 8
-    3: 8
+    0: 5
+    1: 5
+    2: 5
+    3: 5
   stepFeatures:
-    0: 11
-    1: 11
-    2: 11
-    3: 11
+    0: 5
+    1: 5
+    2: 5
+    3: 5
 HLT_tau50_mediumRNN_tracktwoMVA_xe80_tcpufit_xe50_cell_L1XE50:
   eventCount: 0
   stepCounts:
@@ -33616,51 +33616,51 @@ HLT_tau50_mediumRNN_tracktwoMVA_xe80_tcpufit_xe50_cell_L1XE55:
 HLT_tau50_mediumRNN_tracktwoMVA_xe80_tcpufit_xe50_cell_L1gXEJWOJ100:
   eventCount: 0
   stepCounts:
-    0: 10
-    1: 10
-    2: 10
-    3: 10
+    0: 4
+    1: 4
+    2: 4
+    3: 4
   stepFeatures:
-    0: 16
-    1: 16
-    2: 16
-    3: 16
+    0: 5
+    1: 5
+    2: 5
+    3: 5
 HLT_tau50_mediumRNN_tracktwoMVA_xe80_tcpufit_xe50_cell_L1gXEJWOJ110:
   eventCount: 0
   stepCounts:
-    0: 8
-    1: 8
-    2: 8
-    3: 8
+    0: 3
+    1: 3
+    2: 3
+    3: 3
   stepFeatures:
-    0: 10
-    1: 10
-    2: 10
-    3: 10
+    0: 3
+    1: 3
+    2: 3
+    3: 3
 HLT_tau50_mediumRNN_tracktwoMVA_xe80_tcpufit_xe50_cell_L1jXE100:
   eventCount: 0
   stepCounts:
-    0: 10
-    1: 10
-    2: 10
-    3: 10
+    0: 5
+    1: 5
+    2: 5
+    3: 5
   stepFeatures:
-    0: 15
-    1: 15
-    2: 15
-    3: 15
+    0: 5
+    1: 5
+    2: 5
+    3: 5
 HLT_tau50_mediumRNN_tracktwoMVA_xe80_tcpufit_xe50_cell_L1jXE110:
   eventCount: 0
   stepCounts:
-    0: 8
-    1: 8
-    2: 8
-    3: 8
+    0: 5
+    1: 5
+    2: 5
+    3: 5
   stepFeatures:
-    0: 11
-    1: 11
-    2: 11
-    3: 11
+    0: 5
+    1: 5
+    2: 5
+    3: 5
 HLT_tau60_mediumRNN_tracktwoLLP_probe_xe65_cell_xe100_pfopufit_L1XE50:
   eventCount: 0
   stepCounts:
@@ -34293,10 +34293,10 @@ HLT_tau60_mediumRNN_tracktwoMVA_tau25_mediumRNN_tracktwoMVA_xe50_cell_03dRAB_L1e
     2: 6
     3: 6
   stepFeatures:
-    0: 22
-    1: 22
-    2: 22
-    3: 22
+    0: 21
+    1: 21
+    2: 21
+    3: 21
     4: 2
 HLT_tau60_mediumRNN_tracktwoMVA_tau25_mediumRNN_tracktwoMVA_xe50_cell_03dRAB_L1eTAU60_2eTAU20M_jXE80:
   eventCount: 0
@@ -34955,10 +34955,10 @@ HLT_tau80_mediumRNN_tracktwoMVA_tau35_mediumRNN_tracktwoMVA_03dRAB30_L1eTAU80_2c
     2: 3
     3: 3
   stepFeatures:
-    0: 10
-    1: 10
-    2: 10
-    3: 10
+    0: 9
+    1: 9
+    2: 9
+    3: 9
 HLT_tau80_mediumRNN_tracktwoMVA_tau60_mediumRNN_tracktwoMVA_03dRAB_L1TAU60_2TAU40:
   eventCount: 0
   stepCounts:
diff --git a/Trigger/TrigValidation/TrigP1Test/share/ref_v1Dev_decodeBS_build.ref b/Trigger/TrigValidation/TrigP1Test/share/ref_v1Dev_decodeBS_build.ref
index c09dff3be8d0456f3ad9b1d5ae353507738a21c5..92e95606f217d5ebc3eee5e65e4b3127e5594d10 100644
--- a/Trigger/TrigValidation/TrigP1Test/share/ref_v1Dev_decodeBS_build.ref
+++ b/Trigger/TrigValidation/TrigP1Test/share/ref_v1Dev_decodeBS_build.ref
@@ -10194,7 +10194,7 @@ HLT_noalg_L1cTAU20M:
 HLT_noalg_L1cTAU30M:
   eventCount: 9
 HLT_noalg_L1cTAU35M:
-  eventCount: 7
+  eventCount: 3
 HLT_noalg_L1eEM12L:
   eventCount: 7
 HLT_noalg_L1eEM18L:
@@ -11040,11 +11040,11 @@ HLT_tau25_idperf_tracktwoMVA_L1cTAU20M:
     3: 10
     4: 10
   stepFeatures:
-    0: 14
-    1: 14
-    2: 14
-    3: 14
-    4: 14
+    0: 15
+    1: 15
+    2: 15
+    3: 15
+    4: 15
 HLT_tau25_idperf_tracktwoMVA_L1eTAU20:
   eventCount: 10
   stepCounts:
@@ -11147,9 +11147,9 @@ HLT_tau25_mediumRNN_trackLRT_L1cTAU20M:
     2: 10
     3: 4
   stepFeatures:
-    0: 14
-    1: 14
-    2: 14
+    0: 15
+    1: 15
+    2: 15
     3: 4
 HLT_tau25_mediumRNN_trackLRT_L1eTAU20:
   eventCount: 4
@@ -11186,10 +11186,10 @@ HLT_tau25_mediumRNN_tracktwoLLP_L1cTAU20M:
     3: 10
     4: 5
   stepFeatures:
-    0: 14
-    1: 14
-    2: 14
-    3: 14
+    0: 15
+    1: 15
+    2: 15
+    3: 15
     4: 5
 HLT_tau25_mediumRNN_tracktwoMVA_L1TAU12IM:
   eventCount: 3
@@ -11214,10 +11214,10 @@ HLT_tau25_mediumRNN_tracktwoMVA_L1cTAU20M:
     3: 10
     4: 3
   stepFeatures:
-    0: 14
-    1: 14
-    2: 14
-    3: 14
+    0: 15
+    1: 15
+    2: 15
+    3: 15
     4: 3
 HLT_tau25_mediumRNN_tracktwoMVA_L1eTAU20:
   eventCount: 3
@@ -11428,11 +11428,11 @@ HLT_tau25_perf_tracktwoMVA_L1cTAU20M:
     3: 10
     4: 9
   stepFeatures:
-    0: 14
-    1: 14
-    2: 14
-    3: 14
-    4: 10
+    0: 15
+    1: 15
+    2: 15
+    3: 15
+    4: 11
 HLT_tau25_perf_tracktwoMVA_L1eTAU20:
   eventCount: 9
   stepCounts:
@@ -11621,15 +11621,15 @@ HLT_tau30_mediumRNN_tracktwoMVA_tau20_mediumRNN_tracktwoMVA_03dRAB_L1cTAU20M_cTA
 HLT_tau30_mediumRNN_tracktwoMVA_tau20_mediumRNN_tracktwoMVA_03dRAB_L1cTAU30M_2cTAU20M:
   eventCount: 0
   stepCounts:
-    0: 4
-    1: 4
-    2: 4
-    3: 4
+    0: 5
+    1: 5
+    2: 5
+    3: 5
   stepFeatures:
-    0: 15
-    1: 15
-    2: 15
-    3: 15
+    0: 18
+    1: 18
+    2: 18
+    3: 18
 HLT_tau30_mediumRNN_tracktwoMVA_tau20_mediumRNN_tracktwoMVA_03dRAB_L1cTAU30M_2cTAU20M_4jJ30p0ETA25:
   eventCount: 0
 HLT_tau30_mediumRNN_tracktwoMVA_tau20_mediumRNN_tracktwoMVA_03dRAB_L1jJ85p0ETA21_3jJ40p0ETA25:
@@ -11895,15 +11895,15 @@ HLT_tau35_mediumRNN_tracktwoMVA_tau25_mediumRNN_tracktwoMVA_03dRAB_L1TAU20IM_2TA
 HLT_tau35_mediumRNN_tracktwoMVA_tau25_mediumRNN_tracktwoMVA_03dRAB_L1cTAU30M_2cTAU20M:
   eventCount: 0
   stepCounts:
-    0: 3
-    1: 3
-    2: 3
-    3: 3
+    0: 4
+    1: 4
+    2: 4
+    3: 4
   stepFeatures:
-    0: 14
-    1: 12
-    2: 12
-    3: 12
+    0: 17
+    1: 15
+    2: 15
+    3: 15
 HLT_tau35_mediumRNN_tracktwoMVA_tau25_mediumRNN_tracktwoMVA_03dRAB_L1cTAU30M_2cTAU20M_4jJ30p0ETA25:
   eventCount: 0
 HLT_tau35_perf_tracktwoMVA_L1TAU20IM:
@@ -12082,10 +12082,10 @@ HLT_tau40_mediumRNN_tracktwoMVA_tau35_mediumRNN_tracktwoMVA_03dRAB_L1cTAU35M_2cT
     2: 3
     3: 3
   stepFeatures:
-    0: 12
-    1: 12
-    2: 12
-    3: 12
+    0: 10
+    1: 10
+    2: 10
+    3: 10
 HLT_tau40_mediumRNN_tracktwoMVA_tau35_mediumRNN_tracktwoMVA_03dRAB_L1cTAU35M_2cTAU30M_2jJ55_3jJ50:
   eventCount: 0
   stepCounts:
@@ -12094,10 +12094,10 @@ HLT_tau40_mediumRNN_tracktwoMVA_tau35_mediumRNN_tracktwoMVA_03dRAB_L1cTAU35M_2cT
     2: 1
     3: 1
   stepFeatures:
-    0: 4
-    1: 4
-    2: 4
-    3: 4
+    0: 3
+    1: 3
+    2: 3
+    3: 3
 HLT_tau40_mediumRNN_tracktwoMVA_tau35_mediumRNN_tracktwoMVA_03dRAB_L1eTAU35M_2eTAU30M:
   eventCount: 0
   stepCounts:
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/TypeWideThresholdConfig.py b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/TypeWideThresholdConfig.py
index 44e022d44aa5a868542a49fcbb41dbf01767617d..2d1e712fa8d9675983d2a23080b57e76650377ee 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/TypeWideThresholdConfig.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/TypeWideThresholdConfig.py
@@ -363,9 +363,9 @@ class L1Config_eTAU:
 
     # BDT eTAU score cuts
     # 12 bits (0 - 4095), BDT > threshold -> pass
-    BDT_fw_loose = 2
-    BDT_fw_medium = 12
-    BDT_fw_tight = 32
+    BDT_fw_loose = 130
+    BDT_fw_medium = 200
+    BDT_fw_tight = 240
 
     # RHad isolation cuts
     # 8 bits (0 - 255), rHad > threshold -> pass
@@ -405,7 +405,7 @@ class L1Config_eTAU:
         ]
         confObj["ptMinToTopo"] = 5 # PLACEHOLDER
         confObj["resolutionMeV"] = 100
-        confObj["minIsoEt"] = 0.0 # Minimum Et for the BDT cut, in units of GeV (internally with 16-bit resolution, in units of 100 MeV)
+        confObj["minIsoEt"] = 13.0 # Minimum Et for the BDT cut, in units of GeV (internally with 16-bit resolution, in units of 100 MeV)
         confObj["maxEt"] = 50 # Maximum Et for the RCore/BDT/RHad cuts, in units of GeV
         confObj["algoVersion"] = int(do_eFex_BDT_Tau)
 
@@ -471,27 +471,27 @@ class L1Config_cTAU:
 
     # Dedicated M thresholds for the primary items:
     #cTAU12M (Medium12)
-    isolation_fw_medium12: int = 358
-    isolation_jTAUCoreScale_fw_medium12: int = 0
-    eTAU_rCoreMin_WP_fw_medium12: eTAUWP = eTAUWP.NoSelection
+    isolation_fw_medium12: int = 620 + 870
+    isolation_jTAUCoreScale_fw_medium12: int = 870
+    eTAU_rCoreMin_WP_fw_medium12: eTAUWP = eTAUWP.Loose
     eTAU_rHadMin_WP_fw_medium12: eTAUWP = eTAUWP.NoSelection
 
     #cTAU20M (Medium20)
-    isolation_fw_medium20: int = 358
-    isolation_jTAUCoreScale_fw_medium20: int = 0
-    eTAU_rCoreMin_WP_fw_medium20: eTAUWP = eTAUWP.NoSelection
+    isolation_fw_medium20: int = 620 + 870
+    isolation_jTAUCoreScale_fw_medium20: int = 870
+    eTAU_rCoreMin_WP_fw_medium20: eTAUWP = eTAUWP.Loose
     eTAU_rHadMin_WP_fw_medium20: eTAUWP = eTAUWP.NoSelection
 
     #cTAU30M (Medium30)
-    isolation_fw_medium30: int = 358
-    isolation_jTAUCoreScale_fw_medium30: int = 0
-    eTAU_rCoreMin_WP_fw_medium30: eTAUWP = eTAUWP.NoSelection
+    isolation_fw_medium30: int = 500 + 870
+    isolation_jTAUCoreScale_fw_medium30: int = 870
+    eTAU_rCoreMin_WP_fw_medium30: eTAUWP = eTAUWP.Medium
     eTAU_rHadMin_WP_fw_medium30: eTAUWP = eTAUWP.NoSelection
 
     #cTAU35M (Medium35)
-    isolation_fw_medium35: int = 358
-    isolation_jTAUCoreScale_fw_medium35: int = 0
-    eTAU_rCoreMin_WP_fw_medium35: eTAUWP = eTAUWP.NoSelection
+    isolation_fw_medium35: int = 385 + 500
+    isolation_jTAUCoreScale_fw_medium35: int = 500
+    eTAU_rCoreMin_WP_fw_medium35: eTAUWP = eTAUWP.Tight
     eTAU_rHadMin_WP_fw_medium35: eTAUWP = eTAUWP.NoSelection
 
     def __post_init__(self):