diff --git a/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/src/CscPrepDataCollectionGetterTool.cxx b/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/src/CscPrepDataCollectionGetterTool.cxx
deleted file mode 100644
index f922ce377b2031d6a738e6ae8963fc9ff30dc53b..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/src/CscPrepDataCollectionGetterTool.cxx
+++ /dev/null
@@ -1,128 +0,0 @@
-/*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-// $Id: CscPrepDataCollectionGetterTool.cxx 535250 2013-01-29 13:22:17Z salekd $
-#include "CscPrepDataCollectionGetterTool.h"
-
-namespace D3PD {
-
-CscPrepDataCollectionGetterTool::CscPrepDataCollectionGetterTool
-  (const std::string& type,
-   const std::string& name,
-   const IInterface* parent)
-    : Base (type, name, parent)
-{
-}
-
-StatusCode CscPrepDataCollectionGetterTool::initialize()
-{
-  CHECK( Base::initialize() );
-
-  return StatusCode::SUCCESS;
-}
-
-const std::type_info& CscPrepDataCollectionGetterTool::typeinfo() const
-{
-  return typeid(Muon::CscPrepDataContainer);
-}
-
-
-const std::type_info& CscPrepDataCollectionGetterTool::elementTypeinfo() const
-{
-  return typeid(Muon::CscPrepData);
-}
-
-size_t CscPrepDataCollectionGetterTool::sizeHint(bool allowMissing)
-{
-  const Muon::CscPrepDataContainer* cont = (Muon::CscPrepDataContainer*)getUntyped(allowMissing);
-
-  if (!cont) {
-    return 0;
-  }
-  int nclus = 0;
-
-  // Loop over the container
-  Muon::CscPrepDataContainer::const_iterator itr = cont->begin();
-  Muon::CscPrepDataContainer::const_iterator itr_end = cont->end();
-  for( ; itr!=itr_end; ++itr ){
-
-    // Loop over the collection
-    Muon::CscPrepDataCollection::const_iterator itr_col = (*itr)->begin();
-    Muon::CscPrepDataCollection::const_iterator itr_col_end = (*itr)->end();
-    for( ; itr_col!=itr_col_end; ++itr_col ){
-      nclus++;
-    }
-  }
-
-  return nclus;
-}
-
-StatusCode CscPrepDataCollectionGetterTool::reset(bool allowMissing)
-{
-  const Muon::CscPrepDataContainer* cont = (Muon::CscPrepDataContainer*)getUntyped(allowMissing);
- 
-  if (!cont) {
-    m_contItr = m_contEnd;
-    m_collItr = m_collEnd;
-    return StatusCode::FAILURE;
-  }
-
-  m_contItr = cont->begin();
-  m_contEnd = cont->end();
-
-  if(m_contItr == m_contEnd){
-    m_collItr = m_collEnd;
-    return StatusCode::SUCCESS;
-  }
-
-  m_collItr = (*m_contItr)->begin();
-  m_collEnd = (*m_contItr)->end();
-
-  return StatusCode::SUCCESS;
-}
-
-
-const void* CscPrepDataCollectionGetterTool::nextUntyped()
-{
-  if(m_collItr == m_collEnd){
-    if(m_contItr==m_contEnd){
-      return nullptr;
-    }
-    ++m_contItr;
-    if(m_contItr==m_contEnd){
-      return nullptr;
-    }
-    m_collItr = (*m_contItr)->begin();
-    m_collEnd = (*m_contItr)->end();
-    if(m_collItr == m_collEnd){
-      return nullptr;
-    }
-  }
-
-  const Muon::CscPrepData *clus = *m_collItr;
-  
-  ++m_collItr;
-
-  return clus;
-}
-
-
-// Dummies --- the default versions of these don't compile.
-// But these are overridden by the derived class here.
-template<>
-const std::type_info&
-CollectionGetterTool<Muon::CscPrepDataContainer>::elementTypeinfo() const
-{
-  return typeid(Muon::CscPrepData);
-}
-
-template<>
-const void*
-CollectionGetterTool<Muon::CscPrepDataContainer>::nextUntyped()
-{
-  return nullptr;
-}
-
-
-}
diff --git a/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/src/CscPrepDataCollectionGetterTool.h b/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/src/CscPrepDataCollectionGetterTool.h
deleted file mode 100644
index a485fbbbc65fbdfeed5858d76704cd91984b87aa..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/src/CscPrepDataCollectionGetterTool.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-// $Id: CscPrepDataCollectionGetterTool.h 535250 2013-01-29 13:22:17Z salekd $
-#ifndef MUOND3PDMAKER_CSCPREPDATACOLLECTIONGETTERTOOL_H
-#define MUOND3PDMAKER_CSCPREPDATACOLLECTIONGETTERTOOL_H
-
-#include "D3PDMakerUtils/SGCollectionGetterTool.h" 
-#include "MuonPrepRawData/CscPrepData.h"
-#include "MuonPrepRawData/CscPrepDataCollection.h"
-#include "MuonPrepRawData/CscPrepDataContainer.h"
-
-//namespace Muon {
-//  class CscPrepData;
-//}
-
-namespace D3PD { 
-  
-class CscPrepDataCollectionGetterTool 
-  : public SGCollectionGetterTool<Muon::CscPrepDataContainer>
-{ 
-public: 
-  typedef SGCollectionGetterTool<Muon::CscPrepDataContainer> Base; 
-
-  CscPrepDataCollectionGetterTool (const std::string& type,
-				  const std::string& name, 
-				  const IInterface* parent); 
-
-  StatusCode initialize(); 
-  size_t sizeHint(bool=false); 
-  StatusCode reset(bool=false); 
-  const void* nextUntyped(); 
-  const std::type_info& typeinfo() const; 
-  const std::type_info& elementTypeinfo() const; 
-  
-private: 
-  Muon::CscPrepDataContainer::const_iterator m_contItr; 
-  Muon::CscPrepDataContainer::const_iterator m_contEnd; 
-  
-  Muon::CscPrepDataCollection::const_iterator m_collItr; 
-  Muon::CscPrepDataCollection::const_iterator m_collEnd; 
-}; 
-
-// Dummies --- the default versions of these don't compile.
-// But these are overridden by the derived class here.
-template<>
-const std::type_info&
-CollectionGetterTool<Muon::CscPrepDataContainer>::elementTypeinfo() const;
-
-template<>
-const void*
-CollectionGetterTool<Muon::CscPrepDataContainer>::nextUntyped();
-
-} 
-
-#endif
diff --git a/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/src/CscPrepDataFillerTool.cxx b/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/src/CscPrepDataFillerTool.cxx
deleted file mode 100644
index e0e27891f9b7eb86b5e070d69c9dd81c3b716449..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/src/CscPrepDataFillerTool.cxx
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-// $Id: CscPrepDataFillerTool.cxx 535262 2013-01-29 13:54:17Z salekd $
-#include "CscPrepDataFillerTool.h"
-#include "AthenaKernel/errorcheck.h"
-
-
-namespace D3PD {
-
-
-CscPrepDataFillerTool::CscPrepDataFillerTool (const std::string& type,
-                                              const std::string& name,
-                                              const IInterface* parent)
-  : BlockFillerTool<Muon::CscPrepData> (type, name, parent)
-{
-  CscPrepDataFillerTool::book().ignore(); // Avoid coverity warnings.
-}
-
-
-StatusCode CscPrepDataFillerTool::book()
-{
-  CHECK( addVariable ("x", m_x) );
-  CHECK( addVariable ("y", m_y) );
-  CHECK( addVariable ("z", m_z) );
-  CHECK( addVariable ("time", m_time) );
-  CHECK( addVariable ("locX", m_locX) );
-  CHECK( addVariable ("status", m_status) );
-  CHECK( addVariable ("timeStatus", m_timeStatus) );
-  CHECK( addVariable ("charge", m_charge) );
- 
-  return StatusCode::SUCCESS;
-}
-
-
-StatusCode CscPrepDataFillerTool::fill (const Muon::CscPrepData& obj)
-{
-  *m_x      = obj.globalPosition().x();
-  *m_y      = obj.globalPosition().y();
-  *m_z      = obj.globalPosition().z();
-  *m_time   = obj.time();
-  *m_locX   = obj.localPosition().x();
-  *m_status = obj.status();
-  *m_timeStatus = obj.timeStatus();
-  *m_charge = obj.charge();
-
-  return StatusCode::SUCCESS;
-}
-
-
-} // namespace D3PD
diff --git a/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/src/CscPrepDataFillerTool.h b/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/src/CscPrepDataFillerTool.h
deleted file mode 100644
index 6b9dc7fb01e4b3dcea30b7b8eb877a33724b78f2..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/src/CscPrepDataFillerTool.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-// $Id: CscPrepDataFillerTool.h 535262 2013-01-29 13:54:17Z salekd $
-#ifndef D3PDMAKER_CSCPREPDATAFILLERTOOL_H
-#define D3PDMAKER_CSCPREPDATAFILLERTOOL_H
-
-#include "MuonPrepRawData/CscPrepData.h"
-#include "MuonPrepRawData/CscPrepDataCollection.h"
-#include "D3PDMakerUtils/BlockFillerTool.h"
-#include "D3PDMakerUtils/SGCollectionGetterTool.h"
-#include <string>
-
-namespace D3PD {
-
-/**
- * @brief Block filler tool for the CSC hits
- *
- * @author David Salek <David.Salek@cern.ch>
- *
- * $Revision: 535262 $
- * $Date: 2013-01-29 14:54:17 +0100 (Tue, 29 Jan 2013) $
- */
-class CscPrepDataFillerTool
-  : public BlockFillerTool<Muon::CscPrepData>
-{
-public:
-  /// Regular Gaudi AlgTool constructor
-  CscPrepDataFillerTool (const std::string& type,
-                         const std::string& name,
-                         const IInterface* parent);
-
-  /// Function booking the ntuple variables
-  virtual StatusCode book();
-
-  /// Function filling the ntuple variables for a single object
-  virtual StatusCode fill (const Muon::CscPrepData& obj);
-
-
-private:
- float* m_x = nullptr;
- float* m_y = nullptr;
- float* m_z = nullptr;
- float* m_time = nullptr;
- float* m_locX = nullptr;
- int* m_status = nullptr;
- int* m_timeStatus = nullptr;
- int* m_charge = nullptr;
-};
-
-} // namespace D3PD
-
-#endif
diff --git a/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/src/MdtPrepDataCollectionGetterTool.cxx b/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/src/MdtPrepDataCollectionGetterTool.cxx
deleted file mode 100644
index 87c6642a180a28dc06acf6ee318ca1e91886b673..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/src/MdtPrepDataCollectionGetterTool.cxx
+++ /dev/null
@@ -1,128 +0,0 @@
-/*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-// $Id: MdtPrepDataCollectionGetterTool.cxx 535250 2013-01-29 13:22:17Z salekd $
-#include "MdtPrepDataCollectionGetterTool.h"
-
-namespace D3PD {
-
-MdtPrepDataCollectionGetterTool::MdtPrepDataCollectionGetterTool
-  (const std::string& type,
-   const std::string& name,
-   const IInterface* parent)
-    : Base (type, name, parent)
-{
-}
-
-StatusCode MdtPrepDataCollectionGetterTool::initialize()
-{
-  CHECK( Base::initialize() );
-
-  return StatusCode::SUCCESS;
-}
-
-const std::type_info& MdtPrepDataCollectionGetterTool::typeinfo() const
-{
-  return typeid(Muon::MdtPrepDataContainer);
-}
-
-
-const std::type_info& MdtPrepDataCollectionGetterTool::elementTypeinfo() const
-{
-  return typeid(Muon::MdtPrepData);
-}
-
-size_t MdtPrepDataCollectionGetterTool::sizeHint(bool allowMissing)
-{
-  const Muon::MdtPrepDataContainer* cont = (Muon::MdtPrepDataContainer*)getUntyped(allowMissing);
-
-  if (!cont) {
-    return 0;
-  }
-  int nclus = 0;
-
-  // Loop over the container
-  Muon::MdtPrepDataContainer::const_iterator itr = cont->begin();
-  Muon::MdtPrepDataContainer::const_iterator itr_end = cont->end();
-  for( ; itr!=itr_end; ++itr ){
-
-    // Loop over the collection
-    Muon::MdtPrepDataCollection::const_iterator itr_col = (*itr)->begin();
-    Muon::MdtPrepDataCollection::const_iterator itr_col_end = (*itr)->end();
-    for( ; itr_col!=itr_col_end; ++itr_col ){
-      nclus++;
-    }
-  }
-
-  return nclus;
-}
-
-StatusCode MdtPrepDataCollectionGetterTool::reset(bool allowMissing)
-{
-  const Muon::MdtPrepDataContainer* cont = (Muon::MdtPrepDataContainer*)getUntyped(allowMissing);
- 
-  if (!cont) {
-    m_contItr = m_contEnd;
-    m_collItr = m_collEnd;
-    return StatusCode::FAILURE;
-  }
-
-  m_contItr = cont->begin();
-  m_contEnd = cont->end();
-
-  if(m_contItr == m_contEnd){
-    m_collItr = m_collEnd;
-    return StatusCode::SUCCESS;
-  }
-
-  m_collItr = (*m_contItr)->begin();
-  m_collEnd = (*m_contItr)->end();
-
-  return StatusCode::SUCCESS;
-}
-
-
-const void* MdtPrepDataCollectionGetterTool::nextUntyped()
-{
-  if(m_collItr == m_collEnd){
-    if(m_contItr==m_contEnd){
-      return nullptr;
-    }
-    ++m_contItr;
-    if(m_contItr==m_contEnd){
-      return nullptr;
-    }
-    m_collItr = (*m_contItr)->begin();
-    m_collEnd = (*m_contItr)->end();
-    if(m_collItr == m_collEnd){
-      return nullptr;
-    }
-  }
-
-  const Muon::MdtPrepData *clus = *m_collItr;
-  
-  ++m_collItr;
-
-  return clus;
-}
-
-
-// Dummies --- the default versions of these don't compile.
-// But these are overridden by the derived class here.
-template<>
-const std::type_info&
-CollectionGetterTool<Muon::MdtPrepDataContainer>::elementTypeinfo() const
-{
-  return typeid(Muon::MdtPrepData);
-}
-
-template<>
-const void*
-CollectionGetterTool<Muon::MdtPrepDataContainer>::nextUntyped()
-{
-  return nullptr;
-}
-
-
-}
diff --git a/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/src/MdtPrepDataCollectionGetterTool.h b/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/src/MdtPrepDataCollectionGetterTool.h
deleted file mode 100644
index b6365f721f2eb1f9c04d6c9c36a2f2af29deb63b..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/src/MdtPrepDataCollectionGetterTool.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-// $Id: MdtPrepDataCollectionGetterTool.h 535250 2013-01-29 13:22:17Z salekd $
-#ifndef MUOND3PDMAKER_MDTPREPDATACOLLECTIONGETTERTOOL_H
-#define MUOND3PDMAKER_MDTPREPDATACOLLECTIONGETTERTOOL_H
-
-#include "D3PDMakerUtils/SGCollectionGetterTool.h" 
-#include "MuonPrepRawData/MdtPrepData.h"
-#include "MuonPrepRawData/MdtPrepDataCollection.h"
-#include "MuonPrepRawData/MdtPrepDataContainer.h"
-
-//namespace Muon {
-//  class MdtPrepData;
-//}
-
-namespace D3PD { 
-  
-class MdtPrepDataCollectionGetterTool 
-  : public SGCollectionGetterTool<Muon::MdtPrepDataContainer>
-{ 
-public: 
-  typedef SGCollectionGetterTool<Muon::MdtPrepDataContainer> Base; 
-
-  MdtPrepDataCollectionGetterTool (const std::string& type,
-				  const std::string& name, 
-				  const IInterface* parent); 
-
-  StatusCode initialize(); 
-  size_t sizeHint(bool=false); 
-  StatusCode reset(bool=false); 
-  const void* nextUntyped(); 
-  const std::type_info& typeinfo() const; 
-  const std::type_info& elementTypeinfo() const; 
-  
-private: 
-  Muon::MdtPrepDataContainer::const_iterator m_contItr; 
-  Muon::MdtPrepDataContainer::const_iterator m_contEnd; 
-  
-  Muon::MdtPrepDataCollection::const_iterator m_collItr; 
-  Muon::MdtPrepDataCollection::const_iterator m_collEnd; 
-}; 
-
-// Dummies --- the default versions of these don't compile.
-// But these are overridden by the derived class here.
-template<>
-const std::type_info&
-CollectionGetterTool<Muon::MdtPrepDataContainer>::elementTypeinfo() const;
-
-template<>
-const void*
-CollectionGetterTool<Muon::MdtPrepDataContainer>::nextUntyped();
-
-} 
-
-#endif
diff --git a/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/src/MdtPrepDataFillerTool.cxx b/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/src/MdtPrepDataFillerTool.cxx
deleted file mode 100644
index 1cd0a46a0b3f748a41839858ae74b7d2959a1f46..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/src/MdtPrepDataFillerTool.cxx
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-// $Id: MdtPrepDataFillerTool.cxx 535262 2013-01-29 13:54:17Z salekd $
-#include "MdtPrepDataFillerTool.h"
-#include "AthenaKernel/errorcheck.h"
-
-
-namespace D3PD {
-
-
-MdtPrepDataFillerTool::MdtPrepDataFillerTool (const std::string& type,
-                                              const std::string& name,
-                                              const IInterface* parent)
-  : BlockFillerTool<Muon::MdtPrepData> (type, name, parent)
-{
-  MdtPrepDataFillerTool::book().ignore(); // Avoid coverity warnings.
-}
-
-
-StatusCode MdtPrepDataFillerTool::book()
-{
-  CHECK( addVariable ("x", m_x) );
-  CHECK( addVariable ("y", m_y) );
-  CHECK( addVariable ("z", m_z) );
-  CHECK( addVariable ("tdc", m_tdc) );
-  CHECK( addVariable ("adc", m_adc) );
-  CHECK( addVariable ("locX", m_locX) );
-  CHECK( addVariable ("status", m_status) );
- 
-  return StatusCode::SUCCESS;
-}
-
-
-StatusCode MdtPrepDataFillerTool::fill (const Muon::MdtPrepData& obj)
-{
-  *m_x      = obj.globalPosition().x();
-  *m_y      = obj.globalPosition().y();
-  *m_z      = obj.globalPosition().z();
-  *m_tdc    = obj.tdc();
-  *m_adc    = obj.adc();
-  *m_locX   = obj.localPosition().x();
-  *m_status = obj.status();
-
-  return StatusCode::SUCCESS;
-}
-
-
-} // namespace D3PD
diff --git a/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/src/MdtPrepDataFillerTool.h b/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/src/MdtPrepDataFillerTool.h
deleted file mode 100644
index 351ba14b8cd65cc87dcc97578b0969e26317fb0c..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/src/MdtPrepDataFillerTool.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-// $Id: MdtPrepDataFillerTool.h 535262 2013-01-29 13:54:17Z salekd $
-#ifndef D3PDMAKER_MDTPREPDATAFILLERTOOL_H
-#define D3PDMAKER_MDTPREPDATAFILLERTOOL_H
-
-#include "MuonPrepRawData/MdtPrepData.h"
-#include "MuonPrepRawData/MdtPrepDataCollection.h"
-#include "D3PDMakerUtils/BlockFillerTool.h"
-#include "D3PDMakerUtils/SGCollectionGetterTool.h"
-#include <string>
-
-namespace Muon { class MdtPrepData; }
-
-namespace D3PD {
-
-/**
- * @brief Block filler tool for the MDT hits
- *
- * @author David Salek <David.Salek@cern.ch>
- *
- * $Revision: 535262 $
- * $Date: 2013-01-29 14:54:17 +0100 (Tue, 29 Jan 2013) $
- */
-class MdtPrepDataFillerTool
-  : public BlockFillerTool<Muon::MdtPrepData>
-{
-public:
-  /// Regular Gaudi AlgTool constructor
-  MdtPrepDataFillerTool (const std::string& type,
-                         const std::string& name,
-                         const IInterface* parent);
-
-  /// Function booking the ntuple variables
-  virtual StatusCode book();
-
-  /// Function filling the ntuple variables for a single object
-  virtual StatusCode fill (const Muon::MdtPrepData& obj);
-
-
-private:
- float* m_x = nullptr;
- float* m_y = nullptr;
- float* m_z = nullptr;
- int* m_tdc = nullptr;
- int* m_adc = nullptr;
- float* m_locX = nullptr;
- int* m_status = nullptr;
-};
-
-} // namespace D3PD
-
-#endif
diff --git a/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/src/MuonPatternCombinationFillerTool.cxx b/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/src/MuonPatternCombinationFillerTool.cxx
deleted file mode 100644
index 941ddcf2faa082b3062859f4dd91878c8f2f4bbd..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/src/MuonPatternCombinationFillerTool.cxx
+++ /dev/null
@@ -1,219 +0,0 @@
-/*
-  Copyright (C) 2002-2023 CERN for the benefit of the ATLAS collaboration
-*/
-
-//////////////////////////////////////////////////////
-//
-// Author : Daniel Ventura <ventura@cern.ch>
-//
-//////////////////////////////////////////////////////
-#include "MuonPatternCombinationFillerTool.h"
-#include "AthenaKernel/errorcheck.h"
-#include "TrkTruthData/TruthTrajectory.h"
-#include "AtlasHepMC/GenParticle.h"
-#include "TrkTruthData/PRD_MultiTruthCollection.h"
-#include "MuonPattern/MuonPatternCombinationCollection.h"
-#include "MuonPattern/DetailedMuonPatternTruthCollection.h"
-#include "MuonTruthAlgs/MuonPatternCombinationDetailedTrackTruthMaker.h"
-#include "StoreGate/StoreGateSvc.h"
-#include "TrkPrepRawData/PrepRawData.h"
-
-
-using namespace std;
-
-namespace D3PD {
-  
-  
-  MuonPatternCombinationFillerTool::MuonPatternCombinationFillerTool (const std::string& type,
-								      const std::string& name,
-								      const IInterface* parent)
-    : BlockFillerTool<Muon::MuonPatternCombination> (type, name, parent) ,
-      m_idHelper(nullptr),
-      m_truthTool("Trk::DetailedMuonPatternTruthBuilder/DetailedMuonPatternTruthBuilder") {
-
-    declareProperty("DetailedMuonPatternTruthTool", m_truthTool);
-    declareProperty("MuonPatternCombinationCollection", m_patternKey = "MuonRoadPatternCombinations");
-
-    MuonPatternCombinationFillerTool::book().ignore(); // Avoid coverity warnings.
-  }
-  
-  
-  StatusCode MuonPatternCombinationFillerTool::book() {
-    //branches
-    CHECK( addVariable("gpos_eta", m_pattern_gpos_eta) );
-    CHECK( addVariable("gpos_phi", m_pattern_gpos_phi) );
-    CHECK( addVariable("gpos_r", m_pattern_gpos_r) );
-    CHECK( addVariable("gpos_z", m_pattern_gpos_z) );
-    CHECK( addVariable("gdir_x", m_pattern_gdir_x) );
-    CHECK( addVariable("gdir_y", m_pattern_gdir_y) );
-    CHECK( addVariable("gdir_z", m_pattern_gdir_z) );
-    CHECK( addVariable("nMDT", m_pattern_nMDT) );
-    CHECK( addVariable("nRPC", m_pattern_nRPC) );
-    CHECK( addVariable("nTGC", m_pattern_nTGC) );
-    CHECK( addVariable("nCSC", m_pattern_nCSC) );
-    CHECK( addVariable("truth_barcode", m_truth_barcode) );
-    CHECK( addVariable("truth_nMDT", m_truth_nMDT) );
-    CHECK( addVariable("truth_nRPC", m_truth_nRPC) );
-    CHECK( addVariable("truth_nTGC", m_truth_nTGC) );
-    CHECK( addVariable("truth_nCSC", m_truth_nCSC) );
-    CHECK( addVariable("noise_nMDT", m_noise_nMDT) );
-    CHECK( addVariable("noise_nRPC", m_noise_nRPC) );
-    CHECK( addVariable("noise_nTGC", m_noise_nTGC) );
-    CHECK( addVariable("noise_nCSC", m_noise_nCSC) );
-    CHECK( addVariable("common_nMDT", m_common_nMDT) );
-    CHECK( addVariable("common_nRPC", m_common_nRPC) );
-    CHECK( addVariable("common_nTGC", m_common_nTGC) );
-    CHECK( addVariable("common_nCSC", m_common_nCSC) );
-    
-    return StatusCode::SUCCESS;
-  }
-  
-  
-   StatusCode MuonPatternCombinationFillerTool::initialize()
-   {
-     //get tools
-     if(m_truthTool.retrieve().isFailure() ){
-       ATH_MSG_FATAL( "Could not get " << m_truthTool );
-       return StatusCode::FAILURE;
-     }
-     if(!detStore()->retrieve(m_idHelper, "AtlasID").isSuccess()) {
-       ATH_MSG_FATAL("Unable to initialize ID helper.");
-       return StatusCode::FAILURE;
-     }
-    
-    return StatusCode::SUCCESS;
-   }
-
-  StatusCode MuonPatternCombinationFillerTool::fill(const Muon::MuonPatternCombination& pattern) {
-    if(pattern.chamberData().empty()) return StatusCode::SUCCESS;
-    Amg::Vector3D gpos = pattern.chamberData().front().intersectPosition();
-    *m_pattern_gpos_eta = static_cast<float>(gpos.eta());
-    *m_pattern_gpos_phi = static_cast<float>(gpos.phi());
-    *m_pattern_gpos_r = static_cast<float>(gpos.norm());
-    *m_pattern_gpos_z = static_cast<float>(gpos.z());
-    
-    Amg::Vector3D gdir = pattern.chamberData().front().intersectDirection();
-    *m_pattern_gdir_x = static_cast<float>(gdir.x());
-    *m_pattern_gdir_y = static_cast<float>(gdir.y());
-    *m_pattern_gdir_z = static_cast<float>(gdir.z());
-    
-    //hits from the pattern combination
-    int nPatternMDT(0),nPatternRPC(0),nPatternTGC(0),nPatternCSC(0);
-    std::vector< Muon::MuonPatternChamberIntersect >::const_iterator chit = pattern.chamberData().begin();
-    for(; chit!=pattern.chamberData().end(); ++chit) {
-      if((*chit).prepRawDataVec().empty()) continue;
-      SubDetHitStatistics::SubDetType subdet = findSubDetType( (*chit).prepRawDataVec().at(0)->identify() );
-      if(subdet == SubDetHitStatistics::MDT) nPatternMDT += (*chit).prepRawDataVec().size();
-      else if(subdet == SubDetHitStatistics::RPC) nPatternRPC += (*chit).prepRawDataVec().size();
-      else if(subdet == SubDetHitStatistics::TGC) nPatternTGC += (*chit).prepRawDataVec().size();
-      else if(subdet == SubDetHitStatistics::CSC) nPatternCSC += (*chit).prepRawDataVec().size();
-    }
-    *m_pattern_nMDT = static_cast<float>(nPatternMDT);
-    *m_pattern_nRPC = static_cast<float>(nPatternRPC);
-    *m_pattern_nTGC = static_cast<float>(nPatternTGC);
-    *m_pattern_nCSC = static_cast<float>(nPatternCSC);
-
-    //----------------------------------------------------------------
-    // Retrieve prep raw data truth
-    std::vector<std::string> PRD_TruthNames;
-    PRD_TruthNames.emplace_back("CSC_TruthMap");
-    PRD_TruthNames.emplace_back("RPC_TruthMap");
-    PRD_TruthNames.emplace_back("TGC_TruthMap");
-    PRD_TruthNames.emplace_back("MDT_TruthMap");
-    
-    std::vector<const PRD_MultiTruthCollection*> prdCollectionVector;
-    for(std::vector<std::string>::const_iterator ikey=PRD_TruthNames.begin(); ikey!=PRD_TruthNames.end(); ++ikey) {
-      prdCollectionVector.push_back(nullptr);
-      StatusCode sc = evtStore()->retrieve(*prdCollectionVector.rbegin(), *ikey);
-      if (!sc.isSuccess()){
-	ATH_MSG_WARNING( "PRD_MultiTruthCollection " << *ikey << " NOT found");
-      } else {
-	ATH_MSG_DEBUG( "Got PRD_MultiTruthCollection " << *ikey);
-      }
-    }
-    
-    //----------------------------------------------------------------
-    // Produce and store the output.  
-    std::vector<DetailedTrackTruth> *dtt = new std::vector<DetailedTrackTruth>;
-    m_truthTool->buildDetailedTrackTruth(dtt, pattern, prdCollectionVector);
-
-    bool isTruthMatched(false);
-    for(std::vector<DetailedTrackTruth>::const_iterator dtit=dtt->begin(); dtit!=dtt->end(); ++dtit) {
-      const TruthTrajectory traj = (*dtit).trajectory();
-      if(traj[0].isValid()) {
-	isTruthMatched = true;
-
-        vector<int> barcode_list;
-        for(unsigned int i = 0; i < traj.size(); i++) {
-          barcode_list.push_back(traj[i].barcode());
-        }
-        m_truth_barcode->push_back(barcode_list);
-        m_truth_nMDT->push_back(dtit->statsTruth()[SubDetHitStatistics::MDT]);
-        m_truth_nRPC->push_back(dtit->statsTruth()[SubDetHitStatistics::RPC]);
-        m_truth_nTGC->push_back(dtit->statsTruth()[SubDetHitStatistics::TGC]);
-        m_truth_nCSC->push_back(dtit->statsTruth()[SubDetHitStatistics::CSC]);
-        m_common_nMDT->push_back(dtit->statsCommon()[SubDetHitStatistics::MDT]);
-        m_common_nRPC->push_back(dtit->statsCommon()[SubDetHitStatistics::RPC]);
-        m_common_nTGC->push_back(dtit->statsCommon()[SubDetHitStatistics::TGC]);
-        m_common_nCSC->push_back(dtit->statsCommon()[SubDetHitStatistics::CSC]);
-        m_noise_nMDT->push_back(dtit->statsTrack()[SubDetHitStatistics::MDT]-dtit->statsCommon()[SubDetHitStatistics::MDT]);
-        m_noise_nRPC->push_back(dtit->statsTrack()[SubDetHitStatistics::RPC]-dtit->statsCommon()[SubDetHitStatistics::RPC]);
-        m_noise_nTGC->push_back(dtit->statsTrack()[SubDetHitStatistics::TGC]-dtit->statsCommon()[SubDetHitStatistics::TGC]);
-        m_noise_nCSC->push_back(dtit->statsTrack()[SubDetHitStatistics::CSC]-dtit->statsCommon()[SubDetHitStatistics::CSC]);
-      }
-    }
-    if(!isTruthMatched) {
-      vector<int> temp;
-      temp.push_back(0);
-      m_truth_barcode->push_back(temp); 
-      m_truth_nMDT->push_back(0);
-      m_truth_nRPC->push_back(0);  
-      m_truth_nTGC->push_back(0);
-      m_truth_nCSC->push_back(0);
-      m_common_nMDT->push_back(0);
-      m_common_nRPC->push_back(0);
-      m_common_nTGC->push_back(0);
-      m_common_nCSC->push_back(0);
-      m_noise_nMDT->push_back(0);
-      m_noise_nRPC->push_back(0);
-      m_noise_nTGC->push_back(0);
-      m_noise_nCSC->push_back(0);
-    }
-       
-    delete dtt;
-
-    return StatusCode::SUCCESS;
-  }
-  
-  double MuonPatternCombinationFillerTool::deltaR(double eta1, double eta2, double phi1, double phi2) {
-    double Deta = eta1 - eta2;
-    double Dphi = phi1 - phi2;
-    if(Dphi > M_PI) Dphi -= 2*M_PI;
-    else if(Dphi < -M_PI) Dphi += 2*M_PI;
-    double DR = sqrt(Deta*Deta + Dphi*Dphi);
-    return DR;
-  }
-  
-  SubDetHitStatistics::SubDetType MuonPatternCombinationFillerTool::findSubDetType(Identifier id) {
-    if (m_idHelper->is_pixel(id))
-      return SubDetHitStatistics::Pixel;
-    if (m_idHelper->is_sct(id))
-      return SubDetHitStatistics::SCT;
-    if (m_idHelper->is_trt(id))
-      return SubDetHitStatistics::TRT;
-    if (m_idHelper->is_mdt(id))
-      return SubDetHitStatistics::MDT;
-    if (m_idHelper->is_rpc(id))
-      return SubDetHitStatistics::RPC;
-    if (m_idHelper->is_tgc(id))
-      return SubDetHitStatistics::TGC;
-    if (m_idHelper->is_csc(id))
-      return SubDetHitStatistics::CSC;
-
-
-    ATH_MSG_WARNING("findSubDetType(): UNKNOWN subdet for id="<<id);
-    return SubDetHitStatistics::NUM_SUBDETECTORS;
-  }
-
-
-} // namespace D3PD
diff --git a/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/src/MuonPatternCombinationFillerTool.h b/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/src/MuonPatternCombinationFillerTool.h
deleted file mode 100644
index 60c51fd46411c274d495668f5baf0b6dd7acbee6..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/src/MuonPatternCombinationFillerTool.h
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
-  Copyright (C) 2002-2023 CERN for the benefit of the ATLAS collaboration
-*/
-
-/**
- * @file MuonD3PDMaker/src/MuonPatternCombinationFillerTool.h
- * @author Daniel Ventura <ventura@cern.ch>
- * @date July 2012
- * @brief Block filler tool for MuonPatternCombinations, detail level 1
- */
-
-#ifndef D3PDMAKER_MUONPATTERNCOMBINATIONFILLERTOOL_H
-#define D3PDMAKER_MUONPATTERNCOMBINATIONFILLERTOOL_H 
-
-#include "GaudiKernel/ToolHandle.h"
-#include "D3PDMakerUtils/BlockFillerTool.h"
-#include "MuonPattern/MuonPatternCombination.h"
-#include "MuonRecToolInterfaces/IDetailedMuonPatternTruthBuilder.h"
-#include "TrkTruthData/SubDetHitStatistics.h"
-#include "AtlasDetDescr/AtlasDetectorID.h"
-
-#include <vector>
-
-namespace D3PD {
-
-
-class MuonPatternCombinationFillerTool
-  : public BlockFillerTool< Muon::MuonPatternCombination >
-{
-public:
-  MuonPatternCombinationFillerTool (const std::string& type,
-                        const std::string& name,
-                        const IInterface* parent);
-
-  virtual StatusCode book();
-  virtual StatusCode initialize();
-
-  virtual StatusCode fill(const Muon::MuonPatternCombination& pattern);
-  virtual double deltaR(double eta1, double eta2, double phi1, double phi2);
-  virtual SubDetHitStatistics::SubDetType findSubDetType(Identifier id);
-
-private:
-  float* m_pattern_gpos_eta = nullptr;
-  float* m_pattern_gpos_phi = nullptr;
-  float* m_pattern_gpos_r = nullptr;
-  float* m_pattern_gpos_z = nullptr;
-  float* m_pattern_gdir_x = nullptr;
-  float* m_pattern_gdir_y = nullptr;
-  float* m_pattern_gdir_z = nullptr;
-  int* m_pattern_nMDT = nullptr;
-  int* m_pattern_nRPC = nullptr;
-  int* m_pattern_nTGC = nullptr;
-  int* m_pattern_nCSC = nullptr;
-  std::vector<std::vector<int> >* m_truth_barcode = nullptr;
-  std::vector<int>* m_truth_nMDT = nullptr;
-  std::vector<int>* m_truth_nRPC = nullptr;
-  std::vector<int>* m_truth_nTGC = nullptr;
-  std::vector<int>* m_truth_nCSC = nullptr;
-  std::vector<int>* m_noise_nMDT = nullptr;
-  std::vector<int>* m_noise_nRPC = nullptr;
-  std::vector<int>* m_noise_nTGC = nullptr;
-  std::vector<int>* m_noise_nCSC = nullptr;
-  std::vector<int>* m_common_nMDT = nullptr;
-  std::vector<int>* m_common_nRPC = nullptr;
-  std::vector<int>* m_common_nTGC = nullptr;
-  std::vector<int>* m_common_nCSC = nullptr;
-  
-  //int m_matchedTruth;
-  std::string m_truthSGkey;
-  std::string m_patternKey;
-
-  const AtlasDetectorID *m_idHelper;
-  ToolHandle<Trk::IDetailedMuonPatternTruthBuilder> m_truthTool;
-};
-
-} // namespace D3PD
-
-#endif
diff --git a/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/src/MuonSegmentAuthorFillerTool.cxx b/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/src/MuonSegmentAuthorFillerTool.cxx
deleted file mode 100644
index 68c59f9bf4a0a5d2e9bd4bf7aa7635d2260b233d..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/src/MuonSegmentAuthorFillerTool.cxx
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-//////////////////////////////////////////////////////
-//
-// Author : Srivas Prasad (srivas.prasad@cern.ch)
-// Date   : February 2010
-//
-//////////////////////////////////////////////////////
-#include "MuonSegmentAuthorFillerTool.h"
-#include "TrkSegment/Segment.h"
-#include "AthenaKernel/errorcheck.h"
-
-
-namespace D3PD {
-
-
-MuonSegmentAuthorFillerTool::MuonSegmentAuthorFillerTool (const std::string& type,
-                                            const std::string& name,
-                                            const IInterface* parent)
-  : BlockFillerTool<Trk::Segment> (type, name, parent)
-{
-  MuonSegmentAuthorFillerTool::book().ignore(); // Avoid coverity warnings.
-}
-
-
-StatusCode MuonSegmentAuthorFillerTool::book()
-{
-  CHECK( addVariable ("author",          m_author)  );
-  return StatusCode::SUCCESS;
-}
-
-
-StatusCode MuonSegmentAuthorFillerTool::fill (const Trk::Segment& ms) {
-  *m_author = ms.author();
-
-  return StatusCode::SUCCESS;
-}
-
-
-} // namespace D3PD
diff --git a/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/src/MuonSegmentAuthorFillerTool.h b/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/src/MuonSegmentAuthorFillerTool.h
deleted file mode 100644
index b7723e5f3cc4debb06646466df8ab663e7a0c316..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/src/MuonSegmentAuthorFillerTool.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-/**
- * @file MuonD3PDMaker/src/MuonSegmentAuthorFillerTool.h
- * @author srivas prasad <srivas.prasad@cern.ch>
- * @date Feb 2010
- * @brief Block filler tool with author information for muon segments, detail level 1
- */
-
-#ifndef D3PDMAKER_MUONSEGMENTAUTHORFILLERTOOL_H
-#define D3PDMAKER_MUONSEGMENTAUTHORFILLERTOOL_H 1
-
-
-#include "D3PDMakerUtils/BlockFillerTool.h"
-namespace Trk { 
-  class Segment;
-}
-
-
-namespace D3PD {
-
-
-class MuonSegmentAuthorFillerTool
-  : public BlockFillerTool<Trk::Segment>
-{
-public:
-  MuonSegmentAuthorFillerTool (const std::string& type,
-                        const std::string& name,
-                        const IInterface* parent);
-
-  virtual StatusCode book();
-
-  virtual StatusCode fill (const Trk::Segment& p);
-
-
-private:
-  int *m_author = nullptr;
-};
-
-} // namespace D3PD
-
-#endif
diff --git a/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/src/MuonSegmentFitQualityFillerTool.cxx b/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/src/MuonSegmentFitQualityFillerTool.cxx
deleted file mode 100644
index 42d6792c2b3601e0f6284063895f4591148ba2ce..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/src/MuonSegmentFitQualityFillerTool.cxx
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-//////////////////////////////////////////////////////
-//
-// Author : Srivas Prasad (srivas.prasad@cern.ch)
-// Date   : February 2010
-//
-//////////////////////////////////////////////////////
-#include "MuonSegmentFitQualityFillerTool.h"
-#include "TrkSegment/Segment.h"
-#include "MuonSegment/MuonSegment.h"
-#include "TrkEventPrimitives/FitQuality.h"
-#include "AthenaKernel/errorcheck.h"
-
-
-namespace D3PD {
-
-
-MuonSegmentFitQualityFillerTool::MuonSegmentFitQualityFillerTool (const std::string& type,
-                                            const std::string& name,
-                                            const IInterface* parent)
-  : BlockFillerTool<Trk::Segment> (type, name, parent)
-{
-  MuonSegmentFitQualityFillerTool::book().ignore(); // Avoid coverity warnings.
-}
-
-
-StatusCode MuonSegmentFitQualityFillerTool::book()
-{
-  CHECK( addVariable ("chi2",          m_chi2)  );
-  CHECK( addVariable ("ndof",          m_ndof)  );
-  return StatusCode::SUCCESS;
-}
-
-
-StatusCode MuonSegmentFitQualityFillerTool::fill (const Trk::Segment& ts) {
-  const Muon::MuonSegment& mSeg = dynamic_cast<const Muon::MuonSegment&> (ts);
-
-  *m_chi2 = (float) mSeg.fitQuality()->chiSquared();
-  *m_ndof = (int) mSeg.fitQuality()->numberDoF();
-
-  return StatusCode::SUCCESS;
-}
-
-
-} // namespace D3PD
diff --git a/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/src/MuonSegmentFitQualityFillerTool.h b/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/src/MuonSegmentFitQualityFillerTool.h
deleted file mode 100644
index 81c3f2667133e6513b4dd9c3d68f0f1b3bf3d490..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/src/MuonSegmentFitQualityFillerTool.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-/**
- * @file MuonD3PDMaker/src/MuonSegmentFitQualityFillerTool.h
- * @author srivas prasad <srivas.prasad@cern.ch>
- * @date Feb 2010
- * @brief Block filler tool with fit quality information for muon segments, detail level 1
- */
-
-#ifndef D3PDMAKER_MUONSEGMENTFITQUALITYFILLERTOOL_H
-#define D3PDMAKER_MUONSEGMENTFITQUALITYFILLERTOOL_H 1
-
-
-#include "D3PDMakerUtils/BlockFillerTool.h"
-namespace Trk { 
-  class Segment;
-}
-
-
-namespace D3PD {
-
-
-class MuonSegmentFitQualityFillerTool
-  : public BlockFillerTool<Trk::Segment>
-{
-public:
-  MuonSegmentFitQualityFillerTool (const std::string& type,
-                        const std::string& name,
-                        const IInterface* parent);
-
-  virtual StatusCode book();
-
-  virtual StatusCode fill (const Trk::Segment& p);
-
-
-private:
-  float *m_chi2 = nullptr;
-  int *m_ndof = nullptr;
-};
-
-} // namespace D3PD
-
-#endif
diff --git a/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/src/MuonSegmentLocationFillerTool.cxx b/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/src/MuonSegmentLocationFillerTool.cxx
deleted file mode 100644
index 393f43d35167ad690d21ccf08575378cd0d10287..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/src/MuonSegmentLocationFillerTool.cxx
+++ /dev/null
@@ -1,209 +0,0 @@
-/*
-  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
-*/
-
-#include "MuonSegmentLocationFillerTool.h"
-#include "TrkSegment/Segment.h"
-#include "MuonSegment/MuonSegment.h"
-#include "AthenaKernel/errorcheck.h"
-#include "TrkEventPrimitives/LocalDirection.h"
-
-namespace D3PD {
-
-MuonSegmentLocationFillerTool::MuonSegmentLocationFillerTool (const std::string& type,
-                                            const std::string& name,
-                                            const IInterface* parent)
-  : BlockFillerTool<Trk::Segment> (type, name, parent),
-    m_idToFixedIdTool("MuonCalib::IdToFixedIdTool"),
-    m_slPropagator("Trk::StraightLinePropagator/MuonStraightLinePropagator"),
-    m_pullCalculator("Trk::ResidualPullCalculator/ResidualPullCalculator")
-{
-  MuonSegmentLocationFillerTool::book().ignore(); // Avoid coverity warnings.
-}
-
-
-StatusCode MuonSegmentLocationFillerTool::initialize()
-{
-  CHECK( BlockFillerTool<Trk::Segment>::initialize() );
-  CHECK( m_edmHelperSvc.retrieve() );
-  CHECK( m_idHelperSvc.retrieve() );
-  CHECK( m_idToFixedIdTool.retrieve() );
-  CHECK( m_slPropagator.retrieve() );
-  CHECK( m_pullCalculator.retrieve() );
-  m_magFieldProperties = new Trk::MagneticFieldProperties(Trk::FullField);
-  return StatusCode::SUCCESS;
-}
-
-StatusCode MuonSegmentLocationFillerTool::book()
-{
-  CHECK( addVariable ("x",             m_x)  );
-  CHECK( addVariable ("y",             m_y)  );
-  CHECK( addVariable ("z",             m_z)  );
-  CHECK( addVariable ("phi",           m_phi)  );
-  CHECK( addVariable ("theta",         m_theta)  );
-  CHECK( addVariable ("locX",          m_locX)  );
-  CHECK( addVariable ("locY",          m_locY)  );
-  CHECK( addVariable ("locAngleXZ",    m_thetaXZ)  );
-  CHECK( addVariable ("locAngleYZ",    m_thetaYZ)  );
-  CHECK( addVariable ("locAngleXZ_IP", m_thetaXZ_IP)  );
-  CHECK( addVariable ("locAngleYZ_IP", m_thetaYZ_IP)  );
-  CHECK( addVariable ("sector",        m_sector)  );
-  CHECK( addVariable ("stationEta",    m_stationEta)  );
-  CHECK( addVariable ("isEndcap",      m_isEndcap)  );
-  CHECK( addVariable ("stationName",   m_stationName)  );
-  CHECK( addVariable ("nphiHits",      m_nphiHits)  );
-  CHECK( addVariable ("netaHits",      m_netaHits)  );
-  CHECK( addVariable ("netaTrigHits",  m_netaTrigHits)  );
-  CHECK( addVariable ("npadHits",      m_npadHits)  );
-  CHECK( addVariable ("npseudoHits",   m_npseudoHits)  );
-  CHECK( addVariable ("id",            m_id)  );
-  CHECK( addVariable ("type",          m_type)  );
-  CHECK( addVariable ("residual",      m_residual)  );
-  CHECK( addVariable ("error",         m_error)  );
-  CHECK( addVariable ("biasedpull",    m_biasedPull)  );
-  CHECK( addVariable ("unbiasedpull",  m_unbiasedPull)  );
-
-  return StatusCode::SUCCESS;
-}
-
-
-StatusCode MuonSegmentLocationFillerTool::fill (const Trk::Segment& ts) {
-  const Muon::MuonSegment& mSeg = dynamic_cast<const Muon::MuonSegment&> (ts);
-
-  // global position
-  const Amg::Vector3D&  globalPos         = mSeg.globalPosition();
-  *m_x = (float) globalPos.x();
-  *m_y = (float) globalPos.y();
-  *m_z = (float) globalPos.z();
-
-  // global direction
-  const Amg::Vector3D& globalDir         = mSeg.globalDirection();
-  *m_phi = (float) globalDir.phi();
-  *m_theta = (float) globalDir.theta();
-
-  //local position
-  Amg::Vector2D localPos;
-  Amg::Vector3D momdum (0, 0, 0);
-
-  if( mSeg.associatedSurface().globalToLocal(globalPos, momdum, localPos) )
-  {
-    *m_locX = (float) localPos.x();
-    *m_locY = (float) localPos.y();
-  }
-  else{
-    *m_locX = -99999.;
-    *m_locY = -99999.;
-  }
-
-  //local direction
-  const Trk::LocalDirection& localDir  = mSeg.localDirection();
-  *m_thetaXZ = (float) localDir.angleXZ();
-  *m_thetaYZ = (float) localDir.angleYZ();
-
-  Amg::Vector3D pointingDir(globalPos.x(),globalPos.y(),globalPos.z());
-  Trk::LocalDirection localIPDir;
-  mSeg.associatedSurface().globalToLocalDirection(pointingDir, localIPDir);
-  *m_thetaXZ_IP = (float) localIPDir.angleXZ();
-  *m_thetaYZ_IP = (float) localIPDir.angleYZ();
-
-  Identifier chid = m_edmHelperSvc->chamberId(mSeg);
-  if( !(m_idHelperSvc->isMuon(chid)) ) { // bad chid
-    *m_stationName = -1;
-    *m_sector = -1;
-    *m_stationEta = -1;
-    *m_isEndcap = -1;
-  } else {
-    MuonCalib::MuonFixedId fid = m_idToFixedIdTool->idToFixedId( chid ) ;
-    *m_stationName = fid.stationName();
-    // chamber location information
-    // should not happen...chamberId is supposed to return id only for MDT or CSC hits.
-    if(!fid.is_tgc() ) *m_sector = m_idHelperSvc->sector(chid);
-    else *m_sector = 0;
-    *m_stationEta = m_idHelperSvc->stationEta(chid);
-    *m_isEndcap = m_idHelperSvc->isEndcap(chid);
-  }
-  //we own these pars, but the createTrackParameters returns a plain pointer
-  const Trk::AtaPlane* pars = m_edmHelperSvc->createTrackParameters( mSeg );
-  if( !pars ) return StatusCode::SUCCESS;
-
-  int nphiHits = 0;
-  int netaHits = 0;
-  int netaTrigHits = 0;
-  int npadHits = 0;
-  int npseudoHits = 0;
-
-  const std::vector<const Trk::MeasurementBase*>& measurements = mSeg.containedMeasurements();
-  for( std::vector<const Trk::MeasurementBase*>::const_iterator it = measurements.begin();it!=measurements.end();++it ){
-    const Trk::MeasurementBase& meas = **it;
-    Identifier id = m_edmHelperSvc->getIdentifier(meas);
-    m_id->push_back(m_idToFixedIdTool->idToFixedId(id).getIdInt());
-    int type = 6;
-    if( id.is_valid() ){
-      if( m_idHelperSvc->isMdt(id) )       type = 0;
-      else if( m_idHelperSvc->isRpc(id) )  type = 1;
-      else if( m_idHelperSvc->isTgc(id) )  type = 2;
-      else if( m_idHelperSvc->isCsc(id) )  type = 3;
-      else if( m_idHelperSvc->isMM(id)   ) type = 4;
-      else if( m_idHelperSvc->issTgc(id) ) type = 5;
-
-      if( m_idHelperSvc->issTgc(id) ){
-	int chtype = m_idHelperSvc->stgcIdHelper().channelType(id);
-	type += 1000*chtype;
-	if( chtype == 0 )      ++npadHits;
-	else if( chtype == 1 ) ++netaTrigHits;
-	else                   ++nphiHits;
-      }else if( !m_idHelperSvc->measuresPhi(id) ) {
-	if( type == 1 || type ==3 ) ++netaTrigHits;
-	else                        ++netaHits;
-	type += 1000;
-      }else{
-	++nphiHits;
-      }
-    }else ++npseudoHits;
-
-    m_type->push_back(type);
-
-    *m_nphiHits = nphiHits;
-    *m_netaHits = netaHits;
-    *m_netaTrigHits = netaTrigHits;
-    *m_npadHits = npadHits;
-    *m_npseudoHits = npseudoHits;
-
-    std::unique_ptr<const Trk::TrackParameters> exPars = m_slPropagator->propagate(Gaudi::Hive::currentContext(),
-      *pars,meas.associatedSurface(),Trk::anyDirection,false,*m_magFieldProperties);
-    if( !exPars && meas.associatedSurface().isOnSurface(pars->position()) ){
-      exPars = pars->uniqueClone();
-    }
-    float res = -99999;
-    float pullub = -99999;
-    float pullb  = -99999;
-    if( exPars ){
-      //residualPull just needs some numbers from the params, it never owns them
-      std::optional<Trk::ResidualPull> resPull = m_pullCalculator->residualPull(
-          &meas, exPars.get(), Trk::ResidualPull::Biased);
-      if (resPull) {
-        res = resPull->residual().front();
-        pullub = resPull->pull().front();
-      } else
-        ATH_MSG_WARNING("Failed to calculate biased residual for "
-                        << m_idHelperSvc->toString(id));
-
-      resPull = m_pullCalculator->residualPull( &meas, exPars.get(), Trk::ResidualPull::Unbiased );
-      if( resPull ) {
-        pullb = resPull->pull().front();
-      } else {
-        ATH_MSG_WARNING("Failed to calculate biased residual for " << m_idHelperSvc->toString(id) );
-      }
-    }else{
-      ATH_MSG_WARNING("Failed to obtain track parameters for " << m_idHelperSvc->toString(id) );
-    }
-    m_residual->push_back(res);
-    m_biasedPull->push_back(pullb);
-    m_unbiasedPull->push_back(pullub);
-  }
-  delete pars;
-  return StatusCode::SUCCESS;
-}
-
-
-} // namespace D3PD
diff --git a/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/src/MuonSegmentLocationFillerTool.h b/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/src/MuonSegmentLocationFillerTool.h
deleted file mode 100644
index 3ddaf5a5b3f93816ab336d92f9f0d26ee945783c..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/src/MuonSegmentLocationFillerTool.h
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
-  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
-*/
-
-/**
- * @file MuonD3PDMaker/src/MuonSegmentLocationFillerTool.h
- * @author srivas prasad <srivas.prasad@cern.ch>
- * @date Feb 2010
- * @brief Position/direction/chamber-location for muon segments, detail level 1
- */
-
-#ifndef D3PDMAKER_MUONSEGMENTLOCATIONFILLERTOOL_H
-#define D3PDMAKER_MUONSEGMENTLOCATIONFILLERTOOL_H 1
-
-#include "D3PDMakerUtils/BlockFillerTool.h"
-
-#include "GaudiKernel/ServiceHandle.h"
-#include "GaudiKernel/ToolHandle.h"
-
-#include "MuonRecHelperTools/IMuonEDMHelperSvc.h"
-#include "MuonIdHelpers/IMuonIdHelperSvc.h"
-#include "MuonCalibITools/IIdToFixedIdTool.h"
-#include "TrkExInterfaces/IPropagator.h"
-#include "TrkGeometry/MagneticFieldProperties.h"
-#include "TrkToolInterfaces/IResidualPullCalculator.h"
-
-namespace Trk { 
-  class Segment;
-}
-
-namespace D3PD {
-
-class MuonSegmentLocationFillerTool
-  : public BlockFillerTool<Trk::Segment>
-{
-public:
-  MuonSegmentLocationFillerTool (const std::string& type,
-                        const std::string& name,
-                        const IInterface* parent);
-
-  /// Standard Gaudi initialize method.
-  StatusCode initialize();
-
-  virtual StatusCode book();
-
-  virtual StatusCode fill (const Trk::Segment& p);
-
-private:
-  // global position
-  float *m_x = nullptr;
-  float *m_y = nullptr;
-  float *m_z = nullptr;
-
-  // global direction
-  float *m_phi = nullptr;
-  float *m_theta = nullptr;
-
-  // local position
-  float *m_locX = nullptr;
-  float *m_locY = nullptr;
-
-  // local direction - conventions for Moore and Muonboy are different!
-  float *m_thetaXZ = nullptr; // local x-z angle
-  float *m_thetaYZ = nullptr; // local y-z angle
-  float *m_thetaXZ_IP = nullptr; // local x-z angle pointing to the IP
-  float *m_thetaYZ_IP = nullptr; // local y-z angle pointing to the IP
-
-  // chamber summary
-  int *m_sector = nullptr;  // phi sector - 1 to 16
-  int *m_stationEta = nullptr; // station eta
-  bool *m_isEndcap = nullptr; // 1 for endcap, 0 for barrel
-  int *m_stationName = nullptr; // Station name in MuonFixedId scheme
-
-  // hit counts
-  int* m_nphiHits = nullptr;
-  int* m_netaHits = nullptr;
-  int* m_netaTrigHits = nullptr;
-  int* m_npadHits = nullptr;
-  int* m_npseudoHits = nullptr;
-
-  std::vector<int>*   m_id = nullptr; // fixed id
-  std::vector<int>*   m_type = nullptr;  // 1000*channelType (0:pad,1:eta,2:phi) + 0:MDT,1:RPC,2:TGC,3:CSC,4:STGC,5::MM,6::Pseudo)
-  std::vector<float>* m_error = nullptr; // error
-  std::vector<float>* m_residual = nullptr; // residual
-  std::vector<float>* m_biasedPull = nullptr; // biased pull
-  std::vector<float>* m_unbiasedPull = nullptr; // unbiased pull
-
-  // tools
-  ServiceHandle<Muon::IMuonEDMHelperSvc> m_edmHelperSvc {this, "edmHelper", 
-    "Muon::MuonEDMHelperSvc/MuonEDMHelperSvc", 
-    "Handle to the service providing the IMuonEDMHelperSvc interface" };
-  ServiceHandle<Muon::IMuonIdHelperSvc> m_idHelperSvc {this, "MuonIdHelperSvc", "Muon::MuonIdHelperSvc/MuonIdHelperSvc"};
-  ToolHandle<MuonCalib::IIdToFixedIdTool> m_idToFixedIdTool;
-  ToolHandle<Trk::IPropagator>  m_slPropagator;
-  ToolHandle<Trk::IResidualPullCalculator>  m_pullCalculator;
-  Trk::MagneticFieldProperties* m_magFieldProperties = nullptr;
-};
-
-} // namespace D3PD
-
-#endif
diff --git a/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/src/MuonSegmentT0FillerTool.cxx b/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/src/MuonSegmentT0FillerTool.cxx
deleted file mode 100644
index 2aa71c9a7ba318d8e8d7401cd8ea1bcae40bb4a7..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/src/MuonSegmentT0FillerTool.cxx
+++ /dev/null
@@ -1,125 +0,0 @@
-/*
-  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
-*/
-
-#include <cmath>
-
-#include "MuonSegmentT0FillerTool.h"
-#include "TrkSegment/Segment.h"
-#include "MuonSegment/MuonSegment.h"
-#include "MuonPrepRawData/CscPrepData.h"
-#include "AthenaKernel/errorcheck.h"
-
-namespace D3PD {
-
-
-MuonSegmentT0FillerTool::MuonSegmentT0FillerTool (const std::string& type,
-                                            const std::string& name,
-                                            const IInterface* parent)
-  : BlockFillerTool<Trk::Segment> (type, name, parent) {
-  declareProperty("doMuonBoyCSCTiming", m_doMuonBoyCSCTiming=false);
-
-  MuonSegmentT0FillerTool::book().ignore(); // Avoid coverity warnings.
-}
-
-StatusCode MuonSegmentT0FillerTool::initialize()
-{
-  CHECK( BlockFillerTool<Trk::Segment>::initialize() );
-  CHECK( m_edmHelperSvc.retrieve() );
-  return StatusCode::SUCCESS;
-}
-
-StatusCode MuonSegmentT0FillerTool::book()
-{
-  CHECK( addVariable ("t0",             m_t0)  );
-  CHECK( addVariable ("t0err",             m_t0err)  );
-  return StatusCode::SUCCESS;
-}
-
-
-StatusCode MuonSegmentT0FillerTool::fill (const Trk::Segment& ts) {
-  const Muon::MuonSegment& mSeg = dynamic_cast<const Muon::MuonSegment&> (ts);
-  float t0=0, t0err=0;
-  t0 = mSeg.time();
-  t0err = mSeg.errorTime();
-  if(m_doMuonBoyCSCTiming) MuonboyT0CSCSegment(&mSeg, t0, t0err);
-
-  *m_t0 = t0;
-  *m_t0err = t0err;
-
-  return StatusCode::SUCCESS;
-}
-
-// CSC timing for muonboy
-// Code from: MboyEDMTool-07-83-41/src//MuonboyToSegmentTool.cxx
-
-void MuonSegmentT0FillerTool::MuonboyT0CSCSegment(const Muon::MuonSegment* pMuonSegment, float& t0, float& t0Error) {
-   t0      = pMuonSegment->time()      ;
-   t0Error = pMuonSegment->errorTime() ;
-   
-   int   DoAlternative = 0 ;
-   int   Alternative_ThereIsaCscTimeEarly  = 0 ;
-   int   Alternative_ThereIsaCscTimeLate   = 0 ;
-   float Alternative_LatestEarlyTime  = 0. ;
-   float Alternative_EarliestLateTime = 0. ;
-   float Alternative_counter = 0. ;
-   float Alternative_t0      = 0. ;
-   float Alternative_t0sqr   = 0. ;
-   float Alternative_t0Error = 0. ;
-   for(unsigned int irot=0;irot<pMuonSegment->numberOfContainedROTs();irot++){
-     const Trk::RIO_OnTrack* pRIO_OnTrack=pMuonSegment->rioOnTrack(irot);
-     if ( (pRIO_OnTrack) ){
-       const Trk::PrepRawData* pPrepRawData =(pRIO_OnTrack)->prepRawData () ;
-       if ( pPrepRawData ){
-         const Muon::CscPrepData* pPrepData = dynamic_cast<const Muon::CscPrepData*>(pPrepRawData);
-         if ( pPrepData ){
-           DoAlternative = 1 ;
-           double Time = pPrepData->time() ;
-           if (pPrepData->timeStatus() == Muon::CscTimeSuccess){
-             Alternative_counter = Alternative_counter + 1. ;
-             Alternative_t0    = Alternative_t0    + Time      ;
-             Alternative_t0sqr = Alternative_t0sqr + Time*Time ;
-           }
-           if (pPrepData->timeStatus() == Muon::CscTimeEarly) {
-             if ( Alternative_ThereIsaCscTimeEarly == 0 ) Alternative_LatestEarlyTime = Time ;
-             if ( Time >= Alternative_LatestEarlyTime   ) Alternative_LatestEarlyTime = Time ; 
-             Alternative_ThereIsaCscTimeEarly = 1 ;
-           }
-           if (pPrepData->timeStatus() == Muon::CscTimeLate ) {
-             if ( Alternative_ThereIsaCscTimeLate == 0 ) Alternative_EarliestLateTime = Time ;
-             if ( Time <= Alternative_EarliestLateTime ) Alternative_EarliestLateTime = Time ; 
-             Alternative_ThereIsaCscTimeLate  = 1 ;
-           }
-         }
-       }
-     }
-   }
-   
-   if (DoAlternative==1){ 
-     if (Alternative_counter){
-       const float inv_Alternative_counter = 1. / Alternative_counter;
-       Alternative_t0    =  Alternative_t0   * inv_Alternative_counter;
-       Alternative_t0sqr =  Alternative_t0sqr * inv_Alternative_counter;
-       Alternative_t0Error =  Alternative_t0sqr - Alternative_t0*Alternative_t0 ;
-       if (Alternative_t0Error < 0.){
-         Alternative_t0Error = 0. ;
-       }else{
-         Alternative_t0Error = std::sqrt(Alternative_t0Error) ;
-       }
-     }else if (Alternative_ThereIsaCscTimeEarly == 1 && Alternative_ThereIsaCscTimeLate == 0){
-       Alternative_t0      = Alternative_LatestEarlyTime       ;
-       Alternative_t0Error = std::fabs(Alternative_LatestEarlyTime) ;
-     }else if (Alternative_ThereIsaCscTimeEarly == 0 && Alternative_ThereIsaCscTimeLate == 1){
-       Alternative_t0      = Alternative_EarliestLateTime ;
-       Alternative_t0Error = Alternative_EarliestLateTime ;
-     }else{
-       Alternative_t0      = 99999. ;
-       Alternative_t0Error = 99999. ;
-     }
-     t0      = Alternative_t0      ;
-     t0Error = Alternative_t0Error ;
-   }
-}
-
-
-} // namespace D3PD
diff --git a/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/src/MuonSegmentT0FillerTool.h b/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/src/MuonSegmentT0FillerTool.h
deleted file mode 100644
index 3da66b0614cf78ec6f088665096faf95f9ff67fd..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/src/MuonSegmentT0FillerTool.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
-  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
-*/
-
-/**
- * @file MuonD3PDMaker/src/MuonSegmentT0FillerTool.h
- * @author srivas prasad <srivas.prasad@cern.ch>
- * @date Jun 2010
- * @brief t0 fit info for muon segments, detail level 2
- */
-
-#ifndef D3PDMAKER_MUONSEGMENTT0FILLERTOOL_H
-#define D3PDMAKER_MUONSEGMENTT0FILLERTOOL_H 1
-
-#include "D3PDMakerUtils/BlockFillerTool.h"
-
-#include "GaudiKernel/ServiceHandle.h"
-#include "MuonRecHelperTools/IMuonEDMHelperSvc.h"
-
-#include <string>
-
-namespace Trk { 
-  class Segment;
-}
-
-
-namespace D3PD {
-
-
-class MuonSegmentT0FillerTool
-  : public BlockFillerTool<Trk::Segment>
-{
-public:
-  MuonSegmentT0FillerTool (const std::string& type,
-                        const std::string& name,
-                        const IInterface* parent);
-
-  /// Standard Gaudi initialize method.
-  StatusCode initialize();
-
-  virtual StatusCode book();
-
-  virtual StatusCode fill (const Trk::Segment& p);
-
-private:
-  // t0 from either t0segment or chamber-t0
-  float *m_t0 = nullptr;
-  float *m_t0err = nullptr;
-
-  // muonboy specific CSC timing code
-  bool m_doMuonBoyCSCTiming;
-  static void MuonboyT0CSCSegment(const Muon::MuonSegment* pMuonSegment, float& t0, float& t0Error);
-  
-  std::string m_muonSegmentT0ContainerKey;
-  ServiceHandle<Muon::IMuonEDMHelperSvc> m_edmHelperSvc {this, "edmHelper", 
-    "Muon::MuonEDMHelperSvc/MuonEDMHelperSvc", 
-    "Handle to the service providing the IMuonEDMHelperSvc interface" };
-};
-
-} // namespace D3PD
-
-#endif
diff --git a/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/src/MuonSegmentTruthFillerTool.cxx b/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/src/MuonSegmentTruthFillerTool.cxx
deleted file mode 100644
index 25db7e710d49271ec3e8d9d823710af94333a5b1..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/src/MuonSegmentTruthFillerTool.cxx
+++ /dev/null
@@ -1,261 +0,0 @@
-/*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-//////////////////////////////////////////////////////
-//
-// Author : Daniel Ventura <ventura@cern.ch>
-//
-//////////////////////////////////////////////////////
-#include "MuonSegmentTruthFillerTool.h"
-#include "AthenaKernel/errorcheck.h"
-#include "TrkTruthData/TruthTrajectory.h"
-#include "AtlasHepMC/GenParticle.h"
-#include "TrkTruthData/PRD_MultiTruthCollection.h"
-#include "MuonPattern/MuonPatternCombinationCollection.h"
-#include "MuonPattern/DetailedMuonPatternTruthCollection.h"
-#include "MuonTruthAlgs/MuonPatternCombinationDetailedTrackTruthMaker.h"
-#include "StoreGate/StoreGateSvc.h"
-#include "TrkPrepRawData/PrepRawData.h"
-
-#include "TrkTruthData/DetailedSegmentTruth.h"
-
-#include "MuonSegment/MuonSegment.h"
-
-using HepGeom::Point3D;
-using HepGeom::Vector3D;
-using namespace std;
-
-namespace D3PD {
-  
-  MuonSegmentTruthFillerTool::MuonSegmentTruthFillerTool (const std::string& type,
-								      const std::string& name,
-								      const IInterface* parent)
-    : BlockFillerTool<Trk::Segment> (type, name, parent) ,
-      m_idHelper(nullptr),
-      m_truthTool("Trk::DetailedMuonPatternTruthBuilder/DetailedMuonPatternTruthBuilder") {
-
-    declareProperty("DetailedMuonPatternTruthTool", m_truthTool);
-    MuonSegmentTruthFillerTool::book().ignore(); // Avoid coverity warnings.
-  }
-  
-  StatusCode MuonSegmentTruthFillerTool::book() {
-    //branches
-    CHECK( addVariable("res_x", m_res_x) );
-    CHECK( addVariable("res_y", m_res_y) );
-    CHECK( addVariable("dAngleYZ", m_dAngleYZ) );
-    CHECK( addVariable("dAngleXZ", m_dAngleXZ) );
-    CHECK( addVariable("truth_barcode", m_truth_barcode) );
-    CHECK( addVariable("truth_nSTGC", m_truth_nSTGC) );
-    CHECK( addVariable("truth_nMM", m_truth_nMM) );
-    CHECK( addVariable("truth_nMDT", m_truth_nMDT) );
-    CHECK( addVariable("truth_nRPC", m_truth_nRPC) );
-    CHECK( addVariable("truth_nTGC", m_truth_nTGC) );
-    CHECK( addVariable("truth_nCSC", m_truth_nCSC) );
-    CHECK( addVariable("noise_nSTGC", m_noise_nSTGC) );
-    CHECK( addVariable("noise_nMM", m_noise_nMM) );
-    CHECK( addVariable("noise_nMDT", m_noise_nMDT) );
-    CHECK( addVariable("noise_nRPC", m_noise_nRPC) );
-    CHECK( addVariable("noise_nTGC", m_noise_nTGC) );
-    CHECK( addVariable("noise_nCSC", m_noise_nCSC) );
-    CHECK( addVariable("common_nSTGC", m_common_nSTGC) );
-    CHECK( addVariable("common_nMM", m_common_nMM) );
-    CHECK( addVariable("common_nMDT", m_common_nMDT) );
-    CHECK( addVariable("common_nRPC", m_common_nRPC) );
-    CHECK( addVariable("common_nTGC", m_common_nTGC) );
-    CHECK( addVariable("common_nCSC", m_common_nCSC) );
-    
-    return StatusCode::SUCCESS;
-  }
-  
-  
-  StatusCode MuonSegmentTruthFillerTool::initialize()
-  {
-    //get tools
-    if(m_truthTool.retrieve().isFailure() ){
-      ATH_MSG_FATAL( "Could not get " << m_truthTool );
-      return StatusCode::FAILURE;
-    }
-    if(!detStore()->retrieve(m_idHelper, "AtlasID").isSuccess()) {
-      ATH_MSG_FATAL("Unable to initialize ID helper.");
-      return StatusCode::FAILURE;
-    }
-    
-    return StatusCode::SUCCESS;
-  }
-
-
-  StatusCode MuonSegmentTruthFillerTool::fill(const Trk::Segment& ts) {
-    const Muon::MuonSegment& mSeg = dynamic_cast<const Muon::MuonSegment&> (ts);
-
-//    const std::vector<const Trk::RIO_OnTrack*>& cROTv = mSeg.containedROTs();
-
-    // global position
-//    const Point3D<double>& segGlobalPos = ts.globalPosition();
-    
-    // global direction
-//    const Vector3D<double>& segGlobalDir = mSeg.globalDirection();
-
-    //----------------------------------------------------------------
-    // Retrieve prep raw data truth
-    std::vector<std::string> PRD_TruthNames;
-    PRD_TruthNames.emplace_back("CSC_TruthMap");
-    PRD_TruthNames.emplace_back("RPC_TruthMap");
-    PRD_TruthNames.emplace_back("TGC_TruthMap");
-    PRD_TruthNames.emplace_back("MDT_TruthMap");
-    PRD_TruthNames.emplace_back("MM_TruthMap");
-    PRD_TruthNames.emplace_back("STGC_TruthMap");
-
-    std::vector<const PRD_MultiTruthCollection*> prdCollectionVector;
-    for(std::vector<std::string>::const_iterator ikey=PRD_TruthNames.begin(); ikey!=PRD_TruthNames.end(); ++ikey) {
-      prdCollectionVector.push_back(nullptr);
-
-      StatusCode sc = evtStore()->retrieve(*prdCollectionVector.rbegin(), *ikey);
-      if (!sc.isSuccess()){
-	ATH_MSG_WARNING( "PRD_MultiTruthCollection " << *ikey << " NOT found");
-      } else {
-	ATH_MSG_DEBUG( "Got PRD_MultiTruthCollection " << *ikey);
-      }
-    }
-
-    //----------------------------------------------------------------
-    // Produce and store the output.  
-    std::vector<DetailedSegmentTruth> *dtt = new std::vector<DetailedSegmentTruth>;
-
-    m_truthTool->buildDetailedTrackTruthFromSegments(dtt, mSeg, prdCollectionVector);
-
-    bool isTruthMatched(false);
-
-    // Find the best dtt to store.  Best is defined as the one with the most total hits in common
-    std::vector<DetailedSegmentTruth>::const_iterator best_dtit = dtt->begin();
-    int best_nHits = 0; 
-
-    for(std::vector<DetailedSegmentTruth>::const_iterator dtit=dtt->begin(); dtit!=dtt->end(); ++dtit) {
-      int nHits = 0;
-      for(unsigned i = 0; i < SubDetHitStatistics::NUM_SUBDETECTORS; i++) {
-        nHits += dtit->statsCommon()[ (SubDetHitStatistics::SubDetType)i ];
-      }
-
-      if(nHits > best_nHits) {
-        best_dtit = dtit;
-        best_nHits = nHits;
-      }
-    }
-
-    if(dtt->begin() != dtt->end() && ((*best_dtit).trajectory())[0].isValid()) {
-      const TruthTrajectory traj = (*best_dtit).trajectory();
-
-      isTruthMatched = true;
-
-
-      vector<int> barcode_list;
-      for(unsigned int i = 0; i < traj.size(); i++) {
-        barcode_list.push_back(traj[i].barcode());
-      }
-      *m_truth_barcode = barcode_list;
-      *m_truth_nSTGC = best_dtit->statsTruth()[SubDetHitStatistics::STGC];
-      *m_truth_nMM = best_dtit->statsTruth()[SubDetHitStatistics::MM];
-      *m_truth_nMDT = best_dtit->statsTruth()[SubDetHitStatistics::MDT];
-      *m_truth_nRPC = best_dtit->statsTruth()[SubDetHitStatistics::RPC];
-      *m_truth_nTGC = best_dtit->statsTruth()[SubDetHitStatistics::TGC];
-      *m_truth_nCSC = best_dtit->statsTruth()[SubDetHitStatistics::CSC];
-      *m_common_nSTGC = best_dtit->statsCommon()[SubDetHitStatistics::STGC];
-      *m_common_nMM = best_dtit->statsCommon()[SubDetHitStatistics::MM];
-      *m_common_nMDT = best_dtit->statsCommon()[SubDetHitStatistics::MDT];
-      *m_common_nRPC = best_dtit->statsCommon()[SubDetHitStatistics::RPC];
-      *m_common_nTGC = best_dtit->statsCommon()[SubDetHitStatistics::TGC];
-      *m_common_nCSC = best_dtit->statsCommon()[SubDetHitStatistics::CSC];
-      *m_noise_nSTGC = best_dtit->statsTrack()[SubDetHitStatistics::STGC]-best_dtit->statsCommon()[SubDetHitStatistics::STGC];
-      *m_noise_nMM = best_dtit->statsTrack()[SubDetHitStatistics::MM]-best_dtit->statsCommon()[SubDetHitStatistics::MM];
-      *m_noise_nMDT = best_dtit->statsTrack()[SubDetHitStatistics::MDT]-best_dtit->statsCommon()[SubDetHitStatistics::MDT];
-      *m_noise_nRPC = best_dtit->statsTrack()[SubDetHitStatistics::RPC]-best_dtit->statsCommon()[SubDetHitStatistics::RPC];
-      *m_noise_nTGC = best_dtit->statsTrack()[SubDetHitStatistics::TGC]-best_dtit->statsCommon()[SubDetHitStatistics::TGC];
-      *m_noise_nCSC = best_dtit->statsTrack()[SubDetHitStatistics::CSC]-best_dtit->statsCommon()[SubDetHitStatistics::CSC];
-
-      if(best_dtit->truthSegPos().x() != -15000.0) {
-        Amg::Transform3D gToLocal = mSeg.associatedSurface().transform().inverse();
-        Amg::Vector3D localSegPos = gToLocal * mSeg.globalPosition(); 
-        Amg::Vector3D localTrueSegPos = gToLocal * best_dtit->truthSegPos();
-        Amg::Vector3D localSegDir = gToLocal * mSeg.globalDirection(); 
-        Amg::Vector3D localTrueSegDir = gToLocal * best_dtit->truthSegDir();
-
-        double scaleFactor = localTrueSegPos.z() / localTrueSegDir.z();
-        Amg::Vector3D localTrueSegPosOnSurface = -scaleFactor * localTrueSegDir + localTrueSegPos; 
-
-        *m_res_x = localSegPos.x() - localTrueSegPosOnSurface.x();
-        *m_res_y = localSegPos.y() - localTrueSegPosOnSurface.y();
-
-        if( fabs(localSegPos.z() - localTrueSegPosOnSurface.z()) > 0.1)
-          ATH_MSG_WARNING("Error: localTrueSegPosOnSurface.z() has value " << localTrueSegPosOnSurface.z() << 
-			  ", but should be extremely close to zero.");
-
-        Amg::Vector3D temp = localSegDir;
-        Amg::Vector3D tempTrue = localTrueSegDir;
-        temp.x() = 0;
-        tempTrue.x() = 0;
-        temp = temp.unit();
-        tempTrue = tempTrue.unit();
-        //double cosAngleYZ = temp * tempTrue;
-        //double dAngleYZ = acos(cosAngleYZ);
-
-        double new_dAngleYZ = temp.theta() - tempTrue.theta();
- 
-
-        temp = localSegDir;
-        tempTrue = localTrueSegDir;
-        temp.y() =  0;
-        tempTrue.y() = 0;
-        temp = temp.unit();
-        tempTrue = tempTrue.unit();
-        //double cosAngleXZ = temp * tempTrue;
-        //double dAngleXZ = acos(cosAngleXZ);
-
-        double new_dAngleXZ = temp.theta() - tempTrue.theta();
-
-
-        *m_dAngleYZ = new_dAngleYZ;
-        *m_dAngleXZ = new_dAngleXZ;
-      }
-    }
-    if(!isTruthMatched) {
-      vector<int> temp;
-      temp.push_back(0);
-      *m_truth_barcode = temp;
-      *m_truth_nSTGC = 0;
-      *m_truth_nMM = 0;
-      *m_truth_nMDT = 0;
-      *m_truth_nRPC = 0;  
-      *m_truth_nTGC = 0;
-      *m_truth_nCSC = 0;
-      *m_common_nSTGC = 0;
-      *m_common_nMM = 0;
-      *m_common_nMDT = 0;
-      *m_common_nRPC = 0;
-      *m_common_nTGC = 0;
-      *m_common_nCSC = 0;
-      *m_noise_nSTGC = 0;
-      *m_noise_nMM = 0;
-      *m_noise_nMDT = 0;
-      *m_noise_nRPC = 0;
-      *m_noise_nTGC = 0;
-      *m_noise_nCSC = 0;
-      *m_dAngleYZ = 0;
-      *m_dAngleXZ = 0;
-      *m_res_x = 0;
-      *m_res_y = 0;
-    }
-
-//    if(dtt) delete dtt;
-    return StatusCode::SUCCESS;
-  }
-  
-  double MuonSegmentTruthFillerTool::deltaR(double eta1, double eta2, double phi1, double phi2) {
-    double Deta = eta1 - eta2;
-    double Dphi = phi1 - phi2;
-    if(Dphi > M_PI) Dphi -= 2*M_PI;
-    else if(Dphi < -M_PI) Dphi += 2*M_PI;
-    double DR = sqrt(Deta*Deta + Dphi*Dphi);
-    return DR;
-  }
-
-} // namespace D3PD
diff --git a/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/src/MuonSegmentTruthFillerTool.h b/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/src/MuonSegmentTruthFillerTool.h
deleted file mode 100644
index 65cb2b221f2a114d9f806ca551978a9d34c102e7..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/src/MuonSegmentTruthFillerTool.h
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-/**
- * @file MuonD3PDMaker/src/MuonSegmentTruthFillerTool.h
- * @author Daniel Blackburn <ventura@cern.ch>
- * @date February 2013
- * @brief Block filler tool for MuonSegmentTruth
- */
-
-#ifndef D3PDMAKER_MuonSegmentTruthFillerTool_H
-#define D3PDMAKER_MuonSegmentTruthFillerTool_H 
-
-#include "GaudiKernel/ToolHandle.h"
-#include "D3PDMakerUtils/BlockFillerTool.h"
-#include "MuonPattern/MuonPatternCombination.h"
-#include "TrkTruthData/SubDetHitStatistics.h"
-#include "AtlasDetDescr/AtlasDetectorID.h"
-
-#include "MuonSegment/MuonSegment.h"
-#include "MuonRecToolInterfaces/IDetailedMuonPatternTruthBuilder.h"
-
-#include <vector>
-
-
-namespace D3PD {
-
-
-class MuonSegmentTruthFillerTool
-  : public BlockFillerTool< Trk::Segment >
-{
-public:
-  MuonSegmentTruthFillerTool (const std::string& type,
-                              const std::string& name,
-                              const IInterface* parent);
-
-  virtual StatusCode book();
-  virtual StatusCode initialize();
-
-  virtual StatusCode fill(const Trk::Segment& segment);
-  virtual double deltaR(double eta1, double eta2, double phi1, double phi2);
-//  virtual SubDetHitStatistics::SubDetType findSubDetType(Identifier id);
-
-private:
-  std::vector<int>* m_truth_barcode = nullptr;
-  float* m_res_x = nullptr;
-  float* m_res_y = nullptr;
-  float* m_dAngleYZ = nullptr;
-  float* m_dAngleXZ = nullptr;
-  int* m_truth_nSTGC = nullptr;
-  int* m_truth_nMM = nullptr;
-  int* m_truth_nMDT = nullptr;
-  int* m_truth_nRPC = nullptr;
-  int* m_truth_nTGC = nullptr;
-  int* m_truth_nCSC = nullptr;
-  int* m_noise_nSTGC = nullptr;
-  int* m_noise_nMM = nullptr;
-  int* m_noise_nMDT = nullptr;
-  int* m_noise_nRPC = nullptr;
-  int* m_noise_nTGC = nullptr;
-  int* m_noise_nCSC = nullptr;
-  int* m_common_nSTGC = nullptr;
-  int* m_common_nMM = nullptr;
-  int* m_common_nMDT = nullptr;
-  int* m_common_nRPC = nullptr;
-  int* m_common_nTGC = nullptr;
-  int* m_common_nCSC = nullptr;
-  
-  //int m_matchedTruth;
-  std::string m_truthSGkey;
-
-  const AtlasDetectorID *m_idHelper;
-  ToolHandle<Trk::IDetailedMuonPatternTruthBuilder> m_truthTool;
-};
-
-} // namespace D3PD
-
-#endif
diff --git a/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/src/MuonSpShowerFillerTool.cxx b/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/src/MuonSpShowerFillerTool.cxx
deleted file mode 100644
index 76f670561c940ab41e376e1e1a77ad34db208936..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/src/MuonSpShowerFillerTool.cxx
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-// $Id$
-/**
- * @file MuonD3PDMaker/src/fillers/MuonSpShowerFillerTool.cxx
- * @author Michiru Kaneda <Michiru.Kaneda@cern.ch>
- * @date Jan., 2011
- * @brief Block filler tool for MuonSpShower
- */
-
-#include "MuonSpShowerFillerTool.h"
-#include "muonEvent/MuonSpShower.h"
-#include "muonEvent/MuonSpShowerContainer.h"
-
-#include "AthenaKernel/errorcheck.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.
- */
-MuonSpShowerFillerTool::MuonSpShowerFillerTool
-  (const std::string& type,
-   const std::string& name,
-   const IInterface* parent)
-    : D3PD::BlockFillerTool<Rec::MuonSpShower> (type, name, parent),
-      m_storeGate("StoreGateSvc", name),
-      m_doPosition(false),
-      m_doHits(false),
-      m_doSegments(false)
-{
-  m_doPosition = true;
-  m_doHits = true;
-  m_doSegments = true;
-  MuonSpShowerFillerTool::book().ignore(); // Avoid coverity warnings.
-
-  declareProperty("WritePosition",    m_doPosition    = false);
-  declareProperty("WriteHits", m_doHits = false);
-  declareProperty("WriteSegments", m_doSegments = false);
-}
-  
-
-/**
- * @brief Book variables for this block.
- */
-StatusCode MuonSpShowerFillerTool::book() {
-  if(m_doPosition){
-    CHECK( addVariable ("eta",  m_eta)  );
-    CHECK( addVariable ("phi",  m_phi)  );
-  }
-  if(m_doHits){
-    CHECK( addVariable ("trigHits", m_trigHits)  );
-    CHECK( addVariable ("innerHits", m_innerHits)  );
-    CHECK( addVariable ("middleHits", m_middleHits)  );
-    CHECK( addVariable ("outerHits", m_outerHits)  );
-  }
-  if(m_doSegments){
-    CHECK( addVariable ("innerSegments", m_innerSegments)  );
-    CHECK( addVariable ("middleSegments", m_middleSegments)  );
-    CHECK( addVariable ("outerSegments", m_outerSegments)  );
-  }
-
-  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 MuonSpShowerFillerTool::fill(const Rec::MuonSpShower& p) {
-  if(m_doPosition){
-    *m_eta = p.eta();
-    *m_phi = p.phi();
-  }
-  if(m_doHits){
-    *m_trigHits = p.numberOfTriggerHits();
-    *m_innerHits = p.numberOfInnerHits();
-    *m_middleHits = p.numberOfMiddleHits();
-    *m_outerHits = p.numberOfOuterHits();
-  }
-  if(m_doSegments){
-    *m_innerSegments = p.numberOfInnerSegments();
-    *m_middleSegments = p.numberOfMiddleSegments();
-    *m_outerSegments = p.numberOfOuterSegments();
-  }
-  
-  return StatusCode::SUCCESS;
-}
-
-
-} // namespace D3PD
diff --git a/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/src/MuonSpShowerFillerTool.h b/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/src/MuonSpShowerFillerTool.h
deleted file mode 100644
index 004ea4538afdf219fabf634be447e3da3bd4a1e7..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/src/MuonSpShowerFillerTool.h
+++ /dev/null
@@ -1,73 +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$
-/**
- * @file MuonD3PDMaker/src/MuonSpShowerFillerTool.h
- * @author Michiru Kaneda <Michiru.Kaneda@cern.ch>
- * @date Jan., 2011
- * @brief Block filler tool for MuonSpShower
- */
-
-#ifndef MUOND3PDMAKER_MUONSPSHOWERFILLERTOOL_H
-#define MUOND3PDMAKER_MUONSPSHOWERFILLERTOOL_H
-
-#include "D3PDMakerUtils/BlockFillerTool.h"
-#include "StoreGate/StoreGateSvc.h"
-#include "muonEvent/MuonSpShower.h"
-
-namespace D3PD {
-
-
-class MuonSpShowerFillerTool
-  : public D3PD::BlockFillerTool<Rec::MuonSpShower>
-
-{
-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.
-   */
-  MuonSpShowerFillerTool (const std::string& type,
-                          const std::string& name,
-                          const IInterface* parent);
-
-  virtual StatusCode book ();
-  virtual StatusCode fill (const Rec::MuonSpShower &p);
-
-
-private:
-  ServiceHandle<StoreGateSvc> m_storeGate;
-
-  /// Variable: Position
-  float* m_eta = nullptr;
-  float* m_phi = nullptr;
-  /// Variable: Hits
-  unsigned short* m_trigHits = nullptr;
-  unsigned short* m_innerHits = nullptr;
-  unsigned short* m_middleHits = nullptr;
-  unsigned short* m_outerHits = nullptr;
-  /// Variable: Segments
-  unsigned short* m_innerSegments = nullptr;
-  unsigned short* m_middleSegments = nullptr;
-  unsigned short* m_outerSegments = nullptr;
-
-  /// Property: Fill Position?
-  bool m_doPosition;
-  /// Property: Fill Hits?
-  bool m_doHits;
-  /// Property: Fill Segments?
-  bool m_doSegments;
-
-};
-
-
-} // namespace D3PD
-
-
-#endif //MUOND3PDMAKER_MUONSPSHOWERFILLERTOOL_H
diff --git a/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/src/RpcPrepDataCollectionGetterTool.cxx b/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/src/RpcPrepDataCollectionGetterTool.cxx
deleted file mode 100644
index 3e9343695db62021b0cfae1560cf7c7e981a997c..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/src/RpcPrepDataCollectionGetterTool.cxx
+++ /dev/null
@@ -1,128 +0,0 @@
-/*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-// $Id: RpcPrepDataCollectionGetterTool.cxx 535250 2013-01-29 13:22:17Z salekd $
-#include "RpcPrepDataCollectionGetterTool.h"
-
-namespace D3PD {
-
-RpcPrepDataCollectionGetterTool::RpcPrepDataCollectionGetterTool
-  (const std::string& type,
-   const std::string& name,
-   const IInterface* parent)
-    : Base (type, name, parent)
-{
-}
-
-StatusCode RpcPrepDataCollectionGetterTool::initialize()
-{
-  CHECK( Base::initialize() );
-
-  return StatusCode::SUCCESS;
-}
-
-const std::type_info& RpcPrepDataCollectionGetterTool::typeinfo() const
-{
-  return typeid(Muon::RpcPrepDataContainer);
-}
-
-
-const std::type_info& RpcPrepDataCollectionGetterTool::elementTypeinfo() const
-{
-  return typeid(Muon::RpcPrepData);
-}
-
-size_t RpcPrepDataCollectionGetterTool::sizeHint(bool allowMissing)
-{
-  const Muon::RpcPrepDataContainer* cont = (Muon::RpcPrepDataContainer*)getUntyped(allowMissing);
-
-  if (!cont) {
-    return 0;
-  }
-  int nclus = 0;
-
-  // Loop over the container
-  Muon::RpcPrepDataContainer::const_iterator itr = cont->begin();
-  Muon::RpcPrepDataContainer::const_iterator itr_end = cont->end();
-  for( ; itr!=itr_end; ++itr ){
-
-    // Loop over the collection
-    Muon::RpcPrepDataCollection::const_iterator itr_col = (*itr)->begin();
-    Muon::RpcPrepDataCollection::const_iterator itr_col_end = (*itr)->end();
-    for( ; itr_col!=itr_col_end; ++itr_col ){
-      nclus++;
-    }
-  }
-
-  return nclus;
-}
-
-StatusCode RpcPrepDataCollectionGetterTool::reset(bool allowMissing)
-{
-  const Muon::RpcPrepDataContainer* cont = (Muon::RpcPrepDataContainer*)getUntyped(allowMissing);
- 
-  if (!cont) {
-    m_contItr = m_contEnd;
-    m_collItr = m_collEnd;
-    return StatusCode::FAILURE;
-  }
-
-  m_contItr = cont->begin();
-  m_contEnd = cont->end();
-
-  if(m_contItr == m_contEnd){
-    m_collItr = m_collEnd;
-    return StatusCode::SUCCESS;
-  }
-
-  m_collItr = (*m_contItr)->begin();
-  m_collEnd = (*m_contItr)->end();
-
-  return StatusCode::SUCCESS;
-}
-
-
-const void* RpcPrepDataCollectionGetterTool::nextUntyped()
-{
-  if(m_collItr == m_collEnd){
-    if(m_contItr==m_contEnd){
-      return nullptr;
-    }
-    ++m_contItr;
-    if(m_contItr==m_contEnd){
-      return nullptr;
-    }
-    m_collItr = (*m_contItr)->begin();
-    m_collEnd = (*m_contItr)->end();
-    if(m_collItr == m_collEnd){
-      return nullptr;
-    }
-  }
-
-  const Muon::RpcPrepData *clus = *m_collItr;
-  
-  ++m_collItr;
-
-  return clus;
-}
-
-
-// Dummies --- the default versions of these don't compile.
-// But these are overridden by the derived class here.
-template<>
-const std::type_info&
-CollectionGetterTool<Muon::RpcPrepDataContainer>::elementTypeinfo() const
-{
-  return typeid(Muon::RpcPrepData);
-}
-
-template<>
-const void*
-CollectionGetterTool<Muon::RpcPrepDataContainer>::nextUntyped()
-{
-  return nullptr;
-}
-
-
-}
diff --git a/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/src/RpcPrepDataCollectionGetterTool.h b/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/src/RpcPrepDataCollectionGetterTool.h
deleted file mode 100644
index eb93736cafc6bb7631700c96eb96e8844dec6704..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/src/RpcPrepDataCollectionGetterTool.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-// $Id: RpcPrepDataCollectionGetterTool.h 535250 2013-01-29 13:22:17Z salekd $
-#ifndef MUOND3PDMAKER_RPCPREPDATACOLLECTIONGETTERTOOL_H
-#define MUOND3PDMAKER_RPCPREPDATACOLLECTIONGETTERTOOL_H
-
-#include "D3PDMakerUtils/SGCollectionGetterTool.h" 
-#include "MuonPrepRawData/RpcPrepData.h"
-#include "MuonPrepRawData/RpcPrepDataCollection.h"
-#include "MuonPrepRawData/RpcPrepDataContainer.h"
-
-//namespace Muon {
-//  class RpcPrepData;
-//}
-
-namespace D3PD { 
-  
-class RpcPrepDataCollectionGetterTool 
-  : public SGCollectionGetterTool<Muon::RpcPrepDataContainer>
-{ 
-public: 
-  typedef SGCollectionGetterTool<Muon::RpcPrepDataContainer> Base; 
-
-  RpcPrepDataCollectionGetterTool (const std::string& type,
-				  const std::string& name, 
-				  const IInterface* parent); 
-
-  StatusCode initialize(); 
-  size_t sizeHint(bool=false); 
-  StatusCode reset(bool=false); 
-  const void* nextUntyped(); 
-  const std::type_info& typeinfo() const; 
-  const std::type_info& elementTypeinfo() const; 
-  
-private: 
-  Muon::RpcPrepDataContainer::const_iterator m_contItr; 
-  Muon::RpcPrepDataContainer::const_iterator m_contEnd; 
-  
-  Muon::RpcPrepDataCollection::const_iterator m_collItr; 
-  Muon::RpcPrepDataCollection::const_iterator m_collEnd; 
-}; 
-
-// Dummies --- the default versions of these don't compile.
-// But these are overridden by the derived class here.
-template<>
-const std::type_info&
-CollectionGetterTool<Muon::RpcPrepDataContainer>::elementTypeinfo() const;
-
-template<>
-const void*
-CollectionGetterTool<Muon::RpcPrepDataContainer>::nextUntyped();
-
-} 
-
-#endif
diff --git a/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/src/RpcPrepDataFillerTool.cxx b/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/src/RpcPrepDataFillerTool.cxx
deleted file mode 100644
index be56b0bd301951cb8b153dc52daabf1847fd2dac..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/src/RpcPrepDataFillerTool.cxx
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-// $Id: RpcPrepDataFillerTool.cxx 535262 2013-01-29 13:54:17Z salekd $
-#include "RpcPrepDataFillerTool.h"
-#include "AthenaKernel/errorcheck.h"
-
-
-namespace D3PD {
-
-
-RpcPrepDataFillerTool::RpcPrepDataFillerTool (const std::string& type,
-                                              const std::string& name,
-                                              const IInterface* parent)
-  : BlockFillerTool<Muon::RpcPrepData> (type, name, parent)
-{
-  RpcPrepDataFillerTool::book().ignore(); // Avoid coverity warnings.
-}
-
-
-StatusCode RpcPrepDataFillerTool::book()
-{
-  CHECK( addVariable ("x", m_x) );
-  CHECK( addVariable ("y", m_y) );
-  CHECK( addVariable ("z", m_z) );
-  CHECK( addVariable ("time", m_time) );
-  CHECK( addVariable ("locX", m_locX) );
- 
-  return StatusCode::SUCCESS;
-}
-
-
-StatusCode RpcPrepDataFillerTool::fill (const Muon::RpcPrepData& obj)
-{
-  *m_x    = obj.globalPosition().x();
-  *m_y    = obj.globalPosition().y();
-  *m_z    = obj.globalPosition().z();
-  *m_time = obj.time();
-  *m_locX = obj.localPosition().x();
-
-  return StatusCode::SUCCESS;
-}
-
-
-} // namespace D3PD
diff --git a/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/src/RpcPrepDataFillerTool.h b/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/src/RpcPrepDataFillerTool.h
deleted file mode 100644
index a7ac12e79b57365eba339d9dac1108c5fb53941d..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/src/RpcPrepDataFillerTool.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-// $Id: RpcPrepDataFillerTool.h 535262 2013-01-29 13:54:17Z salekd $
-#ifndef D3PDMAKER_RPCPREPDATAFILLERTOOL_H
-#define D3PDMAKER_RPCPREPDATAFILLERTOOL_H
-
-#include "MuonPrepRawData/RpcPrepData.h"
-#include "MuonPrepRawData/RpcPrepDataCollection.h"
-#include "D3PDMakerUtils/BlockFillerTool.h"
-#include "D3PDMakerUtils/SGCollectionGetterTool.h"
-#include <string>
-
-namespace D3PD {
-
-/**
- * @brief Block filler tool for the RPC hits
- *
- * @author David Salek <David.Salek@cern.ch>
- *
- * $Revision: 535262 $
- * $Date: 2013-01-29 14:54:17 +0100 (Tue, 29 Jan 2013) $
- */
-class RpcPrepDataFillerTool
-  : public BlockFillerTool<Muon::RpcPrepData>
-{
-public:
-  /// Regular Gaudi AlgTool constructor
-  RpcPrepDataFillerTool (const std::string& type,
-                         const std::string& name,
-                         const IInterface* parent);
-
-  /// Function booking the ntuple variables
-  virtual StatusCode book();
-
-  /// Function filling the ntuple variables for a single object
-  virtual StatusCode fill (const Muon::RpcPrepData& obj);
-
-
-private:
- float* m_x = nullptr;
- float* m_y = nullptr;
- float* m_z = nullptr;
- float* m_time = nullptr;
- float* m_locX = nullptr;
-};
-
-} // namespace D3PD
-
-#endif
diff --git a/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/src/TgcPrepDataCollectionGetterTool.cxx b/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/src/TgcPrepDataCollectionGetterTool.cxx
deleted file mode 100644
index cc8bbf9d28faa3e7812b38db0dc14857b9226844..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/src/TgcPrepDataCollectionGetterTool.cxx
+++ /dev/null
@@ -1,128 +0,0 @@
-/*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-// $Id: TgcPrepDataCollectionGetterTool.cxx 535250 2013-01-29 13:22:17Z salekd $
-#include "TgcPrepDataCollectionGetterTool.h"
-
-namespace D3PD {
-
-TgcPrepDataCollectionGetterTool::TgcPrepDataCollectionGetterTool
-  (const std::string& type,
-   const std::string& name,
-   const IInterface* parent)
-    : Base (type, name, parent)
-{
-}
-
-StatusCode TgcPrepDataCollectionGetterTool::initialize()
-{
-  CHECK( Base::initialize() );
-
-  return StatusCode::SUCCESS;
-}
-
-const std::type_info& TgcPrepDataCollectionGetterTool::typeinfo() const
-{
-  return typeid(Muon::TgcPrepDataContainer);
-}
-
-
-const std::type_info& TgcPrepDataCollectionGetterTool::elementTypeinfo() const
-{
-  return typeid(Muon::TgcPrepData);
-}
-
-size_t TgcPrepDataCollectionGetterTool::sizeHint(bool allowMissing)
-{
-  const Muon::TgcPrepDataContainer* cont = (Muon::TgcPrepDataContainer*)getUntyped(allowMissing);
-
-  if (!cont) {
-    return 0;
-  }
-  int nclus = 0;
-
-  // Loop over the container
-  Muon::TgcPrepDataContainer::const_iterator itr = cont->begin();
-  Muon::TgcPrepDataContainer::const_iterator itr_end = cont->end();
-  for( ; itr!=itr_end; ++itr ){
-
-    // Loop over the collection
-    Muon::TgcPrepDataCollection::const_iterator itr_col = (*itr)->begin();
-    Muon::TgcPrepDataCollection::const_iterator itr_col_end = (*itr)->end();
-    for( ; itr_col!=itr_col_end; ++itr_col ){
-      nclus++;
-    }
-  }
-
-  return nclus;
-}
-
-StatusCode TgcPrepDataCollectionGetterTool::reset(bool allowMissing)
-{
-  const Muon::TgcPrepDataContainer* cont = (Muon::TgcPrepDataContainer*)getUntyped(allowMissing);
- 
-  if (!cont) {
-    m_contItr = m_contEnd;
-    m_collItr = m_collEnd;
-    return StatusCode::FAILURE;
-  }
-
-  m_contItr = cont->begin();
-  m_contEnd = cont->end();
-
-  if(m_contItr == m_contEnd){
-    m_collItr = m_collEnd;
-    return StatusCode::SUCCESS;
-  }
-
-  m_collItr = (*m_contItr)->begin();
-  m_collEnd = (*m_contItr)->end();
-
-  return StatusCode::SUCCESS;
-}
-
-
-const void* TgcPrepDataCollectionGetterTool::nextUntyped()
-{
-  if(m_collItr == m_collEnd){
-    if(m_contItr==m_contEnd){
-      return nullptr;
-    }
-    ++m_contItr;
-    if(m_contItr==m_contEnd){
-      return nullptr;
-    }
-    m_collItr = (*m_contItr)->begin();
-    m_collEnd = (*m_contItr)->end();
-    if(m_collItr == m_collEnd){
-      return nullptr;
-    }
-  }
-
-  const Muon::TgcPrepData *clus = *m_collItr;
-  
-  ++m_collItr;
-
-  return clus;
-}
-
-
-// Dummies --- the default versions of these don't compile.
-// But these are overridden by the derived class here.
-template<>
-const std::type_info&
-CollectionGetterTool<Muon::TgcPrepDataContainer>::elementTypeinfo() const
-{
-  return typeid(Muon::TgcPrepData);
-}
-
-template<>
-const void*
-CollectionGetterTool<Muon::TgcPrepDataContainer>::nextUntyped()
-{
-  return nullptr;
-}
-
-
-}
diff --git a/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/src/TgcPrepDataCollectionGetterTool.h b/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/src/TgcPrepDataCollectionGetterTool.h
deleted file mode 100644
index 5aaf2cb3bb9399424f29155b92f2fda4ab558700..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/src/TgcPrepDataCollectionGetterTool.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-// $Id: TgcPrepDataCollectionGetterTool.h 535250 2013-01-29 13:22:17Z salekd $
-#ifndef MUOND3PDMAKER_TGCPREPDATACOLLECTIONGETTERTOOL_H
-#define MUOND3PDMAKER_TGCPREPDATACOLLECTIONGETTERTOOL_H
-
-#include "D3PDMakerUtils/SGCollectionGetterTool.h" 
-#include "MuonPrepRawData/TgcPrepData.h"
-#include "MuonPrepRawData/TgcPrepDataCollection.h"
-#include "MuonPrepRawData/TgcPrepDataContainer.h"
-
-//namespace Muon {
-//  class TgcPrepData;
-//}
-
-namespace D3PD { 
-  
-class TgcPrepDataCollectionGetterTool 
-  : public SGCollectionGetterTool<Muon::TgcPrepDataContainer>
-{ 
-public: 
-  typedef SGCollectionGetterTool<Muon::TgcPrepDataContainer> Base; 
-
-  TgcPrepDataCollectionGetterTool (const std::string& type,
-				  const std::string& name, 
-				  const IInterface* parent); 
-
-  StatusCode initialize(); 
-  size_t sizeHint(bool=false); 
-  StatusCode reset(bool=false); 
-  const void* nextUntyped(); 
-  const std::type_info& typeinfo() const; 
-  const std::type_info& elementTypeinfo() const; 
-  
-private: 
-  Muon::TgcPrepDataContainer::const_iterator m_contItr; 
-  Muon::TgcPrepDataContainer::const_iterator m_contEnd; 
-  
-  Muon::TgcPrepDataCollection::const_iterator m_collItr; 
-  Muon::TgcPrepDataCollection::const_iterator m_collEnd; 
-}; 
-
-// Dummies --- the default versions of these don't compile.
-// But these are overridden by the derived class here.
-template<>
-const std::type_info&
-CollectionGetterTool<Muon::TgcPrepDataContainer>::elementTypeinfo() const;
-
-template<>
-const void*
-CollectionGetterTool<Muon::TgcPrepDataContainer>::nextUntyped();
-
-} 
-
-#endif
diff --git a/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/src/TgcPrepDataFillerTool.cxx b/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/src/TgcPrepDataFillerTool.cxx
deleted file mode 100644
index c05d04bbdead75e9b687e8518f7fe98849d0d249..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/src/TgcPrepDataFillerTool.cxx
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-// $Id: TgcPrepDataFillerTool.cxx 535262 2013-01-29 13:54:17Z salekd $
-#include "TgcPrepDataFillerTool.h"
-#include "AthenaKernel/errorcheck.h"
-
-
-namespace D3PD {
-
-
-TgcPrepDataFillerTool::TgcPrepDataFillerTool (const std::string& type,
-                                              const std::string& name,
-                                              const IInterface* parent)
-  : BlockFillerTool<Muon::TgcPrepData> (type, name, parent)
-{
-  TgcPrepDataFillerTool::book().ignore(); // Avoid coverity warnings.
-}
-
-
-StatusCode TgcPrepDataFillerTool::book()
-{
-  CHECK( addVariable ("x", m_x) );
-  CHECK( addVariable ("y", m_y) );
-  CHECK( addVariable ("z", m_z) );
-  CHECK( addVariable ("locX", m_locX) );
-  //CHECK( addVariable ("bcBitMap", m_bcBitMap) );
- 
-  return StatusCode::SUCCESS;
-}
-
-
-StatusCode TgcPrepDataFillerTool::fill (const Muon::TgcPrepData& obj)
-{
-  *m_x   = obj.globalPosition().x();
-  *m_y   = obj.globalPosition().y();
-  *m_z   = obj.globalPosition().z();
-  *m_locX = obj.localPosition().x();
-  //*m_bcBitMap = obj.getBcBitMap();
-
-  return StatusCode::SUCCESS;
-}
-
-
-} // namespace D3PD
diff --git a/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/src/TgcPrepDataFillerTool.h b/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/src/TgcPrepDataFillerTool.h
deleted file mode 100644
index 8a170d35dbe2696c8ddabba9cc1a27b297bf702e..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/src/TgcPrepDataFillerTool.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-// $Id: TgcPrepDataFillerTool.h 542179 2013-03-24 05:55:13Z ssnyder $
-#ifndef D3PDMAKER_TGCPREPDATAFILLERTOOL_H
-#define D3PDMAKER_TGCPREPDATAFILLERTOOL_H
-
-#include "MuonPrepRawData/TgcPrepData.h"
-#include "MuonPrepRawData/TgcPrepDataCollection.h"
-#include "D3PDMakerUtils/BlockFillerTool.h"
-#include "D3PDMakerUtils/SGCollectionGetterTool.h"
-#include <string>
-
-namespace D3PD {
-
-/**
- * @brief Block filler tool for the TGC hits
- *
- * @author David Salek <David.Salek@cern.ch>
- *
- * $Revision: 542179 $
- * $Date: 2013-03-24 06:55:13 +0100 (Sun, 24 Mar 2013) $
- */
-class TgcPrepDataFillerTool
-  : public BlockFillerTool<Muon::TgcPrepData>
-{
-public:
-  /// Regular Gaudi AlgTool constructor
-  TgcPrepDataFillerTool (const std::string& type,
-                         const std::string& name,
-                         const IInterface* parent);
-
-  /// Function booking the ntuple variables
-  virtual StatusCode book();
-
-  /// Function filling the ntuple variables for a single object
-  virtual StatusCode fill (const Muon::TgcPrepData& obj);
-
-
-private:
- float* m_x = nullptr;
- float* m_y = nullptr;
- float* m_z = nullptr;
- float* m_locX = nullptr;
- //int* m_bcBitMap;
-};
-
-} // namespace D3PD
-
-#endif
diff --git a/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/src/components/MuonD3PDMaker_entries.cxx b/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/src/components/MuonD3PDMaker_entries.cxx
index 6aba03101c56723f0890cb8f2c16fc05f0723588..57db57386efbd9e886240a994f99883b431503aa 100644
--- a/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/src/components/MuonD3PDMaker_entries.cxx
+++ b/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/src/components/MuonD3PDMaker_entries.cxx
@@ -2,24 +2,9 @@
 #include "../MuonNumberOfSegmentsFillerTool.h"
 #include "../MuonTrackParticleAssociationTool.h"
 #include "../MuonGenParticleAssociationTool.h"
