diff --git a/Generators/Herwig7_i/Herwig7_i/Herwig7.h b/Generators/Herwig7_i/Herwig7_i/Herwig7.h index 7d864fec61d543b8f2b462ea575aa28db4cb8f53..8ca89533c42466430ee4f00a0fc63ade4ac8e841 100644 --- a/Generators/Herwig7_i/Herwig7_i/Herwig7.h +++ b/Generators/Herwig7_i/Herwig7_i/Herwig7.h @@ -1,5 +1,9 @@ // -*- C++ -*- +/* + Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration +*/ + /*! \file Herwig7.h * \brief Athena interface for the %Herwig7 generator * \author Daniel Rauch (daniel.rauch@desy.de) diff --git a/Generators/Herwig7_i/cmt/requirements b/Generators/Herwig7_i/cmt/requirements deleted file mode 100644 index 945ffb12946435f559a425a0a821cc2b99ef52db..0000000000000000000000000000000000000000 --- a/Generators/Herwig7_i/cmt/requirements +++ /dev/null @@ -1,40 +0,0 @@ -package Herwig7_i - -author Daniel Rauch <daniel.rauch@desy.de> - -use AtlasPolicy AtlasPolicy-* -use GeneratorModules GeneratorModules-* Generators -use ThePEG ThePEG-* External - -private -use GaudiInterface GaudiInterface-* External -use Herwig7 Herwig7-* External -use AtlasBoost AtlasBoost-* External -use EventInfo EventInfo-* Event -use PathResolver PathResolver-* Tools -end_private - -library Herwig7_i *.cxx -s=components *.cxx -apply_pattern component_library - -# Add the macro definitions for cmake (transparent to CMT) -apply_pattern cmake_add_command command='add_definitions(-DHWVERSION=\"${HERWIG7_VERSION}\")' - -macro Herwig7_i_linkopts "$(Herwig7_linkopts) " -macro_append Herwig7_i_pp_cppflags '-DHWVERSION=\"$(Herwig7_version)\" ' -macro_append Herwig7_i_pp_cppflags '-DHWREPODIR=\"$(Herwig7_repodir)\" ' -macro_append Herwig7_i_pp_cppflags '-DHWMODULEDIR=\"$(Herwig7_moduledir)\" ' -macro_append Herwig7_i_pp_cppflags '-DTHEPEGMODULEDIR=\"$(ThePEG_moduledir)\" ' -#macro_append Herwig7_i_pp_cppflags '-DLCGTAG=\"$(LCG_ext_system)\" ' -#macro_append Herwig7_i_pp_cppflags "-pedantic-errors" - -## This cryptic instruction seems to have the effect of making the NEEDED -## sections in the built library behave properly rather than whatever broken -## thing CMT does by default! Yuck! -private -apply_tag notAsNeeded -end_private - -# Install files from the package: -apply_pattern declare_joboptions files="*.py" -apply_pattern declare_python_modules files="*.py" diff --git a/Generators/Herwig7_i/doc/mainpage.h b/Generators/Herwig7_i/doc/mainpage.h index 2fbd8280a7597e790dbbebe53ba97786c83c613f..a8e97ca5b82345da25512f12a1faca82f6d47e77 100644 --- a/Generators/Herwig7_i/doc/mainpage.h +++ b/Generators/Herwig7_i/doc/mainpage.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration + Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration */ /** diff --git a/Generators/Herwig7_i/python/Herwig7ConfigFxFx.py b/Generators/Herwig7_i/python/Herwig7ConfigFxFx.py index c85bf5ffc6b5b4671d5b2732dd77d40266edd38f..b7a6ef5d354ad8a9e2e3383dfd29941fcec7e7ad 100644 --- a/Generators/Herwig7_i/python/Herwig7ConfigFxFx.py +++ b/Generators/Herwig7_i/python/Herwig7ConfigFxFx.py @@ -1,5 +1,7 @@ #! /usr/bin/env python +## Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration + ## \file Herwig7ConfigFxFx.py ## \brief Configuration class for showering FxFx-merged LHE files from MG5_aMC@NLO ## \author Krishna Kulkarni (krishna.kulkarni@cern.ch) diff --git a/Generators/Herwig7_i/python/Herwig7ConfigGeneric.py b/Generators/Herwig7_i/python/Herwig7ConfigGeneric.py index ea7a388cc1dc7b585e334081d38a26a95e176108..29e880b467a093cd9b07d8591afec5225910db26 100644 --- a/Generators/Herwig7_i/python/Herwig7ConfigGeneric.py +++ b/Generators/Herwig7_i/python/Herwig7ConfigGeneric.py @@ -1,5 +1,7 @@ #! /usr/bin/env python +## Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration + ## \file Herwig7ConfigGeneric.py ## \brief Python class for reproducing standalone runs inside of athena diff --git a/Generators/Herwig7_i/python/Herwig7ConfigLHEF.py b/Generators/Herwig7_i/python/Herwig7ConfigLHEF.py index 9fcb055a8bf52092cbafd4fa7deaee48d5fc0324..7bd132f0324eb542c953379db0185975d16ebcfa 100644 --- a/Generators/Herwig7_i/python/Herwig7ConfigLHEF.py +++ b/Generators/Herwig7_i/python/Herwig7ConfigLHEF.py @@ -1,5 +1,7 @@ #! /usr/bin/env python +## Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration + ## \file Herwig7ConfigLHEF.py ## \brief Configuration class for showering LHE files from MG5_aMC@NLO or PowhegBox ## \author Daniel Rauch (daniel.rauch@desy.de) diff --git a/Generators/Herwig7_i/python/Herwig7ConfigMatchbox.py b/Generators/Herwig7_i/python/Herwig7ConfigMatchbox.py index ec466b93f0f98436a4cf68de17502477a5ad7a02..a08173615f72675c08627f5526122075d258ab80 100644 --- a/Generators/Herwig7_i/python/Herwig7ConfigMatchbox.py +++ b/Generators/Herwig7_i/python/Herwig7ConfigMatchbox.py @@ -1,5 +1,7 @@ #! /usr/bin/env python +## Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration + ## \file Herwig7ConfigMatchbox.py ## \brief Configuration class for Matchbox runs with %Herwig7 ## \author Daniel Rauch (daniel.rauch@desy.de) diff --git a/Generators/Herwig7_i/python/Herwig7ConfigMerging.py b/Generators/Herwig7_i/python/Herwig7ConfigMerging.py index 26bf6db9be45df7d5c9189fb6db2e99a4a1fb871..9980dade7c1685cedb579e8d1c82cc5741bbe557 100644 --- a/Generators/Herwig7_i/python/Herwig7ConfigMerging.py +++ b/Generators/Herwig7_i/python/Herwig7ConfigMerging.py @@ -1,5 +1,7 @@ #! /usr/bin/env python +## Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration + ## \file Herwig7ConfigMatchbox.py ## \brief Configuration class for Matchbox runs with %Herwig7 ## \author Daniel Rauch (daniel.rauch@desy.de) diff --git a/Generators/Herwig7_i/src/components/Herwig7_i_load.cxx b/Generators/Herwig7_i/src/components/Herwig7_i_load.cxx deleted file mode 100644 index 280170ff40183c59114a38cae5a5dfa3b0f0135c..0000000000000000000000000000000000000000 --- a/Generators/Herwig7_i/src/components/Herwig7_i_load.cxx +++ /dev/null @@ -1,3 +0,0 @@ -#include "GaudiKernel/LoadFactoryEntries.h" - -LOAD_FACTORY_ENTRIES(Herwig7_i)