From 4a7f161e13266fce4706640ff6de880f82d04efc Mon Sep 17 00:00:00 2001
From: Frank Winklmeier <fwinkl@cern>
Date: Tue, 30 Jun 2020 17:22:04 +0200
Subject: [PATCH] TrigEgammaMonitoring: CMake cleanup and enable flake8
---
.../TrigEgammaMonitoring/CMakeLists.txt | 50 ++-----------------
.../python/TrigEgammaMonitoringConfig.py | 4 +-
2 files changed, 8 insertions(+), 46 deletions(-)
diff --git a/Trigger/TrigMonitoring/TrigEgammaMonitoring/CMakeLists.txt b/Trigger/TrigMonitoring/TrigEgammaMonitoring/CMakeLists.txt
index 4c6582517f1..4dceac4efa0 100644
--- a/Trigger/TrigMonitoring/TrigEgammaMonitoring/CMakeLists.txt
+++ b/Trigger/TrigMonitoring/TrigEgammaMonitoring/CMakeLists.txt
@@ -1,61 +1,21 @@
-################################################################################
-# Package: TrigEgammaMonitoring
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( TrigEgammaMonitoring )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Control/AthToolSupport/AsgTools
- Event/xAOD/xAODCaloEvent
- Event/xAOD/xAODEgamma
- Event/xAOD/xAODEventInfo
- Event/xAOD/xAODJet
- Event/xAOD/xAODPrimitives
- Event/xAOD/xAODTracking
- Event/xAOD/xAODTrigCalo
- Event/xAOD/xAODTrigEgamma
- Event/xAOD/xAODTrigRinger
- Event/xAOD/xAODTrigger
- Event/xAOD/xAODTruth
- Event/xAOD/xAODMissingET
- Event/xAOD/xAODCaloRings
- LumiBlock/LumiBlockComps
- PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools
- Reconstruction/RecoTools/RecoToolInterfaces
- Reconstruction/egamma/egammaMVACalib
- Trigger/TrigAnalysis/TrigDecisionTool
- Trigger/TrigAnalysis/TrigEgammaAnalysisTools
- Trigger/TrigAnalysis/TrigEgammaMatchingTool
- Trigger/TrigConfiguration/TrigConfHLTData
- Trigger/TrigEvent/TrigSteeringEvent
- Trigger/TrigMonitoring/TrigHLTMonitoring
- PhysicsAnalysis/AnalysisCommon/PATCore
- PRIVATE
- Control/AthenaBaseComps
- Control/AthenaMonitoring
- Control/StoreGate
- GaudiKernel
- Trigger/TrigConfiguration/TrigConfxAOD )
# External dependencies:
find_package( Boost )
-find_package( ROOT COMPONENTS Core Hist Tree )
-
+# Component(s) in the package:
atlas_add_component( TrigEgammaMonitoring
src/*.h
src/*.cxx
src/components/*.cxx
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} ${Boost_LIBRARIES} AsgTools xAODCaloEvent xAODMissingET xAODEgamma xAODEventInfo xAODJet xAODTracking xAODTrigCalo xAODTrigEgamma xAODTrigRinger xAODCaloRings xAODTrigger xAODTruth LumiBlockCompsLib ElectronPhotonSelectorToolsLib egammaMVACalibLib TrigDecisionToolLib TrigEgammaMatchingToolLib TrigConfHLTData TrigSteeringEvent TrigHLTMonitoringLib AthenaBaseComps AthenaMonitoringLib StoreGateLib SGtests GaudiKernel PATCoreLib TrigEgammaAnalysisToolsLib)
-
-# Install files from the package:
-
-
+ INCLUDE_DIRS ${Boost_INCLUDE_DIRS}
+ LINK_LIBRARIES AthenaMonitoringKernelLib AthenaMonitoringLib EgammaAnalysisInterfacesLib GaudiKernel PATCoreLib StoreGateLib TrigConfxAODLib TrigDecisionToolLib TrigEgammaAnalysisToolsLib TrigEgammaMatchingToolLib xAODEgamma xAODEventInfo xAODJet xAODMissingET xAODTracking xAODTrigCalo xAODTrigEgamma xAODTrigger xAODTruth )
# Install files from the package:
-atlas_install_python_modules( python/*.py )
+atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
atlas_install_joboptions( share/*.py )
diff --git a/Trigger/TrigMonitoring/TrigEgammaMonitoring/python/TrigEgammaMonitoringConfig.py b/Trigger/TrigMonitoring/TrigEgammaMonitoring/python/TrigEgammaMonitoringConfig.py
index cb499a2560b..6ee9f233a0c 100644
--- a/Trigger/TrigMonitoring/TrigEgammaMonitoring/python/TrigEgammaMonitoringConfig.py
+++ b/Trigger/TrigMonitoring/TrigEgammaMonitoring/python/TrigEgammaMonitoringConfig.py
@@ -1,6 +1,6 @@
#! /usr/bin/env python
-# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# -*- coding: utf-8 -*-
# vim:fenc=utf-8
#
@@ -14,6 +14,8 @@
# Provide all triggers to be monitored
# Provide list of categories and shifter plots
+# flake8: noqa (obsolete code)
+
# Provide function that is called by HLTMonitoring
# Returns the name of tool in ToolSvc
def TrigEgammaMonitoringTool(**kwargs):
--
GitLab