From 6f804bcfd5c2ff3908978b057ad400fb7cfd42ce Mon Sep 17 00:00:00 2001
From: Frank Winklmeier <fwinkl@cern>
Date: Wed, 2 Dec 2020 11:59:29 +0100
Subject: [PATCH] CaloD3PDMaker: remove unused [MBTS,ZDC]TriggerBitsD3PDObject
Remove these unused classes and dependency on TriggerD3PDMaker.
---
.../python/MBTSTriggerBitsD3PDObject.py | 19 -------------------
.../python/ZDCTriggerBitsD3PDObject.py | 17 -----------------
.../D3PDMakerConfig/python/egammaD3PD.py | 4 ----
3 files changed, 40 deletions(-)
delete mode 100644 PhysicsAnalysis/D3PDMaker/CaloD3PDMaker/python/MBTSTriggerBitsD3PDObject.py
delete mode 100644 PhysicsAnalysis/D3PDMaker/CaloD3PDMaker/python/ZDCTriggerBitsD3PDObject.py
diff --git a/PhysicsAnalysis/D3PDMaker/CaloD3PDMaker/python/MBTSTriggerBitsD3PDObject.py b/PhysicsAnalysis/D3PDMaker/CaloD3PDMaker/python/MBTSTriggerBitsD3PDObject.py
deleted file mode 100644
index a7ff4de17e7..00000000000
--- a/PhysicsAnalysis/D3PDMaker/CaloD3PDMaker/python/MBTSTriggerBitsD3PDObject.py
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-
-# $Id$
-#
-# @file CaloD3PDMaker/python/MBTSTriggerBitsD3PDObject.py
-# @author scott snyder <snyder@bnl.gov>
-# @date Mar, 2010
-# @brief MBTS trigger bits.
-#
-
-import TriggerD3PDMaker
-from D3PDMakerCoreComps.D3PDObject import make_Void_D3PDObject
-
-MBTSTriggerBitsD3PDObject = \
- make_Void_D3PDObject (default_object_name = 'MBTSTriggerBitsD3PDObject', default_name = 'MBTSTriggerBits')
-MBTSTriggerBitsD3PDObject.defineBlock (0, 'MBTSTriggerBits',
- TriggerD3PDMaker.TriggerBitFillerTool,
- Triggers = ['L1_MBTS_.*'])
-
diff --git a/PhysicsAnalysis/D3PDMaker/CaloD3PDMaker/python/ZDCTriggerBitsD3PDObject.py b/PhysicsAnalysis/D3PDMaker/CaloD3PDMaker/python/ZDCTriggerBitsD3PDObject.py
deleted file mode 100644
index b7f8b9e88df..00000000000
--- a/PhysicsAnalysis/D3PDMaker/CaloD3PDMaker/python/ZDCTriggerBitsD3PDObject.py
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-
-# $Id$
-#
-# @file CaloD3PDMaker/python/ZDCTriggerBitsD3PDObject.py
-# @author scott snyder <snyder@bnl.gov>
-# @date Aug, 2010
-# @brief ZDC trigger bits.
-#
-
-
-from TriggerD3PDMaker.defineTriggerBits import defineTriggerBits
-from D3PDMakerCoreComps.D3PDObject import make_Void_D3PDObject
-
-ZDCTriggerBitsD3PDObject = \
- make_Void_D3PDObject (default_object_name = 'ZDCTriggerBitsD3PDObject', default_name = 'ZDCTriggerBits')
-defineTriggerBits (ZDCTriggerBitsD3PDObject, 0, 'L1_ZDC')
diff --git a/PhysicsAnalysis/D3PDMaker/D3PDMakerConfig/python/egammaD3PD.py b/PhysicsAnalysis/D3PDMaker/D3PDMakerConfig/python/egammaD3PD.py
index 6e7856d4859..29bf2a9878c 100644
--- a/PhysicsAnalysis/D3PDMaker/D3PDMakerConfig/python/egammaD3PD.py
+++ b/PhysicsAnalysis/D3PDMaker/D3PDMakerConfig/python/egammaD3PD.py
@@ -16,8 +16,6 @@ from MuonD3PDMaker.MuonD3PDObject import MuonD3PDObject
from JetD3PDMaker.JetD3PDObject import JetD3PDObject
from CaloD3PDMaker.MBTSD3PDObject import MBTSD3PDObject
from CaloD3PDMaker.MBTSTimeD3PDObject import MBTSTimeD3PDObject
-# from CaloD3PDMaker.MBTSTriggerBitsD3PDObject import MBTSTriggerBitsD3PDObject
-# from CaloD3PDMaker.ZDCTriggerBitsD3PDObject import ZDCTriggerBitsD3PDObject
from CaloD3PDMaker.LArCollisionTimeD3PDObject import LArCollisionTimeD3PDObject
from CaloD3PDMaker.CollisionDecisionD3PDObject import CollisionDecisionD3PDObject
from MissingETD3PDMaker.MissingETD3PDObject import MissingETD3PDObject
@@ -293,8 +291,6 @@ def egammaD3PD (alg = None,
'DQMoments']))
alg += MBTSD3PDObject (**_args (level, 'MBTS', kw))
alg += MBTSTimeD3PDObject (**_args (level, 'MBTSTime', kw))
- # alg += MBTSTriggerBitsD3PDObject (**_args (level, 'MBTSTriggerBits', kw))
- # alg += ZDCTriggerBitsD3PDObject (**_args (level, 'ZDCTriggerBits', kw))
alg += CollisionDecisionD3PDObject(**_args (level, 'CollisionDecision', kw))
alg += MissingETD3PDObject (**_args (level, 'MissingET', kw,
sgkey = 'MET_Core_AntiKt4EMTopo',
--
GitLab