-#include "../MuonSegmentAuthorFillerTool.h" // Srivas
-#include "../MuonSegmentLocationFillerTool.h" // Srivas
-#include "../MuonSegmentFitQualityFillerTool.h" // Srivas
-#include "../MuonSegmentT0FillerTool.h" // Srivas, Verena
 #include "../TruthMuonsToSG.h" // Srivas
 #include "../MuonTruthClassificationFillerTool.h" // Max
 //#include "../MuonIDIsolTool.h" // Lashkar
-#include "../MuonSpShowerFillerTool.h" // Michiru, Haifeng
-#include "../MdtPrepDataFillerTool.h" // David
-#include "../RpcPrepDataFillerTool.h" // David
-#include "../TgcPrepDataFillerTool.h" // David
-#include "../CscPrepDataFillerTool.h" // David
-#include "../MdtPrepDataCollectionGetterTool.h" // David
-#include "../RpcPrepDataCollectionGetterTool.h" // David
-#include "../TgcPrepDataCollectionGetterTool.h" // David
-#include "../CscPrepDataCollectionGetterTool.h" // David
-#include "../MuonPatternCombinationFillerTool.h" // Daniel
-#include "../MuonSegmentTruthFillerTool.h" // Daniel
 
 #include "../MDTSimHitFillerTool.h"
 #include "../TrackRecordFillerTool.h"
