diff --git a/PhysicsAnalysis/EventTag/EventSelection/CMakeLists.txt b/PhysicsAnalysis/EventTag/EventSelection/CMakeLists.txt
deleted file mode 100644
index 1ed674d79f41ac7170cc00aa7b79bec4b3b8099b..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/EventTag/EventSelection/CMakeLists.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-################################################################################
-# Package: EventSelection
-################################################################################
-
-# Declare the package name:
-atlas_subdir( EventSelection )
-
-# Install files from the package:
-atlas_install_joboptions( share/*.py )
-
diff --git a/PhysicsAnalysis/EventTag/EventSelection/doc/packagedoc.h b/PhysicsAnalysis/EventTag/EventSelection/doc/packagedoc.h
deleted file mode 100644
index 836a1a7fca8dca498dfc086ebca49dd837b2191a..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/EventTag/EventSelection/doc/packagedoc.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-/**
-@page EventSelection_page EventSelection
-
-@section EventSelection_introductionEventSelection Introduction
-This package contains some jobOs for TAG building.
-
-@section EventSelection_packagecontentEventSelection Package Contents
-EventSelection contains the following jobOs
-
-- AODtoTAG_topOptions.py : produce TAG from AOD
-- EventSplitTest_topOptions.py : produce TAG collections together with AOD streams
-
-
-
-@section EventSelection_How to use MakeSimpleCollection.py, MakeEventTagCollection.py and EventTagCollectionDeepCopy.py
-
-Details are found at the following link:
-
-https://uimon.cern.ch/twiki/bin/view/Atlas/CollectionCreationHowTo
-
-*/
diff --git a/PhysicsAnalysis/EventTag/EventSelection/share/DiElectronTagSelection_jobOptions.py b/PhysicsAnalysis/EventTag/EventSelection/share/DiElectronTagSelection_jobOptions.py
deleted file mode 100644
index 649c75b864e4ba349bf6099c147dd6caf9b41303..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/EventTag/EventSelection/share/DiElectronTagSelection_jobOptions.py
+++ /dev/null
@@ -1,4 +0,0 @@
-include.block ( "EventSelection/DiElectronTagSelection_jobOptions.py" )
-
-DiElectron = "NLooseElectron>1 && abs(LooseElectronPt1)>7000 && abs(LooseElectronPt2)>7000"
-
diff --git a/PhysicsAnalysis/EventTag/EventSelection/share/DiJetTagSelection_jobOptions.py b/PhysicsAnalysis/EventTag/EventSelection/share/DiJetTagSelection_jobOptions.py
deleted file mode 100644
index 3b28ce78cc47b68346ad33ee8e023716da72920e..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/EventTag/EventSelection/share/DiJetTagSelection_jobOptions.py
+++ /dev/null
@@ -1,4 +0,0 @@
-include.block ( "EventSelection/DiJetTagSelection_jobOptions.py" )
-
-DiJet = "NJet>1 && JetPt1>20000 && JetPt2>15000"
-
diff --git a/PhysicsAnalysis/EventTag/EventSelection/share/DiMuonTagSelection_jobOptions.py b/PhysicsAnalysis/EventTag/EventSelection/share/DiMuonTagSelection_jobOptions.py
deleted file mode 100644
index c2fdb7dd38ab170878ca329143f0f1902105aef7..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/EventTag/EventSelection/share/DiMuonTagSelection_jobOptions.py
+++ /dev/null
@@ -1,4 +0,0 @@
-include.block ( "EventSelection/DiMuonTagSelection_jobOptions.py" )
-
-DiMuon = "NLooseMuon>1 && abs(LooseMuonPt1)>7000 && abs(LooseMuonPt2)>7000"
-
diff --git a/PhysicsAnalysis/EventTag/EventSelection/share/FourJetTagSelection_jobOptions.py b/PhysicsAnalysis/EventTag/EventSelection/share/FourJetTagSelection_jobOptions.py
deleted file mode 100644
index 9cfb9adbad3489adfd8641552032b640b3b05c5c..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/EventTag/EventSelection/share/FourJetTagSelection_jobOptions.py
+++ /dev/null
@@ -1,4 +0,0 @@
-include.block ( "EventSelection/DiMuonTagSelection_jobOptions.py" )
-
-FourJet = "NJet>3 && JetPt1>20000 && JetPt2>20000 && JetPt3>15000 && JetPt4>15000"
-
diff --git a/PhysicsAnalysis/EventTag/EventSelection/share/FullyHadronicTtbarTagSelection_jobOptions.py b/PhysicsAnalysis/EventTag/EventSelection/share/FullyHadronicTtbarTagSelection_jobOptions.py
deleted file mode 100644
index e56965a87109e2ffc035bc1e50c68968203babda..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/EventTag/EventSelection/share/FullyHadronicTtbarTagSelection_jobOptions.py
+++ /dev/null
@@ -1,11 +0,0 @@
-include.block ( "EventSelection/FullyHadronicTtbarTagSelection_jobOptions.py" )
-
-include ( "EventSelection/FourJetTagSelection_jobOptions.py" )
-include ( "EventSelection/MissingEtTagSelection_jobOptions.py" )
-
-#define the 4-jet channel
-FourJetChannel = FourJet + "&&" + MissingET + "&&" + "NBJet>0"
-
-#fully-hadronic ttbar channel
-FullyHadronicTtbar = "("+FourJetChannel+")"
-
diff --git a/PhysicsAnalysis/EventTag/EventSelection/share/FullyLeptonicTtbarTagSelection_jobOptions.py b/PhysicsAnalysis/EventTag/EventSelection/share/FullyLeptonicTtbarTagSelection_jobOptions.py
deleted file mode 100644
index 2aff03a12484cf81e3b7922c0b66219724023d78..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/EventTag/EventSelection/share/FullyLeptonicTtbarTagSelection_jobOptions.py
+++ /dev/null
@@ -1,16 +0,0 @@
-include.block ( "EventSelection/FullyLeptonicTtbarTagSelection_jobOptions.py" )
-
-include ( "EventSelection/DiElectronTagSelection_jobOptions.py" )
-include ( "EventSelection/DiMuonTagSelection_jobOptions.py" )
-include ( "EventSelection/DiJetTagSelection_jobOptions.py" )
-include ( "EventSelection/MissingEtTagSelection_jobOptions.py" )
-
-#define the 2-electron/2-jet channel
-DiElectronChannel = DiElectron + "&&" + DiJet + "&&" + MissingET + "&&" + "NBJet>0"
-
-#define the 2-muon/2-jet channel
-DiMuonChannel = DiMuon + "&&" + DiJet + "&&" + MissingET + "&&" + "NBJet>0"
-
-#fully-leptonic ttbar channel
-FullyLeptonicTtbar = "("+DiElectronChannel+")" + "||" + "("+DiMuonChannel+")"
-
diff --git a/PhysicsAnalysis/EventTag/EventSelection/share/MissingEtTagSelection_jobOptions.py b/PhysicsAnalysis/EventTag/EventSelection/share/MissingEtTagSelection_jobOptions.py
deleted file mode 100644
index 45e5a1a315398b2fb2546e3c6e644ea4a7e6c073..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/EventTag/EventSelection/share/MissingEtTagSelection_jobOptions.py
+++ /dev/null
@@ -1,4 +0,0 @@
-include.block ( "EventSelection/MissingEtTagSelection_jobOptions.py" )
-
-MissingET = "MissingET>20000"
-
diff --git a/PhysicsAnalysis/EventTag/EventSelection/share/SemiLeptonicTtbarTagSelection_jobOptions.py b/PhysicsAnalysis/EventTag/EventSelection/share/SemiLeptonicTtbarTagSelection_jobOptions.py
deleted file mode 100644
index 727887c4726ef9d7ae079fa30f9b454362271e1e..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/EventTag/EventSelection/share/SemiLeptonicTtbarTagSelection_jobOptions.py
+++ /dev/null
@@ -1,16 +0,0 @@
-include.block ( "EventSelection/SemiLeptonicTtbarTagSelection_jobOptions.py" )
-
-include ( "EventSelection/SingleElectronTagSelection_jobOptions.py" )
-include ( "EventSelection/SingleMuonTagSelection_jobOptions.py" )
-include ( "EventSelection/ThreeJetTagSelection_jobOptions.py" )
-include ( "EventSelection/MissingEtTagSelection_jobOptions.py" )
-
-#define the 1-electron/3-jet channel
-ElectronChannel = SingleElectron + "&&" + ThreeJet + "&&" + MissingET + "&&" + "NBJet>0"
-
-#define the 1-muon/3-jet channel
-MuonChannel = SingleMuon + "&&" + ThreeJet + "&&" + MissingET + "&&" + "NBJet>0"
-
-#semi-leptonic ttbar channel
-SemiLeptonicTtbar = "("+ElectronChannel+")" + "||" + "("+MuonChannel+")"
-
diff --git a/PhysicsAnalysis/EventTag/EventSelection/share/SimpleTopSelection_jobOptions.py b/PhysicsAnalysis/EventTag/EventSelection/share/SimpleTopSelection_jobOptions.py
deleted file mode 100644
index 2238c70482e6e44b2b8944fa5612de1521896dda..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/EventTag/EventSelection/share/SimpleTopSelection_jobOptions.py
+++ /dev/null
@@ -1,38 +0,0 @@
-####################################################
-#Author - Ketevi A. Assamagan
-
-#DetDescrVersion="ATLAS-XXX-..."
-
-doHist = False
-doCBNT = False
-doWriteTAG = False
-doWriteESD = False
-doESD = False
-readAOD = True
-doAOD = False
-doWriteAOD = True
-# read the TAG as input to the job
-readTAG = True
-
-# Number of Events
-EvtMax = 500000
-
-# Use the TAG that you just produce to select the events
-# define also the selection criteria
-PoolTAGInput = ["TAG.pool.root"]
-
-#The pre-defined simple Bselections
-include ( "EventSelection/SemiLeptonicTtbarTagSelection_jobOptions.py" )
-include ( "EventSelection/FullyLeptonicTtbarTagSelection_jobOptions.py" )
-include ( "EventSelection/FullyHadronicTtbarTagSelection_jobOptions.py" )
-include ( "EventSelection/SingleTopTagSelection_jobOptions.py" )
-
-PoolInputQuery=SemiLeptonicTtbar + "||" + FullyLeptonicTtbar + "||" + FullyHadronicTtbar + "||" + SingleTop
-
-#Create a new RDO, ESD and AOD that contain only selected events
-PoolAODOutput = "AOD.TagSel.root"
-
-# main reconstruction job jobOptions
-include ("RecExCommon/RecExCommon_topOptions.py")
-#######################################################
-
diff --git a/PhysicsAnalysis/EventTag/EventSelection/share/SingleElectronTagSelection_jobOptions.py b/PhysicsAnalysis/EventTag/EventSelection/share/SingleElectronTagSelection_jobOptions.py
deleted file mode 100644
index fc1b4aa3b441127db91931267c9090df2cbc3bfd..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/EventTag/EventSelection/share/SingleElectronTagSelection_jobOptions.py
+++ /dev/null
@@ -1,4 +0,0 @@
-include.block ( "EventSelection/SingleElectronTagSelection_jobOptions.py" )
-
-SingleElectron = "NLooseElectron>0 && abs(LooseElectronPt1)>7000"
-
diff --git a/PhysicsAnalysis/EventTag/EventSelection/share/SingleJetTagSelection_jobOptions.py b/PhysicsAnalysis/EventTag/EventSelection/share/SingleJetTagSelection_jobOptions.py
deleted file mode 100644
index 6d7a378a9e2f43b964872adaad1a6d799781892c..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/EventTag/EventSelection/share/SingleJetTagSelection_jobOptions.py
+++ /dev/null
@@ -1,4 +0,0 @@
-include.block ( "EventSelection/SingleJetTagSelection_jobOptions.py" )
-
-SingleJet = "NJet>0 && JetPt1>15000"
-
diff --git a/PhysicsAnalysis/EventTag/EventSelection/share/SingleMuonTagSelection_jobOptions.py b/PhysicsAnalysis/EventTag/EventSelection/share/SingleMuonTagSelection_jobOptions.py
deleted file mode 100644
index 9f46531a2407f89212a72dfce6d45cfdade487d4..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/EventTag/EventSelection/share/SingleMuonTagSelection_jobOptions.py
+++ /dev/null
@@ -1,4 +0,0 @@
-include.block ( "EventSelection/SingleMuonTagSelection_jobOptions.py" )
-
-SingleMuon = "NLooseMuon>0 && abs(LooseMuonPt1)>6000"
-
diff --git a/PhysicsAnalysis/EventTag/EventSelection/share/SingleTopTagSelection_jobOptions.py b/PhysicsAnalysis/EventTag/EventSelection/share/SingleTopTagSelection_jobOptions.py
deleted file mode 100644
index 6ef841e9d4642ef139dae96aa857a37e9842ee0d..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/EventTag/EventSelection/share/SingleTopTagSelection_jobOptions.py
+++ /dev/null
@@ -1,16 +0,0 @@
-include.block ( "EventSelection/SingleTopTagSelection_jobOptions.py" )
-
-include ( "EventSelection/SingleElectronTagSelection_jobOptions.py" )
-include ( "EventSelection/SingleMuonTagSelection_jobOptions.py" )
-include ( "EventSelection/SingleJetTagSelection_jobOptions.py" )
-
-include ( "EventSelection/MissingEtTagSelection_jobOptions.py" )
-
-#define the 1-electron/3-jet channel
-ElectronJet = SingleElectron + "&&" + SingleJet + "&&" + MissingET + "&&" + "NBJet>0"
-
-#define the 1-muon/3-jet channel
-MuonJet = SingleMuon + "&&" + SingleJet + "&&" + MissingET + "&&" + "NBJet>0"
-
-SingleTop = "("+ElectronJet+")" + "||" + "("+MuonJet+")"
-
diff --git a/PhysicsAnalysis/EventTag/EventSelection/share/ThreeJetTagSelection_jobOptions.py b/PhysicsAnalysis/EventTag/EventSelection/share/ThreeJetTagSelection_jobOptions.py
deleted file mode 100644
index 781b27b388f64e514edbac3f16b0addd7b56465d..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/EventTag/EventSelection/share/ThreeJetTagSelection_jobOptions.py
+++ /dev/null
@@ -1,4 +0,0 @@
-include.block ( "EventSelection/ThreeJetTagSelection_jobOptions.py" )
-
-ThreeJet = "NJet>2 && JetPt1>20000 && JetPt2>15000 && JetPt3>15000"
-
diff --git a/PhysicsAnalysis/EventTag/EventTagAthenaPOOL/CMakeLists.txt b/PhysicsAnalysis/EventTag/EventTagAthenaPOOL/CMakeLists.txt
index 36a115387fb051b93259be1163c78de57200792d..f1ce71af7b6dd7e5874723c565556c4893d5bfbc 100644
--- a/PhysicsAnalysis/EventTag/EventTagAthenaPOOL/CMakeLists.txt
+++ b/PhysicsAnalysis/EventTag/EventTagAthenaPOOL/CMakeLists.txt
@@ -1,20 +1,10 @@
-################################################################################
-# Package: EventTagAthenaPOOL
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 # Declare the package name:
 atlas_subdir( EventTagAthenaPOOL )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PRIVATE
-                          Database/AthenaPOOL/AthenaPoolCnvSvc
-                          Database/AthenaPOOL/AthenaPoolUtilities
-                          PhysicsAnalysis/EventTag/EventTagTPCnv
-                          PhysicsAnalysis/EventTag/TagEvent )
-
 # Component(s) in the package:
 atlas_add_poolcnv_library( EventTagAthenaPOOLPoolCnv
                            src/*.cxx
                            FILES TagEvent/RawInfoSummaryForTag.h
-                           LINK_LIBRARIES AthenaPoolCnvSvcLib AthenaPoolUtilities EventTagTPCnv TagEvent )
-
+                           LINK_LIBRARIES AthenaPoolCnvSvcLib EventTagTPCnv TagEvent )
diff --git a/PhysicsAnalysis/EventTag/EventTagRawAlgs/CMakeLists.txt b/PhysicsAnalysis/EventTag/EventTagRawAlgs/CMakeLists.txt
index f16ce190126aa7cb5ff417388ceff6e39eceb284..59b01b8271c223c6c198831396202a644d3198e9 100644
--- a/PhysicsAnalysis/EventTag/EventTagRawAlgs/CMakeLists.txt
+++ b/PhysicsAnalysis/EventTag/EventTagRawAlgs/CMakeLists.txt
@@ -1,43 +1,13 @@
-################################################################################
-# Package: EventTagRawAlgs
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 # Declare the package name:
 atlas_subdir( EventTagRawAlgs )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          Control/AthenaBaseComps
-                          Control/AthenaKernel
-                          GaudiKernel
-                          Tracking/TrkEvent/TrkSegment
-                          PRIVATE
-                          Calorimeter/CaloEvent
-                          Commission/CommissionEvent
-                          Control/StoreGate
-                          Event/xAOD/xAODCaloEvent
-                          InnerDetector/InDetRawEvent/InDetBCM_RawData
-                          InnerDetector/InDetRecEvent/InDetPrepRawData
-                          LArCalorimeter/LArRecEvent
-                          PhysicsAnalysis/EventTag/TagEvent
-                          TileCalorimeter/TileEvent
-                          TileCalorimeter/TileIdentifier
-                          Tracking/TrkEvent/TrkSpacePoint
-                          Tracking/TrkEvent/TrkTrack
-                          Tracking/TrkEvent/TrkTrackSummary
-                          MagneticField/MagFieldElements
-                          MagneticField/MagFieldConditions
-			  )
-
-# External dependencies:
-find_package( CLHEP )
-
 # Component(s) in the package:
 atlas_add_component( EventTagRawAlgs
                      src/*.cxx
                      src/components/*.cxx
-                     INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS}
-                     LINK_LIBRARIES ${CLHEP_LIBRARIES} AthenaBaseComps AthenaKernel GaudiKernel TrkSegment CaloEvent CommissionEvent StoreGateLib SGtests xAODCaloEvent InDetBCM_RawData InDetPrepRawData LArRecEvent TagEvent TileEvent TileIdentifier TrkSpacePoint TrkTrack TrkTrackSummary MagFieldElements MagFieldConditions )
+                     LINK_LIBRARIES AthenaBaseComps AthenaKernel GaudiKernel TrkSegment CaloEvent CommissionEvent StoreGateLib xAODCaloEvent InDetBCM_RawData InDetPrepRawData LArRecEvent TagEvent TileEvent TileIdentifier TrkSpacePoint TrkTrack TrkTrackSummary MagFieldConditions )
 
 # Install files from the package:
 atlas_install_joboptions( share/*.py )
diff --git a/PhysicsAnalysis/EventTag/EventTagTPCnv/CMakeLists.txt b/PhysicsAnalysis/EventTag/EventTagTPCnv/CMakeLists.txt
index 2ec0702e1b8bcc2793350a7464c3ef7bf861bfc1..f17b7d83a08c720ad34892e67900629e22e081de 100644
--- a/PhysicsAnalysis/EventTag/EventTagTPCnv/CMakeLists.txt
+++ b/PhysicsAnalysis/EventTag/EventTagTPCnv/CMakeLists.txt
@@ -1,30 +1,16 @@
-################################################################################
-# Package: EventTagTPCnv
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 # Declare the package name:
 atlas_subdir( EventTagTPCnv )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          Database/AthenaPOOL/AthenaPoolCnvSvc
-                          PhysicsAnalysis/EventTag/TagEvent
-                          PRIVATE
-                          Control/AthenaKernel )
-
-# External dependencies:
-find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
-
 # Component(s) in the package:
 atlas_add_tpcnv_library( EventTagTPCnv
                          src/*.cxx
                          PUBLIC_HEADERS EventTagTPCnv
-                         PRIVATE_INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
-                         LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaPoolCnvSvcLib TagEvent AthenaKernel )
+                         LINK_LIBRARIES AthenaPoolCnvSvcLib TagEvent
+                         PRIVATE_LINK_LIBRARIES AthenaKernel )
 
 atlas_add_dictionary( EventTagTPCnvDict
                       EventTagTPCnv/EventTagTPCnvDict.h
                       EventTagTPCnv/selection.xml
-                      INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
-                      LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaPoolCnvSvcLib TagEvent AthenaKernel EventTagTPCnv )
-
+                      LINK_LIBRARIES EventTagTPCnv )
diff --git a/PhysicsAnalysis/EventTag/TagEvent/CMakeLists.txt b/PhysicsAnalysis/EventTag/TagEvent/CMakeLists.txt
index cf505c4d969628e0f1d8c7afd473242f66aabbaa..a6209fbbda8db3af5c8c12347b8ec724bf14d59a 100644
--- a/PhysicsAnalysis/EventTag/TagEvent/CMakeLists.txt
+++ b/PhysicsAnalysis/EventTag/TagEvent/CMakeLists.txt
@@ -1,29 +1,16 @@
-################################################################################
-# Package: TagEvent
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 # Declare the package name:
 atlas_subdir( TagEvent )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          Control/AthenaKernel
-                          Database/AthenaPOOL/AthenaPoolUtilities )
-
-# External dependencies:
-find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
-
 # Component(s) in the package:
 atlas_add_library( TagEvent
-                   src/*.cxx
+                   TagEvent/*.h
+                   INTERFACE
                    PUBLIC_HEADERS TagEvent
-                   PRIVATE_INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
-                   LINK_LIBRARIES AthenaKernel AthenaPoolUtilities
-                   PRIVATE_LINK_LIBRARIES ${ROOT_LIBRARIES} )
+                   LINK_LIBRARIES AthenaKernel )
 
 atlas_add_dictionary( TagEventDict
                       TagEvent/TagEventDict.h
                       TagEvent/selection.xml
-                      INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
-                      LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaKernel AthenaPoolUtilities TagEvent )
-
+                      LINK_LIBRARIES TagEvent )
diff --git a/PhysicsAnalysis/EventTag/TagEvent/TagEvent/BPhysAttributeNames.h b/PhysicsAnalysis/EventTag/TagEvent/TagEvent/BPhysAttributeNames.h
deleted file mode 100755
index e6a767f67bbc67472eff6e7c78a2290969dd464b..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/EventTag/TagEvent/TagEvent/BPhysAttributeNames.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-#ifndef BPHYSANALYSISATTRIBUTENAMES_H
-#define BPHYSANALYSISATTRIBUTENAMES_H
-
-/****************************************
- Author - Ketevi A. Assamagan 
- Feb 2006
-****************************************/
-
-#include "GlobalGroupAndUnitNames.h"
-#include <string>
-
-/** list of ALL the BPhys attributes and their types */
-namespace BPhys {
-  static const int BphysAttr=1;    // This is the number of BPhys TAG attributes
-  static const int NumBphys = 1;   // This is the max number of BPhys words in the TAG per some attributes
-}
-
-/** This is the list of the TAG attribute names */
-static const std::string BPhysAttributeNames[BPhys::BphysAttr] = {"BPhysWord"};
-
-/** This is the list of the TAG attribute Unit names */
-static const std::string BPhysAttributeUnitNames[BPhys::BphysAttr] = {UnitNames[Unt::Bitmask]};
-
-/** This is the list of the TAG attribute Group names */
-static const std::string BPhysAttributeGroupNames[BPhys::BphysAttr] = {GroupNames[Grp::QualityPhysics]};
-
-#endif
-
-
diff --git a/PhysicsAnalysis/EventTag/TagEvent/TagEvent/CombinedMuonAttributeNames.h b/PhysicsAnalysis/EventTag/TagEvent/TagEvent/CombinedMuonAttributeNames.h
deleted file mode 100755
index 0960af3cb35c9d4145a5360dec3c3e7ec2d7f28d..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/EventTag/TagEvent/TagEvent/CombinedMuonAttributeNames.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-#ifndef COMBINEDMUONATTRIBUTENAMES_H
-#define COMBINEDMUONATTRIBUTENAMES_H
-
-/****************************************
- Author - Ketevi A. Assamagan
- Feb 2006
-****************************************/
-
-#include "GlobalGroupAndUnitNames.h"
-#include <string>
-
-/** list of ALL the Muon ID attributes */
-namespace MuonID {
-  static const int NcombMuonAttr=1;    // This number of combined muon TAG attributes
-  static const int NumCombinedMuon=1;  // This the max number of combined muon words in the TAG per some attributes
-}
-
-/** This is the list of the Combined Muon TAG attributes */
-static const std::string CombinedMuonAttributeNames[MuonID::NcombMuonAttr] = {"CombinedMuonWord"};
-
-
-/** This is the list of the Combined Muon TAG attributes Unit names */
-static const std::string CombinedMuonAttributeUnitNames[MuonID::NcombMuonAttr] = {UnitNames[Unt::Bitmask]};
-
-/** This is the list of the Combined Muon TAG attributes Group names */
-static const std::string CombinedMuonAttributeGroupNames[MuonID::NcombMuonAttr] = {GroupNames[Grp::QualityPhysics]};
-
-#endif
-
diff --git a/PhysicsAnalysis/EventTag/TagEvent/TagEvent/DPDAttributeNames.h b/PhysicsAnalysis/EventTag/TagEvent/TagEvent/DPDAttributeNames.h
deleted file mode 100755
index 4fbebf668af2236ff40c461970f21536f6bfaac7..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/EventTag/TagEvent/TagEvent/DPDAttributeNames.h
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-#ifndef DPDATTRIBUTENAMES_H
-#define DPDATTRIBUTENAMES_H
-
-/****************************************
- Author - Tulay Cuhadar Donszelmann
- Dec 2008
-****************************************/
-#include "GlobalGroupAndUnitNames.h"
-#include <string>
-#include <map>
-
-
-/** list of ALL the DPD attributes and their types */
-namespace DPDId {
-  static const int NdpdAttr=2;    // This the number of DPD TAG attributes
-  static const int NumDpd = 1;    // This is the max number of DPD words in the TAG per some Attributes
-  enum { Daod=0, Desd=1};
-}
-
-/** This is the list of DPD Phys TAG attributes */
-static const std::string DPDAttributeNames[DPDId::NdpdAttr] = {"DAODStreams",
-                                                               "DESDStreams"};
-
-/** This is the list of DPD Phys TAG attributes */
-static const std::string DPDAttributeUnitNames[DPDId::NdpdAttr] = {UnitNames[Unt::Bitmask],
-                                                                   UnitNames[Unt::Bitmask]};
-
-/** This is the list of DPD Phys TAG attributes */
-static const std::string DPDAttributeGroupNames[DPDId::NdpdAttr] = {GroupNames[Grp::TriggerStream],
-                                                                    GroupNames[Grp::TriggerStream]
-                                                                   };
-
-struct DPDBits
-{ 
-   DPDBits();
-
-   std::map<const std::string, unsigned int> daodMap;
-   std::map<const std::string, unsigned int> desdMap;
-};
-
-DPDBits::DPDBits()
-{
-   daodMap.insert(std::make_pair("Other_StreamDAOD_2PH_AcceptEvent"    ,0)); 
-   daodMap.insert(std::make_pair("Other_StreamDAOD_EMTAU_AcceptEvent"  ,1)); 
-   daodMap.insert(std::make_pair("Other_StreamDAODM_SGLEM_AcceptEvent" ,2)); 
-   daodMap.insert(std::make_pair("Other_StreamDAOD_TAUJET_AcceptEvent" ,3));
-   daodMap.insert(std::make_pair("Other_StreamDAODM_SGLPH_AcceptEvent" ,4));
-   daodMap.insert(std::make_pair("Other_StreamDAODM_SGLTAU_AcceptEvent",5)); 
-   daodMap.insert(std::make_pair("Other_StreamDAOD_JETMET_AcceptEvent" ,6));
-   daodMap.insert(std::make_pair("Other_StreamDAOD_EMJET_AcceptEvent"  ,7)); 
-   daodMap.insert(std::make_pair("Other_StreamDAOD_EMMET_AcceptEvent"  ,8));
-   daodMap.insert(std::make_pair("Other_StreamDAOD_2EM_AcceptEvent"    ,9));
-   daodMap.insert(std::make_pair("Other_StreamDAOD_MUJET_AcceptEvent" ,10)); 
-   daodMap.insert(std::make_pair("Other_StreamDAOD_2MU_AcceptEvent"   ,11));
-   daodMap.insert(std::make_pair("Other_StreamDAOD_MUTAU_AcceptEvent" ,12)); 
-   daodMap.insert(std::make_pair("Other_StreamDAODM_SGLMU_AcceptEvent",13));
-   daodMap.insert(std::make_pair("Other_StreamDAOD_MUMET_AcceptEvent" ,14)); 
-   daodMap.insert(std::make_pair("Other_StreamDAOD_EMMU_AcceptEvent"  ,15));
-
-   desdMap.insert(std::make_pair("Other_StreamDESDM_EGAMMA_AcceptEvent" ,0)); 
-   desdMap.insert(std::make_pair("Other_StreamDESDM_TRACK_AcceptEvent"  ,1));
-   desdMap.insert(std::make_pair("Other_StreamDESD_MBIAS_AcceptEvent"   ,2)); 
-   desdMap.insert(std::make_pair("Other_StreamDESD_MET_AcceptEvent"     ,3));
-   desdMap.insert(std::make_pair("Other_StreamDESD_DESD_SGLMU_AcceptEvent",4)); 
-   desdMap.insert(std::make_pair("Other_StreamDESD_PHOJET_AcceptEvent"  ,5));
-   desdMap.insert(std::make_pair("Other_StreamDESDM_CALJET_AcceptEvent" ,6)); 
-   desdMap.insert(std::make_pair("Other_StreamDESD_COLLCAND_AcceptEvent",7));
-   desdMap.insert(std::make_pair("Other_StreamDESD_SGLEL_AcceptEvent"   ,8)); 
-   desdMap.insert(std::make_pair("Other_StreamDESDM_MUON_AcceptEvent"   ,9));
-}
-
-#endif
-
-
diff --git a/PhysicsAnalysis/EventTag/TagEvent/TagEvent/EgammaAttributeNames.h b/PhysicsAnalysis/EventTag/TagEvent/TagEvent/EgammaAttributeNames.h
deleted file mode 100755
index 686fff3c43192eedecd6050fabc51b8acee644df..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/EventTag/TagEvent/TagEvent/EgammaAttributeNames.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-#ifndef EGAMMAATTRIBUTENAMES_H
-#define EGAMMAATTRIBUTENAMES_H
-
-/****************************************
- Author - Ketevi A. Assamagan
- Feb 2006
-****************************************/
-
-#include "GlobalGroupAndUnitNames.h"
-#include <string>
-
-/** list of ALL the Egamma ID attributes */
-namespace Egamma { 
-   static const int NegAttr = 1;      // This number of Egamma TAG attributes
-   static const int NumEgamma = 1;    // This maximum number of Egamma words in the TAG per some attributes
-}
-
-/** This is the list of the Egamma TAG attributes */
-static const std::string EgammaAttributeNames[Egamma::NegAttr] = {"EgammaWord"};
-
-
-/** This is the list of the TAG attribute Unit names */
-static const std::string EgammaAttributeUnitNames[Egamma::NegAttr] = {UnitNames[Unt::Bitmask]};
-
-
-/** This is the list of the TAG attribute Group names */
-static const std::string EgammaAttributeGroupNames[Egamma::NegAttr] = {GroupNames[Grp::QualityPhysics]};
-
-#endif
-
-
diff --git a/PhysicsAnalysis/EventTag/TagEvent/TagEvent/ElectronAttributeNames.h b/PhysicsAnalysis/EventTag/TagEvent/TagEvent/ElectronAttributeNames.h
deleted file mode 100755
index 78d1bc4986aab48eb4384736bec50818c3787b88..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/EventTag/TagEvent/TagEvent/ElectronAttributeNames.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-#ifndef ELECTRONATTRIBUTENAMES_H
-#define ELECTRONATTRIBUTENAMES_H
-
-/****************************************
- Author - Ketevi A. Assamagan
- Feb 2006
-****************************************/
-#include "GlobalGroupAndUnitNames.h"
-#include <string>
-
-/** list of ALL the Electron attributes  */
-namespace ElectronID { 
-  static const int NelecAttr = 6;                     // This the number of electron TAG attributes
-  static const int NumElectron = 6;                   // this maximum number of electrons in the TAG
-  enum { NElectron=0, Pt=1, Eta=2, Phi=3, Tight=4, Isol=5 };
-}
-
-/** This is the list of the Electorn TAG attributes */
-static const std::string ElectronAttributeNames[ElectronID::NelecAttr] = {
-                                                      "NLooseElectron",
-                                                      "LooseElectronPt",
-                                                      "LooseElectronEta",
-                                                      "LooseElectronPhi",
-                                                      "LooseElectronTightness",
-                                                      "LooseElectronIsolation"
-                                                    };
-
-static const std::string ElectronAttributeUnitNames[ElectronID::NelecAttr] = {
-                                                  UnitNames[Unt::Number],
-                                                  UnitNames[Unt::Mevc],
-                                                  UnitNames[Unt::Rap],
-                                                  UnitNames[Unt::Rad],
-                                                  UnitNames[Unt::Bitmask],
-                                                  UnitNames[Unt::Bitmask]
-                                                    };
-
-static const std::string ElectronAttributeGroupNames[ElectronID::NelecAttr] = {
-                                                 GroupNames[Grp::PhysicsElectron],
-                                                 GroupNames[Grp::PhysicsElectron],
-                                                 GroupNames[Grp::PhysicsElectron],
-                                                 GroupNames[Grp::PhysicsElectron],
-                                                 GroupNames[Grp::PhysicsElectron],
-                                                 GroupNames[Grp::PhysicsElectron]
-                                                    };
-
-#endif
diff --git a/PhysicsAnalysis/EventTag/TagEvent/TagEvent/ExoticPhysAttributeNames.h b/PhysicsAnalysis/EventTag/TagEvent/TagEvent/ExoticPhysAttributeNames.h
deleted file mode 100755
index f9585cd5847bd9ac96d97023c3e523cbf3284011..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/EventTag/TagEvent/TagEvent/ExoticPhysAttributeNames.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-#ifndef EXOTICPHYSATTRIBUTENAMES_H
-#define EXOTICPHYSATTRIBUTENAMES_H
-
-/****************************************
- Author - Ketevi A. Assamagan
- Feb 2006
-****************************************/
-#include "GlobalGroupAndUnitNames.h"
-#include <string>
-
-/** list of ALL the Higgs attributes and their types */
-namespace ExoticPhys {
-  static const int NexoticAttr=1;       // This is the number of Exotic TAG attributes
-  static const int NumExoticPhys = 1;   // This is the max number of Exotic TAG words per some attributes
-}
-
-/** This is the list of the exotic phys TAG attributes */
-static const std::string ExoticAttributeNames[ExoticPhys::NexoticAttr] = {"ExoticWord"};
-
-/** This is the list of the exotic phys TAG attributes Unit names*/
-static const std::string ExoticAttributeUnitNames[ExoticPhys::NexoticAttr] = {UnitNames[Unt::Bitmask]};
-
-/** This is the list of the exotic phys TAG attributes Group names*/
-static const std::string ExoticAttributeGroupNames[ExoticPhys::NexoticAttr] = {GroupNames[Grp::QualityPhysics]};
-#endif
-
-
diff --git a/PhysicsAnalysis/EventTag/TagEvent/TagEvent/GlobalEventAttributeNames.h b/PhysicsAnalysis/EventTag/TagEvent/TagEvent/GlobalEventAttributeNames.h
deleted file mode 100755
index 4fdb5f9a9fc43332ca02a73956e9b4ea21379f27..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/EventTag/TagEvent/TagEvent/GlobalEventAttributeNames.h
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
-  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
-*/
-
-#ifndef EVENTTAGALGS_GLOBALEVENTATTRIBUTENAMES_H
-#define EVENTTAGALGS_GLOBALEVENTATTRIBUTENAMES_H
-
-/****************************************
- Author - Ketevi A. Assamagan
- Feb 2006
-****************************************/
-
-#include "AthenaPoolUtilities/AthenaAttributeSpecification.h"
-#include "GlobalGroupAndUnitNames.h"
-#include <string>
-
-/** list of ALL the Event attributes */
-namespace Evt { 
-
-  //static const int NevtAttr = 24;    // This is the number of the Event TAG attributes 
-  enum { Run=0, Event=1, Time=2, TimeNS=3, NLumiBlock=4, Weight=5, BunchId=6, ConditionsRun=7, 
-         Pixel=8, SCT=9, TRT=10, LAr=11, Tile=12, Muon=13, ForwardDet=14, Core=15, 
-         Simu=16, Calib=17, Test=18, Random=19, ActualInt=20, AvgInt=21,
-         NCaloClus=22, NTrk=23, NVx=24, VtxX=25, VtxY=26, VtxZ=27, VtxChiSq=28, VtxNdof=29,//, NVxTight=30, 
-         RecoTimeRAW2ESD=30, RecoTimeESD2AOD=31,  RecoTimeRAWtoALL=32, RecoTimeEVNT2HITS=33, RecoTimeHITS2RDO=34,
-         NevtAttr = 35
-       }; 
-}
-
-static const AthenaAttributeSpecification EventAttributeSpecs[Evt::NevtAttr] = 
-{
-   AthenaAttributeSpecification("RunNumber","unsigned int",        GroupNames[Grp::Time],UnitNames[Unt::Number]),
-   AthenaAttributeSpecification("EventNumber","unsigned long long",      GroupNames[Grp::Time],UnitNames[Unt::Number]),
-   AthenaAttributeSpecification("EventTime","unsigned int",        GroupNames[Grp::Time],UnitNames[Unt::Number]),
-   AthenaAttributeSpecification("EventTimeNanoSec","unsigned int", GroupNames[Grp::Time],UnitNames[Unt::Number]),
-   AthenaAttributeSpecification("LumiBlockN","unsigned int",       GroupNames[Grp::Time],UnitNames[Unt::Number]),
-   AthenaAttributeSpecification("EventWeight","float",             GroupNames[Grp::Time],UnitNames[Unt::Number]),
-   AthenaAttributeSpecification("BunchId","unsigned int",          GroupNames[Grp::Time],UnitNames[Unt::Number]),
-   AthenaAttributeSpecification("ConditionsRun","unsigned int",        GroupNames[Grp::Time],UnitNames[Unt::Number]),
-   AthenaAttributeSpecification("PixelFlags","unsigned int",       GroupNames[Grp::QualityDetector],UnitNames[Unt::Bitmask]),
-   AthenaAttributeSpecification("SCTFlags","unsigned int",         GroupNames[Grp::QualityDetector],UnitNames[Unt::Bitmask]),
-   AthenaAttributeSpecification("TRTFlags","unsigned int",         GroupNames[Grp::QualityDetector],UnitNames[Unt::Bitmask]),
-   AthenaAttributeSpecification("LArFlags","unsigned int",         GroupNames[Grp::QualityDetector],UnitNames[Unt::Bitmask]),
-   AthenaAttributeSpecification("TileFlags","unsigned int",        GroupNames[Grp::QualityDetector],UnitNames[Unt::Bitmask]),
-   AthenaAttributeSpecification("MuonFlags","unsigned int",        GroupNames[Grp::QualityDetector],UnitNames[Unt::Bitmask]),
-   AthenaAttributeSpecification("ForwardDetFlags","unsigned int",  GroupNames[Grp::QualityDetector],UnitNames[Unt::Bitmask]),
-   AthenaAttributeSpecification("CoreFlags","unsigned int",        GroupNames[Grp::QualityDetector],UnitNames[Unt::Bitmask]),
-   AthenaAttributeSpecification("IsSimulation","bool",             GroupNames[Grp::Quality],UnitNames[Unt::Bitmask]),
-   AthenaAttributeSpecification("IsCalibration","bool",            GroupNames[Grp::Quality],UnitNames[Unt::Bitmask]),
-   AthenaAttributeSpecification("IsTestBeam","bool",               GroupNames[Grp::Quality],UnitNames[Unt::Bitmask]),
-   AthenaAttributeSpecification("RandomNumber","float",            GroupNames[Grp::Quality],UnitNames[Unt::Number]),
-   AthenaAttributeSpecification("ActualIntPerXing","float",        GroupNames[Grp::Vertex],UnitNames[Unt::Number]),
-   AthenaAttributeSpecification("AvgIntPerXing","float",           GroupNames[Grp::Vertex],UnitNames[Unt::Number]),
-   AthenaAttributeSpecification("NCaloClus","unsigned int",        GroupNames[Grp::Vertex],UnitNames[Unt::Number]),
-   AthenaAttributeSpecification("NTrk","unsigned int",             GroupNames[Grp::Vertex],UnitNames[Unt::Number]),
-   AthenaAttributeSpecification("NVtx","unsigned int",             GroupNames[Grp::Vertex],UnitNames[Unt::Number]),
-   AthenaAttributeSpecification("VtxX","float",                    GroupNames[Grp::Vertex],UnitNames[Unt::milimeter]),
-   AthenaAttributeSpecification("VtxY","float",                    GroupNames[Grp::Vertex],UnitNames[Unt::milimeter]),
-   AthenaAttributeSpecification("VtxZ","float",                    GroupNames[Grp::Vertex],UnitNames[Unt::milimeter]),
-   AthenaAttributeSpecification("VtxChiSq","float",                GroupNames[Grp::Vertex],UnitNames[Unt::Number]),
-   AthenaAttributeSpecification("VtxNDOF","unsigned int",          GroupNames[Grp::Vertex],UnitNames[Unt::Number]),
-   //   AthenaAttributeSpecification("NVtxTight","int",                 GroupNames[Grp::Vertex],UnitNames[Unt::Number]),
-   AthenaAttributeSpecification("RecoTimeRAWtoESD","float",        GroupNames[Grp::Time],UnitNames[Unt::Number]),
-   AthenaAttributeSpecification("RecoTimeESDtoAOD","float",        GroupNames[Grp::Time],UnitNames[Unt::Number]),
-   AthenaAttributeSpecification("RecoTimeRAWtoALL","float",        GroupNames[Grp::Time],UnitNames[Unt::Number]),
-   AthenaAttributeSpecification("RecoTimeEVNTtoHITS","float",      GroupNames[Grp::Time],UnitNames[Unt::Number]),
-   AthenaAttributeSpecification("RecoTimeHITStoRDO","float",       GroupNames[Grp::Time],UnitNames[Unt::Number])
-
-};
-
-
-#endif
diff --git a/PhysicsAnalysis/EventTag/TagEvent/TagEvent/GlobalGroupAndUnitNames.h b/PhysicsAnalysis/EventTag/TagEvent/TagEvent/GlobalGroupAndUnitNames.h
deleted file mode 100755
index e617af665aa4fa5ac50b01c8371dfb930edcf30c..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/EventTag/TagEvent/TagEvent/GlobalGroupAndUnitNames.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-#ifndef TAGEVENT_GLOBALGROUPANDUNITNAMES_H
-#define TAGEVENT_GLOBALGROUPANDUNITNAMES_H
-
-/****************************************
- Author - Tulay Cuhadar Donszelmann
- Nov 2008
-****************************************/
-#include <vector>
-#include <string>
-#include <iostream>
-
-namespace Grp {
-    //static const int NGroupNames = 16;
-    enum { Nav=0, Time=1, Vertex=2, Quality=3, PhysicsElectron=4, PhysicsPhoton=5, PhysicsMuon=6, PhysicsTau=7,   PhysicsJetmet=8, TriggerL1=9, TriggerHLT=10, TriggerStream=11, QualityDetector=12, QualityPhysics=13,  RawSummary=14, Test=15, NGroupNames=16 };
-    
-}    
-    
-    /** List of all the  Group names */
-static const std::string GroupNames[Grp::NGroupNames] = {  "NAV",
-                                                           "TIME",
-                                                           "VERTEX",
-                                                           "QUALITY",
-                                                           "PHYSICS_ELECTRON",
-                                                           "PHYSICS_PHOTON",
-                                                           "PHYSICS_MUON",
-                                                           "PHYSICS_TAU",
-                                                           "PHYSICS_JETMET",
-                                                           "TRIGGER_L1",
-                                                           "TRIGGER_HLT",
-                                                           "TRIGGER_STREAM", 
-                                                           "QUALITY_DETECTOR", 
-                                                           "QUALITY_PHYSICS",
-                                                           "RAWSUMMARY",
-                                                           "TEST"
-                                                        };
-
-/** List of all the  unit names */
-namespace Unt {
-    static const int NUnitNames = 12;
-    enum { Bitmask=0, milimeter=1, Mev=2, Mevc=3, Rad=4, Number=5, invpicobarn=6, invfemtobarn=7, Rap=8, StatusFlag=9, invMev=10, nanosec=11 };
-}    
-static const std::string UnitNames[Unt::NUnitNames] = {  "BITMASK",
-                                                         "MM",
-                                                         "MEV",
-                                                         "MEV/c",
-                                                         "RAD",
-                                                         "NUMBER",
-                                                         "INV_PB", 
-                                                         "INV_FB",
-                                                         "PSEUDO_RAP",
-                                                         "RYG_FLAG",
-                                                         "1/MEV",
-                                                         "NS" 
-                                                      };
-	                                                                               
-
-
-#endif
diff --git a/PhysicsAnalysis/EventTag/TagEvent/TagEvent/GlobalTriggerAttributeNames.h b/PhysicsAnalysis/EventTag/TagEvent/TagEvent/GlobalTriggerAttributeNames.h
deleted file mode 100755
index c8e862c808c949fdc53e6ff51d20eb91efcaf0bf..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/EventTag/TagEvent/TagEvent/GlobalTriggerAttributeNames.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-#ifndef EVENTTAGALGS_GLOBALTRIGGERATTRIBUTENAMES_H
-#define EVENTTAGALGS_GLOBALTRIGGERATTRIBUTENAMES_H
-
-/****************************************
- Author - Ketevi A. Assamagan
- Feb 2006
-****************************************/
-
-#include "GlobalGroupAndUnitNames.h"
-#include <string>
-
-/** list of ALL the Trigger status attributes */
-namespace Trg { 
-   static const int Ntrg = 4;      // This is the number of Trigger TAG attributes 
-   static const int NumTrig = 16;   // This is the max number of Trigger words in the TAG per some attributes
-   enum { LVL1=0, HLT=1, Stream=2, BunchGroup=3 }; 
-}
-
-/** This is the list of the Trigger TAG attributes */
-static const std::string TriggerAttributeNames[Trg::Ntrg] = {
-                                                       "L1PassedTrigMask",
-                                                       "HLTPassedTrigMask",
-                                                       "SFOStreams",
-                                                       "BunchGroup"
-                                                   };
-
-/** This is the list of the Trigger TAG attributes unit names*/
-static const std::string TriggerAttributeUnitNames[Trg::Ntrg] = {
-                                                        UnitNames[Unt::Bitmask],
-                                                        UnitNames[Unt::Bitmask],
-                                                        UnitNames[Unt::Bitmask],
-                                                        UnitNames[Unt::Number]
-                                                   };
-
-/** This is the list of the Trigger TAG attributes group names*/
-static const std::string TriggerAttributeGroupNames[Trg::Ntrg] = {
-                                                       GroupNames[Grp::TriggerL1],
-                                                       GroupNames[Grp::TriggerHLT],
-                                                       GroupNames[Grp::TriggerStream],
-                                                       GroupNames[Grp::TriggerStream]
-                                                   };
-#endif
diff --git a/PhysicsAnalysis/EventTag/TagEvent/TagEvent/HeavyIonPhysAttributeNames.h b/PhysicsAnalysis/EventTag/TagEvent/TagEvent/HeavyIonPhysAttributeNames.h
deleted file mode 100755
index 7e2b52bef58e8909da627a5462e3d9323844c0fc..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/EventTag/TagEvent/TagEvent/HeavyIonPhysAttributeNames.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-#ifndef HEAVYIONPHYSATTRIBUTENAMES_H
-#define HEAVYIONPHYSATTRIBUTENAMES_H
-
-/****************************************
- Author - Ketevi A. Assamagan
- June 2006
-****************************************/
-
-#include "GlobalGroupAndUnitNames.h"
-#include <string>
-
-/** list of ALL the HeavyIon Phys attributes and their types */
-namespace HeavyIonPhys {
-  static const int NheavyIonAttr=1;       // This is the number of HeavyIon TAG attributes
-  static const int NumHeavyIonPhys = 1;   // This is the max number of HeavyIon TAG words per some attributes
-}
-
-/** This is the list of the heavyIon phys TAG attributes */
-static const std::string HeavyIonAttributeNames[HeavyIonPhys::NheavyIonAttr] = {"HeavyIonWord"};
-
-/** This is the list of the heavyIon phys TAG attributes unit names*/
-static const std::string HeavyIonAttributeUnitNames[HeavyIonPhys::NheavyIonAttr] = {UnitNames[Unt::Bitmask]};
-
-/** This is the list of the heavyIon phys TAG attributes group names*/
-static const std::string HeavyIonAttributeGroupNames[HeavyIonPhys::NheavyIonAttr] = {GroupNames[Grp::QualityPhysics]};
-
-#endif
-
-
diff --git a/PhysicsAnalysis/EventTag/TagEvent/TagEvent/HiggsPhysAttributeNames.h b/PhysicsAnalysis/EventTag/TagEvent/TagEvent/HiggsPhysAttributeNames.h
deleted file mode 100755
index c109f3287071862bf1ff2aae9733fbd617292c4e..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/EventTag/TagEvent/TagEvent/HiggsPhysAttributeNames.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-#ifndef HIGGSPHYSATTRIBUTENAMES_H
-#define HIGGSPHYSATTRIBUTENAMES_H
-
-/****************************************
- Author - Ketevi A. Assamagan
- Feb 2006
-****************************************/
-#include "GlobalGroupAndUnitNames.h"
-#include <string>
-
-/** list of ALL the Higgs attributes and their types */
-namespace HiggsPhys {
-  static const int HiggsAttr=1;       // This is the number of Higgs Phys TAG attributes
-  static const int NumHiggsPhys = 1;  // This is the max number of Higgs Phys words in the TAG per some attributes
-}
-
-/** This is the list of the Higgs Phys TAG attributes */
-static const std::string HiggsAttributeNames[HiggsPhys::HiggsAttr] = {"HiggsWord"};
-
-/** This is the list of the Higgs Phys TAG attributes unit names*/
-static const std::string HiggsAttributeUnitNames[HiggsPhys::HiggsAttr] = {UnitNames[Unt::Bitmask]};
-
-/** This is the list of the Higgs Phys TAG attributes group names*/
-static const std::string HiggsAttributeGroupNames[HiggsPhys::HiggsAttr] = {GroupNames[Grp::QualityPhysics]};
-
-#endif
-
-
diff --git a/PhysicsAnalysis/EventTag/TagEvent/TagEvent/JetMissingEtIdentificationAttributeNames.h b/PhysicsAnalysis/EventTag/TagEvent/TagEvent/JetMissingEtIdentificationAttributeNames.h
deleted file mode 100755
index 52949769eaddd558197e25e507d66ad04a8a299e..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/EventTag/TagEvent/TagEvent/JetMissingEtIdentificationAttributeNames.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-#ifndef JETMISSINGETIDENTIFICATIONATTRIBUTENAMES_H
-#define JETMISSINGETIDENTIFICATIONATTRIBUTENAMES_H
-
-/****************************************
- Author - Ketevi A. Assamagan
- Feb 2006
-****************************************/
-#include "GlobalGroupAndUnitNames.h"
-#include <string>
-
-/** list of ALL the Jet and Missing ET ID attributes */
-namespace JetMissingEt {
-  static const int NjetMetAttr=1;          // This is the number of JetMissingEt ID tag attributes
-  static const int NumJetMissingEtID = 1;  // This the max number of JetMissingET ID words in the TAG per some attributes
-}
- 
-/** This is the list of the JetMissingET ID TAG attributes */
-static const std::string JetMissingEtAttributeNames[JetMissingEt::NjetMetAttr] = {"JetMissingETWord"};
-
-/** This is the list of the JetMissingET ID TAG attributes unit names*/
-static const std::string JetMissingEtAttributeUnitNames[JetMissingEt::NjetMetAttr] = {UnitNames[Unt::Bitmask]};
-
-/** This is the list of the JetMissingET ID TAG attributes group names*/
-static const std::string JetMissingEtAttributeGroupNames[JetMissingEt::NjetMetAttr] = {GroupNames[Grp::QualityPhysics]};
-
-#endif
-
-
diff --git a/PhysicsAnalysis/EventTag/TagEvent/TagEvent/JetTaggingAttributeNames.h b/PhysicsAnalysis/EventTag/TagEvent/TagEvent/JetTaggingAttributeNames.h
deleted file mode 100755
index 221d8094384bd376a5e8df602daf7f5f25f7fe0a..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/EventTag/TagEvent/TagEvent/JetTaggingAttributeNames.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-#ifndef JETTAGGINGATTRIBUTENAMES_H
-#define JETTAGGINGATTRIBUTENAMES_H
-
-/****************************************
- Author - Ketevi A. Assamagan
- Feb 2006
-****************************************/
-
-#include "GlobalGroupAndUnitNames.h"
-#include <string>
-
-/** list of ALL the Jet-Tagging attributes and their types */
-namespace JetTagging {
-  static const int NjetTagAttr=1;      // This is the number of JetTagging TAG attributes
-  static const int NumJetTagging = 1;  // This is the max number of JetTagging TAG words per some attributes
-}
-
-/** This is the list of the JetTagging TAG attributes */
-static const std::string JetTaggingAttributeNames[JetTagging::NjetTagAttr] = {"JetTagWord"};
-
-/** This is the list of the JetTagging TAG attributes unit names*/
-static const std::string JetTaggingAttributeUnitNames[JetTagging::NjetTagAttr] = {UnitNames[Unt::Bitmask]};
-
-/** This is the list of the JetTagging TAG attributes unit names*/
-static const std::string JetTaggingAttributeGroupNames[JetTagging::NjetTagAttr] = {GroupNames[Grp::QualityPhysics]};
-
-#endif
diff --git a/PhysicsAnalysis/EventTag/TagEvent/TagEvent/MissingETAttributeNames.h b/PhysicsAnalysis/EventTag/TagEvent/TagEvent/MissingETAttributeNames.h
deleted file mode 100755
index df3f908796769e7277996c5deff8be7f6ace8557..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/EventTag/TagEvent/TagEvent/MissingETAttributeNames.h
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-#ifndef MISSINGETATTRIBUTENAMES_H
-#define MISSINGETATTRIBUTENAMES_H
-
-#include "GlobalGroupAndUnitNames.h"
-#include <string>
-
-/** list of ALL MissingEt attributes and their types */
-namespace EtMiss { 
-  static const int NetAttr=19;              // This number of MissingEt TAG Attributes
-  static const int NumMissingEt=1;         // This the max number of MissingEt objects in the TAG 
-  enum { MET_RefFinalX=0, MET_RefFinalY=1, SumET=2, MET_SoftClusX=3, MET_SoftClusY=4, MET_RefJetX=5, MET_RefJetY=6, MET_RefTauX=7, MET_RefTauY=8, MET_MuonsX=9, MET_MuonsY=10, MET_RefEleX=11, MET_RefEleY=12, MET_RefGammaX=13, MET_RefGammaY=14, MET_PVSoftTrkX=15, MET_PVSoftTrkY=16, MET_FinalTrkX=17,  MET_FinalTrkY=18
-}; 
-}
-
-/** This is the list of the Missing ET TAG attributes */
-static const std::string MissingEtAttributeNames[EtMiss::NetAttr] = {
-                                                       "MET_RefFinalX",
-                                                       "MET_RefFinalY",
-                                                       "SumET",
-                                                       "MET_SoftClusX",
-                                                       "MET_SoftClusY",
-						       "MET_RefJetX",
-						       "MET_RefJetY",
-						       "MET_RefTauX",
-						       "MET_RefTauY",
-						       "MET_MuonsX",
-						       "MET_MuonsY",
-						       "MET_RefEleX",
-						       "MET_RefEleY",
-						       "MET_RefGammaX",
-						       "MET_RefGammaY",
-						       "MET_PVSoftTrkX",
-						       "MET_PVSoftTrkY",
-						       "MET_FinalTrkX",
-						       "MET_FinalTrkY"
-                                                     };
-
-/** This is the list of the Missing ET TAG attributes unit names*/
-static const std::string MissingEtAttributeUnitNames[EtMiss::NetAttr] = {
-                                                       UnitNames[Unt::Mev],
-                                                       UnitNames[Unt::Mev],
-                                                       UnitNames[Unt::Mev],
-                                                       UnitNames[Unt::Mev],
-                                                       UnitNames[Unt::Mev],
-                                                       UnitNames[Unt::Mev],
-                                                       UnitNames[Unt::Mev],
-                                                       UnitNames[Unt::Mev],
-                                                       UnitNames[Unt::Mev],
-						       UnitNames[Unt::Mev],
-                                                       UnitNames[Unt::Mev],
-                                                       UnitNames[Unt::Mev],
-                                                       UnitNames[Unt::Mev],
-                                                       UnitNames[Unt::Mev],
-                                                       UnitNames[Unt::Mev],
-						       UnitNames[Unt::Mev],
-                                                       UnitNames[Unt::Mev],
-                                                       UnitNames[Unt::Mev],
-                                                       UnitNames[Unt::Mev]
-                                                     };
-
-
-/** This is the list of the Missing ET TAG attributes group names*/
-static const std::string MissingEtAttributeGroupNames[EtMiss::NetAttr] = {
-                                                      GroupNames[Grp::PhysicsJetmet],
-                                                      GroupNames[Grp::PhysicsJetmet],
-                                                      GroupNames[Grp::PhysicsJetmet],
-                                                      GroupNames[Grp::PhysicsJetmet],
-                                                      GroupNames[Grp::PhysicsJetmet],
-                                                      GroupNames[Grp::PhysicsJetmet],
-                                                      GroupNames[Grp::PhysicsJetmet],
-                                                      GroupNames[Grp::PhysicsJetmet],
-                                                      GroupNames[Grp::PhysicsJetmet],
-						      GroupNames[Grp::PhysicsJetmet],
-                                                      GroupNames[Grp::PhysicsJetmet],
-                                                      GroupNames[Grp::PhysicsJetmet],
-                                                      GroupNames[Grp::PhysicsJetmet],
-                                                      GroupNames[Grp::PhysicsJetmet],
-                                                      GroupNames[Grp::PhysicsJetmet],
-						      GroupNames[Grp::PhysicsJetmet],
-                                                      GroupNames[Grp::PhysicsJetmet],
-                                                      GroupNames[Grp::PhysicsJetmet],
-                                                      GroupNames[Grp::PhysicsJetmet]
-                                                     };
-
-#endif
diff --git a/PhysicsAnalysis/EventTag/TagEvent/TagEvent/MuonAttributeNames.h b/PhysicsAnalysis/EventTag/TagEvent/TagEvent/MuonAttributeNames.h
deleted file mode 100755
index eafb5222481d2645efd6f05ca4f770d82198fab7..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/EventTag/TagEvent/TagEvent/MuonAttributeNames.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-#ifndef MUONATTRIBUTENAMES_H
-#define MUONATTRIBUTENAMES_H
-
-/****************************************
- Author - Ketevi A. Assamagan
- Feb 2006
-****************************************/
-
-#include "GlobalGroupAndUnitNames.h"
-#include <string>
-
-/** list of ALL the Muon attributes  */
-namespace MuonTAG { 
-  static const int NmuonAttr=10;        // This the number of Muon TAG attributes
-  static const int NumMuon = 6;        // This the max number of Muons in the TAG
-  enum { NMuon=0, Pt=1, Eta=2, Phi=3, Tight=4, Isol=5, NPrecLay=6, NPrecHoleLay=7, NPhiLay=8, MomBalSign=9 }; 
-}
-
-/** This is the list of the Muon TAG attributes */
-static const std::string MuonAttributeNames[MuonTAG::NmuonAttr] = {
-                                                  "NLooseMuon",
-                                                  "LooseMuonPt",
-                                                  "LooseMuonEta",
-                                                  "LooseMuonPhi",
-                                                  "LooseMuonTightness",
-                                                  "LooseMuonIsolation",
-						  "LooseMuonPrecLay",
-						  "LooseMuonPrecHoleLay",
-						  "LooseMuonPhiLay",
-						  "LooseMuonMomBalSig",
-                                               };
-
-static const std::string MuonAttributeUnitNames[MuonTAG::NmuonAttr] = {
-                                                  UnitNames[Unt::Number],
-                                                  UnitNames[Unt::Mevc],
-                                                  UnitNames[Unt::Rap],
-                                                  UnitNames[Unt::Rad],
-                                                  UnitNames[Unt::Bitmask],
-                                                  UnitNames[Unt::Bitmask],
-                                                  UnitNames[Unt::Number],
-                                                  UnitNames[Unt::Number],
-                                                  UnitNames[Unt::Number],
-                                                  UnitNames[Unt::Number]
-                                               };
-
-static const std::string MuonAttributeGroupNames[MuonTAG::NmuonAttr] = {
-                                                 GroupNames[Grp::PhysicsMuon],
-                                                 GroupNames[Grp::PhysicsMuon],
-                                                 GroupNames[Grp::PhysicsMuon],
-                                                 GroupNames[Grp::PhysicsMuon],
-                                                 GroupNames[Grp::PhysicsMuon],
-                                                 GroupNames[Grp::PhysicsMuon],
-                                                 GroupNames[Grp::PhysicsMuon],
-                                                 GroupNames[Grp::PhysicsMuon],
-                                                 GroupNames[Grp::PhysicsMuon],
-                                                 GroupNames[Grp::PhysicsMuon]
-                                               };
-
-
-#endif
diff --git a/PhysicsAnalysis/EventTag/TagEvent/TagEvent/ParticleJetAttributeNames.h b/PhysicsAnalysis/EventTag/TagEvent/TagEvent/ParticleJetAttributeNames.h
deleted file mode 100755
index 2dfc8cae83a4cc2f53437e0d29e921aec0d6fc68..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/EventTag/TagEvent/TagEvent/ParticleJetAttributeNames.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-#ifndef PARTICLEJETATTRIBUTENAMES_H
-#define PARTICLEJETATTRIBUTENAMES_H
-
-/****************************************
- Author - Ketevi A. Assamagan
- Feb 2006
-****************************************/
-#include "GlobalGroupAndUnitNames.h"
-#include <string>
-
-/** list of ALL the Jet attribute  */
-namespace PJet { 
-  static const int NjetAttr=9;   // This is the number of Jet TAG attributes
-  static const int NumJet = 10;   // This is the max number of ParticleJets in the TAG
-  enum { NJet=0, Pt=1, Eta=2, Phi=3, JetSumET=4, E=5, JetPID=6, NpTJet=7, NpTBJet=8 };
-}
-
-/** This is the list of Jet TAG attributes */
-static const std::string JetAttributeNames[PJet::NjetAttr] = {
-                                                  "NJet",
-                                                  "JetPt",
-                                                  "JetEta",
-                                                  "JetPhi",
-                                                  "JetSumET",
-						  "JetE",
-						  "JetPID",
-						  "NpTJet",
-						  "NpTBJet",
-                                               };
-
-/** This is the list of Jet TAG attributes unit names*/
-static const std::string JetAttributeUnitNames[PJet::NjetAttr] = {
-                                               UnitNames[Unt::Number],
-                                               UnitNames[Unt::Mevc],
-                                               UnitNames[Unt::Rap],
-                                               UnitNames[Unt::Rad],
-                                               UnitNames[Unt::Mev],
-                                               UnitNames[Unt::Mev],
-                                               UnitNames[Unt::Bitmask],
-                                               UnitNames[Unt::Number],
-                                               UnitNames[Unt::Number],
-};
-
-/** This is the list of Jet TAG attributes group names */
-static const std::string JetAttributeGroupNames[PJet::NjetAttr] = {
-                                                GroupNames[Grp::PhysicsJetmet],
-                                                GroupNames[Grp::PhysicsJetmet],
-                                                GroupNames[Grp::PhysicsJetmet],
-                                                GroupNames[Grp::PhysicsJetmet],
-                                                GroupNames[Grp::PhysicsJetmet],
-						GroupNames[Grp::PhysicsJetmet],
-                                                GroupNames[Grp::PhysicsJetmet],
-                                                GroupNames[Grp::PhysicsJetmet],
-                                                GroupNames[Grp::PhysicsJetmet],
-                                               };
-
-
-#endif
diff --git a/PhysicsAnalysis/EventTag/TagEvent/TagEvent/PhotonAttributeNames.h b/PhysicsAnalysis/EventTag/TagEvent/TagEvent/PhotonAttributeNames.h
deleted file mode 100755
index 82aa0c4ba9e71b5e7f5e21fdf48674393733c2e7..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/EventTag/TagEvent/TagEvent/PhotonAttributeNames.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-#ifndef PHOTONATTRIBUTENAMES_H
-#define PHOTONATTRIBUTENAMES_H
-
-/****************************************
- Author - Ketevi A. Assamagan
- Feb 2006
-****************************************/
-#include "GlobalGroupAndUnitNames.h"
-#include <string>
-
-/** list of ALL the Photon attributes  */
-namespace PhotonID { 
-  static const int NphotonAttr=7;                                // This is the number of Photon Tag Attributes
-  static const int NumPhoton = 4;                                // This max number of Photons on the TAG
-  enum { NPhoton=0, NConverted=1, Pt=2, Eta=3, Phi=4, Tight=5, Isol=6 }; 
-}
-
-/** This is the list of the Photon TAG attributes */
-static const std::string PhotonAttributeNames[PhotonID::NphotonAttr] = {
-                                                      "NLoosePhoton",
-                                                      "NConvertedLoosePhoton",
-                                                      "LoosePhotonPt",
-                                                      "LoosePhotonEta",
-                                                      "LoosePhotonPhi",
-                                                      "LoosePhotonTightness",
-                                                      "LoosePhotonIsolation"
-                                                   };
-
-/** This is the list of the Photon TAG attributes unit names*/
-static const std::string PhotonAttributeUnitNames[PhotonID::NphotonAttr] = {
-                                                      UnitNames[Unt::Number],
-                                                      UnitNames[Unt::Number],
-                                                      UnitNames[Unt::Mevc],
-                                                      UnitNames[Unt::Rap],
-                                                      UnitNames[Unt::Rad],
-                                                      UnitNames[Unt::Bitmask],
-                                                      UnitNames[Unt::Bitmask]
-                                                   };
-
-/** This is the list of the Photon TAG attributes group names*/
-static const std::string PhotonAttributeGroupNames[PhotonID::NphotonAttr] = {
-                                                       GroupNames[Grp::PhysicsPhoton],
-                                                       GroupNames[Grp::PhysicsPhoton],
-                                                       GroupNames[Grp::PhysicsPhoton],
-                                                       GroupNames[Grp::PhysicsPhoton],
-                                                       GroupNames[Grp::PhysicsPhoton],
-                                                       GroupNames[Grp::PhysicsPhoton],
-                                                       GroupNames[Grp::PhysicsPhoton]
-                                                   };
-
-#endif
diff --git a/PhysicsAnalysis/EventTag/TagEvent/TagEvent/RawInfoSummaryForTag.h b/PhysicsAnalysis/EventTag/TagEvent/TagEvent/RawInfoSummaryForTag.h
index 0dcb64e4f2c0df5e52bcd9fbb3fffdddcd1e53c4..ad6a3c5436bfa4e056b9c894bacc8e97e7fcca01 100644
--- a/PhysicsAnalysis/EventTag/TagEvent/TagEvent/RawInfoSummaryForTag.h
+++ b/PhysicsAnalysis/EventTag/TagEvent/TagEvent/RawInfoSummaryForTag.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 */
 
 /*
@@ -379,7 +379,7 @@ inline int RawInfoSummaryForTag::getBCMHit() const {return m_BCMHit;}
 inline unsigned int RawInfoSummaryForTag::getMBTSword() const {return m_MBTSword;}
 
 
-# include "AthenaKernel/CLASS_DEF.h"
+#include "AthenaKernel/CLASS_DEF.h"
 CLASS_DEF( RawInfoSummaryForTag , 254867753 , 1 )
 
 
diff --git a/PhysicsAnalysis/EventTag/TagEvent/TagEvent/RawInfoSummaryForTagNames.h b/PhysicsAnalysis/EventTag/TagEvent/TagEvent/RawInfoSummaryForTagNames.h
deleted file mode 100644
index 1686ce515ae6d402647bfd37697ee30d555a1738..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/EventTag/TagEvent/TagEvent/RawInfoSummaryForTagNames.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-#ifndef EVENTTAGALGS_GLOBALEVENTATTRIBUTENAMES_H
-#define EVENTTAGALGS_GLOBALEVENTATTRIBUTENAMES_H
-
-/****************************************
- Author - Ketevi A. Assamagan
- Feb 2006
-****************************************/
-#include "AthenaPoolUtilities/AthenaAttributeSpecification.h"
-#include "GlobalGroupAndUnitNames.h"
-#include <string>
-
-/** list of ALL the RawSummary attributes */
-namespace Raw { 
-
-  static const unsigned int NAttr = 22;    // This is the number of the RawSummary TAG attributes
-  static const unsigned int NFloats = 16;
-}
-
-static const AthenaAttributeSpecification RawSummaryAttributeSpecs[Raw::NAttr] = 
-{
-   AthenaAttributeSpecification("CellEnergySum","float",    GroupNames[Grp::RawSummary],UnitNames[Unt::Mev]),
-   AthenaAttributeSpecification("CellEnergySumEMB","float", GroupNames[Grp::RawSummary],UnitNames[Unt::Mev]),
-   AthenaAttributeSpecification("CellEnergySumEMEC","float",GroupNames[Grp::RawSummary],UnitNames[Unt::Mev]),
-   AthenaAttributeSpecification("CellEnergySumHEC","float", GroupNames[Grp::RawSummary],UnitNames[Unt::Mev]),
-   AthenaAttributeSpecification("CellEnergySumFCAL","float",GroupNames[Grp::RawSummary],UnitNames[Unt::Mev]),
-   AthenaAttributeSpecification("CellEnergySumTile","float",GroupNames[Grp::RawSummary],UnitNames[Unt::Mev]),
-   AthenaAttributeSpecification("ClusterEnergySum","float", GroupNames[Grp::RawSummary],UnitNames[Unt::Mev]),
-   AthenaAttributeSpecification("TopoClusterEt1","float",    GroupNames[Grp::RawSummary],UnitNames[Unt::Number]),
-   AthenaAttributeSpecification("TopoClusterEta1","float",   GroupNames[Grp::RawSummary],UnitNames[Unt::Rap]),
-   AthenaAttributeSpecification("TopoClusterPhi1","float",   GroupNames[Grp::RawSummary],UnitNames[Unt::Rad]),
-   AthenaAttributeSpecification("CellMissingET","float",      GroupNames[Grp::RawSummary],UnitNames[Unt::Mev]),
-   AthenaAttributeSpecification("CellMissingETPhi","float",   GroupNames[Grp::RawSummary],UnitNames[Unt::Rad]),
-   AthenaAttributeSpecification("MBTStimeDiff","float", GroupNames[Grp::RawSummary],UnitNames[Unt::nanosec]),
-   AthenaAttributeSpecification("LArECtimeDiff","float",GroupNames[Grp::RawSummary],UnitNames[Unt::nanosec]),
-   AthenaAttributeSpecification("MBTStimeAvg","float", GroupNames[Grp::RawSummary],UnitNames[Unt::nanosec]),
-   AthenaAttributeSpecification("LArECtimeAvg","float",GroupNames[Grp::RawSummary],UnitNames[Unt::nanosec]),
-   AthenaAttributeSpecification("NSCTSPs","int",  GroupNames[Grp::RawSummary],UnitNames[Unt::Number]),
-   AthenaAttributeSpecification("NPixelSPs","int",  GroupNames[Grp::RawSummary],UnitNames[Unt::Number]),
-   AthenaAttributeSpecification("NTRTDCs","int",  GroupNames[Grp::RawSummary],UnitNames[Unt::Number]),
-   AthenaAttributeSpecification("NTRTHtDCs","int",GroupNames[Grp::RawSummary],UnitNames[Unt::Number]),
-   AthenaAttributeSpecification("NBCMHits","int", GroupNames[Grp::RawSummary],UnitNames[Unt::Number]),
-   AthenaAttributeSpecification("MBTSword","unsigned int",GroupNames[Grp::RawSummary],UnitNames[Unt::Bitmask])
-};
-
-
-#endif
diff --git a/PhysicsAnalysis/EventTag/TagEvent/TagEvent/SUSYPhysAttributeNames.h b/PhysicsAnalysis/EventTag/TagEvent/TagEvent/SUSYPhysAttributeNames.h
deleted file mode 100755
index 7a2fa1fc6a41e920f2167e29dd2cb8103f3d6dd4..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/EventTag/TagEvent/TagEvent/SUSYPhysAttributeNames.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-#ifndef SUSYPHYSATTRIBUTENAMES_H
-#define SUSYPHYSATTRIBUTENAMES_H
-
-/****************************************
- Author - Ketevi A. Assamagan
- Feb 2006
-****************************************/
-#include "GlobalGroupAndUnitNames.h"
-#include <string>
-
-/** list of ALL the SUSY attributes and their types */
-namespace SUSYPhys {
-  static const int NsusyAttr=1;        // This the number of SUSY Phys TAG attributes
-  static const int NumSusyPhys = 1;    // This is the max number of SUSY Phys words in the TAG per some Attributes
-}
-
-/** This is the list of SUSY Phys TAG attributes */
-static const std::string SusyAttributeNames[SUSYPhys::NsusyAttr] = {"SUSYWord"};
-
-/** This is the list of SUSY Phys TAG attributes */
-static const std::string SusyAttributeUnitNames[SUSYPhys::NsusyAttr] = {UnitNames[Unt::Bitmask]};
-
-/** This is the list of SUSY Phys TAG attributes */
-static const std::string SusyAttributeGroupNames[SUSYPhys::NsusyAttr] = {GroupNames[Grp::QualityPhysics]};
-
-#endif
-
-
diff --git a/PhysicsAnalysis/EventTag/TagEvent/TagEvent/StandardModelPhysAttributeNames.h b/PhysicsAnalysis/EventTag/TagEvent/TagEvent/StandardModelPhysAttributeNames.h
deleted file mode 100755
index 063660958e6a0ce8a75e6bc730d8431337f783d1..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/EventTag/TagEvent/TagEvent/StandardModelPhysAttributeNames.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-#ifndef SMPHYSATTRIBUTENAMES_H
-#define SMPHYSATTRIBUTENAMES_H
-
-/****************************************
- Author - Ketevi A. Assamagan
- Feb 2006
-****************************************/
-#include "GlobalGroupAndUnitNames.h"
-#include <string>
-
-/** list of ALL the SM attributes and their types */
-namespace SMPhys {
-  static const int NsmAttr=1;         // This is the number of SM TAG attributes
-  static const int NumSmPhys = 1;     // This is max number of SM words in the TAG per some attributes
-}
-
-/** This is the list of SM TAG attributes */
-static const std::string SmAttributeNames[SMPhys::NsmAttr] = {"SMWord"};
-
-/** This is the list of SM TAG attributes unit names*/
-static const std::string SmAttributeUnitNames[SMPhys::NsmAttr] = {UnitNames[Unt::Bitmask]};
-
-
-/** This is the list of SM TAG attributes group names*/
-static const std::string SmAttributeGroupNames[SMPhys::NsmAttr] = {GroupNames[Grp::QualityPhysics]};
-
-#endif
-
-
diff --git a/PhysicsAnalysis/EventTag/TagEvent/TagEvent/TagFragmentCollection.h b/PhysicsAnalysis/EventTag/TagEvent/TagEvent/TagFragmentCollection.h
deleted file mode 100755
index dcf3f14e1ea01c36428d6749a7ce4872db6c99dd..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/EventTag/TagEvent/TagEvent/TagFragmentCollection.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
-  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
-*/
-
-#ifndef TAGEVENT_TAGFRAGMENTCOLLECTION_H
-#define TAGEVENT_TAGFRAGMENTCOLLECTION_H
-/********************************************************************
-
-NAME:     TagFragmentCollection.h
-Package : offline/PhysicsAnlaysis/EventTag/TagEvent
-
-AUTHOR:   Ketevi A. Assamagan
-CREATED:  January 2006
-
-PURPOSE:  Tag fragment list
-********************************************************************/
-
-#include <string>
-#include <vector>
-#include <map>
-
-class TagFragmentCollection {
-
- public:
-
-  typedef std::pair<std::string, double> DataPair;
-
-  /** constructor - destructor */
-  TagFragmentCollection(){}
-  ~TagFragmentCollection(){ m_attrData.clear(); }
-
-  /** Copy constructor */
-  TagFragmentCollection( const TagFragmentCollection& rhs );
-
-  /** Assignement operator */
-  TagFragmentCollection& operator=( const TagFragmentCollection& rhs );
-
-  /** insert something */
-  void insert(const std::string& name, const double val) {
-     m_attrData.emplace_back( name, val );
-  }
-
-  /** return all attributes */
-  const std::vector<DataPair> & attrData() const { return m_attrData; }
-
- protected:
-  
-  /** Tag data associated with this element */
-  std::vector<DataPair>  m_attrData;
-
-};
-
-#endif
-
-
diff --git a/PhysicsAnalysis/EventTag/TagEvent/TagEvent/TauIdentificationAttributeNames.h b/PhysicsAnalysis/EventTag/TagEvent/TagEvent/TauIdentificationAttributeNames.h
deleted file mode 100755
index 80a10eafa602599e319c74b50fc6bc4248181421..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/EventTag/TagEvent/TagEvent/TauIdentificationAttributeNames.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-#ifndef TAUIDENTIFICATIONATTRIBUTENAMES_H
-#define TAUIDENTIFICATIONATTRIBUTENAMES_H
-
-/****************************************
- Author - Ketevi A. Assamagan
- Feb 2006
-****************************************/
-
-#include "GlobalGroupAndUnitNames.h"
-#include <string>
-
-/** list of ALL the Tau ID attributes and their types */
-namespace TauID {
-  static const int NtauIdAttr=1;  // This is the number of Tau TAG Attributes
-  static const int NumTauID = 1;  // This is the max number if Tau ID words in the TAG per some attributes
-}
-
-/** this is the list of the Tau ID TAG attributes */
-static const std::string TauIdAttributeNames[TauID::NtauIdAttr] = {"TauIdWord"};
-
-/** this is the list of the Tau ID TAG attributes unit names */
-static const std::string TauIdAttributeUnitNames[TauID::NtauIdAttr] = {UnitNames[Unt::Bitmask]};
-
-/** this is the list of the Tau ID TAG attributes group names*/
-static const std::string TauIdAttributeGroupNames[TauID::NtauIdAttr] = {GroupNames[Grp::QualityPhysics]};
-
-#endif
-
-
diff --git a/PhysicsAnalysis/EventTag/TagEvent/TagEvent/TauJetAttributeNames.h b/PhysicsAnalysis/EventTag/TagEvent/TagEvent/TauJetAttributeNames.h
deleted file mode 100755
index 225a62907ee2b1dec6fa17fb2e9fe071140a3048..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/EventTag/TagEvent/TagEvent/TauJetAttributeNames.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-#ifndef TAUJETATTRIBUTENAMES_H
-#define TAUJETATTRIBUTENAMES_H
-
-/****************************************
- Author - Ketevi A. Assamagan
- Feb 2006
-****************************************/
-#include "GlobalGroupAndUnitNames.h"
-#include <string>
-
-/** list of ALL the TauJet attributes and their types */
-
-namespace TauID { 
-  static const int NtauJetAttr=5;   // This is the number of Tau TAG attributes
-  static const int NumTauJet = 4;   // This is the max number of TauJets in the TAG
-  enum { NTau=0, Pt=1, Eta=2, Phi=3, PID=4 }; 
-}
-
-/** This is the list of the TauJet TAG attributes */
-static const std::string TauJetAttributeNames[TauID::NtauJetAttr] = {
-                                                    "NTau",
-                                                    "TauJetPt",     
-                                                    "TauJetEta",
-                                                    "TauJetPhi",
-                                                    "TauJetPID"
-
-                                                  };
-
-/** This is the list of the TauJet TAG attributes unit names*/
-static const std::string TauJetAttributeUnitNames[TauID::NtauJetAttr] = {
-                                               UnitNames[Unt::Number],
-                                               UnitNames[Unt::Mevc],
-                                               UnitNames[Unt::Rap],
-                                               UnitNames[Unt::Rad],
-                                               UnitNames[Unt::Bitmask]
-                                                  };
-
-/** This is the list of the TauJet TAG attributes group names*/
-static const std::string TauJetAttributeGroupNames[TauID::NtauJetAttr] = {
-                                               GroupNames[Grp::PhysicsTau],
-                                               GroupNames[Grp::PhysicsTau],
-                                               GroupNames[Grp::PhysicsTau],
-                                               GroupNames[Grp::PhysicsTau],
-                                               GroupNames[Grp::PhysicsTau]
-                                                  };
-
-#endif
diff --git a/PhysicsAnalysis/EventTag/TagEvent/TagEvent/TopPhysAttributeNames.h b/PhysicsAnalysis/EventTag/TagEvent/TagEvent/TopPhysAttributeNames.h
deleted file mode 100755
index 177184f32f4e91b28ffbaafd5afa7f7b297c1af6..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/EventTag/TagEvent/TagEvent/TopPhysAttributeNames.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-#ifndef TOPPHYSATTRIBUTENAMES_H
-#define TOPPHYSATTRIBUTENAMES_H
-
-/****************************************
- Author - Ketevi A. Assamagan
- Feb 2006
-****************************************/
-
-#include "GlobalGroupAndUnitNames.h"
-#include <string>
-
-/** list of ALL the Top attributes and their types */
-namespace TopPhys {
-  static const int NtopAttr=1;        // This is the number of Top Phys TAG attributes
-  static const int NumTopPhys = 1;    // This is the max number of Top Phys TAG words per some attributes
-}
-
-/** This is the list of the Top Phys TAG attributes */
-static const std::string TopAttributeNames[TopPhys::NtopAttr] = {"TopWord"};
-
-/** This is the list of the Top Phys TAG attributes unit names*/
-static const std::string TopAttributeUnitNames[TopPhys::NtopAttr] = {UnitNames[Unt::Bitmask]};
-
-/** This is the list of the Top Phys TAG attributes group names*/
-static const std::string TopAttributeGroupNames[TopPhys::NtopAttr] = {GroupNames[Grp::QualityPhysics]};
-
-#endif
-
-
diff --git a/PhysicsAnalysis/EventTag/TagEvent/doc/packagedoc.h b/PhysicsAnalysis/EventTag/TagEvent/doc/packagedoc.h
deleted file mode 100644
index 660e960dfb58b5b9dd5b69d1b85f14f24efaf177..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/EventTag/TagEvent/doc/packagedoc.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-/**
-
-@page TagEvent_page TagEvent Package
-
-The package which defines the TAG data classes. It the EDM package for the TAG.
-
-@authors Ketevi Assamagan
-
-This is the EDM package for the TAG. It consists of classes that represent the data objects of the various tag 
-fragments. These tag fragments are to be built by the various tag building tools from the AOD. Then the 
-fragments are aggregated by the tag builder algorithms, which then produce the event TAG. This package 
-consists of the following classes - just 2 EDM classes for everythings:
-
- - TagFragmentCollection (a Tag Fragment is a TAG attribute and its value) for:
-
- - Electron tag fragments and Electron tag fragment Collection. 
- - Photon tag fragments and Photon tag Collection.
- - Muon tag fragments and Muon tag Collection.
- - TauJet tag fragments and TauJet tag Collection.
- - ParticleJet tag fragments and ParticleJet tag Collection.
- - MissingET tag fragments and Collection. 
- - Various detector status words and the Good Run bit.
- - Global event related information, including the time stamp and the streaming criteria and results.
- - Global trigger information: CTP decisions, level 1 passed trigger masks, level 2 passed trigger 
-masks, event filter passed trigger masks, and high level trigger stuff.
- - Analysis specific information: here n (n=1 for now)  words are reserved in the TAG for each combined 
-performance and physics group to encode whatever information they deem necessary. For example, the 
-b-physics group may encode the results of various hypotheses about exclusive processes into their tag word.
-
- - For questions or comments: Ketevi A. Assamagan
-   ketevi@bnl.gov
-
-*/
diff --git a/PhysicsAnalysis/EventTag/TagEvent/src/TagFragmentCollection.cxx b/PhysicsAnalysis/EventTag/TagEvent/src/TagFragmentCollection.cxx
deleted file mode 100755
index 6fd9ac53d94092af0252989ea2b0ae36630a38ca..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/EventTag/TagEvent/src/TagFragmentCollection.cxx
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
-  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
-*/
-
-#include "TagEvent/TagFragmentCollection.h"
-
-/** Copy Constructor */
-TagFragmentCollection::TagFragmentCollection( const TagFragmentCollection& rhs )
-  : m_attrData (rhs.m_attrData)
-{
-}
-
-/** Assignement operator */
-TagFragmentCollection& TagFragmentCollection::operator=( const TagFragmentCollection& rhs ) {
-  if ( this != &rhs ) {
-    m_attrData = rhs.m_attrData;
-  }
-  return *this;
-}
-
-