From e04dcaa031fd3055ea18397474bca6a38faa7d50 Mon Sep 17 00:00:00 2001 From: Frank Winklmeier <frank.winklmeier@cern.ch> Date: Wed, 21 Apr 2021 18:03:24 +0200 Subject: [PATCH] JetD3PDMaker: remove dependency on TriggerD3PDMaker Trigger information in D3PDs is no longer supported. --- .../D3PDMaker/JetD3PDMaker/CMakeLists.txt | 4 +- .../D3PDMaker/JetD3PDMaker/python/JetD3PD.py | 7 +-- .../JetD3PDMaker/python/jetMETD3PDTrigger.py | 38 ------------ .../src/JetEFTriggerObjectAssociationTool.cxx | 37 ------------ .../src/JetEFTriggerObjectAssociationTool.h | 57 ------------------ .../src/JetL1TriggerObjectAssociationTool.cxx | 41 ------------- .../src/JetL1TriggerObjectAssociationTool.h | 56 ----------------- .../src/JetL2TriggerObjectAssociationTool.cxx | 45 -------------- .../src/JetL2TriggerObjectAssociationTool.h | 60 ------------------- .../src/components/JetD3PDMaker_entries.cxx | 6 -- 10 files changed, 3 insertions(+), 348 deletions(-) delete mode 100644 PhysicsAnalysis/D3PDMaker/JetD3PDMaker/python/jetMETD3PDTrigger.py delete mode 100644 PhysicsAnalysis/D3PDMaker/JetD3PDMaker/src/JetEFTriggerObjectAssociationTool.cxx delete mode 100644 PhysicsAnalysis/D3PDMaker/JetD3PDMaker/src/JetEFTriggerObjectAssociationTool.h delete mode 100644 PhysicsAnalysis/D3PDMaker/JetD3PDMaker/src/JetL1TriggerObjectAssociationTool.cxx delete mode 100644 PhysicsAnalysis/D3PDMaker/JetD3PDMaker/src/JetL1TriggerObjectAssociationTool.h delete mode 100644 PhysicsAnalysis/D3PDMaker/JetD3PDMaker/src/JetL2TriggerObjectAssociationTool.cxx delete mode 100644 PhysicsAnalysis/D3PDMaker/JetD3PDMaker/src/JetL2TriggerObjectAssociationTool.h diff --git a/PhysicsAnalysis/D3PDMaker/JetD3PDMaker/CMakeLists.txt b/PhysicsAnalysis/D3PDMaker/JetD3PDMaker/CMakeLists.txt index 987894859e3f..e8ebeab2d428 100644 --- a/PhysicsAnalysis/D3PDMaker/JetD3PDMaker/CMakeLists.txt +++ b/PhysicsAnalysis/D3PDMaker/JetD3PDMaker/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration +# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration # Declare the package name: atlas_subdir( JetD3PDMaker ) @@ -11,7 +11,7 @@ atlas_add_component( JetD3PDMaker src/*.cxx src/components/*.cxx INCLUDE_DIRS ${Boost_INCLUDE_DIRS} - LINK_LIBRARIES ${Boost_LIBRARIES} TrigCaloEvent CaloEvent CaloGeoHelpers CaloIdentifier AthenaBaseComps AthenaKernel Navigation StoreGateLib Identifier EventKernel FourMomUtils GaudiKernel AnalysisTriggerEvent D3PDMakerInterfaces D3PDMakerUtils TriggerD3PDMakerLib JetTagEvent JetTagInfo JetEvent Particle TileConditionsLib TileEvent TileIdentifier VxVertex ) + LINK_LIBRARIES ${Boost_LIBRARIES} TrigCaloEvent CaloEvent CaloGeoHelpers CaloIdentifier AthenaBaseComps AthenaKernel Navigation StoreGateLib Identifier EventKernel FourMomUtils GaudiKernel AnalysisTriggerEvent D3PDMakerInterfaces D3PDMakerUtils JetTagEvent JetTagInfo JetEvent Particle TileConditionsLib TileEvent TileIdentifier VxVertex ) # Install files from the package: atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} ) diff --git a/PhysicsAnalysis/D3PDMaker/JetD3PDMaker/python/JetD3PD.py b/PhysicsAnalysis/D3PDMaker/JetD3PDMaker/python/JetD3PD.py index f7671f3431ab..6f3a2df0fe9f 100644 --- a/PhysicsAnalysis/D3PDMaker/JetD3PDMaker/python/JetD3PD.py +++ b/PhysicsAnalysis/D3PDMaker/JetD3PDMaker/python/JetD3PD.py @@ -1,4 +1,4 @@ -# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration +# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration # Haifeng Li <Haifeng.Li@cern.ch> @@ -8,7 +8,6 @@ from D3PDMakerConfig.D3PDMakerFlags import D3PDMakerFlags from EventCommonD3PDMaker.EventInfoD3PDObject import EventInfoD3PDObject from egammaD3PDMaker.ElectronD3PDObject import ElectronD3PDObject from egammaD3PDMaker.PhotonD3PDObject import PhotonD3PDObject -from JetD3PDMaker.jetMETD3PDTrigger import jetMETTriggerBitsD3PDObject from MuonD3PDMaker.MuonD3PDObject import MuonD3PDObject from JetD3PDMaker.JetD3PDObject import JetD3PDObject from TrackD3PDMaker.xAODVertexD3PDObject import PrimaryxAODVertexD3PDObject @@ -57,10 +56,6 @@ def JetD3PD (file, alg += JetD3PDObject (**_args(level,'AntiKt6H1TopoJets', kw, sgkey='AntiKt6H1TopoJets', prefix='AntiKt6H1Topo_' ) ) - if D3PDMakerFlags.DoTrigger(): - alg += jetMETTriggerBitsD3PDObject(level) - - alg += PrimaryxAODVertexD3PDObject (**_args (1, 'PrimaryVertex', kw, allowMissing = True, sgkey = D3PDMakerFlags.VertexSGKey(), diff --git a/PhysicsAnalysis/D3PDMaker/JetD3PDMaker/python/jetMETD3PDTrigger.py b/PhysicsAnalysis/D3PDMaker/JetD3PDMaker/python/jetMETD3PDTrigger.py deleted file mode 100644 index 546f2b379573..000000000000 --- a/PhysicsAnalysis/D3PDMaker/JetD3PDMaker/python/jetMETD3PDTrigger.py +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration - -import D3PDMakerCoreComps -import TriggerD3PDMaker -from D3PDMakerCoreComps.D3PDObject import D3PDObject - -def makeJetMETTriggerBitsD3PDObject (name, - prefix, - object_name, - getter = None, - sgkey = ''): - - return D3PDMakerCoreComps.VoidObjFillerTool (name, - Prefix = prefix, - ObjectName = object_name - ) -# Create the object type. -jetMETTriggerBitsD3PDObject = D3PDObject (makeJetMETTriggerBitsD3PDObject, - 'jetMETTriggerBitsFiller', - 'jetMETTriggerBitsD3PDObject') - - -###### -# Define blocks. - - -jetMETTriggerBitsD3PDObject.defineBlock (0, 'jetMETBits0', - TriggerD3PDMaker.TriggerBitFillerTool , - Triggers=['EF_J30'] - ) - -jetMETTriggerBitsD3PDObject.defineBlock (1, 'jetMETBits1', - TriggerD3PDMaker.TriggerBitFillerTool , - Triggers=['L1_J5', - 'L1_J10', - 'L1_J15', - ] - ) diff --git a/PhysicsAnalysis/D3PDMaker/JetD3PDMaker/src/JetEFTriggerObjectAssociationTool.cxx b/PhysicsAnalysis/D3PDMaker/JetD3PDMaker/src/JetEFTriggerObjectAssociationTool.cxx deleted file mode 100644 index 5267f73d0dda..000000000000 --- a/PhysicsAnalysis/D3PDMaker/JetD3PDMaker/src/JetEFTriggerObjectAssociationTool.cxx +++ /dev/null @@ -1,37 +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 JetD3PDMaker/src/JetEFTriggerObjectAssociationTool.cxx - * @author Haifeng Li <Haifeng.Li@cern.ch> - * @date Oct, 2010 - * @brief Associate from an Jet to its matching EF trigger object. - */ - - -#include "JetEFTriggerObjectAssociationTool.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. - */ -JetEFTriggerObjectAssociationTool::JetEFTriggerObjectAssociationTool - (const std::string& type, - const std::string& name, - const IInterface* parent) - : Base (type, name, parent) -{ -} - - -} // namespace D3PD diff --git a/PhysicsAnalysis/D3PDMaker/JetD3PDMaker/src/JetEFTriggerObjectAssociationTool.h b/PhysicsAnalysis/D3PDMaker/JetD3PDMaker/src/JetEFTriggerObjectAssociationTool.h deleted file mode 100644 index d92403d2ae8b..000000000000 --- a/PhysicsAnalysis/D3PDMaker/JetD3PDMaker/src/JetEFTriggerObjectAssociationTool.h +++ /dev/null @@ -1,57 +0,0 @@ -// This file's extension implies that it's C, but it's really -*- C++ -*-. - -/* - Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration -*/ - -// $Id$ -/** - * @file JetD3PDMaker/src/JetEFTriggerObjectAssociationTool.h - * @author Haifeng Li <Haifeng.Li@cern.ch> - * @date Oct, 2010 - * @brief Associate from an Jet to its matching EF trigger object. - */ - - -#ifndef JETD3PDMAKER_JETEFTRIGGEROBJECTASSOCIATIONTOOL_H -#define JETD3PDMAKER_JETEFTRIGGEROBJECTASSOCIATIONTOOL_H - - -#include "TriggerD3PDMaker/TriggerObjectAssociationTool.h" - -#include "JetEvent/Jet.h" - - -namespace D3PD { - - -/** - * @brief Associate from an Jet to its matching EF trigger object. - */ -typedef TriggerObjectAssociationTool<Jet,Jet> - JetEFTriggerObjectAssociationToolBase; - -class JetEFTriggerObjectAssociationTool - : public JetEFTriggerObjectAssociationToolBase -{ -public: - typedef JetEFTriggerObjectAssociationToolBase Base; - - - /** - * @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. - */ - JetEFTriggerObjectAssociationTool (const std::string& type, - const std::string& name, - const IInterface* parent); -}; - - -} // namespace D3PD - - - -#endif // not JETD3PDMAKER_JETEFTRIGGEROBJECTASSOCIATIONTOOL_H diff --git a/PhysicsAnalysis/D3PDMaker/JetD3PDMaker/src/JetL1TriggerObjectAssociationTool.cxx b/PhysicsAnalysis/D3PDMaker/JetD3PDMaker/src/JetL1TriggerObjectAssociationTool.cxx deleted file mode 100644 index e114fb1bef08..000000000000 --- a/PhysicsAnalysis/D3PDMaker/JetD3PDMaker/src/JetL1TriggerObjectAssociationTool.cxx +++ /dev/null @@ -1,41 +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 JetD3PDMaker/src/JetL1TriggerObjectAssociationTool.cxx - * @author Haifeng Li <Haifeng.Li@cern.ch> - * @date Oct, 2010 - * @brief Associate from an Jet to its matching L1 trigger object. - */ - - -#include "JetL1TriggerObjectAssociationTool.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. - */ -JetL1TriggerObjectAssociationTool::JetL1TriggerObjectAssociationTool - (const std::string& type, - const std::string& name, - const IInterface* parent) - : Base (type, name, parent) -{ - if (setProperty ("ChainPattern", "L1_J.*").isFailure()) { - REPORT_MESSAGE (MSG::ERROR) << "Can't set ChainPattern property for tool " - << type << "/" << name; - } -} - - -} // namespace D3PD diff --git a/PhysicsAnalysis/D3PDMaker/JetD3PDMaker/src/JetL1TriggerObjectAssociationTool.h b/PhysicsAnalysis/D3PDMaker/JetD3PDMaker/src/JetL1TriggerObjectAssociationTool.h deleted file mode 100644 index 174cedb8012d..000000000000 --- a/PhysicsAnalysis/D3PDMaker/JetD3PDMaker/src/JetL1TriggerObjectAssociationTool.h +++ /dev/null @@ -1,56 +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 JetD3PDMaker/src/JetL1TriggerObjectAssociationTool.h - * @author Haifeng Li <Haifeng.Li@cern.ch> - * @date Oct, 2010 - * @brief Associate from an Jet to its matching L1 trigger object. - */ - - -#ifndef JETD3PDMAKER_JETL1TRIGGEROBJECTASSOCIATIONTOOL_H -#define JETD3PDMAKER_JETL1TRIGGEROBJECTASSOCIATIONTOOL_H - - -#include "TriggerD3PDMaker/TriggerObjectAssociationTool.h" -#include "AnalysisTriggerEvent/Jet_ROI.h" -#include "JetEvent/Jet.h" - -namespace D3PD { - - -/** - * @brief Associate from an Tau to its matching L1 trigger object. - */ -typedef TriggerObjectAssociationTool<Jet, Jet_ROI> - JetL1TriggerObjectAssociationToolBase; - -class JetL1TriggerObjectAssociationTool - : public JetL1TriggerObjectAssociationToolBase -{ -public: - typedef JetL1TriggerObjectAssociationToolBase Base; - - - /** - * @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. - */ - JetL1TriggerObjectAssociationTool (const std::string& type, - const std::string& name, - const IInterface* parent); -}; - - -} // namespace D3PD - - - -#endif // not JETD3PDMAKER_JETL1TRIGGEROBJECTASSOCIATIONTOOL_H diff --git a/PhysicsAnalysis/D3PDMaker/JetD3PDMaker/src/JetL2TriggerObjectAssociationTool.cxx b/PhysicsAnalysis/D3PDMaker/JetD3PDMaker/src/JetL2TriggerObjectAssociationTool.cxx deleted file mode 100644 index 169bb43f35b5..000000000000 --- a/PhysicsAnalysis/D3PDMaker/JetD3PDMaker/src/JetL2TriggerObjectAssociationTool.cxx +++ /dev/null @@ -1,45 +0,0 @@ -// This file's extension implies that it's C, but it's really -*- C++ -*-. - -/* - Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration -*/ - -// $Id$ -/** - * @file JetD3PDMaker/src/JetL2TriggerObjectAssociationTool.cxx - * @author Haifeng Li <Haifeng.Li@cern.ch> - * @date Oct, 2010 - * @brief Associate from an Jet to its matching L2 trigger object. - */ - - -#include "JetL2TriggerObjectAssociationTool.h" -#include "AthenaKernel/BaseInfo.h" - - -SG_ADD_BASE(TrigT2Jet, SG_VIRTUAL(INavigable4Momentum)); - - -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. - */ -JetL2TriggerObjectAssociationTool::JetL2TriggerObjectAssociationTool - (const std::string& type, - const std::string& name, - const IInterface* parent) - : Base (type, name, parent) -{ - if (setProperty ("ChainPattern", "L2_j.*").isFailure()) { - REPORT_MESSAGE (MSG::ERROR) << "Can't set ChainPattern property for tool " - << type << "/" << name; - } -} - - -} // namespace D3PD diff --git a/PhysicsAnalysis/D3PDMaker/JetD3PDMaker/src/JetL2TriggerObjectAssociationTool.h b/PhysicsAnalysis/D3PDMaker/JetD3PDMaker/src/JetL2TriggerObjectAssociationTool.h deleted file mode 100644 index 717cee5ed39f..000000000000 --- a/PhysicsAnalysis/D3PDMaker/JetD3PDMaker/src/JetL2TriggerObjectAssociationTool.h +++ /dev/null @@ -1,60 +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 JetD3PDMaker/src/JetL2TriggerObjectAssociationTool.h - * @author Haifeng Li <Haifeng.Li@cern.ch> - * @date Oct, 2010 - * @brief Associate from an Jet to its matching L2 trigger object. - */ - - -#ifndef JETD3PDMAKER_JETL2TRIGGEROBJECTASSOCIATIONTOOL_H -#define JETD3PDMAKER_JETL2TRIGGEROBJECTASSOCIATIONTOOL_H - - -#include "TriggerD3PDMaker/TriggerObjectAssociationTool.h" -#include "TrigCaloEvent/TrigT2Jet.h" -#include "JetEvent/Jet.h" - - - - - -namespace D3PD { - - -/** - * @brief Associate from an electron to its matching L2 trigger object. - */ -typedef TriggerObjectAssociationTool<Jet, TrigT2Jet> - JetL2TriggerObjectAssociationToolBase; - -class JetL2TriggerObjectAssociationTool - : public JetL2TriggerObjectAssociationToolBase -{ -public: - typedef JetL2TriggerObjectAssociationToolBase Base; - - - /** - * @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. - */ - JetL2TriggerObjectAssociationTool (const std::string& type, - const std::string& name, - const IInterface* parent); -}; - - -} // namespace D3PD - - - -#endif // not JETD3PDMAKER_JETL2TRIGGEROBJECTASSOCIATIONTOOL_H diff --git a/PhysicsAnalysis/D3PDMaker/JetD3PDMaker/src/components/JetD3PDMaker_entries.cxx b/PhysicsAnalysis/D3PDMaker/JetD3PDMaker/src/components/JetD3PDMaker_entries.cxx index 00aef60bb8d1..5cba3834f0d4 100644 --- a/PhysicsAnalysis/D3PDMaker/JetD3PDMaker/src/components/JetD3PDMaker_entries.cxx +++ b/PhysicsAnalysis/D3PDMaker/JetD3PDMaker/src/components/JetD3PDMaker_entries.cxx @@ -16,9 +16,6 @@ //#include "../JetFixupAlg.h" #include "../JetROIWordFillerTool.h" #include "../JetSamplingsFracFillerTool.h" -#include "../JetL1TriggerObjectAssociationTool.h" -#include "../JetL2TriggerObjectAssociationTool.h" -#include "../JetEFTriggerObjectAssociationTool.h" DECLARE_COMPONENT( D3PD::JetBTagWeightFillerTool ) @@ -39,7 +36,4 @@ DECLARE_COMPONENT( JetTileFilterAlg ) //DECLARE_COMPONENT( D3PD::JetFixupAlg ) DECLARE_COMPONENT( D3PD::JetROIWordFillerTool ) DECLARE_COMPONENT( D3PD::JetSamplingsFracFillerTool ) -DECLARE_COMPONENT( D3PD::JetL1TriggerObjectAssociationTool ) -DECLARE_COMPONENT( D3PD::JetL2TriggerObjectAssociationTool ) -DECLARE_COMPONENT( D3PD::JetEFTriggerObjectAssociationTool ) -- GitLab