diff --git a/PhysicsAnalysis/D3PDMaker/D3PDMakerTest/share/D3PDTestEgammaAOD-15_jo.py b/PhysicsAnalysis/D3PDMaker/D3PDMakerTest/share/D3PDTestEgammaAOD-15_jo.py
deleted file mode 100644
index 802efb62a867fa3100a7afeb098b19f677f4848f..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/D3PDMaker/D3PDMakerTest/share/D3PDTestEgammaAOD-15_jo.py
+++ /dev/null
@@ -1,8 +0,0 @@
-# Test reading a v15 file.
-
-infile = 'aod/AOD-15.6.4/AOD-15.6.4-full.pool.root'
-reffile = 'egamma-aod-d3pd-15.ref'
-tupleFileOutput = 'egamma-15.root'
-jo = 'D3PDMakerConfig/AODToEgammaD3PD.py'
-include ('D3PDMakerTest/run-d3pd-test.py')
-
diff --git a/PhysicsAnalysis/D3PDMaker/D3PDMakerTest/share/D3PDTestEgammaAOD-16_0_jo.py b/PhysicsAnalysis/D3PDMaker/D3PDMakerTest/share/D3PDTestEgammaAOD-16_0_jo.py
deleted file mode 100644
index b58e7943ce7f2d42b5682b4210a69cdc182edf3c..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/D3PDMaker/D3PDMakerTest/share/D3PDTestEgammaAOD-16_0_jo.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# Test reading a v16.0 file.
-
-infile = 'aod/AOD-16.0.2.3/AOD-16.0.2.3-full.pool.root'
-reffile = 'egamma-aod-d3pd-16_0.ref'
-tupleFileOutput = 'egamma-16_0.root'
-jo = 'D3PDMakerConfig/AODToEgammaD3PD.py'
-
-# Force AODFix off, to get repeatible results across releases.
-from RecExConfig.RecFlags import rec
-rec.doApplyAODFix.set_Value_and_Lock(False)
-
-include ('D3PDMakerTest/run-d3pd-test.py')
-
diff --git a/PhysicsAnalysis/D3PDMaker/D3PDMakerTest/share/D3PDTestEgammaAOD-16_6_jo.py b/PhysicsAnalysis/D3PDMaker/D3PDMakerTest/share/D3PDTestEgammaAOD-16_6_jo.py
deleted file mode 100644
index a3b28957f17e4d7fb224b3216a9e800f6c3c19bc..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/D3PDMaker/D3PDMakerTest/share/D3PDTestEgammaAOD-16_6_jo.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# Test reading a v16.6 file.
-
-infile = 'aod/AOD-16.6.2.1/AOD-16.6.2.1-full.pool.root'
-reffile = 'egamma-aod-d3pd-16_6.ref'
-tupleFileOutput = 'egamma-16_6.root'
-jo = 'D3PDMakerConfig/AODToEgammaD3PD.py'
-
-# Force AODFix off, to get repeatible results across releases.
-from RecExConfig.RecFlags import rec
-rec.doApplyAODFix.set_Value_and_Lock(False)
-
-include ('D3PDMakerTest/run-d3pd-test.py')
-
diff --git a/PhysicsAnalysis/D3PDMaker/D3PDMakerTest/share/D3PDTestEgammaAOD-17_0_jo.py b/PhysicsAnalysis/D3PDMaker/D3PDMakerTest/share/D3PDTestEgammaAOD-17_0_jo.py
deleted file mode 100644
index c2059c9d58cea6dcc8ac2ee070cff8eb674096f0..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/D3PDMaker/D3PDMakerTest/share/D3PDTestEgammaAOD-17_0_jo.py
+++ /dev/null
@@ -1,27 +0,0 @@
-# Test reading a v17.0 file.
-
-import os
-testdata = os.environ.get ('D3PDTESTDATA',
- '/afs/cern.ch/atlas/maxidisk/d33/referencefiles')
-
-# Testing changing trigger menu.
-infile1 = 'aod/AOD-17.0.2/AOD-17.0.2-munged.pool.root'
-#infile1 = os.path.join (testdata, infile1)
-#infile1a = 'AOD-17.0.2-munged.pool.root'
-infile2 = 'aod/AOD-17.0.4/AOD-17.0.4-full.pool.root'
-
-#os.system ('python -m D3PDMakerTest.changerun 123456 %s %s' %
-# (infile1, infile1a))
-
-infile = [infile1, infile2]
-
-reffile = 'egamma-aod-d3pd-17_0.ref'
-tupleFileOutput = 'egamma-17_0.root'
-jo = 'D3PDMakerConfig/AODToEgammaD3PD.py'
-
-# Force AODFix off, to get repeatible results across releases.
-from RecExConfig.RecFlags import rec
-rec.doApplyAODFix.set_Value_and_Lock(False)
-
-include ('D3PDMakerTest/run-d3pd-test.py')
-
diff --git a/PhysicsAnalysis/D3PDMaker/D3PDMakerTest/share/D3PDTestEgammaAOD_jo.py b/PhysicsAnalysis/D3PDMaker/D3PDMakerTest/share/D3PDTestEgammaAOD_jo.py
deleted file mode 100644
index c52aaa1a1c0515fcc321b325951daf366e6d83dc..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/D3PDMaker/D3PDMakerTest/share/D3PDTestEgammaAOD_jo.py
+++ /dev/null
@@ -1,184 +0,0 @@
-infile = 'aod/AOD-17.2.0.2/AOD-17.2.0.2-full.pool.root'
-reffile = 'egamma-aod-d3pd.ref'
-jo = 'D3PDMakerConfig/AODToEgammaD3PD.py'
-
-from RecExConfig.RecFlags import rec
-import RecExConfig.RecAlgsFlags
-
-
-# Force AODFix off, to get repeatible results across releases.
-from RecExConfig.RecFlags import rec
-rec.doApplyAODFix.set_Value_and_Lock(False)
-
-#from AthenaCommon.JobProperties import jobproperties
-#jobproperties.Global.DetDescrVersion = 'ATLAS-GEO-16-00-00'
-##import AtlasGeoModel.GeoModelInit
-#import AtlasGeoModel.SetGeometryVersion
-from AthenaCommon.GlobalFlags import globalflags
-globalflags.DetDescrVersion.set_Value_and_Lock('ATLAS-GEO-18-00-00')
-
-include ('D3PDMakerTest/run-d3pd-test.py')
-
-svcMgr.GeoModelSvc.IgnoreTagDifference = True
-
-from OutputStreamAthenaPool.MultipleStreamManager import MSMgr
-alg = MSMgr.GetStream('StreamNTUP_EGAMMA')
-
-# Test adding another electron with a different container type.
-from egammaD3PDMaker.ElectronD3PDObject import ElectronD3PDObject
-#alg += ElectronD3PDObject (10,
-# sgkey = 'HLT_egamma',
-# typeName = 'egammaContainer',
-# exclude = ['EFInfo', 'L2Info', 'L1Info',
-# 'EFIndex', 'L2Index', 'L1Index'],
-# prefix = 'ef_el_')
-
-# Try doing some filtering...
-from D3PDMakerConfig.D3PDMakerFlags import D3PDMakerFlags
-from D3PDMakerCoreComps.resolveSGKey import resolveSGKey
-from AthenaCommon.AlgSequence import AlgSequence
-from D3PDMakerCoreComps.D3PDObject import D3PDObject
-import EventCommonD3PDMaker
-import D3PDMakerCoreComps
-preseq = AlgSequence (D3PDMakerFlags.PreD3PDAlgSeqName())
-from AnalysisUtils.AnalysisUtilsConf import IParticleSelector
-#preseq += IParticleSelector \
-# ('elesel',
-# PtMin = 15*GeV,
-# InputKey = resolveSGKey ('ElectronContainer',
-# D3PDMakerFlags.ElectronSGKey()),
-# OutSelectedParticlesKey = 'elesel',
-# OutParticleLinksKey = 'elelinks')
-#alg += ElectronD3PDObject (10,
-# sgkey = D3PDMakerFlags.ElectronSGKey(),
-# getterFilter = 'elesel',
-# prefix = 'elfilt_')
-
-#def make_Ele2D3PDObject (name, prefix, object_name):
-# getter = EventCommonD3PDMaker.IParticleLinksCollectionGetterTool \
-# (SGKey = 'elelinks')
-# return D3PDMakerCoreComps.VectorFillerTool (name,
-# Prefix = prefix,
-# Getter = getter)
-#Ele2D3PDObject = D3PDObject (make_Ele2D3PDObject, 'elfilt2_')
-#Ele2D3PDObject.defineBlock (0, 'Kinematics',
-# EventCommonD3PDMaker.FourMomFillerTool)
-#alg += Ele2D3PDObject (10)
-
-# Test egtruth
-from egammaD3PDMaker.egammaTruthD3PDObject import egammaTruthD3PDObject
-alg += egammaTruthD3PDObject (10)
-
-# Test CorrectionCluster
-from egammaD3PDMaker.CorrectionClusterD3PDObject import CorrectionClusterD3PDObject
-alg += CorrectionClusterD3PDObject(10, prefix='cocl_')
-
-# Test filtering.
-import AthenaPython.PyAthena as PyAthena
-from AthenaPython.PyAthena import StatusCode
-class MyFilter (PyAthena.Alg):
- def __init__ (self, name = 'myfilter', exclude=1, **kw):
- super (MyFilter, self).__init__ (name = name, **kw)
- self.count = 0
- self.exclude = exclude
- return
- def execute (self):
- self.setFilterPassed ( self.count != self.exclude )
- self.count += 1
- return StatusCode.Success
-
-# Adding a filter the old way.
-alg.filterSeq += MyFilter ('myfilter1', exclude=1)
-
-# Adding a filter the new way.
-topSequence += MyFilter('myfilter2', exclude=5)
-alg.AddRequireAlgs (MyFilter('myfilter2').getName())
-
-
-from D2PDMaker.D2PDMakerConf import D2PDElectronSelector
-#preseq += D2PDElectronSelector \
-# ('elesel2',
-# ptMin = 15*GeV,
-# inputCollection = resolveSGKey ('ElectronContainer',
-# D3PDMakerFlags.ElectronSGKey()),
-# outputCollection = 'elesel2',
-# outputLinkCollection = 'elelink2')
-#alg += ElectronD3PDObject (0,
-# sgkey = 'elelink2',
-# #typeName = 'INav4MomLinkContainer',
-# getterClass =
-# EventCommonD3PDMaker.INav4MomLinkContainerGetterTool,
-# prefix = 'elfilt3_')
-#alg += ElectronD3PDObject (0,
-# prefix = 'elfilt4_',
-# SelectionFlags_FlagNames = ['selected@INav4MomLinkContainer/elelink2:Test selection'],
-# )
-
-
-# Test composite particles...
-#from D2PDMaker.D2PDMakerConf import D2PDParticleCombiner
-#preseq += D2PDParticleCombiner\
-# ('emucombiner',
-# outputCollection = 'emuCombined',
-# inputCollection1 = 'ElectronAODCollection',
-# inputCollection2 = 'StacoMuonCollection')
-
-# from D3PDMakerCoreComps.D3PDObject import make_SGDataVector_D3PDObject
-# from D3PDMakerCoreComps.IndexMultiAssociation import IndexMultiAssociation
-# import EventCommonD3PDMaker
-# MyCompositeD3PDObject = \
-# make_SGDataVector_D3PDObject ('CompositeParticleContainer',
-# 'emuCombined',
-# 'emu_')
-# MyCompositeD3PDObject.defineBlock (0, 'Kinematics',
-# EventCommonD3PDMaker.FourMomFillerTool)
-# IndexMultiAssociation (MyCompositeD3PDObject,
-# EventCommonD3PDMaker.CompositeParticleAssociationTool,
-# ['el_', 'mu_'],
-# containerIndexName = 'cont',
-# nrowName = '')
-
-# alg += MyCompositeD3PDObject (10)
-
-
-
-
-# Test non-existent egamma.
-alg += ElectronD3PDObject (0,
- sgkey = 'xxx',
- prefix = 'el_xxx_',
- allowMissing = True)
-
-from egammaD3PDMaker.PhotonD3PDObject import PhotonD3PDObject
-alg += PhotonD3PDObject (0,
- sgkey = 'xxx',
- prefix = 'ph_xxx_',
- allowMissing = True)
-
-from MuonD3PDMaker.MuonD3PDObject import MuonD3PDObject
-alg += MuonD3PDObject (0,
- sgkey = 'xxx',
- prefix = 'mu_xxx_',
- allowMissing = True)
-
-from JetD3PDMaker.JetD3PDObject import JetD3PDObject
-alg += JetD3PDObject (0,
- sgkey = 'xxx',
- prefix = 'jet_xxx_',
- allowMissing = True)
-
-from egammaD3PDMaker.GSFElectronD3PDObject import GSFElectronD3PDObject
-alg += GSFElectronD3PDObject (0,
- sgkey = 'xxx',
- prefix = 'el_gxx_',
- allowMissing = True)
-
-# Test fix in D3PDMakerCoreComps-00-01-79 that was leading to crosstalk
-# between TriggerBitFiller objects from different trees.
-from D3PDMakerCoreComps.MakerAlg import MakerAlg
-from EventCommonD3PDMaker.EventInfoD3PDObject import EventInfoD3PDObject
-trigtest_alg = MakerAlg ('trigtest', file = tupleFileOutput)
-trigtest_alg += EventInfoD3PDObject (0)
-trigtest_alg += ElectronD3PDObject (0,
- exclude=['D3PD__GenParticleTruthParticleAssociationTool'])
-
diff --git a/PhysicsAnalysis/D3PDMaker/D3PDMakerTest/share/D3PDTestPhysicsESD_jo.py b/PhysicsAnalysis/D3PDMaker/D3PDMakerTest/share/D3PDTestPhysicsESD_jo.py
deleted file mode 100644
index c47f7b420b11fac4405b70ec25c46c4535736ba2..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/D3PDMaker/D3PDMakerTest/share/D3PDTestPhysicsESD_jo.py
+++ /dev/null
@@ -1,86 +0,0 @@
-infile = 'esd/ESD-17.2.0.2.pool.root'
-reffile = 'physics-esd-d3pd.ref'
-jo = 'D3PDMakerConfig/ESDToPhysicsD3PD.py'
-
-from D3PDMakerConfig.D3PDMakerFlags import D3PDMakerFlags
-D3PDMakerFlags.FilterCollCand = True
-
-physicsD3PD_args = {
- 'AK4TowerJet_JetVertexFraction_FillFullJVF' : True,
- 'AK6TowerJet_JetVertexFraction_FromUD' : True,
- }
-
-
-# Force AODFix off, to get repeatible results across releases.
-from RecExConfig.RecFlags import rec
-rec.doApplyAODFix.set_Value_and_Lock(False)
-
-# Needed for calo d3pd.
-block_override = [
- '/LAR/BadChannels/BadChannels',
- '/LAR/BadChannels/MissingFEBs',
- '/LAR/Identifier/FebRodAtlas',
- '/LAR/Identifier/OnOffIdAtlas',
- ]
-
-include ('D3PDMakerTest/run-d3pd-test.py')
-
-
-# Make a track d3pd tree too!
-from InDetD3PDMaker.TrackD3PD import TrackD3PD
-alg = TrackD3PD (tupleFileOutput,
- Track_trackParametersAtGlobalPerigeeLevelOfDetails = 3,
- Track_storeDiagonalCovarianceAsErrors = True,
- PrimaryVertex_storeDiagonalCovarianceAsErrors = True)
-
-# And a calorimeter tree!
-from CaloSysD3PDMaker.CaloD3PD import CaloD3PD
-alg = CaloD3PD (file = tupleFileOutput)
-
-# Make supercells into a separate file, if available.
-from LArL1Sim import LArL1SimConf
-if hasattr (LArL1SimConf, 'LArSCSimpleMaker'):
- from AthenaCommon.AlgSequence import AlgSequence
- topSequence = AlgSequence()
- topSequence += LArL1SimConf.LArSCSimpleMaker ('LArSCSimpleMaker',
- CellContainer = 'AllCalo',
- SCellContainer = 'SCells')
-
- from D3PDMakerCoreComps.MakerAlg import MakerAlg
- from EventCommonD3PDMaker.EventInfoD3PDObject import EventInfoD3PDObject
- from CaloD3PDMaker.CaloCellD3PDObject import AllCaloCellD3PDObject
- from CaloD3PDMaker.CaloCellD3PDObject import SelCaloCellD3PDObject
- scell_alg = MakerAlg ('scells', file = 'scells.root')
- scell_alg += EventInfoD3PDObject (0)
- scell_alg += AllCaloCellD3PDObject (2, sgkey = 'SCells', prefix = 'sc_',
- include = ['RawPosition'])
-
- d3pd_tests += [('scells.root', 'scells.ref')]
-
-
-# Test LeadingPtAssociationTool.
-from D3PDMakerCoreComps.SimpleAssociation import SimpleAssociation
-from D3PDMakerCoreComps.D3PDObject import make_SGDataVector_D3PDObject
-import EventCommonD3PDMaker
-TestJetD3PDObject = make_SGDataVector_D3PDObject ('JetCollection',
- 'AntiKt4TopoEMJets,' +
- 'AntiKt4TopoJets,' +
- 'AntiKt4H1TopoJets',
- 'testjet_', 'testjet')
-TestJetD3PDObject.defineBlock (0, 'Kin', EventCommonD3PDMaker.FourMomFillerTool)
-LeadingConstitAssoc = SimpleAssociation \
- (TestJetD3PDObject,
- EventCommonD3PDMaker.LeadingPtAssociationTool,
- level = 0,
- prefix = 'lconstit_',
- blockname = 'LeadingConstitAssoc',
- MultiAssocTool = EventCommonD3PDMaker.NavigableConstituentAssociationTool
- ('LeadingConstitMAssoc', TypeName = 'CaloCluster'))
-LeadingConstitAssoc.defineBlock (0, 'LeadKin',
- EventCommonD3PDMaker.FourMomFillerTool)
-
-
-from OutputStreamAthenaPool.MultipleStreamManager import MSMgr
-alg = MSMgr.GetStream('StreamNTUP_PHYSICS')
-alg += TestJetD3PDObject(10)
-