diff --git a/PhysicsAnalysis/D3PDMaker/HiggsD3PDMaker/CMakeLists.txt b/PhysicsAnalysis/D3PDMaker/HiggsD3PDMaker/CMakeLists.txt
deleted file mode 100644
index 23ac26b20f201dbbc43f80258869109c7b8dec4c..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/D3PDMaker/HiggsD3PDMaker/CMakeLists.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-################################################################################
-# Package: HiggsD3PDMaker
-################################################################################
-
-# Declare the package name:
-atlas_subdir( HiggsD3PDMaker )
-
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PRIVATE
- Control/AthenaKernel
- GaudiKernel
- PhysicsAnalysis/AnalysisCommon/ParticleEvent
- PhysicsAnalysis/D3PDMaker/D3PDMakerUtils
- PhysicsAnalysis/HiggsPhys/HSG2/HSG2Event
- Tracking/TrkEvent/VxVertex )
-
-# Component(s) in the package:
-atlas_add_component( HiggsD3PDMaker
- src/*.cxx
- src/components/*.cxx
- LINK_LIBRARIES AthenaKernel GaudiKernel ParticleEvent D3PDMakerUtils HSG2Event VxVertex )
-
-# Install files from the package:
-atlas_install_python_modules( python/*.py )
-
diff --git a/PhysicsAnalysis/D3PDMaker/HiggsD3PDMaker/python/HSG2QuadrupletD3PDObject.py b/PhysicsAnalysis/D3PDMaker/HiggsD3PDMaker/python/HSG2QuadrupletD3PDObject.py
deleted file mode 100644
index 4f379a7dd061ba34d190045e18ba946e08fdf16b..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/D3PDMaker/HiggsD3PDMaker/python/HSG2QuadrupletD3PDObject.py
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-
-# $Id: HSG2QuadrupletD3PDObject.py 520030 2012-10-03 10:11:57Z krasznaa $
-
-# D3PDMaker import(s):
-from D3PDMakerCoreComps.D3PDObject import make_SGDataVector_D3PDObject
-from D3PDMakerCoreComps.IndexAssociation import IndexAssociation
-from D3PDMakerCoreComps.IndexMultiAssociation import IndexMultiAssociation
-from D3PDMakerCoreComps.SimpleAssociation import SimpleAssociation
-import HiggsD3PDMaker
-import EventCommonD3PDMaker
-
-# Hook setting up the vertex reconstruction in the pre-sequence:
-def __vertexReco( c, **kw ):
- from D3PDMakerConfig.D3PDMakerFlags import D3PDMakerFlags
- from AthenaCommon.AlgSequence import AlgSequence
- from HSG2VertexCreation.HSG2VertexReconstruction import HSG2VertexReconstruction
- HSG2VertexReconstruction( "HSG2VertexReconstruction",
- AlgSequence( D3PDMakerFlags.PreD3PDAlgSeqName() ) )
- return
-
-# Create the D3PDObject:
-HSG2QuadrupletD3PDObject = make_SGDataVector_D3PDObject( "QuadrupletContainer",
- "QuadrupletCandidates",
- "quad_",
- "HSG2QuadrupletD3PDObject" )
-
-# Define the vertex reconstruction hook:
-HSG2QuadrupletD3PDObject.defineHook( __vertexReco )
-
-# The basic information:
-HSG2QuadrupletD3PDObject.defineBlock( 0, "BaseInfo",
- HiggsD3PDMaker.QuadrupletFillerTool )
-
-# Associate the reconstructed vertices:
-VtxAssoc = IndexAssociation( HSG2QuadrupletD3PDObject,
- HiggsD3PDMaker.QuadrupletVertexAssociationTool,
- target = "quad_vertex_",
- blockname = "VertexIndex",
- prefix = "vtx_",
- level = 1 )
-
-# Associate the CombinedParticles:
-CombAssoc = SimpleAssociation( HSG2QuadrupletD3PDObject,
- HiggsD3PDMaker.QuadrupletCompositeParticleAssociationTool,
- blockname = "CombPartMatch",
- prefix = "cbpart_",
- level = 1 )
-
-# Save the 4-momentum of the combined particles:
-CombAssoc.defineBlock( 1, "ComPart4Mom",
- EventCommonD3PDMaker.FourMomFillerTool )
-
-# Save the indices of all the electrons that took part in the combination:
-ElAssoc = IndexMultiAssociation( CombAssoc,
- EventCommonD3PDMaker.CompositeParticleAssociationTool,
- target = "el_",
- blockname = "ElectronIndex",
- prefix = "el_",
- level = 2 )
-
-# Save the indices of all the MuID muons that took part in the combination:
-MuidAssoc = IndexMultiAssociation( CombAssoc,
- EventCommonD3PDMaker.CompositeParticleAssociationTool,
- target = "mu_muid_",
- blockname = "MuonMuidIndex",
- prefix = "mu_muid_",
- level = 2 )
-
-# Save the indices of all the Staco muons that took part in the combination:
-StacoAssoc = IndexMultiAssociation( CombAssoc,
- EventCommonD3PDMaker.CompositeParticleAssociationTool,
- target = "mu_staco_",
- blockname = "MuonStacoIndex",
- prefix = "mu_staco_",
- level = 2 )
-
-# Save the indices of all the Calo muons that took part in the combination:
-CaloAssoc = IndexMultiAssociation( CombAssoc,
- EventCommonD3PDMaker.CompositeParticleAssociationTool,
- target = "mu_calo_",
- blockname = "MuonCaloIndex",
- prefix = "mu_calo_",
- level = 2 )
-
-# Save the indices of all the third chain muons that took part in the combination:
-MuonAssoc = IndexMultiAssociation( CombAssoc,
- EventCommonD3PDMaker.CompositeParticleAssociationTool,
- target = "mu_muon_",
- blockname = "MuonIndex",
- prefix = "mu_muon_",
- level = 2 )
diff --git a/PhysicsAnalysis/D3PDMaker/HiggsD3PDMaker/python/HSG2VertexReconstruction.py b/PhysicsAnalysis/D3PDMaker/HiggsD3PDMaker/python/HSG2VertexReconstruction.py
deleted file mode 100644
index 0ee55ddb65e7869bb8f8207b63ef613b1c500307..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/D3PDMaker/HiggsD3PDMaker/python/HSG2VertexReconstruction.py
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
-
-# $Id: HSG2VertexReconstruction.py 520030 2012-10-03 10:11:57Z krasznaa $
-#
-# The function is this module adds all the information to a D3PD stream
-# about the lepton quadruplets and vertices reconstructed while making
-# the HSG2 D3PDs.
-#
-
-##
-# @short Function adding information about re-fitted 4-lepton vertices
-#
-# @param d3pdalg The D3PDMaker algorithm/stream to add the info to
-# @param quadruplet_key The SG key of the reconstructed lepton quadruplets
-# @param vertex_key The SG key of the re-fitted 4-lepton vertices
-# @param electron_target Prefix of electrons taking part in the lepton combinations
-# @param muid_target Prefix of the MuID muons taking part in the lepton combinations
-# @param staco_target Prefix of the Staco muons taking part in the lepton combinations
-# @param calo_target Prefix of the Calo muons taking part in the lepton combinations
-def addHSG2VertexReconstruction( d3pdalg,
- quadruplet_key = "QuadrupletCandidates",
- vertex_key = "QuadrupletVertexCandidates",
- electron_target = "el_",
- muid_target = "mu_muid_",
- staco_target = "mu_staco_",
- calo_target = "mu_calo_",
- muon_target = "mu_muon_" ):
-
- # Add information about the vertices separately:
- from TrackD3PDMaker.xAODVertexD3PDObject import PrimaryxAODVertexD3PDObject
- d3pdalg += PrimaryxAODVertexD3PDObject( 1, sgkey = vertex_key,
- prefix = "quad_vertex_" )
-
- # Add the information about the quadruplets:
- from HiggsD3PDMaker.HSG2QuadrupletD3PDObject import HSG2QuadrupletD3PDObject
- d3pdalg += HSG2QuadrupletD3PDObject( 10, sgkey = quadruplet_key,
- prefix = "quad_",
- VertexIndex_target = "quad_vertex_",
- ElectronIndex_target = electron_target,
- MuonMuidIndex_target = muid_target,
- MuonStacoIndex_target = staco_target,
- MuonCaloIndex_target = calo_target,
- MuonIndex_target = muon_target )
-
- return
diff --git a/PhysicsAnalysis/D3PDMaker/HiggsD3PDMaker/python/__init__.py b/PhysicsAnalysis/D3PDMaker/HiggsD3PDMaker/python/__init__.py
deleted file mode 100644
index 59ef0d52ee62d35b4964ab4ab06433ac2c484193..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/D3PDMaker/HiggsD3PDMaker/python/__init__.py
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-
-# $Id: __init__.py 485019 2012-02-24 16:16:04Z krasznaa $
-#
-# @file HiggsD3PDMaker/python/__init__.py
-# @author scott snyder <snyder@bnl.gov>
-# @date Sep, 2009
-# @brief Define shortcuts for referencing configurables in this package.
-#
-# With this, instead of writing
-#
-# HiggsD3PDMaker.HiggsD3PDMakerConf.D3PD__QuadrupletFillerTool
-#
-# we can write
-#
-# HiggsD3PDMaker.QuadrupletFillerTool
-#
-
-import HiggsD3PDMakerConf
-for k, v in HiggsD3PDMakerConf.__dict__.items():
- if k.startswith ('D3PD__'):
- globals()[k[6:]] = v
diff --git a/PhysicsAnalysis/D3PDMaker/HiggsD3PDMaker/src/QuadrupletCompositeParticleAssociationTool.cxx b/PhysicsAnalysis/D3PDMaker/HiggsD3PDMaker/src/QuadrupletCompositeParticleAssociationTool.cxx
deleted file mode 100644
index 876c00852dd99cb15f64bb3bc9ddaacee0c93520..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/D3PDMaker/HiggsD3PDMaker/src/QuadrupletCompositeParticleAssociationTool.cxx
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-// $Id: QuadrupletCompositeParticleAssociationTool.cxx 485019 2012-02-24 16:16:04Z krasznaa $
-
-// Local include(s):
-#include "QuadrupletCompositeParticleAssociationTool.h"
-
-namespace D3PD {
-
- QuadrupletCompositeParticleAssociationTool::QuadrupletCompositeParticleAssociationTool( const std::string& type,
- const std::string& name,
- const IInterface* parent )
- : SingleAssociationTool< HSG2::Quadruplet, CompositeParticle >( type, name, parent ) {
-
- }
-
- const CompositeParticle* QuadrupletCompositeParticleAssociationTool::get( const HSG2::Quadruplet& q ) {
-
- return *( q.particle() );
- }
-
-} // namespace D3PD
diff --git a/PhysicsAnalysis/D3PDMaker/HiggsD3PDMaker/src/QuadrupletCompositeParticleAssociationTool.h b/PhysicsAnalysis/D3PDMaker/HiggsD3PDMaker/src/QuadrupletCompositeParticleAssociationTool.h
deleted file mode 100644
index b3c7581e31fa2224b80464a3741094e2ae9fc272..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/D3PDMaker/HiggsD3PDMaker/src/QuadrupletCompositeParticleAssociationTool.h
+++ /dev/null
@@ -1,45 +0,0 @@
-// Dear emacs, this is -*- c++ -*-
-
-/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-// $Id: QuadrupletCompositeParticleAssociationTool.h 485019 2012-02-24 16:16:04Z krasznaa $
-#ifndef HIGGSD3PDMAKER_QuadrupletCompositeParticleAssociationTool_H
-#define HIGGSD3PDMAKER_QuadrupletCompositeParticleAssociationTool_H
-
-// EDM include(s):
-#include "HSG2Event/Quadruplet.h"
-#include "ParticleEvent/CompositeParticle.h"
-
-// D3PD include(s):
-#include "D3PDMakerUtils/SingleAssociationTool.h"
-
-namespace D3PD {
-
- /**
- * @short Tool "associating" Quadruplet objects to a VxCandiadte
- *
- *
- * @author Kirill.Prokofiev@cern.ch
- *
- * $Revision: 485019 $
- * $Date: 2012-02-24 17:16:04 +0100 (Fri, 24 Feb 2012) $
- */
- class QuadrupletCompositeParticleAssociationTool :
- public SingleAssociationTool< HSG2::Quadruplet, CompositeParticle > {
-
- public:
- /// Regular AlgTool constructor
- QuadrupletCompositeParticleAssociationTool( const std::string& type,
- const std::string& name,
- const IInterface* parent );
-
- /// Function performing the association
- virtual const CompositeParticle* get( const HSG2::Quadruplet& q );
-
- }; // class QuadrupletCompositeParticleAssociationTool
-
-} // namespace D3PD
-
-#endif // HIGGSD3PDMAKER_QuadrupletCompositeParticleAssociationTool_H
diff --git a/PhysicsAnalysis/D3PDMaker/HiggsD3PDMaker/src/QuadrupletFillerTool.cxx b/PhysicsAnalysis/D3PDMaker/HiggsD3PDMaker/src/QuadrupletFillerTool.cxx
deleted file mode 100644
index 91f7fed5af69b86e7bc3208f377ffe5172396c60..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/D3PDMaker/HiggsD3PDMaker/src/QuadrupletFillerTool.cxx
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-// $Id: QuadrupletFillerTool.cxx 500852 2012-05-15 15:01:24Z ssnyder $
-
-// Athena/Gaudi include(s):
-#include "AthenaKernel/errorcheck.h"
-
-// Local include(s):
-#include "QuadrupletFillerTool.h"
-
-namespace D3PD {
-
- QuadrupletFillerTool::QuadrupletFillerTool( const std::string& type,
- const std::string& name,
- const IInterface* parent )
- : BlockFillerTool< HSG2::Quadruplet >( type, name, parent )
- {
- book().ignore(); // Avoid coverity warnings.
- }
-
- StatusCode QuadrupletFillerTool::book() {
-
- CHECK( addVariable( "finalState", m_fs, "Final state type (0: 4 muon; "
- "1: 4 electron; 2: 2e2mu)" ) );
-
- return StatusCode::SUCCESS;
- }
-
- StatusCode QuadrupletFillerTool::fill( const HSG2::Quadruplet& q ) {
-
- *m_fs = static_cast< unsigned int >( q.finalState() );
-
- return StatusCode::SUCCESS;
- }
-
-} // namespace D3PD
diff --git a/PhysicsAnalysis/D3PDMaker/HiggsD3PDMaker/src/QuadrupletFillerTool.h b/PhysicsAnalysis/D3PDMaker/HiggsD3PDMaker/src/QuadrupletFillerTool.h
deleted file mode 100644
index 9af466bf6080b8eb227e261cd739d316d7bad1f3..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/D3PDMaker/HiggsD3PDMaker/src/QuadrupletFillerTool.h
+++ /dev/null
@@ -1,57 +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: QuadrupletFillerTool.h 485019 2012-02-24 16:16:04Z krasznaa $
-/**
- * @file HiggsD3PDMaker/src/HiggsQuadrupletFillerTool.h
- * @author Kirill Prokofiev <Kirill.Prokofiev@cern.ch>
- * @author Attila Krasznahorkay <Attila.Krasznahorkay@cern.ch>
- * @date Aug, 2009
- * @brief Block filler tool for a four-momentum.
- */
-#ifndef HIGGSD3PDMAKER_QuadrupletFillerTool_H
-#define HIGGSD3PDMAKER_QuadrupletFillerTool_H
-
-// EDM include(s):
-#include "HSG2Event/Quadruplet.h"
-
-// D3PDMaker include(s):
-#include "D3PDMakerUtils/BlockFillerTool.h"
-
-namespace D3PD {
-
- /**
- * @brief Block filler for the Higgs quadruplet
- *
- * Block filler tool for the information stored directly in
- * HSG2::Quadruplet objects.
- *
- * @author Kirill Prokofiev <Kirll.Prokofiev@cern.ch>
- * @author Attila Krasznahorkay <Attila.Krasznahorkay@cern.ch>
- *
- * $Revision: 485019 $
- * $Date: 2012-02-24 17:16:04 +0100 (Fri, 24 Feb 2012) $
- */
- class QuadrupletFillerTool : public BlockFillerTool< HSG2::Quadruplet > {
-
- public:
- /// Standard Gaudi tool constructor
- QuadrupletFillerTool( const std::string& type, const std::string& name,
- const IInterface* parent );
-
- /// Book variables for this block.
- virtual StatusCode book();
- /// Fill the variables of this block
- virtual StatusCode fill( const HSG2::Quadruplet& q );
-
- private:
- unsigned int* m_fs; ///< Quadruplet final state type
-
- }; // class QuadrupletFillerTool
-
-} // namespace D3PD
-
-#endif // HIGGSD3PDMAKER_QuadrupletFillerTool_H
diff --git a/PhysicsAnalysis/D3PDMaker/HiggsD3PDMaker/src/QuadrupletVertexAssociationTool.cxx b/PhysicsAnalysis/D3PDMaker/HiggsD3PDMaker/src/QuadrupletVertexAssociationTool.cxx
deleted file mode 100644
index e807fe133c30c56a3c8160aa76e83bf78e85eb00..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/D3PDMaker/HiggsD3PDMaker/src/QuadrupletVertexAssociationTool.cxx
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-// $Id: QuadrupletVertexAssociationTool.cxx 485019 2012-02-24 16:16:04Z krasznaa $
-
-// Local include(s):
-#include "QuadrupletVertexAssociationTool.h"
-
-namespace D3PD {
-
- QuadrupletVertexAssociationTool::QuadrupletVertexAssociationTool( const std::string& type,
- const std::string& name,
- const IInterface* parent )
- : SingleAssociationTool< HSG2::Quadruplet, Trk::VxCandidate >( type, name, parent ) {
-
- }
-
- const Trk::VxCandidate* QuadrupletVertexAssociationTool::get( const HSG2::Quadruplet& q ) {
-
- return *( q.vertex() );
- }
-
-} // namespace D3PD
diff --git a/PhysicsAnalysis/D3PDMaker/HiggsD3PDMaker/src/QuadrupletVertexAssociationTool.h b/PhysicsAnalysis/D3PDMaker/HiggsD3PDMaker/src/QuadrupletVertexAssociationTool.h
deleted file mode 100644
index 8de48c06cd5218443af3ed3c8463caa6c310a67b..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/D3PDMaker/HiggsD3PDMaker/src/QuadrupletVertexAssociationTool.h
+++ /dev/null
@@ -1,45 +0,0 @@
-// Dear emacs, this is -*- c++ -*-
-
-/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-// $Id: QuadrupletVertexAssociationTool.h 485019 2012-02-24 16:16:04Z krasznaa $
-#ifndef HIGGSD3PDMAKER_QuadrupletVertexAssociationTool_H
-#define HIGGSD3PDMAKER_QuadrupletVertexAssociationTool_H
-
-// EDM include(s):
-#include "HSG2Event/Quadruplet.h"
-#include "VxVertex/VxCandidate.h"
-
-// D3PD include(s):
-#include "D3PDMakerUtils/SingleAssociationTool.h"
-
-namespace D3PD {
-
- /**
- * @short Tool "associating" Quadruplet objects to a VxCandiadte
- *
- *
- * @author Kirill.Prokofiev@cern.ch
- *
- * $Revision: 485019 $
- * $Date: 2012-02-24 17:16:04 +0100 (Fri, 24 Feb 2012) $
- */
- class QuadrupletVertexAssociationTool :
- public SingleAssociationTool< HSG2::Quadruplet, Trk::VxCandidate > {
-
- public:
- /// Regular AlgTool constructor
- QuadrupletVertexAssociationTool( const std::string& type,
- const std::string& name,
- const IInterface* parent );
-
- /// Function performing the association
- virtual const Trk::VxCandidate* get( const HSG2::Quadruplet& q );
-
- }; // class QuadrupletVertexAssociationTool
-
-} // namespace D3PD
-
-#endif // HIGGSD3PDMAKER_QuadrupletVertexAssociationTool_H
diff --git a/PhysicsAnalysis/D3PDMaker/HiggsD3PDMaker/src/components/HiggsD3PDMaker_entries.cxx b/PhysicsAnalysis/D3PDMaker/HiggsD3PDMaker/src/components/HiggsD3PDMaker_entries.cxx
deleted file mode 100644
index 9f7045593815e1b0db80e0a13027dc5abdfe805e..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/D3PDMaker/HiggsD3PDMaker/src/components/HiggsD3PDMaker_entries.cxx
+++ /dev/null
@@ -1,8 +0,0 @@
-#include "../QuadrupletFillerTool.h"
-#include "../QuadrupletVertexAssociationTool.h"
-#include "../QuadrupletCompositeParticleAssociationTool.h"
-
-DECLARE_COMPONENT( D3PD::QuadrupletFillerTool )
-DECLARE_COMPONENT( D3PD::QuadrupletVertexAssociationTool )
-DECLARE_COMPONENT( D3PD::QuadrupletCompositeParticleAssociationTool )
-
diff --git a/PhysicsAnalysis/HiggsPhys/HSG2/HSG2Event/CMakeLists.txt b/PhysicsAnalysis/HiggsPhys/HSG2/HSG2Event/CMakeLists.txt
deleted file mode 100644
index 7dadb666fbb3d83b733ec14746944a313edf48fc..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/HiggsPhys/HSG2/HSG2Event/CMakeLists.txt
+++ /dev/null
@@ -1,31 +0,0 @@
-################################################################################
-# Package: HSG2Event
-################################################################################
-
-# Declare the package name:
-atlas_subdir( HSG2Event )
-
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Control/AthLinks
- Control/AthenaKernel
- PhysicsAnalysis/AnalysisCommon/ParticleEvent
- Tracking/TrkEvent/VxVertex )
-
-# External dependencies:
-find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
-
-# Component(s) in the package:
-atlas_add_library( HSG2Event
- src/*.cxx
- PUBLIC_HEADERS HSG2Event
- PRIVATE_INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES AthLinks AthenaKernel ParticleEvent VxVertex
- PRIVATE_LINK_LIBRARIES ${ROOT_LIBRARIES} )
-
-atlas_add_dictionary( HSG2EventDict
- HSG2Event/HSG2EventDict.h
- HSG2Event/selection.xml
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} AthLinks AthenaKernel ParticleEvent VxVertex HSG2Event )
-
diff --git a/PhysicsAnalysis/HiggsPhys/HSG2/HSG2Event/HSG2Event/HSG2EventDict.h b/PhysicsAnalysis/HiggsPhys/HSG2/HSG2Event/HSG2Event/HSG2EventDict.h
deleted file mode 100644
index 7d7a9ed131edd2224617f4982c24779141c5aec8..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/HiggsPhys/HSG2/HSG2Event/HSG2Event/HSG2EventDict.h
+++ /dev/null
@@ -1,15 +0,0 @@
-// Dear emacs, this is -*- c++ -*-
-
-/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-// $Id: HSG2EventDict.h 484888 2012-02-24 11:20:26Z krasznaa $
-#ifndef HSG2EVENT_HSG2EVENTDICT_H
-#define HSG2EVENT_HSG2EVENTDICT_H
-
-// Local include(s):
-#include "HSG2Event/QuadrupletContainer.h"
-#include "HSG2Event/Quadruplet.h"
-
-#endif // HSG2EVENT_HSG2EVENTDICT_H
diff --git a/PhysicsAnalysis/HiggsPhys/HSG2/HSG2Event/HSG2Event/Quadruplet.h b/PhysicsAnalysis/HiggsPhys/HSG2/HSG2Event/HSG2Event/Quadruplet.h
deleted file mode 100644
index 39d51c6919eaedef2728dffa079278cf1646ad4b..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/HiggsPhys/HSG2/HSG2Event/HSG2Event/Quadruplet.h
+++ /dev/null
@@ -1,96 +0,0 @@
-// Dear emacs, this is -*- c++ -*-
-
-/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-// $Id: Quadruplet.h 485033 2012-02-24 16:54:50Z krasznaa $
-#ifndef HSG2Event_Quadruplet_H
-#define HSG2Event_Quadruplet_H
-
-// EDM include(s):
-#include "AthLinks/ElementLink.h"
-#include "VxVertex/VxContainer.h"
-#include "ParticleEvent/CompositeParticleContainer.h"
-
-/**
- * @short Namespace for HSG2 related classes
- *
- * To play nice, we put (almost) all the classes used in the
- * Athena codes of the HSG2 (H->ZZ) group into this namespace.
- *
- * @author Kirill Prokofiev <Kirill.Prokofiev@cern.ch>
- * @author Attila Krasznahorkay <Attila.Krasznahorkay@cern.ch>
- *
- * $Revision: 485033 $
- * $Date: 2012-02-24 17:54:50 +0100 (Fri, 24 Feb 2012) $
- */
-namespace HSG2 {
-
- /**
- * @short Type definition used for 4-lepton quadruplets
- *
- * It might look better inside the Quadruplet class, but
- * oh well... It's just a simple listing of 4-lepton
- * types that the analysis uses.
- */
- enum FinalState {
- fs_4mu = 0, ///< 4 muon final state
- fs_4e = 1, ///< 4 electron final state
- fs_2e2mu = 2, ///< 2 electron - 2 muon final state
- fs_undef = 100 ///< Undefined final state, needed for technical reasons
- }; // enum FinalState
-
- /**
- * @class HSG2::Quadruplet.h
- * @short Top level object defining lepton quadruplets
- *
- * Multi-lepton objects can in principle simply be created using
- * the CompositeParticle class on its own. The reason why we need
- * this class is that we want to associate the 4-lepton composite
- * objects with the vertex objects that were reconstructed using
- * their tracks.
- *
- * @author Kirill Prokofiev <Kirill.Prokofiev@cern.ch>
- * @author Attila Krasznahorkay <Attila.Krasznahorkay@cern.ch>
- *
- * $Revision: 485033 $
- * $Date: 2012-02-24 17:54:50 +0100 (Fri, 24 Feb 2012) $
- */
- class Quadruplet {
-
- public:
- /// Default constructor needed for persistency
- Quadruplet();
- /// Constructor specifying all properties of the object
- Quadruplet( const ElementLink< CompositeParticleContainer >& particle,
- const ElementLink< VxContainer >& vertex,
- FinalState fs );
-
- /// Get the composite particle describing this quadruplet
- const ElementLink< CompositeParticleContainer >& particle() const;
- /// Get the vertex created from the lepton tracks
- const ElementLink< VxContainer >& vertex() const;
- /// Get the type of the quadruplet
- FinalState finalState() const;
-
- /// Set the composite particle describing this quadruplet
- void setParticle( const ElementLink< CompositeParticleContainer >& comb );
- /// Set the vertex created from the lepton tracks
- void setVertex( const ElementLink< VxContainer >& vertex );
- /// Set the type of the quadruplet
- void setFinalState( FinalState fs );
-
- protected:
- /// Link to the composite particle holding the 4 leptons
- ElementLink< CompositeParticleContainer > m_particle;
- /// Link to the vertex reconstructed from the leptons
- ElementLink< VxContainer > m_vertex;
- /// Decoded final state enumeration to be used during event processing
- FinalState m_finalState;
-
- }; // class Quadruplet
-
-}//end of namespace definitions
-
-#endif /// HSG2Event_Quadruplet_H
diff --git a/PhysicsAnalysis/HiggsPhys/HSG2/HSG2Event/HSG2Event/QuadrupletContainer.h b/PhysicsAnalysis/HiggsPhys/HSG2/HSG2Event/HSG2Event/QuadrupletContainer.h
deleted file mode 100644
index 26db4c336f84dc79592af4cbc0c60b3a5cd6dbea..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/HiggsPhys/HSG2/HSG2Event/HSG2Event/QuadrupletContainer.h
+++ /dev/null
@@ -1,44 +0,0 @@
-// Dear emacs, this is -*- c++ -*-
-
-/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-// $Id: QuadrupletContainer.h 485033 2012-02-24 16:54:50Z krasznaa $
-#ifndef HSG2Event_QuadrupletContainer_H
-#define HSG2Event_QuadrupletContainer_H
-
-// Gaudi/Athena include(s):
-#include "AthContainers/DataVector.h"
-#include "AthenaKernel/CLASS_DEF.h"
-#include "AthenaKernel/BaseInfo.h"
-
-// Local include(s):
-#include "Quadruplet.h"
-
-/**
- * @class QuadrupletContainer
- * @short Container for reconstructed quadruplets
- *
- * Such containers can be put into StoreGate to hold the
- * 4-lepton candidates that were reconstructed by some algorithm.
- *
- * @author Kirill Prokofiev <Kirill.Prokofiev@cern.ch>
- * @author Attila Krasznahorkay <Attila.Krasznahorkay@cern.ch>
- *
- * $Revision: 485033 $
- * $Date: 2012-02-24 17:54:50 +0100 (Fri, 24 Feb 2012) $
- */
-class QuadrupletContainer : public DataVector< HSG2::Quadruplet > {
-
-public:
- /// Constructor with ownership policy
- QuadrupletContainer( SG::OwnershipPolicy own = SG::OWN_ELEMENTS )
- : DataVector< HSG2::Quadruplet >( own ) {}
-
-}; // class QuadrupletContainer
-
-CLASS_DEF( QuadrupletContainer, 1146749485, 1 )
-SG_BASE( QuadrupletContainer, DataVector<HSG2::Quadruplet> );
-
-#endif // HSG2Event_QuadrupletContainer_H
diff --git a/PhysicsAnalysis/HiggsPhys/HSG2/HSG2Event/HSG2Event/selection.xml b/PhysicsAnalysis/HiggsPhys/HSG2/HSG2Event/HSG2Event/selection.xml
deleted file mode 100644
index f4acce9c38932587ec80d7f71abd93de4a8828d5..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/HiggsPhys/HSG2/HSG2Event/HSG2Event/selection.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<lcgdict>
-
- <class name="QuadrupletContainer" id="6C9EEE63-6415-4A3A-A31D-1F9E11264008" />
- <class name="HSG2::Quadruplet" />
-
-</lcgdict>
diff --git a/PhysicsAnalysis/HiggsPhys/HSG2/HSG2Event/src/Quadruplet.cxx b/PhysicsAnalysis/HiggsPhys/HSG2/HSG2Event/src/Quadruplet.cxx
deleted file mode 100644
index f169cb40fe111a9887af0509deb40ddd4a088ecb..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/HiggsPhys/HSG2/HSG2Event/src/Quadruplet.cxx
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-// $Id: Quadruplet.cxx 485033 2012-02-24 16:54:50Z krasznaa $
-
-// EDM include(s):
-#include "VxVertex/VxCandidate.h"
-#include "ParticleEvent/CompositeParticle.h"
-
-// Local include(s):
-#include "../HSG2Event/Quadruplet.h"
-
-namespace HSG2 {
-
- Quadruplet::Quadruplet()
- : m_particle(), m_vertex(), m_finalState( fs_undef ) {
-
- }
-
- /**
- * @param particle The CombinedParticle holding the 4 leptons
- * @param vertex The vertex reconstructed from the lepton tracks
- * @param fs The final state type
- */
- Quadruplet::Quadruplet( const ElementLink< CompositeParticleContainer >& particle,
- const ElementLink< VxContainer >& vertex,
- FinalState fs )
- : m_particle( particle ), m_vertex( vertex ), m_finalState( fs ) {
-
- }
-
- /**
- * @returns The CombinedParticle holding the 4 leptons
- */
- const ElementLink< CompositeParticleContainer >& Quadruplet::particle() const {
-
- return m_particle;
- }
-
- /**
- * @returns The vertex reconstructed from the lepton tracks
- */
- const ElementLink< VxContainer >& Quadruplet::vertex() const {
-
- return m_vertex;
- }
-
- /**
- * @returns The final state type
- */
- FinalState Quadruplet::finalState() const {
-
- return m_finalState;
- }
-
- /**
- * The function only does anything if the ElementLink given to it is valid. If not,
- * it just ignores the passed argument.
- *
- * @param particle The CombinedParticle holding the 4 leptons
- */
- void Quadruplet::setParticle( const ElementLink< CompositeParticleContainer >& particle ) {
-
- if( particle.isValid() ) {
- m_particle = particle;
- }
-
- return;
- }
-
- /**
- * The function only does anything if the ElementLink given to it is valid. If not,
- * it just ignores the passed argument.
- *
- * @param vertex The vertex reconstructed from the lepton tracks
- */
- void Quadruplet::setVertex( const ElementLink< VxContainer>& vertex ) {
-
- if( vertex.isValid() ) {
- m_vertex = vertex;
- }
-
- return;
- }
-
- /**
- * @param fs The final state type
- */
- void Quadruplet::setFinalState( FinalState fs ) {
-
- m_finalState = fs;
- return;
- }
-
-} // namespace HSG2