From 43cf9bf12dcaf89a45bdd69981019fb4d7c64592 Mon Sep 17 00:00:00 2001
From: Frank Winklmeier <fwinkl@cern>
Date: Fri, 20 Nov 2020 15:07:51 +0100
Subject: [PATCH] BackgroundD3PDMaker: delete package

D3PDs are no longer used for background studies.
---
 .../BackgroundD3PDMaker/CMakeLists.txt        |  29 --
 .../python/BackgroundD3PDMakerFlags.py        | 156 ----------
 .../python/BackgroundWordD3PDObject.py        |  22 --
 .../python/BeamBackgroundD3PDObject.py        |  96 -------
 .../python/BkgdTriggerBitsD3PDObject.py       |  45 ---
 .../python/Lucid_RawDataD3PDObject.py         |  33 ---
 .../python/RawInfoSummaryForTagD3PDObject.py  |  22 --
 .../BackgroundD3PDMaker/python/__init__.py    |   6 -
 .../python/backgroundD3PD.py                  | 266 ------------------
 .../share/BackgroundD3PD_prodJobOFragment.py  |  65 -----
 .../share/UserBkgD3PD_jOpts.py                | 158 -----------
 .../src/BackgroundWordFillerTool.cxx          |  75 -----
 .../src/BackgroundWordFillerTool.h            |  70 -----
 .../src/BackgroundWordNames.h                 |  77 -----
 .../BeamBackgroundClusterAssociationTool.cxx  |  51 ----
 .../BeamBackgroundClusterAssociationTool.h    |  62 ----
 .../src/BeamBackgroundClusterFillerTool.cxx   |  50 ----
 .../src/BeamBackgroundClusterFillerTool.h     |  62 ----
 .../src/BeamBackgroundDecisionFillerTool.cxx  |  73 -----
 .../src/BeamBackgroundDecisionFillerTool.h    |  74 -----
 .../src/BeamBackgroundJetAssociationTool.cxx  |  51 ----
 .../src/BeamBackgroundJetAssociationTool.h    |  61 ----
 .../src/BeamBackgroundJetFillerTool.cxx       |  47 ----
 .../src/BeamBackgroundJetFillerTool.h         |  62 ----
 .../src/LucidPMTHitFillerTool.cxx             |  80 ------
 .../src/LucidPMTHitFillerTool.h               |  71 -----
 .../src/RawTagInDetSPFillerTool.cxx           |  72 -----
 .../src/RawTagInDetSPFillerTool.h             |  72 -----
 .../BackgroundD3PDMaker_entries.cxx           |  19 --
 .../D3PDMakerConfig/python/D3PDProdFlags.py   |  15 -
 30 files changed, 2042 deletions(-)
 delete mode 100644 PhysicsAnalysis/D3PDMaker/BackgroundD3PDMaker/CMakeLists.txt
 delete mode 100644 PhysicsAnalysis/D3PDMaker/BackgroundD3PDMaker/python/BackgroundD3PDMakerFlags.py
 delete mode 100644 PhysicsAnalysis/D3PDMaker/BackgroundD3PDMaker/python/BackgroundWordD3PDObject.py
 delete mode 100644 PhysicsAnalysis/D3PDMaker/BackgroundD3PDMaker/python/BeamBackgroundD3PDObject.py
 delete mode 100644 PhysicsAnalysis/D3PDMaker/BackgroundD3PDMaker/python/BkgdTriggerBitsD3PDObject.py
 delete mode 100644 PhysicsAnalysis/D3PDMaker/BackgroundD3PDMaker/python/Lucid_RawDataD3PDObject.py
 delete mode 100644 PhysicsAnalysis/D3PDMaker/BackgroundD3PDMaker/python/RawInfoSummaryForTagD3PDObject.py
 delete mode 100644 PhysicsAnalysis/D3PDMaker/BackgroundD3PDMaker/python/__init__.py
 delete mode 100644 PhysicsAnalysis/D3PDMaker/BackgroundD3PDMaker/python/backgroundD3PD.py
 delete mode 100644 PhysicsAnalysis/D3PDMaker/BackgroundD3PDMaker/share/BackgroundD3PD_prodJobOFragment.py
 delete mode 100644 PhysicsAnalysis/D3PDMaker/BackgroundD3PDMaker/share/UserBkgD3PD_jOpts.py
 delete mode 100644 PhysicsAnalysis/D3PDMaker/BackgroundD3PDMaker/src/BackgroundWordFillerTool.cxx
 delete mode 100644 PhysicsAnalysis/D3PDMaker/BackgroundD3PDMaker/src/BackgroundWordFillerTool.h
 delete mode 100644 PhysicsAnalysis/D3PDMaker/BackgroundD3PDMaker/src/BackgroundWordNames.h
 delete mode 100644 PhysicsAnalysis/D3PDMaker/BackgroundD3PDMaker/src/BeamBackgroundClusterAssociationTool.cxx
 delete mode 100644 PhysicsAnalysis/D3PDMaker/BackgroundD3PDMaker/src/BeamBackgroundClusterAssociationTool.h
 delete mode 100644 PhysicsAnalysis/D3PDMaker/BackgroundD3PDMaker/src/BeamBackgroundClusterFillerTool.cxx
 delete mode 100644 PhysicsAnalysis/D3PDMaker/BackgroundD3PDMaker/src/BeamBackgroundClusterFillerTool.h
 delete mode 100644 PhysicsAnalysis/D3PDMaker/BackgroundD3PDMaker/src/BeamBackgroundDecisionFillerTool.cxx
 delete mode 100644 PhysicsAnalysis/D3PDMaker/BackgroundD3PDMaker/src/BeamBackgroundDecisionFillerTool.h
 delete mode 100644 PhysicsAnalysis/D3PDMaker/BackgroundD3PDMaker/src/BeamBackgroundJetAssociationTool.cxx
 delete mode 100644 PhysicsAnalysis/D3PDMaker/BackgroundD3PDMaker/src/BeamBackgroundJetAssociationTool.h
 delete mode 100644 PhysicsAnalysis/D3PDMaker/BackgroundD3PDMaker/src/BeamBackgroundJetFillerTool.cxx
 delete mode 100644 PhysicsAnalysis/D3PDMaker/BackgroundD3PDMaker/src/BeamBackgroundJetFillerTool.h
 delete mode 100644 PhysicsAnalysis/D3PDMaker/BackgroundD3PDMaker/src/LucidPMTHitFillerTool.cxx
 delete mode 100644 PhysicsAnalysis/D3PDMaker/BackgroundD3PDMaker/src/LucidPMTHitFillerTool.h
 delete mode 100644 PhysicsAnalysis/D3PDMaker/BackgroundD3PDMaker/src/RawTagInDetSPFillerTool.cxx
 delete mode 100644 PhysicsAnalysis/D3PDMaker/BackgroundD3PDMaker/src/RawTagInDetSPFillerTool.h
 delete mode 100644 PhysicsAnalysis/D3PDMaker/BackgroundD3PDMaker/src/components/BackgroundD3PDMaker_entries.cxx