@@ -31,24 +16,9 @@ DECLARE_COMPONENT( D3PD::MuonTrkHitFillerTool ) // Serhan
 DECLARE_COMPONENT( D3PD::MuonNumberOfSegmentsFillerTool )
 DECLARE_COMPONENT( D3PD::MuonTrackParticleAssociationTool )
 DECLARE_COMPONENT( D3PD::MuonGenParticleAssociationTool )
-DECLARE_COMPONENT( D3PD::MuonSegmentAuthorFillerTool ) // Srivas
-DECLARE_COMPONENT( D3PD::MuonSegmentLocationFillerTool ) // Srivas
-DECLARE_COMPONENT( D3PD::MuonSegmentFitQualityFillerTool ) // Srivas
-DECLARE_COMPONENT( D3PD::MuonSegmentT0FillerTool ) // Srivas, Verena
 DECLARE_COMPONENT( D3PD::MuonTruthClassificationFillerTool ) // Max
 DECLARE_COMPONENT( D3PD::TruthMuonsToSG ) // Srivas
 // DECLARE_COMPONENT( D3PD::MuonIDIsolTool ) // Lashkar
-DECLARE_COMPONENT( D3PD::MuonSpShowerFillerTool ) // Michiru, Haifeng
-DECLARE_COMPONENT( D3PD::MdtPrepDataFillerTool ) // David
-DECLARE_COMPONENT( D3PD::RpcPrepDataFillerTool ) // David
-DECLARE_COMPONENT( D3PD::TgcPrepDataFillerTool ) // David
-DECLARE_COMPONENT( D3PD::CscPrepDataFillerTool ) // David
-DECLARE_COMPONENT( D3PD::MdtPrepDataCollectionGetterTool ) // David
-DECLARE_COMPONENT( D3PD::RpcPrepDataCollectionGetterTool ) // David
-DECLARE_COMPONENT( D3PD::TgcPrepDataCollectionGetterTool ) // David
-DECLARE_COMPONENT( D3PD::CscPrepDataCollectionGetterTool ) // David
-DECLARE_COMPONENT( D3PD::MuonPatternCombinationFillerTool ) // Daniel
-DECLARE_COMPONENT( D3PD::MuonSegmentTruthFillerTool ) // Daniel
 
 DECLARE_COMPONENT( D3PD::MDTSimHitFillerTool )
 DECLARE_COMPONENT( D3PD::TrackRecordFillerTool )