diff --git a/Trigger/TrigAlgorithms/TrigMinBias/CMakeLists.txt b/Trigger/TrigAlgorithms/TrigMinBias/CMakeLists.txt index 9d084ae94d29c74d0de61a345fbe229d622d9d88..67c066a1c687a23628c24d8fda10a7a04aec125f 100644 --- a/Trigger/TrigAlgorithms/TrigMinBias/CMakeLists.txt +++ b/Trigger/TrigAlgorithms/TrigMinBias/CMakeLists.txt @@ -1,32 +1,12 @@ -################################################################################ -# Package: TrigMinBias -################################################################################ +# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration # Declare the package name: atlas_subdir( TrigMinBias ) -# Declare the package's dependencies: -atlas_depends_on_subdirs( PRIVATE - Event/xAOD/xAODTracking - Event/xAOD/xAODTrigMinBias - Tracking/TrkEvent/TrkTrack - Trigger/TrigEvent/TrigInDetEvent - Trigger/TrigSteer/TrigInterfaces - Trigger/TrigSteer/DecisionHandling - Trigger/TrigSteer/TrigCompositeUtils - Control/StoreGate - GaudiKernel - Tracking/TrkEvent/TrkParameters - Trigger/TrigTools/TrigTimeAlgs - Event/xAOD/xAODTrigger - Control/AthenaMonitoringKernel - Control/AthViews) - # Component(s) in the package: atlas_add_component( TrigMinBias src/*.cxx src/components/*.cxx - - LINK_LIBRARIES DecisionHandlingLib AthenaMonitoringKernelLib xAODTracking xAODTrigMinBias TrkTrack TrigInDetEvent TrigInterfacesLib StoreGateLib GaudiKernel TrkParameters TrigTimeAlgsLib AthViews TrigCompositeUtilsLib) + LINK_LIBRARIES AthViews AthenaBaseComps AthenaMonitoringKernelLib DecisionHandlingLib GaudiKernel TrigCompositeUtilsLib TrigInterfacesLib TrigTimeAlgsLib TrkParameters TrkTrack xAODTracking xAODTrigMinBias xAODTrigger ) # Install files from the package: -atlas_install_python_modules( python/*.py ) +atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} --extend-extensions=ATL900,ATL901 ) diff --git a/Trigger/TrigAlgorithms/TrigMinBias/python/TrigMinBiasProperties.py b/Trigger/TrigAlgorithms/TrigMinBias/python/TrigMinBiasProperties.py index 01a00dff4244fe4252122ffa616d9805352207e0..eb9c37eb12c52a0bf2e2abab8c6249d6df5f7727 100644 --- a/Trigger/TrigAlgorithms/TrigMinBias/python/TrigMinBiasProperties.py +++ b/Trigger/TrigAlgorithms/TrigMinBias/python/TrigMinBiasProperties.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 Trigger/TrigAlgorithms/TrigMinBias/python/TrigMinBiasProperties.py @@ -19,7 +19,6 @@ __all__ = [ "trigMinBiasProperties" ] ## Import from AthenaCommon.JobProperties import JobProperty, JobPropertyContainer -from AthenaCommon.JobProperties import jobproperties ##----------------------------------------------------------------------------- ## 1st step: define JobProperty classes @@ -102,8 +101,8 @@ log = logging.getLogger( 'TrigMinBiasProperties.py' ) try: from TriggerMenu import useNewTriggerMenu useNewTM = useNewTriggerMenu() - log.info("Using new TriggerMenu: %r" % useNewTM) -except: + log.info("Using new TriggerMenu: %r", useNewTM) +except Exception: useNewTM = False log.info("Using old TriggerMenuPython since TriggerMenu.useNewTriggerMenu can't be imported")