diff --git a/Generators/Prophecy4fControl/CMakeLists.txt b/Generators/Prophecy4fControl/CMakeLists.txt index ab8154addd443fa8d004b34ab714d52c33f85723..62d883c17120ce31ac0b2e016d211e00f90833cf 100644 --- a/Generators/Prophecy4fControl/CMakeLists.txt +++ b/Generators/Prophecy4fControl/CMakeLists.txt @@ -15,6 +15,6 @@ atlas_add_executable( DRM LINK_LIBRARIES ${ROOT_LIBRARIES} ) # Install files from the package: -atlas_install_python_modules( python/*.py python/decorators ) +atlas_install_python_modules( python/*.py python/decorators POST_BUILD_CMD ${ATLAS_FLAKE8} ) atlas_install_joboptions( share/*.py ) diff --git a/Generators/Prophecy4fControl/python/DecoratorFactory.py b/Generators/Prophecy4fControl/python/DecoratorFactory.py index 60b329bf5a8ea30e51bc0d107b77a04491b9140b..998d37b19c18a6b5ae14f97bec71133014579f01 100644 --- a/Generators/Prophecy4fControl/python/DecoratorFactory.py +++ b/Generators/Prophecy4fControl/python/DecoratorFactory.py @@ -1,6 +1,6 @@ -#! /usr/bin/env python +# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration -from decorators import * +from decorators import DecoratorFromDefault, DecoratorFromPowheg def decorate( prophecy_controller, decorator, **kwargs ) : ## Initialise correct decorator for Prophecy configurable diff --git a/Generators/Prophecy4fControl/python/ProphecyConfig.py b/Generators/Prophecy4fControl/python/ProphecyConfig.py index 6f7cbedd16d6969b8fef094a352a803820e79e8a..40682d29ae01e1aa46f80a86f816ec3000eae234 100644 --- a/Generators/Prophecy4fControl/python/ProphecyConfig.py +++ b/Generators/Prophecy4fControl/python/ProphecyConfig.py @@ -1,4 +1,5 @@ -#! /usr/bin/env python +# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration + import os, subprocess, time from DecoratorFactory import decorate from AthenaCommon import Logging @@ -33,7 +34,7 @@ class ProphecyConfig(object) : self.add_parameter_set( 'fromDefault' ) ## Initialise values from runArgs - if runArgs == None : + if runArgs is None : self.logger.warning( 'No run arguments found! Using defaults.' ) else : # Read values from runArgs diff --git a/Generators/Prophecy4fControl/python/ProphecyPowhegDefault.py b/Generators/Prophecy4fControl/python/ProphecyPowhegDefault.py index 7e27b8b9067d899f58c423a97f23e212f62c93dc..49fdc5a5f888cc9f586be34f8c5cb3b4fcb0ccab 100644 --- a/Generators/Prophecy4fControl/python/ProphecyPowhegDefault.py +++ b/Generators/Prophecy4fControl/python/ProphecyPowhegDefault.py @@ -1,4 +1,5 @@ -#! /usr/bin/env python +# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration + from ProphecyConfig import ProphecyConfig class ProphecyPowhegDefault(ProphecyConfig) : diff --git a/Generators/Prophecy4fControl/python/ProphecyPowhegMerge.py b/Generators/Prophecy4fControl/python/ProphecyPowhegMerge.py index 4a60dcf5fba4a2fb9fba9ffebfed3ce0747c193a..129415436a625446a7a9aeedbac82cb8b8c02dee 100644 --- a/Generators/Prophecy4fControl/python/ProphecyPowhegMerge.py +++ b/Generators/Prophecy4fControl/python/ProphecyPowhegMerge.py @@ -1,4 +1,4 @@ -#! /usr/bin/env python +# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration import os, subprocess, time, glob from AthenaCommon import Logging from PowhegControl import RepeatingTimer @@ -26,7 +26,7 @@ class ProphecyPowhegMerge(object) : self.__input_prophecy_file_name = 'ProphecyOTF._1.events' ## Initialise values from runArgs - if runArgs == None : + if runArgs is None : self.logger.warning( 'No run arguments found! Using defaults.' ) else : # Read values from runArgs diff --git a/Generators/Prophecy4fControl/python/__init__.py b/Generators/Prophecy4fControl/python/__init__.py index 9ee08c96c733e24334f81c60aa33750908cfb584..88d7b7298111ea3822ada474b458b970ecad90ff 100644 --- a/Generators/Prophecy4fControl/python/__init__.py +++ b/Generators/Prophecy4fControl/python/__init__.py @@ -1,4 +1,5 @@ -from ProphecyConfig import * -from ProphecyPowhegDefault import * -from ProphecyPowhegMerge import * -from .decorators import * +# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration +from ProphecyConfig import * # noqa: F401, F403 +from ProphecyPowhegDefault import * # noqa: F401, F403 +from ProphecyPowhegMerge import * # noqa: F401, F403 +from .decorators import * # noqa: F401, F403 diff --git a/Generators/Prophecy4fControl/python/decorators/DecoratorFromDefault.py b/Generators/Prophecy4fControl/python/decorators/DecoratorFromDefault.py index ebff63cbf61644e0ce69a8042b92fa1a369d8396..7a1343df89696e292f454b9023148015b454c362 100644 --- a/Generators/Prophecy4fControl/python/decorators/DecoratorFromDefault.py +++ b/Generators/Prophecy4fControl/python/decorators/DecoratorFromDefault.py @@ -1,4 +1,4 @@ -#! /usr/bin/env python +# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration class DecoratorFromDefault(object) : diff --git a/Generators/Prophecy4fControl/python/decorators/DecoratorFromPowheg.py b/Generators/Prophecy4fControl/python/decorators/DecoratorFromPowheg.py index 5e77016e9fc63a7607ea1661655fd86ba532dfd1..98c74d5f02421cbb726366e7be822789946f3be4 100644 --- a/Generators/Prophecy4fControl/python/decorators/DecoratorFromPowheg.py +++ b/Generators/Prophecy4fControl/python/decorators/DecoratorFromPowheg.py @@ -1,4 +1,4 @@ -#! /usr/bin/env python +# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration from PowhegControl import ATLASCommonParameters diff --git a/Generators/Prophecy4fControl/python/decorators/__init__.py b/Generators/Prophecy4fControl/python/decorators/__init__.py index 6e4d88587e9b7ea8d44f36d548c7755d652185e8..a2de9e3a2ab3b9cdaa986943f7e24a2f4851dacb 100644 --- a/Generators/Prophecy4fControl/python/decorators/__init__.py +++ b/Generators/Prophecy4fControl/python/decorators/__init__.py @@ -1,2 +1,3 @@ -from DecoratorFromDefault import * -from DecoratorFromPowheg import * +# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration +from DecoratorFromDefault import * # noqa: F401, F403 +from DecoratorFromPowheg import * # noqa: F401, F403