diff --git a/Reconstruction/eflowEvent/CMakeLists.txt b/Reconstruction/eflowEvent/CMakeLists.txt
index 51a83507c98eaecb8ca2f9c9e8da574d706b1b90..4cae3025b7cdf0cf5d5fff0f81826bac135b5471 100644
--- a/Reconstruction/eflowEvent/CMakeLists.txt
+++ b/Reconstruction/eflowEvent/CMakeLists.txt
@@ -1,44 +1,22 @@
-################################################################################
-# Package: eflowEvent
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( eflowEvent )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Calorimeter/CaloEvent
- Control/AthContainers
- Control/AthLinks
- Control/AthenaKernel
- Control/Navigation
- Event/EventKernel
- Event/FourMom
- Event/NavFourMom
- Event/xAOD/xAODCaloEvent
- Event/xAOD/xAODPFlow
- Event/xAOD/xAODTracking
- GaudiKernel
- Reconstruction/MuonIdentification/muonEvent
- Reconstruction/Particle
- Tracking/TrkEvent/VxVertex )
-
# External dependencies:
-find_package( Boost COMPONENTS filesystem thread system )
-find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
+find_package( Boost )
# Component(s) in the package:
atlas_add_library( eflowEvent
src/*.cxx
PUBLIC_HEADERS eflowEvent
- INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${Boost_LIBRARIES} ${ROOT_LIBRARIES} CaloEvent AthContainers AthLinks Navigation AthenaKernel EventKernel FourMom NavFourMom xAODCaloEvent xAODPFlow xAODTracking GaudiKernel muonEvent Particle VxVertex )
+ INCLUDE_DIRS ${Boost_INCLUDE_DIRS}
+ LINK_LIBRARIES ${Boost_LIBRARIES} CaloEvent AthContainers AthLinks Navigation AthenaKernel EventKernel FourMom NavFourMom xAODCaloEvent xAODPFlow xAODTracking GaudiKernel muonEvent Particle VxVertex )
atlas_generate_cliddb( eflowEvent )
atlas_add_dictionary( eflowEventDict
eflowEvent/eflowEventDict.h
eflowEvent/selection.xml
- INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${Boost_LIBRARIES} ${ROOT_LIBRARIES} CaloEvent AthContainers AthLinks Navigation AthenaKernel EventKernel FourMom NavFourMom xAODCaloEvent xAODPFlow xAODTracking GaudiKernel muonEvent Particle VxVertex eflowEvent
+ LINK_LIBRARIES eflowEvent
NAVIGABLES eflowObjectContainer )
diff --git a/Reconstruction/eflowEventTPCnv/CMakeLists.txt b/Reconstruction/eflowEventTPCnv/CMakeLists.txt
index ab0608c24397868e4a1a760fc4cba2182ad54948..1b0a9749c4b88c3dfeef15f6079dc8cdd850286e 100644
--- a/Reconstruction/eflowEventTPCnv/CMakeLists.txt
+++ b/Reconstruction/eflowEventTPCnv/CMakeLists.txt
@@ -1,101 +1,40 @@
-################################################################################
-# Package: eflowEventTPCnv
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( eflowEventTPCnv )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Calorimeter/CaloEvent
- Control/DataModelAthenaPool
- Database/AthenaPOOL/AthenaPoolCnvSvc
- Reconstruction/MuonIdentification/muonEvent
- Reconstruction/Particle
- Reconstruction/eflowEvent
- Tracking/TrkEvent/VxVertex
- PRIVATE
- AtlasTest/TestTools
- Control/AthLinks
- Control/AthenaKernel
- Control/Navigation
- Control/SGTools )
-
# External dependencies:
find_package( CLHEP )
-find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
# Component(s) in the package:
atlas_add_tpcnv_library( eflowEventTPCnv
src/*.cxx
PUBLIC_HEADERS eflowEventTPCnv
- PRIVATE_INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
+ PRIVATE_INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS}
PRIVATE_DEFINITIONS ${CLHEP_DEFINITIONS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} CaloEvent DataModelAthenaPoolLib AthenaPoolCnvSvcLib muonEvent Particle eflowEvent VxVertex TestTools AthLinks AthenaKernel Navigation SGTools )
+ LINK_LIBRARIES AthenaPoolCnvSvcLib CaloEvent DataModelAthenaPoolLib Particle VxVertex eflowEvent muonEvent
+ PRIVATE_LINK_LIBRARIES AthLinks AthenaKernel Navigation )
atlas_add_dictionary( eflowEventTPCnvDict
eflowEventTPCnv/eflowEventTPCnvDict.h
eflowEventTPCnv/selection.xml
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} CaloEvent DataModelAthenaPoolLib AthenaPoolCnvSvcLib muonEvent Particle eflowEvent VxVertex TestTools AthLinks AthenaKernel Navigation SGTools eflowEventTPCnv )
-
-atlas_add_test( eflowObjectCnv_p1_test
- SOURCES
- test/eflowObjectCnv_p1_test.cxx
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} CaloEvent DataModelAthenaPoolLib AthenaPoolCnvSvcLib muonEvent Particle eflowEvent VxVertex TestTools AthLinks AthenaKernel Navigation SGTools eflowEventTPCnv )
-
-atlas_add_test( eflowObjectCnv_p2_test
- SOURCES
- test/eflowObjectCnv_p2_test.cxx
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} CaloEvent DataModelAthenaPoolLib AthenaPoolCnvSvcLib muonEvent Particle eflowEvent VxVertex TestTools AthLinks AthenaKernel Navigation SGTools eflowEventTPCnv )
-
-atlas_add_test( eflowObjectCnv_p3_test
- SOURCES
- test/eflowObjectCnv_p3_test.cxx
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} CaloEvent DataModelAthenaPoolLib AthenaPoolCnvSvcLib muonEvent Particle eflowEvent VxVertex TestTools AthLinks AthenaKernel Navigation SGTools eflowEventTPCnv )
-
-atlas_add_test( eflowObjectCnv_p4_test
- SOURCES
- test/eflowObjectCnv_p4_test.cxx
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} CaloEvent DataModelAthenaPoolLib AthenaPoolCnvSvcLib muonEvent Particle eflowEvent VxVertex TestTools AthLinks AthenaKernel Navigation SGTools eflowEventTPCnv )
-
-atlas_add_test( eflowObjectCnv_p5_test
- SOURCES
- test/eflowObjectCnv_p5_test.cxx
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} CaloEvent DataModelAthenaPoolLib AthenaPoolCnvSvcLib muonEvent Particle eflowEvent VxVertex TestTools AthLinks AthenaKernel Navigation SGTools eflowEventTPCnv )
-
-atlas_add_test( eflowObjectContainerCnv_p1_test
- SOURCES
- test/eflowObjectContainerCnv_p1_test.cxx
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} CaloEvent DataModelAthenaPoolLib AthenaPoolCnvSvcLib muonEvent Particle eflowEvent VxVertex TestTools AthLinks AthenaKernel Navigation SGTools eflowEventTPCnv )
-
-atlas_add_test( eflowObjectContainerCnv_p2_test
- SOURCES
- test/eflowObjectContainerCnv_p2_test.cxx
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} CaloEvent DataModelAthenaPoolLib AthenaPoolCnvSvcLib muonEvent Particle eflowEvent VxVertex TestTools AthLinks AthenaKernel Navigation SGTools eflowEventTPCnv )
-
-atlas_add_test( eflowObjectContainerCnv_p3_test
- SOURCES
- test/eflowObjectContainerCnv_p3_test.cxx
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} CaloEvent DataModelAthenaPoolLib AthenaPoolCnvSvcLib muonEvent Particle eflowEvent VxVertex TestTools AthLinks AthenaKernel Navigation SGTools eflowEventTPCnv )
-
-atlas_add_test( eflowObjectContainerCnv_p4_test
- SOURCES
- test/eflowObjectContainerCnv_p4_test.cxx
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} CaloEvent DataModelAthenaPoolLib AthenaPoolCnvSvcLib muonEvent Particle eflowEvent VxVertex TestTools AthLinks AthenaKernel Navigation SGTools eflowEventTPCnv )
-
-atlas_add_test( eflowObjectContainerCnv_p5_test
- SOURCES
- test/eflowObjectContainerCnv_p5_test.cxx
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} CaloEvent DataModelAthenaPoolLib AthenaPoolCnvSvcLib muonEvent Particle eflowEvent VxVertex TestTools AthLinks AthenaKernel Navigation SGTools eflowEventTPCnv )
-
+ LINK_LIBRARIES LINK_LIBRARIES DataModelAthenaPoolLib eflowEventTPCnv )
+
+# Tests in the package:
+function( _add_test name )
+ atlas_add_test( ${name}
+ SOURCES test/${name}.cxx
+ INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS}
+ LINK_LIBRARIES ${CLHEP_LIBRARIES} AthenaPoolCnvSvcLib CaloEvent DataModelAthenaPoolLib Particle SGTools TestTools VxVertex eflowEvent eflowEventTPCnv )
+endfunction( _add_test )
+
+_add_test( eflowObjectCnv_p1_test )
+_add_test( eflowObjectCnv_p2_test )
+_add_test( eflowObjectCnv_p3_test )
+_add_test( eflowObjectCnv_p4_test )
+_add_test( eflowObjectCnv_p5_test )
+_add_test( eflowObjectContainerCnv_p1_test )
+_add_test( eflowObjectContainerCnv_p2_test )
+_add_test( eflowObjectContainerCnv_p3_test )
+_add_test( eflowObjectContainerCnv_p4_test )
+_add_test( eflowObjectContainerCnv_p5_test )
diff --git a/Reconstruction/eflowRec/CMakeLists.txt b/Reconstruction/eflowRec/CMakeLists.txt
index 2c73f643b8df0964ea035081f5e3982f5a382f80..4cbac95c78053158d3b1ac8deb09d004c61075e9 100644
--- a/Reconstruction/eflowRec/CMakeLists.txt
+++ b/Reconstruction/eflowRec/CMakeLists.txt
@@ -1,60 +1,19 @@
# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
-################################################################################
-# Package: eflowRec
-################################################################################
-
# Declare the package name:
atlas_subdir( eflowRec )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Calorimeter/CaloEvent
- Calorimeter/CaloIdentifier
- Calorimeter/CaloRec
- Control/AthContainers
- Control/AthLinks
- Control/AthenaBaseComps
- Control/AthenaKernel
- Control/CxxUtils
- DetectorDescription/GeoPrimitives
- Event/xAOD/xAODCaloEvent
- Event/xAOD/xAODCore
- Event/xAOD/xAODEgamma
- Event/xAOD/xAODMuon
- Event/xAOD/xAODPFlow
- Event/xAOD/xAODTracking
- Event/xAOD/xAODTau
- GaudiKernel
- InnerDetector/InDetDetDescr/InDetReadoutGeometry
- InnerDetector/InDetDetDescr/TRT_ReadoutGeometry
- InnerDetector/InDetRecTools/InDetTrackSelectionTool
- InnerDetector/InDetRecTools/TrackVertexAssociationTool
- Reconstruction/Particle
- Reconstruction/RecoTools/RecoToolInterfaces
- Tracking/TrkEvent/TrkParameters
- PRIVATE
- Calorimeter/CaloDetDescr
- Calorimeter/CaloUtils
- Control/StoreGate
- Event/FourMomUtils
- Tools/PathResolver
- Tracking/TrkEvent/TrkCaloExtension
- Tracking/TrkEvent/TrkParametersIdentificationHelpers )
-
# External dependencies:
-find_package( Eigen )
find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
# Component(s) in the package:
atlas_add_component( eflowRec
src/*.cxx
src/components/*.cxx
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${EIGEN_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} ${EIGEN_LIBRARIES} CaloEvent CaloIdentifier CaloRecLib AthContainers AthLinks AthenaBaseComps CxxUtils AthenaKernel GeoPrimitives xAODCaloEvent xAODCore xAODEgamma xAODMuon xAODPFlow xAODTau xAODTracking GaudiKernel InDetReadoutGeometry TRT_ReadoutGeometry TrackVertexAssociationToolLib Particle RecoToolInterfaces TrkParameters CaloDetDescrLib CaloUtilsLib StoreGateLib SGtests FourMomUtils PathResolver TrkCaloExtension TrkParametersIdentificationHelpers InDetTrackSelectionToolLib AthenaMonitoringKernelLib )
+ INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
+ LINK_LIBRARIES ${ROOT_LIBRARIES} CaloEvent CaloIdentifier CaloRecLib AthContainers AthLinks AthenaBaseComps CxxUtils AthenaKernel GeoPrimitives Identifier xAODBase xAODCaloEvent xAODCore xAODEgamma xAODMuon xAODPFlow xAODTau xAODTracking GaudiKernel InDetReadoutGeometry TRT_ReadoutGeometry Particle RecoToolInterfaces TrkParameters CaloDetDescrLib CaloUtilsLib StoreGateLib FourMomUtils PathResolver TrkCaloExtension TrkParametersIdentificationHelpers InDetTrackSelectionToolLib AthenaMonitoringKernelLib )
# Install files from the package:
-atlas_install_headers( eflowRec )
-atlas_install_python_modules( python/*.py )
+atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
atlas_install_joboptions( share/*.py )
atlas_install_runtime( share/rmsvsdr.dat )
diff --git a/Reconstruction/eflowRec/python/PFHLTSequence.py b/Reconstruction/eflowRec/python/PFHLTSequence.py
index a0a999012a0203cc07e5cf19fbdc4d83d3ac36d2..956190f2b3404fae37d4d5e37ccaf57baf5c1849 100644
--- a/Reconstruction/eflowRec/python/PFHLTSequence.py
+++ b/Reconstruction/eflowRec/python/PFHLTSequence.py
@@ -1,4 +1,4 @@
-from __future__ import print_function
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
from eflowRec import eflowRecConf
from InDetTrackSelectionTool import InDetTrackSelectionToolConf
diff --git a/Reconstruction/eflowRec/python/PFLocalHadCal.py b/Reconstruction/eflowRec/python/PFLocalHadCal.py
index 98ed876f560552dda6af3273618d9a4b373ab419..b0ceef9f73db2aa9af402fbbf52f03c6d8e8302c 100644
--- a/Reconstruction/eflowRec/python/PFLocalHadCal.py
+++ b/Reconstruction/eflowRec/python/PFLocalHadCal.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
from AthenaCommon.Logging import logging
from AthenaCommon.JobProperties import jobproperties
@@ -13,15 +13,15 @@ class PFLocalHadCal:
try:
from CaloClusterCorrection.CaloClusterCorrectionConf import CaloClusterLocalCalib
Calib = CaloClusterLocalCalib(name+"_CaloClusterLocalCalib")
- except:
+ except Exception:
mlog.error("could not import CaloClusterCorrection.CaloClusterLocalCalib")
traceback.print_exc()
return False
try:
- from CaloUtils.CaloUtilsConf import CaloLCClassificationTool;
+ from CaloUtils.CaloUtilsConf import CaloLCClassificationTool
LCClassify = CaloLCClassificationTool(name+"_CaloLCClassificationTool")
- except:
+ except Exception:
mlog.error("could not import CaloUtils.EMFracClusterClassificationTool")
traceback.print_exc()
return False
@@ -59,17 +59,16 @@ class PFLocalHadCal:
mlog = logging.getLogger( 'PFLocalHadCal::getLCWeightTool' )
try:
- from CaloUtils.CaloUtilsConf import CaloLCWeightTool;
+ from CaloUtils.CaloUtilsConf import CaloLCWeightTool
LCWeight = CaloLCWeightTool(name+"_CaloLCWeightTool")
- except:
+ except Exception:
mlog.error("could not import CaloUtils.CaloLCWeightTool")
traceback.print_exc()
return False
from CaloTools.CaloNoiseCondAlg import CaloNoiseCondAlg
#For LCWeightsTool needs electronic noise
- CaloNoiseCondAlg(noisetype="electronicNoise")
- from AthenaCommon.AppMgr import ServiceMgr as svcMgr
+ CaloNoiseCondAlg(noisetype="electronicNoise")
LCWeight.CorrectionKey = "H1ClusterCellWeights"
LCWeight.SignalOverNoiseCut = 2.0
@@ -84,7 +83,7 @@ class PFLocalHadCal:
try:
from CaloClusterCorrection.CaloClusterCorrectionConf import CaloClusterLocalCalib
CalibDM = CaloClusterLocalCalib(name+"_CaloClusterLocalCalibDM")
- except:
+ except Exception:
mlog.error("could not import CaloClusterCorrection.CaloClusterLocalCalib")
traceback.print_exc()
return False
@@ -105,7 +104,7 @@ class PFLocalHadCal:
try:
from CaloUtils.CaloUtilsConf import CaloLCDeadMaterialTool
LCDeadMaterial = CaloLCDeadMaterialTool(name+"_CaloLCDeadMaterialTool")
- except:
+ except Exception:
mlog.error("could not import CaloUtils.CaloLCDeadMaterialTool")
traceback.print_exc()
return False
@@ -124,7 +123,7 @@ class PFLocalHadCal:
try:
from CaloClusterCorrection.CaloClusterCorrectionConf import CaloClusterLocalCalib
CalibOO = CaloClusterLocalCalib(name+"_CaloClusterLocalCalibOO")
- except:
+ except Exception:
mlog.error("could not import CaloClusterCorrection.CaloClusterLocalCalib")
traceback.print_exc()
return False
@@ -146,7 +145,7 @@ class PFLocalHadCal:
try:
from CaloClusterCorrection.CaloClusterCorrectionConf import CaloClusterLocalCalib
CalibOOPi0 = CaloClusterLocalCalib(name+"_CaloClusterLocalCalibOOPi0")
- except:
+ except Exception:
mlog.error("could not import CaloClusterCorrection.CaloClusterLocalCalib")
traceback.print_exc()
return False
@@ -167,7 +166,7 @@ class PFLocalHadCal:
try:
from CaloUtils.CaloUtilsConf import CaloLCOutOfClusterTool
OOCC = CaloLCOutOfClusterTool(name+"_CaloLCOutOfClusterTool")
- except:
+ except Exception:
mlog.error("Could not import CaloUtils.CaloLCOutOfClusterTool")
traceback.print_exc()
return False
@@ -185,7 +184,7 @@ class PFLocalHadCal:
try:
from CaloUtils.CaloUtilsConf import CaloLCOutOfClusterTool
OOCCPi0 = CaloLCOutOfClusterTool(name+"_CaloLCOutOfClusterPi0Tool")
- except:
+ except Exception:
mlog.error("Could not import CaloUtils.CaloLCOutOfClusterTool")
traceback.print_exc()
return False