diff --git a/PhysicsAnalysis/D3PDMaker/BackgroundD3PDMaker/CMakeLists.txt b/PhysicsAnalysis/D3PDMaker/BackgroundD3PDMaker/CMakeLists.txt
deleted file mode 100644
index 78eaef00e33..00000000000
--- a/PhysicsAnalysis/D3PDMaker/BackgroundD3PDMaker/CMakeLists.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-################################################################################
-# Package: BackgroundD3PDMaker
-################################################################################
-
-# Declare the package name:
-atlas_subdir( BackgroundD3PDMaker )
-
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PRIVATE
-                          Control/AthenaKernel
-                          Event/xAOD/xAODCaloEvent
-                          Event/xAOD/xAODEventInfo
-                          Event/xAOD/xAODJet
-                          ForwardDetectors/LUCID/LUCID_RawEvent
-                          GaudiKernel
-                          PhysicsAnalysis/D3PDMaker/D3PDMakerUtils
-                          PhysicsAnalysis/EventTag/TagEvent
-                          Reconstruction/RecBackground/RecBackgroundEvent )
-
-# Component(s) in the package:
-atlas_add_component( BackgroundD3PDMaker
-                     src/*.cxx
-                     src/components/*.cxx
-                     LINK_LIBRARIES AthenaKernel xAODCaloEvent xAODEventInfo xAODJet LUCID_RawEvent GaudiKernel D3PDMakerUtils TagEvent RecBackgroundEvent )
-
-# Install files from the package:
-atlas_install_python_modules( python/*.py )
-atlas_install_joboptions( share/*.py )
-
diff --git a/PhysicsAnalysis/D3PDMaker/BackgroundD3PDMaker/python/BackgroundD3PDMakerFlags.py b/PhysicsAnalysis/D3PDMaker/BackgroundD3PDMaker/python/BackgroundD3PDMakerFlags.py
deleted file mode 100644
index 1ec4ac6c71f..00000000000
--- a/PhysicsAnalysis/D3PDMaker/BackgroundD3PDMaker/python/BackgroundD3PDMakerFlags.py
+++ /dev/null
@@ -1,156 +0,0 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-
-#
-## @file BackgroundD3PDMaker/python/BackgroundD3PDMakerFlags.py
-## @author Mark Tibbetts <Mark.James.Tibbetts@cern.ch>
-## @brief Commond flags for backgroundD3PD
-#
-
-"""Common flags for D3PD making.
-"""
-
-
-from AthenaCommon.JobProperties import JobProperty, JobPropertyContainer
-from AthenaCommon.JobProperties import jobproperties
-
-
-class BackgroundD3PDMakerFlags (JobPropertyContainer):
-    """Common flags for BackgroundD3PD making.
-    """
-
-jobproperties.add_Container (BackgroundD3PDMakerFlags)
-
-class AddTriggerBits (JobProperty):
-    """ add trigger bits"""
-    statusOn=True
-    allowedTypes=['bool']
-    StoredValue=True
-jobproperties.BackgroundD3PDMakerFlags.add_JobProperty(AddTriggerBits)
-
-class doMet (JobProperty):
-    """If true fill MET; true by default, may cause problems for cosmics"""
-    statusOn = True
-    allowedTypes = ['bool']
-    StoredValue = True
-jobproperties.BackgroundD3PDMakerFlags.add_JobProperty(doMet)
-
-
-class doLUCID (JobProperty):
-    """If true fill LUCID hit info; only in ESD"""
-    statusOn     = True
-    allowedTypes = ['bool']
-    StoredValue  = False
-jobproperties.BackgroundD3PDMakerFlags.add_JobProperty(doLUCID)
-
-class doBCM (JobProperty):
-    """If true fill BCM RDO and time info; only in ESD"""
-    statusOn     = True
-    allowedTypes = ['bool']
-    StoredValue  = False
-jobproperties.BackgroundD3PDMakerFlags.add_JobProperty(doBCM)   
-
-class doZDC (JobProperty):
-    """If true fill ZDC info; only in ESD"""
-    statusOn     = True
-    allowedTypes = ['bool']
-    StoredValue  = False
-jobproperties.BackgroundD3PDMakerFlags.add_JobProperty(doZDC)    
-
-class doCaloMuon (JobProperty):
-    """If true fill calo muons; missing from HI reco"""
-    statusOn     = True
-    allowedTypes = ['bool']
-    StoredValue  = False
-jobproperties.BackgroundD3PDMakerFlags.add_JobProperty(doCaloMuon)
-
-class doMuGirlSeg (JobProperty):
-    """If true fill muon girl segments; missing from HI reco"""
-    statusOn = True
-    allowedTypes = ['bool']
-    StoredValue = False
-jobproperties.BackgroundD3PDMakerFlags.add_JobProperty(doMuGirlSeg)
-
-class doBeamBkgd (JobProperty):
-    """If true fill beam background tool block; missing from HI reco"""
-    statusOn = True
-    allowedTypes = ['bool']
-    StoredValue = False
-jobproperties.BackgroundD3PDMakerFlags.add_JobProperty(doBeamBkgd)
-
-class doTrk (JobProperty):
-    """If true fill track info; veto from HI reco due to size"""
-    statusOn = True
-    allowedTypes = ['bool']
-    StoredValue = False
-jobproperties.BackgroundD3PDMakerFlags.add_JobProperty(doTrk)
-
-class doMuonTrk (JobProperty):
-    """If true fill muon track info; veto by default due to size"""
-    statusOn = True
-    allowedTypes = ['bool']
-    StoredValue = False
-jobproperties.BackgroundD3PDMakerFlags.add_JobProperty(doMuonTrk)
-
-class doMuonHits (JobProperty):
-    """If true fill muon hits; veto by default due to size"""
-    statusOn = True
-    allowedTypes = ['bool']
-    StoredValue = False
-jobproperties.BackgroundD3PDMakerFlags.add_JobProperty(doMuonHits)
-
-class doCaloJet (JobProperty):
-    """If true fill calo jets, fill track jets if false; HI reco uses track jets"""
-    statusOn = True
-    allowedTypes = ['bool']
-    StoredValue = False
-jobproperties.BackgroundD3PDMakerFlags.add_JobProperty(doCaloJet)
-
-class doPixelClus (JobProperty):
-    """If true fill pixel clusters; veto by default due to size"""
-    statusOn = True
-    allowedTypes = ['bool']
-    StoredValue = False
-jobproperties.BackgroundD3PDMakerFlags.add_JobProperty(doPixelClus)
-
-class doCaloClus (JobProperty):
-    """If true fill calorimeter clusters; veto by default due to size"""
-    statusOn = True
-    allowedTypes = ['bool']
-    StoredValue = False
-jobproperties.BackgroundD3PDMakerFlags.add_JobProperty(doCaloClus)
-
-BackgroundD3PDMakerFlags = jobproperties.BackgroundD3PDMakerFlags
-
-def BackgroundD3PDMakerFlagsSetDefaults():
-    flags=BackgroundD3PDMakerFlags
-    pass
-
-def BackgroundD3PDMakerFlagsSetESD():
-    flags=BackgroundD3PDMakerFlags
-    flags.doLUCID.set_Value(True)
-    flags.doBCM.set_Value(True)
-    flags.doZDC.set_Value(True)
-
-def BackgroundD3PDMakerFlagsSetAOD():
-    flags=BackgroundD3PDMakerFlags
-    flags.doLUCID.set_Value(False)
-    flags.doBCM.set_Value(False)
-    flags.doZDC.set_Value(False)
-    
-def BackgroundD3PDMakerFlagsSetHI():
-    flags=BackgroundD3PDMakerFlags
-    flags.doCaloMuon.set_Value(False)
-    flags.doMuGirlSeg.set_Value(False)
-    flags.doBeamBkgd.set_Value(False)
-    flags.doTrk.set_Value(False)
-    flags.doCaloJet.set_Value(False)
-
-def BackgroundD3PDMakerFlagsSetpp():
-    flags=BackgroundD3PDMakerFlags
-    flags.doCaloMuon.set_Value(True)
-    flags.doMuGirlSeg.set_Value(True)
-    flags.doBeamBkgd.set_Value(True)
-    flags.doTrk.set_Value(True)
-    flags.doCaloJet.set_Value(True)
-
-    
diff --git a/PhysicsAnalysis/D3PDMaker/BackgroundD3PDMaker/python/BackgroundWordD3PDObject.py b/PhysicsAnalysis/D3PDMaker/BackgroundD3PDMaker/python/BackgroundWordD3PDObject.py
deleted file mode 100644
index 2092618a0e2..00000000000
--- a/PhysicsAnalysis/D3PDMaker/BackgroundD3PDMaker/python/BackgroundWordD3PDObject.py
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-
-# $Id: BackgroundWordD3PDObject.py 351806 2011-03-15 10:05:36Z krasznaa $
-#
-# @file BackgroundD3PDMaker/python/BackgroundWordD3PDObject.py
-# @author Mark Tibbets <mark.james.tibbetts@cern.ch>
-# @date Mar, 2011
-# @brief D3PD object for EventInfo Background Word.
-#
-
-import D3PDMakerCoreComps    
-import BackgroundD3PDMaker
-from D3PDMakerConfig.D3PDMakerFlags import D3PDMakerFlags
-from D3PDMakerCoreComps.D3PDObject import make_SG_D3PDObject
-
-BackgroundWordD3PDObject = \
-    make_SG_D3PDObject ('EventInfo',
-                                  D3PDMakerFlags.EventInfoSGKey(),
-                                  'bkgword_', 'BackgroundWordD3PDObject')
-
-BackgroundWordD3PDObject.defineBlock (0, 'BackgroundWord',
-                            BackgroundD3PDMaker.BackgroundWordFillerTool)
diff --git a/PhysicsAnalysis/D3PDMaker/BackgroundD3PDMaker/python/BeamBackgroundD3PDObject.py b/PhysicsAnalysis/D3PDMaker/BackgroundD3PDMaker/python/BeamBackgroundD3PDObject.py
deleted file mode 100644
index c914f3f330f..00000000000
--- a/PhysicsAnalysis/D3PDMaker/BackgroundD3PDMaker/python/BeamBackgroundD3PDObject.py
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
-
-import BackgroundD3PDMaker
-import D3PDMakerCoreComps
-from D3PDMakerCoreComps.D3PDObject import make_SG_D3PDObject
-#from D3PDMakerCoreComps.D3PDObject import make_SGDataVector_D3PDObject
-from D3PDMakerConfig.D3PDMakerFlags import D3PDMakerFlags
-from D3PDMakerCoreComps.ContainedVectorMultiAssociation import ContainedVectorMultiAssociation
-from D3PDMakerCoreComps.D3PDObject import DeferArg
-
-import EventCommonD3PDMaker
-import CaloD3PDMaker
-import CaloSysD3PDMaker
-import JetD3PDMaker
-
-
-#
-# Useful options:
-#  Specify bbJetIndex_Target to fill indices of beam background jets in the jet collection.
-#  Specify bbClusterIndex_Target to fill indices of beam background clusters in the cluster collection.
-#
-
-
-BeamBackgroundD3PDObject = \
-    make_SG_D3PDObject ('BeamBackgroundData',
-        'BeamBackgroundData',
-        'bb_', 'BeamBackgroundD3PDObject')
-
-BeamBackgroundD3PDObject.defineBlock (0, 'decision',
-    BackgroundD3PDMaker.BeamBackgroundDecisionFillerTool)
-
-
-ClusterAssoc = ContainedVectorMultiAssociation( BeamBackgroundD3PDObject,
-    BackgroundD3PDMaker.BeamBackgroundClusterAssociationTool,
-    blockname = "bbClusterInfo",
-    prefix = "cl_" )
-
-ClusterAssoc.defineBlock (1, "clus",
-    BackgroundD3PDMaker.BeamBackgroundClusterFillerTool,
-    BeamBackgroundKey = DeferArg ('sgkey'))
-
-ClusterAssoc.defineBlock (1, 'bbClusterKinematics',
-                               EventCommonD3PDMaker.FourMomFillerTool,
-                               WriteE = False,
-                               WriteM = False)
-ClusterAssoc.defineBlock (1, 'bbClusterSamplingBasics',
-                               CaloD3PDMaker.ClusterSamplingFillerTool)
-from CaloSysD3PDMaker import ClusterMomentFillerTool as CMFT
-ClusterAssoc.defineBlock (1, 'bbClusterMoments', CMFT,
-                               Moments = [CMFT.FIRST_ENG_DENS,   'firstEdens',
-                                          CMFT.ENG_FRAC_MAX,     'cellmaxfrac',
-                                          CMFT.LONGITUDINAL,     'longitudinal',
-                                          CMFT.SECOND_LAMBDA,    'secondlambda',
-                                          CMFT.LATERAL,          'lateral',
-                                          CMFT.SECOND_R,         'secondR',
-                                          CMFT.CENTER_LAMBDA,    'centerlambda',
-                                          CMFT.CENTER_MAG,       'centermag',
-                                          CMFT.DELTA_THETA,      'deltaTheta',
-                                          CMFT.DELTA_PHI,        'deltaPhi'
-                                          ])
-ClusterAssoc.defineBlock (1, 'bbClusterTime',
-                               CaloSysD3PDMaker.ClusterTimeFillerTool)
-
-ClusterAssoc.defineBlock (1, 'bbClusterIndex', D3PDMakerCoreComps.IndexFillerTool,
-    Target = '')
-
-
-JetAssoc = ContainedVectorMultiAssociation( BeamBackgroundD3PDObject,
-    BackgroundD3PDMaker.BeamBackgroundJetAssociationTool,
-    blockname = "bbJetInfo",
-    prefix = "jet_")
-
-JetAssoc.defineBlock( 1, "jet",
-    BackgroundD3PDMaker.BeamBackgroundJetFillerTool,
-    BeamBackgroundKey = DeferArg ('sgkey'))
-
-JetAssoc.defineBlock (1, 'bbJetIndex', D3PDMakerCoreComps.IndexFillerTool,
-    Target = '')
-
-JetAssoc.defineBlock( 2, 'bbJetKinematics',
-    EventCommonD3PDMaker.FourMomFillerTool,
-    WriteE  = True)
-JetAssoc.defineBlock( 2, 'bbJetQual',
-    JetD3PDMaker.JetCaloUtilsFillerTool)
-JetAssoc.defineBlock( 2, 'bbJetDQMoments',
-    JetD3PDMaker.JetMomentFillerTool,
-    Moments=['WIDTH',      'n90',
-             'Timing',     'LArQuality',
-             'nTrk',       'sumPtTrk',
-             'OriginIndex',
-             'HECQuality', 'NegativeE', 'AverageLArQF',
-             'YFlip12',    'YFlip23',
-             'BCH_CORR_CELL', 'BCH_CORR_DOTX','BCH_CORR_JET', 'BCH_CORR_JET_FORCELL', 
-             'ENG_BAD_CELLS', 'N_BAD_CELLS', 'N_BAD_CELLS_CORR','BAD_CELLS_CORR_E',
-             'NumTowers'
-             ])
diff --git a/PhysicsAnalysis/D3PDMaker/BackgroundD3PDMaker/python/BkgdTriggerBitsD3PDObject.py b/PhysicsAnalysis/D3PDMaker/BackgroundD3PDMaker/python/BkgdTriggerBitsD3PDObject.py
deleted file mode 100644
index 5cf235399be..00000000000
--- a/PhysicsAnalysis/D3PDMaker/BackgroundD3PDMaker/python/BkgdTriggerBitsD3PDObject.py
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-
-#
-## @file BackgroundD3PDMaker/python/BkgdTriggerBitsD3PDObject.py
-## @brief D3PD object for background stream trigger bits 
-## @author Mark Tibbetts
-## @date May 2012
-##
-
-
-from TriggerD3PDMaker.defineTriggerBits import defineTriggerBits
-from D3PDMakerCoreComps.D3PDObject import make_Void_D3PDObject
-
-
-BkgdTriggerBitsD3PDObject = make_Void_D3PDObject(  "", "BkgdTriggerBitsD3PDObject",
-                                                   default_name = 'BkgdTriggerBitsFiller' )
-
-
-# defineTriggerBits will handle the duplicates correctly
-
-defineTriggerBits( BkgdTriggerBitsD3PDObject, 0, ["EF_Background.*",
-                                                  "EF_mbSpTrk_unpaired_iso","EF_mbSpBg_unpaired_iso"])
-
-defineTriggerBits( BkgdTriggerBitsD3PDObject, 0, ["L2_Background.*",
-                                                  "L2_mbSpTrk_unpaired_iso","L2_mbSpBg_unpaired_iso"])
-
-defineTriggerBits( BkgdTriggerBitsD3PDObject, 0, ["L1_RD0_UNPAIRED_ISO","L1_RD0_EMPTY",
-                                                  "L1_BCM_AC_CA_BGRP0","L1_BCM_AC_CA_UNPAIRED_ISO",
-                                                  "L1_BCM_Wide_EMPTY",
-                                                  "L1_BCM_Wide_UNPAIRED_ISO","L1_BCM_Wide_UNPAIRED_NONISO",
-                                                  "L1_EM3_UNPAIRED_ISO","L1_FJ30_UNPAIRED_ISO",
-                                                  "L1_J10_UNPAIRED_ISO","L1_J10_UNPAIRED_NONISO",
-                                                  "L1_LUCID_A_C_EMPTY",
-                                                  "L1_LUCID_A_C_UNPAIRED_ISO","L1_LUCID_A_C_UNPAIRED_NONISO",
-                                                  "L1_LUCID_COMM_EMPTY","L1_LUCID_COMM_UNPAIRED_ISO",
-                                                  "L1_LUCID_EMPTY","L1_LUCID_UNPAIRED_ISO",
-                                                  "L1_MU4_UNPAIRED_ISO"
-                                                  ])
-
-
-def getBkgdTriggerBitsD3PDObject(triggerList):
-
-    defineTriggerBits(BkgdTriggerBitsD3PDObject,0,triggerList);
-
-    return BkgdTriggerBitsD3PDObject(0)
diff --git a/PhysicsAnalysis/D3PDMaker/BackgroundD3PDMaker/python/Lucid_RawDataD3PDObject.py b/PhysicsAnalysis/D3PDMaker/BackgroundD3PDMaker/python/Lucid_RawDataD3PDObject.py
deleted file mode 100644
index 822c9404d68..00000000000
--- a/PhysicsAnalysis/D3PDMaker/BackgroundD3PDMaker/python/Lucid_RawDataD3PDObject.py
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-
-# $Id: Lucid_RawDataD3PDObject.py 352093 2011-03-16 13:03:57Z mtibbett $
-#
-# @file BackgroundD3PDMaker/python/Lucid_RawDataD3PDObject.py
-# @author Mark Tibbets <mark.james.tibbetts@cern.ch>
-# @date Feb, 2011
-# @brief D3PD object for LUCID_RawData.
-#
-
-import D3PDMakerCoreComps    
-import BackgroundD3PDMaker
-from D3PDMakerConfig.D3PDMakerFlags import D3PDMakerFlags
-from D3PDMakerCoreComps.D3PDObject import make_SG_D3PDObject
-
-from RecExConfig.ObjKeyStore import cfgKeyStore
-if cfgKeyStore.isInInput( "LUCID_RawDataContainer", "Lucid_RawData" ):
-    _haveLucid = True
-else:
-    _haveLucid = False
-    from AthenaCommon.Logging import logging
-    _mlog = logging.getLogger( "Lucid_RawDataD3PDObject" )
-    _mlog.warning( "No LUCID_RawDataContainer object in input; skipping." )
-
-Lucid_RawDataD3PDObject = \
-    make_SG_D3PDObject ('LUCID_RawDataContainer',
-                        'Lucid_RawData',
-                        'lucid_', 'Lucid_RawDataD3PDObject',
-                        default_allowMissing = not _haveLucid )
-
-if _haveLucid:
-    Lucid_RawDataD3PDObject.defineBlock (0, 'LucidPMTHits',
-                                         BackgroundD3PDMaker.LucidPMTHitFillerTool)
diff --git a/PhysicsAnalysis/D3PDMaker/BackgroundD3PDMaker/python/RawInfoSummaryForTagD3PDObject.py b/PhysicsAnalysis/D3PDMaker/BackgroundD3PDMaker/python/RawInfoSummaryForTagD3PDObject.py
deleted file mode 100644
index 89f9889f1a4..00000000000
--- a/PhysicsAnalysis/D3PDMaker/BackgroundD3PDMaker/python/RawInfoSummaryForTagD3PDObject.py
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-
-# $Id: RawInfoSummaryForTagD3PDObject.py 351806 2011-03-15 10:05:36Z krasznaa $
-#
-# @file BackgroundD3PDMaker/python/RawInfoSummaryForTagD3PDObject.py
-# @author Mark Tibbets <mark.james.tibbetts@cern.ch>
-# @date Feb, 2011
-# @brief D3PD object for RawInfoSummaryForTag.
-#
-
-import D3PDMakerCoreComps    
-import BackgroundD3PDMaker
-from D3PDMakerConfig.D3PDMakerFlags import D3PDMakerFlags
-from D3PDMakerCoreComps.D3PDObject import make_SG_D3PDObject
-
-RawInfoSummaryForTagD3PDObject = \
-    make_SG_D3PDObject ('RawInfoSummaryForTag',
-                                  'RawInfoSummaryForTag',
-                                  'rawtag_', 'RawInfoSummaryForTagD3PDObject')
-
-RawInfoSummaryForTagD3PDObject.defineBlock (0, 'RawTagInDetSP',
-                            BackgroundD3PDMaker.RawTagInDetSPFillerTool)
diff --git a/PhysicsAnalysis/D3PDMaker/BackgroundD3PDMaker/python/__init__.py b/PhysicsAnalysis/D3PDMaker/BackgroundD3PDMaker/python/__init__.py
deleted file mode 100644
index ee3a8d027bf..00000000000
--- a/PhysicsAnalysis/D3PDMaker/BackgroundD3PDMaker/python/__init__.py
+++ /dev/null
@@ -1,6 +0,0 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-
-import BackgroundD3PDMakerConf
-for k, v in BackgroundD3PDMakerConf.__dict__.items():
-    if k.startswith ('D3PD__'):
-        globals()[k[6:]] = v
diff --git a/PhysicsAnalysis/D3PDMaker/BackgroundD3PDMaker/python/backgroundD3PD.py b/PhysicsAnalysis/D3PDMaker/BackgroundD3PDMaker/python/backgroundD3PD.py
deleted file mode 100644
index 9eef81a97b7..00000000000
--- a/PhysicsAnalysis/D3PDMaker/BackgroundD3PDMaker/python/backgroundD3PD.py
+++ /dev/null
@@ -1,266 +0,0 @@
-# Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
-
-# $Id: backgroundD3PD.py 535243 2013-01-29 13:14:01Z salekd $
-#
-# @file BackgroundD3PDMaker/python/backgroundD3PD.py
-# @author Mark Tibbetts <Mark.James.Tibbetts@cern.ch>
-# @date Mar, 2011
-# @brief Construct a Background D3PD.
-#
-
-import D3PDMakerCoreComps
-from D3PDMakerConfig.D3PDMakerFlags                     import D3PDMakerFlags
-from RecExConfig.RecFlags                               import rec
-from RecExConfig.ObjKeyStore                            import cfgKeyStore
-
-from EventCommonD3PDMaker.EventInfoD3PDObject           import EventInfoD3PDObject
-from EventCommonD3PDMaker.LBLengthD3PDObject            import LBLengthD3PDObject
-
-from TriggerD3PDMaker.TrigDecisionD3PDObject            import TrigDecisionD3PDObject
-from TriggerD3PDMaker.TrigConfMetadata                  import addTrigConfMetadata
-from TriggerD3PDMaker.BunchStructureMetadata            import addBunchStructureMetadata
-from TriggerD3PDMaker.BGCodeD3PDObject                  import BGCodeD3PDObject
-
-from BackgroundD3PDMaker.BackgroundWordD3PDObject       import BackgroundWordD3PDObject
-from BackgroundD3PDMaker.Lucid_RawDataD3PDObject        import Lucid_RawDataD3PDObject
-from BackgroundD3PDMaker.RawInfoSummaryForTagD3PDObject import RawInfoSummaryForTagD3PDObject
-from BackgroundD3PDMaker.BkgdTriggerBitsD3PDObject      import getBkgdTriggerBitsD3PDObject
-
-from CaloD3PDMaker.MBTSD3PDObject                       import MBTSD3PDObject
-from CaloD3PDMaker.LArCollisionTimeD3PDObject           import LArCollisionTimeD3PDObject
-
-from MissingETD3PDMaker.MissingETD3PDObject             import MissingETD3PDObject 
-
-from MuonD3PDMaker.MuonD3PDObject                       import MuonD3PDObject
-from MuonD3PDMaker.MuonSegmentD3PDObject                import MuonSegmentD3PDObject
-from MuonD3PDMaker.MdtPrepDataD3PDObject                import MdtPrepDataD3PDObject
-from MuonD3PDMaker.RpcPrepDataD3PDObject                import RpcPrepDataD3PDObject
-from MuonD3PDMaker.TgcPrepDataD3PDObject                import TgcPrepDataD3PDObject
-from MuonD3PDMaker.CscPrepDataD3PDObject                import CscPrepDataD3PDObject
-
-from JetD3PDMaker.JetD3PDObject                         import JetD3PDObject
-
-from TrackD3PDMaker.xAODTrackD3PDObject                 import xAODTrackParticleD3PDObject
-from TrackD3PDMaker.xAODVertexD3PDObject                import PrimaryxAODVertexD3PDObject
-
-from HeavyIonD3PDMaker.ZdcD3PDObject                    import ZdcD3PDObject
-
-from TrigMbD3PDMaker.BcmRdoFlatD3PDObject               import BcmRdoFlatD3PDObject
-
-from BackgroundD3PDMaker.BackgroundD3PDMakerFlags       import BackgroundD3PDMakerFlags
-
-from AthenaCommon.GlobalFlags                           import globalflags
-from AthenaCommon.AlgSequence                           import AlgSequence
-topSequence = AlgSequence()
-
-from BackgroundD3PDMaker.BeamBackgroundD3PDObject import BeamBackgroundD3PDObject
-
-def _args (level, name, kwin, **kw):
-    kw = kw.copy()
-    kw['level'] = level
-    for (k, v) in kwin.items():
-        if k.startswith (name + '_'):
-            kw[k[len(name)+1:]] = v
-    return kw
-
-def backgroundD3PD (alg=None,
-                    level = 10,
-                    file = 'background.root',
-                    tuplename = 'background',
-                    flags=BackgroundD3PDMakerFlags,
-                    **kw):
-
-    preseq = AlgSequence (D3PDMakerFlags.PreD3PDAlgSeqName())
-    if (not hasattr (topSequence, 'BeamBackgroundFiller') and
-        not hasattr (preseq, 'BeamBackgroundFiller')):
-      if cfgKeyStore.isInInput( "Trk::SegmentCollection", "ConvertedMBoySegments" ):
-        from RecBackgroundAlgs import RecBackgroundAlgsConf
-        preseq += RecBackgroundAlgsConf.BeamBackgroundFiller()
-
-    if (not hasattr (topSequence, 'BeamBackgroundFillerMoore') and
-        not hasattr (preseq, 'BeamBackgroundFillerMoore')):
-      if cfgKeyStore.isInInput( "Trk::SegmentCollection", "MooreSegments" ):
-        from RecBackgroundAlgs.RecBackgroundAlgsConf import BeamBackgroundFiller
-        BeamBackgroundFillerMoore = BeamBackgroundFiller('BeamBackgroundFillerMoore',
-                                                        muonSegmentContainerKey='MooreSegments',
-                                                        BeamBackgroundKey='BeamBackgroundDataMoore')
-        preseq += BeamBackgroundFillerMoore
-
-
-    # The core algorithm
-    if not alg:
-        from OutputStreamAthenaPool.MultipleStreamManager import MSMgr
-        alg = MSMgr.NewRootStream(tuplename, file)
-
-    #Event level info
-    alg += EventInfoD3PDObject (**_args(1, 'EventInfo', kw))
-    if globalflags.DataSource == "data" :
-      alg += LBLengthD3PDObject (**_args(0, 'LBLength', kw))
-
-    if rec.doTruth():
-      from TruthD3PDMaker.GenEventD3PDObject import GenEventD3PDObject
-      alg += GenEventD3PDObject (**_args (0, 'GenEvent', kw))
-
-
-    if rec.doTrigger():
-        alg += TrigDecisionD3PDObject  (**_args(2, 'TrigDecision', kw))
-        addTrigConfMetadata( alg )
-
-        bcToolType = ""
-        if globalflags.DataSource == "data" :
-          bcToolType = "LHC"
-        addBunchStructureMetadata( alg, bcToolType )
-
-        alg += BGCodeD3PDObject (**_args (2, 'BGCode', kw))
-
-        if flags.AddTriggerBits():
-            alg += getBkgdTriggerBitsD3PDObject([])
-
-
-    alg += BackgroundWordD3PDObject (**_args(0, 'BkgWord', kw))
-    if flags.doLUCID():
-        alg += Lucid_RawDataD3PDObject (**_args(0, 'Lucid', kw))
-    alg += RawInfoSummaryForTagD3PDObject(**_args(0, 'SumForTag', kw))
-
-    alg += MBTSD3PDObject (**_args(0, 'MBTS', kw))
-    alg += LArCollisionTimeD3PDObject (**_args(0, 'LArTimeDiff', kw))
-    
-    if flags.doMet():
-        alg += MissingETD3PDObject    (**_args (1, 'MET_RefFinal', kw,
-                                                sgkey  = 'MET_RefFinal',
-                                                prefix = 'MET_RefFinal',
-                                                allowMissing = True))
- 
-
-    alg += MuonD3PDObject (**_args(0, 'Muon', kw,
-                                   sgkey='MuonCollection',
-                                   prefix='mu_',
-                                   include=["Isolation","Quality",
-                                            "MuonTimingFillerTool","MuonTileTimeTool",
-                                            "ChamberT0"],
-                                   allowMissing = True))
-    alg += MuonD3PDObject (**_args(0, 'MuidMuon', kw,
-                                   sgkey='MuidMuonCollection',
-                                   prefix='mu_muid_',
-                                   include=["Isolation","Quality",
-                                            "MuonTimingFillerTool","MuonTileTimeTool",
-                                            "ChamberT0"],
-                                   allowMissing = True))
-    alg += MuonD3PDObject (**_args(0, 'StacoMuon', kw,
-                                   sgkey='StacoMuonCollection',
-                                   prefix='mu_staco_',
-                                   include=["Isolation","Quality",
-                                            "MuonTimingFillerTool","MuonTileTimeTool",
-                                            "ChamberT0"],
-                                   allowMissing = True))
-    if flags.doCaloMuon():
-        alg += MuonD3PDObject (**_args(0, 'CaloMuon', kw,
-                                       sgkey='CaloMuonCollection',
-                                       prefix='mu_calo_',
-                                       include=["Isolation","Quality",
-                                                "MuonTimingFillerTool","MuonTileTimeTool",
-                                                "ChamberT0"],
-                                       allowMissing = True))
-       
-
-    alg += MuonSegmentD3PDObject ( **_args(1, 'MuonSeg', kw,
-                                           sgkey='MuonSegments',
-                                           prefix='museg_',
-                                           # MooreSegmentT0 takes the default time
-                                           # MuonboySegmentT0 recalculates time (see MuonSegmentD3PDObject.py and MuonSegmentT0FillerTool.cxx)
-                                           include = ['MooreSegmentT0'],
-                                           exclude = ['MuonboySegmentT0'],
-                                           allowMissing = True))
-    alg += MuonSegmentD3PDObject ( **_args(1, 'MooreSeg', kw,
-                                           sgkey='MooreSegments',
-                                           prefix='mooreseg_',
-                                           include = ['MooreSegmentT0'],
-                                           exclude = ['MuonboySegmentT0'],
-                                           allowMissing = True))
-    alg += MuonSegmentD3PDObject (**_args (1, 'MboySeg', kw,
-                                           sgkey='ConvertedMBoySegments',
-                                           prefix='mboyseg_',
-                                           include = ['MuonboySegmentT0'],
-                                           exclude = ['MooreSegmentT0'],
-                                           allowMissing = True))
-    if flags.doMuGirlSeg():
-        alg += MuonSegmentD3PDObject (**_args (1, 'MuGirlSeg', kw,
-                                               sgkey='MuGirlSegments',
-                                               prefix='mgseg_',
-                                               include = ['MooreSegmentT0'],
-                                               exclude = ['MuonboySegmentT0'],
-                                               allowMissing = True))
-
-    if flags.doTrk():    
-        alg += xAODTrackParticleD3PDObject (**_args (0,  'TrackParticle', kw,
-                                                     prefix='trk_'))
-
-    if flags.doMuonHits():
-        alg += MdtPrepDataD3PDObject (0)
-        alg += RpcPrepDataD3PDObject (0)
-        alg += CscPrepDataD3PDObject (0)
-        alg += TgcPrepDataD3PDObject (0)
-
-        alg += TgcPrepDataD3PDObject (**_args(0, 'TGC_MeasurementsPriorBC', kw,
-                                              sgkey='TGC_MeasurementsPriorBC',
-                                              prefix='tgcPriorBC_',
-                                              label='TgcPrepDataPriorBC'))
-        alg += TgcPrepDataD3PDObject (**_args(0, 'TGC_MeasurementsNextBC', kw,
-                                              sgkey='TGC_MeasurementsNextBC',
-                                              prefix='tgcNextBC_',
-                                              label='TgcPrepDataNextBC'))
-
-
-    if flags.doCaloJet():
-      #alg += JetD3PDObject (**_args(4,'AntiKt4TopoEMJets', kw,  sgkey='AntiKt4TopoEMJets',   prefix='AntiKt4TopoEM_', include='BeamBackground' ))
-      if cfgKeyStore.isInInput( "Trk::SegmentCollection", "ConvertedMBoySegments" ):
-        alg += JetD3PDObject (**_args(4, 'AntiKt4TopoEMJets', kw,
-                                      sgkey='AntiKt4TopoEMJets',
-                                      prefix='AntiKt4TopoEM_',
-                                      include = ['BeamBackground'],
-                                      exclude = ['JetVertexFraction','JVtx','ActiveArea','TruthMF','TracksMoments'],
-                                      BeamBackground_BeamBackgroundKey='BeamBackgroundData'))
-      else :
-        alg += JetD3PDObject (**_args(4, 'AntiKt4TopoEMJets', kw,
-                                      sgkey='AntiKt4TopoEMJets',
-                                      prefix='AntiKt4TopoEM_',
-                                      exclude = ['JetVertexFraction','JVtx','ActiveArea','TruthMF','TracksMoments']))
-    else:
-        alg += JetD3PDObject (**_args(4,'AntiKt4TrackJets', kw,  sgkey='AntiKt4TrackJets',   prefix='AntiKt4Track_',
-                                      exclude = ['JetVertexFraction','JVtx','ActiveArea','TruthMF','TracksMoments']))
-
-
-    alg += PrimaryxAODVertexD3PDObject (0)
-
-
-    if flags.doBeamBkgd():
-      #alg += BeamBackgroundD3PDObject(1)
-      if cfgKeyStore.isInInput( "Trk::SegmentCollection", "ConvertedMBoySegments" ):
-        alg += BeamBackgroundD3PDObject (**_args(1, 'BeamBackgroundData', kw,
-                                                 sgkey='BeamBackgroundData',
-                                                 prefix='bb_',
-                                                 bbJetIndex_Target='AntiKt4TopoEM_',
-                                                 bbClusterIndex_Target='cl_'))
-      if cfgKeyStore.isInInput( "Trk::SegmentCollection", "MooreSegments" ):
-        alg += BeamBackgroundD3PDObject (**_args(1, 'BeamBackgroundData', kw,
-                                                 sgkey='BeamBackgroundDataMoore',
-                                                 prefix='bbMoore_',
-                                                 bbJetIndex_Target='AntiKt4TopoEM_',
-                                                 bbClusterIndex_Target='cl_'))
-  
-
-    if flags.doBCM():
-        alg += BcmRdoFlatD3PDObject (**_args(0, 'BCMRdo', kw))
-
-    if flags.doZDC():    
-        if globalflags.DataSource == "data": alg += ZdcD3PDObject(10)
-
-    if flags.doPixelClus():
-      from InDetD3PDMaker.PixelClusterD3PDObject import PixelClusterD3PDObject
-      alg += PixelClusterD3PDObject( 0 )
-
-    if flags.doCaloClus():
-      from CaloSysD3PDMaker.ClusterD3PDObject import ClusterD3PDObject
-      alg += ClusterD3PDObject( 1 )
-
-    return alg
diff --git a/PhysicsAnalysis/D3PDMaker/BackgroundD3PDMaker/share/BackgroundD3PD_prodJobOFragment.py b/PhysicsAnalysis/D3PDMaker/BackgroundD3PDMaker/share/BackgroundD3PD_prodJobOFragment.py
deleted file mode 100644
index c5ed37db1d1..00000000000
--- a/PhysicsAnalysis/D3PDMaker/BackgroundD3PDMaker/share/BackgroundD3PD_prodJobOFragment.py
+++ /dev/null
@@ -1,65 +0,0 @@
-# $Id: BackgroundD3PD_prodJobOFragment.py 467303 2011-11-10 10:14:19Z mtibbett $
-#
-# This jobO fragment is meant to be called by Reco_trf.py in transformation jobs to
-# create the "Background D3PD cart".
-
-# This jobO should not be included more than once:
-include.block( "BackgroundD3PDMaker/BackgroundD3PD_prodJobOFragment.py" )
-
-# Common import(s):
-from AthenaCommon.JobProperties import jobproperties
-prodFlags = jobproperties.D3PDProdFlags
-from PrimaryDPDMaker.PrimaryDPDHelpers import buildFileName
-
-# Set up a logger:
-from AthenaCommon.Logging import logging
-BackgroundD3PDStream_msg = logging.getLogger( 'BackgroundD3PD_prodJobOFragment' )
-
-# Check if the configuration makes sense:
-if prodFlags.WriteBackgroundD3PD.isVirtual:
-    BackgroundD3PDStream_msg.error( "The Background D3PD stream can't be virtual! " +
-                                    "It's a configuration error!" )
-    raise NameError( "Background D3PD set to be a virtual stream" )
-    pass
-    
-# Construct the stream and file names for the Background D3PD:
-streamName = prodFlags.WriteBackgroundD3PD.StreamName
-fileName   = buildFileName( prodFlags.WriteBackgroundD3PD )
-BackgroundD3PDStream_msg.info( "Configuring BackgroundD3PD with streamName '%s' and fileName '%s'" % \
-                               ( streamName, fileName ) )
-        
-# Create the D3PD stream itself:
-from OutputStreamAthenaPool.MultipleStreamManager import MSMgr
-BackgroundD3PDStream = MSMgr.NewRootStream( streamName, fileName, "background" )
-
-# ESD or AOD
-if rec.readESD:
-    from BackgroundD3PDMaker.BackgroundD3PDMakerFlags import BackgroundD3PDMakerFlagsSetESD
-    BackgroundD3PDMakerFlagsSetESD()
-    BackgroundD3PDStream_msg.info("Detected ESD input so setting BackgroundD3PDMakerFlags accordingly")
-elif rec.readAOD:
-    from BackgroundD3PDMaker.BackgroundD3PDMakerFlags import BackgroundD3PDMakerFlagsSetAOD
-    BackgroundD3PDMakerFlagsSetAOD()
-    BackgroundD3PDStream_msg.info("Detected AOD input so setting BackgroundD3PDMakerFlags accordingly")
-else:
-    from BackgroundD3PDMaker.BackgroundD3PDMakerFlags import BackgroundD3PDMakerFlagsSetDefaults
-    BackgroundD3PDMakerSetDefaults()
-    BackgroundD3PDStream_msg.warning("Neither ESD or AOD input so setting BackgroundD3PDMakerFlags to default")
-
-# pp or HI
-if rec.doHeavyIon:
-    from BackgroundD3PDMaker.BackgroundD3PDMakerFlags import BackgroundD3PDMakerFlagsSetHI
-    BackgroundD3PDMakerFlagsSetHI()
-    BackgroundD3PDStream_msg.info("Background D3PD configured for HI reconstruction, masking known absent collections")
-else:
-    from BackgroundD3PDMaker.BackgroundD3PDMakerFlags import BackgroundD3PDMakerFlagsSetpp
-    BackgroundD3PDMakerFlagsSetpp()
-    BackgroundD3PDStream_msg.info("Background D3PD configured for pp reconstruction")
-
-#Turn off trigger
-from D3PDMakerConfig.D3PDMakerFlags import D3PDMakerFlags
-D3PDMakerFlags.DoTrigger.set_Value_and_Lock( False )
-
-# Now add all the content to this stream:
-from BackgroundD3PDMaker.backgroundD3PD import backgroundD3PD
-backgroundD3PD( BackgroundD3PDStream )
diff --git a/PhysicsAnalysis/D3PDMaker/BackgroundD3PDMaker/share/UserBkgD3PD_jOpts.py b/PhysicsAnalysis/D3PDMaker/BackgroundD3PDMaker/share/UserBkgD3PD_jOpts.py
deleted file mode 100644
index 86ca5195f4e..00000000000
--- a/PhysicsAnalysis/D3PDMaker/BackgroundD3PDMaker/share/UserBkgD3PD_jOpts.py
+++ /dev/null
@@ -1,158 +0,0 @@
-
-##set input content as ESD or AOD
-from BackgroundD3PDMaker.BackgroundD3PDMakerFlags import BackgroundD3PDMakerFlagsSetESD
-BackgroundD3PDMakerFlagsSetESD()
-#from BackgroundD3PDMaker.BackgroundD3PDMakerFlags import BackgroundD3PDMakerFlagsSetAOD
-#BackgroundD3PDMakerFlagsSetAOD()
-
-# pp or HI
-if rec.doHeavyIon:
-    from BackgroundD3PDMaker.BackgroundD3PDMakerFlags import BackgroundD3PDMakerFlagsSetHI
-    BackgroundD3PDMakerFlagsSetHI()
-else:
-    from BackgroundD3PDMaker.BackgroundD3PDMakerFlags import BackgroundD3PDMakerFlagsSetpp
-    BackgroundD3PDMakerFlagsSetpp()
-
-
-import glob
-InputFiles = glob.glob( "myESD.pool.root" )
-
-OutputFile = "custom.backgroundD3PD.root"
-
-EvtMax = 100
-
-
-## Set up the needed RecEx flags:
-from AthenaCommon.AthenaCommonFlags import athenaCommonFlags
-athenaCommonFlags.FilesInput.set_Value_and_Lock( InputFiles )
-athenaCommonFlags.EvtMax.set_Value_and_Lock( EvtMax )
-
-## Set up what the RecExCommon job should and shouldn't do:
-from RecExConfig.RecFlags import rec
-rec.AutoConfiguration = [ "everything" ]
-rec.doCBNT.set_Value_and_Lock( False )
-rec.doWriteESD.set_Value_and_Lock( False )
-rec.doWriteAOD.set_Value_and_Lock( False )
-rec.doWriteTAG.set_Value_and_Lock( False )
-rec.doESD.set_Value_and_Lock( False )
-rec.doAOD.set_Value_and_Lock( False )
-rec.doDPD.set_Value_and_Lock( False )
-rec.doHist.set_Value_and_Lock( False )
-rec.doPerfMon.set_Value_and_Lock( False )
-
-
-## Let RecExCommon set everything up:
-include( "RecExCommon/RecExCommon_topOptions.py" )
-
-#########################################################################
-#                                                                       #
-#                     Now set up the D3PDMaker job                      #
-#                                                                       #
-#########################################################################
-
-## Create a logger:
-from AthenaCommon.Logging import logging
-logger = logging.getLogger( "BackgroundD3PD" )
-
-## Configure the D3PD parameters:
-rec.doTruth.set_Value_and_Lock( False )
-from D3PDMakerConfig.D3PDMakerFlags import D3PDMakerFlags
-D3PDMakerFlags.DoTrigger.set_Value_and_Lock( False ) # add trigger variables by hand...
-
-
-##Uncomment if you want the unassociated hits
-#from MinBiasD3PDMaker.MinBiasD3PDMakerConf import MinBiasD3PD__MinBiasD3PDPreProcessing
-#MinBiasD3PDPreProcessingAlg = MinBiasD3PD__MinBiasD3PDPreProcessing( name = "MinBiasD3PDPreProcessingAlg", OutputLevel = WARNING )
-#topSequence += MinBiasD3PDPreProcessingAlg
-
-## Access the algorithm sequence:
-from AthenaCommon.AlgSequence import AlgSequence
-theJob = AlgSequence()
-
-## Add BeamBackgroundFiller to the algorithm sequence.
-from RecBackgroundAlgs.RecBackgroundAlgsConf import BeamBackgroundFiller
-BeamBackgroundFiller1=BeamBackgroundFiller()
-theJob+=BeamBackgroundFiller1
-
-##Below is an example of running with two BeamBackgroundFiller instances,
-##one for AntiKt4TopoEMJets and one for AntiKt6TopoEMJets.
-BeamBackgroundFiller2=BeamBackgroundFiller('BeamBackgroundFiller2',jetContainerKey="AntiKt6TopoEMJets",BeamBackgroundKey="customBeamBackgroundData")
-theJob+=BeamBackgroundFiller2
-
-
-## Create the D3PD maker algorithm:
-import D3PDMakerCoreComps
-d3pdalg = D3PDMakerCoreComps.MakerAlg( "background", theJob, file = OutputFile,
-                                       D3PDSvc = "D3PD::RootD3PDSvc" )
-
-
-##
-## Add variables
-##
-
-##Uncomment those variables you want in your D3PD
-
-## Default is the usual Background D3PD
-##
-from BackgroundD3PDMaker.backgroundD3PD import backgroundD3PD
-backgroundD3PD(d3pdalg)
-
-## Unassociated Hits
-##
-#from MinBiasD3PDMaker.UnassociatedHitsD3PDObject import UnassociatedHitsD3PDObject
-#d3pdalg += UnassociatedHitsD3PDObject( 10 )
-
-## Calo Info
-##
-##cells
-#from CaloD3PDMaker.CellD3PDObject import CellD3PDObject
-#d3pdalg += CellD3PDObject( 0 )
-##clusters
-#from CaloD3PDMaker.ClusterD3PDObject import ClusterD3PDObject
-#d3pdalg += ClusterD3PDObject( 6 )
-
-
-## Jets
-##
-from JetD3PDMaker.JetD3PDObject import JetD3PDObject
-d3pdalg += JetD3PDObject (**_args(4, 'AntiKt4TopoEMJets', kw,
-                                  sgkey='AntiKt4TopoEMJets',
-                                  prefix='AntiKt4TopoEM_',
-                                  include='BeamBackground',
-                                  BeamBackground_BeamBackgroundKey='BeamBackgroundData' ))
-d3pdalg += JetD3PDObject (**_args(4, 'AntiKt6TopoEMJets', kw,
-                                  sgkey='AntiKt6TopoEMJets',
-                                  prefix='AntiKt6TopoEM_',
-                                  include='BeamBackground',
-                                  BeamBackground_BeamBackgroundKey='customBeamBackgroundData' ))
-
-## Beam Background Variables
-##
-from BackgroundD3PDMaker.BeamBackgroundD3PDObject import BeamBackgroundD3PDObject
-d3pdalg += BeamBackgroundD3PDObject (**_args(2, 'BeamBackgroundData', kw,
-                                             sgkey='BeamBackgroundData',
-                                             prefix='bb_',
-                                             bbJetIndex_Target='AntiKt4TopoEM_',
-                                             bbClusterIndex_Target='cl_'))
-d3pdalg += BeamBackgroundD3PDObject (**_args(2, 'BeamBackgroundData2', kw,
-                                             sgkey='customBeamBackgroundData',
-                                             prefix='bb2_',
-                                             bbJetIndex_Target='AntiKt6TopoEM_',
-                                             bbClusterIndex_Target='cl_'))
-
-
-##
-## End add variables
-##
-
-logger.info( "Configured the Background D3PDMaker algorithm" )
-
-from AthenaCommon.AppMgr import theApp
-theApp.EvtMax = athenaCommonFlags.EvtMax()
-ServiceMgr.MessageSvc.OutputLevel = INFO
-ServiceMgr.MessageSvc.defaultLimit = 10000000
-ServiceMgr.MessageSvc.Format = "% F%50W%S%7W%R%T %0W%M"
-if not hasattr( ServiceMgr, "AthenaEventLoopMgr" ):
-    from AthenaServices.AthenaServicesConf import AthenaEventLoopMgr
-    ServiceMgr += AthenaEventLoopMgr()
-ServiceMgr.AthenaEventLoopMgr.EventPrintoutInterval = 100
diff --git a/PhysicsAnalysis/D3PDMaker/BackgroundD3PDMaker/src/BackgroundWordFillerTool.cxx b/PhysicsAnalysis/D3PDMaker/BackgroundD3PDMaker/src/BackgroundWordFillerTool.cxx
deleted file mode 100644
index de56485ee67..00000000000
--- a/PhysicsAnalysis/D3PDMaker/BackgroundD3PDMaker/src/BackgroundWordFillerTool.cxx
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-// $Id: BackgroundWordFillerTool.cxx 596570 2014-05-12 12:32:04Z wlampl $
-/**
- * @file BackgroundD3PDMaker/src/BackgroundWordFillerTool.cxx
- * @author Mark Tibbetts <mark.james.tibbetts@cern.ch>
- * @date Mar, 2011
- * @brief Block filler tool for background flag info from EventInfo.
- */
-
-
-#include "BackgroundWordFillerTool.h"
-#include "BackgroundWordNames.h"
-#include "xAODEventInfo/EventInfo.h"
-#include "AthenaKernel/errorcheck.h"
-#include <string>
-#include <cassert>
-
-using xAOD::EventInfo;
-
-namespace D3PD {
-
-
-/**
- * @brief Standard Gaudi tool constructor.
- * @param type The name of the tool type.
- * @param name The tool name.
- * @param parent The tool's Gaudi parent.
- */
-BackgroundWordFillerTool::BackgroundWordFillerTool (const std::string& type,
-                                          const std::string& name,
-                                          const IInterface* parent)
-  : BlockFillerTool<EventInfo> (type, name, parent)
-{
-  book().ignore(); // Avoid coverity warnings.
-}
-
-
-/**
- * @brief Book variables for this block.
- */
-StatusCode BackgroundWordFillerTool::book()
-{
-
-  m_setbits.resize(EventInfo::NBackgroundWords);
-  for(size_t i=0; i<nBackgroundWordNames;++i){
-    unsigned int flag=backgroundWordNames[i].m_flag;
-    assert( flag<m_setbits.size() );
-    std::string name = backgroundWordNames[i].m_name;
-    CHECK( addVariable ( name, m_setbits[flag]) );
-  }
- 
-  CHECK( addVariable ("BkgWord", m_bkgword, "Event Info Background Word") );
-
-  return StatusCode::SUCCESS;
-}
-
-
-StatusCode BackgroundWordFillerTool::fill (const EventInfo& p)
-{
-
-  *m_bkgword = p.eventFlags(EventInfo::Background);
-  
-  for(size_t i=0; i<m_setbits.size();++i){
-    if(m_setbits[i])
-      *m_setbits[i]=p.isEventFlagBitSet(EventInfo::Background,static_cast<EventInfo::BackgroundEventFlag>(i));
-  }
-  
-  return StatusCode::SUCCESS;
-}
-
-
-} // namespace D3PD
diff --git a/PhysicsAnalysis/D3PDMaker/BackgroundD3PDMaker/src/BackgroundWordFillerTool.h b/PhysicsAnalysis/D3PDMaker/BackgroundD3PDMaker/src/BackgroundWordFillerTool.h
deleted file mode 100644
index ab32874a78c..00000000000
--- a/PhysicsAnalysis/D3PDMaker/BackgroundD3PDMaker/src/BackgroundWordFillerTool.h
+++ /dev/null
@@ -1,70 +0,0 @@
-// This file's extension implies that it's C, but it's really -*- C++ -*-.
-
-/*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-// $Id: BackgroundWordFillerTool.h 596570 2014-05-12 12:32:04Z wlampl $
-/**
- * @file BackgroundD3PDMaker/src/BackgroundWordFillerTool.h
- * @author Mark Tibbetts <mark.james.tibbetts@cern.ch>
- * @date Mar, 2011
- * @brief Block filler tool for background event flag from EventInfo.
- */
-
-
-#ifndef BACKGROUNDD3PDMAKER_BACKGROUNDWORDFILLERTOOL_H
-#define BACKGROUNDD3PDMAKER_BACKGROUNDWORDFILLERTOOL_H
-
-
-#include "D3PDMakerUtils/BlockFillerTool.h"
-#include "xAODEventInfo/EventInfo.h"
-#include <vector>
-
-
-namespace D3PD {
-
-
-/**
- * @brief Block filler tool for background event flag info from EventInfo.
- */
-class BackgroundWordFillerTool
-  : public BlockFillerTool<xAOD::EventInfo>
-{
-public:
-  /**
-   * @brief Standard Gaudi tool constructor.
-   * @param type The name of the tool type.
-   * @param name The tool name.
-   * @param parent The tool's Gaudi parent.
-   */
-  BackgroundWordFillerTool (const std::string& type,
-			    const std::string& name,
-			    const IInterface* parent);
-
-
-  /// Book variables for this block.
-  virtual StatusCode book();
-
-
-  /**
-   * @brief Fill one block --- type-safe version.
-   * @param p The input object.
-   *
-   * This is called once per object.  The caller
-   * is responsible for arranging that all the pointers for booked variables
-   * are set appropriately upon entry.
-   */
-  virtual StatusCode fill (const xAOD::EventInfo& p);
-
-
-private:
-  unsigned int* m_bkgword;
-  std::vector<bool*> m_setbits;
-};
-
-
-} // namespace D3PD
-
-
-#endif // not BACKGROUNDD3PDMAKER_BACKGROUNDWORDFILLERTOOL_H
diff --git a/PhysicsAnalysis/D3PDMaker/BackgroundD3PDMaker/src/BackgroundWordNames.h b/PhysicsAnalysis/D3PDMaker/BackgroundD3PDMaker/src/BackgroundWordNames.h
deleted file mode 100644
index dbaba5639fc..00000000000
--- a/PhysicsAnalysis/D3PDMaker/BackgroundD3PDMaker/src/BackgroundWordNames.h
+++ /dev/null
@@ -1,77 +0,0 @@
-// This file's extension implies that it's C, but it's really -*- C++ -*-.
-
-/*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-// $Id: BackgroundWordNames.h 596570 2014-05-12 12:32:04Z wlampl $
-/**
- * @file BackgroundD3PDMaker/src/BackgroundWordNames.h
- * @author Mark Tibbetts <mark.james.tibbetts@cern.ch>
- * @date Mar, 2011
- * @brief Assign names to background word bits.
- */
-
-
-#ifndef BACKGROUNDD3PDMAKER_BACKGROUNDWORDNAMES_H
-#define BACKGROUNDD3PDMAKER_BACKGROUNDWORDNAMES_H
-
-
-#include "xAODEventInfo/EventInfo.h"
-
-
-namespace D3PD {
-  
-  
-  struct BackgroundWordNames
-  {
-    xAOD::EventInfo::BackgroundEventFlag m_flag;
-    const char* m_name;
-  };
-  
-
-
-  static BackgroundWordNames backgroundWordNames[] = {
-    { xAOD::EventInfo::MBTSTimeDiffHalo,       "MBTSTimeHaloBit" },
-    { xAOD::EventInfo::MBTSTimeDiffCol,        "MBTSTimeColBit" },
-    { xAOD::EventInfo::LArECTimeDiffHalo,      "LArECTimeHaloBit" },
-    { xAOD::EventInfo::LArECTimeDiffCol,       "LArECTimeColBit" },
-    { xAOD::EventInfo::PixMultiplicityHuge,    "PixMultiHugeBit" },
-    { xAOD::EventInfo::PixSPNonEmpty,          "PixSPNonEmptyBit" },
-    { xAOD::EventInfo::SCTMultiplicityHuge,    "SCTMultiHugeBit" },
-    { xAOD::EventInfo::SCTSPNonEmpty,          "SCTSPNonEmptyBit" },
-    { xAOD::EventInfo::CSCTimeDiffHalo,        "CSCTimeHaloBit" },
-    { xAOD::EventInfo::CSCTimeDiffCol,         "CSCTimeColBit" },
-    { xAOD::EventInfo::BCMTimeDiffHalo,        "BCMTimeHaloBit" },
-    { xAOD::EventInfo::BCMTimeDiffCol,         "BCMTimeColBit" },
-    { xAOD::EventInfo::MuonTimingCol,          "MuonTimingColBit" },
-    { xAOD::EventInfo::MuonTimingCosmic,       "MuonTimingCosmicBit" },
-    { xAOD::EventInfo::MBTSBeamVeto,           "MBTSBeamVetoBit" },
-    { xAOD::EventInfo::BCMBeamVeto,            "BCMBeamVetoBit" },
-    { xAOD::EventInfo::LUCIDBeamVeto,          "LUCIDBeamVetoBit" },
-    { xAOD::EventInfo::HaloMuonSegment,        "HaloMuonSegment" },
-    { xAOD::EventInfo::HaloClusterShape,       "HaloClusterShape" },
-    { xAOD::EventInfo::HaloMuonOneSided,       "HaloMuonOneSided" },
-    { xAOD::EventInfo::HaloMuonTwoSided,       "HaloMuonTwoSided" },
-    { xAOD::EventInfo::HaloTileClusterPattern, "HaloTileClusterPattern" },
-    { xAOD::EventInfo::BeamGasPixel,           "BeamGasPixel" },
-    { xAOD::EventInfo::CosmicStandAlone,       "CosmicStandAlone" },
-    { xAOD::EventInfo::CosmicStandAloneTight,  "CosmicStandAloneTight" },
-    { xAOD::EventInfo::CosmicCombined,         "CosmicCombined" },
-    { xAOD::EventInfo::CosmicCombinedTight,    "CosmicCombinedTight" },
-    { xAOD::EventInfo::BkgdResvBit1,           "BkgdResvBit1" },
-    { xAOD::EventInfo::BkgdResvBit2,           "BkgdResvBit2"},
-    { xAOD::EventInfo::BkgdResvBit3,           "BkgdResvBit3"},
-    { xAOD::EventInfo::BkgdResvBit4,           "BkgdResvBit4"},
-    { xAOD::EventInfo::BkgdResvBit5,           "BkgdResvBit5"}
-
-  };
-
-  static const size_t nBackgroundWordNames =
-    sizeof(backgroundWordNames) / sizeof(backgroundWordNames[0]);
-  
-  
-} // namespace D3PD
-
-
-#endif // not BACKGROUNDD3PDMAKER_BACKGROUNDWORDNAMES_H
diff --git a/PhysicsAnalysis/D3PDMaker/BackgroundD3PDMaker/src/BeamBackgroundClusterAssociationTool.cxx b/PhysicsAnalysis/D3PDMaker/BackgroundD3PDMaker/src/BeamBackgroundClusterAssociationTool.cxx
deleted file mode 100644
index d6399604a14..00000000000
--- a/PhysicsAnalysis/D3PDMaker/BackgroundD3PDMaker/src/BeamBackgroundClusterAssociationTool.cxx
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-// $Id: BeamBackgroundClusterAssociationTool.cxx 589851 2014-03-27 20:01:30Z ssnyder $
-#include "BeamBackgroundClusterAssociationTool.h"
-
-namespace D3PD {
-
-
-BeamBackgroundClusterAssociationTool::BeamBackgroundClusterAssociationTool
-  (const std::string& type,
-   const std::string& name,
-   const IInterface* parent)
-    : Base (type, name, parent),
-      m_clusCounter(0),
-      m_beamBackgroundData(0)
-{
-}
-
-/**
- * @brief Start the iteration for a new association.
- * @param p The object from which to associate.
- */
-StatusCode BeamBackgroundClusterAssociationTool::reset (const BeamBackgroundData& p)
-{
-  m_clusCounter = 0;
-  m_beamBackgroundData = &p;
-   
-  return StatusCode::SUCCESS;
-}
-
-/**
- * @brief Return a pointer to the next element in the association.
- *
- * Return 0 when the association has been exhausted.
- */
-const xAOD::CaloCluster* BeamBackgroundClusterAssociationTool::next()
-{
-  // reached the end
-  if(m_clusCounter == m_beamBackgroundData->GetNumMatched()) return 0;
-
-  // else return a track and increment index
-  const xAOD::CaloCluster* clus = m_beamBackgroundData->GetIndexClus(m_clusCounter);
-  m_clusCounter++;
-  return clus;
-}
-
-
-} // namespace D3PD
-
diff --git a/PhysicsAnalysis/D3PDMaker/BackgroundD3PDMaker/src/BeamBackgroundClusterAssociationTool.h b/PhysicsAnalysis/D3PDMaker/BackgroundD3PDMaker/src/BeamBackgroundClusterAssociationTool.h
deleted file mode 100644
index 58f0d71a68c..00000000000
--- a/PhysicsAnalysis/D3PDMaker/BackgroundD3PDMaker/src/BeamBackgroundClusterAssociationTool.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-// $Id: BeamBackgroundClusterAssociationTool.h 589851 2014-03-27 20:01:30Z ssnyder $
-#ifndef BACKGROUNDD3PDMAKER_BEAMBACKGROUNDCLUSTERASSOCIATIONTOOL_H
-#define BACKGROUNDD3PDMAKER_BEAMBACKGROUNDCLUSTERASSOCIATIONTOOL_H
-
-#include "D3PDMakerUtils/MultiAssociationTool.h"
-#include "RecBackgroundEvent/BeamBackgroundData.h"
-#include "xAODCaloEvent/CaloCluster.h"
-
-
-namespace D3PD {
-
-/**
- * @short Tool "associating" CaloCluster objects to BeamBackgroundData
- *
- *        BeamBackgroundData object contains a list of calorimeter clusters
- *        belonging to beam halo muon candidates.
- *        They can be filled into D3PD using this associatoion tool.
- *
- * @author David Salek <David.Salek@cern.ch>
- *
- * $Revision: 589851 $
- * $Date: 2014-03-27 21:01:30 +0100 (Thu, 27 Mar 2014) $
- */
-class BeamBackgroundClusterAssociationTool :
-  public MultiAssociationTool< BeamBackgroundData, xAOD::CaloCluster >
-{
-public:
-  typedef MultiAssociationTool< BeamBackgroundData, xAOD::CaloCluster> Base;
-
-  /// Regular AlgTool constructor
-  BeamBackgroundClusterAssociationTool (const std::string& type,
-                                        const std::string& name,
-                                        const IInterface* parent);
-
-  /**
-   * @brief Start the iteration for a new association.
-   * @param p The object from which to associate.
-   */
-  virtual StatusCode reset (const BeamBackgroundData& p);
-
-  /**
-   * @brief Return a pointer to the next element in the association.
-   *
-   * Return 0 when the association has been exhausted.
-   */
-  virtual const xAOD::CaloCluster* next();
-
-
-private:
-  int m_clusCounter;
-  const BeamBackgroundData* m_beamBackgroundData;
-};
-
-
-} // namespace D3PD
-
-
-#endif 
diff --git a/PhysicsAnalysis/D3PDMaker/BackgroundD3PDMaker/src/BeamBackgroundClusterFillerTool.cxx b/PhysicsAnalysis/D3PDMaker/BackgroundD3PDMaker/src/BeamBackgroundClusterFillerTool.cxx
deleted file mode 100644
index 5ffa584abe2..00000000000
--- a/PhysicsAnalysis/D3PDMaker/BackgroundD3PDMaker/src/BeamBackgroundClusterFillerTool.cxx
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-// $Id: BeamBackgroundClusterFillerTool.cxx 589851 2014-03-27 20:01:30Z ssnyder $
-#include "BeamBackgroundClusterFillerTool.h"
-
-
-namespace D3PD {
-
-
-BeamBackgroundClusterFillerTool::BeamBackgroundClusterFillerTool (const std::string& type,
-    const std::string& name,
-    const IInterface* parent)
-  : BlockFillerTool<xAOD::CaloCluster> (type, name, parent)
-{
-  declareProperty ("BeamBackgroundKey",
-                   m_beamBackgroundKey = "BeamBackgroundData",
-                   "StoreGate key for BeamBackground data object");
-
-  book().ignore(); // Avoid coverity warnings.
-}
-
-StatusCode BeamBackgroundClusterFillerTool::book()
-{
-  CHECK( addVariable ("bbDecision", m_resultClus) );
-  CHECK( addVariable ("drdz", m_drdzClus) );
-
-  return StatusCode::SUCCESS;
-}
-
-StatusCode BeamBackgroundClusterFillerTool::fill(const xAOD::CaloCluster& p)
-{
-  CHECK( evtStore()->retrieve(m_beamBackgroundData, m_beamBackgroundKey) );
-
-  int index = m_beamBackgroundData->GetIndexClus(&p);
-
-  if( index != -1 ) {
-    *m_resultClus = m_beamBackgroundData->GetResultClus(index);
-    *m_drdzClus = m_beamBackgroundData->GetDrdzClus(index);
-  } else {
-    *m_resultClus = 0;
-    *m_drdzClus = -1.;
-  }
-
-  return StatusCode::SUCCESS;
-}
-
-
-} // namespace D3PD
diff --git a/PhysicsAnalysis/D3PDMaker/BackgroundD3PDMaker/src/BeamBackgroundClusterFillerTool.h b/PhysicsAnalysis/D3PDMaker/BackgroundD3PDMaker/src/BeamBackgroundClusterFillerTool.h
deleted file mode 100644
index 3bea65a34ef..00000000000
--- a/PhysicsAnalysis/D3PDMaker/BackgroundD3PDMaker/src/BeamBackgroundClusterFillerTool.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-// $Id: BeamBackgroundClusterFillerTool.h 589851 2014-03-27 20:01:30Z ssnyder $
-#ifndef D3PDMAKER_BEAMBACKGROUNDCLUSTERFILLERTOOL_H
-#define D3PDMAKER_BEAMBACKGROUNDCLUSTERFILLERTOOL_H
-
-#include "RecBackgroundEvent/BeamBackgroundData.h"
-#include "D3PDMakerUtils/BlockFillerTool.h"
-#include "xAODCaloEvent/CaloCluster.h"
-#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/ToolHandle.h"
-#include "AthenaKernel/IOVSvcDefs.h"
-#include "AthenaKernel/errorcheck.h"
-#include <string>
-
-
-namespace D3PD {
-
-/**
- * @brief Block filler tool for the cluster results of the Beam Background Identification Method
- *
- * @author David Salek <David.Salek@cern.ch>
- *
- * $Revision: 589851 $
- * $Date: 2014-03-27 21:01:30 +0100 (Thu, 27 Mar 2014) $
- */
-class BeamBackgroundClusterFillerTool
-  : public BlockFillerTool<xAOD::CaloCluster>
-{
-public:
-  BeamBackgroundClusterFillerTool (const std::string& type,
-      const std::string& name,
-      const IInterface* parent);
-
-  // Book variables for this block.
-  virtual StatusCode book();
-
-  /**
-   * @brief Fill one block --- type-safe version.
-   * @param p The input object.
-   *
-   * This is called once per object.  The caller
-   * is responsible for arranging that all the pointers for booked variables
-   * are set appropriately upon entry.
-   */
-  virtual StatusCode fill (const xAOD::CaloCluster& p);
-
-private:
-  /// Property: SG key for the beam background object.
-  std::string m_beamBackgroundKey;
-
-  BeamBackgroundData* m_beamBackgroundData;
-
-  int* m_resultClus;
-  float* m_drdzClus;
-};
-
-} // namespace D3PD
-
-#endif
diff --git a/PhysicsAnalysis/D3PDMaker/BackgroundD3PDMaker/src/BeamBackgroundDecisionFillerTool.cxx b/PhysicsAnalysis/D3PDMaker/BackgroundD3PDMaker/src/BeamBackgroundDecisionFillerTool.cxx
deleted file mode 100644
index d12a1b7430b..00000000000
--- a/PhysicsAnalysis/D3PDMaker/BackgroundD3PDMaker/src/BeamBackgroundDecisionFillerTool.cxx
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-// $Id: BeamBackgroundDecisionFillerTool.cxx 502891 2012-05-29 11:04:54Z salekd $
-#include "BeamBackgroundDecisionFillerTool.h"
-
-
-namespace D3PD {
-
-
-BeamBackgroundDecisionFillerTool::BeamBackgroundDecisionFillerTool (const std::string& type,
-    const std::string& name,
-    const IInterface* parent)
-  : BlockFillerTool<BeamBackgroundData> (type, name, parent)
-{
-  book().ignore(); // Avoid coverity warnings.
-}
-
-StatusCode BeamBackgroundDecisionFillerTool::initialize()
-{
-  CHECK( service( "StoreGateSvc", m_storeGate) );
-
-  return StatusCode::SUCCESS;
-}
-
-StatusCode BeamBackgroundDecisionFillerTool::book()
-{
-  CHECK( addVariable ("decision", m_decision) );
-  CHECK( addVariable ("numSegment", m_numSegment) );
-  CHECK( addVariable ("numSegmentEarly", m_numSegmentEarly) );
-  CHECK( addVariable ("numSegmentACNoTime", m_numSegmentACNoTime) );
-  CHECK( addVariable ("numSegmentAC", m_numSegmentAC) );
-  CHECK( addVariable ("numMatched", m_numMatched) );
-  CHECK( addVariable ("numNoTimeLoose", m_numNoTimeLoose) );
-  CHECK( addVariable ("numNoTimeMedium", m_numNoTimeMedium) );
-  CHECK( addVariable ("numNoTimeTight", m_numNoTimeTight) );
-  CHECK( addVariable ("numOneSidedLoose", m_numOneSidedLoose) );
-  CHECK( addVariable ("numOneSidedMedium", m_numOneSidedMedium) );
-  CHECK( addVariable ("numOneSidedTight", m_numOneSidedTight) );
-  CHECK( addVariable ("numTwoSidedNoTime", m_numTwoSidedNoTime) );
-  CHECK( addVariable ("numTwoSided", m_numTwoSided) );
-  CHECK( addVariable ("numClusterShape", m_numClusterShape) );
-  CHECK( addVariable ("direction", m_direction) );
-
-  return StatusCode::SUCCESS;
-}
-
-
-StatusCode BeamBackgroundDecisionFillerTool::fill(const BeamBackgroundData& beamBackgroundData)
-{
-  *m_decision = beamBackgroundData.GetDecision();
-  *m_numSegment = beamBackgroundData.GetNumSegment();
-  *m_numSegmentEarly = beamBackgroundData.GetNumSegmentEarly();
-  *m_numSegmentACNoTime = beamBackgroundData.GetNumSegmentACNoTime();
-  *m_numSegmentAC = beamBackgroundData.GetNumSegmentAC();
-  *m_numMatched = beamBackgroundData.GetNumMatched();
-  *m_numNoTimeLoose = beamBackgroundData.GetNumNoTimeLoose();
-  *m_numNoTimeMedium = beamBackgroundData.GetNumNoTimeMedium();
-  *m_numNoTimeTight = beamBackgroundData.GetNumNoTimeTight();
-  *m_numOneSidedLoose = beamBackgroundData.GetNumOneSidedLoose();
-  *m_numOneSidedMedium = beamBackgroundData.GetNumOneSidedMedium();
-  *m_numOneSidedTight = beamBackgroundData.GetNumOneSidedTight();
-  *m_numTwoSidedNoTime = beamBackgroundData.GetNumTwoSidedNoTime();
-  *m_numTwoSided = beamBackgroundData.GetNumTwoSided();
-  *m_numClusterShape = beamBackgroundData.GetNumClusterShape();
-  *m_direction = beamBackgroundData.GetDirection();
-
-  return StatusCode::SUCCESS;
-}
-
-
-} // namespace D3PD
diff --git a/PhysicsAnalysis/D3PDMaker/BackgroundD3PDMaker/src/BeamBackgroundDecisionFillerTool.h b/PhysicsAnalysis/D3PDMaker/BackgroundD3PDMaker/src/BeamBackgroundDecisionFillerTool.h
deleted file mode 100644
index 16841747540..00000000000
--- a/PhysicsAnalysis/D3PDMaker/BackgroundD3PDMaker/src/BeamBackgroundDecisionFillerTool.h
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-// $Id: BeamBackgroundDecisionFillerTool.h 502891 2012-05-29 11:04:54Z salekd $
-#ifndef D3PDMAKER_BEAMBACKGROUNDDECISIONFILLERTOOL_H
-#define D3PDMAKER_BEAMBACKGROUNDDECISIONFILLERTOOL_H
-
-#include "RecBackgroundEvent/BeamBackgroundData.h"
-#include "D3PDMakerUtils/BlockFillerTool.h"
-#include "GaudiKernel/ToolHandle.h"
-#include "AthenaKernel/IOVSvcDefs.h"
-#include "AthenaKernel/errorcheck.h"
-#include <string>
-
-class BeamBackgroundData;
-
-namespace D3PD {
-
-/**
- * @brief Block filler tool for the event-level summary of the Beam Background Identification Method
- *
- * @author David Salek <David.Salek@cern.ch>
- *
- * $Revision: 502891 $
- * $Date: 2012-05-29 13:04:54 +0200 (Tue, 29 May 2012) $
- */
-class BeamBackgroundDecisionFillerTool
-  : public BlockFillerTool<BeamBackgroundData>
-{
-public:
-  BeamBackgroundDecisionFillerTool (const std::string& type,
-      const std::string& name,
-      const IInterface* parent);
-
-  StatusCode initialize();
-
-  // Book variables for this block.
-  virtual StatusCode book();
-
-  /**
-   * @brief Fill one block --- type-safe version.
-   * @param p The input object.
-   *
-   * This is called once per object.  The caller
-   * is responsible for arranging that all the pointers for booked variables
-   * are set appropriately upon entry.
-   */
-  virtual StatusCode fill (const BeamBackgroundData& beamBackgroundData);
-
-private:
-  StoreGateSvc* m_storeGate;
-
-  int* m_decision;
-  int* m_numSegment;
-  int* m_numSegmentEarly;
-  int* m_numSegmentACNoTime;
-  int* m_numSegmentAC;
-  int* m_numMatched;
-  int* m_numNoTimeLoose;
-  int* m_numNoTimeMedium;
-  int* m_numNoTimeTight;
-  int* m_numOneSidedLoose;
-  int* m_numOneSidedMedium;
-  int* m_numOneSidedTight;
-  int* m_numTwoSidedNoTime;
-  int* m_numTwoSided;
-  int* m_numClusterShape;
-  int* m_direction;
-};
-
-} // namespace D3PD
-
-#endif
diff --git a/PhysicsAnalysis/D3PDMaker/BackgroundD3PDMaker/src/BeamBackgroundJetAssociationTool.cxx b/PhysicsAnalysis/D3PDMaker/BackgroundD3PDMaker/src/BeamBackgroundJetAssociationTool.cxx
deleted file mode 100644
index 127caaef19e..00000000000
--- a/PhysicsAnalysis/D3PDMaker/BackgroundD3PDMaker/src/BeamBackgroundJetAssociationTool.cxx
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-// $Id: BeamBackgroundJetAssociationTool.cxx 589851 2014-03-27 20:01:30Z ssnyder $
-#include "BeamBackgroundJetAssociationTool.h"
-
-namespace D3PD {
-
-
-BeamBackgroundJetAssociationTool::BeamBackgroundJetAssociationTool
-  (const std::string& type,
-   const std::string& name,
-   const IInterface* parent)
-    : Base (type, name, parent),
-      m_jetCounter(0),
-      m_beamBackgroundData(0)
-{
-}
-
-/**
- * @brief Start the iteration for a new association.
- * @param p The object from which to associate.
- */
-StatusCode BeamBackgroundJetAssociationTool::reset (const BeamBackgroundData& p)
-{
-  m_jetCounter = 0;
-  m_beamBackgroundData = &p;
-   
-  return StatusCode::SUCCESS;
-}
-
-/**
- * @brief Return a pointer to the next element in the association.
- *
- * Return 0 when the association has been exhausted.
- */
-const xAOD::Jet* BeamBackgroundJetAssociationTool::next()
-{
-  // reached the end
-  if(m_jetCounter == m_beamBackgroundData->GetNumJet()) return 0;
-
-  // else return a track and increment index
-  const xAOD::Jet* jet = m_beamBackgroundData->GetIndexJet(m_jetCounter);
-  m_jetCounter++;
-  return jet;
-}
-
-
-} // namespace D3PD
-
diff --git a/PhysicsAnalysis/D3PDMaker/BackgroundD3PDMaker/src/BeamBackgroundJetAssociationTool.h b/PhysicsAnalysis/D3PDMaker/BackgroundD3PDMaker/src/BeamBackgroundJetAssociationTool.h
deleted file mode 100644
index 8282c27c3a2..00000000000
--- a/PhysicsAnalysis/D3PDMaker/BackgroundD3PDMaker/src/BeamBackgroundJetAssociationTool.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-// $Id: BeamBackgroundJetAssociationTool.h 589851 2014-03-27 20:01:30Z ssnyder $
-#ifndef BACKGROUNDD3PDMAKER_BEAMBACKGROUNDJETASSOCIATIONTOOL_H
-#define BACKGROUNDD3PDMAKER_BEAMBACKGROUNDJETASSOCIATIONTOOL_H
-
-#include "D3PDMakerUtils/MultiAssociationTool.h"
-#include "RecBackgroundEvent/BeamBackgroundData.h"
-#include "xAODJet/Jet.h"
-
-
-namespace D3PD {
-
-/**
- * @short Tool "associating" Jet objects to BeamBackgroundData
- *
- *        BeamBackgroundData object contains a list of fake jet candidates
- *        which can be filled into D3PD using this associatoion tool.
- *
- * @author David Salek <David.Salek@cern.ch>
- *
- * $Revision: 589851 $
- * $Date: 2014-03-27 21:01:30 +0100 (Thu, 27 Mar 2014) $
- */
-class BeamBackgroundJetAssociationTool :
-  public MultiAssociationTool< BeamBackgroundData, xAOD::Jet >
-{
-public:
-  typedef MultiAssociationTool< BeamBackgroundData, xAOD::Jet> Base;
-
-  /// Regular AlgTool constructor
-  BeamBackgroundJetAssociationTool (const std::string& type,
-                                        const std::string& name,
-                                        const IInterface* parent);
-
-  /**
-   * @brief Start the iteration for a new association.
-   * @param p The object from which to associate.
-   */
-  virtual StatusCode reset (const BeamBackgroundData& p);
-
-  /**
-   * @brief Return a pointer to the next element in the association.
-   *
-   * Return 0 when the association has been exhausted.
-   */
-  virtual const xAOD::Jet* next();
-
-
-private:
-  int m_jetCounter;
-  const BeamBackgroundData* m_beamBackgroundData;
-};
-
-
-} // namespace D3PD
-
-
-#endif 
diff --git a/PhysicsAnalysis/D3PDMaker/BackgroundD3PDMaker/src/BeamBackgroundJetFillerTool.cxx b/PhysicsAnalysis/D3PDMaker/BackgroundD3PDMaker/src/BeamBackgroundJetFillerTool.cxx
deleted file mode 100644
index 71ad7be5076..00000000000
--- a/PhysicsAnalysis/D3PDMaker/BackgroundD3PDMaker/src/BeamBackgroundJetFillerTool.cxx
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-// $Id: BeamBackgroundJetFillerTool.cxx 589851 2014-03-27 20:01:30Z ssnyder $
-#include "BeamBackgroundJetFillerTool.h"
-
-
-namespace D3PD {
-
-
-BeamBackgroundJetFillerTool::BeamBackgroundJetFillerTool (const std::string& type,
-    const std::string& name,
-    const IInterface* parent)
-  : BlockFillerTool<xAOD::Jet> (type, name, parent)
-{
-  declareProperty ("BeamBackgroundKey",
-                   m_beamBackgroundKey = "BeamBackgroundData",
-                   "StoreGate key for BeamBackground data object");
-
-  book().ignore(); // Avoid coverity warnings.
-}
-
-StatusCode BeamBackgroundJetFillerTool::book()
-{
-  CHECK( addVariable ("bbDecision", m_bbDecision) );
-
-  return StatusCode::SUCCESS;
-}
-
-StatusCode BeamBackgroundJetFillerTool::fill(const xAOD::Jet& p)
-{
-  CHECK( evtStore()->retrieve(m_beamBackgroundData, m_beamBackgroundKey) );
-
-  int index = m_beamBackgroundData->GetIndexJet(&p);
-
-  if( index != -1 ) {
-    *m_bbDecision = m_beamBackgroundData->GetResultJet(index);
-  } else {
-    *m_bbDecision = 0;
-  }
-
-  return StatusCode::SUCCESS;
-}
-
-
-} // namespace D3PD
diff --git a/PhysicsAnalysis/D3PDMaker/BackgroundD3PDMaker/src/BeamBackgroundJetFillerTool.h b/PhysicsAnalysis/D3PDMaker/BackgroundD3PDMaker/src/BeamBackgroundJetFillerTool.h
deleted file mode 100644
index a3adb0fa190..00000000000
--- a/PhysicsAnalysis/D3PDMaker/BackgroundD3PDMaker/src/BeamBackgroundJetFillerTool.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-// $Id: BeamBackgroundJetFillerTool.h 589851 2014-03-27 20:01:30Z ssnyder $
-#ifndef D3PDMAKER_BEAMBACKGROUNDJETFILLERTOOL_H
-#define D3PDMAKER_BEAMBACKGROUNDJETFILLERTOOL_H
-
-#include "RecBackgroundEvent/BeamBackgroundData.h"
-#include "D3PDMakerUtils/BlockFillerTool.h"
-#include "xAODJet/Jet.h"
-#include "GaudiKernel/ToolHandle.h"
-#include "AthenaKernel/IOVSvcDefs.h"
-#include "AthenaKernel/errorcheck.h"
-#include <vector>
-#include <string>
-
-
-namespace D3PD {
-
-/**
- * @brief Block filler tool for the fake jet results of the Beam Background Identification Method
- *
- * @author David Salek <David.Salek@cern.ch>
- *
- * $Revision: 589851 $
- * $Date: 2014-03-27 21:01:30 +0100 (Thu, 27 Mar 2014) $
- */
-class BeamBackgroundJetFillerTool
-  : public BlockFillerTool<xAOD::Jet>
-{
-public:
-  BeamBackgroundJetFillerTool (const std::string& type,
-      const std::string& name,
-      const IInterface* parent);
-
-
-  // Book variables for this block.
-  virtual StatusCode book();
-
-  /**
-   * @brief Fill one block --- type-safe version.
-   * @param p The input object.
-   *
-   * This is called once per object.  The caller
-   * is responsible for arranging that all the pointers for booked variables
-   * are set appropriately upon entry.
-   */
-  virtual StatusCode fill (const xAOD::Jet& p);
-
-private:
-  /// Property: SG key for the beam background object.
-  std::string m_beamBackgroundKey;
-
-  BeamBackgroundData* m_beamBackgroundData;
-
-  int* m_bbDecision;
-};
-
-} // namespace D3PD
-
-#endif
diff --git a/PhysicsAnalysis/D3PDMaker/BackgroundD3PDMaker/src/LucidPMTHitFillerTool.cxx b/PhysicsAnalysis/D3PDMaker/BackgroundD3PDMaker/src/LucidPMTHitFillerTool.cxx
deleted file mode 100644
index 12391d001b2..00000000000
--- a/PhysicsAnalysis/D3PDMaker/BackgroundD3PDMaker/src/LucidPMTHitFillerTool.cxx
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-// $Id: LucidPMTHitFillerTool.cxx 498883 2012-05-03 10:33:42Z ssnyder $
-/**
- * @file BackgroundD3PDMaker/src/LucidPMTHitFillerTool.cxx
- * @author Mark Tibbetts <mark.james.tibbetts@cern.ch>
- * @date Feb, 2011
- * @brief Block filler tool for LUCID PMT hit info.
- */
-
-
-#include "LucidPMTHitFillerTool.h"
-#include "AthenaKernel/errorcheck.h"
-#include "LUCID_RawEvent/LUCID_RawDataContainer.h"
-
-
-namespace D3PD {
-  
-  
-  /**
-   * @brief Standard Gaudi tool constructor.
-   * @param type The name of the tool type.
-   * @param name The tool name.
-   * @param parent The tool's Gaudi parent.
-   */
-  LucidPMTHitFillerTool::LucidPMTHitFillerTool
-  (const std::string& type,
-   const std::string& name,
-   const IInterface* parent)
-    : BlockFillerTool<LUCID_RawDataContainer> (type, name, parent)
-  {
-    book().ignore(); // Avoid coverity warnings.
-  }
-  
-  
-  /**
-   * @brief Book variables for this block.
-   */
-  StatusCode LucidPMTHitFillerTool::book()
-  {
-    CHECK( addVariable ("nAhits",       m_nAhits,
-			"LUCID PMT hits on A side.") );
-    CHECK( addVariable ("nChits",     m_nChits,
-			"LUCID PMT hits on C side.") );
-    
-    return StatusCode::SUCCESS;
-  }
-  
-  
-  /**
-   * @brief Fill one block --- type-safe version.
-   * @param p The input object.
-   *
-   * This is called once per object.  The caller
-   * is responsible for arranging that all the pointers for booked variables
-   * are set appropriately upon entry.
-   */
-  StatusCode LucidPMTHitFillerTool::fill (const LUCID_RawDataContainer& lucid_rdc)
-  {
-
-    // Reset the counters:
-    *m_nAhits = 0;
-    *m_nChits = 0;
-
-    LUCID_RawDataContainer::const_iterator LUCID_RawData_itr = lucid_rdc.begin();
-    LUCID_RawDataContainer::const_iterator LUCID_RawData_end = lucid_rdc.end();    
-
-    for (; LUCID_RawData_itr != LUCID_RawData_end; ++LUCID_RawData_itr) {
-
-      *m_nAhits+=(*LUCID_RawData_itr)->getNhitsPMTsideA();
-      *m_nChits+=(*LUCID_RawData_itr)->getNhitsPMTsideC(); 
-    }     
-
-    return StatusCode::SUCCESS;
-    
-  }
-  
-} // namespace D3PD
diff --git a/PhysicsAnalysis/D3PDMaker/BackgroundD3PDMaker/src/LucidPMTHitFillerTool.h b/PhysicsAnalysis/D3PDMaker/BackgroundD3PDMaker/src/LucidPMTHitFillerTool.h
deleted file mode 100644
index cf54de127bd..00000000000
--- a/PhysicsAnalysis/D3PDMaker/BackgroundD3PDMaker/src/LucidPMTHitFillerTool.h
+++ /dev/null
@@ -1,71 +0,0 @@
-// This file's extension implies that it's C, but it's really -*- C++ -*-.
-
-/*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-// $Id: LucidPMTHitFillerTool.h 351806 2011-03-15 10:05:36Z krasznaa $
-/**
- * @file BackgroundD3PDMaker/src/LucidPMTHitFillerTool.h
- * @author Mark Tibbetts <mark.james.tibbetts@cern.ch>
- * @date Feb, 2011
- * @brief Block filler tool for LUCID PMT hit info.
- */
-
-#ifndef BACKGROUNDD3PDMAKER_LUCIDPMTHITFILLERTOOL_H
-#define BACKGROUNDD3PDMAKER_LUCIDPMTHITFILLERTOOL_H
-
-
-#include "D3PDMakerUtils/BlockFillerTool.h"
-#include "LUCID_RawEvent/LUCID_RawDataContainer.h"
-
-namespace D3PD {
-  
-  
-  /**
-   * @brief Block filler tool for LUCID PMT hit info.
-   */
-  class LucidPMTHitFillerTool
-    : public BlockFillerTool<LUCID_RawDataContainer>
-  {
-  public:
-    /**
-     * @brief Standard Gaudi tool constructor.
-     * @param type The name of the tool type.
-     * @param name The tool name.
-     * @param parent The tool's Gaudi parent.
-     */
-    LucidPMTHitFillerTool (const std::string& type,
-		    const std::string& name,
-		    const IInterface* parent);
-    
-    
-    /// Book variables for this block.
-    virtual StatusCode book();
-    
-    
-    /**
-     * @brief Fill one block --- type-safe version.
-     * @param p The input object.
-     *
-     * This is called once per object.  The caller
-     * is responsible for arranging that all the pointers for booked variables
-     * are set appropriately upon entry.
-     */
-    virtual StatusCode fill (const LUCID_RawDataContainer& lucid_rdc);
-    
-    
-  private:
-
-    // number of A side hits
-    int* m_nAhits;
-    // number of C side hits
-    int* m_nChits;
-
-  };
-  
-  
-} // namespace D3PD
-
-
-#endif // not BACKGROUNDD3PDMAKER_LUCIDPMTHITFILLERTOOL_H
diff --git a/PhysicsAnalysis/D3PDMaker/BackgroundD3PDMaker/src/RawTagInDetSPFillerTool.cxx b/PhysicsAnalysis/D3PDMaker/BackgroundD3PDMaker/src/RawTagInDetSPFillerTool.cxx
deleted file mode 100644
index ced88e169e6..00000000000
--- a/PhysicsAnalysis/D3PDMaker/BackgroundD3PDMaker/src/RawTagInDetSPFillerTool.cxx
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-// $Id: RawTagInDetSPFillerTool.cxx 498883 2012-05-03 10:33:42Z ssnyder $
-/**
- * @file BackgroundD3PDMaker/src/RawTagInDetSPFillerTool.cxx
- * @author Mark Tibbetts <mark.james.tibbetts@cern.ch>
- * @date Feb, 2011
- * @brief Block filler tool for InDet spacepoints from RawInfoSummaryForTag.
- */
-
-
-#include "RawTagInDetSPFillerTool.h"
-#include "AthenaKernel/errorcheck.h"
-#include "TagEvent/RawInfoSummaryForTag.h"
-
-
-namespace D3PD {
-  
-  
-  /**
-   * @brief Standard Gaudi tool constructor.
-   * @param type The name of the tool type.
-   * @param name The tool name.
-   * @param parent The tool's Gaudi parent.
-   */
-  RawTagInDetSPFillerTool::RawTagInDetSPFillerTool
-  (const std::string& type,
-   const std::string& name,
-   const IInterface* parent)
-    : BlockFillerTool<RawInfoSummaryForTag> (type, name, parent)
-  {
-    book().ignore(); // Avoid coverity warnings.
-  }
-  
-  
-  /**
-   * @brief Book variables for this block.
-   */
-  StatusCode RawTagInDetSPFillerTool::book()
-  {
-    CHECK( addVariable ("nPixSP",       m_nPixSP,
-			"Number of pixel spacepoints.") );
-    CHECK( addVariable ("nSctSP",     m_nSctSP,
-			"Number of SCT spacepoints.") );
-    
-    return StatusCode::SUCCESS;
-  }
-  
-  
-  /**
-   * @brief Fill one block --- type-safe version.
-   * @param p The input object.
-   *
-   * This is called once per object.  The caller
-   * is responsible for arranging that all the pointers for booked variables
-   * are set appropriately upon entry.
-   */
-  StatusCode RawTagInDetSPFillerTool::fill (const RawInfoSummaryForTag& rawtag)
-  {
-
-
-    *m_nPixSP=rawtag.getNpixSPs();
-    *m_nSctSP=rawtag.getNsctSPs();
-   
-
-    return StatusCode::SUCCESS;
-    
-  }
-  
-} // namespace D3PD
diff --git a/PhysicsAnalysis/D3PDMaker/BackgroundD3PDMaker/src/RawTagInDetSPFillerTool.h b/PhysicsAnalysis/D3PDMaker/BackgroundD3PDMaker/src/RawTagInDetSPFillerTool.h
deleted file mode 100644
index 279629d728a..00000000000
--- a/PhysicsAnalysis/D3PDMaker/BackgroundD3PDMaker/src/RawTagInDetSPFillerTool.h
+++ /dev/null
@@ -1,72 +0,0 @@
-// This file's extension implies that it's C, but it's really -*- C++ -*-.
-
-/*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-// $Id: RawTagInDetSPFillerTool.h 351806 2011-03-15 10:05:36Z krasznaa $
-/**
- * @file BackgroundD3PDMaker/src/RawTagInDetSPFillerTool.h
- * @author Mark Tibbetts <mark.james.tibbetts@cern.ch>
- * @date Feb, 2011
- * @brief Block filler tool for InDet spacepoints from RawInfoSummaryForTag.
- */
-
-#ifndef BACKGROUNDD3PDMAKER_RAWTAGINDETSPFILLERTOOL_H
-#define BACKGROUNDD3PDMAKER_RAWTAGINDETSPFILLERTOOL_H
-
-
-#include "D3PDMakerUtils/BlockFillerTool.h"
-#include "TagEvent/RawInfoSummaryForTag.h"
-
-
-namespace D3PD {
-  
-  
-  /**
-   * @brief Block filler tool for LUCID PMT hit info.
-   */
-  class RawTagInDetSPFillerTool
-    : public BlockFillerTool<RawInfoSummaryForTag>
-  {
-  public:
-    /**
-     * @brief Standard Gaudi tool constructor.
-     * @param type The name of the tool type.
-     * @param name The tool name.
-     * @param parent The tool's Gaudi parent.
-     */
-    RawTagInDetSPFillerTool (const std::string& type,
-		    const std::string& name,
-		    const IInterface* parent);
-    
-    
-    /// Book variables for this block.
-    virtual StatusCode book();
-    
-    
-    /**
-     * @brief Fill one block --- type-safe version.
-     * @param p The input object.
-     *
-     * This is called once per object.  The caller
-     * is responsible for arranging that all the pointers for booked variables
-     * are set appropriately upon entry.
-     */
-    virtual StatusCode fill (const RawInfoSummaryForTag& rawtag);
-    
-    
-  private:
-
-    // number of pixel spacepoints
-    int* m_nPixSP;
-    // number of sct spacepoints
-    int* m_nSctSP;
-
-  };
-  
-  
-} // namespace D3PD
-
-
-#endif // not BACKGROUNDD3PDMAKER_RAWTAGINDETSPFILLERTOOL_H
diff --git a/PhysicsAnalysis/D3PDMaker/BackgroundD3PDMaker/src/components/BackgroundD3PDMaker_entries.cxx b/PhysicsAnalysis/D3PDMaker/BackgroundD3PDMaker/src/components/BackgroundD3PDMaker_entries.cxx
deleted file mode 100644
index dfb2681353c..00000000000
--- a/PhysicsAnalysis/D3PDMaker/BackgroundD3PDMaker/src/components/BackgroundD3PDMaker_entries.cxx
+++ /dev/null
@@ -1,19 +0,0 @@
-#include "../LucidPMTHitFillerTool.h"
-#include "../RawTagInDetSPFillerTool.h"
-#include "../BackgroundWordFillerTool.h"
-#include "../BeamBackgroundDecisionFillerTool.h"
-#include "../BeamBackgroundClusterFillerTool.h"
-#include "../BeamBackgroundClusterAssociationTool.h"
-#include "../BeamBackgroundJetFillerTool.h"
-#include "../BeamBackgroundJetAssociationTool.h"
-
-
-DECLARE_COMPONENT( D3PD::LucidPMTHitFillerTool )
-DECLARE_COMPONENT( D3PD::RawTagInDetSPFillerTool )
-DECLARE_COMPONENT( D3PD::BackgroundWordFillerTool )
-DECLARE_COMPONENT( D3PD::BeamBackgroundDecisionFillerTool )
-DECLARE_COMPONENT( D3PD::BeamBackgroundClusterFillerTool )
-DECLARE_COMPONENT( D3PD::BeamBackgroundClusterAssociationTool )
-DECLARE_COMPONENT( D3PD::BeamBackgroundJetFillerTool )
-DECLARE_COMPONENT( D3PD::BeamBackgroundJetAssociationTool )
-
diff --git a/PhysicsAnalysis/D3PDMaker/D3PDMakerConfig/python/D3PDProdFlags.py b/PhysicsAnalysis/D3PDMaker/D3PDMakerConfig/python/D3PDProdFlags.py
index 083e09528c8..89a4e666a77 100644
--- a/PhysicsAnalysis/D3PDMaker/D3PDMakerConfig/python/D3PDProdFlags.py
+++ b/PhysicsAnalysis/D3PDMaker/D3PDMakerConfig/python/D3PDProdFlags.py
@@ -97,21 +97,6 @@ jobproperties.D3PDProdFlags.add_JobProperty (WriteMuonD3PD)
 listAllKnownD3PD.append (prodFlags.WriteMuonD3PD)
 
 
-class WriteBackgroundD3PD (JobProperty):
-    """Produce the Background D3PD."""
-    statusOn = True
-    allowedTypes = ['bool']
-    StoredValue = False
-    StreamName = 'StreamNTUP_BKGD'
-    FileName = ''
-    isVirtual = False
-    DPDMakerScript = "BackgroundD3PDMaker/BackgroundD3PD_prodJobOFragment.py"
-    TreeNames = ['background']
-    SubSteps = ['e2d', 'a2d']
-jobproperties.D3PDProdFlags.add_JobProperty (WriteBackgroundD3PD)
-listAllKnownD3PD.append (prodFlags.WriteBackgroundD3PD)
-
-
 #######################################################
 #
 #                     Trigger D3PDs
-- 
GitLab