diff --git a/Event/xAOD/xAODForwardCnv/CMakeLists.txt b/Event/xAOD/xAODForwardCnv/CMakeLists.txt
index a62cf0e569611a0e6511dce18ddf9442cca49266..73cfd283459e7659e197b05a52abcfc8fd684d39 100644
--- a/Event/xAOD/xAODForwardCnv/CMakeLists.txt
+++ b/Event/xAOD/xAODForwardCnv/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( xAODForwardCnv )
@@ -17,5 +17,3 @@ atlas_add_component( xAODForwardCnv
 
 # Install files from the package:
 atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
-atlas_install_joboptions( share/*.py )
-
diff --git a/Event/xAOD/xAODForwardCnv/share/xAODForwardCnv_jobOptions.py b/Event/xAOD/xAODForwardCnv/share/xAODForwardCnv_jobOptions.py
deleted file mode 100644
index 07a22ffb93410b4ea57da36623bd15faa8c8f478..0000000000000000000000000000000000000000
--- a/Event/xAOD/xAODForwardCnv/share/xAODForwardCnv_jobOptions.py
+++ /dev/null
@@ -1,43 +0,0 @@
-# Enable xAOD making:
-from RecExConfig.RecFlags import rec 
-rec.doWritexAOD = True
-#FNAME="/afs/cern.ch/work/a/azemla/xAODDevelop/rel_2_test/test/MinBiasSliceAthenaTrigRDO/AOD.pool.root"
-FNAME="AOD.pool.root"
-
-include( "AthenaPython/iread_file.py" )
-
-# Access the algorithm sequence:
-from AthenaCommon.AlgSequence import AlgSequence
-theJob = AlgSequence()
-
-# Create a logger object:
-from AthenaCommon.Logging import logging
-logger = logging.getLogger( "xAODForwardCnv_jobOptions" )
-
-# Create a POOL output file with the StoreGate contents:
-from OutputStreamAthenaPool.MultipleStreamManager import MSMgr
-xaodStream = MSMgr.NewPoolStream( "StreamAOD", "xAOD.pool.root" )
-
-# Create some xAOD::TrigMinBias objects:
-from xAODForwardCnv.xAODMBTSModuleCreator import  xAODMBTSModuleCreator
-xAODMBTSModuleCreator()
-
-from xAODForwardCnv.xAODForwardEventInfoCreator import xAODForwardEventInfoCreator
-xAODForwardEventInfoCreator()
-
-# Check what happened to the stream:
-xaodStream.Print()
-
-# Split all branches:
-ServiceMgr.AthenaPoolCnvSvc.PoolAttributes += [
-        "DEFAULT_SPLITLEVEL='1'" ]
-
-# Force POOL to just simply use the StoreGate keys as branch names:
-ServiceMgr.AthenaPoolCnvSvc.SubLevelBranchName = "<key>"
-
-# Do some additional tweaking:
-from AthenaCommon.AppMgr import theApp
-theApp.EvtMax = 10 
-ServiceMgr.MessageSvc.OutputLevel = VERBOSE
-ServiceMgr.MessageSvc.defaultLimit = 1000
-
diff --git a/Event/xAOD/xAODMuonCnv/CMakeLists.txt b/Event/xAOD/xAODMuonCnv/CMakeLists.txt
index 9753a9a157ae0c65428f76a2959f3eea25c6beaf..1063ca068eeded93e48f63b4469b8b7fb8dbe2bd 100644
--- a/Event/xAOD/xAODMuonCnv/CMakeLists.txt
+++ b/Event/xAOD/xAODMuonCnv/CMakeLists.txt
@@ -1,6 +1,4 @@
-################################################################################
-# Package: xAODMuonCnv
-################################################################################
+# Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
 
 # Declare the package name:
 atlas_subdir( xAODMuonCnv )
@@ -16,5 +14,3 @@ atlas_add_component( xAODMuonCnv
                      src/*.cxx
                      src/components/*.cxx
                      LINK_LIBRARIES xAODMuonCnvLib AthenaBaseComps AthenaKernel xAODPrimitives muonEvent Particle xAODTruth)
-
-
diff --git a/Event/xAOD/xAODMuonCnv/share/xAODMuonCnv_jobOptions.py b/Event/xAOD/xAODMuonCnv/share/xAODMuonCnv_jobOptions.py
deleted file mode 100755
index 4310cf46bc5e930cfa6e7a18d57d978ecb2ec49d..0000000000000000000000000000000000000000
--- a/Event/xAOD/xAODMuonCnv/share/xAODMuonCnv_jobOptions.py
+++ /dev/null
@@ -1,50 +0,0 @@
-# $Id: ClusterCreator_jobOptions.py 297184 2013-10-03 11:18:41Z krasznaa $
-
-# Set up the reading of the input AOD:
-FNAME = "root://eosatlas.cern.ch//eos/atlas/atlasdatadisk/rucio/valid1/36/d9/AOD.01447493._000116.pool.root.1"
-
-include( "AthenaPython/iread_file.py" )
-# from RecExConfig.RecFlags  import rec
-# from AthenaCommon.BeamFlags import jobproperties
-# from AthenaCommon.AthenaCommonFlags import athenaCommonFlags
-# from AthenaCommon.GlobalFlags import globalflags
-
-# Access the algorithm sequence:
-from AthenaCommon.AlgSequence import AlgSequence
-theJob = AlgSequence()
-
-# Create a POOL output file with the StoreGate contents:
-from OutputStreamAthenaPool.MultipleStreamManager import MSMgr
-xaodStream = MSMgr.NewPoolStream( "StreamAOD", "xAOD.pool.root" )
-
-# Set up its contents:
-# xaodStream.AddItem( "xAOD::CaloClusterContainer_v1#*" )
-# xaodStream.AddItem( "xAOD::CaloClusterAuxContainer_v1#*" )
-
-xaodStream.AddItem( "xAOD::TruthParticleContainer#*")
-xaodStream.AddItem( "xAOD::TruthParticleAuxContainer#*")
-xaodStream.AddItem( "xAOD::TrackParticleContainer#*" )
-xaodStream.AddItem( "xAOD::TrackParticleAuxContainer#*" )
-xaodStream.AddItem( "xAOD::MuonContainer#*" )
-xaodStream.AddItem( "xAOD::MuonAuxContainer#*" )
-xaodStream.AddItem( "xAOD::MuonSegmentContainer#*")
-xaodStream.AddItem( "xAOD::MuonSegmentAuxContainer#*")
-xaodStream.AddItem( "xAOD::EventInfo#*" )
-xaodStream.AddItem( "xAOD::EventAuxInfo#*" )
-xaodStream.Print()
-
-# Split all branches:
-ServiceMgr.AthenaPoolCnvSvc.PoolAttributes += [
-    "DEFAULT_SPLITLEVEL='99'" ]
-
-# Force POOL to just simply use the StoreGate keys as branch names:
-ServiceMgr.AthenaPoolCnvSvc.SubLevelBranchName = "<key>"
-
-# Do some additional tweaking:
-from AthenaCommon.AppMgr import theApp
-theApp.EvtMax = -1
-ServiceMgr.MessageSvc.OutputLevel = INFO
-ServiceMgr.MessageSvc.defaultLimit = 1000000
-
-#from VP1Algs.VP1AlgsConf import VP1Alg
-#theJob += VP1Alg()
diff --git a/Event/xAOD/xAODTauCnv/CMakeLists.txt b/Event/xAOD/xAODTauCnv/CMakeLists.txt
index fa0f04ca4ef38044e886f224c15745729e06926f..7aa2ba580aa0a55afd4a35248ce5947d6c582d04 100644
--- a/Event/xAOD/xAODTauCnv/CMakeLists.txt
+++ b/Event/xAOD/xAODTauCnv/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( xAODTauCnv )
@@ -17,5 +17,3 @@ atlas_add_component( xAODTauCnv
 
 # Install files from the package:
 atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
-atlas_install_joboptions( share/*.py )
-
diff --git a/Event/xAOD/xAODTauCnv/share/xAODTauCnv_jobOptions.py b/Event/xAOD/xAODTauCnv/share/xAODTauCnv_jobOptions.py
deleted file mode 100644
index 6b8f5e8ced7fda00b19d15e28391d358ba4229f4..0000000000000000000000000000000000000000
--- a/Event/xAOD/xAODTauCnv/share/xAODTauCnv_jobOptions.py
+++ /dev/null
@@ -1,46 +0,0 @@
-
-
-# $Id: xAODTauCnv_jobOptions.py 579532 2014-01-22 12:40:33Z janus $
-
-# Turn off Tau reconstruction manually for now...
-from RecExConfig.RecFlags import rec
-#rec.doTau = False
-
-# Set up the reading of a file:
-FNAME = "AOD.pool.root"
-include( "AthenaPython/iread_file.py" )
-
-# Access the algorithm sequence:
-from AthenaCommon.AlgSequence import AlgSequence
-theJob = AlgSequence()
-
-# Create a POOL output file with the StoreGate contents:
-from OutputStreamAthenaPool.MultipleStreamManager import MSMgr
-xaodStream = MSMgr.NewPoolStream( "StreamAOD", "xAOD.pool.root" )
-
-# Create the xAOD taus:
-from xAODTauCnv.xAODTauConverter import xAODTauConverter
-xAODTauConverter()
-
-
-# Check what happened to the stream:
-xaodStream.Print()
-
-# Split all branches:
-ServiceMgr.AthenaPoolCnvSvc.PoolAttributes += [
-    "DEFAULT_SPLITLEVEL='1'" ]
-
-# Force POOL to just simply use the StoreGate keys as branch names:
-ServiceMgr.AthenaPoolCnvSvc.SubLevelBranchName = "<key>"
-
-# Do some additional tweaking:
-from AthenaCommon.AppMgr import theApp
-theApp.EvtMax = 10
-ServiceMgr.MessageSvc.OutputLevel = INFO
-ServiceMgr.MessageSvc.defaultLimit = 1000000
-
-
-#theJob.AntiKt4LCTopoJetsCnv.Enable = False
-#theJob.AntiKt6LCTopoJetsCnv.Enable = False
-#theJob.AntiKt4TopoEMJetsCnv.Enable = False
-#theJob.AntiKt6TopoEMJetsCnv.Enable = False
diff --git a/Event/xAOD/xAODTauCnv/share/xAODTauReader_jobOptions.py b/Event/xAOD/xAODTauCnv/share/xAODTauReader_jobOptions.py
deleted file mode 100644
index a0cd5aba0996df84c88cd18d8ace75bc8e19de00..0000000000000000000000000000000000000000
--- a/Event/xAOD/xAODTauCnv/share/xAODTauReader_jobOptions.py
+++ /dev/null
@@ -1,24 +0,0 @@
-# $Id: xAODTauReader_jobOptions.py 632174 2014-11-29 15:23:36Z krasznaa $
-
-# Set up the reading of a file:
-import AthenaPoolCnvSvc.ReadAthenaPool
-ServiceMgr.EventSelector.InputCollections = [
-    "AOD.pool.root"
-    ]
-
-# Access the algorithm sequence:
-from AthenaCommon.AlgSequence import AlgSequence
-theJob = AlgSequence()
-
-# Add the test algorithm:
-theJob += CfgMgr.xAODMaker__TauJetReaderAlg( "TauJetReaderAlg",
-                                             OutputLevel = DEBUG )
-
-# Write out a file with the "new" tau objects:
-from OutputStreamAthenaPool.MultipleStreamManager import MSMgr
-xaodStream = MSMgr.NewPoolRootStream( "StreamAOD", "newAOD.pool.root" )
-xaodStream.AddItem( [ "xAOD::TauJetContainer#*",
-                      "xAOD::TauJetAuxContainer#*" ] )
-
-# Some additional settings:
-theApp.EvtMax = 10
diff --git a/Event/xAOD/xAODTrigCaloCnv/CMakeLists.txt b/Event/xAOD/xAODTrigCaloCnv/CMakeLists.txt
index 7022ee13570477bafddd9d06e1d6846e3e0ccd1f..bf5095779100a9e35f5cdddfb3cca2c08b0153e8 100644
--- a/Event/xAOD/xAODTrigCaloCnv/CMakeLists.txt
+++ b/Event/xAOD/xAODTrigCaloCnv/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( xAODTrigCaloCnv )
@@ -17,5 +17,3 @@ atlas_add_component( xAODTrigCaloCnv
 
 # Install files from the package:
 atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
-atlas_install_joboptions( share/*.py )
-
diff --git a/Event/xAOD/xAODTrigCaloCnv/share/xAODTrigCaloCnv_jobOptions.py b/Event/xAOD/xAODTrigCaloCnv/share/xAODTrigCaloCnv_jobOptions.py
deleted file mode 100644
index d4fc97fe4579e66e3ef0be8e54d435073563b41c..0000000000000000000000000000000000000000
--- a/Event/xAOD/xAODTrigCaloCnv/share/xAODTrigCaloCnv_jobOptions.py
+++ /dev/null
@@ -1,55 +0,0 @@
-# $Id: xAODTrigCaloCnv_jobOptions.py 592334 2014-04-10 11:01:56Z krasznaa $
-
-# Enable xAOD making:
-from RecExConfig.RecFlags import rec
-rec.doWritexAOD = True
-
-# Set up the reading of a file:
-FNAME = "AOD.pool.root"
-include( "AthenaPython/iread_file.py" )
-
-# Access the algorithm sequence:
-from AthenaCommon.AlgSequence import AlgSequence
-theJob = AlgSequence()
-
-# Create a logger object:
-from AthenaCommon.Logging import logging
-logger = logging.getLogger( "xAODTrigCaloCnv_jobOptions" )
-
-# Create a POOL output file with the StoreGate contents:
-from OutputStreamAthenaPool.MultipleStreamManager import MSMgr
-xaodStream = MSMgr.NewPoolStream( "StreamAOD", "xAOD.pool.root" )
-
-# Create the xAOD trigger calorimeter cluster:
-from xAODTrigCaloCnv.xAODTrigCaloClusterCreator import xAODTrigCaloClusterCreator
-xAODTrigCaloClusterCreator()
-alg = getattr( theJob, "xAODMaker::TrigCaloClusterCnvAlg" )
-alg.OutputLevel = DEBUG
-
-# Create the xAOD trigger EM cluster:
-from xAODTrigCaloCnv.xAODTrigEMClusterCreator import xAODTrigEMClusterCreator
-xAODTrigEMClusterCreator()
-alg = getattr( theJob, "xAODMaker::TrigEMClusterCnvAlg" )
-alg.OutputLevel = DEBUG
-
-# Additional type(s) created automatically by RecExCommon:
-xaodStream.AddItem( "xAOD::TrigCaloClusterContainer_v1#*" )
-xaodStream.AddItem( "xAOD::TrigCaloClusterAuxContainer_v1#*" )
-xaodStream.AddItem( "xAOD::TrigEMClusterContainer_v1#*" )
-xaodStream.AddItem( "xAOD::TrigEMClusterAuxContainer_v1#*" )
-
-# Check what happened to the stream:
-xaodStream.Print()
-
-# Split all branches:
-ServiceMgr.AthenaPoolCnvSvc.PoolAttributes += [
-    "DEFAULT_SPLITLEVEL='1'" ]
-
-# Force POOL to just simply use the StoreGate keys as branch names:
-ServiceMgr.AthenaPoolCnvSvc.SubLevelBranchName = "<key>"
-
-# Do some additional tweaking:
-from AthenaCommon.AppMgr import theApp
-theApp.EvtMax = 100
-ServiceMgr.MessageSvc.OutputLevel = INFO
-ServiceMgr.MessageSvc.defaultLimit = 1000
diff --git a/Event/xAOD/xAODTrigMinBiasCnv/CMakeLists.txt b/Event/xAOD/xAODTrigMinBiasCnv/CMakeLists.txt
index 27a92ddd793a61da710fd74c5e33a93ee002f78c..e6b898a1d4198e4a3a9a814c7b1d2a44c0b31c84 100644
--- a/Event/xAOD/xAODTrigMinBiasCnv/CMakeLists.txt
+++ b/Event/xAOD/xAODTrigMinBiasCnv/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( xAODTrigMinBiasCnv )
@@ -17,5 +17,3 @@ atlas_add_component( xAODTrigMinBiasCnv
 
 # Install files from the package:
 atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
-atlas_install_joboptions( share/*.py )
-
diff --git a/Event/xAOD/xAODTrigMinBiasCnv/share/xAODTrigMinBiasCnv_jobOptions.py b/Event/xAOD/xAODTrigMinBiasCnv/share/xAODTrigMinBiasCnv_jobOptions.py
deleted file mode 100755
index 3dd9a4911257dcd8910167f1852e924b42fd29fc..0000000000000000000000000000000000000000
--- a/Event/xAOD/xAODTrigMinBiasCnv/share/xAODTrigMinBiasCnv_jobOptions.py
+++ /dev/null
@@ -1,50 +0,0 @@
-# $Id: xAODTrigMinBiasCnv_jobOptions.py 592539 2014-04-11 10:17:29Z krasznaa $
-
-# Enable xAOD making:
-from RecExConfig.RecFlags import rec
-rec.doWritexAOD = True
-#FNAME="/afs/cern.ch/work/a/azemla/xAODDevelop/rel_2_test/test/MinBiasSliceAthenaTrigRDO/AOD.pool.root"
-FNAME="/afs/cern.ch/user/a/azemla/workdir/xAODDevelop/DATA/mc11_7TeV.105200.T1_McAtNlo_Jimmy.merge.AOD.e835_s1272_s1274_r2730_r2780_tid541650_00/AOD.541650._000544.pool.root.1"
-
-include( "AthenaPython/iread_file.py" )
-
-# Access the algorithm sequence:
-from AthenaCommon.AlgSequence import AlgSequence
-theJob = AlgSequence()
-
-# Create a logger object:
-from AthenaCommon.Logging import logging
-logger = logging.getLogger( "xAODTrigMinBiasCnv_jobOptions" )
-
-# Create a POOL output file with the StoreGate contents:
-from OutputStreamAthenaPool.MultipleStreamManager import MSMgr
-xaodStream = MSMgr.NewPoolStream( "StreamAOD", "xAOD.pool.root" )
-
-# Create some xAOD::TrigMinBias objects:
-from xAODTrigMinBiasCnv.xAODTrigTrackCountsCreator import  xAODTrigTrackCountsCreator
-xAODTrigTrackCountsCreator()
-
-from xAODTrigMinBiasCnv.xAODTrigVertexCountsCreator import  xAODTrigVertexCountsCreator
-xAODTrigVertexCountsCreator()
-
-from xAODTrigMinBiasCnv.xAODTrigT2MbtsBitsCreator import  xAODTrigT2MbtsBitsCreator
-xAODTrigT2MbtsBitsCreator()
-
-from xAODTrigMinBiasCnv.xAODTrigSpacePointCountsCreator import  xAODTrigSpacePointCountsCreator
-xAODTrigSpacePointCountsCreator()
-
-# Check what happened to the stream:
-xaodStream.Print()
-
-# Split all branches:
-ServiceMgr.AthenaPoolCnvSvc.PoolAttributes += [
-    "DEFAULT_SPLITLEVEL='1'" ]
-
-# Force POOL to just simply use the StoreGate keys as branch names:
-ServiceMgr.AthenaPoolCnvSvc.SubLevelBranchName = "<key>"
-
-# Do some additional tweaking:
-from AthenaCommon.AppMgr import theApp
-theApp.EvtMax = 100
-ServiceMgr.MessageSvc.OutputLevel = VERBOSE
-ServiceMgr.MessageSvc.defaultLimit = 1000
diff --git a/Event/xAOD/xAODTrigMissingETCnv/CMakeLists.txt b/Event/xAOD/xAODTrigMissingETCnv/CMakeLists.txt
index d0ddf4145a5bc90321c2c0b7bf9538e319967e84..986db0138cff43f082e7afea75bcef6501b2a854 100644
--- a/Event/xAOD/xAODTrigMissingETCnv/CMakeLists.txt
+++ b/Event/xAOD/xAODTrigMissingETCnv/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( xAODTrigMissingETCnv )
@@ -17,5 +17,3 @@ atlas_add_component( xAODTrigMissingETCnv
 
 # Install files from the package:
 atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
-atlas_install_joboptions( share/*.py )
-
diff --git a/Event/xAOD/xAODTrigMissingETCnv/share/xAODTrigMissingETCnv_jobOptions.py b/Event/xAOD/xAODTrigMissingETCnv/share/xAODTrigMissingETCnv_jobOptions.py
deleted file mode 100644
index e4f342a4251327209d511605efc222afc7a06588..0000000000000000000000000000000000000000
--- a/Event/xAOD/xAODTrigMissingETCnv/share/xAODTrigMissingETCnv_jobOptions.py
+++ /dev/null
@@ -1,42 +0,0 @@
-# $Id: xAODTrigMissingETCnv_jobOptions.py 592539 2014-04-11 10:17:29Z krasznaa $
-
-# Enable xAOD making:
-from RecExConfig.RecFlags import rec
-rec.doWritexAOD = True
-
-# Set up the reading of a file:
-FNAME = "AOD.pool.root"
-include( "AthenaPython/iread_file.py" )
-
-# Access the algorithm sequence:
-from AthenaCommon.AlgSequence import AlgSequence
-theJob = AlgSequence()
-
-# Create a logger object:
-from AthenaCommon.Logging import logging
-logger = logging.getLogger( "xAODTrigMissingETCnv_jobOptions" )
-
-# Create a POOL output file with the StoreGate contents:
-from OutputStreamAthenaPool.MultipleStreamManager import MSMgr
-xaodStream = MSMgr.NewPoolStream( "StreamAOD", "xAOD.pool.root" )
-
-# Create some xAOD::TrigMissingET objects:
-from xAODTrigMissingETCnv.xAODTrigMissingETCreator import \
-    xAODTrigMissingETCreator
-xAODTrigMissingETCreator()
-
-# Check what happened to the stream:
-xaodStream.Print()
-
-# Split all branches:
-ServiceMgr.AthenaPoolCnvSvc.PoolAttributes += [
-    "DEFAULT_SPLITLEVEL='1'" ]
-
-# Force POOL to just simply use the StoreGate keys as branch names:
-ServiceMgr.AthenaPoolCnvSvc.SubLevelBranchName = "<key>"
-
-# Do some additional tweaking:
-from AthenaCommon.AppMgr import theApp
-theApp.EvtMax = 100
-ServiceMgr.MessageSvc.OutputLevel = INFO
-ServiceMgr.MessageSvc.defaultLimit = 1000
diff --git a/Event/xAOD/xAODTriggerCnv/CMakeLists.txt b/Event/xAOD/xAODTriggerCnv/CMakeLists.txt
index 1e5777204bba89e5c91b5d92d9025fc9b7738f26..279e033e4d59c4d71ef725bf0ae0da7af6acf0c0 100644
--- a/Event/xAOD/xAODTriggerCnv/CMakeLists.txt
+++ b/Event/xAOD/xAODTriggerCnv/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( xAODTriggerCnv )
@@ -67,4 +67,3 @@ endif()
 
 # Install files from the package:
 atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
-atlas_install_joboptions( share/*.py )
diff --git a/Event/xAOD/xAODTriggerCnv/share/TriggerMenuMetaDataTool_jobOptions.py b/Event/xAOD/xAODTriggerCnv/share/TriggerMenuMetaDataTool_jobOptions.py
deleted file mode 100644
index c232c63fb29168423f32f943bca3fe746342646b..0000000000000000000000000000000000000000
--- a/Event/xAOD/xAODTriggerCnv/share/TriggerMenuMetaDataTool_jobOptions.py
+++ /dev/null
@@ -1,42 +0,0 @@
-# $Id: TriggerMenuMetaDataTool_jobOptions.py 651874 2015-03-05 14:16:19Z krasznaa $
-#
-# This is a simple test for xAODMaker::TriggerMenuMetaDataTool, testing if
-# it does its job correctly during file processing.
-#
-
-# Set up the reading of the input files using RecExCommon:
-from AthenaCommon.AthenaCommonFlags import athenaCommonFlags
-athenaCommonFlags.FilesInput = [
-    "/afs/cern.ch/atlas/project/PAT/xAODs/r5787/"
-    "mc14_13TeV.110401.PowhegPythia_P2012_ttbar_nonallhad.merge.AOD."
-    "e2928_s1982_s2008_r5787_r5853_tid01597980_00/"
-    "AOD.01597980._000098.pool.root.1",
-    "/afs/cern.ch/atlas/project/PAT/xAODs/r5787/"
-    "mc14_13TeV.110401.PowhegPythia_P2012_ttbar_nonallhad.merge.AOD."
-    "e2928_s1982_s2008_r5787_r5853_tid01597980_00/"
-    "AOD.01597980._000420.pool.root.1"
-    ]
-athenaCommonFlags.EvtMax = -1
-
-# Include RecExCommon:
-from RecExConfig.RecFlags import rec
-rec.doCBNT.set_Value_and_Lock( False )
-rec.doWriteTAG.set_Value_and_Lock( False )
-rec.doAOD.set_Value_and_Lock( False )
-rec.doWriteAOD.set_Value_and_Lock( False )
-include( "RecExCommon/RecExCommon_topOptions.py" )
-
-# Configure the metadata tool:
-ToolSvc += CfgMgr.xAODMaker__TriggerMenuMetaDataTool( "TriggerMenuMetaDataTool",
-                                                      OutputLevel = 1 )
-svcMgr.MetaDataSvc.MetaDataTools += [ ToolSvc.TriggerMenuMetaDataTool ]
-
-# Set up an output file:
-from OutputStreamAthenaPool.MultipleStreamManager import MSMgr
-output = MSMgr.NewPoolRootStream( "StreamAOD", "merged.pool.root" )
-
-# Add some event and metadata items to the stream:
-output.AddItem( [ "xAOD::EventInfo#EventInfo",
-                   "xAOD::EventAuxInfo#EventInfoAux." ] )
-output.AddMetaDataItem( [ "xAOD::TriggerMenuContainer#TriggerMenu",
-                          "xAOD::TriggerMenuAuxContainer#TriggerMenuAux." ] )
diff --git a/Event/xAOD/xAODTriggerCnv/share/decisionFix_preInclude.py b/Event/xAOD/xAODTriggerCnv/share/decisionFix_preInclude.py
deleted file mode 100644
index 7b4bd990affa7018edd99754e71938fc72129165..0000000000000000000000000000000000000000
--- a/Event/xAOD/xAODTriggerCnv/share/decisionFix_preInclude.py
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-from AthenaCommon.AlgSequence import AlgSequence
-topSequence=AlgSequence()
-
-#fix xAOD trigger object by scheduling cnv alg again
-
-include( "RecExCond/RecExCommon_flags.py" )
-
-from xAODTriggerCnv.xAODTriggerCnvConf import xAODMaker__TrigDecisionCnvAlg
-topSequence += xAODMaker__TrigDecisionCnvAlg("TrigDecisionCnvAlg")
-topSequence.TrigDecisionCnvAlg.xAODKey = 'xTrigDecision'
-
-from TrigDecisionTool.TrigDecisionToolConf import Trig__TrigDecisionTool
-ToolSvc += Trig__TrigDecisionTool( "TrigDecisionTool" )
-
diff --git a/Event/xAOD/xAODTriggerCnv/share/xAODTriggerCnv_jobOptions.py b/Event/xAOD/xAODTriggerCnv/share/xAODTriggerCnv_jobOptions.py
deleted file mode 100644
index fa025d4c6460b3dd96515f5bb59bc15f2a955329..0000000000000000000000000000000000000000
--- a/Event/xAOD/xAODTriggerCnv/share/xAODTriggerCnv_jobOptions.py
+++ /dev/null
@@ -1,63 +0,0 @@
-# $Id: xAODTriggerCnv_jobOptions.py 583381 2014-02-14 15:58:20Z krasznaa $
-
-# Enable xAOD making:
-from RecExConfig.RecFlags import rec
-rec.doWritexAOD = True
-
-# Set up the reading of a file:
-FNAME = "AOD.pool.root"
-include( "AthenaPython/iread_file.py" )
-
-# Access the algorithm sequence:
-from AthenaCommon.AlgSequence import AlgSequence
-theJob = AlgSequence()
-
-# Create a logger object:
-from AthenaCommon.Logging import logging
-logger = logging.getLogger( "xAODTriggerCnv_jobOptions" )
-
-# Create a POOL output file with the StoreGate contents:
-from OutputStreamAthenaPool.MultipleStreamManager import MSMgr
-xaodStream = MSMgr.NewPoolStream( "StreamAOD", "xAOD.pool.root" )
-
-# Create the xAOD RoIs:
-from xAODTriggerCnv.xAODRoICreator import xAODRoICreator
-xAODRoICreator()
-
-# Create the xAOD trigger decision:
-from xAODTriggerCnv.xAODTrigDecisionCreator import xAODTrigDecisionCreator
-xAODTrigDecisionCreator()
-
-# Add bunch configuration metadata to the file:
-from xAODTriggerCnv.xAODBunchConfCreator import xAODBunchConfCreator
-xAODBunchConfCreator()
-
-# Additional type(s) created automatically by RecExCommon:
-xaodStream.AddItem( "xAOD::EventInfo_v1#EventInfo" )
-xaodStream.AddItem( "xAOD::EventAuxInfo_v1#EventInfoAux." )
-xaodStream.AddItem( "xAOD::CaloClusterContainer_v1#*" )
-xaodStream.AddItem( "xAOD::CaloClusterAuxContainer_v1#*" )
-xaodStream.AddItem( "xAOD::MuonContainer_v1#*" )
-xaodStream.AddItem( "xAOD::MuonAuxContainer_v1#*" )
-xaodStream.AddItem( "xAOD::TrackParticleContainer_v1#*" )
-xaodStream.AddItem( "xAOD::TrackParticleAuxContainer_v1#*" )
-xaodStream.AddItem( "xAOD::VertexContainer_v1#*" )
-xaodStream.AddItem( "xAOD::VertexAuxContainer_v1#*" )
-xaodStream.AddItem( "xAOD::TauJetContainer_v1#*" )
-xaodStream.AddItem( "xAOD::TauJetAuxContainer_v1#*" )
-
-# Check what happened to the stream:
-xaodStream.Print()
-
-# Split all branches:
-ServiceMgr.AthenaPoolCnvSvc.PoolAttributes += [
-    "DEFAULT_SPLITLEVEL='1'" ]
-
-# Force POOL to just simply use the StoreGate keys as branch names:
-ServiceMgr.AthenaPoolCnvSvc.SubLevelBranchName = "<key>"
-
-# Do some additional tweaking:
-from AthenaCommon.AppMgr import theApp
-theApp.EvtMax = 100
-ServiceMgr.MessageSvc.OutputLevel = INFO
-ServiceMgr.MessageSvc.defaultLimit = 1000
diff --git a/MuonSpectrometer/MuonCnv/MuonNSWCommonDecode/src/NSWTriggerSTGL1AElink.cxx b/MuonSpectrometer/MuonCnv/MuonNSWCommonDecode/src/NSWTriggerSTGL1AElink.cxx
index 91e6c78f1afae22e8de9e8eccc96d6bcd74d5ffb..7096c5e7e1470f10577b94c390c5cff7f5904937 100644
--- a/MuonSpectrometer/MuonCnv/MuonNSWCommonDecode/src/NSWTriggerSTGL1AElink.cxx
+++ b/MuonSpectrometer/MuonCnv/MuonNSWCommonDecode/src/NSWTriggerSTGL1AElink.cxx
@@ -107,7 +107,7 @@ void Muon::nsw::NSWTriggerSTGL1AElink::decode_data(std::size_t& readPointer) {
   while (readPointer < endOfData) {
     static constexpr auto SIZE_DATA_HEADER = STGTPL1A::size_stream_head_nbits + STGTPL1A::size_stream_head_nwords +
                                              STGTPL1A::size_stream_head_fifo_size + STGTPL1A::size_stream_head_streamID;
-    if (readPointer + SIZE_DATA_HEADER >= endOfData) {
+    if (readPointer + SIZE_DATA_HEADER > endOfData) {
       throw std::length_error(
 			      Muon::nsw::format("Read pointer ({}) would excede memory dedicated to data chunks ({}) while parsing the header (size: {})",
 						readPointer, endOfData, SIZE_DATA_HEADER));
diff --git a/Trigger/TrigSteer/DecisionHandling/src/RoRSeqFilter.cxx b/Trigger/TrigSteer/DecisionHandling/src/RoRSeqFilter.cxx
index 83f1dcbd3bbf76449a71cb785197b6524acecd71..948b18c62245925f8ed2275be64283db29c6c9fd 100644
--- a/Trigger/TrigSteer/DecisionHandling/src/RoRSeqFilter.cxx
+++ b/Trigger/TrigSteer/DecisionHandling/src/RoRSeqFilter.cxx
@@ -50,9 +50,9 @@ StatusCode RoRSeqFilter::initialize()
 
   for ( size_t i = 0; i < m_ioMapping.size(); ++i ) {
     for ( unsigned inIndex: m_ioMapping[i] ) {
-      ATH_MSG_INFO("Input collection: " << m_inputKeys[inIndex] );
+      ATH_MSG_DEBUG("Input collection: " << m_inputKeys[inIndex] );
     }
-    ATH_MSG_INFO("   Routed to output collection " << m_outputKeys[i] );
+    ATH_MSG_DEBUG("   Routed to output collection " << m_outputKeys[i] );
   }
 
   // crosscheck mapping (also the default one)
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/TopoAlgoDef.py b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/TopoAlgoDef.py
index b4775c62f3f5146e34a789b8e70102be82749c2f..184b5691d3afbc4fd82cf6151b1375a8a907bcc7 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/TopoAlgoDef.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/TopoAlgoDef.py
@@ -1185,7 +1185,7 @@ class TopoAlgoDef:
                 alg.addvariable(key, value)
             alg.addvariable('MinET', 0)
             for bitid,minxe in enumerate(d.Threlist):
-                alg.addvariable('KFXE', str(minxe), bitid)            
+                alg.addvariable('KFXE', str(minxe*_et_conversion), bitid) 
             tm.registerTopoAlgo(alg)