diff --git a/PhysicsAnalysis/TruthParticleID/McParticleAlgs/CMakeLists.txt b/PhysicsAnalysis/TruthParticleID/McParticleAlgs/CMakeLists.txt
index b5ee2298e2c3360878dac44622e1b991e5ead3e2..436756877607eb4d4cc8fa4b1e97d1da69a289a8 100644
--- a/PhysicsAnalysis/TruthParticleID/McParticleAlgs/CMakeLists.txt
+++ b/PhysicsAnalysis/TruthParticleID/McParticleAlgs/CMakeLists.txt
@@ -1,21 +1,8 @@
-################################################################################
-# Package: McParticleAlgs
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( McParticleAlgs )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- GaudiKernel
- PRIVATE
- Control/AthenaBaseComps
- Control/StoreGate
- Event/NavFourMom
- PhysicsAnalysis/TruthParticleID/McParticleEvent
- PhysicsAnalysis/TruthParticleID/McParticleKernel
- PhysicsAnalysis/TruthParticleID/McParticleUtils )
-
# External dependencies:
find_package( CLHEP )
@@ -24,9 +11,9 @@ atlas_add_component( McParticleAlgs
src/*.cxx
src/components/*.cxx
INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS}
- LINK_LIBRARIES ${CLHEP_LIBRARIES} GaudiKernel AthenaBaseComps StoreGateLib SGtests NavFourMom McParticleEvent McParticleKernel McParticleUtils )
+ LINK_LIBRARIES ${CLHEP_LIBRARIES} GaudiKernel AthenaBaseComps NavFourMom McParticleEvent McParticleKernel McParticleUtils )
# 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/PhysicsAnalysis/TruthParticleID/McParticleAlgs/python/JobOptCfg.py b/PhysicsAnalysis/TruthParticleID/McParticleAlgs/python/JobOptCfg.py
index 5810f1dffa24d6e16d2955a1894fc7257719c21b..555c5381cd05a7f43967597dd3dca14014ce96a3 100755
--- a/PhysicsAnalysis/TruthParticleID/McParticleAlgs/python/JobOptCfg.py
+++ b/PhysicsAnalysis/TruthParticleID/McParticleAlgs/python/JobOptCfg.py
@@ -7,9 +7,8 @@ __doc__ = "hold a set of customized configurables and factory functions"
__author__ = "Sebastien Binet <binet@cern.ch>"
__version__= "$Revision: 1.14 $"
-import EventKernel.ParticleDataType
from .McParticleAlgsConf import TruthParticleBuilder
-
+from AthenaCommon import CfgMgr
class PileUpClassification(object):
# same order as in McParticleEvent/PileUpClassification.h # PLEASE keep in sync with this header !!
@@ -52,7 +51,6 @@ class McAodBuilder( TruthParticleBuilder ):
return
from .McAodFlags import jobproperties as jp
- from AthenaCommon.AppMgr import ToolSvc
from AthenaCommon.Configurable import Configurable
if not hasattr(hdl, 'FilterTool'):
@@ -108,7 +106,6 @@ def createMcAodBuilder( name = "McAodBuilder",
Factory function to create a fully and correctly configured customized
TruthParticleBuilder algorithm
"""
- from AthenaCommon import CfgMgr
if doTruthEtIsolations is None:
from .McAodFlags import jobproperties as jp
doTruthEtIsolations = jp.McAodFlags.doTruthEtIsolations()
@@ -224,7 +221,7 @@ class TruthParticleContainerGetter(Configured):
)
self._seq += builder
mlog = logging.getLogger( self.__class__.__name__)
- mlog.info(" Recorded the %s ESD TruthParticle shadow collection - will be recreated on the fly "%(self.outputKey(),))
+ mlog.info("Recorded the %s ESD TruthParticle shadow collection - will be recreated on the fly", self.outputKey())
objKeyStore.addStreamESD("TruthParticleContainer",self.outputKey())
return True
diff --git a/PhysicsAnalysis/TruthParticleID/McParticleAlgs/python/ReOrderMcEventCollection.py b/PhysicsAnalysis/TruthParticleID/McParticleAlgs/python/ReOrderMcEventCollection.py
index 597bb043272c0e7cf09ad7c2e85f563aec8aafa6..c5e138f0a4ab0f0d406768076ac1662c77ad9ba9 100644
--- a/PhysicsAnalysis/TruthParticleID/McParticleAlgs/python/ReOrderMcEventCollection.py
+++ b/PhysicsAnalysis/TruthParticleID/McParticleAlgs/python/ReOrderMcEventCollection.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# @file: McParticleAlgs/python/FixMcEventCollection.py
# @purpose: <put some purpose here>
@@ -11,7 +11,6 @@ IMPORTANT : this alg must be run before any other algs invoking TruthParticleCnv
__version__ = '$Revision: 1.5 $'
__author__ = 'P-A Delsart'
-import AthenaCommon.SystemOfUnits as Units
import AthenaPython.PyAthena as PyAthena
from AthenaPython.PyAthena import StatusCode
diff --git a/PhysicsAnalysis/TruthParticleID/McParticleAlgs/python/tests.py b/PhysicsAnalysis/TruthParticleID/McParticleAlgs/python/tests.py
index a5cb796537ed83a238166deaff2b1794ac061c52..aaa43a54af64dd1cb3837e4742891377ab26a289 100755
--- a/PhysicsAnalysis/TruthParticleID/McParticleAlgs/python/tests.py
+++ b/PhysicsAnalysis/TruthParticleID/McParticleAlgs/python/tests.py
@@ -1,11 +1,8 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
from McParticleTools.McParticleToolsConf import EtaPtFilterTool
-from McParticleTools.McParticleToolsConf import OldSpclMcFilterTool
-from McParticleTools.McParticleToolsConf import NoopFilterTool
from McParticleTools.McParticleToolsConf import TruthParticleCnvTool
-from McParticleTools.McParticleToolsConf import TruthIsolationTool
from McParticleAlgs.McParticleAlgsConf import TruthParticleBuilder
class test_McAodBuilder( TruthParticleBuilder ):
@@ -43,7 +40,6 @@ class test_McAodBuilder( TruthParticleBuilder ):
pass # test_McAodBuilder
from McParticleTools.McParticleToolsConf import GenAodValidationTool
-from McParticleTools.McParticleToolsConf import SpclMcValidationTool
from McParticleTools.McParticleToolsConf import HepMcWriterTool
from McParticleAlgs.McParticleAlgsConf import McAodValidationAlg
@@ -75,7 +71,6 @@ class test_McAodValidation( McAodValidationAlg ):
pass # test_McAodValidation
from McParticleTools.McParticleToolsConf import McVtxFilterTool
-from McParticleTools.McParticleToolsConf import TruthParticleCnvTool
from McParticleAlgs.McParticleAlgsConf import McAodFilter
class test_McAodFilter( McAodFilter ):
diff --git a/PhysicsAnalysis/TruthParticleID/McParticleEvent/CMakeLists.txt b/PhysicsAnalysis/TruthParticleID/McParticleEvent/CMakeLists.txt
index 6eec381c1da591730d62e4619c64cea25f62c10f..2d37ad407456c9b9ac786960ee577c009addaffd 100644
--- a/PhysicsAnalysis/TruthParticleID/McParticleEvent/CMakeLists.txt
+++ b/PhysicsAnalysis/TruthParticleID/McParticleEvent/CMakeLists.txt
@@ -1,27 +1,8 @@
-################################################################################
-# Package: McParticleEvent
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( McParticleEvent )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs(
- PUBLIC
- Control/AthenaKernel
- Control/AthContainers
- Control/AthLinks
- Control/Navigation
- Event/EventKernel
- Event/NavFourMom
- Generators/GeneratorObjects
- PhysicsAnalysis/AnalysisCommon/ParticleEvent
- Tracking/TrkEvent/VxVertex
- Generators/AtlasHepMC
- PRIVATE
- AtlasTest/TestTools
- GaudiKernel )
-
# External dependencies:
find_package( Boost )
find_package( CLHEP )
@@ -32,9 +13,8 @@ atlas_add_library( McParticleEvent
PUBLIC_HEADERS McParticleEvent
INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS}
PRIVATE_INCLUDE_DIRS ${Boost_INCLUDE_DIRS}
- LINK_LIBRARIES ${CLHEP_LIBRARIES} AtlasHepMCLib AthenaKernel AthContainers AthLinks Navigation
- EventKernel NavFourMom GeneratorObjects ParticleEvent VxVertex
- PRIVATE_LINK_LIBRARIES ${Boost_LIBRARIES} )
+ LINK_LIBRARIES ${Boost_LIBRARIES} ${CLHEP_LIBRARIES} AtlasHepMCLib AthenaKernel AthContainers AthLinks Navigation
+ EventKernel NavFourMom GeneratorObjects ParticleEvent VxVertex )
atlas_add_dictionary( McParticleEventDict
McParticleEvent/McParticleEventDict.h McParticleEvent/selection.xml
@@ -52,8 +32,8 @@ atlas_add_test( TruthParticle_test
SOURCES test/TruthParticle_test.cxx
INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS}
LINK_LIBRARIES ${CLHEP_LIBRARIES} AtlasHepMCLib GeneratorObjects
- TestTools GaudiKernel McParticleEvent
+ StoreGateLib TestTools GaudiKernel McParticleEvent
ENVIRONMENT "JOBOPTSEARCHPATH=${_jobOPath}" )
# Install files from the package:
-atlas_install_python_modules( python/*.py )
+atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
diff --git a/PhysicsAnalysis/TruthParticleID/McParticleEventAthenaPool/CMakeLists.txt b/PhysicsAnalysis/TruthParticleID/McParticleEventAthenaPool/CMakeLists.txt
index d0a710d1f3ed1e8a522a51283c9f52983579bf10..5ab4db3f3adf5dcead5fb1cd1da667fb35ac9779 100644
--- a/PhysicsAnalysis/TruthParticleID/McParticleEventAthenaPool/CMakeLists.txt
+++ b/PhysicsAnalysis/TruthParticleID/McParticleEventAthenaPool/CMakeLists.txt
@@ -1,23 +1,10 @@
-################################################################################
-# Package: McParticleEventAthenaPool
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( McParticleEventAthenaPool )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Database/AthenaPOOL/AthenaPoolUtilities
- GaudiKernel
- PRIVATE
- Control/StoreGate
- Database/AthenaPOOL/AthenaPoolCnvSvc
- PhysicsAnalysis/TruthParticleID/McParticleEvent
- PhysicsAnalysis/TruthParticleID/McParticleEventTPCnv
- PhysicsAnalysis/TruthParticleID/McParticleKernel )
-
# Component(s) in the package:
atlas_add_poolcnv_library( McParticleEventAthenaPoolPoolCnv
src/*.cxx
FILES McParticleEvent/TruthParticleContainer.h McParticleEvent/TruthEtIsolationsContainer.h
- LINK_LIBRARIES AthenaPoolUtilities GaudiKernel StoreGateLib SGtests AthenaPoolCnvSvcLib McParticleEvent McParticleEventTPCnv McParticleKernel )
+ LINK_LIBRARIES GaudiKernel StoreGateLib AthenaPoolCnvSvcLib McParticleEvent McParticleEventTPCnv McParticleKernel )
diff --git a/PhysicsAnalysis/TruthParticleID/McParticleEventTPCnv/CMakeLists.txt b/PhysicsAnalysis/TruthParticleID/McParticleEventTPCnv/CMakeLists.txt
index bd3a2df0c858bda355648237ccde6f651509eb3d..d4639ee915896b336aa2f9ac9d4ae7aa446f7b0b 100644
--- a/PhysicsAnalysis/TruthParticleID/McParticleEventTPCnv/CMakeLists.txt
+++ b/PhysicsAnalysis/TruthParticleID/McParticleEventTPCnv/CMakeLists.txt
@@ -1,56 +1,39 @@
-################################################################################
-# Package: McParticleEventTPCnv
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( McParticleEventTPCnv )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Control/DataModelAthenaPool
- Database/AthenaPOOL/AthenaPoolCnvSvc
- GaudiKernel
- PhysicsAnalysis/TruthParticleID/McParticleEvent
- PRIVATE
- AtlasTest/TestTools
- Control/AthenaKernel
- Control/SGTools
- Control/StoreGate
- Generators/GeneratorObjects
- Generators/AtlasHepMC
- PhysicsAnalysis/TruthParticleID/McParticleKernel )
-
# External dependencies:
-find_package( Boost COMPONENTS filesystem thread system )
-find_package( CLHEP )
+find_package( Boost )
find_package( ROOT COMPONENTS EG Core Tree MathCore Hist RIO pthread )
# Component(s) in the package:
atlas_add_tpcnv_library( McParticleEventTPCnv
src/*.cxx
PUBLIC_HEADERS McParticleEventTPCnv
- INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
- PRIVATE_INCLUDE_DIRS
- DEFINITIONS ${CLHEP_DEFINITIONS}
- LINK_LIBRARIES ${Boost_LIBRARIES} ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} AtlasHepMCLib DataModelAthenaPoolLib AthenaPoolCnvSvcLib GaudiKernel McParticleEvent AthenaKernel StoreGateLib SGtests GeneratorObjects McParticleKernel )
+ INCLUDE_DIRS ${Boost_INCLUDE_DIRS}
+ PRIVATE_INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
+ LINK_LIBRARIES LINK_LIBRARIES ${Boost_LIBRARIES} AthenaPoolCnvSvcLib DataModelAthenaPoolLib GeneratorObjects McParticleEvent McParticleKernel
+ PRIVATE_LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaKernel AtlasHepMCLib GaudiKernel )
atlas_add_dictionary( McParticleEventTPCnvDict
McParticleEventTPCnv/McParticleEventTPCnvDict.h
McParticleEventTPCnv/selection.xml
- INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
- LINK_LIBRARIES ${Boost_LIBRARIES} ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} AtlasHepMCLib DataModelAthenaPoolLib AthenaPoolCnvSvcLib GaudiKernel McParticleEvent AthenaKernel StoreGateLib SGtests GeneratorObjects McParticleKernel McParticleEventTPCnv )
+ LINK_LIBRARIES McParticleEventTPCnv )
+# Tests in the package:
atlas_add_test( TruthParticleContainerCnv_p5_test
SOURCES
test/TruthParticleContainerCnv_p5_test.cxx
- LINK_LIBRARIES McParticleEventTPCnv SGTools TestTools )
+ LINK_LIBRARIES AthenaKernel AthenaPoolCnvSvcLib DataModelAthenaPoolLib GaudiKernel GeneratorObjects McParticleEvent McParticleEventTPCnv SGTools TestTools )
atlas_add_test( TruthParticleContainerCnv_p6_test
SOURCES
test/TruthParticleContainerCnv_p6_test.cxx
- LINK_LIBRARIES McParticleEventTPCnv SGTools TestTools )
+ LINK_LIBRARIES AthenaKernel AthenaPoolCnvSvcLib DataModelAthenaPoolLib GaudiKernel GeneratorObjects McParticleEvent McParticleEventTPCnv SGTools TestTools )
atlas_add_test( TruthEtIsolationsCnv_p1_test
SOURCES
test/TruthEtIsolationsCnv_p1_test.cxx
- LINK_LIBRARIES McParticleEventTPCnv SGTools TestTools )
+ INCLUDE_DIRS ${Boost_INCLUDE_DIRS}
+ LINK_LIBRARIES ${Boost_LIBRARIES} AthenaPoolCnvSvcLib DataModelAthenaPoolLib GaudiKernel GeneratorObjects McParticleEvent McParticleEventTPCnv SGTools TestTools )
diff --git a/PhysicsAnalysis/TruthParticleID/McParticleKernel/CMakeLists.txt b/PhysicsAnalysis/TruthParticleID/McParticleKernel/CMakeLists.txt
index 9ef64aa501d5ab1dc70e8640a4d60354136dc9d5..42ae20c63b685ce8503a9578a657037e21e2e481 100644
--- a/PhysicsAnalysis/TruthParticleID/McParticleKernel/CMakeLists.txt
+++ b/PhysicsAnalysis/TruthParticleID/McParticleKernel/CMakeLists.txt
@@ -1,15 +1,8 @@
-################################################################################
-# Package: McParticleKernel
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( McParticleKernel )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Generators/AtlasHepMC
- GaudiKernel )
-
# Component(s) in the package:
atlas_add_library( McParticleKernel
src/*.cxx
diff --git a/PhysicsAnalysis/TruthParticleID/McParticleTests/CMakeLists.txt b/PhysicsAnalysis/TruthParticleID/McParticleTests/CMakeLists.txt
index fa7a6f28a6bdfd1ced3a86a8e881d05cc95a16df..c11772664efb44d162a1d3f186939545324389e1 100644
--- a/PhysicsAnalysis/TruthParticleID/McParticleTests/CMakeLists.txt
+++ b/PhysicsAnalysis/TruthParticleID/McParticleTests/CMakeLists.txt
@@ -1,25 +1,8 @@
-################################################################################
-# Package: McParticleTests
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( McParticleTests )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PRIVATE
- Control/AthenaBaseComps
- Control/AthenaPython
- Control/StoreGate
- Event/EventKernel
- Event/NavFourMom
- GaudiKernel
- Generators/GeneratorObjects
- Generators/AtlasHepMC
- PhysicsAnalysis/TruthParticleID/McParticleAlgs
- PhysicsAnalysis/TruthParticleID/McParticleEvent
- PhysicsAnalysis/TruthParticleID/McParticleKernel
- PhysicsAnalysis/TruthParticleID/McParticleUtils )
-
# External dependencies:
find_package( CLHEP )
find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
@@ -29,7 +12,7 @@ atlas_add_component( McParticleTests
src/*.cxx
src/components/*.cxx
INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} AtlasHepMCLib AthenaBaseComps StoreGateLib SGtests EventKernel NavFourMom GaudiKernel GeneratorObjects McParticleEvent McParticleKernel McParticleUtils )
+ LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} AtlasHepMCLib AthenaBaseComps EventKernel NavFourMom GaudiKernel GeneratorObjects McParticleEvent McParticleKernel McParticleUtils )
# Install files from the package:
atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
diff --git a/PhysicsAnalysis/TruthParticleID/McParticleTools/CMakeLists.txt b/PhysicsAnalysis/TruthParticleID/McParticleTools/CMakeLists.txt
index fd5438edf5faab927f0d615e547ca4744cdeaa7d..ccbcda38ecc2a567e1d3f5bf7a84d6de5c4caa5a 100644
--- a/PhysicsAnalysis/TruthParticleID/McParticleTools/CMakeLists.txt
+++ b/PhysicsAnalysis/TruthParticleID/McParticleTools/CMakeLists.txt
@@ -1,27 +1,10 @@
-################################################################################
-# Package: McParticleTools
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( McParticleTools )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PRIVATE
- Control/AthenaBaseComps
- Control/SGTools
- Control/AthContainers
- Control/StoreGate
- Event/EventKernel
- GaudiKernel
- Generators/GenAnalysisTools/TruthHelper
- Generators/GeneratorObjects
- Generators/AtlasHepMC
- PhysicsAnalysis/TruthParticleID/McParticleEvent
- PhysicsAnalysis/TruthParticleID/McParticleKernel
- PhysicsAnalysis/TruthParticleID/McParticleUtils )
-
# External dependencies:
-find_package( Boost COMPONENTS filesystem thread system )
+find_package( Boost )
find_package( CLHEP )
find_package( HepPDT )
find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
@@ -31,4 +14,4 @@ atlas_add_component( McParticleTools
src/*.cxx
src/components/*.cxx
INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${HEPPDT_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
- LINK_LIBRARIES ${Boost_LIBRARIES} ${HEPPDT_LIBRARIES} ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} AtlasHepMCLib AthenaBaseComps AthContainers StoreGateLib SGtests EventKernel GaudiKernel TruthHelper GeneratorObjects McParticleEvent McParticleKernel McParticleUtils SGTools )
+ LINK_LIBRARIES ${Boost_LIBRARIES} ${HEPPDT_LIBRARIES} ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} AtlasHepMCLib AthenaBaseComps AthContainers StoreGateLib EventKernel GaudiKernel TruthHelper GeneratorObjects McParticleEvent McParticleKernel McParticleUtils SGTools )
diff --git a/PhysicsAnalysis/TruthParticleID/McParticleUtils/CMakeLists.txt b/PhysicsAnalysis/TruthParticleID/McParticleUtils/CMakeLists.txt
index fce02c971f6f5795ff0582f620fe12a0d5c685f6..5457f0d1c86b6d3525ded34dcb0a5a439e546667 100644
--- a/PhysicsAnalysis/TruthParticleID/McParticleUtils/CMakeLists.txt
+++ b/PhysicsAnalysis/TruthParticleID/McParticleUtils/CMakeLists.txt
@@ -1,27 +1,10 @@
-################################################################################
-# Package: McParticleUtils
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( McParticleUtils )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Control/AthenaKernel
- Control/AthContainers
- Event/EventKernel
- GaudiKernel
- PhysicsAnalysis/AnalysisCommon/AnalysisUtils
- PRIVATE
- AtlasTest/TestTools
- Control/StoreGate
- Control/RootUtils
- Generators/AtlasHepMC )
-
# External dependencies:
-find_package( Boost COMPONENTS filesystem thread system )
-find_package( CLHEP )
-find_package( CppUnit )
+find_package( Boost )
find_package( HepPDT )
find_package( Python COMPONENTS Development )
@@ -29,12 +12,11 @@ find_package( Python COMPONENTS Development )
atlas_add_library( McParticleUtils
src/*.cxx
PUBLIC_HEADERS McParticleUtils
- INCLUDE_DIRS
- PRIVATE_INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${HEPPDT_INCLUDE_DIRS} ${Python_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS} ${CPPUNIT_INCLUDE_DIRS}
+ PRIVATE_INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${HEPPDT_INCLUDE_DIRS} ${Python_INCLUDE_DIRS}
PRIVATE_DEFINITIONS ${CLHEP_DEFINITIONS}
- LINK_LIBRARIES AtlasHepMCLib AthenaKernel AthContainers EventKernel GaudiKernel AnalysisUtilsLib StoreGateLib SGtests RootUtils
- PRIVATE_LINK_LIBRARIES ${Boost_LIBRARIES} ${HEPPDT_LIBRARIES} ${Python_LIBRARIES} ${CLHEP_LIBRARIES} ${CPPUNIT_LIBRARIES} )
+ LINK_LIBRARIES AtlasHepMCLib AthenaKernel AthContainers EventKernel GaudiKernel AnalysisUtilsLib
+ PRIVATE_LINK_LIBRARIES ${Boost_LIBRARIES} ${HEPPDT_LIBRARIES} ${Python_LIBRARIES} RootUtils )
# Install files from the package:
-atlas_install_python_modules( python/*.py )
+atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )