From dca4c9a1a61dec9170a97bd5eff6f7db6fe7b739 Mon Sep 17 00:00:00 2001
From: Tetiana Moskalets <tetiana.moskalets@cern.ch>
Date: Sun, 14 Apr 2019 16:35:34 +0000
Subject: [PATCH 1/2] Delete requirements

---
 Generators/Herwig7_i/cmt/requirements | 40 ---------------------------
 1 file changed, 40 deletions(-)
 delete mode 100644 Generators/Herwig7_i/cmt/requirements

diff --git a/Generators/Herwig7_i/cmt/requirements b/Generators/Herwig7_i/cmt/requirements
deleted file mode 100644
index 945ffb12946..00000000000
--- 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"
-- 
GitLab


From 7a0dc3b37315c3437d9f4394bc345d8731b1851d Mon Sep 17 00:00:00 2001
From: Tetiana Moskalets <tetiana.moskalets@cern.ch>
Date: Sun, 14 Apr 2019 16:39:33 +0000
Subject: [PATCH 2/2] Adding (C) to python snippets, deleting cmt file,
 deleting Generators/Herwig7_i/src/components/Herwig7_i_load.cxx

---
 Generators/Herwig7_i/Herwig7_i/Herwig7.h               | 4 ++++
 Generators/Herwig7_i/doc/mainpage.h                    | 2 +-
 Generators/Herwig7_i/python/Herwig7ConfigFxFx.py       | 2 ++
 Generators/Herwig7_i/python/Herwig7ConfigGeneric.py    | 2 ++
 Generators/Herwig7_i/python/Herwig7ConfigLHEF.py       | 2 ++
 Generators/Herwig7_i/python/Herwig7ConfigMatchbox.py   | 2 ++
 Generators/Herwig7_i/python/Herwig7ConfigMerging.py    | 2 ++
 Generators/Herwig7_i/src/components/Herwig7_i_load.cxx | 3 ---
 8 files changed, 15 insertions(+), 4 deletions(-)
 delete mode 100644 Generators/Herwig7_i/src/components/Herwig7_i_load.cxx

diff --git a/Generators/Herwig7_i/Herwig7_i/Herwig7.h b/Generators/Herwig7_i/Herwig7_i/Herwig7.h
index 7d864fec61d..8ca89533c42 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/doc/mainpage.h b/Generators/Herwig7_i/doc/mainpage.h
index 2fbd8280a75..a8e97ca5b82 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 c85bf5ffc6b..b7a6ef5d354 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 ea7a388cc1d..29e880b467a 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 9fcb055a8bf..7bd132f0324 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 ec466b93f0f..a08173615f7 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 26bf6db9be4..9980dade7c1 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 280170ff401..00000000000
--- 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)
-- 
GitLab