diff --git a/PhysicsAnalysis/PhysicsValidation/PhysValMonitoring/CMakeLists.txt b/PhysicsAnalysis/PhysicsValidation/PhysValMonitoring/CMakeLists.txt
index fbaa4c753918567a716d605aae683e74a64c82ad..7a0c27fb167f1d24a0a523a511378495d0e0cde8 100644
--- a/PhysicsAnalysis/PhysicsValidation/PhysValMonitoring/CMakeLists.txt
+++ b/PhysicsAnalysis/PhysicsValidation/PhysValMonitoring/CMakeLists.txt
@@ -1,28 +1,8 @@
-################################################################################
-# Package: PhysValMonitoring
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( PhysValMonitoring )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- GaudiKernel
- PRIVATE
- Control/AthenaBaseComps
- Control/AthenaMonitoring
- Event/xAOD/xAODBTagging
- Event/xAOD/xAODBase
- Event/xAOD/xAODEgamma
- Event/xAOD/xAODEventInfo
- Event/xAOD/xAODJet
- Event/xAOD/xAODMissingET
- Event/xAOD/xAODMuon
- Event/xAOD/xAODTau
- Event/xAOD/xAODTracking
- Reconstruction/RecEvent
- Tracking/TrkValidation/TrkValHistUtils )
-
# External dependencies:
find_package( CLHEP )
find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
@@ -36,5 +16,4 @@ atlas_add_component( PhysValMonitoring
# Install files from the package:
atlas_install_joboptions( share/*.py )
-atlas_install_python_modules( python/*.py )
-
+atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
diff --git a/PhysicsAnalysis/PhysicsValidation/PhysValMonitoring/python/PhysValUtils.py b/PhysicsAnalysis/PhysicsValidation/PhysValMonitoring/python/PhysValUtils.py
index ab40a0e50a61456a20e7337d1e92d817b2468fa6..a0be1eb29fe1cea72b1a3fc64cb4c31bab5a52aa 100644
--- a/PhysicsAnalysis/PhysicsValidation/PhysValMonitoring/python/PhysValUtils.py
+++ b/PhysicsAnalysis/PhysicsValidation/PhysValMonitoring/python/PhysValUtils.py
@@ -1,3 +1,4 @@
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Defining a python module with helpers for Physics Validation
from AthenaCommon.Logging import logging
@@ -38,7 +39,7 @@ def addPhysValAODContent(algseq,doJets,doTopoCluster):
Timer=0 # No timing information
)
- from JetRec.JetRecConf import JetAlgorithm
+ from JetRec.JetRecConf import JetAlgorithm # noqa: F401
algseq += CfgMgr.JetAlgorithm("jetalgPhysVal",Tools=[jtm.jetrun_PhysVal])
logger.info( '****************** Done *****************' )
diff --git a/PhysicsAnalysis/PhysicsValidation/VKalVrtValidation/CMakeLists.txt b/PhysicsAnalysis/PhysicsValidation/VKalVrtValidation/CMakeLists.txt
index bb8b5fa9833d4515c57e8c51fa5b48aeffc936f4..99eba905457a969b768ae8b6bc6a9e94346f65f3 100644
--- a/PhysicsAnalysis/PhysicsValidation/VKalVrtValidation/CMakeLists.txt
+++ b/PhysicsAnalysis/PhysicsValidation/VKalVrtValidation/CMakeLists.txt
@@ -1,43 +1,16 @@
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+
# The name of the package:
atlas_subdir( VKalVrtValidation )
-# Extra dependencies, based on the build environment:
-set( extra_deps )
-if( NOT XAOD_STANDALONE )
- set( extra_deps Control/AthenaBaseComps Control/AthAnalysisBaseComps GaudiKernel )
-endif()
-
-# The dependencies of the package:
-atlas_depends_on_subdirs(
- PUBLIC
- PRIVATE
- Event/xAOD/xAODEventInfo
- PhysicsAnalysis/JpsiUpsilonTools
- Tracking/TrkVertexFitter/TrkVKalVrtFitter
- ${extra_deps} )
-
# Externals used by the package:
find_package( ROOT COMPONENTS Core )
-find_package( HepPDT )
-
# Libraries in the package:
-atlas_add_library( VKalVrtValidationLib
- VKalVrtValidation/*.h src/*.cxx
- NO_PUBLIC_HEADERS
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- INCLUDE_DIRS ${HEPPDT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} xAODBase AthenaBaseComps AthAnalysisBaseCompsLib xAODTracking JpsiUpsilonToolsLib
- )
-
-if( NOT XAOD_STANDALONE )
- atlas_add_component( VKalVrtValidation
- src/components/*.cxx
- LINK_LIBRARIES VKalVrtValidationLib )
-endif()
-
+atlas_add_component( VKalVrtValidation
+ src/*.cxx src/components/*.cxx
+ INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
+ LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaBaseComps JpsiUpsilonToolsLib TrkVKalVrtFitterLib xAODTracking )
# Install files from the package:
atlas_install_joboptions( share/*.py )
-
-
diff --git a/PhysicsAnalysis/StandardModelPhys/Validation/ZeeValidation/CMakeLists.txt b/PhysicsAnalysis/StandardModelPhys/Validation/ZeeValidation/CMakeLists.txt
index c82d24392255c9e1156bc436e682bc0ddb76b79e..141cc8e2909274264d1139d71e83f49c85379ee1 100644
--- a/PhysicsAnalysis/StandardModelPhys/Validation/ZeeValidation/CMakeLists.txt
+++ b/PhysicsAnalysis/StandardModelPhys/Validation/ZeeValidation/CMakeLists.txt
@@ -1,24 +1,8 @@
-################################################################################
-# Package: ZeeValidation
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( ZeeValidation )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Control/AthenaMonitoring
- Event/xAOD/xAODBase
- Event/xAOD/xAODEgamma
- Event/xAOD/xAODEventInfo
- Event/xAOD/xAODTracking
- Event/xAOD/xAODTruth
- GaudiKernel
- Tracking/TrkValidation/TrkValHistUtils
- PRIVATE
- Control/AthenaBaseComps
- Event/xAOD/xAODPrimitives )
-
# External dependencies:
find_package( CLHEP )
find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
@@ -29,7 +13,3 @@ atlas_add_component( ZeeValidation
src/components/*.cxx
INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} AthenaMonitoringLib xAODBase xAODEgamma xAODEventInfo xAODTracking xAODTruth GaudiKernel TrkValHistUtils AthenaBaseComps xAODPrimitives )
-
-# Install files from the package:
-atlas_install_headers( ZeeValidation )
-
diff --git a/PhysicsAnalysis/TopPhys/TopPhysValMonitoring/CMakeLists.txt b/PhysicsAnalysis/TopPhys/TopPhysValMonitoring/CMakeLists.txt
index e06692b04d342e8e5b0903902fac13e2d03fa3c7..1eec689ceaf36b4e4bc16b7ddaa3241d46621860 100644
--- a/PhysicsAnalysis/TopPhys/TopPhysValMonitoring/CMakeLists.txt
+++ b/PhysicsAnalysis/TopPhys/TopPhysValMonitoring/CMakeLists.txt
@@ -1,23 +1,8 @@
-################################################################################
-# Package: TopPhysValMonitoring
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( TopPhysValMonitoring )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Control/AthenaMonitoring
- Event/xAOD/xAODCaloEvent
- Event/xAOD/xAODEgamma
- Event/xAOD/xAODJet
- Event/xAOD/xAODMissingET
- Event/xAOD/xAODMuon
- Event/xAOD/xAODTau
- GaudiKernel
- PRIVATE
- Control/AthenaBaseComps )
-
# External dependencies:
find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
@@ -27,7 +12,3 @@ atlas_add_component( TopPhysValMonitoring
src/components/*.cxx
INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaMonitoringLib xAODCaloEvent xAODEgamma xAODJet xAODMissingET xAODMuon xAODTau GaudiKernel AthenaBaseComps )
-
-# Install files from the package:
-atlas_install_headers( TopPhysValMonitoring )
-
diff --git a/PhysicsAnalysis/UpgradePhys/SmearingFunctions/UpgradePerformanceFunctions/CMakeLists.txt b/PhysicsAnalysis/UpgradePhys/SmearingFunctions/UpgradePerformanceFunctions/CMakeLists.txt
index d0f81ab970926607b6152a56215859e4edd25216..56a0b439f88743561ae1892a17cddcf10eadf6bd 100644
--- a/PhysicsAnalysis/UpgradePhys/SmearingFunctions/UpgradePerformanceFunctions/CMakeLists.txt
+++ b/PhysicsAnalysis/UpgradePhys/SmearingFunctions/UpgradePerformanceFunctions/CMakeLists.txt
@@ -1,11 +1,7 @@
-# Auto-generated on: 2017-03-09 14:53:36.740759
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the name of this package:
-atlas_subdir( UpgradePerformanceFunctions None )
-
-# This package depends on other packages:
-atlas_depends_on_subdirs( PUBLIC
- PathResolver )
+atlas_subdir( UpgradePerformanceFunctions )
# This package uses ROOT:
find_package( ROOT REQUIRED COMPONENTS Core Gpad Tree Hist RIO MathCore Graf Physics )
@@ -30,11 +26,9 @@ atlas_install_data( share/* )
# Build the executables of the package:
atlas_add_executable( plotPerformanceFunctions
util/plotPerformanceFunctions.cxx
- LINK_LIBRARIES PathResolver
- ${ROOT_LIBRARIES}
+ LINK_LIBRARIES ${ROOT_LIBRARIES}
UpgradePerformanceFunctions )
atlas_add_executable( testPerformanceFunctions
util/testPerformanceFunctions.cxx
- LINK_LIBRARIES PathResolver
- ${ROOT_LIBRARIES}
+ LINK_LIBRARIES ${ROOT_LIBRARIES}
UpgradePerformanceFunctions )