diff --git a/Trigger/TrigT1/L1Common/python/__init__.py b/Trigger/TrigT1/L1Common/python/__init__.py
index 74583d364ec2ca794156596c7254d9b234a940c6..10eda52d21555e116affa250b4cc4c7110c820f1 100644
--- a/Trigger/TrigT1/L1Common/python/__init__.py
+++ b/Trigger/TrigT1/L1Common/python/__init__.py
@@ -1,2 +1,2 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 
diff --git a/Trigger/TrigT1/L1Common/schema/L1Specifications.xml b/Trigger/TrigT1/L1Common/schema/L1Specifications.xml
index 19196b019c02956bf73db4f8ca559745e139c3b7..16cfc3676b4fb6fc2f154ab14ad2bfd0ac767b73 100644
--- a/Trigger/TrigT1/L1Common/schema/L1Specifications.xml
+++ b/Trigger/TrigT1/L1Common/schema/L1Specifications.xml
@@ -388,7 +388,7 @@
     <CTSpec ns='v1'>
         <name>"MBTSSI_cable"</name> 
         <type>u16_mult</type>
-        <value>2, 9, 2, 0, 11, 1, 9, 3, 0, 11, 1</value>
+        <value>2, 9, 2, 0, 15, 1, 9, 3, 0, 15, 1</value>
         <comment>"number of cables, slot, connector, start, stop"</comment>
     </CTSpec>
 
diff --git a/Trigger/TrigT1/L1Common/scripts/XMLtoHeader.py b/Trigger/TrigT1/L1Common/scripts/XMLtoHeader.py
index 028c1148dd413feff77103397ad325d290bc741d..c294b1daf3b9781e2b8372cdbadc383af0af3c79 100644
--- a/Trigger/TrigT1/L1Common/scripts/XMLtoHeader.py
+++ b/Trigger/TrigT1/L1Common/scripts/XMLtoHeader.py
@@ -1,6 +1,6 @@
 #!/usr/bin/python
 
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 import os.path
 import sys
 import getopt
diff --git a/Trigger/TrigT1/L1CommonCore/L1CommonCore/CTPdataformatVersion.h b/Trigger/TrigT1/L1CommonCore/L1CommonCore/CTPdataformatVersion.h
index fbb3de24e2b56acc63d1733092d4ccf00454a5cd..26f756eb0577df9964950abc10a40055c4e6cb4a 100644
--- a/Trigger/TrigT1/L1CommonCore/L1CommonCore/CTPdataformatVersion.h
+++ b/Trigger/TrigT1/L1CommonCore/L1CommonCore/CTPdataformatVersion.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #pragma message( "The package L1CommonCore is obsolete and will be removed" )
diff --git a/Trigger/TrigT1/TrigT1BCM/TrigT1BCM/TrigT1BCM.h b/Trigger/TrigT1/TrigT1BCM/TrigT1BCM/TrigT1BCM.h
index feaee5bd694934051548d03bc87d9591b6755eea..8ac64a02162324c44eea3f6e03ce974e6d411a3a 100644
--- a/Trigger/TrigT1/TrigT1BCM/TrigT1BCM/TrigT1BCM.h
+++ b/Trigger/TrigT1/TrigT1BCM/TrigT1BCM/TrigT1BCM.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef TRIG_T1_BCM_H
diff --git a/Trigger/TrigT1/TrigT1BCM/src/TrigT1BCM.cxx b/Trigger/TrigT1/TrigT1BCM/src/TrigT1BCM.cxx
index 4e54e3f326db632f23cff25ee54afb937b4eb28f..0ee162c4b1a1237dac6ca73175d2d67fe6d1a817 100644
--- a/Trigger/TrigT1/TrigT1BCM/src/TrigT1BCM.cxx
+++ b/Trigger/TrigT1/TrigT1BCM/src/TrigT1BCM.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #include <stdint.h>
diff --git a/Trigger/TrigT1/TrigT1CTMonitoring/python/TrigT1CTMonitoringConfig.py b/Trigger/TrigT1/TrigT1CTMonitoring/python/TrigT1CTMonitoringConfig.py
index 931fb0937fa9e0e5340ac40efdf864d21e3f5c93..74e6486a037cf2d37a514c0e372fae63aea7f0d8 100644
--- a/Trigger/TrigT1/TrigT1CTMonitoring/python/TrigT1CTMonitoringConfig.py
+++ b/Trigger/TrigT1/TrigT1CTMonitoring/python/TrigT1CTMonitoringConfig.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 
 ## get a handle to the ApplicationManager
 from AthenaCommon.AppMgr import theApp
diff --git a/Trigger/TrigT1/TrigT1CTMonitoring/scripts/CheckItemDeadtimes.py b/Trigger/TrigT1/TrigT1CTMonitoring/scripts/CheckItemDeadtimes.py
index 9f5a60c16dcd4e998a3c1c1fe43908c3fb5f1a59..5e8e49f0551ac8279bd006d4e7696aeb89aefe7d 100755
--- a/Trigger/TrigT1/TrigT1CTMonitoring/scripts/CheckItemDeadtimes.py
+++ b/Trigger/TrigT1/TrigT1CTMonitoring/scripts/CheckItemDeadtimes.py
@@ -1,6 +1,6 @@
 #!/bin/env python
 
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 
 import os, sys, getopt, math
 import CoolHelper
diff --git a/Trigger/TrigT1/TrigT1CTMonitoring/scripts/CoolHelper.py b/Trigger/TrigT1/TrigT1CTMonitoring/scripts/CoolHelper.py
index 4d5a3274533c04bda33af6e87a603259845f2058..d48768a855093a4c9450efcfff70a1494c934e23 100644
--- a/Trigger/TrigT1/TrigT1CTMonitoring/scripts/CoolHelper.py
+++ b/Trigger/TrigT1/TrigT1CTMonitoring/scripts/CoolHelper.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 
 import sys
 from PyCool import cool,coral
diff --git a/Trigger/TrigT1/TrigT1CTMonitoring/scripts/GetItemOutput.py b/Trigger/TrigT1/TrigT1CTMonitoring/scripts/GetItemOutput.py
index 1945d37be74464e18498c6eb145ee84ae56aed82..3862015a5362756e828a29b790114da5bb6685d2 100755
--- a/Trigger/TrigT1/TrigT1CTMonitoring/scripts/GetItemOutput.py
+++ b/Trigger/TrigT1/TrigT1CTMonitoring/scripts/GetItemOutput.py
@@ -1,6 +1,6 @@
 #!/bin/env python
 
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 
 import os, sys, getopt, math
 import CoolHelper
diff --git a/Trigger/TrigT1/TrigT1CTMonitoring/scripts/ReadLumiBcid.py b/Trigger/TrigT1/TrigT1CTMonitoring/scripts/ReadLumiBcid.py
index 346f7d12d71cadaed90046431bac93793eb73527..db881d089ba216df4aae0bdff09fd103aaf8f769 100755
--- a/Trigger/TrigT1/TrigT1CTMonitoring/scripts/ReadLumiBcid.py
+++ b/Trigger/TrigT1/TrigT1CTMonitoring/scripts/ReadLumiBcid.py
@@ -1,6 +1,6 @@
 #!/bin/env python
 
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 
 import sys,getopt,os, math
 from PyCool import cool,coral
diff --git a/Trigger/TrigT1/TrigT1CTMonitoring/scripts/ReadPbmCounters.py b/Trigger/TrigT1/TrigT1CTMonitoring/scripts/ReadPbmCounters.py
index ea4d7fb7926e2f87f35c26014e2ce19d2d0594ec..13cd7c051a0d115852ba6dd9959170dc519b2d8d 100755
--- a/Trigger/TrigT1/TrigT1CTMonitoring/scripts/ReadPbmCounters.py
+++ b/Trigger/TrigT1/TrigT1CTMonitoring/scripts/ReadPbmCounters.py
@@ -1,6 +1,6 @@
 #!/bin/env python
 
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 
 import sys,getopt,os, math
 from PyCool import cool,coral
diff --git a/Trigger/TrigT1/TrigT1CTMonitoring/scripts/busy_cool_plot.py b/Trigger/TrigT1/TrigT1CTMonitoring/scripts/busy_cool_plot.py
index 3a35c9176ab8214944d019f5911371cea63759d7..7aac9cc05a7d3a3acba5a2d04e4362bc8c8b27c4 100755
--- a/Trigger/TrigT1/TrigT1CTMonitoring/scripts/busy_cool_plot.py
+++ b/Trigger/TrigT1/TrigT1CTMonitoring/scripts/busy_cool_plot.py
@@ -1,6 +1,6 @@
 #!/bin/env python2.5
 
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 #
 # L1CT crew, Johan.Lundberg@cern.ch, CERN, 2009
 
diff --git a/Trigger/TrigT1/TrigT1CTMonitoring/scripts/busy_cool_reader.py b/Trigger/TrigT1/TrigT1CTMonitoring/scripts/busy_cool_reader.py
index da4c12eae738f03b8bd0e340bc410b0aac5fbaad..9689b7eb864c1a56214f36f23ed25a42e220e00d 100755
--- a/Trigger/TrigT1/TrigT1CTMonitoring/scripts/busy_cool_reader.py
+++ b/Trigger/TrigT1/TrigT1CTMonitoring/scripts/busy_cool_reader.py
@@ -1,6 +1,6 @@
 #!/bin/env python
 
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 #
 # Level 1 Central Trigger crew,
 # Johan.Lundberg@cern.ch, CERN, 2009
diff --git a/Trigger/TrigT1/TrigT1CTMonitoring/scripts/busy_py.py b/Trigger/TrigT1/TrigT1CTMonitoring/scripts/busy_py.py
index 9a701e2d20ffb21f4e1da0f57188ed3a0bb3e5a1..340444fbc06cc1777a1fa4ca403fc05bc2fc0daa 100644
--- a/Trigger/TrigT1/TrigT1CTMonitoring/scripts/busy_py.py
+++ b/Trigger/TrigT1/TrigT1CTMonitoring/scripts/busy_py.py
@@ -1,6 +1,6 @@
 #!/bin/env python2.5
 
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 #
 # Level 1 Central Trigger crew,
 # Johan.Lundberg@cern.ch, CERN, 2009
diff --git a/Trigger/TrigT1/TrigT1CTMonitoring/scripts/check_ctp_deadtime.py b/Trigger/TrigT1/TrigT1CTMonitoring/scripts/check_ctp_deadtime.py
index 16bc6fcb038c0443ea4663d64d841f017982e7a7..dee806db49a91de85bbe13a08f1db38386032d3e 100755
--- a/Trigger/TrigT1/TrigT1CTMonitoring/scripts/check_ctp_deadtime.py
+++ b/Trigger/TrigT1/TrigT1CTMonitoring/scripts/check_ctp_deadtime.py
@@ -1,6 +1,6 @@
 #!/bin/env python
 
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 
 import sys,getopt,os
 from PyCool import cool,coral
diff --git a/Trigger/TrigT1/TrigT1CTMonitoring/scripts/cool_plot_lvl1rates.py b/Trigger/TrigT1/TrigT1CTMonitoring/scripts/cool_plot_lvl1rates.py
index 09247d941260ce2eb4f388aa8e3e3c6c3d5302e9..eec6f4ccd7a7534ec32d6c7a8593ba7aec71fc1f 100755
--- a/Trigger/TrigT1/TrigT1CTMonitoring/scripts/cool_plot_lvl1rates.py
+++ b/Trigger/TrigT1/TrigT1CTMonitoring/scripts/cool_plot_lvl1rates.py
@@ -1,6 +1,6 @@
 #!/bin/env python2.5
 
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 #
 # L1CT crew, Johan.Lundberg@cern.ch, CERN, 2010
 #
diff --git a/Trigger/TrigT1/TrigT1CTMonitoring/scripts/cool_read_livetime.py b/Trigger/TrigT1/TrigT1CTMonitoring/scripts/cool_read_livetime.py
index 600fe9f6af846c6a9e4d82083340b6be97b87c95..f0c8498ff371403237fb534d27cccc256e1041e2 100755
--- a/Trigger/TrigT1/TrigT1CTMonitoring/scripts/cool_read_livetime.py
+++ b/Trigger/TrigT1/TrigT1CTMonitoring/scripts/cool_read_livetime.py
@@ -1,6 +1,6 @@
 #!/bin/env python
 
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 
 # TODO: check for overflows of counters!
 # TODO: option to print out counters instead of rates
diff --git a/Trigger/TrigT1/TrigT1CTMonitoring/scripts/cool_read_lvl1rates.py b/Trigger/TrigT1/TrigT1CTMonitoring/scripts/cool_read_lvl1rates.py
index e3bd3a4f469028f7abcc816a4fec9c0e56db5bd6..7317016330cf8f8bf089954531086b093f8adc0c 100755
--- a/Trigger/TrigT1/TrigT1CTMonitoring/scripts/cool_read_lvl1rates.py
+++ b/Trigger/TrigT1/TrigT1CTMonitoring/scripts/cool_read_lvl1rates.py
@@ -1,6 +1,6 @@
 #!/bin/env python
 
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 
 # TODO: check for overflows of counters!
 # TODO: option to print out counters instead of rates
diff --git a/Trigger/TrigT1/TrigT1CTMonitoring/scripts/cool_read_lvl1rates_get_lumi.py b/Trigger/TrigT1/TrigT1CTMonitoring/scripts/cool_read_lvl1rates_get_lumi.py
index a08ef9320e24016059b12d2b314bef78ba27fe6d..0cd70e61172501d2b72dca8719a9024df589a53a 100755
--- a/Trigger/TrigT1/TrigT1CTMonitoring/scripts/cool_read_lvl1rates_get_lumi.py
+++ b/Trigger/TrigT1/TrigT1CTMonitoring/scripts/cool_read_lvl1rates_get_lumi.py
@@ -1,6 +1,6 @@
 #!/bin/env python
 
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 
 # TODO: check for overflows of counters!
 # TODO: option to print out counters instead of rates
diff --git a/Trigger/TrigT1/TrigT1CTMonitoring/scripts/ctpin_cool_plot.py b/Trigger/TrigT1/TrigT1CTMonitoring/scripts/ctpin_cool_plot.py
index b6a18e3abde9f84690f22ce49cc05ef83c6908e1..7d72e1fd5a0153db84c2b6db320c6c71fc965617 100755
--- a/Trigger/TrigT1/TrigT1CTMonitoring/scripts/ctpin_cool_plot.py
+++ b/Trigger/TrigT1/TrigT1CTMonitoring/scripts/ctpin_cool_plot.py
@@ -1,6 +1,6 @@
 #!/bin/env python2.5
 
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 #
 # L1CT crew, Johan.Lundberg@cern.ch, CERN, 2009
 
diff --git a/Trigger/TrigT1/TrigT1CTMonitoring/scripts/ctpin_cool_reader.py b/Trigger/TrigT1/TrigT1CTMonitoring/scripts/ctpin_cool_reader.py
index 5684dcf1f14175f552836dfed88fe23c1516bb92..7afd526a0161b9ec8d22f6f0f6bcd5f5e7123392 100755
--- a/Trigger/TrigT1/TrigT1CTMonitoring/scripts/ctpin_cool_reader.py
+++ b/Trigger/TrigT1/TrigT1CTMonitoring/scripts/ctpin_cool_reader.py
@@ -1,6 +1,6 @@
 #!/bin/env python2.5
 
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 #
 # Level 1 Central Trigger crew,
 # Johan.Lundberg@cern.ch, CERN, 2009
diff --git a/Trigger/TrigT1/TrigT1CTMonitoring/scripts/ctpin_py.py b/Trigger/TrigT1/TrigT1CTMonitoring/scripts/ctpin_py.py
index 74b770a1a6425c7fcf67d18c917a15e033d0ab1a..9718896b4a457c18c28dd17d2d0411666ad53372 100644
--- a/Trigger/TrigT1/TrigT1CTMonitoring/scripts/ctpin_py.py
+++ b/Trigger/TrigT1/TrigT1CTMonitoring/scripts/ctpin_py.py
@@ -1,6 +1,6 @@
 #!/bin/env python2.5
 
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 #
 # Level 1 Central Trigger crew,
 # Johan.Lundberg@cern.ch, CERN, 2009
diff --git a/Trigger/TrigT1/TrigT1CTMonitoring/scripts/ctpin_readconfig.py b/Trigger/TrigT1/TrigT1CTMonitoring/scripts/ctpin_readconfig.py
index f433caf668ba138ed8c8929dddff3024e343866b..6c34427bb0dcf23b6e16b132ff46e7549b981b4c 100755
--- a/Trigger/TrigT1/TrigT1CTMonitoring/scripts/ctpin_readconfig.py
+++ b/Trigger/TrigT1/TrigT1CTMonitoring/scripts/ctpin_readconfig.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python2.5
 
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 
 #!/bin/env python2.5
 #
diff --git a/Trigger/TrigT1/TrigT1CTMonitoring/scripts/ctpmon_cool_plot.py b/Trigger/TrigT1/TrigT1CTMonitoring/scripts/ctpmon_cool_plot.py
index 3b9cca0a59c092569aab3a3d90c0b32a678ecf7e..ab7844b4ca4c4577bde7d599d938d9b19250060a 100755
--- a/Trigger/TrigT1/TrigT1CTMonitoring/scripts/ctpmon_cool_plot.py
+++ b/Trigger/TrigT1/TrigT1CTMonitoring/scripts/ctpmon_cool_plot.py
@@ -1,6 +1,6 @@
 #!/bin/env python2.5
 
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 #
 # L1CT crew, Johan.Lundberg@cern.ch, CERN, 2009
 
diff --git a/Trigger/TrigT1/TrigT1CTMonitoring/scripts/ctpmon_cool_reader.py b/Trigger/TrigT1/TrigT1CTMonitoring/scripts/ctpmon_cool_reader.py
index 08f526b42a09d2e6cd5d87e6d76f66f579655998..37e6bebbe6de026d37de1033fcede8a3b2ad8721 100755
--- a/Trigger/TrigT1/TrigT1CTMonitoring/scripts/ctpmon_cool_reader.py
+++ b/Trigger/TrigT1/TrigT1CTMonitoring/scripts/ctpmon_cool_reader.py
@@ -1,6 +1,6 @@
 #!/bin/env python2.5
 
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 #
 # Level 1 Central Trigger crew,
 # Johan.Lundberg@cern.ch, CERN, 2009
diff --git a/Trigger/TrigT1/TrigT1CTMonitoring/scripts/ctpmon_py.py b/Trigger/TrigT1/TrigT1CTMonitoring/scripts/ctpmon_py.py
index 65d028d1900d3d72f57329082cd47c1331bee9cc..42ae2fa47a27ec3affad4a647620a0e4320e6db8 100644
--- a/Trigger/TrigT1/TrigT1CTMonitoring/scripts/ctpmon_py.py
+++ b/Trigger/TrigT1/TrigT1CTMonitoring/scripts/ctpmon_py.py
@@ -1,6 +1,6 @@
 #!/bin/env python2.5
 
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 #
 # Level 1 Central Trigger crew,
 # Johan.Lundberg@cern.ch, CERN, 2009
diff --git a/Trigger/TrigT1/TrigT1CTMonitoring/scripts/fillLVL1histograms.py b/Trigger/TrigT1/TrigT1CTMonitoring/scripts/fillLVL1histograms.py
index b587f10ff5e79728da4e0cc68468564ca786076e..193e730c7e72fa25f2d3e35a0ba7a7053f75515f 100755
--- a/Trigger/TrigT1/TrigT1CTMonitoring/scripts/fillLVL1histograms.py
+++ b/Trigger/TrigT1/TrigT1CTMonitoring/scripts/fillLVL1histograms.py
@@ -1,6 +1,6 @@
 #!/bin/env python
 
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 # set the folder description for the trigger schema (not set by default)
 
 import sys,getopt,os
diff --git a/Trigger/TrigT1/TrigT1CTMonitoring/scripts/l1ct_RunStatus.py b/Trigger/TrigT1/TrigT1CTMonitoring/scripts/l1ct_RunStatus.py
index 82c51b71f1fa80e5d4f4b56485550987766cb961..f8a86ae41794303168e6103043ffdb252a4be818 100755
--- a/Trigger/TrigT1/TrigT1CTMonitoring/scripts/l1ct_RunStatus.py
+++ b/Trigger/TrigT1/TrigT1CTMonitoring/scripts/l1ct_RunStatus.py
@@ -1,6 +1,6 @@
 #!/bin/env python2.5
 
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 ##
 ## Central Trigger Crew, Johan Lundberg, 2009
 #
diff --git a/Trigger/TrigT1/TrigT1CTMonitoring/scripts/l1ct_lb2time.py b/Trigger/TrigT1/TrigT1CTMonitoring/scripts/l1ct_lb2time.py
index 443e015f2dc9317cd1a225edcb084b74c2225c13..bddb61ae3ca876be5d59d002b22752a352aa96a2 100755
--- a/Trigger/TrigT1/TrigT1CTMonitoring/scripts/l1ct_lb2time.py
+++ b/Trigger/TrigT1/TrigT1CTMonitoring/scripts/l1ct_lb2time.py
@@ -1,6 +1,6 @@
 #!/bin/env python2.5
 
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 #
 # Level 1 Central Trigger crew,
 # Johan.Lundberg@cern.ch, CERN, 2009
diff --git a/Trigger/TrigT1/TrigT1CTMonitoring/scripts/l1ct_read_counter_conf.py b/Trigger/TrigT1/TrigT1CTMonitoring/scripts/l1ct_read_counter_conf.py
index c50e01fa9ded33e05a41b0d57c3e56907cca26b3..3924bc02d38ce0932fe47ffec7bd6b927133d12d 100755
--- a/Trigger/TrigT1/TrigT1CTMonitoring/scripts/l1ct_read_counter_conf.py
+++ b/Trigger/TrigT1/TrigT1CTMonitoring/scripts/l1ct_read_counter_conf.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python2.5
 
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 
 #!/bin/env python2.5
 #
diff --git a/Trigger/TrigT1/TrigT1CTMonitoring/scripts/l1ct_runNr.py b/Trigger/TrigT1/TrigT1CTMonitoring/scripts/l1ct_runNr.py
index a6566e0b88a4cebce39026de425a5a8b3a3b5b08..3fb5176c12a8d502ffd156a89c21fb4e4ef37421 100755
--- a/Trigger/TrigT1/TrigT1CTMonitoring/scripts/l1ct_runNr.py
+++ b/Trigger/TrigT1/TrigT1CTMonitoring/scripts/l1ct_runNr.py
@@ -1,6 +1,6 @@
 #!/bin/env python2.5
 
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 ##
 ## Central Trigger Crew, Johan Lundberg, 2009
 #
diff --git a/Trigger/TrigT1/TrigT1CTMonitoring/scripts/l1ctpy.py b/Trigger/TrigT1/TrigT1CTMonitoring/scripts/l1ctpy.py
index 45711ea62f58d46e426830b2f9e0fa3ec3df19d8..b81bdfec0e14b2c1c8c6379153ca7b719c1e90a0 100644
--- a/Trigger/TrigT1/TrigT1CTMonitoring/scripts/l1ctpy.py
+++ b/Trigger/TrigT1/TrigT1CTMonitoring/scripts/l1ctpy.py
@@ -1,6 +1,6 @@
 #!/bin/env python2.5
 
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 #
 # Level 1 Central Trigger crew,
 # Johan.Lundberg@cern.ch, CERN, 2009
diff --git a/Trigger/TrigT1/TrigT1CTMonitoring/scripts/read_bunchgroups.py b/Trigger/TrigT1/TrigT1CTMonitoring/scripts/read_bunchgroups.py
index 014d72772fbbfd96b02c772f267863c1b6ebd315..9e046a1044f4cc9a1f9b4e52501d0f588f91d6b3 100755
--- a/Trigger/TrigT1/TrigT1CTMonitoring/scripts/read_bunchgroups.py
+++ b/Trigger/TrigT1/TrigT1CTMonitoring/scripts/read_bunchgroups.py
@@ -1,6 +1,6 @@
 #!/bin/env python
 
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 
 import sys,getopt,os
 from PyCool import cool,coral
diff --git a/Trigger/TrigT1/TrigT1CTMonitoring/src/BSMonitoring.cxx b/Trigger/TrigT1/TrigT1CTMonitoring/src/BSMonitoring.cxx
index 393d6735bb1a214a85747833d67c58c44d4673dc..a96097d02bd81bbec320087412dabd77be331d01 100644
--- a/Trigger/TrigT1/TrigT1CTMonitoring/src/BSMonitoring.cxx
+++ b/Trigger/TrigT1/TrigT1CTMonitoring/src/BSMonitoring.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 /// Gaudi includes
diff --git a/Trigger/TrigT1/TrigT1CTMonitoring/src/BSMonitoring.h b/Trigger/TrigT1/TrigT1CTMonitoring/src/BSMonitoring.h
index 984bac770cdcdf6ac5d5a8766ce044a306c81d38..850741fe7d7f40bd31a3051146881284141cc9c8 100644
--- a/Trigger/TrigT1/TrigT1CTMonitoring/src/BSMonitoring.h
+++ b/Trigger/TrigT1/TrigT1CTMonitoring/src/BSMonitoring.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef TRIGT1_CTMONITORING_BSMONITORING_H
diff --git a/Trigger/TrigT1/TrigT1CTMonitoring/src/DeriveSimulationInputs.cxx b/Trigger/TrigT1/TrigT1CTMonitoring/src/DeriveSimulationInputs.cxx
index ab65afc805e49fba230d5a2925b218cdfe5f485d..84ba68154b1702e0741e7501a57a6263e71a919b 100644
--- a/Trigger/TrigT1/TrigT1CTMonitoring/src/DeriveSimulationInputs.cxx
+++ b/Trigger/TrigT1/TrigT1CTMonitoring/src/DeriveSimulationInputs.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 // STL includes:
diff --git a/Trigger/TrigT1/TrigT1CTMonitoring/src/DeriveSimulationInputs.h b/Trigger/TrigT1/TrigT1CTMonitoring/src/DeriveSimulationInputs.h
index 248e1d5eac194eb58524fb81ad4f9c6b2e8e6b27..705cb4aa6842ec1269a65a44ee928002dcd517f8 100644
--- a/Trigger/TrigT1/TrigT1CTMonitoring/src/DeriveSimulationInputs.h
+++ b/Trigger/TrigT1/TrigT1CTMonitoring/src/DeriveSimulationInputs.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef TRIGT1CTMONITORING_DERIVESIMULATIONINPUTS_H
diff --git a/Trigger/TrigT1/TrigT1CTP/TrigT1CTP/BunchGroupTrigger.h b/Trigger/TrigT1/TrigT1CTP/TrigT1CTP/BunchGroupTrigger.h
index a075545bcfc05a6af5361efbc3fcf91544741ac3..06f70f36d9d0b71bd13b5af395c63993980c6533 100755
--- a/Trigger/TrigT1/TrigT1CTP/TrigT1CTP/BunchGroupTrigger.h
+++ b/Trigger/TrigT1/TrigT1CTP/TrigT1CTP/BunchGroupTrigger.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef TRIGT1CTP_BUNCH_GROUP_TRIGGER_H
diff --git a/Trigger/TrigT1/TrigT1CTP/TrigT1CTP/CTPConstants.h b/Trigger/TrigT1/TrigT1CTP/TrigT1CTP/CTPConstants.h
index b4b98403ee51082c1c6dc89280f9788adcd7a7c1..c2c28ea07f2a314fe1dec4a707a01734acabd052 100755
--- a/Trigger/TrigT1/TrigT1CTP/TrigT1CTP/CTPConstants.h
+++ b/Trigger/TrigT1/TrigT1CTP/TrigT1CTP/CTPConstants.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 
diff --git a/Trigger/TrigT1/TrigT1CTP/TrigT1CTP/CTPDataDumper.h b/Trigger/TrigT1/TrigT1CTP/TrigT1CTP/CTPDataDumper.h
index 194620516b61be59bba6722903ccb165fb1a2399..6b6ee13bdd9b00ed12f6956d5ef5b06ff5a7cf04 100755
--- a/Trigger/TrigT1/TrigT1CTP/TrigT1CTP/CTPDataDumper.h
+++ b/Trigger/TrigT1/TrigT1CTP/TrigT1CTP/CTPDataDumper.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 
diff --git a/Trigger/TrigT1/TrigT1CTP/TrigT1CTP/CTPSimulation.h b/Trigger/TrigT1/TrigT1CTP/TrigT1CTP/CTPSimulation.h
index 1a8efae5d2d07d0c681d1447a18fd1cc07524fcb..207568a851c08a1ead38eab24ae2fd8ed629d8d0 100755
--- a/Trigger/TrigT1/TrigT1CTP/TrigT1CTP/CTPSimulation.h
+++ b/Trigger/TrigT1/TrigT1CTP/TrigT1CTP/CTPSimulation.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 
diff --git a/Trigger/TrigT1/TrigT1CTP/TrigT1CTP/CTPTriggerItem.h b/Trigger/TrigT1/TrigT1CTP/TrigT1CTP/CTPTriggerItem.h
index 0c5ba3a76c76f1be0d9805485662e691c6324c0d..70d98fe340c9a52c62a043bf5e1fd598e3fe9df7 100755
--- a/Trigger/TrigT1/TrigT1CTP/TrigT1CTP/CTPTriggerItem.h
+++ b/Trigger/TrigT1/TrigT1CTP/TrigT1CTP/CTPTriggerItem.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 
diff --git a/Trigger/TrigT1/TrigT1CTP/TrigT1CTP/CTPTriggerItemNode.h b/Trigger/TrigT1/TrigT1CTP/TrigT1CTP/CTPTriggerItemNode.h
index 1a2ffc1ca139991d0946a4ed24ac2214eee6d60e..3d21f009acb3929677b866dcf08500989e6819ac 100755
--- a/Trigger/TrigT1/TrigT1CTP/TrigT1CTP/CTPTriggerItemNode.h
+++ b/Trigger/TrigT1/TrigT1CTP/TrigT1CTP/CTPTriggerItemNode.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 
diff --git a/Trigger/TrigT1/TrigT1CTP/TrigT1CTP/CTPTriggerThreshold.h b/Trigger/TrigT1/TrigT1CTP/TrigT1CTP/CTPTriggerThreshold.h
index 14e0f8bc5d1a77decbc3567942e8b0440721e824..a38508a79b7b0add0cc138d7d9cb67f69dbc2760 100755
--- a/Trigger/TrigT1/TrigT1CTP/TrigT1CTP/CTPTriggerThreshold.h
+++ b/Trigger/TrigT1/TrigT1CTP/TrigT1CTP/CTPTriggerThreshold.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 
diff --git a/Trigger/TrigT1/TrigT1CTP/TrigT1CTP/CTPUtil.h b/Trigger/TrigT1/TrigT1CTP/TrigT1CTP/CTPUtil.h
index 4c265b3b31709b43c7d8e02026eebbf786896c02..0977e0cd3f478b7a098ca387d9553ab37e6193b2 100755
--- a/Trigger/TrigT1/TrigT1CTP/TrigT1CTP/CTPUtil.h
+++ b/Trigger/TrigT1/TrigT1CTP/TrigT1CTP/CTPUtil.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 
diff --git a/Trigger/TrigT1/TrigT1CTP/TrigT1CTP/CustomBit.h b/Trigger/TrigT1/TrigT1CTP/TrigT1CTP/CustomBit.h
index fad9b8be76ae3ea28889f829c4924b275b0e4498..1ed211e19a5b59e600fc3fa74019bea7b6cf873a 100644
--- a/Trigger/TrigT1/TrigT1CTP/TrigT1CTP/CustomBit.h
+++ b/Trigger/TrigT1/TrigT1CTP/TrigT1CTP/CustomBit.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 
diff --git a/Trigger/TrigT1/TrigT1CTP/TrigT1CTP/EventInfo.h b/Trigger/TrigT1/TrigT1CTP/TrigT1CTP/EventInfo.h
index 6024c1f98192d17a1bae02e45716756a1000753d..08cfed385cfe3cdb636ea1e11bd6d16b8f53598b 100755
--- a/Trigger/TrigT1/TrigT1CTP/TrigT1CTP/EventInfo.h
+++ b/Trigger/TrigT1/TrigT1CTP/TrigT1CTP/EventInfo.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef TRIGT1CTP_EVENTINFO_H
diff --git a/Trigger/TrigT1/TrigT1CTP/TrigT1CTP/ISpecialTrigger.h b/Trigger/TrigT1/TrigT1CTP/TrigT1CTP/ISpecialTrigger.h
index 0451dab8a92ceea36407e98f43776911154f9fdc..7fff61f754075020c484bb3f9fb03d7f3c906c8e 100755
--- a/Trigger/TrigT1/TrigT1CTP/TrigT1CTP/ISpecialTrigger.h
+++ b/Trigger/TrigT1/TrigT1CTP/TrigT1CTP/ISpecialTrigger.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef TRIGT1CTP_ISPECIAL_TRIGGER_H
diff --git a/Trigger/TrigT1/TrigT1CTP/TrigT1CTP/ItemMap.h b/Trigger/TrigT1/TrigT1CTP/TrigT1CTP/ItemMap.h
index 4de5e65570434d48ea7ca877d65b523957f63823..190e64f1c9acfdd466b5a13c6b927e8c224f458e 100755
--- a/Trigger/TrigT1/TrigT1CTP/TrigT1CTP/ItemMap.h
+++ b/Trigger/TrigT1/TrigT1CTP/TrigT1CTP/ItemMap.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 
diff --git a/Trigger/TrigT1/TrigT1CTP/TrigT1CTP/MsgLogger.h b/Trigger/TrigT1/TrigT1CTP/TrigT1CTP/MsgLogger.h
index 27335d93268c09aa4504f0057334562f0702dfbf..55bcaa610095d42fa01f6cf540b1a9cde0472ec4 100755
--- a/Trigger/TrigT1/TrigT1CTP/TrigT1CTP/MsgLogger.h
+++ b/Trigger/TrigT1/TrigT1CTP/TrigT1CTP/MsgLogger.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef TRIGT1CTP_MSGLOGGER_H
diff --git a/Trigger/TrigT1/TrigT1CTP/TrigT1CTP/MsgWriter.h b/Trigger/TrigT1/TrigT1CTP/TrigT1CTP/MsgWriter.h
index ffe7912a1a7949b507a19b3d72e82ac4891de4f7..35f1c1f00e8e01b94f0bd59d2d369528ca34051e 100755
--- a/Trigger/TrigT1/TrigT1CTP/TrigT1CTP/MsgWriter.h
+++ b/Trigger/TrigT1/TrigT1CTP/TrigT1CTP/MsgWriter.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef TRIGT1CTP_MSGWRITER_H
diff --git a/Trigger/TrigT1/TrigT1CTP/TrigT1CTP/PrescaledClockTrigger.h b/Trigger/TrigT1/TrigT1CTP/TrigT1CTP/PrescaledClockTrigger.h
index ef76bac1843fd5b0b0e5e195ae5be6831d97771a..6488c87406f4c53e8505989023e53fd118225b71 100755
--- a/Trigger/TrigT1/TrigT1CTP/TrigT1CTP/PrescaledClockTrigger.h
+++ b/Trigger/TrigT1/TrigT1CTP/TrigT1CTP/PrescaledClockTrigger.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef TRIGT1CTP_PRESCALED_CLOCK_TRIGGER_H
diff --git a/Trigger/TrigT1/TrigT1CTP/TrigT1CTP/RandomTrigger.h b/Trigger/TrigT1/TrigT1CTP/TrigT1CTP/RandomTrigger.h
index 835684ff8727ac0b404b5c857ea5274b4e6dc1d5..0788d4f3100af4a6ebecb8c3827dca07ba4ce004 100755
--- a/Trigger/TrigT1/TrigT1CTP/TrigT1CTP/RandomTrigger.h
+++ b/Trigger/TrigT1/TrigT1CTP/TrigT1CTP/RandomTrigger.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef TRIGT1CTP_RANDOM_TRIGGER_H
diff --git a/Trigger/TrigT1/TrigT1CTP/TrigT1CTP/ResultBuilder.h b/Trigger/TrigT1/TrigT1CTP/TrigT1CTP/ResultBuilder.h
index 8042cfead0f599b7b176623c05f81b9ddd374b7d..28aa9c214e3cd991c9f4457f70a9da6f6809c038 100755
--- a/Trigger/TrigT1/TrigT1CTP/TrigT1CTP/ResultBuilder.h
+++ b/Trigger/TrigT1/TrigT1CTP/TrigT1CTP/ResultBuilder.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 
diff --git a/Trigger/TrigT1/TrigT1CTP/TrigT1CTP/SpecialTrigger.h b/Trigger/TrigT1/TrigT1CTP/TrigT1CTP/SpecialTrigger.h
index a748c2b712a18c9e0495957a568b7874eca6e7a0..b5036cd5d0509b0254c381a93a1e92db3c32d499 100755
--- a/Trigger/TrigT1/TrigT1CTP/TrigT1CTP/SpecialTrigger.h
+++ b/Trigger/TrigT1/TrigT1CTP/TrigT1CTP/SpecialTrigger.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef TRIGT1CTP_SPECIAL_TRIGGER_H
diff --git a/Trigger/TrigT1/TrigT1CTP/TrigT1CTP/ThresholdMap.h b/Trigger/TrigT1/TrigT1CTP/TrigT1CTP/ThresholdMap.h
index 9f0e04cf83a4cd094955494816514c6edb7a8fdc..169cf5efe62ea64b0f50e1a53ebc2fb02fea07b5 100755
--- a/Trigger/TrigT1/TrigT1CTP/TrigT1CTP/ThresholdMap.h
+++ b/Trigger/TrigT1/TrigT1CTP/TrigT1CTP/ThresholdMap.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 
diff --git a/Trigger/TrigT1/TrigT1CTP/doc/packagedoc.h b/Trigger/TrigT1/TrigT1CTP/doc/packagedoc.h
index 95c2e65b7136a161862e4b090e890befb789fd13..c4a3af78178f418d4d270bd0b2f2f6407bba4ce9 100644
--- a/Trigger/TrigT1/TrigT1CTP/doc/packagedoc.h
+++ b/Trigger/TrigT1/TrigT1CTP/doc/packagedoc.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 /**
diff --git a/Trigger/TrigT1/TrigT1CTP/python/TrigT1CTPAlgorithmConfig.py b/Trigger/TrigT1/TrigT1CTP/python/TrigT1CTPAlgorithmConfig.py
index 108dd5f3531f0e63e493289545f61e579b24209a..fb8ab68c1502933bd502adae19903c5ca3ab9ba1 100755
--- a/Trigger/TrigT1/TrigT1CTP/python/TrigT1CTPAlgorithmConfig.py
+++ b/Trigger/TrigT1/TrigT1CTP/python/TrigT1CTPAlgorithmConfig.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 
 ## get a handle to the default top-level algorithm sequence
 from AthenaCommon.AlgSequence import AlgSequence
diff --git a/Trigger/TrigT1/TrigT1CTP/python/TrigT1CTPConfig.py b/Trigger/TrigT1/TrigT1CTP/python/TrigT1CTPConfig.py
index 7a377c7490f92fa1be0d50e5524ebb5ec49d6074..3dbfcce895319355cc7deb6061f45e23dcbb5356 100755
--- a/Trigger/TrigT1/TrigT1CTP/python/TrigT1CTPConfig.py
+++ b/Trigger/TrigT1/TrigT1CTP/python/TrigT1CTPConfig.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 
 
 from TrigT1CTP.TrigT1CTPConf import *
diff --git a/Trigger/TrigT1/TrigT1CTP/python/TrigT1CTPMonitoring.py b/Trigger/TrigT1/TrigT1CTP/python/TrigT1CTPMonitoring.py
index f4e63f7b82b693902294b09645a29fc4a9ee30ce..055a168211b9425f20ed92345e51b088fb65bb71 100644
--- a/Trigger/TrigT1/TrigT1CTP/python/TrigT1CTPMonitoring.py
+++ b/Trigger/TrigT1/TrigT1CTP/python/TrigT1CTPMonitoring.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 
 from TrigMonitorBase.TrigGenericMonitoringToolConfig import defineHistogram, TrigGenericMonitoringToolConfig
 
diff --git a/Trigger/TrigT1/TrigT1CTP/python/__init__.py b/Trigger/TrigT1/TrigT1CTP/python/__init__.py
index 4be847f2362e42aceef1ec4bf9c26ead3734b124..a06fe23f11180c418edab295e19512ef9b1bcc8d 100755
--- a/Trigger/TrigT1/TrigT1CTP/python/__init__.py
+++ b/Trigger/TrigT1/TrigT1CTP/python/__init__.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 
 #
 # $Id: __init__.py,v 1.4 2008-06-10 13:48:37 efeld Exp $
diff --git a/Trigger/TrigT1/TrigT1CTP/src/BunchGroupTrigger.cxx b/Trigger/TrigT1/TrigT1CTP/src/BunchGroupTrigger.cxx
index f37598542d0623d71fc3309c53a38e4b91e1c3c0..1eac40d958e0596f02a1414e06c714725386afc8 100755
--- a/Trigger/TrigT1/TrigT1CTP/src/BunchGroupTrigger.cxx
+++ b/Trigger/TrigT1/TrigT1CTP/src/BunchGroupTrigger.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #include "TrigT1CTP/BunchGroupTrigger.h"
diff --git a/Trigger/TrigT1/TrigT1CTP/src/CTPConstants.cxx b/Trigger/TrigT1/TrigT1CTP/src/CTPConstants.cxx
index d08cd7297605591341950c4448f5d4162a6acfbd..0be2fb746310851998b9f4ab5db85f0ad6a743b7 100755
--- a/Trigger/TrigT1/TrigT1CTP/src/CTPConstants.cxx
+++ b/Trigger/TrigT1/TrigT1CTP/src/CTPConstants.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 
diff --git a/Trigger/TrigT1/TrigT1CTP/src/CTPDataDumper.cxx b/Trigger/TrigT1/TrigT1CTP/src/CTPDataDumper.cxx
index 2a2d38f071e242a0b9138601b57408e007a26d7f..53e0173335215760a899a47e8da61872e84fe7d0 100755
--- a/Trigger/TrigT1/TrigT1CTP/src/CTPDataDumper.cxx
+++ b/Trigger/TrigT1/TrigT1CTP/src/CTPDataDumper.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 
diff --git a/Trigger/TrigT1/TrigT1CTP/src/CTPSimulation.cxx b/Trigger/TrigT1/TrigT1CTP/src/CTPSimulation.cxx
index 56a9dc823006e23f27315f2911af1c3faf25fb7d..84aefde472f8f45fa5ad0376fb24fff12ef425bc 100755
--- a/Trigger/TrigT1/TrigT1CTP/src/CTPSimulation.cxx
+++ b/Trigger/TrigT1/TrigT1CTP/src/CTPSimulation.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 // STL includes:
diff --git a/Trigger/TrigT1/TrigT1CTP/src/CTPTriggerItem.cxx b/Trigger/TrigT1/TrigT1CTP/src/CTPTriggerItem.cxx
index 38907a1d54d690b0587ada0cb9a65eeb052e88e5..beab386acb39f6106ded24da0060496daedc686a 100755
--- a/Trigger/TrigT1/TrigT1CTP/src/CTPTriggerItem.cxx
+++ b/Trigger/TrigT1/TrigT1CTP/src/CTPTriggerItem.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 
diff --git a/Trigger/TrigT1/TrigT1CTP/src/CTPTriggerItemNode.cxx b/Trigger/TrigT1/TrigT1CTP/src/CTPTriggerItemNode.cxx
index ddf8a31c49a1a6c68bf8992ad59ef365778e2db4..976bd6e964a3ba3c67be2d53f222ede35dd29009 100755
--- a/Trigger/TrigT1/TrigT1CTP/src/CTPTriggerItemNode.cxx
+++ b/Trigger/TrigT1/TrigT1CTP/src/CTPTriggerItemNode.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #include <cassert>
diff --git a/Trigger/TrigT1/TrigT1CTP/src/CTPTriggerThreshold.cxx b/Trigger/TrigT1/TrigT1CTP/src/CTPTriggerThreshold.cxx
index fef7a55154232b51bbf98f7f62b8557330595602..b54a11726d121b44c4bb0b96ceafbbc0d6c63619 100755
--- a/Trigger/TrigT1/TrigT1CTP/src/CTPTriggerThreshold.cxx
+++ b/Trigger/TrigT1/TrigT1CTP/src/CTPTriggerThreshold.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 
diff --git a/Trigger/TrigT1/TrigT1CTP/src/CTPUtil.cxx b/Trigger/TrigT1/TrigT1CTP/src/CTPUtil.cxx
index 3781ab340583b3197a051bc46393dc21638e8873..0c39ac29c5348cf840a62e0e0abfec6d187d85b4 100755
--- a/Trigger/TrigT1/TrigT1CTP/src/CTPUtil.cxx
+++ b/Trigger/TrigT1/TrigT1CTP/src/CTPUtil.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 
diff --git a/Trigger/TrigT1/TrigT1CTP/src/CustomBit.cxx b/Trigger/TrigT1/TrigT1CTP/src/CustomBit.cxx
index 2917a586fd057badbe6eff95b19037fa92f8d22b..01af8dd4e09af80e48501a050779a24b0e6c0b37 100644
--- a/Trigger/TrigT1/TrigT1CTP/src/CustomBit.cxx
+++ b/Trigger/TrigT1/TrigT1CTP/src/CustomBit.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 
diff --git a/Trigger/TrigT1/TrigT1CTP/src/EventInfo.cxx b/Trigger/TrigT1/TrigT1CTP/src/EventInfo.cxx
index 23b8654433a4ba5ded1c18e662594b5cbdb9b638..7b14e7182575c11953be7788998f2c0697b2233c 100755
--- a/Trigger/TrigT1/TrigT1CTP/src/EventInfo.cxx
+++ b/Trigger/TrigT1/TrigT1CTP/src/EventInfo.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 
diff --git a/Trigger/TrigT1/TrigT1CTP/src/ItemMap.cxx b/Trigger/TrigT1/TrigT1CTP/src/ItemMap.cxx
index 498f0daf5bd1145c6f4ca89e5b284caadccff7cd..2d7ce375ec549cdf2aecba5a80747407ec8b802a 100755
--- a/Trigger/TrigT1/TrigT1CTP/src/ItemMap.cxx
+++ b/Trigger/TrigT1/TrigT1CTP/src/ItemMap.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 
diff --git a/Trigger/TrigT1/TrigT1CTP/src/MsgLogger.cxx b/Trigger/TrigT1/TrigT1CTP/src/MsgLogger.cxx
index 31ce6c142150d7172e172b35c96788e3066f8585..f8ca0ad3698413038c5f0d0195e98b7eb711cb06 100755
--- a/Trigger/TrigT1/TrigT1CTP/src/MsgLogger.cxx
+++ b/Trigger/TrigT1/TrigT1CTP/src/MsgLogger.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 
diff --git a/Trigger/TrigT1/TrigT1CTP/src/MsgWriter.cxx b/Trigger/TrigT1/TrigT1CTP/src/MsgWriter.cxx
index 17d5c504f0e8ab38e6a794bc9e3e304f4f097dd7..6fe0ab253c07f5b9296af0f6ad0d9eb294ecbac2 100755
--- a/Trigger/TrigT1/TrigT1CTP/src/MsgWriter.cxx
+++ b/Trigger/TrigT1/TrigT1CTP/src/MsgWriter.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 
diff --git a/Trigger/TrigT1/TrigT1CTP/src/PrescaledClockTrigger.cxx b/Trigger/TrigT1/TrigT1CTP/src/PrescaledClockTrigger.cxx
index c0d592f07ab1db8ce9bd69304d3c0acbf73fe23a..344f88086da30c63fc53803a2dbbf6267b885bbd 100755
--- a/Trigger/TrigT1/TrigT1CTP/src/PrescaledClockTrigger.cxx
+++ b/Trigger/TrigT1/TrigT1CTP/src/PrescaledClockTrigger.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 
diff --git a/Trigger/TrigT1/TrigT1CTP/src/RandomTrigger.cxx b/Trigger/TrigT1/TrigT1CTP/src/RandomTrigger.cxx
index 9616abad5ed2a6984d13be64a5c1ada5a27de29f..fadf9b16842ffed5dd8749dd5667b5a83c360266 100755
--- a/Trigger/TrigT1/TrigT1CTP/src/RandomTrigger.cxx
+++ b/Trigger/TrigT1/TrigT1CTP/src/RandomTrigger.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 
diff --git a/Trigger/TrigT1/TrigT1CTP/src/ResultBuilder.cxx b/Trigger/TrigT1/TrigT1CTP/src/ResultBuilder.cxx
index 621142d74bad9874ea6d24c5c49d30a2d7b9618e..d21739c6c72d3cfa440ab8860287138fd2c211f6 100755
--- a/Trigger/TrigT1/TrigT1CTP/src/ResultBuilder.cxx
+++ b/Trigger/TrigT1/TrigT1CTP/src/ResultBuilder.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 
diff --git a/Trigger/TrigT1/TrigT1CTP/src/SpecialTrigger.cxx b/Trigger/TrigT1/TrigT1CTP/src/SpecialTrigger.cxx
index d5bfbde344bf79bb46cfbeb45f68ca44abd88355..cc1ba5cbacfea9ef97c098c360f8e46d003231cf 100755
--- a/Trigger/TrigT1/TrigT1CTP/src/SpecialTrigger.cxx
+++ b/Trigger/TrigT1/TrigT1CTP/src/SpecialTrigger.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #include "TrigT1CTP/SpecialTrigger.h"
diff --git a/Trigger/TrigT1/TrigT1CTP/src/ThresholdMap.cxx b/Trigger/TrigT1/TrigT1CTP/src/ThresholdMap.cxx
index b31fc4d9273871d4b5cdaabe00688707683a1b6d..3ca545def376d9bcacad2ba9b099655510893c48 100755
--- a/Trigger/TrigT1/TrigT1CTP/src/ThresholdMap.cxx
+++ b/Trigger/TrigT1/TrigT1CTP/src/ThresholdMap.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 
diff --git a/Trigger/TrigT1/TrigT1EventAthenaPool/src/CMMCPHitsCollectionCnv.cxx b/Trigger/TrigT1/TrigT1EventAthenaPool/src/CMMCPHitsCollectionCnv.cxx
index b7277feb59c7e184f2f318e8b28f29ad38fef283..2918d71d770e0341feed35e4e7f6a65556066411 100644
--- a/Trigger/TrigT1/TrigT1EventAthenaPool/src/CMMCPHitsCollectionCnv.cxx
+++ b/Trigger/TrigT1/TrigT1EventAthenaPool/src/CMMCPHitsCollectionCnv.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 /**
diff --git a/Trigger/TrigT1/TrigT1EventAthenaPool/src/CMMCPHitsCollectionCnv.h b/Trigger/TrigT1/TrigT1EventAthenaPool/src/CMMCPHitsCollectionCnv.h
index 52984913a0538cdfc1aed7016b55b3db036ab9ee..24a2df3e1e9de9adc4a04852d9f53631e7f9e748 100644
--- a/Trigger/TrigT1/TrigT1EventAthenaPool/src/CMMCPHitsCollectionCnv.h
+++ b/Trigger/TrigT1/TrigT1EventAthenaPool/src/CMMCPHitsCollectionCnv.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 /** 
diff --git a/Trigger/TrigT1/TrigT1EventAthenaPool/src/CMMEtSumsCollectionCnv.cxx b/Trigger/TrigT1/TrigT1EventAthenaPool/src/CMMEtSumsCollectionCnv.cxx
index 72e5bd60793b62a82988b395eede82b2b7469a53..b9edeb443ea560be2b83465712f7f32b39fde359 100644
--- a/Trigger/TrigT1/TrigT1EventAthenaPool/src/CMMEtSumsCollectionCnv.cxx
+++ b/Trigger/TrigT1/TrigT1EventAthenaPool/src/CMMEtSumsCollectionCnv.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 /**
diff --git a/Trigger/TrigT1/TrigT1EventAthenaPool/src/CMMEtSumsCollectionCnv.h b/Trigger/TrigT1/TrigT1EventAthenaPool/src/CMMEtSumsCollectionCnv.h
index 9deb75e80c5500f5b87c8ce65629d67d4116cb7b..c57fad3d0e5245337b86683cc9561b9704dba4a8 100644
--- a/Trigger/TrigT1/TrigT1EventAthenaPool/src/CMMEtSumsCollectionCnv.h
+++ b/Trigger/TrigT1/TrigT1EventAthenaPool/src/CMMEtSumsCollectionCnv.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 /** 
diff --git a/Trigger/TrigT1/TrigT1EventAthenaPool/src/CMMJetHitsCollectionCnv.cxx b/Trigger/TrigT1/TrigT1EventAthenaPool/src/CMMJetHitsCollectionCnv.cxx
index dd74f6c1d907b66825d9f9c5acad10ac1121a1df..9a5f04fde4feb9ebb53d002bd975af7a5261bc7b 100644
--- a/Trigger/TrigT1/TrigT1EventAthenaPool/src/CMMJetHitsCollectionCnv.cxx
+++ b/Trigger/TrigT1/TrigT1EventAthenaPool/src/CMMJetHitsCollectionCnv.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 /**
diff --git a/Trigger/TrigT1/TrigT1EventAthenaPool/src/CMMJetHitsCollectionCnv.h b/Trigger/TrigT1/TrigT1EventAthenaPool/src/CMMJetHitsCollectionCnv.h
index 078f1ace1edde363c1d5a22fe7eb1012b023f4e7..861729471ca7838d85858b5146571c33a8143bfc 100644
--- a/Trigger/TrigT1/TrigT1EventAthenaPool/src/CMMJetHitsCollectionCnv.h
+++ b/Trigger/TrigT1/TrigT1EventAthenaPool/src/CMMJetHitsCollectionCnv.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 /** 
diff --git a/Trigger/TrigT1/TrigT1EventAthenaPool/src/CMMRoICnv.cxx b/Trigger/TrigT1/TrigT1EventAthenaPool/src/CMMRoICnv.cxx
index 16809081b94e120aa0bf7a590f800fcb16207076..c735340621f275aa16f4896c3a91c1c62574782f 100644
--- a/Trigger/TrigT1/TrigT1EventAthenaPool/src/CMMRoICnv.cxx
+++ b/Trigger/TrigT1/TrigT1EventAthenaPool/src/CMMRoICnv.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 /**
diff --git a/Trigger/TrigT1/TrigT1EventAthenaPool/src/CMMRoICnv.h b/Trigger/TrigT1/TrigT1EventAthenaPool/src/CMMRoICnv.h
index 369d7b741e125b70f31cabbe92293b524c11b139..e6069bb2a28aa8022e0f200a7d47adb55103405f 100644
--- a/Trigger/TrigT1/TrigT1EventAthenaPool/src/CMMRoICnv.h
+++ b/Trigger/TrigT1/TrigT1EventAthenaPool/src/CMMRoICnv.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 /** 
diff --git a/Trigger/TrigT1/TrigT1EventAthenaPool/src/CMXCPHitsCollectionCnv.cxx b/Trigger/TrigT1/TrigT1EventAthenaPool/src/CMXCPHitsCollectionCnv.cxx
index 0c58f9da53ab217fa8525723b6fd3ded47d67719..818fd2825e0d87d25b0fdb88e173d5ddbe3e4d59 100644
--- a/Trigger/TrigT1/TrigT1EventAthenaPool/src/CMXCPHitsCollectionCnv.cxx
+++ b/Trigger/TrigT1/TrigT1EventAthenaPool/src/CMXCPHitsCollectionCnv.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 /**
diff --git a/Trigger/TrigT1/TrigT1EventAthenaPool/src/CMXCPHitsCollectionCnv.h b/Trigger/TrigT1/TrigT1EventAthenaPool/src/CMXCPHitsCollectionCnv.h
index d670739b79e71b93e72e4eb0cb7c00467bdb0bf8..50341bf347d09cb0c05ee4e0a75e5a0e3be03914 100644
--- a/Trigger/TrigT1/TrigT1EventAthenaPool/src/CMXCPHitsCollectionCnv.h
+++ b/Trigger/TrigT1/TrigT1EventAthenaPool/src/CMXCPHitsCollectionCnv.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 /** 
diff --git a/Trigger/TrigT1/TrigT1EventAthenaPool/src/CMXCPTobCollectionCnv.cxx b/Trigger/TrigT1/TrigT1EventAthenaPool/src/CMXCPTobCollectionCnv.cxx
index d135e56cb52164c65b30f5ad8bb4fd6c69c2d270..fc9e17b348e7b2cbaa6539ff004e33ee99d5916e 100644
--- a/Trigger/TrigT1/TrigT1EventAthenaPool/src/CMXCPTobCollectionCnv.cxx
+++ b/Trigger/TrigT1/TrigT1EventAthenaPool/src/CMXCPTobCollectionCnv.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 /**
diff --git a/Trigger/TrigT1/TrigT1EventAthenaPool/src/CMXCPTobCollectionCnv.h b/Trigger/TrigT1/TrigT1EventAthenaPool/src/CMXCPTobCollectionCnv.h
index 6201e8a3edf5ab94883fd09b993d0b45217a78ab..4ce671c54d29c9ee3f34db22425987b863d6ae14 100644
--- a/Trigger/TrigT1/TrigT1EventAthenaPool/src/CMXCPTobCollectionCnv.h
+++ b/Trigger/TrigT1/TrigT1EventAthenaPool/src/CMXCPTobCollectionCnv.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 /** 
diff --git a/Trigger/TrigT1/TrigT1EventAthenaPool/src/CMXEtSumsCollectionCnv.cxx b/Trigger/TrigT1/TrigT1EventAthenaPool/src/CMXEtSumsCollectionCnv.cxx
index 6935116d0f184c214b82d699f2e2b7bb98b4806f..3a59d61506fa3a92b72491307b3e35d7919b5c0a 100644
--- a/Trigger/TrigT1/TrigT1EventAthenaPool/src/CMXEtSumsCollectionCnv.cxx
+++ b/Trigger/TrigT1/TrigT1EventAthenaPool/src/CMXEtSumsCollectionCnv.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 /**
diff --git a/Trigger/TrigT1/TrigT1EventAthenaPool/src/CMXEtSumsCollectionCnv.h b/Trigger/TrigT1/TrigT1EventAthenaPool/src/CMXEtSumsCollectionCnv.h
index 987e579b0c33c74c011c9fdd3a2b18adbb08f972..476db70e565e028529b5daad12875041f6c593fa 100644
--- a/Trigger/TrigT1/TrigT1EventAthenaPool/src/CMXEtSumsCollectionCnv.h
+++ b/Trigger/TrigT1/TrigT1EventAthenaPool/src/CMXEtSumsCollectionCnv.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 /** 
diff --git a/Trigger/TrigT1/TrigT1EventAthenaPool/src/CMXJetHitsCollectionCnv.cxx b/Trigger/TrigT1/TrigT1EventAthenaPool/src/CMXJetHitsCollectionCnv.cxx
index 9f26a223f6059edb94fdbf843793ca70c76e6498..2c0c9b4d2947f46bc4f5bb6626d1744427a9c6d6 100644
--- a/Trigger/TrigT1/TrigT1EventAthenaPool/src/CMXJetHitsCollectionCnv.cxx
+++ b/Trigger/TrigT1/TrigT1EventAthenaPool/src/CMXJetHitsCollectionCnv.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 /**
diff --git a/Trigger/TrigT1/TrigT1EventAthenaPool/src/CMXJetHitsCollectionCnv.h b/Trigger/TrigT1/TrigT1EventAthenaPool/src/CMXJetHitsCollectionCnv.h
index c80918b48423e33df25406941016297257d97060..8a585292967aee7426498ac91e12a5d418ce3bf0 100644
--- a/Trigger/TrigT1/TrigT1EventAthenaPool/src/CMXJetHitsCollectionCnv.h
+++ b/Trigger/TrigT1/TrigT1EventAthenaPool/src/CMXJetHitsCollectionCnv.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 /** 
diff --git a/Trigger/TrigT1/TrigT1EventAthenaPool/src/CMXJetTobCollectionCnv.cxx b/Trigger/TrigT1/TrigT1EventAthenaPool/src/CMXJetTobCollectionCnv.cxx
index 6c43f9f66e2c5eca26292f35523bd0868152b9f5..1cc4b8f3c158d63c3102c11d4b5bc823699b28ef 100644
--- a/Trigger/TrigT1/TrigT1EventAthenaPool/src/CMXJetTobCollectionCnv.cxx
+++ b/Trigger/TrigT1/TrigT1EventAthenaPool/src/CMXJetTobCollectionCnv.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 /**
diff --git a/Trigger/TrigT1/TrigT1EventAthenaPool/src/CMXJetTobCollectionCnv.h b/Trigger/TrigT1/TrigT1EventAthenaPool/src/CMXJetTobCollectionCnv.h
index c71e09d83677eafbaa0cc6711227ba745efd960c..d4dd9643b0db85267b80c59bd66600cae12ada4f 100644
--- a/Trigger/TrigT1/TrigT1EventAthenaPool/src/CMXJetTobCollectionCnv.h
+++ b/Trigger/TrigT1/TrigT1EventAthenaPool/src/CMXJetTobCollectionCnv.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 /** 
diff --git a/Trigger/TrigT1/TrigT1EventAthenaPool/src/CMXRoICnv.cxx b/Trigger/TrigT1/TrigT1EventAthenaPool/src/CMXRoICnv.cxx
index 13fbd106fcc264a342b17af4499548ea7abe63a7..34de049b3f897d401c0b544fdda2221ce6b962f6 100644
--- a/Trigger/TrigT1/TrigT1EventAthenaPool/src/CMXRoICnv.cxx
+++ b/Trigger/TrigT1/TrigT1EventAthenaPool/src/CMXRoICnv.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 /**
diff --git a/Trigger/TrigT1/TrigT1EventAthenaPool/src/CMXRoICnv.h b/Trigger/TrigT1/TrigT1EventAthenaPool/src/CMXRoICnv.h
index d603c74cf317e7cdd91fee73fe9536db371532a5..0a08261f9ce6a48ae45f628d9b88b74fbd90fa52 100644
--- a/Trigger/TrigT1/TrigT1EventAthenaPool/src/CMXRoICnv.h
+++ b/Trigger/TrigT1/TrigT1EventAthenaPool/src/CMXRoICnv.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 /** 
diff --git a/Trigger/TrigT1/TrigT1EventAthenaPool/src/CPMHitsCollectionCnv.cxx b/Trigger/TrigT1/TrigT1EventAthenaPool/src/CPMHitsCollectionCnv.cxx
index bab4346292c0d7aa168a4e84e4424e2612042dbe..53da59042cf9a3852b69b892c140133366fc2e93 100644
--- a/Trigger/TrigT1/TrigT1EventAthenaPool/src/CPMHitsCollectionCnv.cxx
+++ b/Trigger/TrigT1/TrigT1EventAthenaPool/src/CPMHitsCollectionCnv.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 /**
diff --git a/Trigger/TrigT1/TrigT1EventAthenaPool/src/CPMHitsCollectionCnv.h b/Trigger/TrigT1/TrigT1EventAthenaPool/src/CPMHitsCollectionCnv.h
index 34d04eca5676fbf60b063b04c44b6707559fda67..ee0f545e984ffd64ca23f15a8939f0dfb4e92684 100644
--- a/Trigger/TrigT1/TrigT1EventAthenaPool/src/CPMHitsCollectionCnv.h
+++ b/Trigger/TrigT1/TrigT1EventAthenaPool/src/CPMHitsCollectionCnv.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 /** 
diff --git a/Trigger/TrigT1/TrigT1EventAthenaPool/src/CPMRoICollectionCnv.cxx b/Trigger/TrigT1/TrigT1EventAthenaPool/src/CPMRoICollectionCnv.cxx
index 1270553c4bd97abbdb8fa1b6796562b9764ac74e..2e1509922ad14d9b1046539dd58c604da1999b30 100644
--- a/Trigger/TrigT1/TrigT1EventAthenaPool/src/CPMRoICollectionCnv.cxx
+++ b/Trigger/TrigT1/TrigT1EventAthenaPool/src/CPMRoICollectionCnv.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 /**
diff --git a/Trigger/TrigT1/TrigT1EventAthenaPool/src/CPMRoICollectionCnv.h b/Trigger/TrigT1/TrigT1EventAthenaPool/src/CPMRoICollectionCnv.h
index e2880197ffc8c4ad96bc81641c674cc487a2ce86..cc03fbc3ee9051c27b17b2408b92833b3f1034c7 100644
--- a/Trigger/TrigT1/TrigT1EventAthenaPool/src/CPMRoICollectionCnv.h
+++ b/Trigger/TrigT1/TrigT1EventAthenaPool/src/CPMRoICollectionCnv.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 /** 
diff --git a/Trigger/TrigT1/TrigT1EventAthenaPool/src/CPMTobRoICollectionCnv.cxx b/Trigger/TrigT1/TrigT1EventAthenaPool/src/CPMTobRoICollectionCnv.cxx
index b11d0c24a8d85b16fa79e2252481842270fd10a9..1526ec5792d1a2b638cddb576ade23410ce4e37c 100644
--- a/Trigger/TrigT1/TrigT1EventAthenaPool/src/CPMTobRoICollectionCnv.cxx
+++ b/Trigger/TrigT1/TrigT1EventAthenaPool/src/CPMTobRoICollectionCnv.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 /**
diff --git a/Trigger/TrigT1/TrigT1EventAthenaPool/src/CPMTobRoICollectionCnv.h b/Trigger/TrigT1/TrigT1EventAthenaPool/src/CPMTobRoICollectionCnv.h
index 8242a053210b70808b1499d3a828cc6ad9e27562..f001f973067de22604cf23587ad46e206e6f276c 100644
--- a/Trigger/TrigT1/TrigT1EventAthenaPool/src/CPMTobRoICollectionCnv.h
+++ b/Trigger/TrigT1/TrigT1EventAthenaPool/src/CPMTobRoICollectionCnv.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 /** 
diff --git a/Trigger/TrigT1/TrigT1EventAthenaPool/src/CPMTowerCollectionCnv.cxx b/Trigger/TrigT1/TrigT1EventAthenaPool/src/CPMTowerCollectionCnv.cxx
index 909a77d70c788352ab45e749434859b9b7dc10af..96fb207c3278b6efe382f8f55abbd1f8d5069257 100644
--- a/Trigger/TrigT1/TrigT1EventAthenaPool/src/CPMTowerCollectionCnv.cxx
+++ b/Trigger/TrigT1/TrigT1EventAthenaPool/src/CPMTowerCollectionCnv.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 /**
diff --git a/Trigger/TrigT1/TrigT1EventAthenaPool/src/CPMTowerCollectionCnv.h b/Trigger/TrigT1/TrigT1EventAthenaPool/src/CPMTowerCollectionCnv.h
index 4d107c15578c7aa185413a85688fcbcf506099dc..584d7e3caca87a29639ee7a208633c0689d2653c 100644
--- a/Trigger/TrigT1/TrigT1EventAthenaPool/src/CPMTowerCollectionCnv.h
+++ b/Trigger/TrigT1/TrigT1EventAthenaPool/src/CPMTowerCollectionCnv.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 /** 
diff --git a/Trigger/TrigT1/TrigT1EventAthenaPool/src/CTP_RDOCnv.cxx b/Trigger/TrigT1/TrigT1EventAthenaPool/src/CTP_RDOCnv.cxx
index 9e336d3065240af5c6c73603f1bf27a3f73c90c6..ca4ff0f73ee4c30f27c3e534f510e2d24b0eb35c 100644
--- a/Trigger/TrigT1/TrigT1EventAthenaPool/src/CTP_RDOCnv.cxx
+++ b/Trigger/TrigT1/TrigT1EventAthenaPool/src/CTP_RDOCnv.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 
diff --git a/Trigger/TrigT1/TrigT1EventAthenaPool/src/CTP_RDOCnv.h b/Trigger/TrigT1/TrigT1EventAthenaPool/src/CTP_RDOCnv.h
index 60ea8949bcac4f329c3b1d43d72edc797171aacb..75f5634be0f5e9ad9faa139043d1e4950c5a8447 100644
--- a/Trigger/TrigT1/TrigT1EventAthenaPool/src/CTP_RDOCnv.h
+++ b/Trigger/TrigT1/TrigT1EventAthenaPool/src/CTP_RDOCnv.h
@@ -1,7 +1,7 @@
 // Dear emacs, this is -*- c++ -*-
 
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef TRIGT1EVENTATHENAPOOL_CTP_RDOCNV_H
diff --git a/Trigger/TrigT1/TrigT1EventAthenaPool/src/JEMEtSumsCollectionCnv.cxx b/Trigger/TrigT1/TrigT1EventAthenaPool/src/JEMEtSumsCollectionCnv.cxx
index 45fe8c6643f30a90984b3f66e3bcc02b540af417..3f28f7530ba2b84e1286cd44c4597cb6688bbe97 100644
--- a/Trigger/TrigT1/TrigT1EventAthenaPool/src/JEMEtSumsCollectionCnv.cxx
+++ b/Trigger/TrigT1/TrigT1EventAthenaPool/src/JEMEtSumsCollectionCnv.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 /**
diff --git a/Trigger/TrigT1/TrigT1EventAthenaPool/src/JEMEtSumsCollectionCnv.h b/Trigger/TrigT1/TrigT1EventAthenaPool/src/JEMEtSumsCollectionCnv.h
index ce21a8a2279533b0390643446742074509060ea9..9f35b83ab93b13e706156b2ff2e0052ebc3d2d6d 100644
--- a/Trigger/TrigT1/TrigT1EventAthenaPool/src/JEMEtSumsCollectionCnv.h
+++ b/Trigger/TrigT1/TrigT1EventAthenaPool/src/JEMEtSumsCollectionCnv.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 /** 
diff --git a/Trigger/TrigT1/TrigT1EventAthenaPool/src/JEMHitsCollectionCnv.cxx b/Trigger/TrigT1/TrigT1EventAthenaPool/src/JEMHitsCollectionCnv.cxx
index 8f99e9ac7ebc374fccbeee79bbb20d2d29d88d8c..473aaa19fa8a3bf9c639d533db6c4a86b7b9461f 100644
--- a/Trigger/TrigT1/TrigT1EventAthenaPool/src/JEMHitsCollectionCnv.cxx
+++ b/Trigger/TrigT1/TrigT1EventAthenaPool/src/JEMHitsCollectionCnv.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 /**
diff --git a/Trigger/TrigT1/TrigT1EventAthenaPool/src/JEMHitsCollectionCnv.h b/Trigger/TrigT1/TrigT1EventAthenaPool/src/JEMHitsCollectionCnv.h
index b32842c5f0fd205cb8cc5d2144a7153b1310b689..5b55426f1f47b5d92115fe617a5495c99efd5150 100644
--- a/Trigger/TrigT1/TrigT1EventAthenaPool/src/JEMHitsCollectionCnv.h
+++ b/Trigger/TrigT1/TrigT1EventAthenaPool/src/JEMHitsCollectionCnv.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 /** 
diff --git a/Trigger/TrigT1/TrigT1EventAthenaPool/src/JEMRoICollectionCnv.cxx b/Trigger/TrigT1/TrigT1EventAthenaPool/src/JEMRoICollectionCnv.cxx
index d30cc1c80e52c0e2aba083c7dc72752fdbfa2e75..1fe3e548caafbd5a0307e817f260f5f039783c46 100644
--- a/Trigger/TrigT1/TrigT1EventAthenaPool/src/JEMRoICollectionCnv.cxx
+++ b/Trigger/TrigT1/TrigT1EventAthenaPool/src/JEMRoICollectionCnv.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 /**
diff --git a/Trigger/TrigT1/TrigT1EventAthenaPool/src/JEMRoICollectionCnv.h b/Trigger/TrigT1/TrigT1EventAthenaPool/src/JEMRoICollectionCnv.h
index 8f86a0543af5defe59c0dcc77501be4a95f96817..b123bf6bd3ade9e9a3a9c80d6c95dc6fa4a9c113 100644
--- a/Trigger/TrigT1/TrigT1EventAthenaPool/src/JEMRoICollectionCnv.h
+++ b/Trigger/TrigT1/TrigT1EventAthenaPool/src/JEMRoICollectionCnv.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 /** 
diff --git a/Trigger/TrigT1/TrigT1EventAthenaPool/src/JEMTobRoICollectionCnv.cxx b/Trigger/TrigT1/TrigT1EventAthenaPool/src/JEMTobRoICollectionCnv.cxx
index 84480ba005f9bc52e51fc8bc5a23e1bf09bacdf0..15208fd44d506720dfd56e61329b84edf49b5ad1 100644
--- a/Trigger/TrigT1/TrigT1EventAthenaPool/src/JEMTobRoICollectionCnv.cxx
+++ b/Trigger/TrigT1/TrigT1EventAthenaPool/src/JEMTobRoICollectionCnv.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 /**
diff --git a/Trigger/TrigT1/TrigT1EventAthenaPool/src/JEMTobRoICollectionCnv.h b/Trigger/TrigT1/TrigT1EventAthenaPool/src/JEMTobRoICollectionCnv.h
index caed626a5a4b3205dca8ba9534ccc4039c024a2b..9f252883de0ee86687e13bd7d8dc503a72e1d6b3 100644
--- a/Trigger/TrigT1/TrigT1EventAthenaPool/src/JEMTobRoICollectionCnv.h
+++ b/Trigger/TrigT1/TrigT1EventAthenaPool/src/JEMTobRoICollectionCnv.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 /** 
diff --git a/Trigger/TrigT1/TrigT1EventAthenaPool/src/JetElementCollectionCnv.cxx b/Trigger/TrigT1/TrigT1EventAthenaPool/src/JetElementCollectionCnv.cxx
index 920c859ba7f221579cb30aea1c06c0d7f64067df..3b7baa1cb70953d8a0547e3d31817c6dba6e6991 100644
--- a/Trigger/TrigT1/TrigT1EventAthenaPool/src/JetElementCollectionCnv.cxx
+++ b/Trigger/TrigT1/TrigT1EventAthenaPool/src/JetElementCollectionCnv.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 /**
diff --git a/Trigger/TrigT1/TrigT1EventAthenaPool/src/JetElementCollectionCnv.h b/Trigger/TrigT1/TrigT1EventAthenaPool/src/JetElementCollectionCnv.h
index f46e83bf3b8d31a3f0eabe640288126b0b15b456..d5d939b3a08962a6bb086fc3392893e4c71e2082 100644
--- a/Trigger/TrigT1/TrigT1EventAthenaPool/src/JetElementCollectionCnv.h
+++ b/Trigger/TrigT1/TrigT1EventAthenaPool/src/JetElementCollectionCnv.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 /** 
diff --git a/Trigger/TrigT1/TrigT1EventAthenaPool/src/MuCTPI_RDOCnv.cxx b/Trigger/TrigT1/TrigT1EventAthenaPool/src/MuCTPI_RDOCnv.cxx
index 97ad8333c4b3f4109b7e0c0c326337dfba7716cc..c98ef284f0bb96eaf4b86ca5370d81bdc95dab15 100644
--- a/Trigger/TrigT1/TrigT1EventAthenaPool/src/MuCTPI_RDOCnv.cxx
+++ b/Trigger/TrigT1/TrigT1EventAthenaPool/src/MuCTPI_RDOCnv.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 
diff --git a/Trigger/TrigT1/TrigT1EventAthenaPool/src/MuCTPI_RDOCnv.h b/Trigger/TrigT1/TrigT1EventAthenaPool/src/MuCTPI_RDOCnv.h
index 2aa8faa805077fc7b1dbb5e65807375f235bff6e..5f82e428c671cd1c580f0934da9e8172c9b0b603 100644
--- a/Trigger/TrigT1/TrigT1EventAthenaPool/src/MuCTPI_RDOCnv.h
+++ b/Trigger/TrigT1/TrigT1EventAthenaPool/src/MuCTPI_RDOCnv.h
@@ -1,7 +1,7 @@
 // Dear emacs, this is -*- c++ -*-
 
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef TRIGT1EVENTATHENAPOOL_MUCTPI_RDOCNV_H
diff --git a/Trigger/TrigT1/TrigT1EventAthenaPool/src/RODHeaderCollectionCnv.cxx b/Trigger/TrigT1/TrigT1EventAthenaPool/src/RODHeaderCollectionCnv.cxx
index 3c2e22db1da239425739554c89b3e87e968a9eef..ce70c5d27c7ac4dc6fdee2dc61167e9e8931972f 100644
--- a/Trigger/TrigT1/TrigT1EventAthenaPool/src/RODHeaderCollectionCnv.cxx
+++ b/Trigger/TrigT1/TrigT1EventAthenaPool/src/RODHeaderCollectionCnv.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 /**
diff --git a/Trigger/TrigT1/TrigT1EventAthenaPool/src/RODHeaderCollectionCnv.h b/Trigger/TrigT1/TrigT1EventAthenaPool/src/RODHeaderCollectionCnv.h
index a39cfed6c5011acb5be63cf804314b36197231ce..52115025163e7366b3c0b6bcb40f5c84450ca992 100644
--- a/Trigger/TrigT1/TrigT1EventAthenaPool/src/RODHeaderCollectionCnv.h
+++ b/Trigger/TrigT1/TrigT1EventAthenaPool/src/RODHeaderCollectionCnv.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 /** 
diff --git a/Trigger/TrigT1/TrigT1EventAthenaPool/src/RoIBResultCnv.cxx b/Trigger/TrigT1/TrigT1EventAthenaPool/src/RoIBResultCnv.cxx
index 15a67492c2d92f79f211eeab608ca9c3fdf02adf..dcdbdf56d803f711ddfc165888c6967ff1fa2983 100755
--- a/Trigger/TrigT1/TrigT1EventAthenaPool/src/RoIBResultCnv.cxx
+++ b/Trigger/TrigT1/TrigT1EventAthenaPool/src/RoIBResultCnv.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 
diff --git a/Trigger/TrigT1/TrigT1EventAthenaPool/src/RoIBResultCnv.h b/Trigger/TrigT1/TrigT1EventAthenaPool/src/RoIBResultCnv.h
index a07e959890e184e539af226f27381bef127517bf..b384f1aac16c1c150a40c0a5d9426ac8bd496363 100644
--- a/Trigger/TrigT1/TrigT1EventAthenaPool/src/RoIBResultCnv.h
+++ b/Trigger/TrigT1/TrigT1EventAthenaPool/src/RoIBResultCnv.h
@@ -1,7 +1,7 @@
 // Dear emacs, this is -*- c++ -*-
 
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef TRIGT1EVENTATHENAPOOL_ROIBRESULTCNV_H
diff --git a/Trigger/TrigT1/TrigT1EventAthenaPool/src/TriggerTowerCollectionCnv.cxx b/Trigger/TrigT1/TrigT1EventAthenaPool/src/TriggerTowerCollectionCnv.cxx
index 9364831243110f12d2cfc8a9f191f4882c4a49b4..c18aa0a81641ea2d9ad1039b7a2670518a53caff 100644
--- a/Trigger/TrigT1/TrigT1EventAthenaPool/src/TriggerTowerCollectionCnv.cxx
+++ b/Trigger/TrigT1/TrigT1EventAthenaPool/src/TriggerTowerCollectionCnv.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 /**
diff --git a/Trigger/TrigT1/TrigT1EventAthenaPool/src/TriggerTowerCollectionCnv.h b/Trigger/TrigT1/TrigT1EventAthenaPool/src/TriggerTowerCollectionCnv.h
index ceba4b85b273864b733a4b227746d1ccd77701b0..31ee17252b740f8f19e1ea06a62bba2e1c153c48 100644
--- a/Trigger/TrigT1/TrigT1EventAthenaPool/src/TriggerTowerCollectionCnv.h
+++ b/Trigger/TrigT1/TrigT1EventAthenaPool/src/TriggerTowerCollectionCnv.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 /** 
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CMMCPHitsCnv_p1.h b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CMMCPHitsCnv_p1.h
index fdf655571520e7c093ccbdeb9a2956cb6f570189..1e28e980c4a1d8ee7b769d94fbb43e7e64ff986d 100755
--- a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CMMCPHitsCnv_p1.h
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CMMCPHitsCnv_p1.h
@@ -1,20 +1,14 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 
  //***************************************************************************
  //                           CMMCPHitsCnv_p1.h  -  description
  //                              -------------------
  //     begin                : 21 04 2008
- //     copyright            : (C) 2008 by Alan Watson
  //     email                : Alan.Watson@cern.ch
  //  ***************************************************************************/
   
- //***************************************************************************
- //  *                                                                         *
- //  *   This program is free software; you can redistribute it and/or modify  *
-  // *   it under the terms of the GNU General Public License as published by  *
-//   *   the Free Software Foundation; either version 2 of the License, or     *
- //  *   (at your option) any later version.                                   *
- //  *                                                                         *
- //  ***************************************************************************/
   
 #ifndef CMMCPHitsCnv_p1_H
 #define CMMCPHitsCnv_p1_H
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CMMCPHitsCollectionCnv_p1.h b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CMMCPHitsCollectionCnv_p1.h
index c3b36303fd6b56643ba4fc99fd48408402ff06aa..dc209ab219d1c2a91121ab543db970c96ae6bd8a 100755
--- a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CMMCPHitsCollectionCnv_p1.h
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CMMCPHitsCollectionCnv_p1.h
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 #ifndef CMMCPHitsCollectionCNV_P1_H
 #define CMMCPHitsCollectionCNV_P1_H
 
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CMMCPHitsCollectionCnv_tlp1.h b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CMMCPHitsCollectionCnv_tlp1.h
index 5db25a498cb4135c75e0d6f7a3b95c37b304df20..9d26bf9b9b1a6ed71c710b3191ea0f131dc8246a 100755
--- a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CMMCPHitsCollectionCnv_tlp1.h
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CMMCPHitsCollectionCnv_tlp1.h
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 #ifndef CMMCPHitsCollectionCNV_TLP1_H
 #define CMMCPHitsCollectionCNV_TLP1_H
 
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CMMCPHitsCollection_p1.h b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CMMCPHitsCollection_p1.h
index 2ab8026e187a0f80ef8c818f0066a4cf4abe8aae..fa7696f79972f58caeae7609dcf6310c292f5be1 100644
--- a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CMMCPHitsCollection_p1.h
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CMMCPHitsCollection_p1.h
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 #ifndef TRIGT1EVENTTPCNV_CMMCPHitsCOLLECTION_P1_H
 #define TRIGT1EVENTTPCNV_CMMCPHitsCOLLECTION_P1_H
 
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CMMCPHitsCollection_tlp1.h b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CMMCPHitsCollection_tlp1.h
index 8b10e6c033d942551e744bc871de62df239f30e0..7ffdbd8eb9a84c82e5a865744842fd4683ca516e 100755
--- a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CMMCPHitsCollection_tlp1.h
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CMMCPHitsCollection_tlp1.h
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 #ifndef TRIGT1EVENTTPCNV_CMMCPHitsCOLLECTION_TLP1_H
 #define TRIGT1EVENTTPCNV_CMMCPHitsCOLLECTION_TLP1_H
 
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CMMCPHits_p1.h b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CMMCPHits_p1.h
index 069216076369510fd2e56ca30972c67dd9527a2f..0652f9917b76880fc28b404e40b77d1e28488462 100755
--- a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CMMCPHits_p1.h
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CMMCPHits_p1.h
@@ -1,20 +1,14 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 
  //***************************************************************************
  //                           CMMCPHits_p1.h  -  description
  //                              -------------------
  //     begin                : 21 04 2008
- //     copyright            : (C) 2008 by Alan Watson
  //     email                : Alan.Watson@cern.ch
  //  ***************************************************************************/
   
- //***************************************************************************
- //  *                                                                         *
- //  *   This program is free software; you can redistribute it and/or modify  *
-  // *   it under the terms of the GNU General Public License as published by  *
-//   *   the Free Software Foundation; either version 2 of the License, or     *
- //  *   (at your option) any later version.                                   *
- //  *                                                                         *
- //  ***************************************************************************/
   
 #ifndef CMMCPHits_p1_H
 #define CMMCPHits_p1_H
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CMMEtSumsCnv_p1.h b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CMMEtSumsCnv_p1.h
index 8ec957ba690b38332fdd658f6aa5675d342969ff..44a740a9e6705cbca2ece21f8b013c62e58deda2 100755
--- a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CMMEtSumsCnv_p1.h
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CMMEtSumsCnv_p1.h
@@ -1,20 +1,14 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 
  //***************************************************************************
  //                           CMMEtSumsCnv_p1.h  -  description
  //                              -------------------
  //     begin                : 21 04 2008
- //     copyright            : (C) 2008 by Alan Watson
  //     email                : Alan.Watson@cern.ch
  //  ***************************************************************************/
   
- //***************************************************************************
- //  *                                                                         *
- //  *   This program is free software; you can redistribute it and/or modify  *
-  // *   it under the terms of the GNU General Public License as published by  *
-//   *   the Free Software Foundation; either version 2 of the License, or     *
- //  *   (at your option) any later version.                                   *
- //  *                                                                         *
- //  ***************************************************************************/
   
 #ifndef CMMEtSumsCnv_p1_H
 #define CMMEtSumsCnv_p1_H
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CMMEtSumsCollectionCnv_p1.h b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CMMEtSumsCollectionCnv_p1.h
index 802ba747e16a7f161afe2463e0d9544cbd2f43fd..30ee4c0a383bb24f08415178191449c2978b9032 100755
--- a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CMMEtSumsCollectionCnv_p1.h
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CMMEtSumsCollectionCnv_p1.h
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 #ifndef CMMEtSumsCollectionCNV_P1_H
 #define CMMEtSumsCollectionCNV_P1_H
 
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CMMEtSumsCollectionCnv_tlp1.h b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CMMEtSumsCollectionCnv_tlp1.h
index f4416210b1137ec9519d63dca60b2c326153b86f..444deb00cf417008a1cb57eca4e85abe60fafa97 100755
--- a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CMMEtSumsCollectionCnv_tlp1.h
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CMMEtSumsCollectionCnv_tlp1.h
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 #ifndef CMMEtSumsCollectionCNV_TLP1_H
 #define CMMEtSumsCollectionCNV_TLP1_H
 
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CMMEtSumsCollection_p1.h b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CMMEtSumsCollection_p1.h
index 37525936af5447faedeeb95bc8b73a1a112ab8b7..7495045929ae2847db90fbdb0a4a42e610516890 100644
--- a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CMMEtSumsCollection_p1.h
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CMMEtSumsCollection_p1.h
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 #ifndef TRIGT1EVENTTPCNV_CMMEtSumsCOLLECTION_P1_H
 #define TRIGT1EVENTTPCNV_CMMEtSumsCOLLECTION_P1_H
 
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CMMEtSumsCollection_tlp1.h b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CMMEtSumsCollection_tlp1.h
index 6915d213aea08efb0217fc3d0b43acbd1d59ba64..ecd38cf43eb9a19cb097252303e9b65aef2d6c8e 100755
--- a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CMMEtSumsCollection_tlp1.h
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CMMEtSumsCollection_tlp1.h
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 #ifndef TRIGT1EVENTTPCNV_CMMEtSumsCOLLECTION_TLP1_H
 #define TRIGT1EVENTTPCNV_CMMEtSumsCOLLECTION_TLP1_H
 
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CMMEtSums_p1.h b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CMMEtSums_p1.h
index 2330029cf5b97b7c388b9eef1bad07ab6ff4fa3e..cfe3f3a7810bfb463c2c3a8fc204158e2bd3f659 100755
--- a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CMMEtSums_p1.h
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CMMEtSums_p1.h
@@ -1,20 +1,14 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 
  //***************************************************************************
  //                           CMMEtSums_p1.h  -  description
  //                              -------------------
  //     begin                : 21 04 2008
- //     copyright            : (C) 2008 by Alan Watson
  //     email                : Alan.Watson@cern.ch
  //  ***************************************************************************/
   
- //***************************************************************************
- //  *                                                                         *
- //  *   This program is free software; you can redistribute it and/or modify  *
-  // *   it under the terms of the GNU General Public License as published by  *
-//   *   the Free Software Foundation; either version 2 of the License, or     *
- //  *   (at your option) any later version.                                   *
- //  *                                                                         *
- //  ***************************************************************************/
   
 #ifndef CMMEtSums_p1_H
 #define CMMEtSums_p1_H
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CMMJetHitsCnv_p1.h b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CMMJetHitsCnv_p1.h
index 0a39703e8574fdc299bd5b7d74ae3fdfb4884d48..058c8083159178098dff92d78a845d6dfd6e1fe4 100755
--- a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CMMJetHitsCnv_p1.h
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CMMJetHitsCnv_p1.h
@@ -1,20 +1,14 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 
  //***************************************************************************
  //                           CMMJetHitsCnv_p1.h  -  description
  //                              -------------------
  //     begin                : 21 04 2008
- //     copyright            : (C) 2008 by Alan Watson
  //     email                : Alan.Watson@cern.ch
  //  ***************************************************************************/
   
- //***************************************************************************
- //  *                                                                         *
- //  *   This program is free software; you can redistribute it and/or modify  *
-  // *   it under the terms of the GNU General Public License as published by  *
-//   *   the Free Software Foundation; either version 2 of the License, or     *
- //  *   (at your option) any later version.                                   *
- //  *                                                                         *
- //  ***************************************************************************/
   
 #ifndef CMMJetHitsCnv_p1_H
 #define CMMJetHitsCnv_p1_H
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CMMJetHitsCollectionCnv_p1.h b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CMMJetHitsCollectionCnv_p1.h
index e6c6b888742daf9c47e9999cd8b032a7db18cb86..e9139c7e12aa08c36e2b9349f558ed744d8f442c 100755
--- a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CMMJetHitsCollectionCnv_p1.h
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CMMJetHitsCollectionCnv_p1.h
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 #ifndef CMMJetHitsCollectionCNV_P1_H
 #define CMMJetHitsCollectionCNV_P1_H
 
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CMMJetHitsCollectionCnv_tlp1.h b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CMMJetHitsCollectionCnv_tlp1.h
index 05764235ff33c43637f6f66ba3bb059a7d434175..cf862b30f552c381ee9e610a221815c1ee044335 100755
--- a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CMMJetHitsCollectionCnv_tlp1.h
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CMMJetHitsCollectionCnv_tlp1.h
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 #ifndef CMMJetHitsCollectionCNV_TLP1_H
 #define CMMJetHitsCollectionCNV_TLP1_H
 
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CMMJetHitsCollection_p1.h b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CMMJetHitsCollection_p1.h
index f40051c8bf3add503d255c7dbe05ecbd869b6b0e..138816300f12b56ab41982115e3d105dd3b42847 100644
--- a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CMMJetHitsCollection_p1.h
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CMMJetHitsCollection_p1.h
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 #ifndef TRIGT1EVENTTPCNV_CMMJetHitsCOLLECTION_P1_H
 #define TRIGT1EVENTTPCNV_CMMJetHitsCOLLECTION_P1_H
 
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CMMJetHitsCollection_tlp1.h b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CMMJetHitsCollection_tlp1.h
index 929bdfe13e200f79db33be7e1a3024b01013c236..d36815900b7b925c05acc09830b5d05f4ca59a02 100755
--- a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CMMJetHitsCollection_tlp1.h
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CMMJetHitsCollection_tlp1.h
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 #ifndef TRIGT1EVENTTPCNV_CMMJetHitsCOLLECTION_TLP1_H
 #define TRIGT1EVENTTPCNV_CMMJetHitsCOLLECTION_TLP1_H
 
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CMMJetHits_p1.h b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CMMJetHits_p1.h
index be1754b044c73493441652e6993d142fa739bfe0..9c7848051e353a3194b5664bc7fbf3029276ebab 100755
--- a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CMMJetHits_p1.h
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CMMJetHits_p1.h
@@ -1,20 +1,14 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 
  //***************************************************************************
  //                           CMMJetHits_p1.h  -  description
  //                              -------------------
  //     begin                : 21 04 2008
- //     copyright            : (C) 2008 by Alan Watson
  //     email                : Alan.Watson@cern.ch
  //  ***************************************************************************/
   
- //***************************************************************************
- //  *                                                                         *
- //  *   This program is free software; you can redistribute it and/or modify  *
-  // *   it under the terms of the GNU General Public License as published by  *
-//   *   the Free Software Foundation; either version 2 of the License, or     *
- //  *   (at your option) any later version.                                   *
- //  *                                                                         *
- //  ***************************************************************************/
   
 #ifndef CMMJetHits_p1_H
 #define CMMJetHits_p1_H
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CMMRoICnv_p1.h b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CMMRoICnv_p1.h
index e8df984fd0a211e1b731a63ccacbdc3591d0d6eb..db30f9dc5c3a306c38c0792a40dd91f5a2dd063b 100755
--- a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CMMRoICnv_p1.h
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CMMRoICnv_p1.h
@@ -1,20 +1,14 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 
  //***************************************************************************
  //                           CMMRoICnv_p1.h  -  description
  //                              -------------------
  //     begin                : 21 04 2008
- //     copyright            : (C) 2008 by Alan Watson
  //     email                : Alan.Watson@cern.ch
  //  ***************************************************************************/
   
- //***************************************************************************
- //  *                                                                         *
- //  *   This program is free software; you can redistribute it and/or modify  *
-  // *   it under the terms of the GNU General Public License as published by  *
-//   *   the Free Software Foundation; either version 2 of the License, or     *
- //  *   (at your option) any later version.                                   *
- //  *                                                                         *
- //  ***************************************************************************/
   
 #ifndef CMMRoICnv_p1_H
 #define CMMRoICnv_p1_H
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CMMRoI_p1.h b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CMMRoI_p1.h
index a5b7eea7da2bd850fb098a5abe661f2789ec3198..c5dba5e02a0055a3cc87445676e2d412549adb1e 100755
--- a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CMMRoI_p1.h
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CMMRoI_p1.h
@@ -1,20 +1,14 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 
  //***************************************************************************
  //                           CMMRoI_p1.h  -  description
  //                              -------------------
  //     begin                : 21 04 2008
- //     copyright            : (C) 2008 by Alan Watson
  //     email                : Alan.Watson@cern.ch
  //  ***************************************************************************/
   
- //***************************************************************************
- //  *                                                                         *
- //  *   This program is free software; you can redistribute it and/or modify  *
-  // *   it under the terms of the GNU General Public License as published by  *
-//   *   the Free Software Foundation; either version 2 of the License, or     *
- //  *   (at your option) any later version.                                   *
- //  *                                                                         *
- //  ***************************************************************************/
   
 #ifndef CMMRoI_p1_H
 #define CMMRoI_p1_H
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CMXCPHitsCnv_p1.h b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CMXCPHitsCnv_p1.h
index 89f19fcb84e7ea210a17ab42c1abf220cb336f1f..0e4724f252be506f723cc2ed426c68faecc79fbe 100755
--- a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CMXCPHitsCnv_p1.h
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CMXCPHitsCnv_p1.h
@@ -1,20 +1,14 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 
  //***************************************************************************
  //                           CMXCPHitsCnv_p1.h  -  description
  //                              -------------------
  //     begin                : 21 04 2008
- //     copyright            : (C) 2008 by Alan Watson
  //     email                : Alan.Watson@cern.ch
  //  ***************************************************************************/
   
- //***************************************************************************
- //  *                                                                         *
- //  *   This program is free software; you can redistribute it and/or modify  *
-  // *   it under the terms of the GNU General Public License as published by  *
-//   *   the Free Software Foundation; either version 2 of the License, or     *
- //  *   (at your option) any later version.                                   *
- //  *                                                                         *
- //  ***************************************************************************/
   
 #ifndef CMXCPHitsCnv_p1_H
 #define CMXCPHitsCnv_p1_H
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CMXCPHitsCollectionCnv_p1.h b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CMXCPHitsCollectionCnv_p1.h
index 0b13cc6ad19821da57b4b33bbfcf5ec420e9d7f2..a9c435211ffde1987b6a6c5f69c22d677e2225be 100755
--- a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CMXCPHitsCollectionCnv_p1.h
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CMXCPHitsCollectionCnv_p1.h
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 #ifndef CMXCPHitsCollectionCNV_P1_H
 #define CMXCPHitsCollectionCNV_P1_H
 
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CMXCPHitsCollectionCnv_tlp1.h b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CMXCPHitsCollectionCnv_tlp1.h
index caca869d818302f9ee35f64a9a95f9216feabb6a..20778cffd7682c95cab2fb3975f1e58478d42312 100755
--- a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CMXCPHitsCollectionCnv_tlp1.h
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CMXCPHitsCollectionCnv_tlp1.h
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 #ifndef CMXCPHitsCollectionCNV_TLP1_H
 #define CMXCPHitsCollectionCNV_TLP1_H
 
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CMXCPHitsCollection_p1.h b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CMXCPHitsCollection_p1.h
index 97e97ec06c3f4a5af68c92279c8b48ffbc1763bb..e7a9304b8d69eb30e533bf2d4bc463aa8d222d99 100644
--- a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CMXCPHitsCollection_p1.h
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CMXCPHitsCollection_p1.h
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 #ifndef TRIGT1EVENTTPCNV_CMXCPHitsCOLLECTION_P1_H
 #define TRIGT1EVENTTPCNV_CMXCPHitsCOLLECTION_P1_H
 
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CMXCPHitsCollection_tlp1.h b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CMXCPHitsCollection_tlp1.h
index 05259f29a6c72a33cff994ab82255714d1321873..a8d8842937a1b38cef6f8a19b9190df9225c04ab 100755
--- a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CMXCPHitsCollection_tlp1.h
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CMXCPHitsCollection_tlp1.h
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 #ifndef TRIGT1EVENTTPCNV_CMXCPHitsCOLLECTION_TLP1_H
 #define TRIGT1EVENTTPCNV_CMXCPHitsCOLLECTION_TLP1_H
 
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CMXCPHits_p1.h b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CMXCPHits_p1.h
index 0e3a53fa0c70a1d5335d17dcae1afb1d2264178b..ea4d80e24c65b4ccffd1dfad51c6cdbcc2e847b7 100755
--- a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CMXCPHits_p1.h
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CMXCPHits_p1.h
@@ -1,20 +1,14 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 
  //***************************************************************************
  //                           CMXCPHits_p1.h  -  description
  //                              -------------------
  //     begin                : 21 04 2008
- //     copyright            : (C) 2008 by Alan Watson
  //     email                : Alan.Watson@cern.ch
  //  ***************************************************************************/
   
- //***************************************************************************
- //  *                                                                         *
- //  *   This program is free software; you can redistribute it and/or modify  *
-  // *   it under the terms of the GNU General Public License as published by  *
-//   *   the Free Software Foundation; either version 2 of the License, or     *
- //  *   (at your option) any later version.                                   *
- //  *                                                                         *
- //  ***************************************************************************/
   
 #ifndef CMXCPHits_p1_H
 #define CMXCPHits_p1_H
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CMXCPTobCnv_p1.h b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CMXCPTobCnv_p1.h
index bd3fbea16d517de7fe111f9eccf88b2edb488a00..474b6877af1d7de6619e6c6f80922f1627d97754 100755
--- a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CMXCPTobCnv_p1.h
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CMXCPTobCnv_p1.h
@@ -1,20 +1,14 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 
  //***************************************************************************
  //                           CMXCPTobCnv_p1.h  -  description
  //                              -------------------
  //     begin                : 21 04 2008
- //     copyright            : (C) 2008 by Alan Watson
  //     email                : Alan.Watson@cern.ch
  //  ***************************************************************************/
   
- //***************************************************************************
- //  *                                                                         *
- //  *   This program is free software; you can redistribute it and/or modify  *
-  // *   it under the terms of the GNU General Public License as published by  *
-//   *   the Free Software Foundation; either version 2 of the License, or     *
- //  *   (at your option) any later version.                                   *
- //  *                                                                         *
- //  ***************************************************************************/
   
 #ifndef CMXCPTobCnv_p1_H
 #define CMXCPTobCnv_p1_H
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CMXCPTobCollectionCnv_p1.h b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CMXCPTobCollectionCnv_p1.h
index 0553e0178c2863317ef00a9b55e28146f2db03d4..1b40b6916731b02fc24220b6d7f3d18b73c3ae24 100755
--- a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CMXCPTobCollectionCnv_p1.h
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CMXCPTobCollectionCnv_p1.h
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 #ifndef CMXCPTobCollectionCNV_P1_H
 #define CMXCPTobCollectionCNV_P1_H
 
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CMXCPTobCollectionCnv_tlp1.h b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CMXCPTobCollectionCnv_tlp1.h
index 76c748b63b99d69dd667c4e76d3dad586324979c..9bcb2ebd613b465f50d0ceb142394e3ae307cfec 100755
--- a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CMXCPTobCollectionCnv_tlp1.h
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CMXCPTobCollectionCnv_tlp1.h
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 #ifndef CMXCPTobCollectionCNV_TLP1_H
 #define CMXCPTobCollectionCNV_TLP1_H
 
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CMXCPTobCollection_p1.h b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CMXCPTobCollection_p1.h
index f125cea7eb1b9e9954f46c8e9333e88296aa4e43..4a139ca6ad7e7bc6723675756a85f0d09e9f70cf 100644
--- a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CMXCPTobCollection_p1.h
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CMXCPTobCollection_p1.h
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 #ifndef TRIGT1EVENTTPCNV_CMXCPTobCOLLECTION_P1_H
 #define TRIGT1EVENTTPCNV_CMXCPTobCOLLECTION_P1_H
 
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CMXCPTobCollection_tlp1.h b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CMXCPTobCollection_tlp1.h
index 6cc0b9db3b71a0a40ad0acfd08fc1421db48958a..62a2094b49ccf669b7d7579efaa6e473fc6052c0 100755
--- a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CMXCPTobCollection_tlp1.h
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CMXCPTobCollection_tlp1.h
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 #ifndef TRIGT1EVENTTPCNV_CMXCPTobCOLLECTION_TLP1_H
 #define TRIGT1EVENTTPCNV_CMXCPTobCOLLECTION_TLP1_H
 
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CMXCPTob_p1.h b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CMXCPTob_p1.h
index ed5bdff70c19e9f696f6f5052a8b3e1e481e35c6..4ab0a8f7b4c8483a412785b7d453e13158552566 100755
--- a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CMXCPTob_p1.h
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CMXCPTob_p1.h
@@ -1,20 +1,14 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 
  //***************************************************************************
  //                           CMXCPTob_p1.h  -  description
  //                              -------------------
  //     begin                : 21 04 2008
- //     copyright            : (C) 2008 by Alan Watson
  //     email                : Alan.Watson@cern.ch
  //  ***************************************************************************/
   
- //***************************************************************************
- //  *                                                                         *
- //  *   This program is free software; you can redistribute it and/or modify  *
-  // *   it under the terms of the GNU General Public License as published by  *
-//   *   the Free Software Foundation; either version 2 of the License, or     *
- //  *   (at your option) any later version.                                   *
- //  *                                                                         *
- //  ***************************************************************************/
   
 #ifndef CMXCPTob_p1_H
 #define CMXCPTob_p1_H
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CMXEtSumsCnv_p1.h b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CMXEtSumsCnv_p1.h
index b938e5df6eecd8025cc0763aa095001951e475aa..35564821396cd0607d607b421fdb4eb47dc113ad 100755
--- a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CMXEtSumsCnv_p1.h
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CMXEtSumsCnv_p1.h
@@ -1,12 +1,7 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
   
- //***************************************************************************
- //  *                                                                         *
- //  *   This program is free software; you can redistribute it and/or modify  *
-  // *   it under the terms of the GNU General Public License as published by  *
-//   *   the Free Software Foundation; either version 2 of the License, or     *
- //  *   (at your option) any later version.                                   *
- //  *                                                                         *
- //  ***************************************************************************/
   
 #ifndef CMXEtSumsCnv_p1_H
 #define CMXEtSumsCnv_p1_H
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CMXEtSumsCollectionCnv_p1.h b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CMXEtSumsCollectionCnv_p1.h
index 5d15b206b46ba06c8b4c612d8eff66bf0954a952..02e162d84a2e5e4aac8b26792fbc27efd573f39b 100755
--- a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CMXEtSumsCollectionCnv_p1.h
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CMXEtSumsCollectionCnv_p1.h
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 #ifndef CMXEtSumsCollectionCNV_P1_H
 #define CMXEtSumsCollectionCNV_P1_H
 
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CMXEtSumsCollectionCnv_tlp1.h b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CMXEtSumsCollectionCnv_tlp1.h
index ebfd6a9d0b56e484ec9c8e39c1f362ef216d83e5..0b2860eb0055c58ba618ca5b33a156e4e8467eba 100755
--- a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CMXEtSumsCollectionCnv_tlp1.h
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CMXEtSumsCollectionCnv_tlp1.h
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 #ifndef CMXEtSumsCollectionCNV_TLP1_H
 #define CMXEtSumsCollectionCNV_TLP1_H
 
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CMXEtSumsCollection_p1.h b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CMXEtSumsCollection_p1.h
index c831daf0e49cb4ef4e02d66db85f17d8860dcd53..5dd862a4de1b73d9ca2bd01cb70dcd7e718fe288 100644
--- a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CMXEtSumsCollection_p1.h
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CMXEtSumsCollection_p1.h
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 #ifndef TRIGT1EVENTTPCNV_CMXEtSumsCOLLECTION_P1_H
 #define TRIGT1EVENTTPCNV_CMXEtSumsCOLLECTION_P1_H
 
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CMXEtSumsCollection_tlp1.h b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CMXEtSumsCollection_tlp1.h
index 92859fe1cef6ce6a3bda33d93cce835ed7044520..ab3db19301618519bd54504d6eb7e0f4dd6317c0 100755
--- a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CMXEtSumsCollection_tlp1.h
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CMXEtSumsCollection_tlp1.h
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 #ifndef TRIGT1EVENTTPCNV_CMXEtSumsCOLLECTION_TLP1_H
 #define TRIGT1EVENTTPCNV_CMXEtSumsCOLLECTION_TLP1_H
 
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CMXEtSums_p1.h b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CMXEtSums_p1.h
index b6aa089ef8c896749a1e4bb3ae0d5d8f80a9f772..978e0d180bbc4249da2998f84e6cf8a898c13aff 100755
--- a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CMXEtSums_p1.h
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CMXEtSums_p1.h
@@ -1,12 +1,7 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
   
- //***************************************************************************
- //  *                                                                         *
- //  *   This program is free software; you can redistribute it and/or modify  *
-  // *   it under the terms of the GNU General Public License as published by  *
-//   *   the Free Software Foundation; either version 2 of the License, or     *
- //  *   (at your option) any later version.                                   *
- //  *                                                                         *
- //  ***************************************************************************/
   
 #ifndef CMXEtSums_p1_H
 #define CMXEtSums_p1_H
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CMXJetHitsCnv_p1.h b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CMXJetHitsCnv_p1.h
index 7decc2ca749b7a2b8ccdad1d03886713eb8ce5f0..e6b0348f9adb977701870b498eabedada67dc0d9 100755
--- a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CMXJetHitsCnv_p1.h
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CMXJetHitsCnv_p1.h
@@ -1,12 +1,7 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
   
- //***************************************************************************
- //  *                                                                         *
- //  *   This program is free software; you can redistribute it and/or modify  *
-  // *   it under the terms of the GNU General Public License as published by  *
-//   *   the Free Software Foundation; either version 2 of the License, or     *
- //  *   (at your option) any later version.                                   *
- //  *                                                                         *
- //  ***************************************************************************/
   
 #ifndef CMXJetHitsCnv_p1_H
 #define CMXJetHitsCnv_p1_H
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CMXJetHitsCollectionCnv_p1.h b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CMXJetHitsCollectionCnv_p1.h
index bd6dd159183084c31e15255a6570fb8a953cc25b..5257f37b5cc23d7594af411d0fcd26db6a0dd700 100755
--- a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CMXJetHitsCollectionCnv_p1.h
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CMXJetHitsCollectionCnv_p1.h
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 #ifndef CMXJetHitsCollectionCNV_P1_H
 #define CMXJetHitsCollectionCNV_P1_H
 
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CMXJetHitsCollectionCnv_tlp1.h b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CMXJetHitsCollectionCnv_tlp1.h
index d8323734e3a8f0030d56fd8b794e0821844aada2..d9c729a22d11af80c7072abd6be194165bfaf3b1 100755
--- a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CMXJetHitsCollectionCnv_tlp1.h
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CMXJetHitsCollectionCnv_tlp1.h
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 #ifndef CMXJetHitsCollectionCNV_TLP1_H
 #define CMXJetHitsCollectionCNV_TLP1_H
 
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CMXJetHitsCollection_p1.h b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CMXJetHitsCollection_p1.h
index 0e63d7f3c579db42be455e1317d18565849124d9..920906cf71c73ce487dec891a026b63b996a1a12 100644
--- a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CMXJetHitsCollection_p1.h
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CMXJetHitsCollection_p1.h
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 #ifndef TRIGT1EVENTTPCNV_CMXJetHitsCOLLECTION_P1_H
 #define TRIGT1EVENTTPCNV_CMXJetHitsCOLLECTION_P1_H
 
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CMXJetHitsCollection_tlp1.h b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CMXJetHitsCollection_tlp1.h
index 04622891f1cb9781d2bf3ee106252ce5a55ffeaa..f9c21d0f9bd0842a7334fa023c4298e5e9d85ef8 100755
--- a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CMXJetHitsCollection_tlp1.h
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CMXJetHitsCollection_tlp1.h
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 #ifndef TRIGT1EVENTTPCNV_CMXJetHitsCOLLECTION_TLP1_H
 #define TRIGT1EVENTTPCNV_CMXJetHitsCOLLECTION_TLP1_H
 
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CMXJetHits_p1.h b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CMXJetHits_p1.h
index 1628470093a78e0ad0fc8014e24fa3489fd259c8..bbd5dcb92c1aba2073f527b6ad4be1b79feafa03 100755
--- a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CMXJetHits_p1.h
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CMXJetHits_p1.h
@@ -1,12 +1,7 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
   
- //***************************************************************************
- //  *                                                                         *
- //  *   This program is free software; you can redistribute it and/or modify  *
-  // *   it under the terms of the GNU General Public License as published by  *
-//   *   the Free Software Foundation; either version 2 of the License, or     *
- //  *   (at your option) any later version.                                   *
- //  *                                                                         *
- //  ***************************************************************************/
   
 #ifndef CMXJetHits_p1_H
 #define CMXJetHits_p1_H
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CMXJetTobCnv_p1.h b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CMXJetTobCnv_p1.h
index ad28bd693d3322f8ec32f6bb2a29eda433a4152e..3480809d8bc856377bff66cca19e337dba5de0c0 100755
--- a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CMXJetTobCnv_p1.h
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CMXJetTobCnv_p1.h
@@ -1,12 +1,7 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
   
- //***************************************************************************
- //  *                                                                         *
- //  *   This program is free software; you can redistribute it and/or modify  *
-  // *   it under the terms of the GNU General Public License as published by  *
-//   *   the Free Software Foundation; either version 2 of the License, or     *
- //  *   (at your option) any later version.                                   *
- //  *                                                                         *
- //  ***************************************************************************/
   
 #ifndef CMXJetTobCnv_p1_H
 #define CMXJetTobCnv_p1_H
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CMXJetTobCollectionCnv_p1.h b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CMXJetTobCollectionCnv_p1.h
index 0fce30224a7bc657dfe639bf0948b2ee9898ff59..6538976cb3f3a6b9b6513844fb67183ccb5a679a 100755
--- a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CMXJetTobCollectionCnv_p1.h
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CMXJetTobCollectionCnv_p1.h
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 #ifndef CMXJetTobCollectionCNV_P1_H
 #define CMXJetTobCollectionCNV_P1_H
 
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CMXJetTobCollectionCnv_tlp1.h b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CMXJetTobCollectionCnv_tlp1.h
index 640d1325cce19048ca3b1b345f524fef1fa2f55d..134da7b886d43c83b5b62715165b97edd6154fa3 100755
--- a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CMXJetTobCollectionCnv_tlp1.h
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CMXJetTobCollectionCnv_tlp1.h
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 #ifndef CMXJetTobCollectionCNV_TLP1_H
 #define CMXJetTobCollectionCNV_TLP1_H
 
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CMXJetTobCollection_p1.h b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CMXJetTobCollection_p1.h
index caf5945f2aa92f5f6d522d8bab43aa90f18b22f9..421c786cd2cf201197c84a116d8e86440dee3f21 100644
--- a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CMXJetTobCollection_p1.h
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CMXJetTobCollection_p1.h
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 #ifndef TRIGT1EVENTTPCNV_CMXJetTobCOLLECTION_P1_H
 #define TRIGT1EVENTTPCNV_CMXJetTobCOLLECTION_P1_H
 
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CMXJetTobCollection_tlp1.h b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CMXJetTobCollection_tlp1.h
index ccd2e29b1cd8c29a8f2d09a3de035af7cf2a434c..c11b9506a44f061d1d5c2a74d45365d5149bb4c0 100755
--- a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CMXJetTobCollection_tlp1.h
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CMXJetTobCollection_tlp1.h
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 #ifndef TRIGT1EVENTTPCNV_CMXJetTobCOLLECTION_TLP1_H
 #define TRIGT1EVENTTPCNV_CMXJetTobCOLLECTION_TLP1_H
 
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CMXJetTob_p1.h b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CMXJetTob_p1.h
index fa4d0e22f5600c52eab151bfd7560916a15ec0ce..451ba157184fea17759196c53769e6dfc632407d 100755
--- a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CMXJetTob_p1.h
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CMXJetTob_p1.h
@@ -1,12 +1,7 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
   
- //***************************************************************************
- //  *                                                                         *
- //  *   This program is free software; you can redistribute it and/or modify  *
-  // *   it under the terms of the GNU General Public License as published by  *
-//   *   the Free Software Foundation; either version 2 of the License, or     *
- //  *   (at your option) any later version.                                   *
- //  *                                                                         *
- //  ***************************************************************************/
   
 #ifndef CMXJetTob_p1_H
 #define CMXJetTob_p1_H
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CMXRoICnv_p1.h b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CMXRoICnv_p1.h
index 393c32d3b2d566373bad18d0234353350143e5bd..0ed83ad3b93009e2c136d8d4144102708a865f52 100755
--- a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CMXRoICnv_p1.h
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CMXRoICnv_p1.h
@@ -1,12 +1,7 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
   
- //***************************************************************************
- //  *                                                                         *
- //  *   This program is free software; you can redistribute it and/or modify  *
-  // *   it under the terms of the GNU General Public License as published by  *
-//   *   the Free Software Foundation; either version 2 of the License, or     *
- //  *   (at your option) any later version.                                   *
- //  *                                                                         *
- //  ***************************************************************************/
   
 #ifndef CMXRoICnv_p1_H
 #define CMXRoICnv_p1_H
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CMXRoI_p1.h b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CMXRoI_p1.h
index c2b6584c09f379af90d7beafce1fe82e78e5ee45..5bc7cfc8477ddfe01f1b721dcadd9db1de69f2cf 100755
--- a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CMXRoI_p1.h
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CMXRoI_p1.h
@@ -1,12 +1,7 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
   
- //***************************************************************************
- //  *                                                                         *
- //  *   This program is free software; you can redistribute it and/or modify  *
-  // *   it under the terms of the GNU General Public License as published by  *
-//   *   the Free Software Foundation; either version 2 of the License, or     *
- //  *   (at your option) any later version.                                   *
- //  *                                                                         *
- //  ***************************************************************************/
   
 #ifndef CMXRoI_p1_H
 #define CMXRoI_p1_H
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CPMHitsCnv_p1.h b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CPMHitsCnv_p1.h
index bffc9c440616e73c3f9e85bafa9c3ed00e13136d..39ad3c809567aab5398d5ffe54c40d006365b3c5 100755
--- a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CPMHitsCnv_p1.h
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CPMHitsCnv_p1.h
@@ -1,20 +1,14 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 
  //***************************************************************************
  //                           CPMHitsCnv_p1.h  -  description
  //                              -------------------
  //     begin                : 21 04 2008
- //     copyright            : (C) 2008 by Alan Watson
  //     email                : Alan.Watson@cern.ch
  //  ***************************************************************************/
   
- //***************************************************************************
- //  *                                                                         *
- //  *   This program is free software; you can redistribute it and/or modify  *
-  // *   it under the terms of the GNU General Public License as published by  *
-//   *   the Free Software Foundation; either version 2 of the License, or     *
- //  *   (at your option) any later version.                                   *
- //  *                                                                         *
- //  ***************************************************************************/
   
 #ifndef CPMHitsCnv_p1_H
 #define CPMHitsCnv_p1_H 
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CPMHitsCollectionCnv_p1.h b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CPMHitsCollectionCnv_p1.h
index 3d0a3333d7cf6d45f3cd7c8c2f33517d587df587..7a472d7d2458f4237a94391d4b0d37598ecf784e 100755
--- a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CPMHitsCollectionCnv_p1.h
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CPMHitsCollectionCnv_p1.h
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 #ifndef CPMHitsCollectionCNV_P1_H
 #define CPMHitsCollectionCNV_P1_H
 
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CPMHitsCollectionCnv_tlp1.h b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CPMHitsCollectionCnv_tlp1.h
index 5acd0bc9b629369402c5c2fc8178a7f2c4c82905..48e9293ae060e7cde7f6c9670ec7c2c1f99b5587 100755
--- a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CPMHitsCollectionCnv_tlp1.h
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CPMHitsCollectionCnv_tlp1.h
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 #ifndef CPMHitsCollectionCNV_TLP1_H
 #define CPMHitsCollectionCNV_TLP1_H
 
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CPMHitsCollection_p1.h b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CPMHitsCollection_p1.h
index b12226744b292bcdf7485ba968582bbe8cbe155b..65ed9f47cace857f84868c3e8d5d4f225e3b0e52 100644
--- a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CPMHitsCollection_p1.h
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CPMHitsCollection_p1.h
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 #ifndef TRIGT1EVENTTPCNV_CPMHITSCOLLECTION_P1_H
 #define TRIGT1EVENTTPCNV_CPMHITSCOLLECTION_P1_H
 
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CPMHitsCollection_tlp1.h b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CPMHitsCollection_tlp1.h
index 7ce67cc5ac57d14f70670356bb5a49a197eb9e7b..bc7d4681d27ae0fc501b2fb4eaaba53c820f07a8 100755
--- a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CPMHitsCollection_tlp1.h
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CPMHitsCollection_tlp1.h
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 #ifndef TRIGT1EVENTTPCNV_CPMHITSCOLLECTION_TLP1_H
 #define TRIGT1EVENTTPCNV_CPMHITSCOLLECTION_TLP1_H
 
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CPMHits_p1.h b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CPMHits_p1.h
index 643649f4aa64740ebac9e52d0ef91237da8e6737..4d2b825e3c483826974c26d8da7bdeb1abac851b 100755
--- a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CPMHits_p1.h
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CPMHits_p1.h
@@ -1,20 +1,14 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 
  //***************************************************************************
  //                           CPMHits_p1.h  -  description
  //                              -------------------
  //     begin                : 21 04 2008
- //     copyright            : (C) 2008 by Alan Watson
  //     email                : Alan.Watson@cern.ch
  //  ***************************************************************************/
   
- //***************************************************************************
- //  *                                                                         *
- //  *   This program is free software; you can redistribute it and/or modify  *
-  // *   it under the terms of the GNU General Public License as published by  *
-//   *   the Free Software Foundation; either version 2 of the License, or     *
- //  *   (at your option) any later version.                                   *
- //  *                                                                         *
- //  ***************************************************************************/
   
 #ifndef CPMHits_p1_H
 #define CPMHits_p1_H
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CPMRoICnv_p1.h b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CPMRoICnv_p1.h
index afa98394431a19b7435b2a6a986bc8bf7ec10ef4..0132286b80f79f28de534fbbdc0bf6e13962aa7c 100755
--- a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CPMRoICnv_p1.h
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CPMRoICnv_p1.h
@@ -1,20 +1,14 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 
  //***************************************************************************
  //                           CPMRoICnv_p1.h  -  description
  //                              -------------------
  //     begin                : 21 04 2008
- //     copyright            : (C) 2008 by Alan Watson
  //     email                : Alan.Watson@cern.ch
  //  ***************************************************************************/
   
- //***************************************************************************
- //  *                                                                         *
- //  *   This program is free software; you can redistribute it and/or modify  *
-  // *   it under the terms of the GNU General Public License as published by  *
-//   *   the Free Software Foundation; either version 2 of the License, or     *
- //  *   (at your option) any later version.                                   *
- //  *                                                                         *
- //  ***************************************************************************/
   
 #ifndef CPMRoICnv_p1_H
 #define CPMRoICnv_p1_H
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CPMRoICollectionCnv_p1.h b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CPMRoICollectionCnv_p1.h
index d845a21b9787efd9420ecb3cb1362734b413bdd0..0cb8733e06a92ad3a4b033b4b3dcaf7828a6adcb 100755
--- a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CPMRoICollectionCnv_p1.h
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CPMRoICollectionCnv_p1.h
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 #ifndef CPMRoICollectionCNV_P1_H
 #define CPMRoICollectionCNV_P1_H
 
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CPMRoICollectionCnv_tlp1.h b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CPMRoICollectionCnv_tlp1.h
index ae010443be133a5b188a06d63aa79c411b2cc1e1..e85b3035d2b68b8d0b7ef89c8693fcf853be83d4 100755
--- a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CPMRoICollectionCnv_tlp1.h
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CPMRoICollectionCnv_tlp1.h
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 #ifndef CPMRoICollectionCNV_TLP1_H
 #define CPMRoICollectionCNV_TLP1_H
 
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CPMRoICollection_p1.h b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CPMRoICollection_p1.h
index 960ddf8da870a5ccb917aa86db14d4f46067ab49..33365e34bfb65b012a348c419256dbdacdc492c4 100644
--- a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CPMRoICollection_p1.h
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CPMRoICollection_p1.h
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 #ifndef TRIGT1EVENTTPCNV_CPMRoICOLLECTION_P1_H
 #define TRIGT1EVENTTPCNV_CPMRoICOLLECTION_P1_H
 
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CPMRoICollection_tlp1.h b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CPMRoICollection_tlp1.h
index c27fdac6124117cdcb1b63fcf7615732d23f9ba9..69a35b66927efd208936425c519767b0619a8001 100755
--- a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CPMRoICollection_tlp1.h
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CPMRoICollection_tlp1.h
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 #ifndef TRIGT1EVENTTPCNV_CPMRoICOLLECTION_TLP1_H
 #define TRIGT1EVENTTPCNV_CPMRoICOLLECTION_TLP1_H
 
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CPMRoI_p1.h b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CPMRoI_p1.h
index ecd44ce1170aad7030266b346bfe1e0b6d9062e9..245696c637fdd4b69c9b9c4679b15706e7e12abe 100755
--- a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CPMRoI_p1.h
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CPMRoI_p1.h
@@ -1,20 +1,14 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 
  //***************************************************************************
  //                           CPMRoI_p1.h  -  description
  //                              -------------------
  //     begin                : 21 04 2008
- //     copyright            : (C) 2008 by Alan Watson
  //     email                : Alan.Watson@cern.ch
  //  ***************************************************************************/
   
- //***************************************************************************
- //  *                                                                         *
- //  *   This program is free software; you can redistribute it and/or modify  *
-  // *   it under the terms of the GNU General Public License as published by  *
-//   *   the Free Software Foundation; either version 2 of the License, or     *
- //  *   (at your option) any later version.                                   *
- //  *                                                                         *
- //  ***************************************************************************/
   
 #ifndef CPMRoI_p1_H
 #define CPMRoI_p1_H
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CPMTobRoICnv_p1.h b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CPMTobRoICnv_p1.h
index 2e73ff801194e9cb79c321387757bc0ad9d636cd..8c4e7654c79da0e07fb142b3b0e20834219312af 100755
--- a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CPMTobRoICnv_p1.h
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CPMTobRoICnv_p1.h
@@ -1,20 +1,14 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 
  //***************************************************************************
  //                           CPMTobRoICnv_p1.h  -  description
  //                              -------------------
  //     begin                : 21 04 2008
- //     copyright            : (C) 2008 by Alan Watson
  //     email                : Alan.Watson@cern.ch
  //  ***************************************************************************/
   
- //***************************************************************************
- //  *                                                                         *
- //  *   This program is free software; you can redistribute it and/or modify  *
-  // *   it under the terms of the GNU General Public License as published by  *
-//   *   the Free Software Foundation; either version 2 of the License, or     *
- //  *   (at your option) any later version.                                   *
- //  *                                                                         *
- //  ***************************************************************************/
   
 #ifndef CPMTobRoICnv_p1_H
 #define CPMTobRoICnv_p1_H
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CPMTobRoICollectionCnv_p1.h b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CPMTobRoICollectionCnv_p1.h
index 298e9d2e98ace6a5141ac37708589fd1dc1b39c9..2177ae3d0a4b66694c9f1bd606f8184de4ab7eb1 100755
--- a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CPMTobRoICollectionCnv_p1.h
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CPMTobRoICollectionCnv_p1.h
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 #ifndef CPMTobRoICollectionCNV_P1_H
 #define CPMTobRoICollectionCNV_P1_H
 
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CPMTobRoICollectionCnv_tlp1.h b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CPMTobRoICollectionCnv_tlp1.h
index c7a8e6c1ec4bc151f74e63a68876d1d3df1f5370..f9be95504120469cc09d9249ef453e206eb4e1c4 100755
--- a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CPMTobRoICollectionCnv_tlp1.h
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CPMTobRoICollectionCnv_tlp1.h
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 #ifndef CPMTobRoICollectionCNV_TLP1_H
 #define CPMTobRoICollectionCNV_TLP1_H
 
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CPMTobRoICollection_p1.h b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CPMTobRoICollection_p1.h
index b852397f79b16e8aafc0d5bb9460ad48f77b0f61..6da9c77c4594ad43d4ae07f2c391341b81b2c7f3 100644
--- a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CPMTobRoICollection_p1.h
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CPMTobRoICollection_p1.h
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 #ifndef TRIGT1EVENTTPCNV_CPMTobRoICOLLECTION_P1_H
 #define TRIGT1EVENTTPCNV_CPMTobRoICOLLECTION_P1_H
 
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CPMTobRoICollection_tlp1.h b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CPMTobRoICollection_tlp1.h
index 32c164b4d05ba65a0840d40cdf6446159c5e25e3..944d6f58388a39333e123e5504ecc4b955913fb0 100755
--- a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CPMTobRoICollection_tlp1.h
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CPMTobRoICollection_tlp1.h
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 #ifndef TRIGT1EVENTTPCNV_CPMTobRoICOLLECTION_TLP1_H
 #define TRIGT1EVENTTPCNV_CPMTobRoICOLLECTION_TLP1_H
 
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CPMTobRoI_p1.h b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CPMTobRoI_p1.h
index 709f98155507f0eb76ce0c1683f95f2a77c7afa9..77c0e867b27fe2ad50982dae01d7d509a3aa27b0 100755
--- a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CPMTobRoI_p1.h
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CPMTobRoI_p1.h
@@ -1,20 +1,14 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 
  //***************************************************************************
  //                           CPMTobRoI_p1.h  -  description
  //                              -------------------
  //     begin                : 21 04 2008
- //     copyright            : (C) 2008 by Alan Watson
  //     email                : Alan.Watson@cern.ch
  //  ***************************************************************************/
   
- //***************************************************************************
- //  *                                                                         *
- //  *   This program is free software; you can redistribute it and/or modify  *
-  // *   it under the terms of the GNU General Public License as published by  *
-//   *   the Free Software Foundation; either version 2 of the License, or     *
- //  *   (at your option) any later version.                                   *
- //  *                                                                         *
- //  ***************************************************************************/
   
 #ifndef CPMTobRoI_p1_H
 #define CPMTobRoI_p1_H
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CPMTowerCnv_p1.h b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CPMTowerCnv_p1.h
index ba244cc77277cfe918cfa621abfca8447e972442..168dcffc7b84ba2b5c0a6703d9baf3b5c2c6d17c 100755
--- a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CPMTowerCnv_p1.h
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CPMTowerCnv_p1.h
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 #ifndef CPMTowerCNV_P1_H
 #define CPMTowerCNV_P1_H
 
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CPMTowerCollectionCnv_p1.h b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CPMTowerCollectionCnv_p1.h
index 5d4c1b52eb0ed6db31518233c0ae8100c3ae4e41..35dbf92c0958e3708aae89b82c4b0666d9e85912 100755
--- a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CPMTowerCollectionCnv_p1.h
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CPMTowerCollectionCnv_p1.h
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 #ifndef CPMTowerCollectionCNV_P1_H
 #define CPMTowerCollectionCNV_P1_H
 
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CPMTowerCollectionCnv_tlp1.h b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CPMTowerCollectionCnv_tlp1.h
index f782740d39a4227d795da9a89232ea68646799cf..21ba39c41e94120dca3fbdce7ebf80b360fea957 100755
--- a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CPMTowerCollectionCnv_tlp1.h
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CPMTowerCollectionCnv_tlp1.h
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 #ifndef CPMTowerCollectionCNV_TLP1_H
 #define CPMTowerCollectionCNV_TLP1_H
 
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CPMTowerCollection_p1.h b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CPMTowerCollection_p1.h
index d3bb5f1292c592e0b0eea05fbe7735a1985d7958..2ff4ed45b12b8961de38d6f6af0444e5f92da80a 100644
--- a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CPMTowerCollection_p1.h
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CPMTowerCollection_p1.h
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 #ifndef TRIGT1EVENTTPCNV_CPMTowerCOLLECTION_P1_H
 #define TRIGT1EVENTTPCNV_CPMTowerCOLLECTION_P1_H
 
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CPMTowerCollection_tlp1.h b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CPMTowerCollection_tlp1.h
index 1633b87e205aa850cac37ecf14748e149e77a5c3..03e701699cdc4a080d5b2388509f5a2d258cf520 100755
--- a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CPMTowerCollection_tlp1.h
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CPMTowerCollection_tlp1.h
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 #ifndef TRIGT1EVENTTPCNV_CPMTowerCOLLECTION_TLP1_H
 #define TRIGT1EVENTTPCNV_CPMTowerCOLLECTION_TLP1_H
 
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CPMTower_p1.h b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CPMTower_p1.h
index 64d52254ade5673c216f7a50daf85a8154a4018b..4c448f8e899c15af66677f6eb65af28df46df07d 100755
--- a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CPMTower_p1.h
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CPMTower_p1.h
@@ -1,20 +1,14 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 
  //***************************************************************************
  //                           CPMTower_p1.h  -  description
  //                              -------------------
  //    begin                : 29/11/2007
- //    copyright            : (C) 2007 by Alan Watson
  //    email                : Alan.Watson@cern.ch
  //  ***************************************************************************/
   
- //***************************************************************************
- //  *                                                                         *
- //  *   This program is free software; you can redistribute it and/or modify  *
-  // *   it under the terms of the GNU General Public License as published by  *
-//   *   the Free Software Foundation; either version 2 of the License, or     *
- //  *   (at your option) any later version.                                   *
- //  *                                                                         *
- //  ***************************************************************************/
   
 #ifndef CPMTower_P1_H
 #define CPMTower_P1_H
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CTP_RDOCnv_p1.h b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CTP_RDOCnv_p1.h
index 869e23782ab0dbe3ac0fbf752f0228b2d90e05c5..0c27e50b4c86e2dd4cf62d1c4087490009f02b01 100644
--- a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CTP_RDOCnv_p1.h
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CTP_RDOCnv_p1.h
@@ -1,5 +1,8 @@
 // Dear emacs, this is -*- c++ -*-
 #ifndef TRIGT1EVENTTPCNV_CTP_RDOCNV_P1_H
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 #define TRIGT1EVENTTPCNV_CTP_RDOCNV_P1_H
 
 // Gaudi/Athena include(s):
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CTP_RDOCnv_p2.h b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CTP_RDOCnv_p2.h
index a939f79c343244670c9841f6b62425ffe719f2c6..0801fb67547770bd7b0a2badcf5a732463cabc57 100644
--- a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CTP_RDOCnv_p2.h
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CTP_RDOCnv_p2.h
@@ -1,5 +1,8 @@
 // Dear emacs, this is -*- c++ -*-
 #ifndef TRIGT1EVENTTPCNV_CTP_RDOCNV_P2_H
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 #define TRIGT1EVENTTPCNV_CTP_RDOCNV_P2_H
 
 // Gaudi/Athena include(s):
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CTP_RDO_p1.h b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CTP_RDO_p1.h
index e37939739e8873bcae84ce153e53d0d6f98ebfd6..384592482906ddc3fa14efe4561a93a27e61e785 100644
--- a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CTP_RDO_p1.h
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CTP_RDO_p1.h
@@ -1,5 +1,8 @@
 // Dear emacs, this is -*- c++ -*-
 #ifndef TRIGT1EVENTTPCNV_CTP_RDO_P1_H
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 #define TRIGT1EVENTTPCNV_CTP_RDO_P1_H
 
 // System include(s):
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CTP_RDO_p2.h b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CTP_RDO_p2.h
index 0c24e9108626add98864ebc8319f937e1eff6afe..21015760e93c7ba757a2c6ce023ab35eae77329d 100644
--- a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CTP_RDO_p2.h
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/CTP_RDO_p2.h
@@ -1,5 +1,8 @@
 // Dear emacs, this is -*- c++ -*-
 #ifndef TRIGT1EVENTTPCNV_CTP_RDO_P2_H
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 #define TRIGT1EVENTTPCNV_CTP_RDO_P2_H
 
 // System include(s):
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/JEMEtSumsCnv_p1.h b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/JEMEtSumsCnv_p1.h
index c1672058f3b639ea6004dd6e048d1eb40103bb49..24abed705a272a81acabbc9958cc048e7ea26a08 100755
--- a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/JEMEtSumsCnv_p1.h
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/JEMEtSumsCnv_p1.h
@@ -1,20 +1,14 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 
  //***************************************************************************
  //                           JEMEtSumsCnv_p1.h  -  description
  //                              -------------------
  //     begin                : 21 04 2008
- //     copyright            : (C) 2008 by Alan Watson
  //     email                : Alan.Watson@cern.ch
  //  ***************************************************************************/
   
- //***************************************************************************
- //  *                                                                         *
- //  *   This program is free software; you can redistribute it and/or modify  *
-  // *   it under the terms of the GNU General Public License as published by  *
-//   *   the Free Software Foundation; either version 2 of the License, or     *
- //  *   (at your option) any later version.                                   *
- //  *                                                                         *
- //  ***************************************************************************/
   
 #ifndef JEMEtSumsCnv_p1_H
 #define JEMEtSumsCnv_p1_H
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/JEMEtSumsCollectionCnv_p1.h b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/JEMEtSumsCollectionCnv_p1.h
index b8411f12978d633617582bcef64c4fb695fc697b..0b64c1d29798e96cff2c8efcdb50b5c8cfcd5ac8 100755
--- a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/JEMEtSumsCollectionCnv_p1.h
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/JEMEtSumsCollectionCnv_p1.h
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 #ifndef JEMEtSumsCollectionCNV_P1_H
 #define JEMEtSumsCollectionCNV_P1_H
 
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/JEMEtSumsCollectionCnv_tlp1.h b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/JEMEtSumsCollectionCnv_tlp1.h
index 283cf11f899cccb2b5f8b3078dbaa72259808450..f1732fb4d94139108a74de1baf815dd3acde1027 100755
--- a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/JEMEtSumsCollectionCnv_tlp1.h
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/JEMEtSumsCollectionCnv_tlp1.h
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 #ifndef JEMEtSumsCollectionCNV_TLP1_H
 #define JEMEtSumsCollectionCNV_TLP1_H
 
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/JEMEtSumsCollection_p1.h b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/JEMEtSumsCollection_p1.h
index 4f36ad06fa163493a0c94abfd8ecca5f5eea1d08..b9570cf1dd07119dceeac04baa22ce0945e74d3c 100644
--- a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/JEMEtSumsCollection_p1.h
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/JEMEtSumsCollection_p1.h
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 #ifndef TRIGT1EVENTTPCNV_JEMEtSumsCOLLECTION_P1_H
 #define TRIGT1EVENTTPCNV_JEMEtSumsCOLLECTION_P1_H
 
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/JEMEtSumsCollection_tlp1.h b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/JEMEtSumsCollection_tlp1.h
index 5cae03022b4d5bcbdaf9abbf2f3601e6a9ed4735..1eee196fb41c49ee5581164f2b5b05649828a77f 100755
--- a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/JEMEtSumsCollection_tlp1.h
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/JEMEtSumsCollection_tlp1.h
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 #ifndef TRIGT1EVENTTPCNV_JEMEtSumsCOLLECTION_TLP1_H
 #define TRIGT1EVENTTPCNV_JEMEtSumsCOLLECTION_TLP1_H
 
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/JEMEtSums_p1.h b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/JEMEtSums_p1.h
index ad42fdbf8f5bd79084778c9a02027c4bf21cf7af..568e751c6f6f24724b7703df21fc90b82e0277f7 100755
--- a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/JEMEtSums_p1.h
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/JEMEtSums_p1.h
@@ -1,20 +1,14 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 
  //***************************************************************************
  //                           JEMEtSums_p1.h  -  description
  //                              -------------------
  //     begin                : 21 04 2008
- //     copyright            : (C) 2008 by Alan Watson
  //     email                : Alan.Watson@cern.ch
  //  ***************************************************************************/
   
- //***************************************************************************
- //  *                                                                         *
- //  *   This program is free software; you can redistribute it and/or modify  *
-  // *   it under the terms of the GNU General Public License as published by  *
-//   *   the Free Software Foundation; either version 2 of the License, or     *
- //  *   (at your option) any later version.                                   *
- //  *                                                                         *
- //  ***************************************************************************/
   
 #ifndef JEMEtSums_p1_H
 #define JEMEtSums_p1_H
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/JEMHitsCnv_p1.h b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/JEMHitsCnv_p1.h
index 58e01295e56c052b3c0c2be49bdb4ea4c37b7b86..5d9af3d3873cbd5790b0f36f4078e4ece114a903 100755
--- a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/JEMHitsCnv_p1.h
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/JEMHitsCnv_p1.h
@@ -1,20 +1,14 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 
  //***************************************************************************
  //                           JEMHitsCnv_p1.h  -  description
  //                              -------------------
  //     begin                : 21 04 2008
- //     copyright            : (C) 2008 by Alan Watson
  //     email                : Alan.Watson@cern.ch
  //  ***************************************************************************/
   
- //***************************************************************************
- //  *                                                                         *
- //  *   This program is free software; you can redistribute it and/or modify  *
-  // *   it under the terms of the GNU General Public License as published by  *
-//   *   the Free Software Foundation; either version 2 of the License, or     *
- //  *   (at your option) any later version.                                   *
- //  *                                                                         *
- //  ***************************************************************************/
   
 #ifndef JEMHitsCnv_p1_H
 #define JEMHitsCnv_p1_H
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/JEMHitsCollectionCnv_p1.h b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/JEMHitsCollectionCnv_p1.h
index c15eb878deca852ec8b9bb995250f32ee5a317b8..706bc5fa414792c1d4299567aca1d7c016345296 100755
--- a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/JEMHitsCollectionCnv_p1.h
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/JEMHitsCollectionCnv_p1.h
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 #ifndef JEMHitsCollectionCNV_P1_H
 #define JEMHitsCollectionCNV_P1_H
 
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/JEMHitsCollectionCnv_tlp1.h b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/JEMHitsCollectionCnv_tlp1.h
index b7993933e26fdd3d098792dbd480a79edce51526..f6df584958d22315ae6f00a051c7d5b5cdb0fe7a 100755
--- a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/JEMHitsCollectionCnv_tlp1.h
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/JEMHitsCollectionCnv_tlp1.h
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 #ifndef JEMHitsCollectionCNV_TLP1_H
 #define JEMHitsCollectionCNV_TLP1_H
 
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/JEMHitsCollection_p1.h b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/JEMHitsCollection_p1.h
index 856a5da88dfbd05b74d488c1c241674e5d63397b..4620b8fb910eae80fd5fb996b4b40bcc33de4876 100644
--- a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/JEMHitsCollection_p1.h
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/JEMHitsCollection_p1.h
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 #ifndef TRIGT1EVENTTPCNV_JEMHitsCOLLECTION_P1_H
 #define TRIGT1EVENTTPCNV_JEMHitsCOLLECTION_P1_H
 
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/JEMHitsCollection_tlp1.h b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/JEMHitsCollection_tlp1.h
index c947d9c1a96bd6acba0693f1defcc386fded406c..1a3d3992cbcc705f4eea34688ae20b690d57b6ef 100755
--- a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/JEMHitsCollection_tlp1.h
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/JEMHitsCollection_tlp1.h
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 #ifndef TRIGT1EVENTTPCNV_JEMHitsCOLLECTION_TLP1_H
 #define TRIGT1EVENTTPCNV_JEMHitsCOLLECTION_TLP1_H
 
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/JEMHits_p1.h b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/JEMHits_p1.h
index fa33d74a187f32fb15e2a1ec5d4a2410540e56ad..d5316517d3a971693e2ae982da23af5ef6a3c170 100755
--- a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/JEMHits_p1.h
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/JEMHits_p1.h
@@ -1,20 +1,14 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 
  //***************************************************************************
  //                           JEMHits_p1.h  -  description
  //                              -------------------
  //     begin                : 21 04 2008
- //     copyright            : (C) 2008 by Alan Watson
  //     email                : Alan.Watson@cern.ch
  //  ***************************************************************************/
   
- //***************************************************************************
- //  *                                                                         *
- //  *   This program is free software; you can redistribute it and/or modify  *
-  // *   it under the terms of the GNU General Public License as published by  *
-//   *   the Free Software Foundation; either version 2 of the License, or     *
- //  *   (at your option) any later version.                                   *
- //  *                                                                         *
- //  ***************************************************************************/
   
 #ifndef JEMHits_p1_H
 #define JEMHits_p1_H
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/JEMRoICnv_p1.h b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/JEMRoICnv_p1.h
index aaa2d3b6be6c87147f4f7ea02470f71ccd95572a..35087f45e0cc9b0c2036d6d7646d1bdafa7ce046 100755
--- a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/JEMRoICnv_p1.h
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/JEMRoICnv_p1.h
@@ -1,20 +1,14 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 
  //***************************************************************************
  //                           JEMRoICnv_p1.h  -  description
  //                              -------------------
  //     begin                : 21 04 2008
- //     copyright            : (C) 2008 by Alan Watson
  //     email                : Alan.Watson@cern.ch
  //  ***************************************************************************/
   
- //***************************************************************************
- //  *                                                                         *
- //  *   This program is free software; you can redistribute it and/or modify  *
-  // *   it under the terms of the GNU General Public License as published by  *
-//   *   the Free Software Foundation; either version 2 of the License, or     *
- //  *   (at your option) any later version.                                   *
- //  *                                                                         *
- //  ***************************************************************************/
   
 #ifndef JEMRoICnv_p1_H
 #define JEMRoICnv_p1_H
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/JEMRoICollectionCnv_p1.h b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/JEMRoICollectionCnv_p1.h
index 84dcd98f438969a0dd385236677a112f56a37217..6227c78e861f4f8aab6be4fc7eaa952302ba6ae3 100755
--- a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/JEMRoICollectionCnv_p1.h
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/JEMRoICollectionCnv_p1.h
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 #ifndef JEMRoICollectionCNV_P1_H
 #define JEMRoICollectionCNV_P1_H
 
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/JEMRoICollectionCnv_tlp1.h b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/JEMRoICollectionCnv_tlp1.h
index df91e09fdb1969e8b17d0bf8c5212da2f84b571e..27c50f073bede0496fbec5b7b4cf7056a4b3c23c 100755
--- a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/JEMRoICollectionCnv_tlp1.h
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/JEMRoICollectionCnv_tlp1.h
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 #ifndef JEMRoICollectionCNV_TLP1_H
 #define JEMRoICollectionCNV_TLP1_H
 
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/JEMRoICollection_p1.h b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/JEMRoICollection_p1.h
index 5df1bb45e7f9fba8ad9c22c0585bee0284c95e2f..9d036121b8230b05f8e05ffbccabaadc62d190a4 100644
--- a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/JEMRoICollection_p1.h
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/JEMRoICollection_p1.h
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 #ifndef TRIGT1EVENTTPCNV_JEMRoICOLLECTION_P1_H
 #define TRIGT1EVENTTPCNV_JEMRoICOLLECTION_P1_H
 
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/JEMRoICollection_tlp1.h b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/JEMRoICollection_tlp1.h
index 50b687acd5ddb9b891e467b2fbef3a5856b374ed..367e3de5de0e8e67f8837bc76662d431a6fe24d2 100755
--- a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/JEMRoICollection_tlp1.h
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/JEMRoICollection_tlp1.h
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 #ifndef TRIGT1EVENTTPCNV_JEMRoICOLLECTION_TLP1_H
 #define TRIGT1EVENTTPCNV_JEMRoICOLLECTION_TLP1_H
 
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/JEMRoI_p1.h b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/JEMRoI_p1.h
index 6d936812972b7b3e0db562d126c7f03c5f43ce17..d248474ceb879848e1d80e746694536c36e51597 100755
--- a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/JEMRoI_p1.h
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/JEMRoI_p1.h
@@ -1,20 +1,14 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 
  //***************************************************************************
  //                           JEMRoI_p1.h  -  description
  //                              -------------------
  //     begin                : 21 04 2008
- //     copyright            : (C) 2008 by Alan Watson
  //     email                : Alan.Watson@cern.ch
  //  ***************************************************************************/
   
- //***************************************************************************
- //  *                                                                         *
- //  *   This program is free software; you can redistribute it and/or modify  *
-  // *   it under the terms of the GNU General Public License as published by  *
-//   *   the Free Software Foundation; either version 2 of the License, or     *
- //  *   (at your option) any later version.                                   *
- //  *                                                                         *
- //  ***************************************************************************/
   
 #ifndef JEMRoI_p1_H
 #define JEMRoI_p1_H
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/JEMTobRoICnv_p1.h b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/JEMTobRoICnv_p1.h
index db137ca93fe2484b3164864a577d72531660237a..ebec2b7fe875146dcfcaf9a81ab97d96ef263f0e 100755
--- a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/JEMTobRoICnv_p1.h
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/JEMTobRoICnv_p1.h
@@ -1,12 +1,7 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
   
- //***************************************************************************
- //  *                                                                         *
- //  *   This program is free software; you can redistribute it and/or modify  *
-  // *   it under the terms of the GNU General Public License as published by  *
-//   *   the Free Software Foundation; either version 2 of the License, or     *
- //  *   (at your option) any later version.                                   *
- //  *                                                                         *
- //  ***************************************************************************/
   
 #ifndef JEMTobRoICnv_p1_H
 #define JEMTobRoICnv_p1_H
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/JEMTobRoICollectionCnv_p1.h b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/JEMTobRoICollectionCnv_p1.h
index 7c5de188dba76047dc5624ef8c1751f741146872..583700dbe696b6e44f1bb300c41c44654414973c 100755
--- a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/JEMTobRoICollectionCnv_p1.h
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/JEMTobRoICollectionCnv_p1.h
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 #ifndef JEMTobRoICollectionCNV_P1_H
 #define JEMTobRoICollectionCNV_P1_H
 
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/JEMTobRoICollectionCnv_tlp1.h b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/JEMTobRoICollectionCnv_tlp1.h
index 0aaa0bb74b8b8d33aadb34b7189e0d4340b8c331..56cea72d709bdedc8a511486fd27669240fcf731 100755
--- a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/JEMTobRoICollectionCnv_tlp1.h
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/JEMTobRoICollectionCnv_tlp1.h
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 #ifndef JEMTobRoICollectionCNV_TLP1_H
 #define JEMTobRoICollectionCNV_TLP1_H
 
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/JEMTobRoICollection_p1.h b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/JEMTobRoICollection_p1.h
index 9f706a01892499acbb5be4417c9dad32ca978df9..b83d1b885e7ea2701647d60cd4959ac1747fbadc 100644
--- a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/JEMTobRoICollection_p1.h
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/JEMTobRoICollection_p1.h
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 #ifndef TRIGT1EVENTTPCNV_JEMTobRoICOLLECTION_P1_H
 #define TRIGT1EVENTTPCNV_JEMTobRoICOLLECTION_P1_H
 
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/JEMTobRoICollection_tlp1.h b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/JEMTobRoICollection_tlp1.h
index c79a99082b7e2eb9fb3f3ae4340c47dfd9fda7e8..a975ab8f65f8a930b849d876235bd7da98b66d4c 100755
--- a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/JEMTobRoICollection_tlp1.h
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/JEMTobRoICollection_tlp1.h
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 #ifndef TRIGT1EVENTTPCNV_JEMTobRoICOLLECTION_TLP1_H
 #define TRIGT1EVENTTPCNV_JEMTobRoICOLLECTION_TLP1_H
 
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/JEMTobRoI_p1.h b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/JEMTobRoI_p1.h
index cad73983514c9f3cbd572ccf70bea8a04c0829be..2e63ac4023705778c502a29161c26ccf4e711928 100755
--- a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/JEMTobRoI_p1.h
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/JEMTobRoI_p1.h
@@ -1,12 +1,7 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
   
- //***************************************************************************
- //  *                                                                         *
- //  *   This program is free software; you can redistribute it and/or modify  *
-  // *   it under the terms of the GNU General Public License as published by  *
-//   *   the Free Software Foundation; either version 2 of the License, or     *
- //  *   (at your option) any later version.                                   *
- //  *                                                                         *
- //  ***************************************************************************/
   
 #ifndef JEMTobRoI_p1_H
 #define JEMTobRoI_p1_H
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/JetElementCnv_p1.h b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/JetElementCnv_p1.h
index 2b04a6bb43b54f04fe005cda498751d48c9fb96b..3c0c27015874a4f5d60fb7a5c9060abc5e498f70 100755
--- a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/JetElementCnv_p1.h
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/JetElementCnv_p1.h
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 #ifndef JetElementCNV_P1_H
 #define JetElementCNV_P1_H
 
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/JetElementCollectionCnv_p1.h b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/JetElementCollectionCnv_p1.h
index 4836d1b6f4bc8c31790df9b3235ae64a9899e45c..33edbfbd9ebbac249588c21f00bf9b7e801d32d9 100755
--- a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/JetElementCollectionCnv_p1.h
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/JetElementCollectionCnv_p1.h
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 #ifndef JetElementCollectionCNV_P1_H
 #define JetElementCollectionCNV_P1_H
 
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/JetElementCollectionCnv_tlp1.h b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/JetElementCollectionCnv_tlp1.h
index 373b1df3d1bdf26fa23c3def5550409aad8e18f8..09f20d7ba7c2b8afe7eb82e62a8df32f7524eef9 100755
--- a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/JetElementCollectionCnv_tlp1.h
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/JetElementCollectionCnv_tlp1.h
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 #ifndef JetElementCollectionCNV_TLP1_H
 #define JetElementCollectionCNV_TLP1_H
 
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/JetElementCollection_p1.h b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/JetElementCollection_p1.h
index 6651a6f137ed32ce459932ff9fb40ca041bbcedc..c89ad20ac80f5776e810e86cbabb5c976abcc676 100644
--- a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/JetElementCollection_p1.h
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/JetElementCollection_p1.h
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 #ifndef TRIGT1EVENTTPCNV_JETELEMENTCOLLECTION_P1_H
 #define TRIGT1EVENTTPCNV_JETELEMENTCOLLECTION_P1_H
 
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/JetElementCollection_tlp1.h b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/JetElementCollection_tlp1.h
index 090ffbaeff18fa56aa437f90251c517c5fb917f8..33c506dd1233fed917fed6263b0dc4febcc2e75f 100755
--- a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/JetElementCollection_tlp1.h
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/JetElementCollection_tlp1.h
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 #ifndef TRIGT1EVENTTPCNV_JETELEMENTCOLLECTION_TLP1_H
 #define TRIGT1EVENTTPCNV_JETELEMENTCOLLECTION_TLP1_H
 
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/JetElement_p1.h b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/JetElement_p1.h
index cfe78df9275f8753a71094ffe8ddeb0b16611c94..aca5ce665bed0a353ce4091cbf837667d4eada18 100755
--- a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/JetElement_p1.h
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/JetElement_p1.h
@@ -1,20 +1,14 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 
  //***************************************************************************
  //                           JetElement_p1.h  -  description
  //                              -------------------
  //    begin                : 29/11/2007
- //    copyright            : (C) 2007 by Alan Watson
  //    email                : Alan.Watson@cern.ch
  //  ***************************************************************************/
   
- //***************************************************************************
- //  *                                                                         *
- //  *   This program is free software; you can redistribute it and/or modify  *
-  // *   it under the terms of the GNU General Public License as published by  *
-//   *   the Free Software Foundation; either version 2 of the License, or     *
- //  *   (at your option) any later version.                                   *
- //  *                                                                         *
- //  ***************************************************************************/
   
 #ifndef JETELEMENT_P1_H
 #define JETELEMENT_P1_H
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/MuCTPI_RDOCnv_p1.h b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/MuCTPI_RDOCnv_p1.h
index c395c5a01685bdbe897470b58fb7812094e79938..900009f954f3b6a7678fdf1228a02a227cb5c02d 100644
--- a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/MuCTPI_RDOCnv_p1.h
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/MuCTPI_RDOCnv_p1.h
@@ -1,5 +1,8 @@
 // Dear emacs, this is -*- c++ -*-
 #ifndef TRIGT1EVENTTPCNV_MUCTPI_RDOCNV_P1_H
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 #define TRIGT1EVENTTPCNV_MUCTPI_RDOCNV_P1_H
 
 // Gaudi/Athena include(s):
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/MuCTPI_RDO_p1.h b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/MuCTPI_RDO_p1.h
index b5e86f0f30621dfce39dd2e6d9131e30d3d95dd3..865544661a230ae16d31f3785bf223783cae7a2a 100644
--- a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/MuCTPI_RDO_p1.h
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/MuCTPI_RDO_p1.h
@@ -1,5 +1,8 @@
 // Dear emacs, this is -*- c++ -*-
 #ifndef TRIGT1EVENTTPCNV_MUCTPI_RDO_P1_H
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 #define TRIGT1EVENTTPCNV_MUCTPI_RDO_P1_H
 
 // System include(s):
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/RODHeaderCnv_p1.h b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/RODHeaderCnv_p1.h
index ea765980e98f4e4b9ddd9ec2bddeac3804eafa9b..f73e30ba389c667cb1dc823e6eb4aa42dd1b489c 100755
--- a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/RODHeaderCnv_p1.h
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/RODHeaderCnv_p1.h
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 #ifndef RODHeaderCNV_P1_H
 #define RODHeaderCNV_P1_H
 
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/RODHeaderCollectionCnv_p1.h b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/RODHeaderCollectionCnv_p1.h
index 06596c3d2c830d61e5b34af4156dcf613a45f307..62f0ff2a09179539ebb2902bc85269a941256081 100755
--- a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/RODHeaderCollectionCnv_p1.h
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/RODHeaderCollectionCnv_p1.h
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 #ifndef RODHeaderCollectionCNV_P1_H
 #define RODHeaderCollectionCNV_P1_H
 
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/RODHeaderCollectionCnv_tlp1.h b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/RODHeaderCollectionCnv_tlp1.h
index 1730079db7889323775eee381e09c3f6261918de..e43f44e1d49079054b130a514406b76898315e25 100755
--- a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/RODHeaderCollectionCnv_tlp1.h
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/RODHeaderCollectionCnv_tlp1.h
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 #ifndef RODHeaderCollectionCNV_TLP1_H
 #define RODHeaderCollectionCNV_TLP1_H
 
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/RODHeaderCollection_p1.h b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/RODHeaderCollection_p1.h
index 3192ccc8cc629f2f2f48b61e13cee12c05147440..290d502776cde9d3f1ba29df1f16d388e27a0ee8 100644
--- a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/RODHeaderCollection_p1.h
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/RODHeaderCollection_p1.h
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 #ifndef TRIGT1EVENTTPCNV_RODHeaderCOLLECTION_P1_H
 #define TRIGT1EVENTTPCNV_RODHeaderCOLLECTION_P1_H
 
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/RODHeaderCollection_tlp1.h b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/RODHeaderCollection_tlp1.h
index a518638602079d3f3b33ddf40f45c03e6452233e..a823cebccc848099c8ff3503ac7d75666df298ef 100755
--- a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/RODHeaderCollection_tlp1.h
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/RODHeaderCollection_tlp1.h
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 #ifndef TRIGT1EVENTTPCNV_RODHeaderCOLLECTION_TLP1_H
 #define TRIGT1EVENTTPCNV_RODHeaderCOLLECTION_TLP1_H
 
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/RODHeader_p1.h b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/RODHeader_p1.h
index 9c2d110bf179d2005beced32c9f1db41dd0ba214..cc927399725d3feac2b8273011a0a4175fb8c429 100755
--- a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/RODHeader_p1.h
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/RODHeader_p1.h
@@ -1,20 +1,14 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 
  //***************************************************************************
  //                           RODHeader_p1.h  -  description
  //                              -------------------
  //    begin                : 29/11/2007
- //    copyright            : (C) 2007 by Alan Watson
  //    email                : Alan.Watson@cern.ch
  //  ***************************************************************************/
   
- //***************************************************************************
- //  *                                                                         *
- //  *   This program is free software; you can redistribute it and/or modify  *
-  // *   it under the terms of the GNU General Public License as published by  *
-//   *   the Free Software Foundation; either version 2 of the License, or     *
- //  *   (at your option) any later version.                                   *
- //  *                                                                         *
- //  ***************************************************************************/
   
 #ifndef RODHeader_P1_H
 #define RODHeader_P1_H
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/RoIBResultCnv_p1.h b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/RoIBResultCnv_p1.h
index 5e32569e777396fe4cd33ee6d45f5bd1748c43d9..4a9004e1dfc4c2f23c1ccd5b3234b3e5bfcbb5eb 100644
--- a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/RoIBResultCnv_p1.h
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/RoIBResultCnv_p1.h
@@ -1,5 +1,8 @@
 // Dear emacs, this is -*- c++ -*-
 #ifndef TRIGT1EVENTTPCNV_ROIBRESULTCNV_P1_H
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 #define TRIGT1EVENTTPCNV_ROIBRESULTCNV_P1_H
 
 // Gaudi/Athena include(s):
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/RoIBResult_p1.h b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/RoIBResult_p1.h
index 5481621a788ac9d7f3d5c67722395455bdd43fcf..514c55b9c9f45712cd9ce53e0c0a76917f2822cd 100644
--- a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/RoIBResult_p1.h
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/RoIBResult_p1.h
@@ -1,5 +1,8 @@
 // Dear emacs, this is -*- c++ -*-
 #ifndef TRIGT1EVENTTPCNV_ROIBRESULT_P1_H
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 #define TRIGT1EVENTTPCNV_ROIBRESULT_P1_H
 
 // System include(s):
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/SubSysResult_p1.h b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/SubSysResult_p1.h
index c3b35544218168a89fb036987e10ade900856bf1..b1e9cd7c394a676046458e9d18d57590fc971c8a 100644
--- a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/SubSysResult_p1.h
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/SubSysResult_p1.h
@@ -1,5 +1,8 @@
 // Dear emacs, this is -*- c++ -*-
 #ifndef TRIGT1EVENTTPCNV_SUBSYSRESULT_P1_H
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 #define TRIGT1EVENTTPCNV_SUBSYSRESULT_P1_H
 
 // System include(s):
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/TrigT1EventTPCnvDict.h b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/TrigT1EventTPCnvDict.h
index 46b329a07ac8d505f01a8a2351656a0e84fb21d3..bf3ae483e708c24fdf9c6b9a4fea6e803f99ad75 100644
--- a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/TrigT1EventTPCnvDict.h
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/TrigT1EventTPCnvDict.h
@@ -1,5 +1,8 @@
 // Dear emacs, this is -*- c++ -*-
 #ifndef TRIGT1EVENTTPCNV_TRIGT1EVENTTPCNVDICT_H
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 #define TRIGT1EVENTTPCNV_TRIGT1EVENTTPCNVDICT_H
 
 //
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/TriggerTowerCnv_p1.h b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/TriggerTowerCnv_p1.h
index ac115320d630e69977d446f5b663a7543c70b521..79df17401b0e9715e897ed803d908be073215383 100755
--- a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/TriggerTowerCnv_p1.h
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/TriggerTowerCnv_p1.h
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 #ifndef TriggerTowerCNV_P1_H
 #define TriggerTowerCNV_P1_H
 
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/TriggerTowerCollectionCnv_p1.h b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/TriggerTowerCollectionCnv_p1.h
index 6db0579bd19cb8d8a06ea0ff2aef861daa80252b..bf3fa6d957ed0998eecf0ca708ace84476ad6465 100755
--- a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/TriggerTowerCollectionCnv_p1.h
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/TriggerTowerCollectionCnv_p1.h
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 #ifndef TriggerTowerCollectionCNV_P1_H
 #define TriggerTowerCollectionCNV_P1_H
 
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/TriggerTowerCollectionCnv_tlp1.h b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/TriggerTowerCollectionCnv_tlp1.h
index a56b9a2b9b2a755f81fbd42ee8ff50f76195f5d8..c2d2cfdbf304baa97f83c193d5181a7591d1deff 100755
--- a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/TriggerTowerCollectionCnv_tlp1.h
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/TriggerTowerCollectionCnv_tlp1.h
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 #ifndef TriggerTowerCollectionCNV_TLP1_H
 #define TriggerTowerCollectionCNV_TLP1_H
 
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/TriggerTowerCollection_p1.h b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/TriggerTowerCollection_p1.h
index fb2c14dcfcf71632df4eabed214e72b098e6c08e..2aea35c263ee59728b5aab0334c6f1a0f02b5de4 100644
--- a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/TriggerTowerCollection_p1.h
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/TriggerTowerCollection_p1.h
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 #ifndef TRIGT1EVENTTPCNV_TRIGGERTOWERCOLLECTION_P1_H
 #define TRIGT1EVENTTPCNV_TRIGGERTOWERCOLLECTION_P1_H
 
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/TriggerTowerCollection_tlp1.h b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/TriggerTowerCollection_tlp1.h
index 2408f416c278d3f43780877a9031b6f79e97771d..3cb19d00a1038ff119e781919b4378bca6b309ae 100755
--- a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/TriggerTowerCollection_tlp1.h
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/TriggerTowerCollection_tlp1.h
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 #ifndef TRIGT1EVENTTPCNV_TRIGGERTOWERCOLLECTION_TLP1_H
 #define TRIGT1EVENTTPCNV_TRIGGERTOWERCOLLECTION_TLP1_H
 
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/TriggerTower_p1.h b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/TriggerTower_p1.h
index 36778dc3325fc7ba1e4a811c5145cd3d77ad1824..5d317cc03a74af9dc02f9c3bb8e4cbc2e1d936de 100755
--- a/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/TriggerTower_p1.h
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/TrigT1EventTPCnv/TriggerTower_p1.h
@@ -1,20 +1,14 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 
  //***************************************************************************
  //                           TriggerTower_p1.h  -  description
  //                              -------------------
  //    begin                : 29/11/2007
- //    copyright            : (C) 2007 by Alan Watson
  //    email                : Alan.Watson@cern.ch
  //  ***************************************************************************/
   
- //***************************************************************************
- //  *                                                                         *
- //  *   This program is free software; you can redistribute it and/or modify  *
-  // *   it under the terms of the GNU General Public License as published by  *
-//   *   the Free Software Foundation; either version 2 of the License, or     *
- //  *   (at your option) any later version.                                   *
- //  *                                                                         *
- //  ***************************************************************************/
   
 #ifndef TRIGGERTOWER_P1_H
 #define TRIGGERTOWER_P1_H
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/src/CMMCPHitsCnv_p1.cxx b/Trigger/TrigT1/TrigT1EventTPCnv/src/CMMCPHitsCnv_p1.cxx
index 58881adccdfc42e9eaf150c385ac35ef8f4b547d..59bd5e8d5c18b529ed29e87089b0217ec9c5af89 100755
--- a/Trigger/TrigT1/TrigT1EventTPCnv/src/CMMCPHitsCnv_p1.cxx
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/src/CMMCPHitsCnv_p1.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #include "TrigT1CaloEvent/CMMCPHits.h"
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/src/CMMCPHitsCollectionCnv_tlp1.cxx b/Trigger/TrigT1/TrigT1EventTPCnv/src/CMMCPHitsCollectionCnv_tlp1.cxx
index 18ad852895732a8ccb329dd462af9765a1d36a19..dc367afd742783aa62c4cf329715ca70bb7a6133 100755
--- a/Trigger/TrigT1/TrigT1EventTPCnv/src/CMMCPHitsCollectionCnv_tlp1.cxx
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/src/CMMCPHitsCollectionCnv_tlp1.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/src/CMMEtSumsCnv_p1.cxx b/Trigger/TrigT1/TrigT1EventTPCnv/src/CMMEtSumsCnv_p1.cxx
index 8b59b5be7d0f93ef6995d9f6c638869bd953fa33..4cd8e7a783bb6e4f496121747cbe31b69f8ec4d3 100755
--- a/Trigger/TrigT1/TrigT1EventTPCnv/src/CMMEtSumsCnv_p1.cxx
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/src/CMMEtSumsCnv_p1.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #include "TrigT1CaloEvent/CMMEtSums.h"
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/src/CMMEtSumsCollectionCnv_tlp1.cxx b/Trigger/TrigT1/TrigT1EventTPCnv/src/CMMEtSumsCollectionCnv_tlp1.cxx
index 3766bbb28588f3d3502951a7dab325b21d89ce87..0c62ab4ce3d816534f1c97cd6b2df91ed3edd903 100755
--- a/Trigger/TrigT1/TrigT1EventTPCnv/src/CMMEtSumsCollectionCnv_tlp1.cxx
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/src/CMMEtSumsCollectionCnv_tlp1.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/src/CMMJetHitsCnv_p1.cxx b/Trigger/TrigT1/TrigT1EventTPCnv/src/CMMJetHitsCnv_p1.cxx
index 0efe4c3d16b250b160abbf2657593ba040eafa8a..74cc4b2c8b798d58aa92d5cd99018be663cb9225 100755
--- a/Trigger/TrigT1/TrigT1EventTPCnv/src/CMMJetHitsCnv_p1.cxx
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/src/CMMJetHitsCnv_p1.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #include "TrigT1CaloEvent/CMMJetHits.h"
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/src/CMMJetHitsCollectionCnv_tlp1.cxx b/Trigger/TrigT1/TrigT1EventTPCnv/src/CMMJetHitsCollectionCnv_tlp1.cxx
index 9efd154a4586f6572d3640981c7af50684a853bf..208b457ac48a771b282523bcb6630d0430594582 100755
--- a/Trigger/TrigT1/TrigT1EventTPCnv/src/CMMJetHitsCollectionCnv_tlp1.cxx
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/src/CMMJetHitsCollectionCnv_tlp1.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/src/CMMRoICnv_p1.cxx b/Trigger/TrigT1/TrigT1EventTPCnv/src/CMMRoICnv_p1.cxx
index dbb00b7614f5b56da8600383a4203d2bb31a957d..82b6d8998c71fcf298596e50c32784b19d6be984 100755
--- a/Trigger/TrigT1/TrigT1EventTPCnv/src/CMMRoICnv_p1.cxx
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/src/CMMRoICnv_p1.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #include "TrigT1CaloEvent/CMMRoI.h"
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/src/CMXCPHitsCnv_p1.cxx b/Trigger/TrigT1/TrigT1EventTPCnv/src/CMXCPHitsCnv_p1.cxx
index 7b8425de53a6884fb09ed8c94e66f754cb2a98b1..4b0310955d8ac44fe7b6668ae7f73ade2f9541a0 100755
--- a/Trigger/TrigT1/TrigT1EventTPCnv/src/CMXCPHitsCnv_p1.cxx
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/src/CMXCPHitsCnv_p1.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #include "TrigT1CaloEvent/CMXCPHits.h"
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/src/CMXCPHitsCollectionCnv_tlp1.cxx b/Trigger/TrigT1/TrigT1EventTPCnv/src/CMXCPHitsCollectionCnv_tlp1.cxx
index b4758b02fac6cf6745aad6d5312e1e47c7264380..450d0c01984c6d6b73c4c52cd1631cd6957145df 100755
--- a/Trigger/TrigT1/TrigT1EventTPCnv/src/CMXCPHitsCollectionCnv_tlp1.cxx
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/src/CMXCPHitsCollectionCnv_tlp1.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/src/CMXCPTobCnv_p1.cxx b/Trigger/TrigT1/TrigT1EventTPCnv/src/CMXCPTobCnv_p1.cxx
index ed502e2340e5a647e00fdd21279de68fc379e135..3b7997cf9ab68d7fd859671adc7b0a369147c32d 100755
--- a/Trigger/TrigT1/TrigT1EventTPCnv/src/CMXCPTobCnv_p1.cxx
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/src/CMXCPTobCnv_p1.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #include "TrigT1CaloEvent/CMXCPTob.h"
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/src/CMXCPTobCollectionCnv_tlp1.cxx b/Trigger/TrigT1/TrigT1EventTPCnv/src/CMXCPTobCollectionCnv_tlp1.cxx
index 18ddb524dd21b5f5315bcc942d8f9bcae61087d5..601394b8751a1bdccd4c56586ecbcdeaf9618e20 100755
--- a/Trigger/TrigT1/TrigT1EventTPCnv/src/CMXCPTobCollectionCnv_tlp1.cxx
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/src/CMXCPTobCollectionCnv_tlp1.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/src/CMXEtSumsCnv_p1.cxx b/Trigger/TrigT1/TrigT1EventTPCnv/src/CMXEtSumsCnv_p1.cxx
index 2365cce2b1f9e7361ef6385cbb5fd45414d702d3..875cf53b4566ecb4a5f08e761dc0d1a35b9aa44f 100755
--- a/Trigger/TrigT1/TrigT1EventTPCnv/src/CMXEtSumsCnv_p1.cxx
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/src/CMXEtSumsCnv_p1.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #include "TrigT1CaloEvent/CMXEtSums.h"
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/src/CMXEtSumsCollectionCnv_tlp1.cxx b/Trigger/TrigT1/TrigT1EventTPCnv/src/CMXEtSumsCollectionCnv_tlp1.cxx
index c5015007951cf908283b20dc944c28aa70b03ba5..9fa9c19959aebeab59f3baa26847b8df82c69c58 100755
--- a/Trigger/TrigT1/TrigT1EventTPCnv/src/CMXEtSumsCollectionCnv_tlp1.cxx
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/src/CMXEtSumsCollectionCnv_tlp1.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/src/CMXJetHitsCnv_p1.cxx b/Trigger/TrigT1/TrigT1EventTPCnv/src/CMXJetHitsCnv_p1.cxx
index 545aa41dedb689469c3151bf9952f9efe5913526..9aea2bfb1ab3b45305bf9f70f422b8d4307bff44 100755
--- a/Trigger/TrigT1/TrigT1EventTPCnv/src/CMXJetHitsCnv_p1.cxx
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/src/CMXJetHitsCnv_p1.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #include "TrigT1CaloEvent/CMXJetHits.h"
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/src/CMXJetHitsCollectionCnv_tlp1.cxx b/Trigger/TrigT1/TrigT1EventTPCnv/src/CMXJetHitsCollectionCnv_tlp1.cxx
index af54d49aa0f2a35098b6ba501e53ce483f06a1d2..a7416caf55d69e4b1918d91f59fa69821321f8b7 100755
--- a/Trigger/TrigT1/TrigT1EventTPCnv/src/CMXJetHitsCollectionCnv_tlp1.cxx
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/src/CMXJetHitsCollectionCnv_tlp1.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/src/CMXJetTobCnv_p1.cxx b/Trigger/TrigT1/TrigT1EventTPCnv/src/CMXJetTobCnv_p1.cxx
index 6e217eecbaedc94a0b1a975e32a24e12a8eedae6..965413b030c65aad1c40a3680cdafb6cbe73c940 100755
--- a/Trigger/TrigT1/TrigT1EventTPCnv/src/CMXJetTobCnv_p1.cxx
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/src/CMXJetTobCnv_p1.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #include "TrigT1CaloEvent/CMXJetTob.h"
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/src/CMXJetTobCollectionCnv_tlp1.cxx b/Trigger/TrigT1/TrigT1EventTPCnv/src/CMXJetTobCollectionCnv_tlp1.cxx
index 2c5982c6b5578e05dd76c2ce3b4ff60f5eb7a612..f6e28c9386d99ad8041eb1fa366094b83fd8eacf 100755
--- a/Trigger/TrigT1/TrigT1EventTPCnv/src/CMXJetTobCollectionCnv_tlp1.cxx
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/src/CMXJetTobCollectionCnv_tlp1.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/src/CMXRoICnv_p1.cxx b/Trigger/TrigT1/TrigT1EventTPCnv/src/CMXRoICnv_p1.cxx
index 4afd032b3de118879479faae549f990f4a6a89eb..f4c5d36c2b26cb843d7ac59246aba744b7c62d04 100755
--- a/Trigger/TrigT1/TrigT1EventTPCnv/src/CMXRoICnv_p1.cxx
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/src/CMXRoICnv_p1.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #include "TrigT1CaloEvent/CMXRoI.h"
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/src/CPMHitsCnv_p1.cxx b/Trigger/TrigT1/TrigT1EventTPCnv/src/CPMHitsCnv_p1.cxx
index 009fa7e68544900d96581665bd5d9d51c51d47b3..5e6b0d462aa6ffac0cd0bd94af8fa002f849cbd1 100755
--- a/Trigger/TrigT1/TrigT1EventTPCnv/src/CPMHitsCnv_p1.cxx
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/src/CPMHitsCnv_p1.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #include "TrigT1CaloEvent/CPMHits.h"
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/src/CPMHitsCollectionCnv_tlp1.cxx b/Trigger/TrigT1/TrigT1EventTPCnv/src/CPMHitsCollectionCnv_tlp1.cxx
index 526c04ebfc6cdf35d3b7d77b610acb6f7e3a832b..28cf553e4105723d53e909657861b219d2d117a2 100755
--- a/Trigger/TrigT1/TrigT1EventTPCnv/src/CPMHitsCollectionCnv_tlp1.cxx
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/src/CPMHitsCollectionCnv_tlp1.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/src/CPMRoICnv_p1.cxx b/Trigger/TrigT1/TrigT1EventTPCnv/src/CPMRoICnv_p1.cxx
index 8a68ddfb1b05c97cb288cbda0c838c3e36b4a2c1..da138b5f257576fc5928983d39ddec280bd3042a 100755
--- a/Trigger/TrigT1/TrigT1EventTPCnv/src/CPMRoICnv_p1.cxx
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/src/CPMRoICnv_p1.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #include "TrigT1CaloEvent/CPMRoI.h"
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/src/CPMRoICollectionCnv_tlp1.cxx b/Trigger/TrigT1/TrigT1EventTPCnv/src/CPMRoICollectionCnv_tlp1.cxx
index e985a207d5ac034ed7c884503812ca68a6927288..50b137794488e2cd718f6e2501610510d7645414 100755
--- a/Trigger/TrigT1/TrigT1EventTPCnv/src/CPMRoICollectionCnv_tlp1.cxx
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/src/CPMRoICollectionCnv_tlp1.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/src/CPMTobRoICnv_p1.cxx b/Trigger/TrigT1/TrigT1EventTPCnv/src/CPMTobRoICnv_p1.cxx
index 62150031ba5cc4f84303750a51bde71b90fee4d8..c71e67fb51eb8af466941d3c4889dfbb3a95cd69 100755
--- a/Trigger/TrigT1/TrigT1EventTPCnv/src/CPMTobRoICnv_p1.cxx
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/src/CPMTobRoICnv_p1.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #include "TrigT1CaloEvent/CPMTobRoI.h"
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/src/CPMTobRoICollectionCnv_tlp1.cxx b/Trigger/TrigT1/TrigT1EventTPCnv/src/CPMTobRoICollectionCnv_tlp1.cxx
index d61c9fa247a7593aeced0c8d9913d4c8f34fa284..f5f7edfeec7fb3d8a298e53afc8deba6959e473e 100755
--- a/Trigger/TrigT1/TrigT1EventTPCnv/src/CPMTobRoICollectionCnv_tlp1.cxx
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/src/CPMTobRoICollectionCnv_tlp1.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/src/CPMTowerCnv_p1.cxx b/Trigger/TrigT1/TrigT1EventTPCnv/src/CPMTowerCnv_p1.cxx
index b5942e2a3d346648c2097ca91ffa4f582dd01e7a..a070c4d3f0917e7af5545db270a9fdc8db6dbec7 100755
--- a/Trigger/TrigT1/TrigT1EventTPCnv/src/CPMTowerCnv_p1.cxx
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/src/CPMTowerCnv_p1.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #include "TrigT1CaloEvent/CPMTower.h"
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/src/CPMTowerCollectionCnv_tlp1.cxx b/Trigger/TrigT1/TrigT1EventTPCnv/src/CPMTowerCollectionCnv_tlp1.cxx
index d024ff07e279cad78ccf0045ff24e4d4ce484916..f434d9ef09b966132d2d56357e2cf0636281017b 100755
--- a/Trigger/TrigT1/TrigT1EventTPCnv/src/CPMTowerCollectionCnv_tlp1.cxx
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/src/CPMTowerCollectionCnv_tlp1.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/src/CTP_RDOCnv_p1.cxx b/Trigger/TrigT1/TrigT1EventTPCnv/src/CTP_RDOCnv_p1.cxx
index f2feb842847167cfe23eb261044dd8f2f2ba462f..896315e435dbb6b3215b2cbf4de01f9cc264bb11 100644
--- a/Trigger/TrigT1/TrigT1EventTPCnv/src/CTP_RDOCnv_p1.cxx
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/src/CTP_RDOCnv_p1.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/src/CTP_RDOCnv_p2.cxx b/Trigger/TrigT1/TrigT1EventTPCnv/src/CTP_RDOCnv_p2.cxx
index 9da284fe7cc83e1a4a849e95589e448f1461a06c..892d442f91a6658c1fdd0287b85806ab1e9cac6b 100644
--- a/Trigger/TrigT1/TrigT1EventTPCnv/src/CTP_RDOCnv_p2.cxx
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/src/CTP_RDOCnv_p2.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/src/JEMEtSumsCnv_p1.cxx b/Trigger/TrigT1/TrigT1EventTPCnv/src/JEMEtSumsCnv_p1.cxx
index a697b1da549db42ea3d46568237d9d153c4414a6..e7d4dad3b884439e65ee5a69021385b2ed565e80 100755
--- a/Trigger/TrigT1/TrigT1EventTPCnv/src/JEMEtSumsCnv_p1.cxx
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/src/JEMEtSumsCnv_p1.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #include "TrigT1CaloEvent/JEMEtSums.h"
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/src/JEMEtSumsCollectionCnv_tlp1.cxx b/Trigger/TrigT1/TrigT1EventTPCnv/src/JEMEtSumsCollectionCnv_tlp1.cxx
index e837a93c21972a1b086b9bf9349abec3e4786c49..0f3260c849e036ab358e6fefbd16a21b326f80d6 100755
--- a/Trigger/TrigT1/TrigT1EventTPCnv/src/JEMEtSumsCollectionCnv_tlp1.cxx
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/src/JEMEtSumsCollectionCnv_tlp1.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/src/JEMHitsCnv_p1.cxx b/Trigger/TrigT1/TrigT1EventTPCnv/src/JEMHitsCnv_p1.cxx
index 835b875f0592d18d438c02e52662dadf31d54cac..d47cefce95969eb783835d7ac0f95c599b6f8732 100755
--- a/Trigger/TrigT1/TrigT1EventTPCnv/src/JEMHitsCnv_p1.cxx
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/src/JEMHitsCnv_p1.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #include "TrigT1CaloEvent/JEMHits.h"
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/src/JEMHitsCollectionCnv_tlp1.cxx b/Trigger/TrigT1/TrigT1EventTPCnv/src/JEMHitsCollectionCnv_tlp1.cxx
index 1bbbc32dacb1d38537f51cf45790e3205e39ab7e..8733dcb968ad4f55fc1f2e6de557c9a71cac741d 100755
--- a/Trigger/TrigT1/TrigT1EventTPCnv/src/JEMHitsCollectionCnv_tlp1.cxx
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/src/JEMHitsCollectionCnv_tlp1.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/src/JEMRoICnv_p1.cxx b/Trigger/TrigT1/TrigT1EventTPCnv/src/JEMRoICnv_p1.cxx
index aa7b78a531d3cf095da9db5b53152b15c6a5ce89..9cffff1a94fd68c49110dfdb05bad1a03cd20097 100755
--- a/Trigger/TrigT1/TrigT1EventTPCnv/src/JEMRoICnv_p1.cxx
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/src/JEMRoICnv_p1.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #include "TrigT1CaloEvent/JEMRoI.h"
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/src/JEMRoICollectionCnv_tlp1.cxx b/Trigger/TrigT1/TrigT1EventTPCnv/src/JEMRoICollectionCnv_tlp1.cxx
index b27d5a122b07d19f32ad627b690f9ca6c2cf09d2..d3f8d719a60dfa18978b35b199bdec7dbf610b6b 100755
--- a/Trigger/TrigT1/TrigT1EventTPCnv/src/JEMRoICollectionCnv_tlp1.cxx
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/src/JEMRoICollectionCnv_tlp1.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/src/JEMTobRoICnv_p1.cxx b/Trigger/TrigT1/TrigT1EventTPCnv/src/JEMTobRoICnv_p1.cxx
index 933ac3c8c87df02b612a6009fe0c6d27de21eac4..119827d1bb7c921f71932da6d18c114f0db7060f 100755
--- a/Trigger/TrigT1/TrigT1EventTPCnv/src/JEMTobRoICnv_p1.cxx
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/src/JEMTobRoICnv_p1.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #include "TrigT1CaloEvent/JEMTobRoI.h"
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/src/JEMTobRoICollectionCnv_tlp1.cxx b/Trigger/TrigT1/TrigT1EventTPCnv/src/JEMTobRoICollectionCnv_tlp1.cxx
index 84e6ee20344542916ef017a45a9bc4f52f575d1d..ae45941e6c96d228112093045ba29be66abfa40c 100755
--- a/Trigger/TrigT1/TrigT1EventTPCnv/src/JEMTobRoICollectionCnv_tlp1.cxx
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/src/JEMTobRoICollectionCnv_tlp1.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/src/JetElementCnv_p1.cxx b/Trigger/TrigT1/TrigT1EventTPCnv/src/JetElementCnv_p1.cxx
index 52c4c1e53e5f8ca34fef05620bfeb039b23d64fc..acd9640d18a2c672ce2576b52abedf2c6ac2fe0f 100755
--- a/Trigger/TrigT1/TrigT1EventTPCnv/src/JetElementCnv_p1.cxx
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/src/JetElementCnv_p1.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #include "TrigT1CaloEvent/JetElement.h"
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/src/JetElementCollectionCnv_tlp1.cxx b/Trigger/TrigT1/TrigT1EventTPCnv/src/JetElementCollectionCnv_tlp1.cxx
index 8e67a9962b6447e2a14794332a59ed9aacdf1790..02800606d8534d2f252cd8496233c07a90b6819f 100755
--- a/Trigger/TrigT1/TrigT1EventTPCnv/src/JetElementCollectionCnv_tlp1.cxx
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/src/JetElementCollectionCnv_tlp1.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/src/MuCTPI_RDOCnv_p1.cxx b/Trigger/TrigT1/TrigT1EventTPCnv/src/MuCTPI_RDOCnv_p1.cxx
index 0642641d36e164a599b54ca7d8e639d9c7b35fd7..65172cd1b157825c934d5d35bfb276c494a087e5 100644
--- a/Trigger/TrigT1/TrigT1EventTPCnv/src/MuCTPI_RDOCnv_p1.cxx
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/src/MuCTPI_RDOCnv_p1.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/src/RODHeaderCnv_p1.cxx b/Trigger/TrigT1/TrigT1EventTPCnv/src/RODHeaderCnv_p1.cxx
index 326825e98db11f150f0cebefe8cdd0cd7d684dd7..bab2479f311a2b6c97d1050a20996036152b555f 100755
--- a/Trigger/TrigT1/TrigT1EventTPCnv/src/RODHeaderCnv_p1.cxx
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/src/RODHeaderCnv_p1.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #include "TrigT1CaloEvent/RODHeader.h"
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/src/RODHeaderCollectionCnv_tlp1.cxx b/Trigger/TrigT1/TrigT1EventTPCnv/src/RODHeaderCollectionCnv_tlp1.cxx
index a19ea0ad495ee755db3d57199faf4bd6048882b2..cddb0ea4254abe1e24f3037eff9618090dc53b10 100755
--- a/Trigger/TrigT1/TrigT1EventTPCnv/src/RODHeaderCollectionCnv_tlp1.cxx
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/src/RODHeaderCollectionCnv_tlp1.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/src/RoIBResultCnv_p1.cxx b/Trigger/TrigT1/TrigT1EventTPCnv/src/RoIBResultCnv_p1.cxx
index 85c4c5f855e3bc76071b0ffe54ae6d8bad77518a..0226d83941b2cc0d74b8975512cae38f63575852 100644
--- a/Trigger/TrigT1/TrigT1EventTPCnv/src/RoIBResultCnv_p1.cxx
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/src/RoIBResultCnv_p1.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/src/TrigT1EventTPCnv.cxx b/Trigger/TrigT1/TrigT1EventTPCnv/src/TrigT1EventTPCnv.cxx
index 1f5a67f88271f094068e21568915f8f33551e06b..a688db8e90360956a7ac7e3e400d782421c705d9 100644
--- a/Trigger/TrigT1/TrigT1EventTPCnv/src/TrigT1EventTPCnv.cxx
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/src/TrigT1EventTPCnv.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 // generate the T/P converter entries
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/src/TriggerTowerCnv_p1.cxx b/Trigger/TrigT1/TrigT1EventTPCnv/src/TriggerTowerCnv_p1.cxx
index d730fbedd1ddf1e17a2a1d7930f3baa0285c0fa2..3c7b39985b5a2ffda910f26901cd90cf3d686705 100755
--- a/Trigger/TrigT1/TrigT1EventTPCnv/src/TriggerTowerCnv_p1.cxx
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/src/TriggerTowerCnv_p1.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #include "TrigT1CaloEvent/TriggerTower.h"
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/src/TriggerTowerCollectionCnv_tlp1.cxx b/Trigger/TrigT1/TrigT1EventTPCnv/src/TriggerTowerCollectionCnv_tlp1.cxx
index 6a9dd3cdba81f08df5ba28ec1078f5d25a6dc9a8..225a92e9511d07be76fcab7927471ad492338853 100755
--- a/Trigger/TrigT1/TrigT1EventTPCnv/src/TriggerTowerCollectionCnv_tlp1.cxx
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/src/TriggerTowerCollectionCnv_tlp1.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/test/CMMCPHitsCnv_p1_test.cxx b/Trigger/TrigT1/TrigT1EventTPCnv/test/CMMCPHitsCnv_p1_test.cxx
index 8c9c2eab8b3100ca779fdd58d5a1b02eac174cc4..34cfa0b16ef301da3a902036e70362a6bcb86398 100644
--- a/Trigger/TrigT1/TrigT1EventTPCnv/test/CMMCPHitsCnv_p1_test.cxx
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/test/CMMCPHitsCnv_p1_test.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 // $Id$
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/test/CMMEtSumsCnv_p1_test.cxx b/Trigger/TrigT1/TrigT1EventTPCnv/test/CMMEtSumsCnv_p1_test.cxx
index 517dd34e8713953ab870b37145b8fa14e8f1c8ed..da4a7a3f66628fc4887e641ee523cf30c1a4706f 100644
--- a/Trigger/TrigT1/TrigT1EventTPCnv/test/CMMEtSumsCnv_p1_test.cxx
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/test/CMMEtSumsCnv_p1_test.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 // $Id$
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/test/CMMJetHitsCnv_p1_test.cxx b/Trigger/TrigT1/TrigT1EventTPCnv/test/CMMJetHitsCnv_p1_test.cxx
index 91447db2a7773dad6b5aa9d13122e50e6c69e28f..942d5e0ba05f3c51b60d31902a8c83547c6c2806 100644
--- a/Trigger/TrigT1/TrigT1EventTPCnv/test/CMMJetHitsCnv_p1_test.cxx
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/test/CMMJetHitsCnv_p1_test.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 // $Id$
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/test/CMMRoICnv_p1_test.cxx b/Trigger/TrigT1/TrigT1EventTPCnv/test/CMMRoICnv_p1_test.cxx
index e5ab9081198fc01ec504f01845c99ac4b47e7c6d..f6ac7b14d2939211bda55888c9f6f2b203c3efbf 100644
--- a/Trigger/TrigT1/TrigT1EventTPCnv/test/CMMRoICnv_p1_test.cxx
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/test/CMMRoICnv_p1_test.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 // $Id$
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/test/CMXCPHitsCnv_p1_test.cxx b/Trigger/TrigT1/TrigT1EventTPCnv/test/CMXCPHitsCnv_p1_test.cxx
index 195d014656f0abdece73c1abfcfe848dc05b4e2f..c8ef9ffa7236cd023a9d1ef2bd0be121177051c8 100644
--- a/Trigger/TrigT1/TrigT1EventTPCnv/test/CMXCPHitsCnv_p1_test.cxx
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/test/CMXCPHitsCnv_p1_test.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 // $Id$
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/test/CMXCPTobCnv_p1_test.cxx b/Trigger/TrigT1/TrigT1EventTPCnv/test/CMXCPTobCnv_p1_test.cxx
index 8f44e1b00b465522861e2fcfa1469a93dcbaec71..b3f23cea56314850e5ee4425c663acb2ca2dc7c2 100644
--- a/Trigger/TrigT1/TrigT1EventTPCnv/test/CMXCPTobCnv_p1_test.cxx
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/test/CMXCPTobCnv_p1_test.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 // $Id$
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/test/CMXEtSumsCnv_p1_test.cxx b/Trigger/TrigT1/TrigT1EventTPCnv/test/CMXEtSumsCnv_p1_test.cxx
index 60a2271c50570e4462487b3883af93ec730e8c8a..5be002758dd5a95247a224f3664e45e552a1a020 100644
--- a/Trigger/TrigT1/TrigT1EventTPCnv/test/CMXEtSumsCnv_p1_test.cxx
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/test/CMXEtSumsCnv_p1_test.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 // $Id$
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/test/CMXJetHitsCnv_p1_test.cxx b/Trigger/TrigT1/TrigT1EventTPCnv/test/CMXJetHitsCnv_p1_test.cxx
index 9c936a0c2af4ccd7c0728d16a9920da9c7690b38..73c9bb9474172f951b89a025c3e27a8e3dac7f9c 100644
--- a/Trigger/TrigT1/TrigT1EventTPCnv/test/CMXJetHitsCnv_p1_test.cxx
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/test/CMXJetHitsCnv_p1_test.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 // $Id$
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/test/CMXJetTobCnv_p1_test.cxx b/Trigger/TrigT1/TrigT1EventTPCnv/test/CMXJetTobCnv_p1_test.cxx
index 43456a0b27baa33cc0557f3f9d6651cd0789cc49..80cc7233f3e792f3f27215d61818cb32f00ed14d 100644
--- a/Trigger/TrigT1/TrigT1EventTPCnv/test/CMXJetTobCnv_p1_test.cxx
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/test/CMXJetTobCnv_p1_test.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 // $Id$
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/test/CMXRoICnv_p1_test.cxx b/Trigger/TrigT1/TrigT1EventTPCnv/test/CMXRoICnv_p1_test.cxx
index 603713d6ea6c1ab321dc08aef94daf1d5a64a99f..c246ccdf4e25541dfc6f6839c5a5c338c6602343 100644
--- a/Trigger/TrigT1/TrigT1EventTPCnv/test/CMXRoICnv_p1_test.cxx
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/test/CMXRoICnv_p1_test.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 // $Id$
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/test/CPMHitsCnv_p1_test.cxx b/Trigger/TrigT1/TrigT1EventTPCnv/test/CPMHitsCnv_p1_test.cxx
index c027388cd459f6d8c4ad37f6910ef131cb1fe8ff..6161f8076d0e06ae272c07cb45e6cec458f613e9 100644
--- a/Trigger/TrigT1/TrigT1EventTPCnv/test/CPMHitsCnv_p1_test.cxx
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/test/CPMHitsCnv_p1_test.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 // $Id$
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/test/CPMRoICnv_p1_test.cxx b/Trigger/TrigT1/TrigT1EventTPCnv/test/CPMRoICnv_p1_test.cxx
index dec5c610df95fbfa71c767a68acc7824f990ad77..399d2fa96d712b6227ed63877790769f01476e8f 100644
--- a/Trigger/TrigT1/TrigT1EventTPCnv/test/CPMRoICnv_p1_test.cxx
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/test/CPMRoICnv_p1_test.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 // $Id$
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/test/CPMTobRoICnv_p1_test.cxx b/Trigger/TrigT1/TrigT1EventTPCnv/test/CPMTobRoICnv_p1_test.cxx
index 65d0505c847bb96fb74785f156dd26d43cbc3ccf..22a499e0c763a21587f7796fd832f1bf77c12a3d 100644
--- a/Trigger/TrigT1/TrigT1EventTPCnv/test/CPMTobRoICnv_p1_test.cxx
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/test/CPMTobRoICnv_p1_test.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 // $Id$
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/test/CPMTowerCnv_p1_test.cxx b/Trigger/TrigT1/TrigT1EventTPCnv/test/CPMTowerCnv_p1_test.cxx
index f7b4e7a6a7557f0727f676168909988305e67350..8707985c18a78a8bf45dd16c7fdb47dc6429c4d7 100644
--- a/Trigger/TrigT1/TrigT1EventTPCnv/test/CPMTowerCnv_p1_test.cxx
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/test/CPMTowerCnv_p1_test.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 // $Id$
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/test/CTP_RDOCnv_p1_test.cxx b/Trigger/TrigT1/TrigT1EventTPCnv/test/CTP_RDOCnv_p1_test.cxx
index 926c1a26b0276e4fa9d3ff42412204fdb7336eaf..a18bfaf0868f541e4347b1039ebc3ba79b896072 100644
--- a/Trigger/TrigT1/TrigT1EventTPCnv/test/CTP_RDOCnv_p1_test.cxx
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/test/CTP_RDOCnv_p1_test.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 // $Id$
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/test/CTP_RDOCnv_p2_test.cxx b/Trigger/TrigT1/TrigT1EventTPCnv/test/CTP_RDOCnv_p2_test.cxx
index 412d2377ae4e03ce0129b3403f7e55f265016d46..d1c417ba4c16e309bedb2697a520a5719822af80 100644
--- a/Trigger/TrigT1/TrigT1EventTPCnv/test/CTP_RDOCnv_p2_test.cxx
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/test/CTP_RDOCnv_p2_test.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 // $Id$
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/test/JEMEtSumsCnv_p1_test.cxx b/Trigger/TrigT1/TrigT1EventTPCnv/test/JEMEtSumsCnv_p1_test.cxx
index dab09e192d0192c3d14a7ec3a797452b229861f8..d0038b0e8863393e003a83509e05a3c927e53b41 100644
--- a/Trigger/TrigT1/TrigT1EventTPCnv/test/JEMEtSumsCnv_p1_test.cxx
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/test/JEMEtSumsCnv_p1_test.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 // $Id$
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/test/JEMHitsCnv_p1_test.cxx b/Trigger/TrigT1/TrigT1EventTPCnv/test/JEMHitsCnv_p1_test.cxx
index 46fa6733ac0648969e12c6eb70420ccce41f9631..6e09a1e8e15e3b89b40d061d21a9eaa462b8ac64 100644
--- a/Trigger/TrigT1/TrigT1EventTPCnv/test/JEMHitsCnv_p1_test.cxx
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/test/JEMHitsCnv_p1_test.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 // $Id$
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/test/JEMRoICnv_p1_test.cxx b/Trigger/TrigT1/TrigT1EventTPCnv/test/JEMRoICnv_p1_test.cxx
index b72af47bc3db3b9619ee8c80f7a409b10a5f913c..2c5d838d38889fb67cda6dd7af3b8087e4058fcc 100644
--- a/Trigger/TrigT1/TrigT1EventTPCnv/test/JEMRoICnv_p1_test.cxx
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/test/JEMRoICnv_p1_test.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 // $Id$
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/test/JEMTobRoICnv_p1_test.cxx b/Trigger/TrigT1/TrigT1EventTPCnv/test/JEMTobRoICnv_p1_test.cxx
index c0b75c5a0659e1670e9450e79bff4f436d02bc1d..77f915f15a8f1c82c2fab4bc23d52c7f1b7d3ab7 100644
--- a/Trigger/TrigT1/TrigT1EventTPCnv/test/JEMTobRoICnv_p1_test.cxx
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/test/JEMTobRoICnv_p1_test.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 // $Id$
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/test/JetElementCnv_p1_test.cxx b/Trigger/TrigT1/TrigT1EventTPCnv/test/JetElementCnv_p1_test.cxx
index bb797bc6211aaffb76347c2cd2d71d5022179c48..7feb3c5c3d8aab1bae357bb12abc32b6e033e54b 100644
--- a/Trigger/TrigT1/TrigT1EventTPCnv/test/JetElementCnv_p1_test.cxx
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/test/JetElementCnv_p1_test.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 // $Id$
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/test/MuCTPI_RDOCnv_p1_test.cxx b/Trigger/TrigT1/TrigT1EventTPCnv/test/MuCTPI_RDOCnv_p1_test.cxx
index 9200426d342858f126e6c63ac515a6e96dc9db91..96fd198802df2ff4c87c304d70e589f9a1032fe7 100644
--- a/Trigger/TrigT1/TrigT1EventTPCnv/test/MuCTPI_RDOCnv_p1_test.cxx
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/test/MuCTPI_RDOCnv_p1_test.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 // $Id$
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/test/RODHeaderCnv_p1_test.cxx b/Trigger/TrigT1/TrigT1EventTPCnv/test/RODHeaderCnv_p1_test.cxx
index db9cd11a5b84425b4010adaf0d5999b7a534e256..7302667746e8db584965b64cb072ef1eb0f5b53d 100644
--- a/Trigger/TrigT1/TrigT1EventTPCnv/test/RODHeaderCnv_p1_test.cxx
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/test/RODHeaderCnv_p1_test.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 // $Id$
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/test/RoIBResultCnv_p1_test.cxx b/Trigger/TrigT1/TrigT1EventTPCnv/test/RoIBResultCnv_p1_test.cxx
index 2e65f2cfa490babc041f30097452af4c05fdf890..3fa54bda98a230d39043207f1066082aeb2bff91 100644
--- a/Trigger/TrigT1/TrigT1EventTPCnv/test/RoIBResultCnv_p1_test.cxx
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/test/RoIBResultCnv_p1_test.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 // $Id$
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/test/TriggerTowerCnv_p1_test.cxx b/Trigger/TrigT1/TrigT1EventTPCnv/test/TriggerTowerCnv_p1_test.cxx
index 926d1c78040f3b00c5a54e4df913149068bcfb95..e1e15573d6ea9174a4ca5e0057f8cfdbbdf832f8 100644
--- a/Trigger/TrigT1/TrigT1EventTPCnv/test/TriggerTowerCnv_p1_test.cxx
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/test/TriggerTowerCnv_p1_test.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 // $Id$
diff --git a/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/BcmCTP.h b/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/BcmCTP.h
index 711ee88122368637866241e9a8397c4e1e9992cb..c093f08509f50f5bb7a34f8ee195d2c94091271d 100644
--- a/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/BcmCTP.h
+++ b/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/BcmCTP.h
@@ -1,4 +1,7 @@
 // Dear emacs, this is -*- c++ -*-
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 #ifndef TRIGT1INTERFACES_BCM_CTP_H
 #define TRIGT1INTERFACES_BCM_CTP_H
 
diff --git a/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/BitOp.h b/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/BitOp.h
index 320752903c37a231d58306418f84c659dd3ce3d1..8ef62e588906eaf8368db0ef56d44b65c8268202 100644
--- a/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/BitOp.h
+++ b/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/BitOp.h
@@ -1,4 +1,7 @@
 // Dear emacs, this is -*- c++ -*-
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 #ifndef TRIGT1INTERFACES_BITOP_H
 #define TRIGT1INTERFACES_BITOP_H
 
diff --git a/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/BptxCTP.h b/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/BptxCTP.h
index 58122b13d86e64df2d3551b7d3479a4063088a44..b0305c51f1255074d8350a9f7d6e2928ecf45a11 100755
--- a/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/BptxCTP.h
+++ b/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/BptxCTP.h
@@ -1,4 +1,7 @@
 // Dear emacs, this is -*- c++ -*-
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 #ifndef TRIGT1INTERFACES_BPTX_CTP_H
 #define TRIGT1INTERFACES_BPTX_CTP_H
 
diff --git a/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/CPRoIDecoder.h b/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/CPRoIDecoder.h
index 14b0df7f321d4e367f9c30ae62f08f398ab89979..6a8411527998c577d446079277bb691e547bcb34 100644
--- a/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/CPRoIDecoder.h
+++ b/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/CPRoIDecoder.h
@@ -1,20 +1,14 @@
 // Dear emacs, this is -*- c++ -*-
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 /***************************************************************************
                          CPRoIDecoder.h  -  description
                             -------------------
    begin                : Fri Apr 19 2002
-   copyright            : (C) 2002 by E.Moyse
    email                : moyse@ph.qmw.ac.uk
 ***************************************************************************/
 
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
 
 #ifndef TRIGT1INTERFACES_CPROIDECODER_H
 #define TRIGT1INTERFACES_CPROIDECODER_H
diff --git a/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/CTPSLink.h b/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/CTPSLink.h
index c82efa12ebc055a2d43d1ad1d0c0df6ba2250a7d..cab3b7165446ef3f06c3df8f89ba6ebdc55fd654 100644
--- a/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/CTPSLink.h
+++ b/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/CTPSLink.h
@@ -1,5 +1,8 @@
 // Dear emacs, this is -*- c++ -*-
 #ifndef TRIGT1INTERFACES_CTPSLINK_H
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 #define TRIGT1INTERFACES_CTPSLINK_H
 
 // std include(s):
diff --git a/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/Coordinate.h b/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/Coordinate.h
index 00f5285ee05ad478acc91aa397dcd25df9532dd0..bd3fc94a31fcd49fc941aa12ae614ebf82da0fd9 100644
--- a/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/Coordinate.h
+++ b/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/Coordinate.h
@@ -1,20 +1,14 @@
 // Dear emacs, this is -*- c++ -*-
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 /***************************************************************************
                          Coordinate.h  -  description
                             -------------------
    begin                : 28/02/2002
-   copyright            : (C) 2002 by moyse
    email                : e.moyse@qmul.ac.uk
 ***************************************************************************/
 
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
 
 #ifndef TRIGT1INTERFACES_COORDINATE_H
 #define TRIGT1INTERFACES_COORDINATE_H
diff --git a/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/CoordinateRange.h b/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/CoordinateRange.h
index ba66d9c422b6ba22f10d5180a6277ed383257ec5..ee78f281f594bef70e5f59726fbde65b9ce74091 100644
--- a/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/CoordinateRange.h
+++ b/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/CoordinateRange.h
@@ -1,20 +1,14 @@
 // Dear emacs, this is -*- c++ -*-
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 /***************************************************************************
                          CoordinateRange.h  -  description
                             -------------------
    begin                : 28/02/2002
-   copyright            : (C) 2002 by moyse
    email                : e.moyse@qmul.ac.uk
 ***************************************************************************/
 
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
 
 #ifndef TRIGT1INTERFACES_COORDINATERANGE_H
 #define TRIGT1INTERFACES_COORDINATERANGE_H
diff --git a/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/EmTauCTP.h b/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/EmTauCTP.h
index e62434b7fe8245a84332054898ccb5aaa33d72f2..edd5967fa57a620ce1ae0def7ceb93423780fe29 100644
--- a/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/EmTauCTP.h
+++ b/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/EmTauCTP.h
@@ -1,20 +1,14 @@
 // Dear emacs, this is -*- c++ -*-
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 /***************************************************************************
                          EmTauCTP.h  -  description
                             -------------------
    begin                : Friday May 05 2002
-   copyright            : (C) 2002 by moyse
    email                : e.moyse@qmul.ac.uk
 ***************************************************************************/
 
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
 
 #ifndef TRIGT1INTERFACES_EMTAUCTP_H
 #define TRIGT1INTERFACES_EMTAUCTP_H
diff --git a/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/EnergyCTP.h b/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/EnergyCTP.h
index b68a364fbeed1534445470cb1adf39406356a505..ae7967f68e4bd9dc0308b37802432fe8c96f4b2f 100644
--- a/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/EnergyCTP.h
+++ b/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/EnergyCTP.h
@@ -1,21 +1,14 @@
 // Dear emacs, this is -*- c++ -*-
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 /***************************************************************************
                          EnergyCTP.h  -  description
                             -------------------
    begin                : Friday May 05 2002
-   copyright            : (C) 2002 by moyse
    email                : e.moyse@qmul.ac.uk
 ***************************************************************************/
 
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
 #ifndef TRIGT1INTERFACES_ENERGYCTP_H
 #define TRIGT1INTERFACES_ENERGYCTP_H
 
diff --git a/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/FrontPanelCTP.h b/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/FrontPanelCTP.h
index 885e94c813483faa7988d092074daf152ff54c80..0cb450e6521687e0360a654e9a27a1b8c4d8adae 100644
--- a/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/FrontPanelCTP.h
+++ b/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/FrontPanelCTP.h
@@ -1,5 +1,8 @@
 ///////////////////////// -*- C++ -*- /////////////////////////////
 // FrontPanelCTP.h 
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 // Header file for class FrontPanelCTP
 // Author: S.Binet<binet@cern.ch>
 /////////////////////////////////////////////////////////////////// 
diff --git a/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/IMuctpiSimTool.h b/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/IMuctpiSimTool.h
index aa5b68521b63ce1faf3b0bb1889b533f988f7739..8382c3e071e06f0ee933e5cae103a65e058e7099 100644
--- a/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/IMuctpiSimTool.h
+++ b/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/IMuctpiSimTool.h
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 #ifndef TrigT1Muctpi_IMuctpiSimTool
 #define TrigT1Muctpi_IMuctpiSimTool
 
@@ -26,7 +29,7 @@ namespace LVL1MUCTPI {
       *  \param inputEvent reference to the inputEvent
       */
 
-     virtual StatusCode fillMuCTPIL1Topo(LVL1::MuCTPIL1Topo & ) const = 0;
+     virtual StatusCode fillMuCTPIL1Topo(LVL1::MuCTPIL1Topo &, int bcidOffset=0) const = 0;
 
   };
 
diff --git a/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/JEPRoIDecoder.h b/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/JEPRoIDecoder.h
index 389a08447117e0fa6016af7a514075c24c0582c7..e90fb62c17287df0dcebce1174175fbbb5dd13c5 100644
--- a/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/JEPRoIDecoder.h
+++ b/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/JEPRoIDecoder.h
@@ -1,20 +1,13 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 /***************************************************************************
                          JEPRoIDecoder.h  -  description
                             -------------------
    begin                : Fri Apr 19 2002
-   copyright            : (C) 2002 by E.Moyse
    email                : moyse@ph.qmw.ac.uk
 ***************************************************************************/
 
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
 #ifndef TRIGT1INTERFACES_JEPROIDECODER_H
 #define TRIGT1INTERFACES_JEPROIDECODER_H
 
diff --git a/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/JetCTP.h b/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/JetCTP.h
index 4db6ad273b339351f644b18ce387c1909271ae3c..c11c38277a7a994fb4b8a93fe97f05877acb315a 100644
--- a/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/JetCTP.h
+++ b/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/JetCTP.h
@@ -1,20 +1,13 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 /***************************************************************************
                          JetCTP.h  -  description
                             -------------------
    begin                : Friday May 05 2002
-   copyright            : (C) 2002 by moyse
    email                : e.moyse@qmul.ac.uk
 ***************************************************************************/
 
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
 #ifndef TRIGT1INTERFACES_JETCTP_H
 #define TRIGT1INTERFACES_JETCTP_H
 
diff --git a/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/JetEtRoIDecoder.h b/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/JetEtRoIDecoder.h
index 8ffe3d17ac97156676452da49cb2f902260e9f96..9d3f6a23fa530a867fd64ac85e3d238f581b580b 100644
--- a/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/JetEtRoIDecoder.h
+++ b/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/JetEtRoIDecoder.h
@@ -1,20 +1,13 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 /***************************************************************************
                          JetEtRoIDecoder.h  -  description
                             -------------------
    begin                : Fri Apr 19 2002
-   copyright            : (C) 2002 by E.Moyse
    email                : moyse@ph.qmw.ac.uk
 ***************************************************************************/
 
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
 #ifndef TRIGT1INTERFACES_JETETROIDECODER_H
 #define TRIGT1INTERFACES_JETETROIDECODER_H
 
diff --git a/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/L1METvalue.h b/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/L1METvalue.h
index 576decd35b34f1c38ba049171fcacb57bba5e917..77f0e5a6f450c938429cb034e115dd00b3cb83cd 100644
--- a/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/L1METvalue.h
+++ b/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/L1METvalue.h
@@ -1,19 +1,12 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 /***************************************************************************
                           L1MET.h  -  description
                              -------------------
     begin                : 19-10-2007
-    copyright            : (C) 2007 Alan Watson
     email                : Alan.Watson@cern.ch
  ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
                                                                                 
 #ifndef L1METvalue_H
 #define L1METvalue_H
diff --git a/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/LucidCTP.h b/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/LucidCTP.h
index 6f7e0c64eebf6bdeb76c9c11a413aa774052599c..319f8cd56e81c7144281dedb1fc7ae081386d4ce 100644
--- a/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/LucidCTP.h
+++ b/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/LucidCTP.h
@@ -1,5 +1,8 @@
 // Dear emacs, this is -*- c++ -*-
 #ifndef TRIGT1INTERFACES_LUCID_CTP_H
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 #define TRIGT1INTERFACES_LUCID_CTP_H
 
 #include <stdint.h>
diff --git a/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/Lvl1MuBarrelSectorLogicData.h b/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/Lvl1MuBarrelSectorLogicData.h
index a2d40c266bdc8900df6f6d8f274136234c01cc96..ed06cab29c5ffb23df451bd4b9ef6eec8caf5405 100644
--- a/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/Lvl1MuBarrelSectorLogicData.h
+++ b/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/Lvl1MuBarrelSectorLogicData.h
@@ -1,5 +1,8 @@
 // Dear emacs, this is -*- c++ -*-
 #ifndef TRIGT1INTERFACES_LVL1MUBARRELSECTORLOGICDATA_H
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 #define TRIGT1INTERFACES_LVL1MUBARRELSECTORLOGICDATA_H
 
 // System include(s):
diff --git a/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/Lvl1MuCTPIInput.h b/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/Lvl1MuCTPIInput.h
index ef5cb66c9608bf5ca672c378ff7322899d19dbc8..9b83381eecad5a19f9c89636018891e2790d63d0 100644
--- a/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/Lvl1MuCTPIInput.h
+++ b/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/Lvl1MuCTPIInput.h
@@ -1,5 +1,8 @@
 // Dear emacs, this is -*- c++ -*-
 #ifndef TRIGT1INTERFACES_LVL1MUCTPIINPUT_H
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 #define TRIGT1INTERFACES_LVL1MUCTPIINPUT_H
 
 // System include(s):
diff --git a/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/Lvl1MuEndcapSectorLogicData.h b/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/Lvl1MuEndcapSectorLogicData.h
index 1bd750ae6167039ec9909007da68e60ca568364a..abfae10efe8a0303d5142b7b18ad967647bfddfb 100644
--- a/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/Lvl1MuEndcapSectorLogicData.h
+++ b/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/Lvl1MuEndcapSectorLogicData.h
@@ -1,4 +1,7 @@
 // Dear emacs, this is -*- c++ -*-
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 #ifndef TRIGT1INTERFACES_LVL1MUENDCAPSECTORLOGICDATA_H
 #define TRIGT1INTERFACES_LVL1MUENDCAPSECTORLOGICDATA_H
 
diff --git a/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/Lvl1MuForwardSectorLogicData.h b/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/Lvl1MuForwardSectorLogicData.h
index 63d50ecd50b2a41fb8433623492bba9ae1ecc2b9..8d34d722c87e9acd14675c3026df468bc0832ea0 100644
--- a/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/Lvl1MuForwardSectorLogicData.h
+++ b/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/Lvl1MuForwardSectorLogicData.h
@@ -1,4 +1,7 @@
 // Dear emacs, this is -*- c++ -*-
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 #ifndef TRIGT1INTERFACES_LVL1MUFORWARDSECTORLOGICDATA_H
 #define TRIGT1INTERFACES_LVL1MUFORWARDSECTORLOGICDATA_H
 
diff --git a/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/Lvl1MuSectorLogicData.h b/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/Lvl1MuSectorLogicData.h
index 3abf9ef857a9769dbd693110662783c4196dd440..76de787350d3533b99ee70b2f87089ad3baf96a4 100644
--- a/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/Lvl1MuSectorLogicData.h
+++ b/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/Lvl1MuSectorLogicData.h
@@ -1,4 +1,7 @@
 // Dear emacs, this is -*- c++ -*-
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 #ifndef TRIGT1INTERFACES_LVL1MUSECTORLOGICDATA_H
 #define TRIGT1INTERFACES_LVL1MUSECTORLOGICDATA_H
 
diff --git a/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/MbtsCTP.h b/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/MbtsCTP.h
index e4f23d6b474bf9de95d90878458a069e3cbc9306..0eb3b8a377018ad0c7abfd477b359bf70e989421 100644
--- a/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/MbtsCTP.h
+++ b/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/MbtsCTP.h
@@ -1,4 +1,7 @@
 // Dear emacs, this is -*- c++ -*-
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 #ifndef TRIGT1INTERFACES_MBTS_CTP_H
 #define TRIGT1INTERFACES_MBTS_CTP_H
 
diff --git a/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/MuCTPICTP.h b/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/MuCTPICTP.h
index 42c8c1249ba96b1d7166e762e8dd122fb0f3a31f..050f7fab7f3389c98f69950bc6afec0b64b8f3d9 100644
--- a/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/MuCTPICTP.h
+++ b/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/MuCTPICTP.h
@@ -1,4 +1,7 @@
 // Dear emacs, this is -*- c++ -*-
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 #ifndef TRIGT1INTERFACES_MUCTPICTP_H
 #define TRIGT1INTERFACES_MUCTPICTP_H
 
diff --git a/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/MuCTPIL1Topo.h b/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/MuCTPIL1Topo.h
index 36c49a381ddd0823c44e758955299fe777fb718f..610d9c20aaa270f47af87a96486c5c2d4da78232 100644
--- a/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/MuCTPIL1Topo.h
+++ b/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/MuCTPIL1Topo.h
@@ -1,4 +1,7 @@
 // Dear emacs, this is -*- c++ -*-
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 #ifndef TRIGT1INTERFACES_MUCTPIL1TOPO_H
 #define TRIGT1INTERFACES_MUCTPIL1TOPO_H
 
diff --git a/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/MuCTPIL1TopoCandidate.h b/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/MuCTPIL1TopoCandidate.h
index 6c72ed690d32918d2a9ae316071b101716d075aa..f7743521fca39df1789a1308c83a005b51a188bc 100644
--- a/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/MuCTPIL1TopoCandidate.h
+++ b/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/MuCTPIL1TopoCandidate.h
@@ -1,4 +1,7 @@
 // Dear emacs, this is -*- c++ -*-
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 #ifndef TRIGT1INTERFACES_MUCTPIL1TOPOCANDIDATE_H
 #define TRIGT1INTERFACES_MUCTPIL1TOPOCANDIDATE_H
 
diff --git a/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/MuCTPIToRoIBSLink.h b/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/MuCTPIToRoIBSLink.h
index abc319c073bc5be80d88a3800449620d8095d165..e9f8179f61ded2de108c57286ffda7cbf5d18c39 100644
--- a/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/MuCTPIToRoIBSLink.h
+++ b/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/MuCTPIToRoIBSLink.h
@@ -1,4 +1,7 @@
 // Dear emacs, this is -*- c++ -*-
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 #ifndef TRIGT1INTERFACES_MUCTPITOROIBSLINK_H
 #define TRIGT1INTERFACES_MUCTPITOROIBSLINK_H
 
diff --git a/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/NimCTP.h b/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/NimCTP.h
index 9200bc93f0e48d5e20120890a3a9625062219f0f..ee13896b155ad16ecfc19cf1217c20ec918b2a52 100755
--- a/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/NimCTP.h
+++ b/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/NimCTP.h
@@ -1,20 +1,13 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 /***************************************************************************
                          NimCTP.h  -  description
                             -------------------
    begin                : August 2010
-   copyright            : (C) 2002 by dobson
    email                : eleanor.dobson@cern.ch
 ***************************************************************************/
 
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
 #ifndef TRIGT1INTERFACES_NIMCTP_H
 #define TRIGT1INTERFACES_NIMCTP_H
 
diff --git a/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/PhiRange.h b/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/PhiRange.h
index 812c4f482a1248bb67f3fae33d1df0c235513d40..b9e6ce2a4c3a36e1233214b5992bce79d964f08e 100644
--- a/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/PhiRange.h
+++ b/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/PhiRange.h
@@ -1,20 +1,13 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 /***************************************************************************
                          Range.h  -  description
                             -------------------
    begin                : 28/02/2002
-   copyright            : (C) 2002 by moyse
    email                : e.moyse@qmul.ac.uk
 ***************************************************************************/
 
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
 #ifndef TRIGT1INTERFACES_PHIRANGE_H
 #define TRIGT1INTERFACES_PHIRANGE_H
 
diff --git a/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/Range.h b/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/Range.h
index 213983baffa2e01661fcefc3a33bf246abcbb9d5..f413ca52739cc591a8214fc32ca6964f258ac1c3 100644
--- a/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/Range.h
+++ b/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/Range.h
@@ -1,20 +1,13 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 /***************************************************************************
                          Range.h  -  description
                             -------------------
    begin                : 28/02/2002
-   copyright            : (C) 2002 by moyse
    email                : e.moyse@qmul.ac.uk
 ***************************************************************************/
 
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
 #ifndef TRIGT1INTERFACES_RANGE_H
 #define TRIGT1INTERFACES_RANGE_H
 
diff --git a/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/RecEmTauRoI.h b/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/RecEmTauRoI.h
index 1e710687bf2aa983366b15dff1601a96f740100b..b2b47c1dfc14900946e8e3ee84ad94afd02ff873 100644
--- a/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/RecEmTauRoI.h
+++ b/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/RecEmTauRoI.h
@@ -1,21 +1,15 @@
 // Dear emacs, this is -*- c++ -*-
 // $Id: RecEmTauRoI.h 782811 2016-11-07 17:20:40Z smh $
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 /***************************************************************************
                          RecEmTauRoI.h  -  description
                             -------------------
    begin                : Mon Jan 22 2001
-   copyright            : (C) 2001 by moyse
    email                : moyse@heppch.ph.qmw.ac.uk
 ***************************************************************************/
 
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
 
 #ifndef TRIGT1INTERFACES_RECEMTAUROI_H
 #define TRIGT1INTERFACES_RECEMTAUROI_H
diff --git a/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/RecEnergyRoI.h b/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/RecEnergyRoI.h
index 91374b66b5faaf31b0d998605bf6f000b9f11ac8..ef6d0f5cb967ea46051d75158cf7dc61e2fd5e72 100644
--- a/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/RecEnergyRoI.h
+++ b/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/RecEnergyRoI.h
@@ -1,22 +1,15 @@
 // Dear emacs, this is -*- c++ -*-
 // $Id: RecEnergyRoI.h 782811 2016-11-07 17:20:40Z smh $
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 /***************************************************************************
                          RecEnergyRoI.h  -  description
                             -------------------
    begin                : Mon Jan 22 2001
-   copyright            : (C) 2001 by moyse
    email                : moyse@heppch.ph.qmw.ac.uk
 ***************************************************************************/
 
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
 #ifndef TRIGT1INTERFACES_RECENERGYROI_H
 #define TRIGT1INTERFACES_RECENERGYROI_H
 
diff --git a/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/RecJetEtRoI.h b/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/RecJetEtRoI.h
index b25859f5d94b7e063ce13b0c591830a1eba66734..a308ecc0d997e22079bd7952d446f3138bcf61da 100644
--- a/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/RecJetEtRoI.h
+++ b/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/RecJetEtRoI.h
@@ -1,22 +1,15 @@
 // Dear emacs, this is -*- c++ -*-
 // $Id: RecJetEtRoI.h 782811 2016-11-07 17:20:40Z smh $
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 /***************************************************************************
                          RecJetEtRoI.h  -  description
                             -------------------
    begin                : Mon Jan 22 2001
-   copyright            : (C) 2001 by moyse
    email                : moyse@heppch.ph.qmw.ac.uk
 ***************************************************************************/
 
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
 #ifndef TRIGT1INTERFACES_RECJETETROI_H
 #define TRIGT1INTERFACES_RECJETETROI_H
 
diff --git a/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/RecJetRoI.h b/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/RecJetRoI.h
index 283bbfa5689b8430b0a64246b36e6363e5fc4f87..b17667f83b08fd7627cc3c6c0ced1cd579ff2a8b 100644
--- a/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/RecJetRoI.h
+++ b/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/RecJetRoI.h
@@ -1,22 +1,15 @@
 // Dear emacs, this is -*- c++ -*-
 // $Id: RecJetRoI.h 782811 2016-11-07 17:20:40Z smh $
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 /***************************************************************************
                          RecJetRoI.h  -  description
                             -------------------
    begin                : Mon Jan 22 2001
-   copyright            : (C) 2001 by moyse
    email                : moyse@heppch.ph.qmw.ac.uk
 ***************************************************************************/
 
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
 #ifndef TRIGT1INTERFACES_RECJETTROI_H
 #define TRIGT1INTERFACES_RECJETTROI_H
 
diff --git a/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/RecMuonRoI.h b/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/RecMuonRoI.h
index 0c312544e4b93df9a8b878ef17616c95dff66065..2a688a5df0abe372cac65bdbee82ba5ced911ab4 100644
--- a/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/RecMuonRoI.h
+++ b/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/RecMuonRoI.h
@@ -1,22 +1,15 @@
 // Dear emacs, this is -*- c++ -*-
 // $Id: RecMuonRoI.h 782811 2016-11-07 17:20:40Z smh $
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 /***************************************************************************
                           RecMuonRoI.h  -  description
                              -------------------
     begin                : Tue Feb 25 2003
-    copyright            : (C) 2003 by wengler
     email                : Thorsten Wengler
  ***************************************************************************/
 
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
 #ifndef TRIGT1INTERFACES_RECMUONROI_H
 #define TRIGT1INTERFACES_RECMUONROI_H
 
diff --git a/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/RecMuonRoiSvc.h b/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/RecMuonRoiSvc.h
index b46c9c0db273ed0b9ca6d01a5fed97817b58ae51..0d44820308d837d868a31dae697087c6bd4ac467 100644
--- a/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/RecMuonRoiSvc.h
+++ b/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/RecMuonRoiSvc.h
@@ -1,4 +1,7 @@
 // Dear emacs, this is -*- c++ -*-
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 #ifndef TRIGT1INTERFACES_RECMUONROISVC_H
 #define TRIGT1INTERFACES_RECMUONROISVC_H
 
diff --git a/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/RecRoI.h b/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/RecRoI.h
index 95298c5d79be24033043f439cd553366116e5065..522c654f84a525887849eccd03a65af45479b8e8 100644
--- a/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/RecRoI.h
+++ b/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/RecRoI.h
@@ -1,20 +1,13 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 /***************************************************************************
                          RecRoi.h  -  description
                             -------------------
    begin                : Fri Oct 4 2002
-   copyright            : (C) 2002 by moyse
    email                : edward.moyse@cern.ch
 ***************************************************************************/
 
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
 #ifndef TRIGT1INTERFACES_RECROI_H
 #define TRIGT1INTERFACES_RECROI_H
 
diff --git a/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/RoIDecoder.h b/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/RoIDecoder.h
index 8a4910ade8fbd4d00a7d73e1704d15bbb2f2dc54..6535cbb9314a3f0b7ae640fa8f1d27d22c8275f6 100644
--- a/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/RoIDecoder.h
+++ b/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/RoIDecoder.h
@@ -1,22 +1,15 @@
 // Dear emacs, this is -*- c++ -*-
 // $Id: RoIDecoder.h 187728 2009-05-27 16:18:06Z krasznaa $
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 /***************************************************************************
                           RoIDecoder.h  -  description
                              -------------------
     begin                : Fri Apr 19 2002
-    copyright            : (C) 2002 by E.Moyse
     email                : moyse@ph.qmw.ac.uk
  ***************************************************************************/
 
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
 #ifndef TRIGT1INTERFACES_ROIDECODER_H
 #define TRIGT1INTERFACES_ROIDECODER_H
 
diff --git a/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/RoIFormatUpdater.h b/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/RoIFormatUpdater.h
index 156e63b149a66f4a155cb99af934a3fb90dadc55..c90daf46cc24fbd62196e6b03c38876d277378e0 100644
--- a/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/RoIFormatUpdater.h
+++ b/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/RoIFormatUpdater.h
@@ -1,4 +1,7 @@
 // Dear emacs, this is -*- c++ -*-
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 #ifndef TRIGT1INTERFACES_ROIFORMATUPDATER_H
 #define TRIGT1INTERFACES_ROIFORMATUPDATER_H
 
diff --git a/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/SlinkWord.h b/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/SlinkWord.h
index 842e3c697bdabb280bcf881811ec23866b36adeb..cabc9be938c79fa3109a842592a7cdaad94b9e20 100644
--- a/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/SlinkWord.h
+++ b/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/SlinkWord.h
@@ -1,4 +1,7 @@
 // Dear emacs, this is -*- c++ -*-
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 #ifndef TRIGT1INTERFACES_SLINKWORD_H
 #define TRIGT1INTERFACES_SLINKWORD_H
 
diff --git a/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/TMConst.h b/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/TMConst.h
index d43c4ba6e6f77d78d4b43fa286ef0f99ca01401c..ab3f7060c76bcc84c899344e0d533c18091e7a10 100644
--- a/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/TMConst.h
+++ b/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/TMConst.h
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 /****************************************************
  *
  * TMConst contains constants relevant to all the L1 trigger. There
diff --git a/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/TMUtil.h b/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/TMUtil.h
index 7db3aa8ff064d7a4ef73217e944155aad46b60b0..accd3b0766a870c9ad8ca0e545eb36ec72e0b243 100644
--- a/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/TMUtil.h
+++ b/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/TMUtil.h
@@ -1,4 +1,7 @@
 // Dear emacs, this is -*- c++ -*-
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 #ifndef TRIGT1INTERFACES_TMUTIL_H
 #define TRIGT1INTERFACES_TMUTIL_H
 
diff --git a/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/TrigT1CTPDefs.h b/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/TrigT1CTPDefs.h
index 9d6e323e874d10f5c7e39a0f4a9db129ddc5f47c..90c1a3c71b1ab16f4b71e544b33ccf9d495c006c 100644
--- a/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/TrigT1CTPDefs.h
+++ b/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/TrigT1CTPDefs.h
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 
 #ifndef TRIGT1INTERFACES_TRIGT1CTPDEFS_H
 #define TRIGT1INTERFACES_TRIGT1CTPDEFS_H
diff --git a/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/TrigT1CaloDefs.h b/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/TrigT1CaloDefs.h
index 936435a587dad5d36a258e215e9c5a23df9b186f..2b5ae2235d4ac55cbc9a3f4c2f47935e0d403bce 100644
--- a/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/TrigT1CaloDefs.h
+++ b/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/TrigT1CaloDefs.h
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //==============================================================================
 // $Id: TrigT1CaloDefs.h 632038 2014-11-28 19:27:49Z amazurov $
 //==============================================================================
diff --git a/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/TrigT1InterfacesDict.h b/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/TrigT1InterfacesDict.h
index dd91ebe85d6b4d0952470d7c4ebcbccdc62fb7d6..882606fb958f23a30ff12334ed1ed036f96f59e8 100644
--- a/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/TrigT1InterfacesDict.h
+++ b/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/TrigT1InterfacesDict.h
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 
 #ifndef TRIGT1INTERFACES_TRIGT1INTERFACESDICT_H
 #define TRIGT1INTERFACES_TRIGT1INTERFACESDICT_H
diff --git a/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/TrigT1Interfaces_ClassDEF.h b/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/TrigT1Interfaces_ClassDEF.h
index 9fad1578a77f7983efae83117d1c378256e5c4d8..a1e104f9cd77cbac0bc1f730de919327defb99f1 100644
--- a/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/TrigT1Interfaces_ClassDEF.h
+++ b/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/TrigT1Interfaces_ClassDEF.h
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 #ifndef TrigT1Interfaces_ClassDEF_H
 #define TrigT1Interfaces_ClassDEF_H
 //Put here the CLASS_DEF macros for the STL containers you put in StoreGate
diff --git a/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/TrigT1StoreGateKeys.h b/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/TrigT1StoreGateKeys.h
index 48ae00039a7589bf4f520af40ce2d8b682a37159..489542295927aee4be5efdaea9cd298d11c76c53 100644
--- a/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/TrigT1StoreGateKeys.h
+++ b/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/TrigT1StoreGateKeys.h
@@ -1,4 +1,7 @@
 // Dear emacs, this is -*- c++ -*-
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 #ifndef TRIGT1INTERFACES_TRIGT1STOREGATEKEYS_H
 #define TRIGT1INTERFACES_TRIGT1STOREGATEKEYS_H
 
diff --git a/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/TriggerTypeWord.h b/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/TriggerTypeWord.h
index f73c726e06c5407b020eb448198d1794cf520dea..6c08668375d8a6cd2297401c6b4c4c5d3047d503 100644
--- a/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/TriggerTypeWord.h
+++ b/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/TriggerTypeWord.h
@@ -1,4 +1,7 @@
 // Dear emacs, this is -*- c++ -*-
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 #ifndef TRIGT1INTERFACES_TRIGGERTYPEWORD_H
 #define TRIGT1INTERFACES_TRIGGERTYPEWORD_H
 
diff --git a/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/TrtCTP.h b/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/TrtCTP.h
index 7c6538b891b31385902583b20bb91263856046a8..8f32a1aba526f7eb3bd7712fa9633f1a9dcdb347 100644
--- a/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/TrtCTP.h
+++ b/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/TrtCTP.h
@@ -1,4 +1,7 @@
 // Dear emacs, this is -*- c++ -*-
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 #ifndef TRIGT1INTERFACES_TRT_CTP_H
 #define TRIGT1INTERFACES_TRT_CTP_H
 
diff --git a/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/ZdcCTP.h b/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/ZdcCTP.h
index 74a716c11a7d9c0b60f97317c62067fd5253342a..9ebb09870f6fceafb789d161524b4ad78d796d6b 100644
--- a/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/ZdcCTP.h
+++ b/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/ZdcCTP.h
@@ -1,4 +1,7 @@
 // Dear emacs, this is -*- c++ -*-
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 #ifndef TRIGT1INTERFACES_ZDC_CTP_H
 #define TRIGT1INTERFACES_ZDC_CTP_H
 
diff --git a/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/iRecCoordRoI.h b/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/iRecCoordRoI.h
index edb9d18a88caa28ff55849500a800117220fa1e2..b22be68336bd99994d09540e88a689dc9fe9f2c1 100644
--- a/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/iRecCoordRoI.h
+++ b/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/iRecCoordRoI.h
@@ -1,21 +1,14 @@
 // Dear emacs, this is -*- c++ -*-
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 /***************************************************************************
                          iRecCoordRoi.h  -  description
                             -------------------
    begin                : Tue Aug 12 2003
-   copyright            : (C) 2003 by emoyse
    email                : edward.moyse@cern.ch
 ***************************************************************************/
 
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
 #ifndef TRIGT1INTERFACES_IRECCOORDROI_H
 #define TRIGT1INTERFACES_IRECCOORDROI_H
 
diff --git a/Trigger/TrigT1/TrigT1Interfaces/src/BcmCTP.cxx b/Trigger/TrigT1/TrigT1Interfaces/src/BcmCTP.cxx
index 82ee56c35d645d293082df71a9b2a7ab2c3b60aa..9ee738caa24747c74ff720b62815464068c48c83 100644
--- a/Trigger/TrigT1/TrigT1Interfaces/src/BcmCTP.cxx
+++ b/Trigger/TrigT1/TrigT1Interfaces/src/BcmCTP.cxx
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 #include "TrigT1Interfaces/BcmCTP.h"
 
 // STL includes(s):
diff --git a/Trigger/TrigT1/TrigT1Interfaces/src/BitOp.cxx b/Trigger/TrigT1/TrigT1Interfaces/src/BitOp.cxx
index 11583cbb1c1f5b77752153a88d990c81aa391824..6dead27e1cbcd76114cb66c4e10947a4251667c1 100644
--- a/Trigger/TrigT1/TrigT1Interfaces/src/BitOp.cxx
+++ b/Trigger/TrigT1/TrigT1Interfaces/src/BitOp.cxx
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 
 #include <string>
 #include <algorithm>
diff --git a/Trigger/TrigT1/TrigT1Interfaces/src/BptxCTP.cxx b/Trigger/TrigT1/TrigT1Interfaces/src/BptxCTP.cxx
index b10fe803242c3d434331dcbd3e27ed9ff6bd05be..9b6e1db279545fc95837f970a6c98910b07cd75f 100644
--- a/Trigger/TrigT1/TrigT1Interfaces/src/BptxCTP.cxx
+++ b/Trigger/TrigT1/TrigT1Interfaces/src/BptxCTP.cxx
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 #include "TrigT1Interfaces/BptxCTP.h"
 
 // STL includes(s):
diff --git a/Trigger/TrigT1/TrigT1Interfaces/src/CPRoIDecoder.cxx b/Trigger/TrigT1/TrigT1Interfaces/src/CPRoIDecoder.cxx
index c30372241de15d9ed8773b5295a046080cced3c7..476e339c917518c94ac33720830cc1969c926440 100644
--- a/Trigger/TrigT1/TrigT1Interfaces/src/CPRoIDecoder.cxx
+++ b/Trigger/TrigT1/TrigT1Interfaces/src/CPRoIDecoder.cxx
@@ -1,20 +1,13 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 /***************************************************************************
                          CPRoIDecoder.cxx  -  description
                             -------------------
    begin                : Fri Apr 19 2002
-   copyright            : (C) 2002 by E.Moyse
    email                : moyse@ph.qmw.ac.uk
 ***************************************************************************/
 
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
 #include <cmath>
 #include <iostream>
 
diff --git a/Trigger/TrigT1/TrigT1Interfaces/src/CTPSLink.cxx b/Trigger/TrigT1/TrigT1Interfaces/src/CTPSLink.cxx
index 97e883a399c57a39aa60c8374a104ce4f8095943..2d3cf57869082cfed6e35a6278fceec932b570d8 100644
--- a/Trigger/TrigT1/TrigT1Interfaces/src/CTPSLink.cxx
+++ b/Trigger/TrigT1/TrigT1Interfaces/src/CTPSLink.cxx
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 
 #include "TrigT1Interfaces/CTPSLink.h"
 
diff --git a/Trigger/TrigT1/TrigT1Interfaces/src/Coordinate.cxx b/Trigger/TrigT1/TrigT1Interfaces/src/Coordinate.cxx
index 44e52b2af06ddd722996446c4157f9d71b690593..5a41447dc4d49a6f0c9121477b6d41c635da9a20 100644
--- a/Trigger/TrigT1/TrigT1Interfaces/src/Coordinate.cxx
+++ b/Trigger/TrigT1/TrigT1Interfaces/src/Coordinate.cxx
@@ -1,8 +1,10 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 /***************************************************************************
                          Coordinate.cxx  -  description
                             -------------------
    begin                : 26/02/2002
-   copyright            : (C) 2002 by moyse
    email                : e.moyse@qmul.ac.uk
 ***************************************************************************/
 
diff --git a/Trigger/TrigT1/TrigT1Interfaces/src/CoordinateRange.cxx b/Trigger/TrigT1/TrigT1Interfaces/src/CoordinateRange.cxx
index 52314990b4612c02b1760e985dea6906b74b29c2..4bf3383ed2b69fa38e3588102d1663f73f31216e 100644
--- a/Trigger/TrigT1/TrigT1Interfaces/src/CoordinateRange.cxx
+++ b/Trigger/TrigT1/TrigT1Interfaces/src/CoordinateRange.cxx
@@ -1,8 +1,10 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 /***************************************************************************
                          CoordinateRange.cxx  -  description
                             -------------------
    begin                : 26/02/2002
-   copyright            : (C) 2002 by moyse
    email                : e.moyse@qmul.ac.uk
 ***************************************************************************/
 
diff --git a/Trigger/TrigT1/TrigT1Interfaces/src/EmTauCTP.cxx b/Trigger/TrigT1/TrigT1Interfaces/src/EmTauCTP.cxx
index c5c3d36d68f54d97ddba5ca150216e0ccaac3fc5..4cae6c897c2d91040d53bc2f8328387039b45fe5 100644
--- a/Trigger/TrigT1/TrigT1Interfaces/src/EmTauCTP.cxx
+++ b/Trigger/TrigT1/TrigT1Interfaces/src/EmTauCTP.cxx
@@ -1,19 +1,13 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 /***************************************************************************
                          EmTauCTP.cxx  -  description
                             -------------------
    begin                : Mon Jan 22 2001
-   copyright            : (C) 2001 by moyse
    email                : moyse@heppch.ph.qmw.ac.uk
 ***************************************************************************/
 
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
 
 #include "TrigT1Interfaces/EmTauCTP.h"
 
diff --git a/Trigger/TrigT1/TrigT1Interfaces/src/EnergyCTP.cxx b/Trigger/TrigT1/TrigT1Interfaces/src/EnergyCTP.cxx
index 1169d88b6f91958fe717c4c8dc0efd01345381c3..5d71270d57ed2b6ab2c42f5c7032657a19205fd7 100644
--- a/Trigger/TrigT1/TrigT1Interfaces/src/EnergyCTP.cxx
+++ b/Trigger/TrigT1/TrigT1Interfaces/src/EnergyCTP.cxx
@@ -1,20 +1,13 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 /***************************************************************************
                          EnergyCTP.cxx  -  description
                             -------------------
    begin                : Mon Jan 22 2001
-   copyright            : (C) 2001 by moyse
    email                : moyse@heppch.ph.qmw.ac.uk
 ***************************************************************************/
 
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
 #include "TrigT1Interfaces/EnergyCTP.h"
 
 namespace LVL1 {
diff --git a/Trigger/TrigT1/TrigT1Interfaces/src/FrontPanelCTP.cxx b/Trigger/TrigT1/TrigT1Interfaces/src/FrontPanelCTP.cxx
index edb049aa9f1d2904302bea676fd29c2776c87f73..a325430b035591c0f3d1b44971a54b87b91ba6ec 100644
--- a/Trigger/TrigT1/TrigT1Interfaces/src/FrontPanelCTP.cxx
+++ b/Trigger/TrigT1/TrigT1Interfaces/src/FrontPanelCTP.cxx
@@ -1,5 +1,8 @@
 ///////////////////////// -*- C++ -*- /////////////////////////////
 // FrontPanelCTP.cxx 
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 // Implementation file for class FrontPanelCTP
 // Author: S.Binet<binet@cern.ch>
 /////////////////////////////////////////////////////////////////// 
diff --git a/Trigger/TrigT1/TrigT1Interfaces/src/JEPRoIDecoder.cxx b/Trigger/TrigT1/TrigT1Interfaces/src/JEPRoIDecoder.cxx
index e50775721d7d94529725a8078bfd7986e97e7e40..3db7a968c2a22378e0a5c0eabd751fed96594a0f 100644
--- a/Trigger/TrigT1/TrigT1Interfaces/src/JEPRoIDecoder.cxx
+++ b/Trigger/TrigT1/TrigT1Interfaces/src/JEPRoIDecoder.cxx
@@ -1,19 +1,13 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 /***************************************************************************
                          JEPRoIDecoder.cxx  -  description
                             -------------------
    begin                : Fri Apr 19 2002
-   copyright            : (C) 2002 by E.Moyse
    email                : moyse@ph.qmw.ac.uk
 ***************************************************************************/
 
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
 
 #include <cmath>
 #include <iostream>
diff --git a/Trigger/TrigT1/TrigT1Interfaces/src/JetCTP.cxx b/Trigger/TrigT1/TrigT1Interfaces/src/JetCTP.cxx
index 316662cdeadcf9d3b2efda7d2de313054599006a..94118829167df5b08c1f893b8fa26f77c109efff 100644
--- a/Trigger/TrigT1/TrigT1Interfaces/src/JetCTP.cxx
+++ b/Trigger/TrigT1/TrigT1Interfaces/src/JetCTP.cxx
@@ -1,19 +1,13 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 /***************************************************************************
                          JetCTP.cxx  -  description
                             -------------------
    begin                : Mon Jan 22 2001
-   copyright            : (C) 2001 by moyse
    email                : moyse@heppch.ph.qmw.ac.uk
 ***************************************************************************/
 
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
 
 #include "TrigT1Interfaces/JetCTP.h"
 
diff --git a/Trigger/TrigT1/TrigT1Interfaces/src/JetEtRoIDecoder.cxx b/Trigger/TrigT1/TrigT1Interfaces/src/JetEtRoIDecoder.cxx
index af9e080bbec6087114bf6def621371d782b846ca..a9faa0d10f47477b2f676fd7c62ae8c62fac04eb 100644
--- a/Trigger/TrigT1/TrigT1Interfaces/src/JetEtRoIDecoder.cxx
+++ b/Trigger/TrigT1/TrigT1Interfaces/src/JetEtRoIDecoder.cxx
@@ -1,19 +1,13 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 /***************************************************************************
                          JetEtRoIDecoder.cxx  -  description
                             -------------------
    begin                : Fri Apr 19 2002
-   copyright            : (C) 2002 by E.Moyse
    email                : moyse@ph.qmw.ac.uk
 ***************************************************************************/
 
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
 
 #include <cmath>
 #include <iostream>
diff --git a/Trigger/TrigT1/TrigT1Interfaces/src/L1METvalue.cxx b/Trigger/TrigT1/TrigT1Interfaces/src/L1METvalue.cxx
index 5dceaa7c8d010b8c700b2a55b787d139a941a287..cea80dcd89e586f8b99dc4beffdede236c5dcb01 100644
--- a/Trigger/TrigT1/TrigT1Interfaces/src/L1METvalue.cxx
+++ b/Trigger/TrigT1/TrigT1Interfaces/src/L1METvalue.cxx
@@ -1,8 +1,10 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 /***************************************************************************
                           L1METvalue.cxx  -  description
                              -------------------
     begin                : 19-10-2007
-    copyright            : (C) 2007 Alan Watson
     email                : Alan.Watson@cern.ch
  
     A simple set of functions to calculate ETmiss at the precision available
@@ -17,14 +19,6 @@
     value.
  ***************************************************************************/
 
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
 #include "TrigT1Interfaces/L1METvalue.h"
 #include <cmath>
 
diff --git a/Trigger/TrigT1/TrigT1Interfaces/src/LucidCTP.cxx b/Trigger/TrigT1/TrigT1Interfaces/src/LucidCTP.cxx
index 268ff4499bfb27f6be108efa12acd92da215d5a6..1166f528aa40a65384f96506d02586a210d9df6f 100644
--- a/Trigger/TrigT1/TrigT1Interfaces/src/LucidCTP.cxx
+++ b/Trigger/TrigT1/TrigT1Interfaces/src/LucidCTP.cxx
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 #include "TrigT1Interfaces/LucidCTP.h"
 
 #include <sstream>
diff --git a/Trigger/TrigT1/TrigT1Interfaces/src/Lvl1MuBarrelSectorLogicData.cxx b/Trigger/TrigT1/TrigT1Interfaces/src/Lvl1MuBarrelSectorLogicData.cxx
index d592362bc6b84e3ce5309d8f34955f2a6e5dc2a1..189f2ff1006d120552818505165b32afc7d690e9 100644
--- a/Trigger/TrigT1/TrigT1Interfaces/src/Lvl1MuBarrelSectorLogicData.cxx
+++ b/Trigger/TrigT1/TrigT1Interfaces/src/Lvl1MuBarrelSectorLogicData.cxx
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 #include <iomanip>
 #include <iostream>
 
diff --git a/Trigger/TrigT1/TrigT1Interfaces/src/Lvl1MuCTPIInput.cxx b/Trigger/TrigT1/TrigT1Interfaces/src/Lvl1MuCTPIInput.cxx
index 3284dab96219c3b5f923c2f5b09efac85af2b454..7c57a93ad4d15654f5070bc38bed553217e0c097 100644
--- a/Trigger/TrigT1/TrigT1Interfaces/src/Lvl1MuCTPIInput.cxx
+++ b/Trigger/TrigT1/TrigT1Interfaces/src/Lvl1MuCTPIInput.cxx
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 
 #include <iostream>
 #include <iomanip>
diff --git a/Trigger/TrigT1/TrigT1Interfaces/src/Lvl1MuEndcapSectorLogicData.cxx b/Trigger/TrigT1/TrigT1Interfaces/src/Lvl1MuEndcapSectorLogicData.cxx
index 53143b9ca863e45fee4cdf37d0768c50ecc39eef..5e3b916967631f6cd31118bcda21d0e34508732b 100644
--- a/Trigger/TrigT1/TrigT1Interfaces/src/Lvl1MuEndcapSectorLogicData.cxx
+++ b/Trigger/TrigT1/TrigT1Interfaces/src/Lvl1MuEndcapSectorLogicData.cxx
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 
 #include <iomanip>
 #include <iostream>
diff --git a/Trigger/TrigT1/TrigT1Interfaces/src/Lvl1MuForwardSectorLogicData.cxx b/Trigger/TrigT1/TrigT1Interfaces/src/Lvl1MuForwardSectorLogicData.cxx
index 32097b0d4c1fe7d05f435ee494d49194670909f1..1aea6fa51194453fdf74e4dc217d82e6b9efd40b 100644
--- a/Trigger/TrigT1/TrigT1Interfaces/src/Lvl1MuForwardSectorLogicData.cxx
+++ b/Trigger/TrigT1/TrigT1Interfaces/src/Lvl1MuForwardSectorLogicData.cxx
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 #include <iomanip>
 #include <iostream>
 
diff --git a/Trigger/TrigT1/TrigT1Interfaces/src/Lvl1MuSectorLogicData.cxx b/Trigger/TrigT1/TrigT1Interfaces/src/Lvl1MuSectorLogicData.cxx
index 6a26f9b03f6d3d70681b80b4c33ef1f2488e979b..37d8a4e611da2fad1508a41157ecf87db93ad4e4 100644
--- a/Trigger/TrigT1/TrigT1Interfaces/src/Lvl1MuSectorLogicData.cxx
+++ b/Trigger/TrigT1/TrigT1Interfaces/src/Lvl1MuSectorLogicData.cxx
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 
 #include <cstdio>
 #include <iostream>
diff --git a/Trigger/TrigT1/TrigT1Interfaces/src/MbtsCTP.cxx b/Trigger/TrigT1/TrigT1Interfaces/src/MbtsCTP.cxx
index 4d5a7d5fd58fc5243ad86107ec4b3cffbcac5133..d9e919f43f6263588e951effd51b2e937561e6b8 100644
--- a/Trigger/TrigT1/TrigT1Interfaces/src/MbtsCTP.cxx
+++ b/Trigger/TrigT1/TrigT1Interfaces/src/MbtsCTP.cxx
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 #include "TrigT1Interfaces/MbtsCTP.h"
 
 // STL includes(s):
diff --git a/Trigger/TrigT1/TrigT1Interfaces/src/MuCTPICTP.cxx b/Trigger/TrigT1/TrigT1Interfaces/src/MuCTPICTP.cxx
index 18819cb9df2ca2adc80c38989e887cca24ad8667..094f9e987e87b1cba1611b4ef1bfdfdae93c7f07 100644
--- a/Trigger/TrigT1/TrigT1Interfaces/src/MuCTPICTP.cxx
+++ b/Trigger/TrigT1/TrigT1Interfaces/src/MuCTPICTP.cxx
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 
 #include "TrigT1Interfaces/MuCTPICTP.h"
 
diff --git a/Trigger/TrigT1/TrigT1Interfaces/src/MuCTPIL1Topo.cxx b/Trigger/TrigT1/TrigT1Interfaces/src/MuCTPIL1Topo.cxx
index e34afd06d7f392e5fb9c17076b55fb5b4af8f532..040504058a0022598fec7bbf1456dd16b179774a 100644
--- a/Trigger/TrigT1/TrigT1Interfaces/src/MuCTPIL1Topo.cxx
+++ b/Trigger/TrigT1/TrigT1Interfaces/src/MuCTPIL1Topo.cxx
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 
 #include "TrigT1Interfaces/MuCTPIL1Topo.h"
 
diff --git a/Trigger/TrigT1/TrigT1Interfaces/src/MuCTPIL1TopoCandidate.cxx b/Trigger/TrigT1/TrigT1Interfaces/src/MuCTPIL1TopoCandidate.cxx
index 22f5ef962910d2c00f5faf31107143092e763d86..81f3c0e58bc1938b3acf404cf614c4762b287a93 100644
--- a/Trigger/TrigT1/TrigT1Interfaces/src/MuCTPIL1TopoCandidate.cxx
+++ b/Trigger/TrigT1/TrigT1Interfaces/src/MuCTPIL1TopoCandidate.cxx
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 
 #include "TrigT1Interfaces/MuCTPIL1TopoCandidate.h"
 #include <iostream> 
diff --git a/Trigger/TrigT1/TrigT1Interfaces/src/MuCTPIToRoIBSLink.cxx b/Trigger/TrigT1/TrigT1Interfaces/src/MuCTPIToRoIBSLink.cxx
index 6b43463e00672a85d6bd142fb8c3b9b7cd3b15e8..25198d228f3482515b76fbdc33182502f259d078 100644
--- a/Trigger/TrigT1/TrigT1Interfaces/src/MuCTPIToRoIBSLink.cxx
+++ b/Trigger/TrigT1/TrigT1Interfaces/src/MuCTPIToRoIBSLink.cxx
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 #include "TrigT1Interfaces/MuCTPIToRoIBSLink.h"
 
 namespace L1MUINT {
diff --git a/Trigger/TrigT1/TrigT1Interfaces/src/NimCTP.cxx b/Trigger/TrigT1/TrigT1Interfaces/src/NimCTP.cxx
index b15e888f39f1ed9eed313516963ebe3d31929886..3a99d12ad05655388e49e21a319288a4980217e3 100644
--- a/Trigger/TrigT1/TrigT1Interfaces/src/NimCTP.cxx
+++ b/Trigger/TrigT1/TrigT1Interfaces/src/NimCTP.cxx
@@ -1,19 +1,13 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 /***************************************************************************
                          NimCTP.cxx  -  description
                             -------------------
    begin                : Mon Jan 22 2001
-   copyright            : (C) 2010 by dobson
    email                : eleanor.dobson@cern.ch
 ***************************************************************************/
 
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
 
 #include "TrigT1Interfaces/NimCTP.h"
 
diff --git a/Trigger/TrigT1/TrigT1Interfaces/src/PhiRange.cxx b/Trigger/TrigT1/TrigT1Interfaces/src/PhiRange.cxx
index 466e44fd9abbb0438ac1d9f9237b9a9d2ec7d083..f82d1328871c953515ad6c2afbe06c78a686ab69 100644
--- a/Trigger/TrigT1/TrigT1Interfaces/src/PhiRange.cxx
+++ b/Trigger/TrigT1/TrigT1Interfaces/src/PhiRange.cxx
@@ -1,8 +1,10 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 /***************************************************************************
                          PhiRange.cxx  -  description
                             -------------------
    begin                : 26/02/2002
-   copyright            : (C) 2002 by moyse
    email                : e.moyse@qmul.ac.uk
 ***************************************************************************/
 
diff --git a/Trigger/TrigT1/TrigT1Interfaces/src/Range.cxx b/Trigger/TrigT1/TrigT1Interfaces/src/Range.cxx
index f4be88a28515de4f01781b092020e223eb808858..2d4de1344fa89d123e347eecbc64654fa56dc20d 100644
--- a/Trigger/TrigT1/TrigT1Interfaces/src/Range.cxx
+++ b/Trigger/TrigT1/TrigT1Interfaces/src/Range.cxx
@@ -1,8 +1,10 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 /***************************************************************************
                          Range.cxx  -  description
                             -------------------
    begin                : 26/02/2002
-   copyright            : (C) 2002 by moyse
    email                : e.moyse@qmul.ac.uk
 ***************************************************************************/
 
diff --git a/Trigger/TrigT1/TrigT1Interfaces/src/RecEmTauRoI.cxx b/Trigger/TrigT1/TrigT1Interfaces/src/RecEmTauRoI.cxx
index 5783053826cc594f0daddbd8d8d513d0657a9bf8..b86338e0a3902eaf5cde0f48f4dcdcc9698ce506 100644
--- a/Trigger/TrigT1/TrigT1Interfaces/src/RecEmTauRoI.cxx
+++ b/Trigger/TrigT1/TrigT1Interfaces/src/RecEmTauRoI.cxx
@@ -1,20 +1,14 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 // $Id: RecEmTauRoI.cxx 796120 2017-02-08 03:20:47Z ssnyder $
 /***************************************************************************
                         RecEmTauRoI.cxx  -  description
                            -------------------
   begin                : Mon Jan 22 2001
-  copyright            : (C) 2001 by moyse
   email                : moyse@heppch.ph.qmw.ac.uk
 ***************************************************************************/
 
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
 
 // STL include(s):
 #include <cmath>
diff --git a/Trigger/TrigT1/TrigT1Interfaces/src/RecEnergyRoI.cxx b/Trigger/TrigT1/TrigT1Interfaces/src/RecEnergyRoI.cxx
index 6ec8ae52449aef898251caf18456e108344b8c87..e6c13aba14123a6a38fa3659dc8572c7aa767b7b 100644
--- a/Trigger/TrigT1/TrigT1Interfaces/src/RecEnergyRoI.cxx
+++ b/Trigger/TrigT1/TrigT1Interfaces/src/RecEnergyRoI.cxx
@@ -1,20 +1,14 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 // $Id: RecEnergyRoI.cxx 342657 2011-01-28 23:42:18Z watsona $
 /***************************************************************************
                          RecEnergyRoI.cxx  -  description
                             -------------------
    begin                : Mon Jan 22 2001
-   copyright            : (C) 2001 by moyse
    email                : moyse@heppch.ph.qmw.ac.uk
 ***************************************************************************/
 
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
 
 // Trigger config includes:
 #include "TrigConfL1Data/L1DataDef.h"
diff --git a/Trigger/TrigT1/TrigT1Interfaces/src/RecJetEtRoI.cxx b/Trigger/TrigT1/TrigT1Interfaces/src/RecJetEtRoI.cxx
index 597cbbbe94998515b7bd7d3e18a9a1453150e960..0fd17bfb0931f3871e28ab73631a2f9b63c02759 100644
--- a/Trigger/TrigT1/TrigT1Interfaces/src/RecJetEtRoI.cxx
+++ b/Trigger/TrigT1/TrigT1Interfaces/src/RecJetEtRoI.cxx
@@ -1,20 +1,14 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 // $Id: RecJetEtRoI.cxx 187728 2009-05-27 16:18:06Z krasznaa $
 /***************************************************************************
                          RecJetEtRoI.cxx  -  description
                             -------------------
    begin                : Mon Jan 22 2001
-   copyright            : (C) 2001 by moyse
    email                : moyse@heppch.ph.qmw.ac.uk
 ***************************************************************************/
 
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
 
 // Local include(s):
 #include "TrigT1Interfaces/RecJetEtRoI.h"
diff --git a/Trigger/TrigT1/TrigT1Interfaces/src/RecJetRoI.cxx b/Trigger/TrigT1/TrigT1Interfaces/src/RecJetRoI.cxx
index 7062fad126db8607649ae6bfcb7f2693845787d1..c4d5d646617119e20578bdc7a6ef4736d008769e 100644
--- a/Trigger/TrigT1/TrigT1Interfaces/src/RecJetRoI.cxx
+++ b/Trigger/TrigT1/TrigT1Interfaces/src/RecJetRoI.cxx
@@ -1,20 +1,14 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 // $Id: RecJetRoI.cxx 796120 2017-02-08 03:20:47Z ssnyder $
 /***************************************************************************
                          RecJetRoI.cxx  -  description
                             -------------------
    begin                : Mon Jan 22 2001
-   copyright            : (C) 2001 by moyse
    email                : moyse@heppch.ph.qmw.ac.uk
 ***************************************************************************/
 
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
 
 // STL include(s):
 #include <cmath>
diff --git a/Trigger/TrigT1/TrigT1Interfaces/src/RecMuonRoI.cxx b/Trigger/TrigT1/TrigT1Interfaces/src/RecMuonRoI.cxx
index 9002058e2da7f3945f22989215edcce6fec81946..f88a32149a51c41e5b098deda08e19082cf41eba 100644
--- a/Trigger/TrigT1/TrigT1Interfaces/src/RecMuonRoI.cxx
+++ b/Trigger/TrigT1/TrigT1Interfaces/src/RecMuonRoI.cxx
@@ -1,20 +1,14 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 // $Id: RecMuonRoI.cxx 364688 2011-05-09 16:58:25Z krasznaa $
 /***************************************************************************
                          RecMuonRoI.cxx  -  description
                             -------------------
    begin                : Tue Feb 25 2003
-   copyright            : (C) 2003 by wengler
    email                : Thorsten.Wengler
 ***************************************************************************/
 
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
 
 // STL include(s):
 #include <iomanip>
diff --git a/Trigger/TrigT1/TrigT1Interfaces/src/RecRoI.cxx b/Trigger/TrigT1/TrigT1Interfaces/src/RecRoI.cxx
index f1074fef9f9cb984241c3838bf60ccd32066a4f4..058f4647d555c3920a1d7d59547551dfb85b8cf3 100644
--- a/Trigger/TrigT1/TrigT1Interfaces/src/RecRoI.cxx
+++ b/Trigger/TrigT1/TrigT1Interfaces/src/RecRoI.cxx
@@ -1,19 +1,13 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 /***************************************************************************
                           RecRoi.cxx  -  description
                              -------------------
     begin                : Fri Oct 4 2002
-    copyright            : (C) 2002 by moyse
     email                : moyse@zanzibar
  ***************************************************************************/
 
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
 
 #include "TrigT1Interfaces/RecRoI.h"
 
diff --git a/Trigger/TrigT1/TrigT1Interfaces/src/RoIDecoder.cxx b/Trigger/TrigT1/TrigT1Interfaces/src/RoIDecoder.cxx
index 9ea5e1128b9de23a01703cd066ab929aee52da3d..fa19e6fa58d75da23b893e936a9225e2f71ce39e 100644
--- a/Trigger/TrigT1/TrigT1Interfaces/src/RoIDecoder.cxx
+++ b/Trigger/TrigT1/TrigT1Interfaces/src/RoIDecoder.cxx
@@ -1,20 +1,14 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 // $Id: RoIDecoder.cxx 187728 2009-05-27 16:18:06Z krasznaa $
 /***************************************************************************
                           RoIDecoder.cxx  -  description
                              -------------------
     begin                : Fri Apr 19 2002
-    copyright            : (C) 2002 by E.Moyse
     email                : moyse@ph.qmw.ac.uk
  ***************************************************************************/
 
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
 
 #ifndef  TRIGGERSPACE
 // running in Athena
diff --git a/Trigger/TrigT1/TrigT1Interfaces/src/RoIFormatUpdater.cxx b/Trigger/TrigT1/TrigT1Interfaces/src/RoIFormatUpdater.cxx
index a7a6ecc284f9cdb4888046a4357402cd8c60590c..2082995440335e6ef37630220640c3cbcfb1aedf 100644
--- a/Trigger/TrigT1/TrigT1Interfaces/src/RoIFormatUpdater.cxx
+++ b/Trigger/TrigT1/TrigT1Interfaces/src/RoIFormatUpdater.cxx
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 /* **********************************************************
 *
 * Quick and dirty hack to work around fact that there is no RoI
diff --git a/Trigger/TrigT1/TrigT1Interfaces/src/SlinkWord.cxx b/Trigger/TrigT1/TrigT1Interfaces/src/SlinkWord.cxx
index 6b12bc532f779a9b83ba5ee3257998f5c9c2af72..770ee88d8189d2d567d1db0ad8b3a85f646f0c39 100644
--- a/Trigger/TrigT1/TrigT1Interfaces/src/SlinkWord.cxx
+++ b/Trigger/TrigT1/TrigT1Interfaces/src/SlinkWord.cxx
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 
 #include "TrigT1Interfaces/SlinkWord.h"
 
diff --git a/Trigger/TrigT1/TrigT1Interfaces/src/TMUtil.cxx b/Trigger/TrigT1/TrigT1Interfaces/src/TMUtil.cxx
index 5a4d114975e0a1a4a356083e43ea8f8ee7d451c6..ec4289982d2a6e7db78aaaa03ea1c758aa4a44e7 100644
--- a/Trigger/TrigT1/TrigT1Interfaces/src/TMUtil.cxx
+++ b/Trigger/TrigT1/TrigT1Interfaces/src/TMUtil.cxx
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 
 #include <sstream>
 #include <cmath>
diff --git a/Trigger/TrigT1/TrigT1Interfaces/src/TrigT1CTPDefs.cxx b/Trigger/TrigT1/TrigT1Interfaces/src/TrigT1CTPDefs.cxx
index 29217641bd6103bf63c3f6f78c152087340ba092..976e13a4fa8ef4b8c60f1279de235e451ada797b 100644
--- a/Trigger/TrigT1/TrigT1Interfaces/src/TrigT1CTPDefs.cxx
+++ b/Trigger/TrigT1/TrigT1Interfaces/src/TrigT1CTPDefs.cxx
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 
 #include "TrigT1Interfaces/TrigT1CTPDefs.h"
 
diff --git a/Trigger/TrigT1/TrigT1Interfaces/src/TrigT1CaloDefs.cxx b/Trigger/TrigT1/TrigT1Interfaces/src/TrigT1CaloDefs.cxx
index a633ff0405b6bbb1fbb85a4de4c9a1b24ee27407..0ea2624a6fe9b24538b96b928d237fe795a6da0e 100644
--- a/Trigger/TrigT1/TrigT1Interfaces/src/TrigT1CaloDefs.cxx
+++ b/Trigger/TrigT1/TrigT1Interfaces/src/TrigT1CaloDefs.cxx
@@ -1,19 +1,13 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 /***************************************************************************
                           TrigT1CaloDefs.cxx  -  description
                              -------------------
     begin                : Mon Apr 22 2002
-    copyright            : (C) 2002 by Edward Moyse
     email                : e.moyse@qmul.ac.uk
  ***************************************************************************/
 
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
 #ifndef TRIGGERSPACE
 //running in Athena
 #include "TrigT1Interfaces/TrigT1CaloDefs.h"
diff --git a/Trigger/TrigT1/TrigT1Interfaces/src/TrtCTP.cxx b/Trigger/TrigT1/TrigT1Interfaces/src/TrtCTP.cxx
index 7aea0be66db518c462ec6f074b065bb2b9714ece..f6db0eb358213cd5bcbe626c4a5203c228b8f036 100644
--- a/Trigger/TrigT1/TrigT1Interfaces/src/TrtCTP.cxx
+++ b/Trigger/TrigT1/TrigT1Interfaces/src/TrtCTP.cxx
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 #include "TrigT1Interfaces/TrtCTP.h"
 
 // STL includes(s):
diff --git a/Trigger/TrigT1/TrigT1Interfaces/src/ZdcCTP.cxx b/Trigger/TrigT1/TrigT1Interfaces/src/ZdcCTP.cxx
index acd03da3541a1b42d06a107e0aa380b6e900dc55..8743d5874a2bbadf500da733b68c64658c0ec292 100644
--- a/Trigger/TrigT1/TrigT1Interfaces/src/ZdcCTP.cxx
+++ b/Trigger/TrigT1/TrigT1Interfaces/src/ZdcCTP.cxx
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 #include "TrigT1Interfaces/ZdcCTP.h"
 
 // STL includes(s):
diff --git a/Trigger/TrigT1/TrigT1Interfaces/src/iRecCoordRoI.cxx b/Trigger/TrigT1/TrigT1Interfaces/src/iRecCoordRoI.cxx
index 2b3b3048400572af500f1af43275f0dde13f097e..a56186926de4de4be2ff8fd5e3f5c953bc443efb 100644
--- a/Trigger/TrigT1/TrigT1Interfaces/src/iRecCoordRoI.cxx
+++ b/Trigger/TrigT1/TrigT1Interfaces/src/iRecCoordRoI.cxx
@@ -1,20 +1,13 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 /***************************************************************************
                           iRecCoordRoi.cxx  -  description
                              -------------------
     begin                : Tue Aug 12 2003
-    copyright            : (C) 2003 by emoyse
     email                : emoyse@pcephc402
  ***************************************************************************/
 
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
 #include "TrigT1Interfaces/iRecCoordRoI.h"
 
 iRecCoordRoI::iRecCoordRoI(){
diff --git a/Trigger/TrigT1/TrigT1Lucid/TrigT1Lucid/TrigT1Lucid.h b/Trigger/TrigT1/TrigT1Lucid/TrigT1Lucid/TrigT1Lucid.h
index 588e8c78d976da95a0e9ec84de98d281941a79b8..3c63de97fe3ee9c2e4f88c769da975427f02dcc0 100644
--- a/Trigger/TrigT1/TrigT1Lucid/TrigT1Lucid/TrigT1Lucid.h
+++ b/Trigger/TrigT1/TrigT1Lucid/TrigT1Lucid/TrigT1Lucid.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef TRIG_T1_LUCID_H
diff --git a/Trigger/TrigT1/TrigT1Lucid/src/TrigT1Lucid.cxx b/Trigger/TrigT1/TrigT1Lucid/src/TrigT1Lucid.cxx
index 284d0adbbb7ff87f9a6c629261289a085670d600..781562947413e8626dcc913db5238d82cbd4f553 100644
--- a/Trigger/TrigT1/TrigT1Lucid/src/TrigT1Lucid.cxx
+++ b/Trigger/TrigT1/TrigT1Lucid/src/TrigT1Lucid.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #include "TrigT1Lucid/TrigT1Lucid.h"
diff --git a/Trigger/TrigT1/TrigT1MBTS/TrigT1MBTS/TrigT1MBTS.h b/Trigger/TrigT1/TrigT1MBTS/TrigT1MBTS/TrigT1MBTS.h
index 39e7c8cb8e6fb5c8c95652b4fb967605ec4dead0..af607858c85f8a1b9297140628b4fc3901931d3c 100644
--- a/Trigger/TrigT1/TrigT1MBTS/TrigT1MBTS/TrigT1MBTS.h
+++ b/Trigger/TrigT1/TrigT1MBTS/TrigT1MBTS/TrigT1MBTS.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef TRIGT1MBTS_H
diff --git a/Trigger/TrigT1/TrigT1MBTS/doc/packagedoc.h b/Trigger/TrigT1/TrigT1MBTS/doc/packagedoc.h
index 7d14c2b9c4292d0f5cdf27f80425683358b4c2df..167b5c79aa992a539532d8b72f9a937c600e34b2 100644
--- a/Trigger/TrigT1/TrigT1MBTS/doc/packagedoc.h
+++ b/Trigger/TrigT1/TrigT1MBTS/doc/packagedoc.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 /**
diff --git a/Trigger/TrigT1/TrigT1MBTS/src/TrigT1MBTS.cxx b/Trigger/TrigT1/TrigT1MBTS/src/TrigT1MBTS.cxx
index 69aa43efa4a1119ecfa38606d76490499e857e2f..3bc4692d50cb3a9956690302055a073afbbb4b1d 100644
--- a/Trigger/TrigT1/TrigT1MBTS/src/TrigT1MBTS.cxx
+++ b/Trigger/TrigT1/TrigT1MBTS/src/TrigT1MBTS.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #include "TrigT1MBTS/TrigT1MBTS.h"
diff --git a/Trigger/TrigT1/TrigT1Monitoring/doc/packagedoc.h b/Trigger/TrigT1/TrigT1Monitoring/doc/packagedoc.h
index 08269ef3d5412df123ac07fc2818d98a890a739b..5be2b651d5e6100d96ab1f57a4b8dc857193a9f9 100644
--- a/Trigger/TrigT1/TrigT1Monitoring/doc/packagedoc.h
+++ b/Trigger/TrigT1/TrigT1Monitoring/doc/packagedoc.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 /**
diff --git a/Trigger/TrigT1/TrigT1Monitoring/src/CalorimeterL1CaloMon.cxx b/Trigger/TrigT1/TrigT1Monitoring/src/CalorimeterL1CaloMon.cxx
index 9d549720a64503c0d581165898a2d9412eceaffe..41dd136a8ab6425153b3c3a39285bded6c312f70 100644
--- a/Trigger/TrigT1/TrigT1Monitoring/src/CalorimeterL1CaloMon.cxx
+++ b/Trigger/TrigT1/TrigT1Monitoring/src/CalorimeterL1CaloMon.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 // ********************************************************************
diff --git a/Trigger/TrigT1/TrigT1Monitoring/src/CalorimeterL1CaloMon.h b/Trigger/TrigT1/TrigT1Monitoring/src/CalorimeterL1CaloMon.h
index 1d8eb9188ec94821721a5889afdd39bfe2ad3454..182fc401664498dd8fd68ca98aa3f566f777b6a6 100644
--- a/Trigger/TrigT1/TrigT1Monitoring/src/CalorimeterL1CaloMon.h
+++ b/Trigger/TrigT1/TrigT1Monitoring/src/CalorimeterL1CaloMon.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 // ********************************************************************
diff --git a/Trigger/TrigT1/TrigT1Monitoring/src/L1CaloCTPMon.cxx b/Trigger/TrigT1/TrigT1Monitoring/src/L1CaloCTPMon.cxx
index 001076f45a18228aa7fbe41f981c004dcc2321b9..bb78be92bb2ba7d3bb6e730de64c940148b6092c 100755
--- a/Trigger/TrigT1/TrigT1Monitoring/src/L1CaloCTPMon.cxx
+++ b/Trigger/TrigT1/TrigT1Monitoring/src/L1CaloCTPMon.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 // ********************************************************************
diff --git a/Trigger/TrigT1/TrigT1Monitoring/src/L1CaloCTPMon.h b/Trigger/TrigT1/TrigT1Monitoring/src/L1CaloCTPMon.h
index 63eebd7aabb791b9adc538bbedc10327b5f1fea7..9ee5e1f51b031937437b2ad7f07f0d170bbe8509 100755
--- a/Trigger/TrigT1/TrigT1Monitoring/src/L1CaloCTPMon.h
+++ b/Trigger/TrigT1/TrigT1Monitoring/src/L1CaloCTPMon.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 // ********************************************************************
diff --git a/Trigger/TrigT1/TrigT1Monitoring/src/L1CaloHVScalesMon.cxx b/Trigger/TrigT1/TrigT1Monitoring/src/L1CaloHVScalesMon.cxx
index 1e978bba28055a2248194e0afd741a20ac54978f..3ec28f9fc24f0dde70a2270230477644ce0e7183 100644
--- a/Trigger/TrigT1/TrigT1Monitoring/src/L1CaloHVScalesMon.cxx
+++ b/Trigger/TrigT1/TrigT1Monitoring/src/L1CaloHVScalesMon.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 // ********************************************************************
diff --git a/Trigger/TrigT1/TrigT1Monitoring/src/L1CaloHVScalesMon.h b/Trigger/TrigT1/TrigT1Monitoring/src/L1CaloHVScalesMon.h
index 5efddd62a812f7c5df9ea91ab19d6c57178ce02b..8dfc7e191285113c13ab8a1549737a71576a67c3 100644
--- a/Trigger/TrigT1/TrigT1Monitoring/src/L1CaloHVScalesMon.h
+++ b/Trigger/TrigT1/TrigT1Monitoring/src/L1CaloHVScalesMon.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 
diff --git a/Trigger/TrigT1/TrigT1Monitoring/src/L1CaloL1TopoMon.cxx b/Trigger/TrigT1/TrigT1Monitoring/src/L1CaloL1TopoMon.cxx
index efbfbdedabb4fd65cd2aeeb125e5acf87c9a4f73..8f0e33e0f6f085bb5852084e026b15d7f074a06a 100755
--- a/Trigger/TrigT1/TrigT1Monitoring/src/L1CaloL1TopoMon.cxx
+++ b/Trigger/TrigT1/TrigT1Monitoring/src/L1CaloL1TopoMon.cxx
@@ -1,18 +1,7 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
-// ********************************************************************
-//
-// NAME:        L1CaloL1TopoMon.cxx
-// PACKAGE:     TrigT1CaloMonitoring
-//
-// AUTHOR:      Joergen Sjoelin (sjolin@fysik.su.se)
-//
-// DESCRIPTION: Monitoring of L1Calo --> L1Topo transmission
-//
-// ********************************************************************
-
 #include <map>
 #include <utility>
 #include <set>
@@ -25,6 +14,9 @@
 #include "GaudiKernel/MsgStream.h"
 #include "GaudiKernel/StatusCode.h"
 
+#include "EventInfo/EventID.h"
+#include "EventInfo/EventInfo.h"
+
 #include "LWHists/LWHist.h"
 #include "LWHists/TH1F_LW.h"
 #include "LWHists/TH2F_LW.h"
@@ -89,7 +81,7 @@ L1CaloL1TopoMon::L1CaloL1TopoMon( const std::string & type,
     m_configSvc("TrigConf::TrigConfigSvc/TrigConfigSvc", name),
     m_errorTool("LVL1::TrigT1CaloMonErrorTool/TrigT1CaloMonErrorTool"),
     m_histTool("LVL1::TrigT1CaloLWHistogramTool/TrigT1CaloLWHistogramTool"),
-    m_debug(false), m_histBooked(false),
+    m_debug(false), m_histBooked(false),m_lumiNo(0),
     m_h_l1topo_1d_CMXTobs(0),
     m_h_l1topo_1d_Simulation(0),
     m_h_l1topo_1d_JetTobs_EnergyLg(0),
@@ -98,6 +90,7 @@ L1CaloL1TopoMon::L1CaloL1TopoMon( const std::string & type,
     m_h_l1topo_2d_Tobs_etaPhi_mismatch{},
     m_h_l1topo_2d_Tobs_etaPhi_match{},
     m_h_l1topo_1d_Errors(0),
+    m_h_l1topo_1d_Overflows(0),
     m_h_l1topo_1d_DAQTobs(0),
     m_h_l1topo_1d_DAQJetTobs(0),
     m_h_l1topo_1d_DAQTauTobs(0),
@@ -107,6 +100,7 @@ L1CaloL1TopoMon::L1CaloL1TopoMon( const std::string & type,
     m_h_l1topo_1d_DAQMismatchTriggerBits(0),
     m_h_l1topo_1d_DAQOverflowBits(0),
     m_h_l1topo_1d_ROITobs(0),
+    m_h_l1topo_1d_ErrorsByLumiblock(0),
     m_h_l1topo_2d_ItemsBC{},
     m_h_l1topo_2d_ItemsBC_ratio{}
   
@@ -191,26 +185,40 @@ StatusCode L1CaloL1TopoMon::bookHistogramsRecurrent()
     // book histograms that are only relevant for cosmics data...
   }
 
+  if (newRunFlag() || newLumiBlockFlag()) {
+    const EventInfo *evtInfo = 0;
+    StatusCode sc = evtStore()->retrieve(evtInfo);
+    if (sc.isSuccess()) {
+      m_lumiNo = evtInfo->event_ID()->lumi_block();
+    }
+  }
+
   //if ( newLumiBlockFlag() ) {}
 
   if ( newRunFlag() ) {
 
     MgmtAttr_t attr = ATTRIB_UNMANAGED;
-    MonGroup L1CaloL1Topo( this, m_PathInRootFile, run, attr );
-    MonGroup L1CaloL1TopoEvents( this, m_PathInRootFile, run, attr,
-                                 "", "eventSample" );
+    MonGroup L1CaloL1Topo( this, m_PathInRootFile, run, attr, "", "merge" );
 
     m_histTool->setMonGroup(&L1CaloL1Topo);
 
     m_h_l1topo_1d_Errors =
       m_histTool->book1F("l1topo_1d_Errors",
-			 "L1Topo error summary",
+			 "L1Topo error summary;;Number of Events",
 			 ERROR_BIT::NUMBEROFBITS, 0, ERROR_BIT::NUMBEROFBITS);
+
+    m_h_l1topo_1d_Overflows =
+      m_histTool->book1F("l1topo_1d_Overflow",
+			 "L1Topo overflows;Overflow;Number of Events",1,0,1);
+
     for (int i=0; i<ERROR_BIT::NUMBEROFBITS;++i)
       m_h_l1topo_1d_Errors->GetXaxis()->
 	SetBinLabel(i+1,ERROR_LABELS[i].c_str());
 
-  
+    m_h_l1topo_1d_ErrorsByLumiblock =
+      m_histTool->book1F("l1topo_1d_ErrorsByLumiblock",
+			 "Events with Errors by Lumiblock;"
+			 "Lumi Block;Number of Events",2500,0,2500);
 
     m_h_l1topo_1d_CMXTobs =
       m_histTool->book1F("l1topo_1d_CMXTobs",
@@ -338,33 +346,27 @@ StatusCode L1CaloL1TopoMon::bookHistogramsRecurrent()
 			     std::to_string(i),
 			     std::string("Timing vs "
 					 "Algorithm Number ")+textFPGA[i],
-			     32, i*32, (i+1)*32, 3, -1.5, 1.5);
+			     32, i*32, (i+1)*32, 5, -2.5, 2.5);
       m_h_l1topo_2d_ItemsBC_ratio[i][0] =
 	m_histTool->bookTH2F(std::string("l1topo_2d_ItemsBC_online_ratio")+
 			     std::to_string(i),
 			     std::string("(online) Timing Ratio vs "
 					 "Algorithm Number ")+textFPGA[i],
-			     32, i*32, (i+1)*32, 3, -1.5, 1.5);
+			     32, i*32, (i+1)*32, 5, -2.5, 2.5);
       m_h_l1topo_2d_ItemsBC_ratio[i][1] =
 	m_histTool->bookTH2F(std::string("l1topo_2d_ItemsBC_ratio")+
 			     std::to_string(i),
 			     std::string("Timing Ratio vs "
 					 "Algorithm Number ")+textFPGA[i],
-			     32, i*32, (i+1)*32, 3, -1.5, 1.5);
+			     32, i*32, (i+1)*32, 5, -2.5, 2.5);
     }
 
     // Get L1Topo output bit names from the LVL1 menu thresholds
-    
-    // KW COMMENTING OUT
-    // LABELS ARE CROWDED AND ILLEGIBLE
-    // ALPHANUMERIC LABELS BREAK TIER-0 MERGING (ATR-13604)
-
-    /*std::map<unsigned int, std::string> topoCounterToName;
+    std::map<unsigned int, std::string> topoCounterToName;
     const std::vector<TrigConf::TriggerThreshold*>& thrVec = 
       m_configSvc->thresholdConfig()->
       getThresholdVector(TrigConf::L1DataDef::TOPO);
-    ATH_MSG_INFO("L1Topo bits found in the LVL1 menu = " << thrVec.size());
-    
+    ATH_MSG_DEBUG("L1Topo bits found in the LVL1 menu = " << thrVec.size());
     if (thrVec.size()>0) {
       for (auto thr : thrVec) {
 	if (thr) {
@@ -375,22 +377,24 @@ StatusCode L1CaloL1TopoMon::bookHistogramsRecurrent()
 	else
 	  ATH_MSG_DEBUG("Looping L1Topo bit inactive");
       }
-      ATH_MSG_INFO("L1Topo bits configured in the LVL1 menu = "
-		   << topoCounterToName.size());
+      ATH_MSG_DEBUG("L1Topo bits configured in the LVL1 menu = "
+		    << topoCounterToName.size());
       for (unsigned int binIndex=0; binIndex<128; ++binIndex){ 
+	std::string label(std::to_string(binIndex));
 	auto it = topoCounterToName.find(binIndex);
-	std::string label;
-	if (it != topoCounterToName.end()){ // KW commenting out (labels are crowded & illegible)
-	  label=it->second;
-	}
-	else {
-	  label=std::to_string(binIndex);
-          cout << (binIndex%32+1);
+	if (it != topoCounterToName.end()){
+	  const bool USE_ALPHANUM=true;
+	  if (USE_ALPHANUM && it->second.length()>2) {
+	    label=it->second;
+	    for (uint32_t bc=1; bc<=5; ++bc)
+	      m_h_l1topo_2d_ItemsBC[binIndex/32]->
+		SetBinContent(binIndex%32+1,bc,0.0001); // bins>0 active bins
+	  }
 	}
 	m_h_l1topo_2d_ItemsBC[binIndex/32]->GetXaxis()->
 	  SetBinLabel(binIndex%32+1,label.c_str());
       }
-    }*/
+    }
 
     m_histTool->unsetMonGroup();
     m_histBooked = true;
@@ -414,6 +418,8 @@ StatusCode L1CaloL1TopoMon::fillHistograms()
 
   StatusCode sc = StatusCode::SUCCESS;
 
+  int topo_error=0;
+
   typedef std::tuple<int,int,int,int,int,int> TobKey;
   std::set<TobKey> cmxKeys[TOB_TYPES],topoKeys[TOB_TYPES],
     keyDiff[TOB_TYPES],keyIntersect[TOB_TYPES];
@@ -422,6 +428,7 @@ StatusCode L1CaloL1TopoMon::fillHistograms()
   if (m_errorTool->corrupt() || m_errorTool->robOrUnpackingError()) {
     if (m_debug) msg(MSG::DEBUG) << "Corrupt L1Calo event" << endmsg;
     m_h_l1topo_1d_Errors->Fill(CALO_CONV);
+    topo_error|=(1<<CALO_CONV);
   }
 
   const DataHandle<CTP_RDO> ctpRDO = 0;
@@ -434,38 +441,24 @@ StatusCode L1CaloL1TopoMon::fillHistograms()
     ctp.setRDO(ctpRDO);
     const uint16_t l1aPos = ctpRDO->getL1AcceptBunchPosition();
     const uint32_t bx=ctp.getBunchCrossings().size();
+    const int dbx=bx/2;
     if (l1aPos >= bx) {
       ATH_MSG_INFO( "CTP_RDO gave invalid l1aPos." );
     }
     else {
       ATH_MSG_DEBUG( "CTP l1aPos, size : " << l1aPos << ", " << bx );
       if ( bx>=3 && l1aPos>0) {
-	for (int bc=-1; bc<2; ++bc) {
+	for (int bc=-dbx; bc<=dbx; ++bc) {
 	  const CTP_BC& ctp_bc = ctp.getBunchCrossings().at(l1aPos+bc);
 	  std::bitset<512> tip = ctp_bc.getTIP();
-	  ATH_MSG_VERBOSE( "got CTP TIP bits: " << tip.to_string() );
+	  ATH_MSG_DEBUG( "got CTP TIP bits: " << tip.to_string() );
 	  const unsigned int topoTipStart(384);
 	  const unsigned int nTopoCTPOutputs(128);
-	  for (unsigned int item=0; item<nTopoCTPOutputs; ++item){
-	    int h = (int)item/32;
-	    int binx = m_h_l1topo_2d_ItemsBC[h]->GetXaxis()->FindBin(item);
-	    int biny = m_h_l1topo_2d_ItemsBC[h]->GetYaxis()->FindBin(bc);
-	    if (item == 8 || item == 29 || item == 30 || item == 31
-		|| item == 46 || item == 47 || item == 48 || item == 49
-		|| item == 50 || item == 51 || item == 52 || item == 53
-		|| item == 54 || item == 55 || item == 56 || item == 57
-		|| item == 58 || item == 59 || item == 60 || item == 61
-		|| item == 62 || item == 63 || item == 88 || item == 89
-		|| item == 90 || item == 91 || item == 92 || item == 93
-		|| item == 94 || item == 95 || item == 107 || item == 108) { 
-	      //Sets bin value for algorithms not used in the run
-	      m_h_l1topo_2d_ItemsBC[item/32]->SetBinContent(binx, biny,-200);
-	    } 
-	    else {
-	      //Checks if algorithms fired on event-by-event basis
-	      if (tip.test(item+topoTipStart)) {
-		m_h_l1topo_2d_ItemsBC[item/32]->Fill(item,bc);
-	      }
+	  for (unsigned int item=0; item<nTopoCTPOutputs;++item) {
+	    // Check if algorithms fired
+	    if (tip.test(item+topoTipStart)) {
+	      m_h_l1topo_2d_ItemsBC[item/32]->Fill(item,bc);
+	      ATH_MSG_DEBUG("  Fired (item, bc) =" << item << ", " << bc);
 	    }
 	  }
 	}
@@ -478,7 +471,7 @@ StatusCode L1CaloL1TopoMon::fillHistograms()
   sc = evtStore()->retrieve(cmxcptob);
   if (sc.isFailure() || !cmxcptob) {
     ATH_MSG_DEBUG ("No CMX CP tobs found in TES");
-    //m_h_l1topo_1d_Errors->Fill(NO_CMX_CP);
+    // tot_error|=NO_CMX_CP;
   }   
   else {
     ATH_MSG_DEBUG( "Found CMXCPTobCollection, looping on TOBs ..." );
@@ -506,6 +499,7 @@ StatusCode L1CaloL1TopoMon::fillHistograms()
   if (sc.isFailure() || !cmxtob) {
     ATH_MSG_DEBUG ("No CMX tobs found in TES");
     m_h_l1topo_1d_Errors->Fill(NO_CMX);
+    topo_error|=(1<<NO_CMX);
   }   
   else {
     ATH_MSG_DEBUG( "Found CMXJetTobCollection, looping on TOBs ..." );
@@ -527,8 +521,8 @@ StatusCode L1CaloL1TopoMon::fillHistograms()
   
   // Retrieve L1Topo CTP simulted decision if present
   if (!evtStore()->contains<LVL1::FrontPanelCTP>(m_topoCTPLoc.value())){
-    ATH_MSG_INFO("Could not retrieve LVL1::FrontPanelCTP with key "
-		 << m_topoCTPLoc.value());
+    ATH_MSG_DEBUG("Could not retrieve LVL1::FrontPanelCTP with key "
+		  << m_topoCTPLoc.value());
   }
   else {
     const DataHandle< LVL1::FrontPanelCTP > topoCTP;
@@ -538,16 +532,6 @@ StatusCode L1CaloL1TopoMon::fillHistograms()
     }
     else {
       for(unsigned int i=0; i<32; ++i) {
-	// old scheme
-	//uint32_t mask = 0x1; mask <<= i;
-	//if( (m_topoCTP->cableWord0(0) & mask) != 0 )
-	//	m_h_l1topo_1d_Simulation->Fill(i); // cable 0, clock 0
-	//if( (m_topoCTP->cableWord0(1) & mask) != 0 )
-	//	m_h_l1topo_1d_Simulation->Fill(32 + i); // cable 0, clock 1
-	//if( (m_topoCTP->cableWord1(0) & mask) != 0 )
-	//	m_h_l1topo_1d_Simulation->Fill(64 + i); // cable 1, clock 0
-	//if( (m_topoCTP->cableWord1(1) & mask) != 0 )
-	//	m_h_l1topo_1d_Simulation->Fill(96 + i); // cable 1, clock 1
 	uint64_t topores0=topoCTP->cableWord0(1);
 	topores0<<=32;
 	topores0+=topoCTP->cableWord0(0);
@@ -586,6 +570,7 @@ StatusCode L1CaloL1TopoMon::fillHistograms()
   sc = evtStore()->retrieve(rdos);
   if (sc.isFailure() or 0 == rdos) {
     m_h_l1topo_1d_Errors->Fill(NO_DAQ);
+    topo_error|=(1<<NO_DAQ);
     ATH_MSG_DEBUG ( "Could not retrieve L1Topo DAQ RDO collection "
 		    "from StoreGate" );
   }
@@ -598,6 +583,10 @@ StatusCode L1CaloL1TopoMon::fillHistograms()
     std::vector<uint32_t> daqMuonTobs;
     std::vector<uint32_t> vFibreSizes;
     std::vector<uint32_t> vFibreStatus;
+
+    auto triggerBits = L1Topo::getDecisionAndOverflowBits(*rdos);
+    ATH_MSG_DEBUG( "Trigger  bits from L1Topo RDOs 0b" << triggerBits.first );
+    ATH_MSG_DEBUG( "Overflow bits from L1Topo RDOs 0b" << triggerBits.second );
     
     for (const L1TopoRDO* rdo : *rdos) {
       ATH_MSG_VERBOSE( *rdo );
@@ -607,12 +596,14 @@ StatusCode L1CaloL1TopoMon::fillHistograms()
       if (! errors.empty()){
 	ATH_MSG_WARNING( "Converter errors reported: " << errors );
 	m_h_l1topo_1d_Errors->Fill(DAQ_CONV);
+	topo_error|=(1<<DAQ_CONV);
       }
       const std::vector<uint32_t> cDataWords = rdo->getDataWords();
 
       if ( cDataWords.size() == 0 ) {
         ATH_MSG_DEBUG ( "L1TopoRDO DAQ is empty" );
 	m_h_l1topo_1d_Errors->Fill(NO_DAQ);
+	topo_error|=(1<<NO_DAQ);
       }
 
       // initialise header: beware, this can make a valid-looking header
@@ -626,6 +617,7 @@ StatusCode L1CaloL1TopoMon::fillHistograms()
 	    header = L1Topo::Header(word);
 	    if (header.payload_crc()!=0) {
 	      m_h_l1topo_1d_Errors->Fill(PAYL_CRC);
+	      topo_error|=(1<<PAYL_CRC);
 	    }
 	    i_fpga=(((rdo->getSourceID())>>3)&2)+header.fpga();
 	    break;
@@ -646,8 +638,11 @@ StatusCode L1CaloL1TopoMon::fillHistograms()
 	    auto status = L1Topo::Status(word);
 	    ATH_MSG_WARNING( "fibre overflow: " << status.overflow()
 			     << " fibre crc: " << status.crc() );
-	    if (status.overflow()) m_h_l1topo_1d_Errors->Fill(F_OVERFLOW);
-	    if (status.crc()) m_h_l1topo_1d_Errors->Fill(F_CRC);
+	    if (status.overflow()) m_h_l1topo_1d_Overflows->Fill(0.5);
+	    if (status.crc()) {
+	      m_h_l1topo_1d_Errors->Fill(F_CRC);
+	      topo_error|=(1<<F_CRC);
+	    }
 	    break;
 	  }
 	case L1Topo::BlockTypes::L1TOPO_TOB:
@@ -771,11 +766,13 @@ StatusCode L1CaloL1TopoMon::fillHistograms()
     if (! errors.empty()) {
       ATH_MSG_WARNING( "Converter errors reported: " << errors );
       m_h_l1topo_1d_Errors->Fill(ROI_CONV);
+      topo_error|=(1<<ROI_CONV);
     }
     const std::vector<uint32_t> cDataWords = rdo.getDataWords();
     if ( cDataWords.size() == 0 ) {
       ATH_MSG_DEBUG ( "L1TopoRDO ROI is empty" );
       m_h_l1topo_1d_Errors->Fill(NO_ROI);
+      topo_error|=(1<<NO_ROI);
     }
     for (auto word : cDataWords) {
       switch (L1Topo::blockType(word)) {
@@ -786,8 +783,10 @@ StatusCode L1CaloL1TopoMon::fillHistograms()
         roiTobs.push_back(tob);
         //auto index = L1Topo::triggerBitIndex(rdo.getSourceID(),tob);
         for (unsigned int i = 0; i < 8; ++i) {
-          //m_histTriggerBitsFromROIConv->Fill (index+i,(tob.trigger_bits() >>i)&1);
-          //m_histOverflowBitsFromROIConv->Fill(index+i,(tob.overflow_bits()>>i)&1);
+          //m_histTriggerBitsFromROIConv->
+	  // Fill(index+i,(tob.trigger_bits() >>i)&1);
+          //m_histOverflowBitsFromROIConv->
+	  // Fill(index+i,(tob.overflow_bits()>>i)&1);
         }
         // histogram trigger and overflow bits
         break;
@@ -815,7 +814,10 @@ StatusCode L1CaloL1TopoMon::fillHistograms()
     set_symmetric_difference(cmxKeys[t].begin(),cmxKeys[t].end(),
 			     topoKeys[t].begin(),topoKeys[t].end(),
 			     inserter(keyDiff[t],keyDiff[t].begin()));
-    if (keyDiff[t].size()>0) m_h_l1topo_1d_Errors->Fill(CMX_MATCH);
+    if (keyDiff[t].size()>0) {
+      m_h_l1topo_1d_Errors->Fill(CMX_MATCH);
+      topo_error|=(1<<CMX_MATCH);
+    }
     for (auto& tob : keyDiff[t]) {
       int x,y;
       double eta,phi;
@@ -850,6 +852,10 @@ StatusCode L1CaloL1TopoMon::fillHistograms()
       m_h_l1topo_2d_Tobs_Hitmap_match[t]->Fill(x,y);
     }
   }
+
+  if (topo_error) {
+    m_h_l1topo_1d_ErrorsByLumiblock->Fill(m_lumiNo);
+  }
   
   return StatusCode::SUCCESS;
 }
@@ -858,27 +864,24 @@ StatusCode L1CaloL1TopoMon::fillHistograms()
 StatusCode L1CaloL1TopoMon::procHistograms()
 /*---------------------------------------------------------*/
 {
+  ATH_MSG_DEBUG("Enter procHistograms()");
+
   //if ( endOfLumiBlockFlag() ) { }  
   //if ( endOfRunFlag() ) { }
   
-  if ( endOfLumiBlockFlag() || endOfRunFlag() ) {
-    int eor=(endOfRunFlag() ? 1 : 0);
-    for (int cpu=0; cpu<=3; ++cpu) {
-      for (int item=1; item<=32; ++item) {
-	for (int bc=1; bc<=3; ++bc) {
-	  if (m_h_l1topo_2d_ItemsBC[cpu]->GetBinContent(item,bc)<0);
-	  //m_h_l1topo_2d_ItemsBC_ratio[cpu]->SetBinContent(item,bc,-0.4);
-	  else if (m_h_l1topo_2d_ItemsBC[cpu]->GetBinContent(item,bc)==0)
-	    m_h_l1topo_2d_ItemsBC_ratio[cpu][eor]->SetBinContent(item,bc,0.0001);
-	  else if (bc==2)
-	    m_h_l1topo_2d_ItemsBC_ratio[cpu][eor]->SetBinContent(item,bc,1);
-	  else {
-	    float ratio=m_h_l1topo_2d_ItemsBC[cpu]->
-	      GetBinContent(item,bc)/(float)
-	      m_h_l1topo_2d_ItemsBC[cpu]->GetBinContent(item,2);
-	    m_h_l1topo_2d_ItemsBC_ratio[cpu][eor]->
-	      SetBinContent(item,bc,fmax(0.05,ratio));
-	  }
+  int eor=(endOfRunFlag() ? 1 : 0);
+  for (int cpu=0; cpu<=3; ++cpu) {
+    for (int item=1; item<=32; ++item) {
+      for (int bc=1; bc<=5; ++bc) {
+	if (m_h_l1topo_2d_ItemsBC[cpu]->GetBinContent(item,bc)==0);
+	else if (bc==3)
+	  m_h_l1topo_2d_ItemsBC_ratio[cpu][eor]->SetBinContent(item,bc,1);
+	else {
+	  float binval=m_h_l1topo_2d_ItemsBC[cpu]->GetBinContent(item,bc);
+	  float centerbin=m_h_l1topo_2d_ItemsBC[cpu]->GetBinContent(item,3);
+	  float ratio=(binval<1 || centerbin<1 ? 0 : binval/centerbin);
+	  m_h_l1topo_2d_ItemsBC_ratio[cpu][eor]->
+	    SetBinContent(item,bc,fmax(0.05,ratio));
 	}
       }
     }
diff --git a/Trigger/TrigT1/TrigT1Monitoring/src/L1CaloL1TopoMon.h b/Trigger/TrigT1/TrigT1Monitoring/src/L1CaloL1TopoMon.h
index 7db6ce45018fa387242c518eeb1163643d85e9b3..6c9a32461b560200f913ea37c8ca999183818569 100755
--- a/Trigger/TrigT1/TrigT1Monitoring/src/L1CaloL1TopoMon.h
+++ b/Trigger/TrigT1/TrigT1Monitoring/src/L1CaloL1TopoMon.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 // ********************************************************************
@@ -58,14 +58,12 @@ class TrigT1CaloLWHistogramTool;
   virtual StatusCode procHistograms();
 
   enum ERROR_BIT {CALO_CONV=0, NO_CMX, DAQ_CONV, NO_DAQ, ROI_CONV,
-		  NO_ROI, F_OVERFLOW,
-		  F_CRC, PAYL_CRC, CMX_MATCH, NUMBEROFBITS};
+		  NO_ROI, F_CRC, PAYL_CRC, CMX_MATCH, NUMBEROFBITS};
 
   enum TOB_TYPE {JETL_TOB=0, JETS_TOB, TAU_TOB, EM_TOB, MU_TOB};
   
   std::vector<std::string> ERROR_LABELS{"Calo conv","No CMX","DAQ conv",
-      "No DAQ","ROI conv","No ROI","Fibre Overf","Fibre CRC",
-      "Payload CRC","CMX-Topo match"};
+      "No DAQ","ROI conv","No ROI","Fibre CRC","Payload CRC","CMX-Topo match"};
   
  private:
   
@@ -96,6 +94,8 @@ class TrigT1CaloLWHistogramTool;
    bool m_debug;
    /// Histograms booked flag
    bool m_histBooked;
+   /// Current lumiblock
+   unsigned int m_lumiNo;
 
    /** Histos */   
    // Data transmission checks
@@ -108,6 +108,7 @@ class TrigT1CaloLWHistogramTool;
    TH2F_LW* m_h_l1topo_2d_Tobs_etaPhi_mismatch[TOB_TYPES];
    TH2F_LW* m_h_l1topo_2d_Tobs_etaPhi_match[TOB_TYPES];
    TH1F_LW* m_h_l1topo_1d_Errors;
+   TH1F_LW* m_h_l1topo_1d_Overflows;
    TH1F_LW* m_h_l1topo_1d_DAQTobs;
    TH1F_LW* m_h_l1topo_1d_DAQJetTobs;
    TH1F_LW* m_h_l1topo_1d_DAQTauTobs;
@@ -117,8 +118,9 @@ class TrigT1CaloLWHistogramTool;
    TH1F_LW* m_h_l1topo_1d_DAQMismatchTriggerBits;
    TH1F_LW* m_h_l1topo_1d_DAQOverflowBits;
    TH1F_LW* m_h_l1topo_1d_ROITobs;
-   TH2F*    m_h_l1topo_2d_ItemsBC[4];
-   TH2F*    m_h_l1topo_2d_ItemsBC_ratio[4][2];
+   TH1F_LW* m_h_l1topo_1d_ErrorsByLumiblock;
+   TH2F* m_h_l1topo_2d_ItemsBC[4];
+   TH2F* m_h_l1topo_2d_ItemsBC_ratio[4][2];
 };
  
  // ============================================================================
diff --git a/Trigger/TrigT1/TrigT1Monitoring/src/L1CaloLevel2Mon.cxx b/Trigger/TrigT1/TrigT1Monitoring/src/L1CaloLevel2Mon.cxx
index 09f379b0ff84abedc25fba1732350ef435783384..7bcb938a72e04559e9a921e99a01a6a09c6723e3 100755
--- a/Trigger/TrigT1/TrigT1Monitoring/src/L1CaloLevel2Mon.cxx
+++ b/Trigger/TrigT1/TrigT1Monitoring/src/L1CaloLevel2Mon.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 // ********************************************************************
diff --git a/Trigger/TrigT1/TrigT1Monitoring/src/L1CaloLevel2Mon.h b/Trigger/TrigT1/TrigT1Monitoring/src/L1CaloLevel2Mon.h
index 8ec32c00d2d231208b38492d0e7f2b1c7d669652..a92b970fab831da31def5efbc3cb7be4ad6402ce 100755
--- a/Trigger/TrigT1/TrigT1Monitoring/src/L1CaloLevel2Mon.h
+++ b/Trigger/TrigT1/TrigT1Monitoring/src/L1CaloLevel2Mon.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 // ********************************************************************
diff --git a/Trigger/TrigT1/TrigT1Monitoring/src/L1CaloPMTScoresMon.cxx b/Trigger/TrigT1/TrigT1Monitoring/src/L1CaloPMTScoresMon.cxx
index 38f1283bfa9912b72a00b08775d7b1822ca22b85..2c5b603a7ef7ead993d93e17ac2eae5e43a2dd5e 100644
--- a/Trigger/TrigT1/TrigT1Monitoring/src/L1CaloPMTScoresMon.cxx
+++ b/Trigger/TrigT1/TrigT1Monitoring/src/L1CaloPMTScoresMon.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 // ********************************************************************
diff --git a/Trigger/TrigT1/TrigT1Monitoring/src/L1CaloPMTScoresMon.h b/Trigger/TrigT1/TrigT1Monitoring/src/L1CaloPMTScoresMon.h
index a3118b50e97c24e477f3f0040d63ce9c71018a86..073446934e3905e36f6518ea3ab83b3e956e4f71 100644
--- a/Trigger/TrigT1/TrigT1Monitoring/src/L1CaloPMTScoresMon.h
+++ b/Trigger/TrigT1/TrigT1Monitoring/src/L1CaloPMTScoresMon.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 
diff --git a/Trigger/TrigT1/TrigT1Muctpi/doc/packagedoc.h b/Trigger/TrigT1/TrigT1Muctpi/doc/packagedoc.h
index 07abe24b4f3b1c182b6f2073bc8f84d4b370278b..c4a7fe4f532ddefe063c7ad409ae787b57a415cf 100644
--- a/Trigger/TrigT1/TrigT1Muctpi/doc/packagedoc.h
+++ b/Trigger/TrigT1/TrigT1Muctpi/doc/packagedoc.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 /**
diff --git a/Trigger/TrigT1/TrigT1Muctpi/python/TrigT1MuctpiAlgorithmConfig.py b/Trigger/TrigT1/TrigT1Muctpi/python/TrigT1MuctpiAlgorithmConfig.py
new file mode 100644
index 0000000000000000000000000000000000000000..92083d42c15a02620f26ac7678c0589a10d31f26
--- /dev/null
+++ b/Trigger/TrigT1/TrigT1Muctpi/python/TrigT1MuctpiAlgorithmConfig.py
@@ -0,0 +1,65 @@
+# Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+
+## get a handle to the default top-level algorithm sequence
+from AthenaCommon.AlgSequence import AlgSequence
+topSequence = AlgSequence()
+## get a handle to the ServiceManager
+from AthenaCommon.AppMgr import ServiceMgr as svcMgr
+## get a handle to the ApplicationManager
+from AthenaCommon.AppMgr import theApp
+
+## to decode the MuCTPI bytestream
+from TrigT1ResultByteStream.TrigT1ResultByteStreamConf import MuCTPIByteStreamTool,RecMuCTPIByteStreamTool
+from TrigT1Muctpi.TrigT1MuctpiConf import CBNTAA_ReadMuCTPI_RDO
+from TrigT1Muctpi.TrigT1MuctpiConf import CBNTAA_ReadMuCTPI_RIO
+from TrigT1Muctpi.TrigT1MuctpiConf import CBNTAA_MuctpiRoI
+
+if not hasattr( svcMgr, "THistSvc" ):
+  from GaudiSvc.GaudiSvcConf import THistSvc
+  svcMgr += THistSvc()
+#svcMgr.THistSvc.Output = ["file1 DATAFILE='HistFile.root' OPT='RECREATE'"];
+
+if not hasattr( theApp.Dlls, "RootHistCnv" ):
+  theApp.Dlls += [ "RootHistCnv" ]
+  theApp.HistogramPersistency = "ROOT"
+
+if not hasattr( svcMgr, "NTupleSvc" ):
+  from GaudiSvc.GaudiSvcConf import NTupleSvc
+  svcMgr += NTupleSvc()
+#svcMgr.NTupleSvc.Output = [ "FILE1 DATAFILE='NtupleFile.root' OPT='NEW'" ]
+
+if not hasattr( topSequence, "CBNT_AthenaAware" ):
+  from CBNT_Athena.CBNT_AthenaConf import *
+  from CBNT_Utils.CBNT_UtilsConf import *
+  CBNT_AthenaAware = CBNT_AthenaAware()
+#  CBNT_AthenaAware.OutputLevel = 2
+  topSequence += CBNT_AthenaAware
+
+if not "CBNTAA_EventInfo" in topSequence.CBNT_AthenaAware.Members :
+  from CBNT_Athena.CBNT_AthenaConf import *
+  from CBNT_Utils.CBNT_UtilsConf import *
+  topSequence.CBNT_AthenaAware.Members += ["CBNTAA_EventInfo"]
+        
+if not "CBNTAA_ReadMuCTPI_RDO" in topSequence.CBNT_AthenaAware.Members :
+  CBNTAA_ReadMuCTPI_RDO = CBNTAA_ReadMuCTPI_RDO()
+  CBNTAA_ReadMuCTPI_RDO.StoreRawData = False
+  topSequence.CBNT_AthenaAware.Members += ["CBNTAA_ReadMuCTPI_RDO"]
+
+if not "CBNTAA_ReadMuCTPI_RIO" in topSequence.CBNT_AthenaAware.Members :
+  topSequence.CBNT_AthenaAware.Members += ["CBNTAA_ReadMuCTPI_RIO"]
+
+if not "CBNTAA_MuctpiRoI" in topSequence.CBNT_AthenaAware.Members :
+  CBNTAA_MuctpiRoI = CBNTAA_MuctpiRoI()
+  #      CBNT_MuctpiRoI.RoISource = "roi"
+  topSequence.CBNT_AthenaAware.Members += ["CBNTAA_MuctpiRoI"]
+
+# print topSequence
+
+# class CBNTAA_Algorithms():
+#   """
+#     Configurable module to setup ntuple-producing algorithms
+#   """
+#   def __init__( self, name = "CBNTAA_Algorithms" ):
+#     #
+#     # CBNT part
+#     #
diff --git a/Trigger/TrigT1/TrigT1Muctpi/python/__init__.py b/Trigger/TrigT1/TrigT1Muctpi/python/__init__.py
index f0cb7ef91c4772555f05b58ccccfcc80f09cda74..670f0c6952edc92e6936e070b3f4cfba4c7004c2 100644
--- a/Trigger/TrigT1/TrigT1Muctpi/python/__init__.py
+++ b/Trigger/TrigT1/TrigT1Muctpi/python/__init__.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 
 # File: TrigT1Muctpi/__init__.py
 # Author: berge@cern.ch
diff --git a/Trigger/TrigT1/TrigT1Muctpi/src/Algorithms/L1Muctpi.cxx b/Trigger/TrigT1/TrigT1Muctpi/src/Algorithms/L1Muctpi.cxx
index bb6060f5bab5883a2b15edba5983a158f571d407..2f59f619c3790499ea6404a73bd4c8d5936804b7 100644
--- a/Trigger/TrigT1/TrigT1Muctpi/src/Algorithms/L1Muctpi.cxx
+++ b/Trigger/TrigT1/TrigT1Muctpi/src/Algorithms/L1Muctpi.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 // $Id: L1Muctpi.cxx 794528 2017-01-30 12:36:33Z fwinkl $
@@ -418,7 +418,11 @@ namespace LVL1MUCTPI {
     m_theMuctpi->processData( &mergedInput );      
     // Save the output of the simulation
     CHECK( saveOutput() );
-      
+
+    uint32_t can;
+    std::vector< uint32_t > dataWord;
+    CHECK( updateMuCTPI_RDO(can, dataWord) );
+
     // check the other 4 possible BC offset values in case the input objects tells us there are
     // out of time candidates
 
@@ -433,9 +437,12 @@ namespace LVL1MUCTPI {
 	  m_theMuctpi->processData( &mergedInput, (*it));      
 	  // Save the output of the simulation
 	  CHECK( saveOutput( (*it) ) );	    
+	  uint32_t tmp_can; // this isn't used for anything!
+	  CHECK( updateMuCTPI_RDO(tmp_can, dataWord) );
 	}
       }
     }    
+    CHECK( saveOutput_MuCTPI_RDO(can, dataWord) );
 
     return StatusCode::SUCCESS;
   }
@@ -478,6 +485,11 @@ namespace LVL1MUCTPI {
     // Save the output of the simulation
     CHECK( saveOutput() );
 
+    uint32_t can;
+    std::vector< uint32_t > dataWord;
+    CHECK( updateMuCTPI_RDO(can, dataWord) );
+    CHECK( saveOutput_MuCTPI_RDO(can, dataWord) );
+
     return StatusCode::SUCCESS;
   }
 
@@ -508,6 +520,11 @@ namespace LVL1MUCTPI {
     // Save the output of the simulation
     CHECK( saveOutput() );
 
+    uint32_t can;
+    std::vector< uint32_t > dataWord;
+    CHECK( updateMuCTPI_RDO(can, dataWord) );
+    CHECK( saveOutput_MuCTPI_RDO(can, dataWord) );
+
     return StatusCode::SUCCESS;
   }
 
@@ -579,6 +596,58 @@ namespace LVL1MUCTPI {
     return StatusCode::SUCCESS;
   }
 
+  /**
+   *In order to handle multiple BCID per event, the RDO object needs to be saved only after
+   *all BCID offsets have been processed. This function will update the data word that will
+   *go to the RDO, but won't save the RDO to storegate yet.
+   */
+  StatusCode L1Muctpi::updateMuCTPI_RDO(uint32_t& can, std::vector< uint32_t >& dataWord)
+  {
+    const std::list< unsigned int >& daqData = m_theMuctpi->getDAQData();
+    
+    const int HEADER_SIZE = 9;
+    const int STATUSandTAILER_SIZE = 2 + 3;
+    
+    // size check
+    // payload should contain at least 1 data (Candidate Multiplicity)
+    int payloadSize = daqData.size() - HEADER_SIZE - STATUSandTAILER_SIZE;
+    if( payloadSize < 1 ) {
+      REPORT_ERROR( StatusCode::FAILURE )
+	<< "MIROD didn't provide correct DAQ data";
+      return StatusCode::FAILURE;
+    }
+    
+    // skip header part
+    std::list< unsigned int >::const_iterator itDAQ = daqData.begin();
+    for( int iHead = 0; iHead < HEADER_SIZE; ++iHead ) {
+      ++itDAQ;
+    }
+    
+    // candidate multiplicity
+    can = *itDAQ;
+    ++itDAQ;
+    
+    // data word
+    //std::vector< uint32_t > dataWord;
+    for( int iData = 1; iData < payloadSize; ++iData, ++itDAQ ) {
+      dataWord.push_back( *itDAQ );
+    }
+
+    return StatusCode::SUCCESS;
+  }
+
+  /**
+   *Here we save the actual RDO, after all BCID offsets have been processed
+   */
+  StatusCode L1Muctpi::saveOutput_MuCTPI_RDO(uint32_t& can, std::vector< uint32_t >& dataWord)
+  {
+    MuCTPI_RDO * muCTPI_RDO = new MuCTPI_RDO( can, dataWord );
+    CHECK( evtStore()->record( muCTPI_RDO, m_rdoOutputLocId ) );
+    ATH_MSG_DEBUG( "MuCTPI_RDO object recorded to StoreGate with key: "
+		   << m_rdoOutputLocId );
+    return StatusCode::SUCCESS;
+  }
+
   /**
    * This function is used by all the different execute functions to save the output
    * of the MuCTPI simulation into various objects in StoreGate.
@@ -594,41 +663,43 @@ namespace LVL1MUCTPI {
                      << m_ctpOutputLocId );
 
       // create MuCTPI RDO
-      const std::list< unsigned int >& daqData = m_theMuctpi->getDAQData();
-
-      const int HEADER_SIZE = 9;
-      const int STATUSandTAILER_SIZE = 2 + 3;
-
-      // size check
-      // payload should contain at least 1 data (Candidate Multiplicity)
-      int payloadSize = daqData.size() - HEADER_SIZE - STATUSandTAILER_SIZE;
-      if( payloadSize < 1 ) {
-	REPORT_ERROR( StatusCode::FAILURE )
-	  << "MIROD didn't provide correct DAQ data";
-	return StatusCode::FAILURE;
-      }
-
-      // skip header part
-      std::list< unsigned int >::const_iterator itDAQ = daqData.begin();
-      for( int iHead = 0; iHead < HEADER_SIZE; ++iHead ) {
-	++itDAQ;
-      }
-
-      // candidate multiplicity
-      const uint32_t can = *itDAQ;
-      ++itDAQ;
-
-      // data word
-      std::vector< uint32_t > dataWord;
-      for( int iData = 1; iData < payloadSize; ++iData, ++itDAQ ) {
-	dataWord.push_back( *itDAQ );
-      }
+      // const std::list< unsigned int >& daqData = m_theMuctpi->getDAQData();
+
+      // const int HEADER_SIZE = 9;
+      // const int STATUSandTAILER_SIZE = 2 + 3;
+
+      // // size check
+      // // payload should contain at least 1 data (Candidate Multiplicity)
+      // int payloadSize = daqData.size() - HEADER_SIZE - STATUSandTAILER_SIZE;
+      // if( payloadSize < 1 ) {
+      // 	REPORT_ERROR( StatusCode::FAILURE )
+      // 	  << "MIROD didn't provide correct DAQ data";
+      // 	return StatusCode::FAILURE;
+      // }
+
+      // // skip header part
+      // std::list< unsigned int >::const_iterator itDAQ = daqData.begin();
+      // for( int iHead = 0; iHead < HEADER_SIZE; ++iHead ) {
+      // 	++itDAQ;
+      // }
+
+      // // candidate multiplicity
+      // const uint32_t can = *itDAQ;
+      // ++itDAQ;
+
+      // // data word
+      // std::vector< uint32_t > dataWord;
+      // for( int iData = 1; iData < payloadSize; ++iData, ++itDAQ ) {
+      // 	dataWord.push_back( *itDAQ );
+      // }
 
       // create MuCTPI RDO
-      MuCTPI_RDO * muCTPI_RDO = new MuCTPI_RDO( can, dataWord );
-      CHECK( evtStore()->record( muCTPI_RDO, m_rdoOutputLocId ) );
-      ATH_MSG_DEBUG( "MuCTPI_RDO object recorded to StoreGate with key: "
-                     << m_rdoOutputLocId );
+      // MuCTPI_RDO * muCTPI_RDO = new MuCTPI_RDO( can, dataWord );
+      // std::string rdoOutputLocId = m_rdoOutputLocId;
+      // if (bcidOffset) rdoOutputLocId = m_rdoOutputLocId+std::to_string(bcidOffset);
+      // CHECK( evtStore()->record( muCTPI_RDO, rdoOutputLocId ) );
+      // ATH_MSG_DEBUG( "MuCTPI_RDO object recorded to StoreGate with key: "
+      //                << rdoOutputLocId );
 
       // store RoIB result in interface object and put to StoreGate
       std::list< unsigned int > resultForRoIB = m_theMuctpi->getRoIBData();
diff --git a/Trigger/TrigT1/TrigT1Muctpi/src/Algorithms/L1Muctpi.h b/Trigger/TrigT1/TrigT1Muctpi/src/Algorithms/L1Muctpi.h
index 37959254a98e2e824bb43825d9112f45854483ef..f9ab2367a37e25e0c07b90b20b52b02f5a566470 100644
--- a/Trigger/TrigT1/TrigT1Muctpi/src/Algorithms/L1Muctpi.h
+++ b/Trigger/TrigT1/TrigT1Muctpi/src/Algorithms/L1Muctpi.h
@@ -1,7 +1,7 @@
 // Dear emacs, this is -*- c++ -*-
 
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 // $Id: L1Muctpi.h 681356 2015-07-08 12:17:52Z wengler $
@@ -81,6 +81,10 @@ namespace LVL1MUCTPI {
       StatusCode executeFromRDO();
       /// Validate the muon threshold configuration
       StatusCode validate( const std::vector< TrigConf::TriggerThreshold* >& thresholds ) const;
+      /// Update the data word for the RDO object
+      StatusCode updateMuCTPI_RDO(uint32_t& can, std::vector< uint32_t >& dataWord);
+      /// Save the MuCTPI RDO object
+      StatusCode saveOutput_MuCTPI_RDO(uint32_t& can, std::vector< uint32_t >& dataWord);
       /// Save the outputs of the simulation into StoreGate
       StatusCode saveOutput(int bcidOffset = 0);
 
diff --git a/Trigger/TrigT1/TrigT1Muctpi/src/Algorithms/L1MuctpiPatGen.cxx b/Trigger/TrigT1/TrigT1Muctpi/src/Algorithms/L1MuctpiPatGen.cxx
index 42fcf88dce2cf06a33ba133885adc2068c40ea09..55d8bc366663e6c2ab29e51757b0722cf262ac76 100644
--- a/Trigger/TrigT1/TrigT1Muctpi/src/Algorithms/L1MuctpiPatGen.cxx
+++ b/Trigger/TrigT1/TrigT1Muctpi/src/Algorithms/L1MuctpiPatGen.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 // $Id: L1MuctpiPatGen.cxx 441850 2011-06-06 14:50:52Z krasznaa $
diff --git a/Trigger/TrigT1/TrigT1Muctpi/src/Algorithms/L1MuctpiPatGen.h b/Trigger/TrigT1/TrigT1Muctpi/src/Algorithms/L1MuctpiPatGen.h
index e4aa30d080394d7cc65b6318b048120c115a1762..2ed6821a02a8559a9e9ad2d46325f49ee13696df 100644
--- a/Trigger/TrigT1/TrigT1Muctpi/src/Algorithms/L1MuctpiPatGen.h
+++ b/Trigger/TrigT1/TrigT1Muctpi/src/Algorithms/L1MuctpiPatGen.h
@@ -1,7 +1,7 @@
 // Dear emacs, this is -*- c++ -*-
 
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 // $Id: L1MuctpiPatGen.h 362102 2011-04-28 13:17:28Z krasznaa $
diff --git a/Trigger/TrigT1/TrigT1Muctpi/src/Algorithms/L1MuctpiTestReadResults.cxx b/Trigger/TrigT1/TrigT1Muctpi/src/Algorithms/L1MuctpiTestReadResults.cxx
index 64eb31ac8466dfb1ffc4f195769d71230172094d..14563d6919f06af2737a2de07f02b3ab11c4180a 100644
--- a/Trigger/TrigT1/TrigT1Muctpi/src/Algorithms/L1MuctpiTestReadResults.cxx
+++ b/Trigger/TrigT1/TrigT1Muctpi/src/Algorithms/L1MuctpiTestReadResults.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 // $Id: L1MuctpiTestReadResults.cxx 362102 2011-04-28 13:17:28Z krasznaa $
diff --git a/Trigger/TrigT1/TrigT1Muctpi/src/Algorithms/L1MuctpiTestReadResults.h b/Trigger/TrigT1/TrigT1Muctpi/src/Algorithms/L1MuctpiTestReadResults.h
index 0125fb3664efdacc65026c99e88cb6fecf42c213..61e852a4d178dc324242bb0dcb631fe973370228 100644
--- a/Trigger/TrigT1/TrigT1Muctpi/src/Algorithms/L1MuctpiTestReadResults.h
+++ b/Trigger/TrigT1/TrigT1Muctpi/src/Algorithms/L1MuctpiTestReadResults.h
@@ -1,7 +1,7 @@
 // Dear emacs, this is -*- c++ -*-
 
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 // $Id: L1MuctpiTestReadResults.h 362102 2011-04-28 13:17:28Z krasznaa $
diff --git a/Trigger/TrigT1/TrigT1Muctpi/src/Algorithms/L1MuctpiTool.cxx b/Trigger/TrigT1/TrigT1Muctpi/src/Algorithms/L1MuctpiTool.cxx
index 01718c515d5a401b07aced86282546d489b74187..7d2db622c24a78f050c8b40dc99a80cb2b9d0235 100644
--- a/Trigger/TrigT1/TrigT1Muctpi/src/Algorithms/L1MuctpiTool.cxx
+++ b/Trigger/TrigT1/TrigT1Muctpi/src/Algorithms/L1MuctpiTool.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 // $Id: L1MuctpiTool.cxx 794528 2017-01-30 12:36:33Z fwinkl $
@@ -30,6 +30,8 @@
 
 // The output object of the simulation
 #include "TrigT1Result/MuCTPI_RDO.h"
+#include "TrigT1Result/MuCTPI_MultiplicityWord_Decoder.h"
+#include "TrigT1Result/MuCTPI_DataWord_Decoder.h"
 
 // Inlcudes for the MuCTPI simulation
 #include "../Algorithms/L1MuctpiTool.h"
@@ -366,63 +368,93 @@ namespace LVL1MUCTPI {
   // algorithm code what to execute. This is essetnially the execute from RDO variant
   // below without the saveOutput call, since we only want part of that routine.
 
-  StatusCode L1MuctpiTool::fillMuCTPIL1Topo(LVL1::MuCTPIL1Topo& l1topoCandidates ) const {
+  StatusCode L1MuctpiTool::fillMuCTPIL1Topo(LVL1::MuCTPIL1Topo& l1topoCandidates, int bcidOffset) const {
     ATH_MSG_DEBUG( "in fillMuCTPIL1Topo()" );
     
     // Retrieve the MuCTPIToRoIBSLink or RoIBResult object from storegate:
     const ROIB::RoIBResult* roibResult {nullptr};
     const L1MUINT::MuCTPIToRoIBSLink* muctpi_slink {nullptr};
+    const MuCTPI_RDO* muctpiRDO = {nullptr};
     
-    if( evtStore()->contains<L1MUINT::MuCTPIToRoIBSLink>( m_roiOutputLocId) ) {
-      CHECK( evtStore()->retrieve( muctpi_slink,  m_roiOutputLocId) );
-    } else if( evtStore()->contains<ROIB::RoIBResult>(m_roibLocation) ) {
-      CHECK( evtStore()->retrieve(roibResult, m_roibLocation) );
-    } else {
-      ATH_MSG_WARNING("Neither a MuCTPIToRoIBSLink with SG key " << m_roibLocation << " nor an RoIBResult were found in the event.");
-      return StatusCode::RECOVERABLE;
+    if(bcidOffset==0) {      
+      if( evtStore()->contains<L1MUINT::MuCTPIToRoIBSLink>( m_roiOutputLocId) ) {
+	CHECK( evtStore()->retrieve( muctpi_slink,  m_roiOutputLocId) );
+      } else if( evtStore()->contains<ROIB::RoIBResult>(m_roibLocation) ) {
+	CHECK( evtStore()->retrieve(roibResult, m_roibLocation) );
+      } else {
+	ATH_MSG_WARNING("Neither a MuCTPIToRoIBSLink with SG key '/Run/L1MuCTPItoRoIBLocation' nor a an RoIBResult were found in the event.");
+	return StatusCode::RECOVERABLE;
+      }
+    }else{
+      CHECK( evtStore()->retrieve( muctpiRDO, m_rdoLocId ) );
+      ATH_MSG_DEBUG( "Retrieved MuCTPI_RDO object from StoreGate" );
     }
     
-    // Extract the RoIs into a vector:
-    std::vector< unsigned int > convertableRoIs;
-
-   if( roibResult ) {
-
-      const std::vector< ROIB::MuCTPIRoI >& rois = roibResult->muCTPIResult().roIVec();
-      ATH_MSG_DEBUG("Filling the input event from RoIBResult. Number of Muon ROIs: " << rois.size() );
-      for( const ROIB::MuCTPIRoI & muonRoI : rois ) {
-	   convertableRoIs.push_back(  muonRoI.roIWord() );
-      }
-   } else if( muctpi_slink ) {
-
-      ATH_MSG_DEBUG("Filling the input event. Number of Muon ROIs: " << muctpi_slink->getMuCTPIToRoIBWords().size() - ROIB::Header::wordsPerHeader - ROIB::Trailer::wordsPerTrailer - 1);
-      unsigned int icnt = 0;
-      for ( unsigned int roiword : muctpi_slink->getMuCTPIToRoIBWords() ) {
-
-         ++icnt;
-         // skip header
-         if ( icnt <= ROIB::Header::wordsPerHeader + 1 )
-            continue;
-
-         // skip trailer
-         if ( icnt > ( muctpi_slink->getMuCTPIToRoIBWords().size() - ROIB::Trailer::wordsPerTrailer ) )
-            continue;
-
-	 // fill RoI into vector
-	 convertableRoIs.push_back(roiword);
-      }
-   }
-
-    // Create the input to the MuCTPI:
+    // Convert output of MUCTPi to input
     LVL1MUONIF::Lvl1MuCTPIInput convertedInput;
-    CHECK( Converter::convertRoIs( convertableRoIs, &convertedInput ) );
 
+    // if reading from ROS data
+    if(muctpiRDO) {
+      
+      //std::cout << "DataWord Decoding" << std::endl;
+      //for(auto dW : muctpiRDO->dataWord()) 
+      //MuCTPI_DataWord_Decoder(dW).dumpData(msg());
+      
+      // Get the BCID of the collision:
+      unsigned int bcid_next = ( ( muctpiRDO->candidateMultiplicity() >> 18 ) & 0x7 ) + bcidOffset;
+      if(bcid_next==8) bcid_next=0;
+      ATH_MSG_DEBUG("Filling the input event from MUCTPI_RDO for bcid = " << bcid_next);
+      
+      // Create the input to the MuCTPI for the +1 BC
+      CHECK( Converter::convertRDO( muctpiRDO->dataWord(), bcid_next, &convertedInput ) );
+      ATH_MSG_DEBUG("Input converted");
+     
+    }
+    // or from RoIB data
+    else{
+      
+      // Extract the RoIs into a vector:
+      std::vector< unsigned int > convertableRoIs;
+      
+      if( roibResult ) {
+	
+	const std::vector< ROIB::MuCTPIRoI >& rois = roibResult->muCTPIResult().roIVec();
+	ATH_MSG_DEBUG("Filling the input event from RoIBResult. Number of Muon ROIs: " << rois.size() );
+	for( const ROIB::MuCTPIRoI & muonRoI : rois ) {
+	  convertableRoIs.push_back(  muonRoI.roIWord() );
+	}
+      } else if( muctpi_slink ) {
+	
+	ATH_MSG_DEBUG("Filling the input event. Number of Muon ROIs: " << muctpi_slink->getMuCTPIToRoIBWords().size() - ROIB::Header::wordsPerHeader - ROIB::Trailer::wordsPerTrailer - 1);
+	unsigned int icnt = 0;
+	for ( unsigned int roiword : muctpi_slink->getMuCTPIToRoIBWords() ) {
+	  
+	  ++icnt;
+	  // skip header
+	  if ( icnt <= ROIB::Header::wordsPerHeader + 1 )
+	    continue;
+	  
+	  // skip trailer
+	  if ( icnt > ( muctpi_slink->getMuCTPIToRoIBWords().size() - ROIB::Trailer::wordsPerTrailer ) )
+	    continue;
+	  
+	  // fill RoI into vector
+	  convertableRoIs.push_back(roiword);
+	}
+      }
+      
+      // Create the input to the MuCTPI:
+      CHECK( Converter::convertRoIs( convertableRoIs, &convertedInput ) );     
+    }
+    
     // process the input with the MuCTPI simulation
+    ATH_MSG_DEBUG("MUCTPI data processing...");
     m_theMuctpi->processData( &convertedInput );
-
+    
     // get outputs for L1Topo 
     ATH_MSG_DEBUG("Getting the output for L1Topo");
     l1topoCandidates = m_theMuctpi->getL1TopoData();
- 
+    
     return StatusCode::SUCCESS;
   }
 
@@ -759,8 +791,8 @@ namespace LVL1MUCTPI {
       CHECK( evtStore()->record( l1topo, m_l1topoOutputLocId ) );
       //      std::cout << "TW: central slice: offset: " <<  bcidOffset << "  location: " << m_l1topoOutputLocId << std::endl;
       //l1topo->print();
-   }
-    
+    }
+
     /// if we have a bcid offset, then just get the topo output and put it on storegate
     if (bcidOffset  != 0) {
       ATH_MSG_DEBUG("Getting the output for L1Topo for BCID slice");
diff --git a/Trigger/TrigT1/TrigT1Muctpi/src/Algorithms/L1MuctpiTool.h b/Trigger/TrigT1/TrigT1Muctpi/src/Algorithms/L1MuctpiTool.h
index 5c79f85c92d7b37b075a327ba53ae093d1a9dca9..1916095e9b87114988d3e55e23c8f583bbd9502d 100644
--- a/Trigger/TrigT1/TrigT1Muctpi/src/Algorithms/L1MuctpiTool.h
+++ b/Trigger/TrigT1/TrigT1Muctpi/src/Algorithms/L1MuctpiTool.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef TRIGT1MUCTPI_L1MUCTPITOOL_H
@@ -33,7 +33,7 @@ namespace LVL1MUCTPI {
 
       virtual StatusCode initialize() override;
 
-      virtual StatusCode fillMuCTPIL1Topo(LVL1::MuCTPIL1Topo& ) const override; 
+      virtual StatusCode fillMuCTPIL1Topo(LVL1::MuCTPIL1Topo&, int bcidOffset=0) const override;
 
       virtual void handle(const Incident&) override;
 
diff --git a/Trigger/TrigT1/TrigT1Muctpi/src/Common/BitOp.cxx b/Trigger/TrigT1/TrigT1Muctpi/src/Common/BitOp.cxx
index 53b41de5e82173d30fc9d5863b9e902807fec4a7..db2159ba5c68aeea517c0781f7abb42af3c631de 100644
--- a/Trigger/TrigT1/TrigT1Muctpi/src/Common/BitOp.cxx
+++ b/Trigger/TrigT1/TrigT1Muctpi/src/Common/BitOp.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 // $Id: BitOp.cxx 796872 2017-02-13 15:03:25Z fwinkl $
diff --git a/Trigger/TrigT1/TrigT1Muctpi/src/Common/BitOp.h b/Trigger/TrigT1/TrigT1Muctpi/src/Common/BitOp.h
index d75f4ba1e0624926d4ca828431b058c0fe961959..dfbd3cad8cee938ff88c8e4bebff05f778abe254 100644
--- a/Trigger/TrigT1/TrigT1Muctpi/src/Common/BitOp.h
+++ b/Trigger/TrigT1/TrigT1Muctpi/src/Common/BitOp.h
@@ -1,7 +1,7 @@
 // Dear emacs, this is -*- c++ -*-
 
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 // $Id: BitOp.h 796872 2017-02-13 15:03:25Z fwinkl $
diff --git a/Trigger/TrigT1/TrigT1Muctpi/src/Common/Configuration.h b/Trigger/TrigT1/TrigT1Muctpi/src/Common/Configuration.h
index 6a867bdef73b23a8de0bc31116639c46db14675f..f999a1fda99b757cb8d3ff07d278fd1ad3b4a9cb 100644
--- a/Trigger/TrigT1/TrigT1Muctpi/src/Common/Configuration.h
+++ b/Trigger/TrigT1/TrigT1Muctpi/src/Common/Configuration.h
@@ -1,7 +1,7 @@
 // Dear emacs, this is -*- c++ -*-
 
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 // $Id: Configuration.h 515239 2012-08-28 11:39:45Z krasznaa $
diff --git a/Trigger/TrigT1/TrigT1Muctpi/src/Common/Converter.cxx b/Trigger/TrigT1/TrigT1Muctpi/src/Common/Converter.cxx
index 1f9e2c3e55fa02e67fc589f64b5c009f34760cce..0b61e6ffb5a84360e2adade8c1e8b5dfe2f30295 100644
--- a/Trigger/TrigT1/TrigT1Muctpi/src/Common/Converter.cxx
+++ b/Trigger/TrigT1/TrigT1Muctpi/src/Common/Converter.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 // $Id: Converter.cxx 707664 2015-11-13 05:36:00Z ssnyder $
diff --git a/Trigger/TrigT1/TrigT1Muctpi/src/Common/Converter.h b/Trigger/TrigT1/TrigT1Muctpi/src/Common/Converter.h
index 3ee7f62922c611bf0e7183a6086920a058e5a72f..3083a78b63ebd7895c03c2bd6dd34059d0968550 100644
--- a/Trigger/TrigT1/TrigT1Muctpi/src/Common/Converter.h
+++ b/Trigger/TrigT1/TrigT1Muctpi/src/Common/Converter.h
@@ -1,7 +1,7 @@
 // Dear emacs, this is -*- c++ -*-
 
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 // $Id: Converter.h 707664 2015-11-13 05:36:00Z ssnyder $
diff --git a/Trigger/TrigT1/TrigT1Muctpi/src/Common/CorruptedFileException.h b/Trigger/TrigT1/TrigT1Muctpi/src/Common/CorruptedFileException.h
index 572478e83ece5bbf9109164ac9d7cabbfc7dc63f..fb68fca4427263bdac8fe7ea18e60d28683643dd 100644
--- a/Trigger/TrigT1/TrigT1Muctpi/src/Common/CorruptedFileException.h
+++ b/Trigger/TrigT1/TrigT1Muctpi/src/Common/CorruptedFileException.h
@@ -1,7 +1,7 @@
 // Dear emacs, this is -*- c++ -*-
 
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 // $Id: CorruptedFileException.h 362102 2011-04-28 13:17:28Z krasznaa $
diff --git a/Trigger/TrigT1/TrigT1Muctpi/src/Common/Detector.h b/Trigger/TrigT1/TrigT1Muctpi/src/Common/Detector.h
index d5e3e95f9b86ae27ccff800ddc31fa6c62b385e2..a5db3ded440a2d118d36d1dbd5341edd3e4af83f 100644
--- a/Trigger/TrigT1/TrigT1Muctpi/src/Common/Detector.h
+++ b/Trigger/TrigT1/TrigT1Muctpi/src/Common/Detector.h
@@ -1,7 +1,7 @@
 // Dear emacs, this is -*- c++ -*-
 
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 // $Id: Detector.h 362102 2011-04-28 13:17:28Z krasznaa $
diff --git a/Trigger/TrigT1/TrigT1Muctpi/src/Common/EventID.cxx b/Trigger/TrigT1/TrigT1Muctpi/src/Common/EventID.cxx
index 85e22902d43b5716b76290c1438a46e6e419d3ef..1054f11d4ff7e575dcc1dcbe759639305cf5ca56 100644
--- a/Trigger/TrigT1/TrigT1Muctpi/src/Common/EventID.cxx
+++ b/Trigger/TrigT1/TrigT1Muctpi/src/Common/EventID.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 // $Id: EventID.cxx 362102 2011-04-28 13:17:28Z krasznaa $
diff --git a/Trigger/TrigT1/TrigT1Muctpi/src/Common/EventID.h b/Trigger/TrigT1/TrigT1Muctpi/src/Common/EventID.h
index 88a59b46c82370251878588e4ec96dce9d5dc447..8cda8df3548b81bd663b42431d5801a0180a650a 100644
--- a/Trigger/TrigT1/TrigT1Muctpi/src/Common/EventID.h
+++ b/Trigger/TrigT1/TrigT1Muctpi/src/Common/EventID.h
@@ -1,7 +1,7 @@
 // Dear emacs, this is -*- c++ -*-
 
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 // $Id: EventID.h 362102 2011-04-28 13:17:28Z krasznaa $
diff --git a/Trigger/TrigT1/TrigT1Muctpi/src/Common/EventIDSingleton.cxx b/Trigger/TrigT1/TrigT1Muctpi/src/Common/EventIDSingleton.cxx
index 686af9cf363cbc883815900ff5a3397555f8ad3a..9f9755d1e1ed018979923c34f6679518180a96f4 100644
--- a/Trigger/TrigT1/TrigT1Muctpi/src/Common/EventIDSingleton.cxx
+++ b/Trigger/TrigT1/TrigT1Muctpi/src/Common/EventIDSingleton.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 // $Id: EventIDSingleton.cxx 362102 2011-04-28 13:17:28Z krasznaa $
diff --git a/Trigger/TrigT1/TrigT1Muctpi/src/Common/EventIDSingleton.h b/Trigger/TrigT1/TrigT1Muctpi/src/Common/EventIDSingleton.h
index 9c78eb6e2c36a252cf4c92e649a83229fba2dfcf..a6c0b783aa4c948ccce2552a18d31f7b4ffbf535 100644
--- a/Trigger/TrigT1/TrigT1Muctpi/src/Common/EventIDSingleton.h
+++ b/Trigger/TrigT1/TrigT1Muctpi/src/Common/EventIDSingleton.h
@@ -1,7 +1,7 @@
 // Dear emacs, this is -*- c++ -*-
 
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 // $Id: EventIDSingleton.h 362102 2011-04-28 13:17:28Z krasznaa $
diff --git a/Trigger/TrigT1/TrigT1Muctpi/src/Common/GenTestPattern.cxx b/Trigger/TrigT1/TrigT1Muctpi/src/Common/GenTestPattern.cxx
index 53b944e2e3cc1a935132f2374c85b3ccf045dac3..1a0a0e6d0434c5ffb198e8207f90c4f31acba5e4 100644
--- a/Trigger/TrigT1/TrigT1Muctpi/src/Common/GenTestPattern.cxx
+++ b/Trigger/TrigT1/TrigT1Muctpi/src/Common/GenTestPattern.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 // $Id: GenTestPattern.cxx 362102 2011-04-28 13:17:28Z krasznaa $
diff --git a/Trigger/TrigT1/TrigT1Muctpi/src/Common/GenTestPattern.h b/Trigger/TrigT1/TrigT1Muctpi/src/Common/GenTestPattern.h
index 01921b107babd069f7fb5be96ae39256bf68def7..aa8ed7bff7441272529fd33bde3563c6cfb2f94d 100644
--- a/Trigger/TrigT1/TrigT1Muctpi/src/Common/GenTestPattern.h
+++ b/Trigger/TrigT1/TrigT1Muctpi/src/Common/GenTestPattern.h
@@ -1,7 +1,7 @@
 // Dear emacs, this is -*- c++ -*-
 
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 // $Id: GenTestPattern.h 362102 2011-04-28 13:17:28Z krasznaa $
diff --git a/Trigger/TrigT1/TrigT1Muctpi/src/Common/MioctL1TopoConverter.cxx b/Trigger/TrigT1/TrigT1Muctpi/src/Common/MioctL1TopoConverter.cxx
index 88419beb4f8894de5d2a1e6ceba7af9b2ff8642a..ccf0b3abd72072b8b12b47be76cf73157463059b 100644
--- a/Trigger/TrigT1/TrigT1Muctpi/src/Common/MioctL1TopoConverter.cxx
+++ b/Trigger/TrigT1/TrigT1Muctpi/src/Common/MioctL1TopoConverter.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 
diff --git a/Trigger/TrigT1/TrigT1Muctpi/src/Common/MioctL1TopoConverter.h b/Trigger/TrigT1/TrigT1Muctpi/src/Common/MioctL1TopoConverter.h
index 2b12b5320e0c2d77cd14dfc2dac6920b20456da1..216888744e61549f7190a6c37ca930c4c8006489 100644
--- a/Trigger/TrigT1/TrigT1Muctpi/src/Common/MioctL1TopoConverter.h
+++ b/Trigger/TrigT1/TrigT1Muctpi/src/Common/MioctL1TopoConverter.h
@@ -1,7 +1,7 @@
 // Dear emacs, this is -*- c++ -*-
 
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef TRIGT1MUCTPI_MIOCTL1TOPOCONVERTER_H
diff --git a/Trigger/TrigT1/TrigT1Muctpi/src/Common/MuctpiBitMasks.h b/Trigger/TrigT1/TrigT1Muctpi/src/Common/MuctpiBitMasks.h
index 26a5ce4534e9572c2e4f7733c37956a44dee9a31..165cd397ad17e00e39c22bc236bdcef6d01f52a0 100644
--- a/Trigger/TrigT1/TrigT1Muctpi/src/Common/MuctpiBitMasks.h
+++ b/Trigger/TrigT1/TrigT1Muctpi/src/Common/MuctpiBitMasks.h
@@ -1,7 +1,7 @@
 // Dear emacs, this is -*- c++ -*-
 
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 // $Id: MuctpiBitMasks.h 700318 2015-10-13 14:13:15Z wengler $
diff --git a/Trigger/TrigT1/TrigT1Muctpi/src/Common/MuctpiSim.cxx b/Trigger/TrigT1/TrigT1Muctpi/src/Common/MuctpiSim.cxx
index 8576a0fc1a48c5f4d2f384024b55ee96c65a256d..966f410bb0fe3c4b10154aef1f6427daf94ef92c 100644
--- a/Trigger/TrigT1/TrigT1Muctpi/src/Common/MuctpiSim.cxx
+++ b/Trigger/TrigT1/TrigT1Muctpi/src/Common/MuctpiSim.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 // $Id: MuctpiSim.cxx 726107 2016-02-25 11:04:42Z wengler $
diff --git a/Trigger/TrigT1/TrigT1Muctpi/src/Common/MuctpiSim.h b/Trigger/TrigT1/TrigT1Muctpi/src/Common/MuctpiSim.h
index 3bff22b7332aea60e2963e9721da3d04556efc40..88e16ec110c7e87e13d0fbf9f849084885ac9cf7 100644
--- a/Trigger/TrigT1/TrigT1Muctpi/src/Common/MuctpiSim.h
+++ b/Trigger/TrigT1/TrigT1Muctpi/src/Common/MuctpiSim.h
@@ -1,7 +1,7 @@
 // Dear emacs, this is -*- c++ -*-
 
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 // $Id: MuctpiSim.h 726107 2016-02-25 11:04:42Z wengler $
diff --git a/Trigger/TrigT1/TrigT1Muctpi/src/Common/MultiplicityCalcType.h b/Trigger/TrigT1/TrigT1Muctpi/src/Common/MultiplicityCalcType.h
index 5d0f8ac57e7b980c7d4518b5c8d85d074702a482..ffd3e5b1ba28f9b70f49f76ff448c00a7df756dd 100644
--- a/Trigger/TrigT1/TrigT1Muctpi/src/Common/MultiplicityCalcType.h
+++ b/Trigger/TrigT1/TrigT1Muctpi/src/Common/MultiplicityCalcType.h
@@ -1,7 +1,7 @@
 // Dear emacs, this is -*- c++ -*-
 
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 // $Id: MultiplicityCalcType.h 362102 2011-04-28 13:17:28Z krasznaa $
diff --git a/Trigger/TrigT1/TrigT1Muctpi/src/Common/MuonCandidate.cxx b/Trigger/TrigT1/TrigT1Muctpi/src/Common/MuonCandidate.cxx
index afebecffb59e7a57a02a3665796e92de10d753dc..f15f5269e497987b044ea0559cb124c9a3dde994 100644
--- a/Trigger/TrigT1/TrigT1Muctpi/src/Common/MuonCandidate.cxx
+++ b/Trigger/TrigT1/TrigT1Muctpi/src/Common/MuonCandidate.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 // $Id: MuonCandidate.cxx 364083 2011-05-06 09:09:55Z krasznaa $
diff --git a/Trigger/TrigT1/TrigT1Muctpi/src/Common/MuonCandidate.h b/Trigger/TrigT1/TrigT1Muctpi/src/Common/MuonCandidate.h
index e42d886911903ad06e6f2981790b0e1f4b3442f6..b0bdad703711928f92b487e3a921b743338ff0de 100644
--- a/Trigger/TrigT1/TrigT1Muctpi/src/Common/MuonCandidate.h
+++ b/Trigger/TrigT1/TrigT1Muctpi/src/Common/MuonCandidate.h
@@ -1,7 +1,7 @@
 // Dear emacs, this is -*- c++ -*-
 
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 // $Id: MuonCandidate.h 364083 2011-05-06 09:09:55Z krasznaa $
diff --git a/Trigger/TrigT1/TrigT1Muctpi/src/Common/NoMoreDataException.h b/Trigger/TrigT1/TrigT1Muctpi/src/Common/NoMoreDataException.h
index 279dc72d8eadd5ea43f39fea9ff40de4e369c0fa..ac28a540d636d7b504a66b2d23c7305ce38774aa 100644
--- a/Trigger/TrigT1/TrigT1Muctpi/src/Common/NoMoreDataException.h
+++ b/Trigger/TrigT1/TrigT1Muctpi/src/Common/NoMoreDataException.h
@@ -1,7 +1,7 @@
 // Dear emacs, this is -*- c++ -*-
 
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 // $Id: NoMoreDataException.h 362102 2011-04-28 13:17:28Z krasznaa $
diff --git a/Trigger/TrigT1/TrigT1Muctpi/src/Common/PtMultiplicitySet.cxx b/Trigger/TrigT1/TrigT1Muctpi/src/Common/PtMultiplicitySet.cxx
index c8d7b3444d7d8f334de2f6d648b51c99038a5785..e9950e17b7fcfaa44024a50e698ab2549fb8ab11 100644
--- a/Trigger/TrigT1/TrigT1Muctpi/src/Common/PtMultiplicitySet.cxx
+++ b/Trigger/TrigT1/TrigT1Muctpi/src/Common/PtMultiplicitySet.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 // $Id: PtMultiplicitySet.cxx 700318 2015-10-13 14:13:15Z wengler $
diff --git a/Trigger/TrigT1/TrigT1Muctpi/src/Common/PtMultiplicitySet.h b/Trigger/TrigT1/TrigT1Muctpi/src/Common/PtMultiplicitySet.h
index 76a9496ba3c3a2fad2139a581e71cfdec67bfda5..7967ed12667b9f7148bfe35d0eac042f09dc5111 100644
--- a/Trigger/TrigT1/TrigT1Muctpi/src/Common/PtMultiplicitySet.h
+++ b/Trigger/TrigT1/TrigT1Muctpi/src/Common/PtMultiplicitySet.h
@@ -1,7 +1,7 @@
 // Dear emacs, this is -*- c++ -*-
 
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 // $Id: PtMultiplicitySet.h 364083 2011-05-06 09:09:55Z krasznaa $
diff --git a/Trigger/TrigT1/TrigT1Muctpi/src/Common/RandomCandidateRange.cxx b/Trigger/TrigT1/TrigT1Muctpi/src/Common/RandomCandidateRange.cxx
index c456a7d7b7d7dbee21afb2d15dfe1778da23deca..242600bd9c05152561f269be6fcc2325d24da738 100644
--- a/Trigger/TrigT1/TrigT1Muctpi/src/Common/RandomCandidateRange.cxx
+++ b/Trigger/TrigT1/TrigT1Muctpi/src/Common/RandomCandidateRange.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 // $Id: RandomCandidateRange.cxx 362102 2011-04-28 13:17:28Z krasznaa $
diff --git a/Trigger/TrigT1/TrigT1Muctpi/src/Common/RandomCandidateRange.h b/Trigger/TrigT1/TrigT1Muctpi/src/Common/RandomCandidateRange.h
index 1dea1e1f9213766d34d1d7cf7c5df4c5da0d0c9c..ccd80838cecb6082207b0b34047cc8e8ad9ccb51 100644
--- a/Trigger/TrigT1/TrigT1Muctpi/src/Common/RandomCandidateRange.h
+++ b/Trigger/TrigT1/TrigT1Muctpi/src/Common/RandomCandidateRange.h
@@ -1,7 +1,7 @@
 // Dear emacs, this is -*- c++ -*-
 
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 // $Id: RandomCandidateRange.h 362102 2011-04-28 13:17:28Z krasznaa $
diff --git a/Trigger/TrigT1/TrigT1Muctpi/src/Common/SectorConstants.h b/Trigger/TrigT1/TrigT1Muctpi/src/Common/SectorConstants.h
index 4c0a2f55f09599a9d67527f36594f4793bfe139d..69ad93a2861f90c32566eeeba7410af9c8e66340 100644
--- a/Trigger/TrigT1/TrigT1Muctpi/src/Common/SectorConstants.h
+++ b/Trigger/TrigT1/TrigT1Muctpi/src/Common/SectorConstants.h
@@ -1,7 +1,7 @@
 // Dear emacs, this is -*- c++ -*-
 
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 // $Id: SectorConstants.h 362102 2011-04-28 13:17:28Z krasznaa $
diff --git a/Trigger/TrigT1/TrigT1Muctpi/src/Common/TestPatternMethods.h b/Trigger/TrigT1/TrigT1Muctpi/src/Common/TestPatternMethods.h
index 7f07924c7b07a0e16e6fff310098e1df85f5c15f..370c096b21a27542ed140566f05e1821e3ca5d41 100644
--- a/Trigger/TrigT1/TrigT1Muctpi/src/Common/TestPatternMethods.h
+++ b/Trigger/TrigT1/TrigT1Muctpi/src/Common/TestPatternMethods.h
@@ -1,7 +1,7 @@
 // Dear emacs, this is -*- c++ -*-
 
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 // $Id: TestPatternMethods.h 362102 2011-04-28 13:17:28Z krasznaa $
diff --git a/Trigger/TrigT1/TrigT1Muctpi/src/Common/Verifyer.cxx b/Trigger/TrigT1/TrigT1Muctpi/src/Common/Verifyer.cxx
index 1cdc800b3e83f671eaa6f7a69d48b38e9770b38e..bfa2f91f9f5117472a0e57d8ec8249b3a6b52f5d 100644
--- a/Trigger/TrigT1/TrigT1Muctpi/src/Common/Verifyer.cxx
+++ b/Trigger/TrigT1/TrigT1Muctpi/src/Common/Verifyer.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 // $Id: Verifyer.cxx 362102 2011-04-28 13:17:28Z krasznaa $
diff --git a/Trigger/TrigT1/TrigT1Muctpi/src/Common/Verifyer.h b/Trigger/TrigT1/TrigT1Muctpi/src/Common/Verifyer.h
index 572bf46a8a4db7365d5c8810cbdd6ee8d181cb64..bdee2657b0dada13dd19ea71a720894647b5702a 100644
--- a/Trigger/TrigT1/TrigT1Muctpi/src/Common/Verifyer.h
+++ b/Trigger/TrigT1/TrigT1Muctpi/src/Common/Verifyer.h
@@ -1,7 +1,7 @@
 // Dear emacs, this is -*- c++ -*-
 
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 // $Id: Verifyer.h 362102 2011-04-28 13:17:28Z krasznaa $
diff --git a/Trigger/TrigT1/TrigT1Muctpi/src/Logging/MsgLogger.cxx b/Trigger/TrigT1/TrigT1Muctpi/src/Logging/MsgLogger.cxx
index 38b3da39b4278c9508cf21704790abbb67ff03c4..470acc9c9308a2058c8b6dca86b468f4e2fc06ff 100644
--- a/Trigger/TrigT1/TrigT1Muctpi/src/Logging/MsgLogger.cxx
+++ b/Trigger/TrigT1/TrigT1Muctpi/src/Logging/MsgLogger.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 // $Id: MsgLogger.cxx 706709 2015-11-09 12:10:23Z wengler $
diff --git a/Trigger/TrigT1/TrigT1Muctpi/src/Logging/MsgLogger.h b/Trigger/TrigT1/TrigT1Muctpi/src/Logging/MsgLogger.h
index 8c4d7d4c9dd9605a0998657ef266a51eae67e639..14f5926ef88d6aa8137ed1d4d6b3c437a96b5bc0 100644
--- a/Trigger/TrigT1/TrigT1Muctpi/src/Logging/MsgLogger.h
+++ b/Trigger/TrigT1/TrigT1Muctpi/src/Logging/MsgLogger.h
@@ -1,7 +1,7 @@
 // Dear emacs, this is -*- c++ -*-
 
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 // $Id: MsgLogger.h 472835 2011-12-06 21:05:16Z stelzer $
diff --git a/Trigger/TrigT1/TrigT1Muctpi/src/Logging/MsgType.h b/Trigger/TrigT1/TrigT1Muctpi/src/Logging/MsgType.h
index c4ce3ca4e129f9de23a1e8f26116d3b1d2be1c1e..35d0d8944884cc21f7dddfe9fac3a9ff8a15a1f7 100644
--- a/Trigger/TrigT1/TrigT1Muctpi/src/Logging/MsgType.h
+++ b/Trigger/TrigT1/TrigT1Muctpi/src/Logging/MsgType.h
@@ -1,7 +1,7 @@
 // Dear emacs, this is -*- c++ -*-
 
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 // $Id: MsgType.h 362102 2011-04-28 13:17:28Z krasznaa $
diff --git a/Trigger/TrigT1/TrigT1Muctpi/src/Logging/MsgWriter.cxx b/Trigger/TrigT1/TrigT1Muctpi/src/Logging/MsgWriter.cxx
index b3ad8f4acadc1006105ea6b1df9d0994c68564dd..0827d4359aa94f4e16666ad504370f28908e5dd7 100644
--- a/Trigger/TrigT1/TrigT1Muctpi/src/Logging/MsgWriter.cxx
+++ b/Trigger/TrigT1/TrigT1Muctpi/src/Logging/MsgWriter.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 // $Id: MsgWriter.cxx 796122 2017-02-08 03:23:15Z ssnyder $
diff --git a/Trigger/TrigT1/TrigT1Muctpi/src/Logging/MsgWriter.h b/Trigger/TrigT1/TrigT1Muctpi/src/Logging/MsgWriter.h
index 1e57575d119105db6414e8bc3ac69dab267eab41..85633c10bd5c620d72728c313bf3deed7252d605 100644
--- a/Trigger/TrigT1/TrigT1Muctpi/src/Logging/MsgWriter.h
+++ b/Trigger/TrigT1/TrigT1Muctpi/src/Logging/MsgWriter.h
@@ -1,7 +1,7 @@
 // Dear emacs, this is -*- c++ -*-
 
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 // $Id: MsgWriter.h 472835 2011-12-06 21:05:16Z stelzer $
diff --git a/Trigger/TrigT1/TrigT1Muctpi/src/Mibak/Lvl1Mibak.cxx b/Trigger/TrigT1/TrigT1Muctpi/src/Mibak/Lvl1Mibak.cxx
index 3dff59d47ee47eab5eaa4b88744cb878c68b7dc5..c2059c03865ddc8ab10c129b268074e59689f1cd 100644
--- a/Trigger/TrigT1/TrigT1Muctpi/src/Mibak/Lvl1Mibak.cxx
+++ b/Trigger/TrigT1/TrigT1Muctpi/src/Mibak/Lvl1Mibak.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 // $Id: Lvl1Mibak.cxx 700318 2015-10-13 14:13:15Z wengler $
diff --git a/Trigger/TrigT1/TrigT1Muctpi/src/Mibak/Lvl1Mibak.h b/Trigger/TrigT1/TrigT1Muctpi/src/Mibak/Lvl1Mibak.h
index f99d0a303a4fe27187805be52c326e6fe918e40e..1d6d4e5956ae80cf63e4f407fc68c196605ec7f6 100644
--- a/Trigger/TrigT1/TrigT1Muctpi/src/Mibak/Lvl1Mibak.h
+++ b/Trigger/TrigT1/TrigT1Muctpi/src/Mibak/Lvl1Mibak.h
@@ -1,7 +1,7 @@
 // Dear emacs, this is -*- c++ -*-
 
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 // $Id: Lvl1Mibak.h 701446 2015-10-19 15:19:09Z wengler $
diff --git a/Trigger/TrigT1/TrigT1Muctpi/src/Mibak/MibakStreamEvent.cxx b/Trigger/TrigT1/TrigT1Muctpi/src/Mibak/MibakStreamEvent.cxx
index c7b03aad9c56ce1879f7f227d911144c9535f503..20b03642433d7f6b3472fa21e833f6e8ef3462bb 100644
--- a/Trigger/TrigT1/TrigT1Muctpi/src/Mibak/MibakStreamEvent.cxx
+++ b/Trigger/TrigT1/TrigT1Muctpi/src/Mibak/MibakStreamEvent.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 // $Id: MibakStreamEvent.cxx 364083 2011-05-06 09:09:55Z krasznaa $
diff --git a/Trigger/TrigT1/TrigT1Muctpi/src/Mibak/MibakStreamEvent.h b/Trigger/TrigT1/TrigT1Muctpi/src/Mibak/MibakStreamEvent.h
index 03f1e3892291dc7844fd664142df15a93917bad1..123a57d2ad967d5d6df5cd3e1fa0bc7c48ce8446 100644
--- a/Trigger/TrigT1/TrigT1Muctpi/src/Mibak/MibakStreamEvent.h
+++ b/Trigger/TrigT1/TrigT1Muctpi/src/Mibak/MibakStreamEvent.h
@@ -1,7 +1,7 @@
 // Dear emacs, this is -*- c++ -*-
 
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 // $Id: MibakStreamEvent.h 364083 2011-05-06 09:09:55Z krasznaa $
diff --git a/Trigger/TrigT1/TrigT1Muctpi/src/Mictp/MictpData.cxx b/Trigger/TrigT1/TrigT1Muctpi/src/Mictp/MictpData.cxx
index 4bc0c73fe969a380c874a78ab5d4fc090281ca52..3b0ea7e07a695eda8f15eef6fa54a6e51ab3aa1c 100644
--- a/Trigger/TrigT1/TrigT1Muctpi/src/Mictp/MictpData.cxx
+++ b/Trigger/TrigT1/TrigT1Muctpi/src/Mictp/MictpData.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 // $Id: MictpData.cxx 700318 2015-10-13 14:13:15Z wengler $
diff --git a/Trigger/TrigT1/TrigT1Muctpi/src/Mictp/MictpData.h b/Trigger/TrigT1/TrigT1Muctpi/src/Mictp/MictpData.h
index a7b8a893c706c413e798cb155d5d7773050aa1c5..33226b261796e6c8d9843141b76f52df4312e583 100644
--- a/Trigger/TrigT1/TrigT1Muctpi/src/Mictp/MictpData.h
+++ b/Trigger/TrigT1/TrigT1Muctpi/src/Mictp/MictpData.h
@@ -1,7 +1,7 @@
 // Dear emacs, this is -*- c++ -*-
 
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 // $Id: MictpData.h 362102 2011-04-28 13:17:28Z krasznaa $
diff --git a/Trigger/TrigT1/TrigT1Muctpi/src/Mictp/MictpModule.cxx b/Trigger/TrigT1/TrigT1Muctpi/src/Mictp/MictpModule.cxx
index 3f8ef563af6f8640d707f7025f28ef26fcc76bd8..72e02e14c35e165957b16a0dcc4e5f43c40f1eca 100644
--- a/Trigger/TrigT1/TrigT1Muctpi/src/Mictp/MictpModule.cxx
+++ b/Trigger/TrigT1/TrigT1Muctpi/src/Mictp/MictpModule.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 // $Id: MictpModule.cxx 700318 2015-10-13 14:13:15Z wengler $
diff --git a/Trigger/TrigT1/TrigT1Muctpi/src/Mictp/MictpModule.h b/Trigger/TrigT1/TrigT1Muctpi/src/Mictp/MictpModule.h
index c62d75bf0a2a2d2b170e53fed76d50f154795873..714c155411637a61b2e7d0decd50ced988c82b67 100644
--- a/Trigger/TrigT1/TrigT1Muctpi/src/Mictp/MictpModule.h
+++ b/Trigger/TrigT1/TrigT1Muctpi/src/Mictp/MictpModule.h
@@ -1,7 +1,7 @@
 // Dear emacs, this is -*- c++ -*-
 
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 // $Id: MictpModule.h 364083 2011-05-06 09:09:55Z krasznaa $
diff --git a/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/BarrelSector.cxx b/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/BarrelSector.cxx
index ddcd064b674012a0352181b9a9024a13584127c3..bd768d4f021f690e3466914e63df645b9a786fdb 100644
--- a/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/BarrelSector.cxx
+++ b/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/BarrelSector.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 // $Id: BarrelSector.cxx 700318 2015-10-13 14:13:15Z wengler $
diff --git a/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/BarrelSector.h b/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/BarrelSector.h
index f77cd9d756c7dc3031bd1670bc3de2e9ef01077b..0c4cc483361f4a906c99fb9bbf33d666732d78f5 100644
--- a/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/BarrelSector.h
+++ b/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/BarrelSector.h
@@ -1,7 +1,7 @@
 // Dear emacs, this is -*- c++ -*-
 
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 // $Id: BarrelSector.h 701446 2015-10-19 15:19:09Z wengler $
diff --git a/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/EndcapSector.cxx b/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/EndcapSector.cxx
index 0305eb599fc1eacfff0204c08d1b53c4d27cf409..67a213fbc70ed393048033368cfba0fdf79c837b 100644
--- a/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/EndcapSector.cxx
+++ b/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/EndcapSector.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 // $Id: EndcapSector.cxx 700318 2015-10-13 14:13:15Z wengler $
diff --git a/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/EndcapSector.h b/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/EndcapSector.h
index caf1000628ed1e78806b213c98d846c7515661ee..ab132a812f9ace72748c8352056f5c7dfcba2ad4 100644
--- a/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/EndcapSector.h
+++ b/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/EndcapSector.h
@@ -1,7 +1,7 @@
 // Dear emacs, this is -*- c++ -*-
 
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 // $Id: EndcapSector.h 701446 2015-10-19 15:19:09Z wengler $
diff --git a/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/EventReader.cxx b/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/EventReader.cxx
index 044eaa34fc6139b82277639b34775993138bc706..e1150cae32b80f3c9ca9b7ad9e423d2fc0c1734f 100644
--- a/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/EventReader.cxx
+++ b/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/EventReader.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 // $Id: EventReader.cxx 364083 2011-05-06 09:09:55Z krasznaa $
diff --git a/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/EventReader.h b/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/EventReader.h
index 12d302502f60acd20fa72e0a25e033e56d3eeff9..d658c26cda75162745bc941440a49b396b49b42c 100644
--- a/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/EventReader.h
+++ b/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/EventReader.h
@@ -1,7 +1,7 @@
 // Dear emacs, this is -*- c++ -*-
 
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 // $Id: EventReader.h 364083 2011-05-06 09:09:55Z krasznaa $
diff --git a/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/EventReaderFactory.cxx b/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/EventReaderFactory.cxx
index 30397b09b3390a66469c8d93a14321e468072265..266bfc1602b040b8f5531593314e593e822b2500 100644
--- a/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/EventReaderFactory.cxx
+++ b/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/EventReaderFactory.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 // $Id: EventReaderFactory.cxx 472835 2011-12-06 21:05:16Z stelzer $
diff --git a/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/EventReaderFactory.h b/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/EventReaderFactory.h
index c95f697c530d58c5ce9a12a6e4501c8bade35db4..3d3ee2c3f4e9b0315c9e42b4ffc8200f20627e87 100644
--- a/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/EventReaderFactory.h
+++ b/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/EventReaderFactory.h
@@ -1,7 +1,7 @@
 // Dear emacs, this is -*- c++ -*-
 
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 // $Id: EventReaderFactory.h 364083 2011-05-06 09:09:55Z krasznaa $
diff --git a/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/EventSource.h b/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/EventSource.h
index 90b4a53d0daae1ea8e58332e632f032c07da034f..f85f383a9d70bd6fc982cd135a86d42a629454cb 100644
--- a/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/EventSource.h
+++ b/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/EventSource.h
@@ -1,7 +1,7 @@
 // Dear emacs, this is -*- c++ -*-
 
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 // $Id: EventSource.h 364083 2011-05-06 09:09:55Z krasznaa $
diff --git a/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/ExclusiveMultStrategy.cxx b/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/ExclusiveMultStrategy.cxx
index 8891431c41eeab19b957b94dc38eeda27fb3eda7..59c06a3ac6f7f61e9768919a6d792cbff76fdadb 100644
--- a/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/ExclusiveMultStrategy.cxx
+++ b/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/ExclusiveMultStrategy.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 // $Id: ExclusiveMultStrategy.cxx 362102 2011-04-28 13:17:28Z krasznaa $
diff --git a/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/ExclusiveMultStrategy.h b/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/ExclusiveMultStrategy.h
index b724bd17494d098433466d6aa31e9ddec49dd41e..0e4121cc6774f86238ecbb1ee54b40e588022c46 100644
--- a/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/ExclusiveMultStrategy.h
+++ b/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/ExclusiveMultStrategy.h
@@ -1,7 +1,7 @@
 // Dear emacs, this is -*- c++ -*-
 
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 // $Id: ExclusiveMultStrategy.h 362102 2011-04-28 13:17:28Z krasznaa $
diff --git a/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/ForwardSector.cxx b/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/ForwardSector.cxx
index 7d6eba03a30d79ce257a6da642a93da296f638ea..46212e6d72b75fb0e18134983e03d7409777d7da 100644
--- a/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/ForwardSector.cxx
+++ b/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/ForwardSector.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 // $Id: ForwardSector.cxx 700318 2015-10-13 14:13:15Z wengler $
diff --git a/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/ForwardSector.h b/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/ForwardSector.h
index 0557028f5794a9165e7bc921a1b0d99b575bca69..9b207807a667eaf64602a5c69fb362e30f41d7e2 100644
--- a/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/ForwardSector.h
+++ b/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/ForwardSector.h
@@ -1,7 +1,7 @@
 // Dear emacs, this is -*- c++ -*-
 
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 // $Id: ForwardSector.h 701446 2015-10-19 15:19:09Z wengler $
diff --git a/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/InclusiveMultStrategy.cxx b/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/InclusiveMultStrategy.cxx
index 76d268578ba3988f15b8e119ba8df40b471c2854..7ec0237d80d6d32cddf06fc5bfb00cd5a0bc2bac 100644
--- a/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/InclusiveMultStrategy.cxx
+++ b/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/InclusiveMultStrategy.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 // $Id: InclusiveMultStrategy.cxx 362102 2011-04-28 13:17:28Z krasznaa $
diff --git a/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/InclusiveMultStrategy.h b/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/InclusiveMultStrategy.h
index 9527b0dfaa69f7bbc281178536d112f4b9f660c5..03af50641a5925987d821654109104d3460bbd93 100644
--- a/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/InclusiveMultStrategy.h
+++ b/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/InclusiveMultStrategy.h
@@ -1,7 +1,7 @@
 // Dear emacs, this is -*- c++ -*-
 
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 // $Id: InclusiveMultStrategy.h 362102 2011-04-28 13:17:28Z krasznaa $
diff --git a/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/LUTBBOverlapCalculator.cxx b/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/LUTBBOverlapCalculator.cxx
index 2d0771e015cedb667f26f4abd12b638ade50b658..842763a65db7e6eab090015eb24e5d4370ed1e8b 100644
--- a/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/LUTBBOverlapCalculator.cxx
+++ b/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/LUTBBOverlapCalculator.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 // $Id: LUTBBOverlapCalculator.cxx 650693 2015-03-01 16:53:48Z masato $
diff --git a/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/LUTBBOverlapCalculator.h b/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/LUTBBOverlapCalculator.h
index 9030b9a24a8d413c5df7727048624c0f505e5e50..3e715c5c890ff02fafbce45d092280213159b41e 100644
--- a/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/LUTBBOverlapCalculator.h
+++ b/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/LUTBBOverlapCalculator.h
@@ -1,7 +1,7 @@
 // Dear emacs, this is -*- c++ -*-
 
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 // $Id: LUTBBOverlapCalculator.h 701446 2015-10-19 15:19:09Z wengler $
diff --git a/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/LUTBEOverlapCalculator.cxx b/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/LUTBEOverlapCalculator.cxx
index af3bc64f1de0104230fa430962443e2bf4100159..be79f6bd3a88dd094bd4269647112f722ad7d3b6 100644
--- a/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/LUTBEOverlapCalculator.cxx
+++ b/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/LUTBEOverlapCalculator.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 // $Id: LUTBEOverlapCalculator.cxx 650693 2015-03-01 16:53:48Z masato $
diff --git a/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/LUTBEOverlapCalculator.h b/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/LUTBEOverlapCalculator.h
index 12cb614d106cc1c323f66063bfeb4daa1b4b4529..bbdabbf29c03eec2c72a0652d5331b6411bdf550 100644
--- a/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/LUTBEOverlapCalculator.h
+++ b/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/LUTBEOverlapCalculator.h
@@ -1,7 +1,7 @@
 // Dear emacs, this is -*- c++ -*-
 
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 // $Id: LUTBEOverlapCalculator.h 701446 2015-10-19 15:19:09Z wengler $
diff --git a/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/LUTEEOverlapCalculator.cxx b/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/LUTEEOverlapCalculator.cxx
index 9cb3bb3511d14fe2e4e759608b7eec5078ac9b27..812c668ee60a2e352913b3c8cbace372d0942f99 100644
--- a/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/LUTEEOverlapCalculator.cxx
+++ b/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/LUTEEOverlapCalculator.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 // $Id: LUTEEOverlapCalculator.cxx 650693 2015-03-01 16:53:48Z masato $
diff --git a/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/LUTEEOverlapCalculator.h b/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/LUTEEOverlapCalculator.h
index b6d78de022ac704fefffe4663bf1dc442ce9d7a4..246c7dc7961879837897c011d6d77929cfb3085a 100644
--- a/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/LUTEEOverlapCalculator.h
+++ b/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/LUTEEOverlapCalculator.h
@@ -1,7 +1,7 @@
 // Dear emacs, this is -*- c++ -*-
 
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 // $Id: LUTEEOverlapCalculator.h 701446 2015-10-19 15:19:09Z wengler $
diff --git a/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/LUTEFOverlapCalculator.cxx b/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/LUTEFOverlapCalculator.cxx
index e2b5fccf8fb0731f335d51317c862c3afcb325a8..66a40c20b4d1147709ac619776417d962cecb3ee 100644
--- a/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/LUTEFOverlapCalculator.cxx
+++ b/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/LUTEFOverlapCalculator.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 // $Id: LUTEFOverlapCalculator.cxx 650693 2015-03-01 16:53:48Z masato $
diff --git a/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/LUTEFOverlapCalculator.h b/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/LUTEFOverlapCalculator.h
index bbcd1efeaf0b0054c16a38e18da8f7b8db8bc4d4..20fee67d586458c058a4b3677070a62d212f0ec3 100644
--- a/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/LUTEFOverlapCalculator.h
+++ b/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/LUTEFOverlapCalculator.h
@@ -1,7 +1,7 @@
 // Dear emacs, this is -*- c++ -*-
 
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 // $Id: LUTEFOverlapCalculator.h 701446 2015-10-19 15:19:09Z wengler $
diff --git a/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/LUTFFOverlapCalculator.cxx b/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/LUTFFOverlapCalculator.cxx
index d34b3d86981b9fb7dfd3fc43b4cb89ef3f0f5184..049f710c0f42c658067d49710dc066f058c9e51a 100644
--- a/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/LUTFFOverlapCalculator.cxx
+++ b/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/LUTFFOverlapCalculator.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 // $Id: LUTFFOverlapCalculator.cxx 650693 2015-03-01 16:53:48Z masato $
diff --git a/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/LUTFFOverlapCalculator.h b/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/LUTFFOverlapCalculator.h
index 68ac208b5b427b536b2c73edaa2cda1ae20b1138..e7a4f4730a5b3b509aaa8db557cf4a060f0f8ee3 100644
--- a/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/LUTFFOverlapCalculator.h
+++ b/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/LUTFFOverlapCalculator.h
@@ -1,7 +1,7 @@
 // Dear emacs, this is -*- c++ -*-
 
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 // $Id: LUTFFOverlapCalculator.h 701446 2015-10-19 15:19:09Z wengler $
diff --git a/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/LUTMultiplicityCalculator.cxx b/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/LUTMultiplicityCalculator.cxx
index abdb2edbb6fa938cdbeb75b48b581744f6db1df4..52ea42ae88dc42124f633871a58040d22d76755d 100644
--- a/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/LUTMultiplicityCalculator.cxx
+++ b/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/LUTMultiplicityCalculator.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 // $Id: LUTMultiplicityCalculator.cxx 650693 2015-03-01 16:53:48Z masato $
diff --git a/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/LUTMultiplicityCalculator.h b/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/LUTMultiplicityCalculator.h
index 23d847cfebf3380ce291dbdff0763eba74bf8a80..7a2b6cb84aa98b8ee7527f500f2e152433add44a 100644
--- a/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/LUTMultiplicityCalculator.h
+++ b/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/LUTMultiplicityCalculator.h
@@ -1,7 +1,7 @@
 // Dear emacs, this is -*- c++ -*-
 
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 // $Id: LUTMultiplicityCalculator.h 701446 2015-10-19 15:19:09Z wengler $
diff --git a/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/LUTOverlapCalculatorBase.cxx b/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/LUTOverlapCalculatorBase.cxx
index 9f6d22922f343c1511c74c118b6e6a779fef266f..a5bdad7bf840c3d49777771e981526c2a04a7c99 100644
--- a/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/LUTOverlapCalculatorBase.cxx
+++ b/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/LUTOverlapCalculatorBase.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 // $Id: LUTOverlapCalculatorBase.cxx 448474 2011-07-13 09:01:48Z krasznaa $
diff --git a/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/LUTOverlapCalculatorBase.h b/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/LUTOverlapCalculatorBase.h
index f9614592e413f062d6c32bbd7763b8cb0dfc78a8..79b659be4733be8caacba68977bea0a08c0a1b92 100644
--- a/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/LUTOverlapCalculatorBase.h
+++ b/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/LUTOverlapCalculatorBase.h
@@ -1,7 +1,7 @@
 // Dear emacs, this is -*- c++ -*-
 
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 // $Id: LUTOverlapCalculatorBase.h 707664 2015-11-13 05:36:00Z ssnyder $
diff --git a/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/LUTStrategy.cxx b/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/LUTStrategy.cxx
index 0c50af3351c2bb927ca917954bfd6a0f8cb33ee4..d46b6b9d1d8b0fafab9a2984c7307048f75313d3 100644
--- a/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/LUTStrategy.cxx
+++ b/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/LUTStrategy.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 // $Id: LUTStrategy.cxx 650693 2015-03-01 16:53:48Z masato $
diff --git a/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/LUTStrategy.h b/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/LUTStrategy.h
index b7860b90dc3686b59aa42b1cfb57cbc3180388b9..fa7a79800e0b9ab73f942069e546d98d443a267c 100644
--- a/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/LUTStrategy.h
+++ b/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/LUTStrategy.h
@@ -1,7 +1,7 @@
 // Dear emacs, this is -*- c++ -*-
 
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 // $Id: LUTStrategy.h 701446 2015-10-19 15:19:09Z wengler $
diff --git a/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/MioctData.cxx b/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/MioctData.cxx
index b91ee0986ce170714a15500d426c7b3159ba9fd3..9cc79f67890b2cfc67ac53c427f09440fa7da1d2 100644
--- a/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/MioctData.cxx
+++ b/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/MioctData.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 // $Id: MioctData.cxx 439423 2011-05-25 21:22:40Z krasznaa $
diff --git a/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/MioctData.h b/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/MioctData.h
index 26e24b65d406b18218d72728934673f26d41da29..d015b7f930ce7c8c9a2e553cbeeb4bb7e5499844 100644
--- a/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/MioctData.h
+++ b/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/MioctData.h
@@ -1,7 +1,7 @@
 // Dear emacs, this is -*- c++ -*-
 
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 // $Id: MioctData.h 439303 2011-05-25 15:20:17Z krasznaa $
diff --git a/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/MioctID.cxx b/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/MioctID.cxx
index a8ca59b6aee63d6e0b191bd6f7e8fb924b8bba6b..cef6e357d8024b7f2c0a89c2c7a1267e93a49024 100644
--- a/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/MioctID.cxx
+++ b/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/MioctID.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 // $Id: MioctID.cxx 364083 2011-05-06 09:09:55Z krasznaa $
diff --git a/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/MioctID.h b/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/MioctID.h
index c749de176b46c8220c8086db777035abf3764558..59352fb23fcc31673dcc8417bf261db6e8241fe7 100644
--- a/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/MioctID.h
+++ b/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/MioctID.h
@@ -1,7 +1,7 @@
 // Dear emacs, this is -*- c++ -*-
 
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 // $Id: MioctID.h 364083 2011-05-06 09:09:55Z krasznaa $
diff --git a/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/MioctModule.cxx b/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/MioctModule.cxx
index ce3f86b9b22b29f6b81eea221b745d532213bac7..5d3590dd0dfe29811f22727b8ac597f7720942f1 100644
--- a/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/MioctModule.cxx
+++ b/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/MioctModule.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 // $Id: MioctModule.cxx 795106 2017-02-02 11:21:27Z wengler $
diff --git a/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/MioctModule.h b/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/MioctModule.h
index 90c75fdc16df7be941a51da27aef29db51ce04de..ae5eb2f4de4a09365e64b284b814f12808ed60e1 100644
--- a/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/MioctModule.h
+++ b/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/MioctModule.h
@@ -1,7 +1,7 @@
 // Dear emacs, this is -*- c++ -*-
 
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 // $Id: MioctModule.h 678659 2015-06-26 14:54:31Z wengler $
diff --git a/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/MioctSectorSet.cxx b/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/MioctSectorSet.cxx
index 0934932384f744acdd1aa63852591b2fc5bc7cf5..cbb00ae5840cb4790074d46ea6b165b5a8d7d520 100644
--- a/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/MioctSectorSet.cxx
+++ b/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/MioctSectorSet.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 // $Id: MioctSectorSet.cxx 472835 2011-12-06 21:05:16Z stelzer $
diff --git a/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/MioctSectorSet.h b/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/MioctSectorSet.h
index bbc64a9eb7783e53b9c22a1b9d7b9cc2e69ad1d4..023b9863d7beea12483ad5031eaf2c4ee2ca6463 100644
--- a/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/MioctSectorSet.h
+++ b/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/MioctSectorSet.h
@@ -1,7 +1,7 @@
 // Dear emacs, this is -*- c++ -*-
 
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 // $Id: MioctSectorSet.h 701446 2015-10-19 15:19:09Z wengler $
diff --git a/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/MultiplicityLogic.cxx b/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/MultiplicityLogic.cxx
index 99df692531237c0b2415ff7a9bfc5f1a0b56639d..a1a752f6a4455ee754ad17fe2111ec34c57bf093 100644
--- a/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/MultiplicityLogic.cxx
+++ b/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/MultiplicityLogic.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 // $Id: MultiplicityLogic.cxx 472835 2011-12-06 21:05:16Z stelzer $
diff --git a/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/MultiplicityLogic.h b/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/MultiplicityLogic.h
index 104f5924137b92c4b6f9dcdc104696caa6b14b0b..a24172b8ca78907b28736fd10a177c3137a29bea 100644
--- a/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/MultiplicityLogic.h
+++ b/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/MultiplicityLogic.h
@@ -1,7 +1,7 @@
 // Dear emacs, this is -*- c++ -*-
 
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 // $Id: MultiplicityLogic.h 362102 2011-04-28 13:17:28Z krasznaa $
diff --git a/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/MultiplicityStrategy.h b/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/MultiplicityStrategy.h
index 1fe5c8bd3ac6c2872fddf8fb0c4c06097c13dae9..47156b1fff56979cb205dc0673e25ded63a3c548 100644
--- a/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/MultiplicityStrategy.h
+++ b/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/MultiplicityStrategy.h
@@ -1,7 +1,7 @@
 // Dear emacs, this is -*- c++ -*-
 
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 // $Id: MultiplicityStrategy.h 362102 2011-04-28 13:17:28Z krasznaa $
diff --git a/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/NullStrategy.cxx b/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/NullStrategy.cxx
index 9dc8d55047175bfa9274536fa9eef6a705e3e7da..ada773cdcb3d95a47dc1dfa778b8031fd46d6d25 100644
--- a/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/NullStrategy.cxx
+++ b/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/NullStrategy.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 // $Id: NullStrategy.cxx 362102 2011-04-28 13:17:28Z krasznaa $
diff --git a/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/NullStrategy.h b/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/NullStrategy.h
index 416f907af3f8812b81c54316e6cc62a95f003415..d65dc42492dd80b8abfce2f335d8cdccac88e102 100644
--- a/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/NullStrategy.h
+++ b/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/NullStrategy.h
@@ -1,7 +1,7 @@
 // Dear emacs, this is -*- c++ -*-
 
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 // $Id: NullStrategy.h 362102 2011-04-28 13:17:28Z krasznaa $
diff --git a/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/OverlapLogic.cxx b/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/OverlapLogic.cxx
index 02daebc85942b99d3c99deb2cea3a95ce20ce005..883915efe79536fd3edc7859edec799bdf852825 100644
--- a/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/OverlapLogic.cxx
+++ b/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/OverlapLogic.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 // $Id: OverlapLogic.cxx 650693 2015-03-01 16:53:48Z masato $
diff --git a/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/OverlapLogic.h b/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/OverlapLogic.h
index 2eeb3cbc7f85d493de6e5c042013034f4eb7c4cb..a3dbdb4649d6b188fa560e7c5ab24a8ed1a72a39 100644
--- a/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/OverlapLogic.h
+++ b/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/OverlapLogic.h
@@ -1,7 +1,7 @@
 // Dear emacs, this is -*- c++ -*-
 
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 // $Id: OverlapLogic.h 650693 2015-03-01 16:53:48Z masato $
diff --git a/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/OverlapStrategy.cxx b/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/OverlapStrategy.cxx
index 2f33fb84862562537c356a05b14fb9ca7ffc4033..8004f54e887bc12f15ef5a471c30d28c75751091 100644
--- a/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/OverlapStrategy.cxx
+++ b/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/OverlapStrategy.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 // $Id: OverlapStrategy.cxx 362102 2011-04-28 13:17:28Z krasznaa $
diff --git a/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/OverlapStrategy.h b/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/OverlapStrategy.h
index aacdbc7a87a27c993be3e5159b438df46fc716d0..f446acce491f0ff17406ba74f0abd8dafa25cb9a 100644
--- a/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/OverlapStrategy.h
+++ b/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/OverlapStrategy.h
@@ -1,7 +1,7 @@
 // Dear emacs, this is -*- c++ -*-
 
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 // $Id: OverlapStrategy.h 362102 2011-04-28 13:17:28Z krasznaa $
diff --git a/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/Sector.cxx b/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/Sector.cxx
index dca670700a141271c86dd9e2cf5b327e02e61b9f..83faf51fbf07be143931dfafbf098ce483d63216 100644
--- a/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/Sector.cxx
+++ b/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/Sector.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 // $Id: Sector.cxx 796872 2017-02-13 15:03:25Z fwinkl $
diff --git a/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/Sector.h b/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/Sector.h
index cb05918d0adebaed1046e618bc2bc12c0bc63df4..abd95b4c0abf58465d8cd0c5c00449b74e929cd7 100644
--- a/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/Sector.h
+++ b/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/Sector.h
@@ -1,7 +1,7 @@
 // Dear emacs, this is -*- c++ -*-
 
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 // $Id: Sector.h 796872 2017-02-13 15:03:25Z fwinkl $
diff --git a/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/SectorID.cxx b/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/SectorID.cxx
index 0603ad537adfe5ba638b32f4557794c2e1ca8d32..1ee2c6bccfe84d8ccdb99c1de77b7dd5e60f2af4 100644
--- a/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/SectorID.cxx
+++ b/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/SectorID.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 // $Id: SectorID.cxx 700318 2015-10-13 14:13:15Z wengler $
diff --git a/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/SectorID.h b/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/SectorID.h
index baef5bd58334286f1976e99ab3c3092c2b7e52ae..73cffda6d822b124b9ad7a1dea33a13b48538750 100644
--- a/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/SectorID.h
+++ b/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/SectorID.h
@@ -1,7 +1,7 @@
 // Dear emacs, this is -*- c++ -*-
 
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 // $Id: SectorID.h 362102 2011-04-28 13:17:28Z krasznaa $
diff --git a/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/SectorLogicReader.cxx b/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/SectorLogicReader.cxx
index ae53bc59becdabe97f11d488a5fd5cfbea660d10..333d333786c579c27d9686406c7f85bf6bd4d373 100644
--- a/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/SectorLogicReader.cxx
+++ b/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/SectorLogicReader.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 // $Id: SectorLogicReader.cxx 364083 2011-05-06 09:09:55Z krasznaa $
diff --git a/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/SectorLogicReader.h b/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/SectorLogicReader.h
index 884b72f50e6ba98122e6951a80063c0bf6f39045..1acae7ddd71700fe63bde12be7dfee1999556225 100644
--- a/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/SectorLogicReader.h
+++ b/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/SectorLogicReader.h
@@ -1,7 +1,7 @@
 // Dear emacs, this is -*- c++ -*-
 
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 // $Id: SectorLogicReader.h 364083 2011-05-06 09:09:55Z krasznaa $
diff --git a/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/SectorLogicSource.cxx b/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/SectorLogicSource.cxx
index a86b5565d433612af86a231e6d092cad55d2fa46..239159444577101c348c62c2927b49739e6c8ad0 100644
--- a/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/SectorLogicSource.cxx
+++ b/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/SectorLogicSource.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 // $Id: SectorLogicSource.cxx 700318 2015-10-13 14:13:15Z wengler $
diff --git a/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/SectorLogicSource.h b/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/SectorLogicSource.h
index defdfa4e229da628157ec3184ba0f78ca030e073..dc471a399a05722a780b210aa88ef045a3ba1e3e 100644
--- a/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/SectorLogicSource.h
+++ b/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/SectorLogicSource.h
@@ -1,7 +1,7 @@
 // Dear emacs, this is -*- c++ -*-
 
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 // $Id: SectorLogicSource.h 681356 2015-07-08 12:17:52Z wengler $
diff --git a/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/StrategyName.h b/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/StrategyName.h
index b89a03b0cd8abbc65e5fc48fa35994b14f43ab28..1ed3d56804a9680daec33500e9a3a7329ea44423 100644
--- a/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/StrategyName.h
+++ b/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/StrategyName.h
@@ -1,7 +1,7 @@
 // Dear emacs, this is -*- c++ -*-
 
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 // $Id: StrategyName.h 362102 2011-04-28 13:17:28Z krasznaa $
diff --git a/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/XMLMultCalculator.cxx b/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/XMLMultCalculator.cxx
index e4bcfca80d6887a003ed02231cabfb37970aac5e..d44416c6952753d64678ec8f892397a09006772f 100644
--- a/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/XMLMultCalculator.cxx
+++ b/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/XMLMultCalculator.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 // $Id: XMLMultCalculator.cxx 362102 2011-04-28 13:17:28Z krasznaa $
diff --git a/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/XMLMultCalculator.h b/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/XMLMultCalculator.h
index 79910a9840670906109b84e06c02e4e30c60b6a1..4ee974ae1430427071779131188763f81a7787c7 100644
--- a/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/XMLMultCalculator.h
+++ b/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/XMLMultCalculator.h
@@ -1,7 +1,7 @@
 // Dear emacs, this is -*- c++ -*-
 
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 // $Id: XMLMultCalculator.h 701446 2015-10-19 15:19:09Z wengler $
diff --git a/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/XMLMultStrategy.cxx b/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/XMLMultStrategy.cxx
index 34badc822071f99565d5bfc904c824354fe60e9d..c2f614c3f33826fdfe11f6653db6a7ecf08df9fa 100644
--- a/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/XMLMultStrategy.cxx
+++ b/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/XMLMultStrategy.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 // $Id: XMLMultStrategy.cxx 472835 2011-12-06 21:05:16Z stelzer $
diff --git a/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/XMLMultStrategy.h b/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/XMLMultStrategy.h
index a7450ec0da2b9f1b1801e665cc58e0fb98ba1a46..1284cfbd411ea6c24fdd70d4f0184913470a060a 100644
--- a/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/XMLMultStrategy.h
+++ b/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/XMLMultStrategy.h
@@ -1,7 +1,7 @@
 // Dear emacs, this is -*- c++ -*-
 
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 // $Id: XMLMultStrategy.h 701446 2015-10-19 15:19:09Z wengler $
diff --git a/Trigger/TrigT1/TrigT1Muctpi/src/Mirod/MirodDaqProcessor.cxx b/Trigger/TrigT1/TrigT1Muctpi/src/Mirod/MirodDaqProcessor.cxx
index 72499786f51838289fbc0c143c90b98073120b34..8bc254c0deca006d588fd1d410191e14a324e854 100644
--- a/Trigger/TrigT1/TrigT1Muctpi/src/Mirod/MirodDaqProcessor.cxx
+++ b/Trigger/TrigT1/TrigT1Muctpi/src/Mirod/MirodDaqProcessor.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 // $Id: MirodDaqProcessor.cxx 624535 2014-10-28 10:02:49Z stelzer $
diff --git a/Trigger/TrigT1/TrigT1Muctpi/src/Mirod/MirodDaqProcessor.h b/Trigger/TrigT1/TrigT1Muctpi/src/Mirod/MirodDaqProcessor.h
index b59054c82aa9693dde8485350d81339dc65125fa..f37a76da1f7afa6c8b986803d31ef1b45ff560ff 100644
--- a/Trigger/TrigT1/TrigT1Muctpi/src/Mirod/MirodDaqProcessor.h
+++ b/Trigger/TrigT1/TrigT1Muctpi/src/Mirod/MirodDaqProcessor.h
@@ -1,7 +1,7 @@
 // Dear emacs, this is -*- c++ -*-
 
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 // $Id: MirodDaqProcessor.h 439423 2011-05-25 21:22:40Z krasznaa $
diff --git a/Trigger/TrigT1/TrigT1Muctpi/src/Mirod/MirodEventReader.cxx b/Trigger/TrigT1/TrigT1Muctpi/src/Mirod/MirodEventReader.cxx
index 78ad2f876119a5796ada66c546edfbd079d9ea7f..6763f5c3a9e98c6e930ee682291041fd756560e7 100644
--- a/Trigger/TrigT1/TrigT1Muctpi/src/Mirod/MirodEventReader.cxx
+++ b/Trigger/TrigT1/TrigT1Muctpi/src/Mirod/MirodEventReader.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 // $Id: MirodEventReader.cxx 441850 2011-06-06 14:50:52Z krasznaa $
diff --git a/Trigger/TrigT1/TrigT1Muctpi/src/Mirod/MirodEventReader.h b/Trigger/TrigT1/TrigT1Muctpi/src/Mirod/MirodEventReader.h
index 137ac313ec109a0fefa1554341e4f49eb6a265ed..660ba10410f854ce6ef2a3e90f7681f2337b4404 100644
--- a/Trigger/TrigT1/TrigT1Muctpi/src/Mirod/MirodEventReader.h
+++ b/Trigger/TrigT1/TrigT1Muctpi/src/Mirod/MirodEventReader.h
@@ -1,7 +1,7 @@
 // Dear emacs, this is -*- c++ -*-
 
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 // $Id: MirodEventReader.h 439423 2011-05-25 21:22:40Z krasznaa $
diff --git a/Trigger/TrigT1/TrigT1Muctpi/src/Mirod/MirodExtractor.cxx b/Trigger/TrigT1/TrigT1Muctpi/src/Mirod/MirodExtractor.cxx
index a8bc3483ca43e0e120fc72e3029cbdb4888a0592..9ff8d9fafdfbbbbb775262d79fde74549e85abfa 100644
--- a/Trigger/TrigT1/TrigT1Muctpi/src/Mirod/MirodExtractor.cxx
+++ b/Trigger/TrigT1/TrigT1Muctpi/src/Mirod/MirodExtractor.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 // $Id: MirodExtractor.cxx 441850 2011-06-06 14:50:52Z krasznaa $
diff --git a/Trigger/TrigT1/TrigT1Muctpi/src/Mirod/MirodExtractor.h b/Trigger/TrigT1/TrigT1Muctpi/src/Mirod/MirodExtractor.h
index ef5bb0c521cbc1547be6c34c6d93a23d33858820..c41c426852751008c21f7b6441796b0b09864b3f 100644
--- a/Trigger/TrigT1/TrigT1Muctpi/src/Mirod/MirodExtractor.h
+++ b/Trigger/TrigT1/TrigT1Muctpi/src/Mirod/MirodExtractor.h
@@ -1,7 +1,7 @@
 // Dear emacs, this is -*- c++ -*-
 
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 // $Id: MirodExtractor.h 439423 2011-05-25 21:22:40Z krasznaa $
diff --git a/Trigger/TrigT1/TrigT1Muctpi/src/Mirod/MirodFiFoContent.cxx b/Trigger/TrigT1/TrigT1Muctpi/src/Mirod/MirodFiFoContent.cxx
index d285d620effd9b5d69228837f580d40f4e021339..fecfe4c031f905e59350f3951e4dfba19bde2e13 100644
--- a/Trigger/TrigT1/TrigT1Muctpi/src/Mirod/MirodFiFoContent.cxx
+++ b/Trigger/TrigT1/TrigT1Muctpi/src/Mirod/MirodFiFoContent.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 // $Id: MirodFiFoContent.cxx 362102 2011-04-28 13:17:28Z krasznaa $
diff --git a/Trigger/TrigT1/TrigT1Muctpi/src/Mirod/MirodFiFoContent.h b/Trigger/TrigT1/TrigT1Muctpi/src/Mirod/MirodFiFoContent.h
index d6c0d235a025c287caaf4ca084af49c05dd6dde8..67ebafeeeeddb0afb99cd94550e0a77f0abf2be3 100644
--- a/Trigger/TrigT1/TrigT1Muctpi/src/Mirod/MirodFiFoContent.h
+++ b/Trigger/TrigT1/TrigT1Muctpi/src/Mirod/MirodFiFoContent.h
@@ -1,7 +1,7 @@
 // Dear emacs, this is -*- c++ -*-
 
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 // $Id: MirodFiFoContent.h 362102 2011-04-28 13:17:28Z krasznaa $
diff --git a/Trigger/TrigT1/TrigT1Muctpi/src/Mirod/MirodLvl2Processor.cxx b/Trigger/TrigT1/TrigT1Muctpi/src/Mirod/MirodLvl2Processor.cxx
index 1c46d04f25b3b853e29d70b61de8913a404a5cdc..83c10c92ea5cac37bd182c707b60b4c1de80e99f 100644
--- a/Trigger/TrigT1/TrigT1Muctpi/src/Mirod/MirodLvl2Processor.cxx
+++ b/Trigger/TrigT1/TrigT1Muctpi/src/Mirod/MirodLvl2Processor.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 // $Id: MirodLvl2Processor.cxx 726107 2016-02-25 11:04:42Z wengler $
diff --git a/Trigger/TrigT1/TrigT1Muctpi/src/Mirod/MirodLvl2Processor.h b/Trigger/TrigT1/TrigT1Muctpi/src/Mirod/MirodLvl2Processor.h
index b300715ce30df1a83838f8de364a31fee1c9501e..b1ac367d6b2e223343268a2aa9ed24e7483376d8 100644
--- a/Trigger/TrigT1/TrigT1Muctpi/src/Mirod/MirodLvl2Processor.h
+++ b/Trigger/TrigT1/TrigT1Muctpi/src/Mirod/MirodLvl2Processor.h
@@ -1,7 +1,7 @@
 // Dear emacs, this is -*- c++ -*-
 
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 // $Id: MirodLvl2Processor.h 726107 2016-02-25 11:04:42Z wengler $
diff --git a/Trigger/TrigT1/TrigT1Muctpi/src/Mirod/MirodModule.cxx b/Trigger/TrigT1/TrigT1Muctpi/src/Mirod/MirodModule.cxx
index 484be28ee76981058bc78ad2631300bdeda829bb..d057a81aeb2284d08c2f071eef3a67767c124fc8 100644
--- a/Trigger/TrigT1/TrigT1Muctpi/src/Mirod/MirodModule.cxx
+++ b/Trigger/TrigT1/TrigT1Muctpi/src/Mirod/MirodModule.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 // $Id: MirodModule.cxx 439303 2011-05-25 15:20:17Z krasznaa $
diff --git a/Trigger/TrigT1/TrigT1Muctpi/src/Mirod/MirodModule.h b/Trigger/TrigT1/TrigT1Muctpi/src/Mirod/MirodModule.h
index d4448333b775b97438d393dabf789c4e3c08fcdf..7c236c2022227d2d35e968ea903c3f96544bdd64 100644
--- a/Trigger/TrigT1/TrigT1Muctpi/src/Mirod/MirodModule.h
+++ b/Trigger/TrigT1/TrigT1Muctpi/src/Mirod/MirodModule.h
@@ -1,7 +1,7 @@
 // Dear emacs, this is -*- c++ -*-
 
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 // $Id: MirodModule.h 726107 2016-02-25 11:04:42Z wengler $
diff --git a/Trigger/TrigT1/TrigT1Muctpi/src/Mirod/MirodTestRamIn.cxx b/Trigger/TrigT1/TrigT1Muctpi/src/Mirod/MirodTestRamIn.cxx
index d52813693761dde05eaf9af9732591e839babdf5..38aaa4e569dae613852bb98ee2c54bb01dd03419 100644
--- a/Trigger/TrigT1/TrigT1Muctpi/src/Mirod/MirodTestRamIn.cxx
+++ b/Trigger/TrigT1/TrigT1Muctpi/src/Mirod/MirodTestRamIn.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 // $Id: MirodTestRamIn.cxx 362102 2011-04-28 13:17:28Z krasznaa $
diff --git a/Trigger/TrigT1/TrigT1Muctpi/src/Mirod/MirodTestRamIn.h b/Trigger/TrigT1/TrigT1Muctpi/src/Mirod/MirodTestRamIn.h
index 3a0d59f36ca3f3b2a111a767307aa80d9c99b35c..4c1d1b494239e4c555ac903d9dda5912bbd4a260 100644
--- a/Trigger/TrigT1/TrigT1Muctpi/src/Mirod/MirodTestRamIn.h
+++ b/Trigger/TrigT1/TrigT1Muctpi/src/Mirod/MirodTestRamIn.h
@@ -1,7 +1,7 @@
 // Dear emacs, this is -*- c++ -*-
 
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 // $Id: MirodTestRamIn.h 362102 2011-04-28 13:17:28Z krasznaa $
diff --git a/Trigger/TrigT1/TrigT1RPCRecRoiSvc/TrigT1RPCRecRoiSvc/RPCRecRoiSvc.h b/Trigger/TrigT1/TrigT1RPCRecRoiSvc/TrigT1RPCRecRoiSvc/RPCRecRoiSvc.h
index 99736f95cea97753ec254b8e0eb017c99933b0d0..19dde7fcb8217ceaca3c32a4c4ffe40b42a98747 100755
--- a/Trigger/TrigT1/TrigT1RPCRecRoiSvc/TrigT1RPCRecRoiSvc/RPCRecRoiSvc.h
+++ b/Trigger/TrigT1/TrigT1RPCRecRoiSvc/TrigT1RPCRecRoiSvc/RPCRecRoiSvc.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef TRIGT1_RPCRECROISVC_H
diff --git a/Trigger/TrigT1/TrigT1RPCRecRoiSvc/python/TrigT1RPCRecRoiConfig.py b/Trigger/TrigT1/TrigT1RPCRecRoiSvc/python/TrigT1RPCRecRoiConfig.py
index 9d2705b091c71e94eba2ec975f0e6a5107b6d921..48e20ff24f9a0b768520cf2fcd19a7505060c17d 100755
--- a/Trigger/TrigT1/TrigT1RPCRecRoiSvc/python/TrigT1RPCRecRoiConfig.py
+++ b/Trigger/TrigT1/TrigT1RPCRecRoiSvc/python/TrigT1RPCRecRoiConfig.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 
 # $Id: TrigT1RPCRecRoiConfig.py 301203 2010-05-26 12:08:22Z krasznaa $
 #
diff --git a/Trigger/TrigT1/TrigT1RPCRecRoiSvc/python/__init__.py b/Trigger/TrigT1/TrigT1RPCRecRoiSvc/python/__init__.py
index f3d4aacf57798dcef7f63b5329d8bba998051680..b16168c0c3c0295dad7ccbe756831c035a81cdce 100755
--- a/Trigger/TrigT1/TrigT1RPCRecRoiSvc/python/__init__.py
+++ b/Trigger/TrigT1/TrigT1RPCRecRoiSvc/python/__init__.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 
 # File: TrigT1RPCRecRoiConfig/__init__.py
 
diff --git a/Trigger/TrigT1/TrigT1RPCRecRoiSvc/src/RPCRecRoiSvc.cxx b/Trigger/TrigT1/TrigT1RPCRecRoiSvc/src/RPCRecRoiSvc.cxx
index d4093ad9e395f06404feea17257ba654567b4db9..b02dbe077878403bc2984e6af68fc085e8b1b402 100755
--- a/Trigger/TrigT1/TrigT1RPCRecRoiSvc/src/RPCRecRoiSvc.cxx
+++ b/Trigger/TrigT1/TrigT1RPCRecRoiSvc/src/RPCRecRoiSvc.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #include <cmath>
diff --git a/Trigger/TrigT1/TrigT1RPChardware/TrigT1RPChardware/CMAVERSION.h b/Trigger/TrigT1/TrigT1RPChardware/TrigT1RPChardware/CMAVERSION.h
index be83a04de680785a6bab1f79c004f663655a4623..081cf27a1f7574ad81b988254ce5c35a2e4fdd35 100755
--- a/Trigger/TrigT1/TrigT1RPChardware/TrigT1RPChardware/CMAVERSION.h
+++ b/Trigger/TrigT1/TrigT1RPChardware/TrigT1RPChardware/CMAVERSION.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef CMAVERSION
diff --git a/Trigger/TrigT1/TrigT1RPChardware/TrigT1RPChardware/CMROCompare.h b/Trigger/TrigT1/TrigT1RPChardware/TrigT1RPChardware/CMROCompare.h
index 1b098a22f55414b57beaba686d5d888a261e77b9..941daff4fe56d87fdcfb8aaf34f3bd0442edbd17 100755
--- a/Trigger/TrigT1/TrigT1RPChardware/TrigT1RPChardware/CMROCompare.h
+++ b/Trigger/TrigT1/TrigT1RPChardware/TrigT1RPChardware/CMROCompare.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef CMROCompare_H
diff --git a/Trigger/TrigT1/TrigT1RPChardware/TrigT1RPChardware/CMReprocessing.h b/Trigger/TrigT1/TrigT1RPChardware/TrigT1RPChardware/CMReprocessing.h
index b3371150024103eedef3fc4dfb323ceee9d1383a..f6d116a2cc68965266dd20ae81225dd696469c46 100755
--- a/Trigger/TrigT1/TrigT1RPChardware/TrigT1RPChardware/CMReprocessing.h
+++ b/Trigger/TrigT1/TrigT1RPChardware/TrigT1RPChardware/CMReprocessing.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef CMReprocessing_H
diff --git a/Trigger/TrigT1/TrigT1RPChardware/TrigT1RPChardware/Lvl1Def.h b/Trigger/TrigT1/TrigT1RPChardware/TrigT1RPChardware/Lvl1Def.h
index 9fb783593902dd3deb55e3b3778c0784a0a2ecb4..cdf59a9b27d09487f072462964acf757d25b3144 100755
--- a/Trigger/TrigT1/TrigT1RPChardware/TrigT1RPChardware/Lvl1Def.h
+++ b/Trigger/TrigT1/TrigT1RPChardware/TrigT1RPChardware/Lvl1Def.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef Lvl1Def_H
diff --git a/Trigger/TrigT1/TrigT1RPChardware/TrigT1RPChardware/Lvl1RpcConf.h b/Trigger/TrigT1/TrigT1RPChardware/TrigT1RPChardware/Lvl1RpcConf.h
index a50647061b1ca0737f9083a1cc056907012a5417..7ec618fed18d9fb1adf5eca59d3da9b0681e16d1 100755
--- a/Trigger/TrigT1/TrigT1RPChardware/TrigT1RPChardware/Lvl1RpcConf.h
+++ b/Trigger/TrigT1/TrigT1RPChardware/TrigT1RPChardware/Lvl1RpcConf.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef Lvl1RpcConf_H
diff --git a/Trigger/TrigT1/TrigT1RPChardware/TrigT1RPChardware/Lvl1RpcTrig.h b/Trigger/TrigT1/TrigT1RPChardware/TrigT1RPChardware/Lvl1RpcTrig.h
index 9d67d845ccd5930460f9c3b36b8cc8d36148da59..ec6f1c070ee0b11ab4c4e1dfd851d35aa00f85a5 100755
--- a/Trigger/TrigT1/TrigT1RPChardware/TrigT1RPChardware/Lvl1RpcTrig.h
+++ b/Trigger/TrigT1/TrigT1RPChardware/TrigT1RPChardware/Lvl1RpcTrig.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef Lvl1RpcTrig_H
diff --git a/Trigger/TrigT1/TrigT1RPChardware/TrigT1RPChardware/Matrix.h b/Trigger/TrigT1/TrigT1RPChardware/TrigT1RPChardware/Matrix.h
index bde6287b7b6684a41963c11d457c5515e03c6d47..c19d16bc19c857826bbecfac3297d1145b1bf977 100755
--- a/Trigger/TrigT1/TrigT1RPChardware/TrigT1RPChardware/Matrix.h
+++ b/Trigger/TrigT1/TrigT1RPChardware/TrigT1RPChardware/Matrix.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef Matrix_H
diff --git a/Trigger/TrigT1/TrigT1RPChardware/TrigT1RPChardware/MatrixReadOut.h b/Trigger/TrigT1/TrigT1RPChardware/TrigT1RPChardware/MatrixReadOut.h
index 86b52c5941bc29a2ef8c49c83a9708fbb1cbb71a..3a7a34e0f1adb387979d293016b6cbfd1597efc7 100755
--- a/Trigger/TrigT1/TrigT1RPChardware/TrigT1RPChardware/MatrixReadOut.h
+++ b/Trigger/TrigT1/TrigT1RPChardware/TrigT1RPChardware/MatrixReadOut.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef MatrixReadOut_H
diff --git a/Trigger/TrigT1/TrigT1RPChardware/TrigT1RPChardware/MatrixReadOutStructure.h b/Trigger/TrigT1/TrigT1RPChardware/TrigT1RPChardware/MatrixReadOutStructure.h
index ee9158a9d7af3d78801096e1520d2675a2ac6214..709b8fdede580e4b79bfab0c1fbb2e35694b23bc 100755
--- a/Trigger/TrigT1/TrigT1RPChardware/TrigT1RPChardware/MatrixReadOutStructure.h
+++ b/Trigger/TrigT1/TrigT1RPChardware/TrigT1RPChardware/MatrixReadOutStructure.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef MatrixReadOutStructure_H
diff --git a/Trigger/TrigT1/TrigT1RPChardware/TrigT1RPChardware/NOBXS.h b/Trigger/TrigT1/TrigT1RPChardware/TrigT1RPChardware/NOBXS.h
index 5ff915efb4bc12d61ba2cc367e0ee28880b94fb5..b5e2f2886e09d29b74c260d7f87a0b99c2603e69 100755
--- a/Trigger/TrigT1/TrigT1RPChardware/TrigT1RPChardware/NOBXS.h
+++ b/Trigger/TrigT1/TrigT1RPChardware/TrigT1RPChardware/NOBXS.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef NOBXS_H
diff --git a/Trigger/TrigT1/TrigT1RPChardware/TrigT1RPChardware/Pad.h b/Trigger/TrigT1/TrigT1RPChardware/TrigT1RPChardware/Pad.h
index b0b52896e0c38113bc4b42ed5d9775f92bd8a4cc..84b5c9972ae9c9a04a3c48ea12d5ec43e736a141 100755
--- a/Trigger/TrigT1/TrigT1RPChardware/TrigT1RPChardware/Pad.h
+++ b/Trigger/TrigT1/TrigT1RPChardware/TrigT1RPChardware/Pad.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #include "NOBXS.h"
diff --git a/Trigger/TrigT1/TrigT1RPChardware/TrigT1RPChardware/PadReadOut.h b/Trigger/TrigT1/TrigT1RPChardware/TrigT1RPChardware/PadReadOut.h
index 6fd62385e35c5ad8b9852b6703dacfc1774fd6a5..534bf7198548577748373cd7e442018820256a2b 100755
--- a/Trigger/TrigT1/TrigT1RPChardware/TrigT1RPChardware/PadReadOut.h
+++ b/Trigger/TrigT1/TrigT1RPChardware/TrigT1RPChardware/PadReadOut.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef PadReadOut_H
diff --git a/Trigger/TrigT1/TrigT1RPChardware/TrigT1RPChardware/PadReadOutStructure.h b/Trigger/TrigT1/TrigT1RPChardware/TrigT1RPChardware/PadReadOutStructure.h
index 1438a49c26065bc8086c937172c235e26c6c411f..9efeb15731123945b389a4661dd1430824dd0f50 100755
--- a/Trigger/TrigT1/TrigT1RPChardware/TrigT1RPChardware/PadReadOutStructure.h
+++ b/Trigger/TrigT1/TrigT1RPChardware/TrigT1RPChardware/PadReadOutStructure.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef PadReadOutStructure_H
diff --git a/Trigger/TrigT1/TrigT1RPChardware/TrigT1RPChardware/RPCROD.h b/Trigger/TrigT1/TrigT1RPChardware/TrigT1RPChardware/RPCROD.h
index e4452956bdc91de1cb171d67a5d6d679df85c50e..7ec812d32a7986c4c31b3abf579e65f702c30777 100755
--- a/Trigger/TrigT1/TrigT1RPChardware/TrigT1RPChardware/RPCROD.h
+++ b/Trigger/TrigT1/TrigT1RPChardware/TrigT1RPChardware/RPCROD.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef RPCROD_H
diff --git a/Trigger/TrigT1/TrigT1RPChardware/TrigT1RPChardware/RPCRODDecode.h b/Trigger/TrigT1/TrigT1RPChardware/TrigT1RPChardware/RPCRODDecode.h
index fdbe33617ea03fab56ea39e92a085deeb9a4deab..8be8b2b99714a6557a4691657dcfe574b213180e 100755
--- a/Trigger/TrigT1/TrigT1RPChardware/TrigT1RPChardware/RPCRODDecode.h
+++ b/Trigger/TrigT1/TrigT1RPChardware/TrigT1RPChardware/RPCRODDecode.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef RPCRODDecode_H
diff --git a/Trigger/TrigT1/TrigT1RPChardware/TrigT1RPChardware/RPCRODStructure.h b/Trigger/TrigT1/TrigT1RPChardware/TrigT1RPChardware/RPCRODStructure.h
index c9681b9cae882786d4daba73d4f9663a20402b6e..d770a45a20276d8fc8c50151c23ee74e119dbf9e 100755
--- a/Trigger/TrigT1/TrigT1RPChardware/TrigT1RPChardware/RPCRODStructure.h
+++ b/Trigger/TrigT1/TrigT1RPChardware/TrigT1RPChardware/RPCRODStructure.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef RPCRODStructure_H
diff --git a/Trigger/TrigT1/TrigT1RPChardware/TrigT1RPChardware/RPCRXRODDecode.h b/Trigger/TrigT1/TrigT1RPChardware/TrigT1RPChardware/RPCRXRODDecode.h
index d23cff7bce16556f572afa31bb3f7b096d05fd72..9dac177f27f73ac896809fd8912c44ba48ad1095 100755
--- a/Trigger/TrigT1/TrigT1RPChardware/TrigT1RPChardware/RPCRXRODDecode.h
+++ b/Trigger/TrigT1/TrigT1RPChardware/TrigT1RPChardware/RPCRXRODDecode.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef RPCRXRODDecode_H
diff --git a/Trigger/TrigT1/TrigT1RPChardware/TrigT1RPChardware/RPCReadOut.h b/Trigger/TrigT1/TrigT1RPChardware/TrigT1RPChardware/RPCReadOut.h
index ba497ea50148a4a8afea31bf1bda75646403567a..00230168f4ecbbda7f920b0eb66b7d9ea5081b71 100755
--- a/Trigger/TrigT1/TrigT1RPChardware/TrigT1RPChardware/RPCReadOut.h
+++ b/Trigger/TrigT1/TrigT1RPChardware/TrigT1RPChardware/RPCReadOut.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef RPCReadOut_H
diff --git a/Trigger/TrigT1/TrigT1RPChardware/TrigT1RPChardware/RXReadOut.h b/Trigger/TrigT1/TrigT1RPChardware/TrigT1RPChardware/RXReadOut.h
index 3e142d205fe6a9e5a393b853f92bc3d20a07248c..1176307a7bad1160abb1f974ee5b2a3767dba474 100755
--- a/Trigger/TrigT1/TrigT1RPChardware/TrigT1RPChardware/RXReadOut.h
+++ b/Trigger/TrigT1/TrigT1RPChardware/TrigT1RPChardware/RXReadOut.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef RXReadOut_H
diff --git a/Trigger/TrigT1/TrigT1RPChardware/TrigT1RPChardware/RXReadOutStructure.h b/Trigger/TrigT1/TrigT1RPChardware/TrigT1RPChardware/RXReadOutStructure.h
index de0367b7aa001a091eef5c2d7bfcb529040fca5e..dea0b737328ac8f61b7bba8c06df8cc33f1df7d8 100755
--- a/Trigger/TrigT1/TrigT1RPChardware/TrigT1RPChardware/RXReadOutStructure.h
+++ b/Trigger/TrigT1/TrigT1RPChardware/TrigT1RPChardware/RXReadOutStructure.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef RXReadOutStructure_H
diff --git a/Trigger/TrigT1/TrigT1RPChardware/TrigT1RPChardware/RpcBook.h b/Trigger/TrigT1/TrigT1RPChardware/TrigT1RPChardware/RpcBook.h
index 9c3af51f30793682253542407ea8dfcff39db7aa..83dd193875e1b9a34c01524febd5541688bfa16b 100755
--- a/Trigger/TrigT1/TrigT1RPChardware/TrigT1RPChardware/RpcBook.h
+++ b/Trigger/TrigT1/TrigT1RPChardware/TrigT1RPChardware/RpcBook.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef RPCBOOK_H
diff --git a/Trigger/TrigT1/TrigT1RPChardware/TrigT1RPChardware/SectorL.h b/Trigger/TrigT1/TrigT1RPChardware/TrigT1RPChardware/SectorL.h
index ac220e2c2a7c41e20b20bbab3357b090bff255eb..92d704096097d2ea4f9a226e022c78609f4a9f00 100755
--- a/Trigger/TrigT1/TrigT1RPChardware/TrigT1RPChardware/SectorL.h
+++ b/Trigger/TrigT1/TrigT1RPChardware/TrigT1RPChardware/SectorL.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #include "NOBXS.h"
diff --git a/Trigger/TrigT1/TrigT1RPChardware/TrigT1RPChardware/SectorLogic.h b/Trigger/TrigT1/TrigT1RPChardware/TrigT1RPChardware/SectorLogic.h
index 333ff18459c8db5e3275caab00a5a932c8d39f36..ecc80288eb470b7c8a56498bb3263e06525c32ea 100755
--- a/Trigger/TrigT1/TrigT1RPChardware/TrigT1RPChardware/SectorLogic.h
+++ b/Trigger/TrigT1/TrigT1RPChardware/TrigT1RPChardware/SectorLogic.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef SectorLogic_H
diff --git a/Trigger/TrigT1/TrigT1RPChardware/TrigT1RPChardware/SectorLogicRXReadOut.h b/Trigger/TrigT1/TrigT1RPChardware/TrigT1RPChardware/SectorLogicRXReadOut.h
index 5b0e657b6266713636b02f7938a5d07a82e88158..db3059c782ed591984aaf360d5c4d6565aac09dd 100755
--- a/Trigger/TrigT1/TrigT1RPChardware/TrigT1RPChardware/SectorLogicRXReadOut.h
+++ b/Trigger/TrigT1/TrigT1RPChardware/TrigT1RPChardware/SectorLogicRXReadOut.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef SectorLogicRXReadOut_H
diff --git a/Trigger/TrigT1/TrigT1RPChardware/TrigT1RPChardware/SectorLogicRXReadOutStructure.h b/Trigger/TrigT1/TrigT1RPChardware/TrigT1RPChardware/SectorLogicRXReadOutStructure.h
index a7a77420c0003f74f15f8f705be3f17f7aa4de7a..55e972434c0e8fe8fdc2fd993e7c4ac1cd4f5d67 100755
--- a/Trigger/TrigT1/TrigT1RPChardware/TrigT1RPChardware/SectorLogicRXReadOutStructure.h
+++ b/Trigger/TrigT1/TrigT1RPChardware/TrigT1RPChardware/SectorLogicRXReadOutStructure.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef SectorLogicRXReadOutStructure_H
diff --git a/Trigger/TrigT1/TrigT1RPChardware/TrigT1RPChardware/SectorLogicReadOut.h b/Trigger/TrigT1/TrigT1RPChardware/TrigT1RPChardware/SectorLogicReadOut.h
index 05ce0c6b82e6971ba689fd6cfc28f3b58acec02e..5faef4761441c7625591b43de4636bd75f336a06 100755
--- a/Trigger/TrigT1/TrigT1RPChardware/TrigT1RPChardware/SectorLogicReadOut.h
+++ b/Trigger/TrigT1/TrigT1RPChardware/TrigT1RPChardware/SectorLogicReadOut.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef SectorLogicReadOut_H
diff --git a/Trigger/TrigT1/TrigT1RPChardware/TrigT1RPChardware/SectorLogicReadOutStructure.h b/Trigger/TrigT1/TrigT1RPChardware/TrigT1RPChardware/SectorLogicReadOutStructure.h
index 84e883d2e0ae0c363e0c824773c19d84802058e9..4c8b67f73b26ac947d37951bba04a4c97e627e4b 100755
--- a/Trigger/TrigT1/TrigT1RPChardware/TrigT1RPChardware/SectorLogicReadOutStructure.h
+++ b/Trigger/TrigT1/TrigT1RPChardware/TrigT1RPChardware/SectorLogicReadOutStructure.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef SectorLogicReadOutStructure_H
diff --git a/Trigger/TrigT1/TrigT1RPChardware/TrigT1RPChardware/crc8.h b/Trigger/TrigT1/TrigT1RPChardware/TrigT1RPChardware/crc8.h
index 1a788fe7848d62fa80066684a2ec0c9e8c332d5d..c25bee685ecb346638beaf12e35763fcb5f94497 100755
--- a/Trigger/TrigT1/TrigT1RPChardware/TrigT1RPChardware/crc8.h
+++ b/Trigger/TrigT1/TrigT1RPChardware/TrigT1RPChardware/crc8.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef crc8_H
diff --git a/Trigger/TrigT1/TrigT1RPChardware/src/CMROCompare.cxx b/Trigger/TrigT1/TrigT1RPChardware/src/CMROCompare.cxx
index 49ffefeb5a3e4351ee6b3011f8775cbdc0fc9669..ea38d04e16bed47df563827bf7783600699634d0 100755
--- a/Trigger/TrigT1/TrigT1RPChardware/src/CMROCompare.cxx
+++ b/Trigger/TrigT1/TrigT1RPChardware/src/CMROCompare.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #include <iostream>
diff --git a/Trigger/TrigT1/TrigT1RPChardware/src/CMReprocessing.cxx b/Trigger/TrigT1/TrigT1RPChardware/src/CMReprocessing.cxx
index fc72c4540ac1ab5fe7b0c18c137f9fbbb9d774d3..83fd6aa5044a8075efa70230772abee06aedba54 100755
--- a/Trigger/TrigT1/TrigT1RPChardware/src/CMReprocessing.cxx
+++ b/Trigger/TrigT1/TrigT1RPChardware/src/CMReprocessing.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #include <iostream>
diff --git a/Trigger/TrigT1/TrigT1RPChardware/src/Matrix.cxx b/Trigger/TrigT1/TrigT1RPChardware/src/Matrix.cxx
index 6cb16c30f5fd2bdb1f7ad7b46998a9d18e1db863..8cb8d2fd795eb59a6a117a187ea72a7bcd51bcd0 100755
--- a/Trigger/TrigT1/TrigT1RPChardware/src/Matrix.cxx
+++ b/Trigger/TrigT1/TrigT1RPChardware/src/Matrix.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #include <fstream>
diff --git a/Trigger/TrigT1/TrigT1RPChardware/src/MatrixReadOut.cxx b/Trigger/TrigT1/TrigT1RPChardware/src/MatrixReadOut.cxx
index 2bff4790813f64f6cd6b37336b405b5f5caf130a..db59009db3a70ea92c429ccde5a3150a80cf5822 100755
--- a/Trigger/TrigT1/TrigT1RPChardware/src/MatrixReadOut.cxx
+++ b/Trigger/TrigT1/TrigT1RPChardware/src/MatrixReadOut.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #include<fstream>
diff --git a/Trigger/TrigT1/TrigT1RPChardware/src/MatrixReadOutStructure.cxx b/Trigger/TrigT1/TrigT1RPChardware/src/MatrixReadOutStructure.cxx
index ec271ded41d1ff543c908ec28aef24bdbf35fbc1..29c0cd0d539d9dc44ed00663bc91068daa434353 100755
--- a/Trigger/TrigT1/TrigT1RPChardware/src/MatrixReadOutStructure.cxx
+++ b/Trigger/TrigT1/TrigT1RPChardware/src/MatrixReadOutStructure.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #include<fstream>
diff --git a/Trigger/TrigT1/TrigT1RPChardware/src/Pad.cxx b/Trigger/TrigT1/TrigT1RPChardware/src/Pad.cxx
index ab2985d379b92eeabb42b80554dcd1ad3d854ba6..7d1877144698e3a975abdf455782200975e240bd 100755
--- a/Trigger/TrigT1/TrigT1RPChardware/src/Pad.cxx
+++ b/Trigger/TrigT1/TrigT1RPChardware/src/Pad.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #include<fstream>
diff --git a/Trigger/TrigT1/TrigT1RPChardware/src/PadReadOut.cxx b/Trigger/TrigT1/TrigT1RPChardware/src/PadReadOut.cxx
index 4e64494500a42b0dc752415ea01ecb4b1c57ee50..422aaf8c1a7828d7a1dc47acc90b843ceb4d736d 100755
--- a/Trigger/TrigT1/TrigT1RPChardware/src/PadReadOut.cxx
+++ b/Trigger/TrigT1/TrigT1RPChardware/src/PadReadOut.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #include<fstream>
diff --git a/Trigger/TrigT1/TrigT1RPChardware/src/PadReadOutStructure.cxx b/Trigger/TrigT1/TrigT1RPChardware/src/PadReadOutStructure.cxx
index 78ad84d1ce6f1d9583b25985229dc7aa31beb9f2..115edad3a33c0e741428dbb24554d490c1588bf0 100755
--- a/Trigger/TrigT1/TrigT1RPChardware/src/PadReadOutStructure.cxx
+++ b/Trigger/TrigT1/TrigT1RPChardware/src/PadReadOutStructure.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #include<fstream>
diff --git a/Trigger/TrigT1/TrigT1RPChardware/src/RPCROD.cxx b/Trigger/TrigT1/TrigT1RPChardware/src/RPCROD.cxx
index 44c9b7e3ed61ce77408402c9d8f7aba65a85db0a..8a89b5b2f95f8e4a101379352e2da8db5c713f54 100755
--- a/Trigger/TrigT1/TrigT1RPChardware/src/RPCROD.cxx
+++ b/Trigger/TrigT1/TrigT1RPChardware/src/RPCROD.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #include<fstream>
diff --git a/Trigger/TrigT1/TrigT1RPChardware/src/RPCRODDecode.cxx b/Trigger/TrigT1/TrigT1RPChardware/src/RPCRODDecode.cxx
index a6f46aa46bd764695bddf314860eb4d83bac14d0..6b40f8e3cf1c3710486f47fe38284e124a92ffbb 100755
--- a/Trigger/TrigT1/TrigT1RPChardware/src/RPCRODDecode.cxx
+++ b/Trigger/TrigT1/TrigT1RPChardware/src/RPCRODDecode.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #include <iostream>
diff --git a/Trigger/TrigT1/TrigT1RPChardware/src/RPCRODStructure.cxx b/Trigger/TrigT1/TrigT1RPChardware/src/RPCRODStructure.cxx
index b71fc39bd21940911b1085518a9760888dbed0dd..b35602667fcf60e156270a409a16df1867f84fd0 100755
--- a/Trigger/TrigT1/TrigT1RPChardware/src/RPCRODStructure.cxx
+++ b/Trigger/TrigT1/TrigT1RPChardware/src/RPCRODStructure.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #include<fstream>
diff --git a/Trigger/TrigT1/TrigT1RPChardware/src/RPCRXRODDecode.cxx b/Trigger/TrigT1/TrigT1RPChardware/src/RPCRXRODDecode.cxx
index 34dee67d86b496fb319e58e1a9fa8cb4ebc86a91..523040db86140070e52ed1ccf4e33a418255cc0e 100755
--- a/Trigger/TrigT1/TrigT1RPChardware/src/RPCRXRODDecode.cxx
+++ b/Trigger/TrigT1/TrigT1RPChardware/src/RPCRXRODDecode.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #include <iostream>
diff --git a/Trigger/TrigT1/TrigT1RPChardware/src/RPCReadOut.cxx b/Trigger/TrigT1/TrigT1RPChardware/src/RPCReadOut.cxx
index a70529419822ba181c0f34cb3497d78293c520bd..ed813977a7033711cd4d3499da5c37d098ac51b4 100755
--- a/Trigger/TrigT1/TrigT1RPChardware/src/RPCReadOut.cxx
+++ b/Trigger/TrigT1/TrigT1RPChardware/src/RPCReadOut.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #include<fstream>
diff --git a/Trigger/TrigT1/TrigT1RPChardware/src/RXReadOut.cxx b/Trigger/TrigT1/TrigT1RPChardware/src/RXReadOut.cxx
index 0b5f89e972b775773ac7d035ffb71428a0e51f7b..c39f2251773e2abe13d2644f9576f3b856a04657 100755
--- a/Trigger/TrigT1/TrigT1RPChardware/src/RXReadOut.cxx
+++ b/Trigger/TrigT1/TrigT1RPChardware/src/RXReadOut.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #include<fstream>
diff --git a/Trigger/TrigT1/TrigT1RPChardware/src/RXReadOutStructure.cxx b/Trigger/TrigT1/TrigT1RPChardware/src/RXReadOutStructure.cxx
index 8885a09eccd9788d2dfa0cfbf16962f86752e958..5fd869f1ee8e058225d80aa9731e1dba6d7f1152 100755
--- a/Trigger/TrigT1/TrigT1RPChardware/src/RXReadOutStructure.cxx
+++ b/Trigger/TrigT1/TrigT1RPChardware/src/RXReadOutStructure.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #include<fstream>
diff --git a/Trigger/TrigT1/TrigT1RPChardware/src/RpcBook.cxx b/Trigger/TrigT1/TrigT1RPChardware/src/RpcBook.cxx
index c98bc5a14fa8b17751afa271a83a5878678bb4c5..c75dfa5a64e38c6140439c75ee7aa2bf4b5e6174 100755
--- a/Trigger/TrigT1/TrigT1RPChardware/src/RpcBook.cxx
+++ b/Trigger/TrigT1/TrigT1RPChardware/src/RpcBook.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #include "TrigT1RPChardware/RpcBook.h"
diff --git a/Trigger/TrigT1/TrigT1RPChardware/src/SectorL.cxx b/Trigger/TrigT1/TrigT1RPChardware/src/SectorL.cxx
index 40e0789d4edf4db4ef46d49b4efcf414b8d05781..25d97eb629bfe733b67912cd5ccc994abe33384e 100755
--- a/Trigger/TrigT1/TrigT1RPChardware/src/SectorL.cxx
+++ b/Trigger/TrigT1/TrigT1RPChardware/src/SectorL.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #include<fstream>
diff --git a/Trigger/TrigT1/TrigT1RPChardware/src/SectorLogic.cxx b/Trigger/TrigT1/TrigT1RPChardware/src/SectorLogic.cxx
index ac5673ab1c325d762ca824632773ca4e803ea1bb..279b8db8c90e90b84bcd7e253cac6c8f0fb1c7ba 100755
--- a/Trigger/TrigT1/TrigT1RPChardware/src/SectorLogic.cxx
+++ b/Trigger/TrigT1/TrigT1RPChardware/src/SectorLogic.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 //****************************************************************************//
diff --git a/Trigger/TrigT1/TrigT1RPChardware/src/SectorLogicRXReadOut.cxx b/Trigger/TrigT1/TrigT1RPChardware/src/SectorLogicRXReadOut.cxx
index b815db5af16a0e1355c1c92a36fe489139497077..ef3e2c8a20277317c1bbea8cab99df3db3f726ea 100755
--- a/Trigger/TrigT1/TrigT1RPChardware/src/SectorLogicRXReadOut.cxx
+++ b/Trigger/TrigT1/TrigT1RPChardware/src/SectorLogicRXReadOut.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #include<fstream>
diff --git a/Trigger/TrigT1/TrigT1RPChardware/src/SectorLogicRXReadOutStructure.cxx b/Trigger/TrigT1/TrigT1RPChardware/src/SectorLogicRXReadOutStructure.cxx
index b93087b40388d914ed80051fe84ffb0df52758e0..f674db87a93935af047db2ac702687f9a3b2d21d 100755
--- a/Trigger/TrigT1/TrigT1RPChardware/src/SectorLogicRXReadOutStructure.cxx
+++ b/Trigger/TrigT1/TrigT1RPChardware/src/SectorLogicRXReadOutStructure.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #include<fstream>
diff --git a/Trigger/TrigT1/TrigT1RPChardware/src/SectorLogicReadOut.cxx b/Trigger/TrigT1/TrigT1RPChardware/src/SectorLogicReadOut.cxx
index 61b7e00c4793ccfa83159d9161d2f6dd19b588c8..b4f122214016959e7ee69d288a2ff81f2a6bfefc 100755
--- a/Trigger/TrigT1/TrigT1RPChardware/src/SectorLogicReadOut.cxx
+++ b/Trigger/TrigT1/TrigT1RPChardware/src/SectorLogicReadOut.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #include<fstream>
diff --git a/Trigger/TrigT1/TrigT1RPChardware/src/SectorLogicReadOutStructure.cxx b/Trigger/TrigT1/TrigT1RPChardware/src/SectorLogicReadOutStructure.cxx
index 9bcfbcd3a5e3dec0f553b5b83fddebad0a6ddc85..3281a8425d00120a7a18e63260ed02b94f9baa9d 100755
--- a/Trigger/TrigT1/TrigT1RPChardware/src/SectorLogicReadOutStructure.cxx
+++ b/Trigger/TrigT1/TrigT1RPChardware/src/SectorLogicReadOutStructure.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #include<fstream>
diff --git a/Trigger/TrigT1/TrigT1RPChardware/src/crc8.cxx b/Trigger/TrigT1/TrigT1RPChardware/src/crc8.cxx
index b8ff20b6e1c16cfff6c2076b969a271b1ccbb240..d2774acc619c5a04866dcbdf0eb55b545f7d1f93 100755
--- a/Trigger/TrigT1/TrigT1RPChardware/src/crc8.cxx
+++ b/Trigger/TrigT1/TrigT1RPChardware/src/crc8.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #include <iostream>
diff --git a/Trigger/TrigT1/TrigT1RPClogic/TrigT1RPClogic/CMAdata.h b/Trigger/TrigT1/TrigT1RPClogic/TrigT1RPClogic/CMAdata.h
index 7d939bf19d9dee5fc90511c71407bb8bcd0fbb57..2745382daa1807af4133d1f37dd84469f0f138d2 100755
--- a/Trigger/TrigT1/TrigT1RPClogic/TrigT1RPClogic/CMAdata.h
+++ b/Trigger/TrigT1/TrigT1RPClogic/TrigT1RPClogic/CMAdata.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef CMADATA_H
diff --git a/Trigger/TrigT1/TrigT1RPClogic/TrigT1RPClogic/CMApatterns.h b/Trigger/TrigT1/TrigT1RPClogic/TrigT1RPClogic/CMApatterns.h
index ff683af66d7430feffc5fa32942636584fe339c3..94417b168b3905962203ff0f5780b94290f00162 100755
--- a/Trigger/TrigT1/TrigT1RPClogic/TrigT1RPClogic/CMApatterns.h
+++ b/Trigger/TrigT1/TrigT1RPClogic/TrigT1RPClogic/CMApatterns.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef CMAPATTERNS_H
diff --git a/Trigger/TrigT1/TrigT1RPClogic/TrigT1RPClogic/CMAreadout.h b/Trigger/TrigT1/TrigT1RPClogic/TrigT1RPClogic/CMAreadout.h
index e0603168efd679e6a51447661b01005cee91a7b8..c6982a4d2e46b2b431bd4ce9a09baf95d0fd49d2 100755
--- a/Trigger/TrigT1/TrigT1RPClogic/TrigT1RPClogic/CMAreadout.h
+++ b/Trigger/TrigT1/TrigT1RPClogic/TrigT1RPClogic/CMAreadout.h
@@ -1,7 +1,7 @@
 /* // -*- C++ -*- */
 
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 
diff --git a/Trigger/TrigT1/TrigT1RPClogic/TrigT1RPClogic/CMAtrigger.h b/Trigger/TrigT1/TrigT1RPClogic/TrigT1RPClogic/CMAtrigger.h
index 02fffcdb12a2ff285a3c5f3be87b2e55211361e4..41145162856e702350db370db4bce479d9c5f791 100755
--- a/Trigger/TrigT1/TrigT1RPClogic/TrigT1RPClogic/CMAtrigger.h
+++ b/Trigger/TrigT1/TrigT1RPClogic/TrigT1RPClogic/CMAtrigger.h
@@ -1,7 +1,7 @@
 /* // -*- C++ -*- */
 
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 
diff --git a/Trigger/TrigT1/TrigT1RPClogic/TrigT1RPClogic/MuonSimuTrack.h b/Trigger/TrigT1/TrigT1RPClogic/TrigT1RPClogic/MuonSimuTrack.h
index 99d5f9f499b4420a98c9ab803d4c826edd998a60..c7c2c4632d0723d98d67b05e509c8c544f29033e 100755
--- a/Trigger/TrigT1/TrigT1RPClogic/TrigT1RPClogic/MuonSimuTrack.h
+++ b/Trigger/TrigT1/TrigT1RPClogic/TrigT1RPClogic/MuonSimuTrack.h
@@ -1,7 +1,7 @@
 /* // -*- C++ -*- */
 
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 
diff --git a/Trigger/TrigT1/TrigT1RPClogic/TrigT1RPClogic/PADdata.h b/Trigger/TrigT1/TrigT1RPClogic/TrigT1RPClogic/PADdata.h
index a71fa29867d785d48ab5474ae9137f0cc8f4b941..8f617f9d544e056cc763a46e493b5af1a737e091 100755
--- a/Trigger/TrigT1/TrigT1RPClogic/TrigT1RPClogic/PADdata.h
+++ b/Trigger/TrigT1/TrigT1RPClogic/TrigT1RPClogic/PADdata.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef PADDATA_H
diff --git a/Trigger/TrigT1/TrigT1RPClogic/TrigT1RPClogic/PADpatterns.h b/Trigger/TrigT1/TrigT1RPClogic/TrigT1RPClogic/PADpatterns.h
index da1ad1faafae0050192f04a2e8271f9b6e485329..4825a08637314c4bbd6031150d995ecf69ee50dc 100755
--- a/Trigger/TrigT1/TrigT1RPClogic/TrigT1RPClogic/PADpatterns.h
+++ b/Trigger/TrigT1/TrigT1RPClogic/TrigT1RPClogic/PADpatterns.h
@@ -1,7 +1,7 @@
 /* // -*- C++ -*- */
 
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 
diff --git a/Trigger/TrigT1/TrigT1RPClogic/TrigT1RPClogic/PADreadout.h b/Trigger/TrigT1/TrigT1RPClogic/TrigT1RPClogic/PADreadout.h
index 730153e767c4b3a955ce0e2b232a7d8a13b4a8cd..3b366794777a1079fe686e5d8c825fe535bcc636 100755
--- a/Trigger/TrigT1/TrigT1RPClogic/TrigT1RPClogic/PADreadout.h
+++ b/Trigger/TrigT1/TrigT1RPClogic/TrigT1RPClogic/PADreadout.h
@@ -1,7 +1,7 @@
 /* // -*- C++ -*- */
 
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 
diff --git a/Trigger/TrigT1/TrigT1RPClogic/TrigT1RPClogic/PATTERNidentity.h b/Trigger/TrigT1/TrigT1RPClogic/TrigT1RPClogic/PATTERNidentity.h
index f13c190bc289b8976cf7f990009a5361b6c205c6..1fa82085c056b3e523646542825fa85613ce6107 100755
--- a/Trigger/TrigT1/TrigT1RPClogic/TrigT1RPClogic/PATTERNidentity.h
+++ b/Trigger/TrigT1/TrigT1RPClogic/TrigT1RPClogic/PATTERNidentity.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef PATTERNIDENTITY_H
diff --git a/Trigger/TrigT1/TrigT1RPClogic/TrigT1RPClogic/RPCbytestream.h b/Trigger/TrigT1/TrigT1RPClogic/TrigT1RPClogic/RPCbytestream.h
index 8e1a5533f99209c26d6360b7b2b7c43f372ac825..45163364c14439f261a6d9ce027036dc6ca6ea74 100755
--- a/Trigger/TrigT1/TrigT1RPClogic/TrigT1RPClogic/RPCbytestream.h
+++ b/Trigger/TrigT1/TrigT1RPClogic/TrigT1RPClogic/RPCbytestream.h
@@ -1,7 +1,7 @@
 /* // -*- C++ -*- */
 
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 
diff --git a/Trigger/TrigT1/TrigT1RPClogic/TrigT1RPClogic/RPCdata.h b/Trigger/TrigT1/TrigT1RPClogic/TrigT1RPClogic/RPCdata.h
index acc4ae1a71d6af3ada3375b3dba83b10bb7e23fb..7a35dc416b416095c34b88fc0447badb08810fbe 100755
--- a/Trigger/TrigT1/TrigT1RPClogic/TrigT1RPClogic/RPCdata.h
+++ b/Trigger/TrigT1/TrigT1RPClogic/TrigT1RPClogic/RPCdata.h
@@ -1,7 +1,7 @@
 /* // -*- C++ -*- */
 
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 
diff --git a/Trigger/TrigT1/TrigT1RPClogic/TrigT1RPClogic/RPCdigit.h b/Trigger/TrigT1/TrigT1RPClogic/TrigT1RPClogic/RPCdigit.h
index 49659d8bb0fc9eac2b50206065c134cdcac13a1e..b072cc678ee5d8ed9d01e21b2abd572ca685682b 100755
--- a/Trigger/TrigT1/TrigT1RPClogic/TrigT1RPClogic/RPCdigit.h
+++ b/Trigger/TrigT1/TrigT1RPClogic/TrigT1RPClogic/RPCdigit.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef RPCDIGIT_H
diff --git a/Trigger/TrigT1/TrigT1RPClogic/TrigT1RPClogic/RPCrawData.h b/Trigger/TrigT1/TrigT1RPClogic/TrigT1RPClogic/RPCrawData.h
index 07d38f80526da44abd8f79c11af6a7c2efe005a4..b2d59822dada9a6627aea6b4a531f134b8507359 100755
--- a/Trigger/TrigT1/TrigT1RPClogic/TrigT1RPClogic/RPCrawData.h
+++ b/Trigger/TrigT1/TrigT1RPClogic/TrigT1RPClogic/RPCrawData.h
@@ -1,7 +1,7 @@
 /* // -*- C++ -*- */
 
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 
diff --git a/Trigger/TrigT1/TrigT1RPClogic/TrigT1RPClogic/RPCrawDigit.h b/Trigger/TrigT1/TrigT1RPClogic/TrigT1RPClogic/RPCrawDigit.h
index 773414545d99325ffd1b0407afdbb0ab74aaf435..977f5ef2593775ccb0bf8659efac7e7d85a82304 100755
--- a/Trigger/TrigT1/TrigT1RPClogic/TrigT1RPClogic/RPCrawDigit.h
+++ b/Trigger/TrigT1/TrigT1RPClogic/TrigT1RPClogic/RPCrawDigit.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef SIMUDIGIT_H
diff --git a/Trigger/TrigT1/TrigT1RPClogic/TrigT1RPClogic/RPCsimuData.h b/Trigger/TrigT1/TrigT1RPClogic/TrigT1RPClogic/RPCsimuData.h
index bf0e49cc42512821eb0a1b40464bd18e92ecb61a..baf33adf8b0b0eb186b667db09767760405494db 100755
--- a/Trigger/TrigT1/TrigT1RPClogic/TrigT1RPClogic/RPCsimuData.h
+++ b/Trigger/TrigT1/TrigT1RPClogic/TrigT1RPClogic/RPCsimuData.h
@@ -1,7 +1,7 @@
 /* // -*- C++ -*- */
 
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 
diff --git a/Trigger/TrigT1/TrigT1RPClogic/TrigT1RPClogic/RPCsimuDigit.h b/Trigger/TrigT1/TrigT1RPClogic/TrigT1RPClogic/RPCsimuDigit.h
index 350a77a7a76b445acbe370ef1516b7304f6a1fc9..fc6d72e54b32e6570c12e2d643e578c40bc08f78 100755
--- a/Trigger/TrigT1/TrigT1RPClogic/TrigT1RPClogic/RPCsimuDigit.h
+++ b/Trigger/TrigT1/TrigT1RPClogic/TrigT1RPClogic/RPCsimuDigit.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef SIMUDIGIT_H
diff --git a/Trigger/TrigT1/TrigT1RPClogic/TrigT1RPClogic/RPCtrigDataObject.h b/Trigger/TrigT1/TrigT1RPClogic/TrigT1RPClogic/RPCtrigDataObject.h
index acdd98b54e3d4d12e1b0a42e303d768801dd9e67..bc5e716070f2967c57fa3041f01917c5c1eac4e0 100755
--- a/Trigger/TrigT1/TrigT1RPClogic/TrigT1RPClogic/RPCtrigDataObject.h
+++ b/Trigger/TrigT1/TrigT1RPClogic/TrigT1RPClogic/RPCtrigDataObject.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef DATAOBJECT_H
diff --git a/Trigger/TrigT1/TrigT1RPClogic/TrigT1RPClogic/SLdata.h b/Trigger/TrigT1/TrigT1RPClogic/TrigT1RPClogic/SLdata.h
index 5a79d34e457138b4285217392e245cb083bad817..313246964a9a554707d14da35615bfdb2ce48a19 100755
--- a/Trigger/TrigT1/TrigT1RPClogic/TrigT1RPClogic/SLdata.h
+++ b/Trigger/TrigT1/TrigT1RPClogic/TrigT1RPClogic/SLdata.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef SLDATA_H
diff --git a/Trigger/TrigT1/TrigT1RPClogic/TrigT1RPClogic/SLpatterns.h b/Trigger/TrigT1/TrigT1RPClogic/TrigT1RPClogic/SLpatterns.h
index 8d4232d130ff27b599f91b666ab3d1cbbc6e35cd..245d5a8376fd1830ae1a8d3cc3b256a625d480bd 100755
--- a/Trigger/TrigT1/TrigT1RPClogic/TrigT1RPClogic/SLpatterns.h
+++ b/Trigger/TrigT1/TrigT1RPClogic/TrigT1RPClogic/SLpatterns.h
@@ -1,7 +1,7 @@
 /* // -*- C++ -*- */
 
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 
diff --git a/Trigger/TrigT1/TrigT1RPClogic/TrigT1RPClogic/ShowData.h b/Trigger/TrigT1/TrigT1RPClogic/TrigT1RPClogic/ShowData.h
index d76543df5152329a9430962c74fd233fd9a0e050..18c436c9f2da464ccb61d43057eba3cdc128d669 100755
--- a/Trigger/TrigT1/TrigT1RPClogic/TrigT1RPClogic/ShowData.h
+++ b/Trigger/TrigT1/TrigT1RPClogic/TrigT1RPClogic/ShowData.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #include <iostream>
diff --git a/Trigger/TrigT1/TrigT1RPClogic/TrigT1RPClogic/bitPATTERN.h b/Trigger/TrigT1/TrigT1RPClogic/TrigT1RPClogic/bitPATTERN.h
index e6af6cb9e9c824d55577f2f147c0e547437117e3..6bbd98a4c0cf262bcd3d723c3d30fb8a974b908c 100755
--- a/Trigger/TrigT1/TrigT1RPClogic/TrigT1RPClogic/bitPATTERN.h
+++ b/Trigger/TrigT1/TrigT1RPClogic/TrigT1RPClogic/bitPATTERN.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef BITPATTERN_H
diff --git a/Trigger/TrigT1/TrigT1RPClogic/TrigT1RPClogic/decodeSL.h b/Trigger/TrigT1/TrigT1RPClogic/TrigT1RPClogic/decodeSL.h
index d1bcd31ecc0230c395b12aa067bcbf574381f8de..af14394075473762365ca3c8c62f34d0631e6cd0 100755
--- a/Trigger/TrigT1/TrigT1RPClogic/TrigT1RPClogic/decodeSL.h
+++ b/Trigger/TrigT1/TrigT1RPClogic/TrigT1RPClogic/decodeSL.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 
diff --git a/Trigger/TrigT1/TrigT1RPClogic/TrigT1RPClogic/foot.h b/Trigger/TrigT1/TrigT1RPClogic/TrigT1RPClogic/foot.h
index 5d701e5d7b688edfc75de1bb32381feba8a6095d..01ab3ac6253d85b25dc138d80c6e9417d697b6ff 100755
--- a/Trigger/TrigT1/TrigT1RPClogic/TrigT1RPClogic/foot.h
+++ b/Trigger/TrigT1/TrigT1RPClogic/TrigT1RPClogic/foot.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef ATRIG_FOOT_H
diff --git a/Trigger/TrigT1/TrigT1RPClogic/TrigT1RPClogic/large.h b/Trigger/TrigT1/TrigT1RPClogic/TrigT1RPClogic/large.h
index 66f59bfaf4c9d5ebee0b3ed4d755ff566f6676a1..1fe7ad2eff16b6a87dca143f89c5722490c39fcb 100755
--- a/Trigger/TrigT1/TrigT1RPClogic/TrigT1RPClogic/large.h
+++ b/Trigger/TrigT1/TrigT1RPClogic/TrigT1RPClogic/large.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef ATRIG_LARGE_H
diff --git a/Trigger/TrigT1/TrigT1RPClogic/TrigT1RPClogic/small.h b/Trigger/TrigT1/TrigT1RPClogic/TrigT1RPClogic/small.h
index 6549ee3cf6e66c22ec4b1dfb9a0f7ed8f4ec02ab..fd87eb5ddb61444f8a2fee9d740413ad7a8b8b79 100755
--- a/Trigger/TrigT1/TrigT1RPClogic/TrigT1RPClogic/small.h
+++ b/Trigger/TrigT1/TrigT1RPClogic/TrigT1RPClogic/small.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef ATRIG_SMALL_H
diff --git a/Trigger/TrigT1/TrigT1RPClogic/TrigT1RPClogic/windows.h b/Trigger/TrigT1/TrigT1RPClogic/TrigT1RPClogic/windows.h
index 9afc2a8829d712db4ea28e750fad6f899dea0335..9f86c542a50fe5c758befbb2a2b56f24df4ab597 100755
--- a/Trigger/TrigT1/TrigT1RPClogic/TrigT1RPClogic/windows.h
+++ b/Trigger/TrigT1/TrigT1RPClogic/TrigT1RPClogic/windows.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef WINDOWS_H
diff --git a/Trigger/TrigT1/TrigT1RPClogic/src/CMAdata.cxx b/Trigger/TrigT1/TrigT1RPClogic/src/CMAdata.cxx
index 47ab4ce98a350265b8a3ebb7926e32573d466ee1..8e1cefb4f3485aff6a34f15fb49f6893a56c846d 100755
--- a/Trigger/TrigT1/TrigT1RPClogic/src/CMAdata.cxx
+++ b/Trigger/TrigT1/TrigT1RPClogic/src/CMAdata.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #include "TrigT1RPClogic/CMAdata.h"
diff --git a/Trigger/TrigT1/TrigT1RPClogic/src/CMApatterns.cxx b/Trigger/TrigT1/TrigT1RPClogic/src/CMApatterns.cxx
index bc83211565906aa3653fbb68090c2df1e3e2862b..359c4aa819ae0ab94cdc9c69bcb2f6e69a023b79 100755
--- a/Trigger/TrigT1/TrigT1RPClogic/src/CMApatterns.cxx
+++ b/Trigger/TrigT1/TrigT1RPClogic/src/CMApatterns.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #include <math.h>
diff --git a/Trigger/TrigT1/TrigT1RPClogic/src/CMAreadout.cxx b/Trigger/TrigT1/TrigT1RPClogic/src/CMAreadout.cxx
index bc7c1b6ad6ea9c874abd723ce5f7635e9ba0e458..1e8feef51156b81296f24caaf0dccc174dc7c170 100755
--- a/Trigger/TrigT1/TrigT1RPClogic/src/CMAreadout.cxx
+++ b/Trigger/TrigT1/TrigT1RPClogic/src/CMAreadout.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #include "TrigT1RPClogic/CMAreadout.h"
diff --git a/Trigger/TrigT1/TrigT1RPClogic/src/CMAtrigger.cxx b/Trigger/TrigT1/TrigT1RPClogic/src/CMAtrigger.cxx
index 387500f8062c11c235dae4dc1d99d9c7beadef2e..e560e09a210eee694adca43fb29da1d5af20c30f 100755
--- a/Trigger/TrigT1/TrigT1RPClogic/src/CMAtrigger.cxx
+++ b/Trigger/TrigT1/TrigT1RPClogic/src/CMAtrigger.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #include "TrigT1RPClogic/CMAtrigger.h"
diff --git a/Trigger/TrigT1/TrigT1RPClogic/src/MuonSimuTrack.cxx b/Trigger/TrigT1/TrigT1RPClogic/src/MuonSimuTrack.cxx
index 03c1c58b060598598b2b7539da6f7d57bb40278e..389c20a25d1446333238b45072c5e95d0581b46d 100755
--- a/Trigger/TrigT1/TrigT1RPClogic/src/MuonSimuTrack.cxx
+++ b/Trigger/TrigT1/TrigT1RPClogic/src/MuonSimuTrack.cxx
@@ -1,7 +1,7 @@
 /* // -*- C++ -*- */
 
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 
diff --git a/Trigger/TrigT1/TrigT1RPClogic/src/PADdata.cxx b/Trigger/TrigT1/TrigT1RPClogic/src/PADdata.cxx
index 6a195f2ca6aef64880d42fdd850d49bf38ed81da..bc00ef73279ea72c08ee75a8b76c2c7c0bb95bae 100755
--- a/Trigger/TrigT1/TrigT1RPClogic/src/PADdata.cxx
+++ b/Trigger/TrigT1/TrigT1RPClogic/src/PADdata.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #include "TrigT1RPClogic/PADdata.h"
diff --git a/Trigger/TrigT1/TrigT1RPClogic/src/PADpatterns.cxx b/Trigger/TrigT1/TrigT1RPClogic/src/PADpatterns.cxx
index 0d0b2a584b554ca57451324d2316f9956cd819d6..05280975ef9f60e24cfce35fa2539f9999c3dc2c 100755
--- a/Trigger/TrigT1/TrigT1RPClogic/src/PADpatterns.cxx
+++ b/Trigger/TrigT1/TrigT1RPClogic/src/PADpatterns.cxx
@@ -1,7 +1,7 @@
 /* // -*- C++ -*- */
 
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 
diff --git a/Trigger/TrigT1/TrigT1RPClogic/src/PADreadout.cxx b/Trigger/TrigT1/TrigT1RPClogic/src/PADreadout.cxx
index 0596b3422f2594f8ea87e99c66d3b7859d1c3519..bc5162da92aae891f5702e94c8173d704b97735f 100755
--- a/Trigger/TrigT1/TrigT1RPClogic/src/PADreadout.cxx
+++ b/Trigger/TrigT1/TrigT1RPClogic/src/PADreadout.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #include "TrigT1RPClogic/PADreadout.h"
diff --git a/Trigger/TrigT1/TrigT1RPClogic/src/PATTERNidentity.cxx b/Trigger/TrigT1/TrigT1RPClogic/src/PATTERNidentity.cxx
index cbc8796179feb6ef991d60a36320b558e600d064..ffc75bb69c0828352a9dab547179edfe02d90a92 100755
--- a/Trigger/TrigT1/TrigT1RPClogic/src/PATTERNidentity.cxx
+++ b/Trigger/TrigT1/TrigT1RPClogic/src/PATTERNidentity.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #include "TrigT1RPClogic/PATTERNidentity.h" 
diff --git a/Trigger/TrigT1/TrigT1RPClogic/src/RPCbytestream.cxx b/Trigger/TrigT1/TrigT1RPClogic/src/RPCbytestream.cxx
index a42e53fcdd48f2a29926c447269f89ac3dee2753..8557e3aa7df8a1121438a105030dd2d48961a448 100755
--- a/Trigger/TrigT1/TrigT1RPClogic/src/RPCbytestream.cxx
+++ b/Trigger/TrigT1/TrigT1RPClogic/src/RPCbytestream.cxx
@@ -1,7 +1,7 @@
 /* // -*- C++ -*- */
 
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 
diff --git a/Trigger/TrigT1/TrigT1RPClogic/src/RPCdata.cxx b/Trigger/TrigT1/TrigT1RPClogic/src/RPCdata.cxx
index 7bb0df97b83d4369c995bb38b6c965e321ffbbdd..52ed12e4a13f731d5aca9bc3859dab260fd7fed9 100755
--- a/Trigger/TrigT1/TrigT1RPClogic/src/RPCdata.cxx
+++ b/Trigger/TrigT1/TrigT1RPClogic/src/RPCdata.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #include "TrigT1RPClogic/RPCdata.h"
diff --git a/Trigger/TrigT1/TrigT1RPClogic/src/RPCdigit.cxx b/Trigger/TrigT1/TrigT1RPClogic/src/RPCdigit.cxx
index 48c0c66ca074075c0f5bd5e8c62e5262c4c3f069..15532eaaf30de58f24f30bcb9574ceb0f11766a1 100755
--- a/Trigger/TrigT1/TrigT1RPClogic/src/RPCdigit.cxx
+++ b/Trigger/TrigT1/TrigT1RPClogic/src/RPCdigit.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #include <math.h>
diff --git a/Trigger/TrigT1/TrigT1RPClogic/src/RPCrawData.cxx b/Trigger/TrigT1/TrigT1RPClogic/src/RPCrawData.cxx
index cf749cdea84d77dc75a8383a14da028db5c17f35..33bdaa499738f25a8039f0198eb986d5b94eadbb 100755
--- a/Trigger/TrigT1/TrigT1RPClogic/src/RPCrawData.cxx
+++ b/Trigger/TrigT1/TrigT1RPClogic/src/RPCrawData.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #include "TrigT1RPClogic/RPCrawData.h"
diff --git a/Trigger/TrigT1/TrigT1RPClogic/src/RPCrawDigit.cxx b/Trigger/TrigT1/TrigT1RPClogic/src/RPCrawDigit.cxx
index 4ac2a31567b40df16d3184b91ca9634e93c98137..2bacbbef28ab3e5180b713938589e7c2edd7b7c0 100755
--- a/Trigger/TrigT1/TrigT1RPClogic/src/RPCrawDigit.cxx
+++ b/Trigger/TrigT1/TrigT1RPClogic/src/RPCrawDigit.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #include "TrigT1RPClogic/RPCrawDigit.h"
diff --git a/Trigger/TrigT1/TrigT1RPClogic/src/RPCsimuData.cxx b/Trigger/TrigT1/TrigT1RPClogic/src/RPCsimuData.cxx
index 07fa8f5436d2f76374dae242c162a9e91946ba31..be1500cdbc15c7f92b2a1cff60db54207da758eb 100755
--- a/Trigger/TrigT1/TrigT1RPClogic/src/RPCsimuData.cxx
+++ b/Trigger/TrigT1/TrigT1RPClogic/src/RPCsimuData.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #include "TrigT1RPClogic/RPCsimuData.h"
diff --git a/Trigger/TrigT1/TrigT1RPClogic/src/RPCsimuDigit.cxx b/Trigger/TrigT1/TrigT1RPClogic/src/RPCsimuDigit.cxx
index 5cce763fe868981029a6311bd1fe421802da121e..4d6ef5ec4ffe64eb006606d4d812235f4de3e957 100755
--- a/Trigger/TrigT1/TrigT1RPClogic/src/RPCsimuDigit.cxx
+++ b/Trigger/TrigT1/TrigT1RPClogic/src/RPCsimuDigit.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #include "TrigT1RPClogic/RPCsimuDigit.h"
diff --git a/Trigger/TrigT1/TrigT1RPClogic/src/RPCtrigDataObject.cxx b/Trigger/TrigT1/TrigT1RPClogic/src/RPCtrigDataObject.cxx
index ba222379013251d2ff3c4bda554a1c1a37715800..10333e22099ca438ba7dada34fe7a239010b9ca8 100755
--- a/Trigger/TrigT1/TrigT1RPClogic/src/RPCtrigDataObject.cxx
+++ b/Trigger/TrigT1/TrigT1RPClogic/src/RPCtrigDataObject.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #include <iomanip>
diff --git a/Trigger/TrigT1/TrigT1RPClogic/src/SLdata.cxx b/Trigger/TrigT1/TrigT1RPClogic/src/SLdata.cxx
index 18c93a7e6f8dab27a636a6a67be7d73aa66aba23..8c382104b0f0c8e30d347cc45d8c6433e9ed2e63 100755
--- a/Trigger/TrigT1/TrigT1RPClogic/src/SLdata.cxx
+++ b/Trigger/TrigT1/TrigT1RPClogic/src/SLdata.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #include "TrigT1RPClogic/SLdata.h"
diff --git a/Trigger/TrigT1/TrigT1RPClogic/src/SLpatterns.cxx b/Trigger/TrigT1/TrigT1RPClogic/src/SLpatterns.cxx
index 1e8df518a8a281f01c0dcb8c6055ccf8842aec24..a4f6c0859ee6e94c0823c491c37a1109467aae89 100755
--- a/Trigger/TrigT1/TrigT1RPClogic/src/SLpatterns.cxx
+++ b/Trigger/TrigT1/TrigT1RPClogic/src/SLpatterns.cxx
@@ -1,7 +1,7 @@
 /* // -*- C++ -*- */
 
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 
diff --git a/Trigger/TrigT1/TrigT1RPClogic/src/bitPATTERN.cxx b/Trigger/TrigT1/TrigT1RPClogic/src/bitPATTERN.cxx
index 1484164aeb55013133b7d6cfe1a6f897749e5cab..a15ef72d16be58415f0f7a021d21afd5284b2c5a 100755
--- a/Trigger/TrigT1/TrigT1RPClogic/src/bitPATTERN.cxx
+++ b/Trigger/TrigT1/TrigT1RPClogic/src/bitPATTERN.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #include "TrigT1RPClogic/bitPATTERN.h"
diff --git a/Trigger/TrigT1/TrigT1RPClogic/src/decodeSL.cxx b/Trigger/TrigT1/TrigT1RPClogic/src/decodeSL.cxx
index ded2ea0463ac8440bb0798fdc1e080e496ac66bb..24513fcf0dcb8765e40489e2925eef3ff5536020 100755
--- a/Trigger/TrigT1/TrigT1RPClogic/src/decodeSL.cxx
+++ b/Trigger/TrigT1/TrigT1RPClogic/src/decodeSL.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #include "TrigT1RPClogic/decodeSL.h"
diff --git a/Trigger/TrigT1/TrigT1RPClogic/src/windows.cxx b/Trigger/TrigT1/TrigT1RPClogic/src/windows.cxx
index 97eb0f9dee1701a74440cc21e88079cd4ba11f56..37ba75d6a9db484f9193bb783a9d910eed64a847 100755
--- a/Trigger/TrigT1/TrigT1RPClogic/src/windows.cxx
+++ b/Trigger/TrigT1/TrigT1RPClogic/src/windows.cxx
@@ -1,7 +1,7 @@
 /* // -*- C++ -*- */
 
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 
diff --git a/Trigger/TrigT1/TrigT1RPCsteering/TrigT1RPCsteering/TrigT1RPC.h b/Trigger/TrigT1/TrigT1RPCsteering/TrigT1RPCsteering/TrigT1RPC.h
index 58a20fea33bdead5c0bcca76e4d1509a532d114b..c2c56e53b76cdf3723c4f11530fdf25a48888a79 100755
--- a/Trigger/TrigT1/TrigT1RPCsteering/TrigT1RPCsteering/TrigT1RPC.h
+++ b/Trigger/TrigT1/TrigT1RPCsteering/TrigT1RPCsteering/TrigT1RPC.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef RPCMuonTrigger_H
diff --git a/Trigger/TrigT1/TrigT1RPCsteering/python/TrigT1RPCsteeringConfig.py b/Trigger/TrigT1/TrigT1RPCsteering/python/TrigT1RPCsteeringConfig.py
index 2629d8ab43d3531df4a9c27c624385ebd72dcb3d..38c189a02bdaa941945a73aa4e3b0160230c287b 100755
--- a/Trigger/TrigT1/TrigT1RPCsteering/python/TrigT1RPCsteeringConfig.py
+++ b/Trigger/TrigT1/TrigT1RPCsteering/python/TrigT1RPCsteeringConfig.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 
 from TrigT1RPCsteering.TrigT1RPCsteeringConf import *
 from AthenaCommon.GlobalFlags import globalflags
diff --git a/Trigger/TrigT1/TrigT1RPCsteering/python/__init__.py b/Trigger/TrigT1/TrigT1RPCsteering/python/__init__.py
index a9420b89e539683fed2623806699763bcfd371f0..c0638976cf3a21b31139032808f323478d5e9ea0 100755
--- a/Trigger/TrigT1/TrigT1RPCsteering/python/__init__.py
+++ b/Trigger/TrigT1/TrigT1RPCsteering/python/__init__.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 
 # File: TrigT1RPCsteeringConfig/__init__.py
 
diff --git a/Trigger/TrigT1/TrigT1RPCsteering/src/TrigT1RPC.cxx b/Trigger/TrigT1/TrigT1RPCsteering/src/TrigT1RPC.cxx
index c12c54294faed3c9885a1126c144d23ffe681566..96dcc112c76e7ef1045304e660486301c73efbf3 100755
--- a/Trigger/TrigT1/TrigT1RPCsteering/src/TrigT1RPC.cxx
+++ b/Trigger/TrigT1/TrigT1RPCsteering/src/TrigT1RPC.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #include "TrigT1RPCsteering/TrigT1RPC.h"
diff --git a/Trigger/TrigT1/TrigT1Result/TrigT1Result/CTPResult.h b/Trigger/TrigT1/TrigT1Result/TrigT1Result/CTPResult.h
index 916c5943948d4a12d14a0214c2207be2bd9a9163..a8f71039a94dd5a34ca33675a2ef9134b6cad2ba 100755
--- a/Trigger/TrigT1/TrigT1Result/TrigT1Result/CTPResult.h
+++ b/Trigger/TrigT1/TrigT1Result/TrigT1Result/CTPResult.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 
diff --git a/Trigger/TrigT1/TrigT1Result/TrigT1Result/CTPResult.icc b/Trigger/TrigT1/TrigT1Result/TrigT1Result/CTPResult.icc
index e4a7d33b7317d0cb096ffa02b70aa21b67102a7b..b3ba29a3675548cd65ade7b1c49b1117fe874e6d 100644
--- a/Trigger/TrigT1/TrigT1Result/TrigT1Result/CTPResult.icc
+++ b/Trigger/TrigT1/TrigT1Result/TrigT1Result/CTPResult.icc
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 // tdaq-common includes for CTP format definition
diff --git a/Trigger/TrigT1/TrigT1Result/TrigT1Result/CTPRoI.h b/Trigger/TrigT1/TrigT1Result/TrigT1Result/CTPRoI.h
index ff390d79b0f594c4cca2594ede259fa5c874a644..1e73bc7881ed28d1413314fea5d726c4348c1e2e 100755
--- a/Trigger/TrigT1/TrigT1Result/TrigT1Result/CTPRoI.h
+++ b/Trigger/TrigT1/TrigT1Result/TrigT1Result/CTPRoI.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 
diff --git a/Trigger/TrigT1/TrigT1Result/TrigT1Result/CTP_Decoder.h b/Trigger/TrigT1/TrigT1Result/TrigT1Result/CTP_Decoder.h
index 914a0b752ed01260a2693f1bc253a12f185a2794..ca544ba89b748912bda6714b0460dea4868c0e73 100755
--- a/Trigger/TrigT1/TrigT1Result/TrigT1Result/CTP_Decoder.h
+++ b/Trigger/TrigT1/TrigT1Result/TrigT1Result/CTP_Decoder.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef TRIGT1_CTP_DECODER_H
diff --git a/Trigger/TrigT1/TrigT1Result/TrigT1Result/CTP_RDO.h b/Trigger/TrigT1/TrigT1Result/TrigT1Result/CTP_RDO.h
index 774ac68f453069b7c0a82a3ff3630150359bdca7..e3c0e3476c0e8ce6edb572f0d3d053b3b1ff61f4 100755
--- a/Trigger/TrigT1/TrigT1Result/TrigT1Result/CTP_RDO.h
+++ b/Trigger/TrigT1/TrigT1Result/TrigT1Result/CTP_RDO.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 // TO DO: encapsulate logic from raw data words! And fill the data
diff --git a/Trigger/TrigT1/TrigT1Result/TrigT1Result/CTP_RIO.h b/Trigger/TrigT1/TrigT1Result/TrigT1Result/CTP_RIO.h
index 612254b9b94930d6fae75a1d1f7d6c651ab6e659..bee2652336d2e3826969fae567dd63dc2b4b36cf 100755
--- a/Trigger/TrigT1/TrigT1Result/TrigT1Result/CTP_RIO.h
+++ b/Trigger/TrigT1/TrigT1Result/TrigT1Result/CTP_RIO.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 /* **********************************************************
diff --git a/Trigger/TrigT1/TrigT1Result/TrigT1Result/EMTauResult.h b/Trigger/TrigT1/TrigT1Result/TrigT1Result/EMTauResult.h
index e79ecfa350d77a2722d62d926605e96452ce916c..e10d5e934dfc7f6466ff9953d9b72836044d726b 100755
--- a/Trigger/TrigT1/TrigT1Result/TrigT1Result/EMTauResult.h
+++ b/Trigger/TrigT1/TrigT1Result/TrigT1Result/EMTauResult.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 /* **********************************************************
diff --git a/Trigger/TrigT1/TrigT1Result/TrigT1Result/EMTauRoI.h b/Trigger/TrigT1/TrigT1Result/TrigT1Result/EMTauRoI.h
index fcd5ac48fceba83d6680dd4bc697663ade69efbc..debc54cd44c7c866976710e115f61111ec8468c7 100755
--- a/Trigger/TrigT1/TrigT1Result/TrigT1Result/EMTauRoI.h
+++ b/Trigger/TrigT1/TrigT1Result/TrigT1Result/EMTauRoI.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 /* **********************************************************
diff --git a/Trigger/TrigT1/TrigT1Result/TrigT1Result/Header.h b/Trigger/TrigT1/TrigT1Result/TrigT1Result/Header.h
index 1818e471d22d007c33ffcca19f00db26318bf554..23e35fe1404c490736bacde0e072b601a841ffd7 100755
--- a/Trigger/TrigT1/TrigT1Result/TrigT1Result/Header.h
+++ b/Trigger/TrigT1/TrigT1Result/TrigT1Result/Header.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 
diff --git a/Trigger/TrigT1/TrigT1Result/TrigT1Result/Header.icc b/Trigger/TrigT1/TrigT1Result/TrigT1Result/Header.icc
index 3ba55a76c4c23b71e0f13f140bf7659299a83fdd..bf1488d05ffe8a3206ae5873aa274c19b0b03b37 100644
--- a/Trigger/TrigT1/TrigT1Result/TrigT1Result/Header.icc
+++ b/Trigger/TrigT1/TrigT1Result/TrigT1Result/Header.icc
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 
diff --git a/Trigger/TrigT1/TrigT1Result/TrigT1Result/JetEnergyResult.h b/Trigger/TrigT1/TrigT1Result/TrigT1Result/JetEnergyResult.h
index 885be510428935d8f6fe158c9a4a92b8611a4ae8..cfb0f36402ffc46f0e66fab68c3840283e8514ae 100755
--- a/Trigger/TrigT1/TrigT1Result/TrigT1Result/JetEnergyResult.h
+++ b/Trigger/TrigT1/TrigT1Result/TrigT1Result/JetEnergyResult.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 /* **********************************************************
diff --git a/Trigger/TrigT1/TrigT1Result/TrigT1Result/JetEnergyRoI.h b/Trigger/TrigT1/TrigT1Result/TrigT1Result/JetEnergyRoI.h
index 46912cd535d42b0a87d3bd347f4a00bed20f57c7..e08e198a9f9663f37d138b8185a73743cf088526 100755
--- a/Trigger/TrigT1/TrigT1Result/TrigT1Result/JetEnergyRoI.h
+++ b/Trigger/TrigT1/TrigT1Result/TrigT1Result/JetEnergyRoI.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 /* **********************************************************
diff --git a/Trigger/TrigT1/TrigT1Result/TrigT1Result/L1TopoResult.h b/Trigger/TrigT1/TrigT1Result/TrigT1Result/L1TopoResult.h
index 5888ae14bc35370e3391221a1a4f24f295674f12..3e436710b0c8ebbc84a26f24a7c9edd4391d7221 100644
--- a/Trigger/TrigT1/TrigT1Result/TrigT1Result/L1TopoResult.h
+++ b/Trigger/TrigT1/TrigT1Result/TrigT1Result/L1TopoResult.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef TRIGT1RESULT_L1TOPORESULT_H
diff --git a/Trigger/TrigT1/TrigT1Result/TrigT1Result/MuCTPIResult.h b/Trigger/TrigT1/TrigT1Result/TrigT1Result/MuCTPIResult.h
index 41d35f7a17fc9de8eb311c75e4d4f4d35c1edce5..ec0489d46daafcae56caf7000452015035b94efa 100755
--- a/Trigger/TrigT1/TrigT1Result/TrigT1Result/MuCTPIResult.h
+++ b/Trigger/TrigT1/TrigT1Result/TrigT1Result/MuCTPIResult.h
@@ -1,7 +1,7 @@
 // Dear emacs, this is -*- c++ -*-
 
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef TRIGT1RESULT_MUCTPIRESULT_H
diff --git a/Trigger/TrigT1/TrigT1Result/TrigT1Result/MuCTPIRoI.h b/Trigger/TrigT1/TrigT1Result/TrigT1Result/MuCTPIRoI.h
index 6dcebe46090b0a2ef57ef621b76e50a50b31d37a..0e1c683c68c1dc81163b0cc3d309f3ef3db6a8e0 100755
--- a/Trigger/TrigT1/TrigT1Result/TrigT1Result/MuCTPIRoI.h
+++ b/Trigger/TrigT1/TrigT1Result/TrigT1Result/MuCTPIRoI.h
@@ -1,7 +1,7 @@
 // Dear emacs, this is -*- c++ -*-
 
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef TRIGT1RESULT_MUCTPIROI_H
diff --git a/Trigger/TrigT1/TrigT1Result/TrigT1Result/MuCTPI_DataWord_Decoder.h b/Trigger/TrigT1/TrigT1Result/TrigT1Result/MuCTPI_DataWord_Decoder.h
index 7453b31867626ad0a5ab8c9bff8308dec83f9f82..d6c2de27e02ec2e40d86265cf11883cb50167a0a 100755
--- a/Trigger/TrigT1/TrigT1Result/TrigT1Result/MuCTPI_DataWord_Decoder.h
+++ b/Trigger/TrigT1/TrigT1Result/TrigT1Result/MuCTPI_DataWord_Decoder.h
@@ -1,7 +1,7 @@
 // Dear emacs, this is -*- c++ -*-
 
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef TRIGT1RESULT_MUCTPI_DATAWORD_DECODER_H
diff --git a/Trigger/TrigT1/TrigT1Result/TrigT1Result/MuCTPI_MultiplicityWord_Decoder.h b/Trigger/TrigT1/TrigT1Result/TrigT1Result/MuCTPI_MultiplicityWord_Decoder.h
index e99285208e9d20f10b70f3abf11461fa16252bd6..29e1f185bb5d382f857d842699de2a72991760aa 100755
--- a/Trigger/TrigT1/TrigT1Result/TrigT1Result/MuCTPI_MultiplicityWord_Decoder.h
+++ b/Trigger/TrigT1/TrigT1Result/TrigT1Result/MuCTPI_MultiplicityWord_Decoder.h
@@ -1,7 +1,7 @@
 // Dear emacs, this is -*- c++ -*-
 
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef TRIGT1RESULT_MUCTPI_MULTIPLICITYWORD_DECODER_H
diff --git a/Trigger/TrigT1/TrigT1Result/TrigT1Result/MuCTPI_RDO.h b/Trigger/TrigT1/TrigT1Result/TrigT1Result/MuCTPI_RDO.h
index aae7e77883c70f32a0d6db9e36af40325fb28084..97d63e18a70399dd0001db5d711b4967dc178dd6 100755
--- a/Trigger/TrigT1/TrigT1Result/TrigT1Result/MuCTPI_RDO.h
+++ b/Trigger/TrigT1/TrigT1Result/TrigT1Result/MuCTPI_RDO.h
@@ -1,7 +1,7 @@
 // Dear emacs, this is -*- c++ -*-
 
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef TRIGT1RESULT_MUCTPI_RDO_H
diff --git a/Trigger/TrigT1/TrigT1Result/TrigT1Result/MuCTPI_RIO.h b/Trigger/TrigT1/TrigT1Result/TrigT1Result/MuCTPI_RIO.h
index 91aa2de542e6c3330c67206e32b95e151bcb16b1..ce6d64dac2ebf327e9cbdc9279ff68effd218529 100755
--- a/Trigger/TrigT1/TrigT1Result/TrigT1Result/MuCTPI_RIO.h
+++ b/Trigger/TrigT1/TrigT1Result/TrigT1Result/MuCTPI_RIO.h
@@ -1,7 +1,7 @@
 // Dear emacs, this is -*- c++ -*-
 
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef TRIGT1RESULT_MUCTPI_RIO_H
diff --git a/Trigger/TrigT1/TrigT1Result/TrigT1Result/RecRoIBResult.h b/Trigger/TrigT1/TrigT1Result/TrigT1Result/RecRoIBResult.h
index 8f63e680578b36f66ba8b3ad401c9622ecab622b..b1d0830f33ea51de337af7729ac1834f18d8b784 100755
--- a/Trigger/TrigT1/TrigT1Result/TrigT1Result/RecRoIBResult.h
+++ b/Trigger/TrigT1/TrigT1Result/TrigT1Result/RecRoIBResult.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 /* **********************************************************
diff --git a/Trigger/TrigT1/TrigT1Result/TrigT1Result/RoIBResult.h b/Trigger/TrigT1/TrigT1Result/TrigT1Result/RoIBResult.h
index 310d337d8de2c537aaff141d2dbf2a5659f17d1f..f2b8410252609b21c457ef7ac3c03876cf0e4b8f 100755
--- a/Trigger/TrigT1/TrigT1Result/TrigT1Result/RoIBResult.h
+++ b/Trigger/TrigT1/TrigT1Result/TrigT1Result/RoIBResult.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 
diff --git a/Trigger/TrigT1/TrigT1Result/TrigT1Result/Trailer.h b/Trigger/TrigT1/TrigT1Result/TrigT1Result/Trailer.h
index 0ba86b33002d5ebb337a940db3bfe385b59aee75..89fad78cffab905f9eb75e8559cb70c44550263d 100755
--- a/Trigger/TrigT1/TrigT1Result/TrigT1Result/Trailer.h
+++ b/Trigger/TrigT1/TrigT1Result/TrigT1Result/Trailer.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 
diff --git a/Trigger/TrigT1/TrigT1Result/TrigT1Result/Trailer.icc b/Trigger/TrigT1/TrigT1Result/TrigT1Result/Trailer.icc
index 760bb07b0c8de0057d8f9cec22067191b4a221af..7cb724a62fc4de18d3283c6738e2256958cc2f60 100644
--- a/Trigger/TrigT1/TrigT1Result/TrigT1Result/Trailer.icc
+++ b/Trigger/TrigT1/TrigT1Result/TrigT1Result/Trailer.icc
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 
diff --git a/Trigger/TrigT1/TrigT1Result/TrigT1Result/TrigT1ResultDict.h b/Trigger/TrigT1/TrigT1Result/TrigT1Result/TrigT1ResultDict.h
index ccc11cc5b671ceb1d8cf333fb61accaeab5e80f7..1334190baf5194f86ee65071addb65b004eb2434 100755
--- a/Trigger/TrigT1/TrigT1Result/TrigT1Result/TrigT1ResultDict.h
+++ b/Trigger/TrigT1/TrigT1Result/TrigT1Result/TrigT1ResultDict.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 /*
diff --git a/Trigger/TrigT1/TrigT1Result/doc/packagedoc.h b/Trigger/TrigT1/TrigT1Result/doc/packagedoc.h
index 87b17b9f3c0dd4a5f75f427affc6b3520277b29c..5c2f44df92982a51d819f6300edba321b600225c 100644
--- a/Trigger/TrigT1/TrigT1Result/doc/packagedoc.h
+++ b/Trigger/TrigT1/TrigT1Result/doc/packagedoc.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 /**
diff --git a/Trigger/TrigT1/TrigT1Result/src/CTPResult.cxx b/Trigger/TrigT1/TrigT1Result/src/CTPResult.cxx
index beb07da0513860f96c42d4eba110b615bbd051f5..f47d2399fa0a2626df01cfef3e171e8e275a4364 100755
--- a/Trigger/TrigT1/TrigT1Result/src/CTPResult.cxx
+++ b/Trigger/TrigT1/TrigT1Result/src/CTPResult.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 
diff --git a/Trigger/TrigT1/TrigT1Result/src/CTP_Decoder.cxx b/Trigger/TrigT1/TrigT1Result/src/CTP_Decoder.cxx
index ced997806f68e4581f738cb70988e92eab34efe9..9a37b65293ac4718f29a5f2035d218360b1f531f 100755
--- a/Trigger/TrigT1/TrigT1Result/src/CTP_Decoder.cxx
+++ b/Trigger/TrigT1/TrigT1Result/src/CTP_Decoder.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 
diff --git a/Trigger/TrigT1/TrigT1Result/src/CTP_RDO.cxx b/Trigger/TrigT1/TrigT1Result/src/CTP_RDO.cxx
index d00a7105d9d728a5636b232f2ec39ee937b767af..ce1e091f6517beb6cc261aadafd2a5112c8608c6 100755
--- a/Trigger/TrigT1/TrigT1Result/src/CTP_RDO.cxx
+++ b/Trigger/TrigT1/TrigT1Result/src/CTP_RDO.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 
diff --git a/Trigger/TrigT1/TrigT1Result/src/CTP_RIO.cxx b/Trigger/TrigT1/TrigT1Result/src/CTP_RIO.cxx
index 063fc1680eef0739f06ca796ba4f8613031e7320..3b878df48b8cd888b2b1e9263aa4280e4ee0e9f0 100755
--- a/Trigger/TrigT1/TrigT1Result/src/CTP_RIO.cxx
+++ b/Trigger/TrigT1/TrigT1Result/src/CTP_RIO.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #include "GaudiKernel/Bootstrap.h"
diff --git a/Trigger/TrigT1/TrigT1Result/src/EMTauResult.cxx b/Trigger/TrigT1/TrigT1Result/src/EMTauResult.cxx
index 76332a59a2229443972f0f31cb21a9842f4c26b3..e24cdee51420954ab59a534732848ac8a650115e 100755
--- a/Trigger/TrigT1/TrigT1Result/src/EMTauResult.cxx
+++ b/Trigger/TrigT1/TrigT1Result/src/EMTauResult.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 
diff --git a/Trigger/TrigT1/TrigT1Result/src/EMTauRoI.cxx b/Trigger/TrigT1/TrigT1Result/src/EMTauRoI.cxx
index 1ba8b221b4b36471607d81ccf1b8ccf395bbc366..1176f9c807f692c86b7ce286fb5d200595453af7 100755
--- a/Trigger/TrigT1/TrigT1Result/src/EMTauRoI.cxx
+++ b/Trigger/TrigT1/TrigT1Result/src/EMTauRoI.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 
diff --git a/Trigger/TrigT1/TrigT1Result/src/Header.cxx b/Trigger/TrigT1/TrigT1Result/src/Header.cxx
index 465e771bcb88746adfcdff31438842a8a579071e..5ddd0bcd29327e7e95f8f241ea9d4c0dc678db5c 100755
--- a/Trigger/TrigT1/TrigT1Result/src/Header.cxx
+++ b/Trigger/TrigT1/TrigT1Result/src/Header.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 
diff --git a/Trigger/TrigT1/TrigT1Result/src/JetEnergyResult.cxx b/Trigger/TrigT1/TrigT1Result/src/JetEnergyResult.cxx
index dfa3a1dd4fd1dbc6eaaeb468d7626c872880032d..483d29ceeb7ef414a16d05a1f2c67468c8583a6a 100755
--- a/Trigger/TrigT1/TrigT1Result/src/JetEnergyResult.cxx
+++ b/Trigger/TrigT1/TrigT1Result/src/JetEnergyResult.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 
diff --git a/Trigger/TrigT1/TrigT1Result/src/JetEnergyRoI.cxx b/Trigger/TrigT1/TrigT1Result/src/JetEnergyRoI.cxx
index 596671e4f2f76213f8052015f31b78cc8302d24a..6acf5c9090207bec9f5648a3df63facef92d752c 100755
--- a/Trigger/TrigT1/TrigT1Result/src/JetEnergyRoI.cxx
+++ b/Trigger/TrigT1/TrigT1Result/src/JetEnergyRoI.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 
diff --git a/Trigger/TrigT1/TrigT1Result/src/L1TopoResult.cxx b/Trigger/TrigT1/TrigT1Result/src/L1TopoResult.cxx
index 9186f6f195286f4603e2fd27e4573095e18d5d93..1708ec2b088e5e4e1b6ec8532f1d93a4f1fe49cf 100644
--- a/Trigger/TrigT1/TrigT1Result/src/L1TopoResult.cxx
+++ b/Trigger/TrigT1/TrigT1Result/src/L1TopoResult.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #include "TrigT1Result/L1TopoResult.h"
diff --git a/Trigger/TrigT1/TrigT1Result/src/MuCTPIResult.cxx b/Trigger/TrigT1/TrigT1Result/src/MuCTPIResult.cxx
index 57831e17685f0eaf78cd372e159821f169f2b85d..3f3c40efae0e0e7e13fb934dca0f7af7bf0414a8 100755
--- a/Trigger/TrigT1/TrigT1Result/src/MuCTPIResult.cxx
+++ b/Trigger/TrigT1/TrigT1Result/src/MuCTPIResult.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 
diff --git a/Trigger/TrigT1/TrigT1Result/src/MuCTPIRoI.cxx b/Trigger/TrigT1/TrigT1Result/src/MuCTPIRoI.cxx
index eb06c8a38894bcb2a67d7c75e67338951003b012..23bb73c9e31a6497ebabed14fe869d3ccd2446bc 100755
--- a/Trigger/TrigT1/TrigT1Result/src/MuCTPIRoI.cxx
+++ b/Trigger/TrigT1/TrigT1Result/src/MuCTPIRoI.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 
diff --git a/Trigger/TrigT1/TrigT1Result/src/MuCTPI_DataWord_Decoder.cxx b/Trigger/TrigT1/TrigT1Result/src/MuCTPI_DataWord_Decoder.cxx
index b92c50dacd2b633b209b3c52d0e7eace54933262..3ade8210f10780358c5d29b8a8eb52816d47cac8 100755
--- a/Trigger/TrigT1/TrigT1Result/src/MuCTPI_DataWord_Decoder.cxx
+++ b/Trigger/TrigT1/TrigT1Result/src/MuCTPI_DataWord_Decoder.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 
diff --git a/Trigger/TrigT1/TrigT1Result/src/MuCTPI_MultiplicityWord_Decoder.cxx b/Trigger/TrigT1/TrigT1Result/src/MuCTPI_MultiplicityWord_Decoder.cxx
index 85fdfcab007f907a8074c0058418df065994ed1d..5e01c7b80070673d2d2fc07d6d314a6b41d6f1c2 100755
--- a/Trigger/TrigT1/TrigT1Result/src/MuCTPI_MultiplicityWord_Decoder.cxx
+++ b/Trigger/TrigT1/TrigT1Result/src/MuCTPI_MultiplicityWord_Decoder.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 
diff --git a/Trigger/TrigT1/TrigT1Result/src/MuCTPI_RIO.cxx b/Trigger/TrigT1/TrigT1Result/src/MuCTPI_RIO.cxx
index fd1eaf5a927970b08fea9e551d8b0446f95eff48..7d04ee430d48c5d87b1a9bd0f10ebf90418cce8c 100755
--- a/Trigger/TrigT1/TrigT1Result/src/MuCTPI_RIO.cxx
+++ b/Trigger/TrigT1/TrigT1Result/src/MuCTPI_RIO.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 
diff --git a/Trigger/TrigT1/TrigT1Result/src/RecRoIBResult.cxx b/Trigger/TrigT1/TrigT1Result/src/RecRoIBResult.cxx
index b0cb6689665b92ca9733b87639f5472c0ec8ceeb..e28e24ec9f8ae53be4139b0e3b7a1275292e477e 100755
--- a/Trigger/TrigT1/TrigT1Result/src/RecRoIBResult.cxx
+++ b/Trigger/TrigT1/TrigT1Result/src/RecRoIBResult.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 
diff --git a/Trigger/TrigT1/TrigT1Result/src/RoIBResult.cxx b/Trigger/TrigT1/TrigT1Result/src/RoIBResult.cxx
index 10eb7e07845c24ffc13f643f1cc665d7e466d785..2f4a66c7bb52ac71dd41424f8f30fa47549d0eb7 100755
--- a/Trigger/TrigT1/TrigT1Result/src/RoIBResult.cxx
+++ b/Trigger/TrigT1/TrigT1Result/src/RoIBResult.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #include <iostream>
diff --git a/Trigger/TrigT1/TrigT1Result/src/Trailer.cxx b/Trigger/TrigT1/TrigT1Result/src/Trailer.cxx
index 06d8b074b1ed056c1ead8b978dc4585d05b733e0..c3b6c17c1210ec706adaa0ceca631101bfa25118 100755
--- a/Trigger/TrigT1/TrigT1Result/src/Trailer.cxx
+++ b/Trigger/TrigT1/TrigT1Result/src/Trailer.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 
diff --git a/Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/CTPByteStreamCnv.h b/Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/CTPByteStreamCnv.h
index 98cf450d92e4bebd4de8d4b5d2a82dda3d0e053d..6036434596b041148d930e844d5ac19c39ab4531 100755
--- a/Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/CTPByteStreamCnv.h
+++ b/Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/CTPByteStreamCnv.h
@@ -1,7 +1,7 @@
 // Dear emacs, this is -*- c++ -*-
 
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef TRIGT1RESULTBYTESTREAM_CTPBYTESTREAMCNV_H
diff --git a/Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/CTPByteStreamTool.h b/Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/CTPByteStreamTool.h
index a22cfe453f99d93b9f2d57ddd1b8f5eff75bcd68..6d7358bdd1f2a97abe4fa011cd66187544dd953c 100755
--- a/Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/CTPByteStreamTool.h
+++ b/Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/CTPByteStreamTool.h
@@ -1,7 +1,7 @@
 // Dear emacs, this is -*- c++ -*-
 
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef TRIGT1RESULTBYTESTREAM_CTPBYTESTREAMTOOL_H
diff --git a/Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/CTPSrcIdMap.h b/Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/CTPSrcIdMap.h
index caee42dca38c2ef42506435558ab0ab6029f0478..548e9f611c0951176c4c79d864f96ec52dfe44eb 100755
--- a/Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/CTPSrcIdMap.h
+++ b/Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/CTPSrcIdMap.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef TRIGT1RESULTBYTESTREAM_CTPSRCIDMAP_H
diff --git a/Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/L1SrcIdMap.h b/Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/L1SrcIdMap.h
index deb797aaed7c8b05e7136e2a7a3dea03f9fcbba0..359eba7cb25d87280ca21fce4c384ea666435c61 100755
--- a/Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/L1SrcIdMap.h
+++ b/Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/L1SrcIdMap.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef TRIGT1RESULTBYTESTREAM_L1SRCIDMAP_H
diff --git a/Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/MuCTPIByteStreamCnv.h b/Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/MuCTPIByteStreamCnv.h
index 4e95eaf61601c2fd53fb6464093237d460420e0d..e5eae54bfd743ccb98ea2b597abf4976585d4a52 100755
--- a/Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/MuCTPIByteStreamCnv.h
+++ b/Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/MuCTPIByteStreamCnv.h
@@ -1,7 +1,7 @@
 // Dear emacs, this is -*- c++ -*-
 
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef TRIGT1RESULTBYTESTREAM_MUCTPIBYTESTREAMCNV_H
diff --git a/Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/MuCTPIByteStreamTool.h b/Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/MuCTPIByteStreamTool.h
index af689afc3a1f698bcf91909146242bf1bc8340ff..d0ce8534983624284db649b4700215c79c97f9bb 100755
--- a/Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/MuCTPIByteStreamTool.h
+++ b/Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/MuCTPIByteStreamTool.h
@@ -1,7 +1,7 @@
 // Dear emacs, this is -*- c++ -*-
 
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef TRIGT1RESULTBYTESTREAM_MUCTPIBYTESTREAMTOOL_H
diff --git a/Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/MuCTPISrcIdMap.h b/Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/MuCTPISrcIdMap.h
index 791a5a3d68cb24c481b37f7626743222b7c521b1..66c757cffa8ccb2fe2d586469221fe22c2410d68 100755
--- a/Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/MuCTPISrcIdMap.h
+++ b/Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/MuCTPISrcIdMap.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef TRIGT1RESULTBYTESTREAM_MUCTPISRCIDMAP_H
diff --git a/Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/RecCTPByteStreamCnv.h b/Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/RecCTPByteStreamCnv.h
index e8ab5a37bb0250a684ea8f730da8b064f3c8d5b8..0a5eed5e95a1c28ee60ffd649b39eda3603e5237 100755
--- a/Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/RecCTPByteStreamCnv.h
+++ b/Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/RecCTPByteStreamCnv.h
@@ -1,7 +1,7 @@
 // Dear emacs, this is -*- c++ -*-
 
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef TRIGT1RESULTBYTESTREAM_RECCTPBYTESTREAMCNV_H
diff --git a/Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/RecCTPByteStreamTool.h b/Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/RecCTPByteStreamTool.h
index eafbd1c97c26dc8cee04253551c3de756c516c96..bf489c062ae9f7147ff67dc54f62ba6e86d1aeba 100755
--- a/Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/RecCTPByteStreamTool.h
+++ b/Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/RecCTPByteStreamTool.h
@@ -1,7 +1,7 @@
 // Dear emacs, this is -*- c++ -*-
 
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef TRIGT1RESULTBYTESTREAM_RECCTPBYTESTREAMTOOL_H
diff --git a/Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/RecMuCTPIByteStreamCnv.h b/Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/RecMuCTPIByteStreamCnv.h
index 093c57fd33fa388df49d441844cc3d87c40a8214..3e2dfbddf3c3c663cf0cf8f60b8f8076221a9875 100755
--- a/Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/RecMuCTPIByteStreamCnv.h
+++ b/Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/RecMuCTPIByteStreamCnv.h
@@ -1,7 +1,7 @@
 // Dear emacs, this is -*- c++ -*-
 
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef TRIGT1RESULTBYTESTREAM_RECMUCTPIBYTESTREAMCNV_H
diff --git a/Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/RecMuCTPIByteStreamTool.h b/Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/RecMuCTPIByteStreamTool.h
index c1361b68792e953133f19a79733155771c766e9c..f9d326607d35a9a06d1b5349d99e89f40d0a60a0 100755
--- a/Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/RecMuCTPIByteStreamTool.h
+++ b/Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/RecMuCTPIByteStreamTool.h
@@ -1,7 +1,7 @@
 // Dear emacs, this is -*- c++ -*-
 
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef TRIGT1RESULTBYTESTREAM_RECMUCTPIBYTESTREAMTOOL_H
diff --git a/Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/RecRoIBResultByteStreamCnv.h b/Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/RecRoIBResultByteStreamCnv.h
index ece0869796ff15e780f4e99ee1f7953b5b8e8794..35ca48a44166999cf83d01abfa0cbbbb5643549a 100755
--- a/Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/RecRoIBResultByteStreamCnv.h
+++ b/Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/RecRoIBResultByteStreamCnv.h
@@ -1,7 +1,7 @@
 // Dear emacs, this is -*- c++ -*-
 
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef TRIGT1RESULTBYTESTREAM_RECROIBRESULTBYTESTREAMCNV_H
diff --git a/Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/RecRoIBResultByteStreamCnv.icc b/Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/RecRoIBResultByteStreamCnv.icc
index 21265c38ce6e4bf211ed14f0d5a1015b69748779..4ae484f8d9dbcd5fcb6853de0af459726dae796c 100755
--- a/Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/RecRoIBResultByteStreamCnv.icc
+++ b/Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/RecRoIBResultByteStreamCnv.icc
@@ -1,7 +1,7 @@
 // Dear emacs, this is -*- c++ -*-
 
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef TRIGT1RESULTBYTESTREAM_RECROIBRESULTBYTESTREAMCNV_ICC
diff --git a/Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/RecRoIBResultByteStreamTool.h b/Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/RecRoIBResultByteStreamTool.h
index 5a3f16f1b77277f246fbe7b31fb0b8b4c60c6efe..3613fdd71b44791374c3754b4b9d9b5fefa60867 100755
--- a/Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/RecRoIBResultByteStreamTool.h
+++ b/Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/RecRoIBResultByteStreamTool.h
@@ -1,7 +1,7 @@
 // Dear emacs, this is -*- c++ -*-
 
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef TRIGT1RESULTBYTESTREAM_RECROIBRESULTBYTESTREAMTOOL_H
diff --git a/Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/RecRoIBResultByteStreamTool.icc b/Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/RecRoIBResultByteStreamTool.icc
index d7e60439aeff1113869cf9e6a7d764fb717b6962..14b85ba382a99b6f555e4e5300a175ac9f56beee 100755
--- a/Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/RecRoIBResultByteStreamTool.icc
+++ b/Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/RecRoIBResultByteStreamTool.icc
@@ -1,7 +1,7 @@
 // Dear emacs, this is -*- c++ -*-
 
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef TRIGT1RESULTBYTESTREAM_RECROIBRESULTBYTESTREAMTOOL_ICC
diff --git a/Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/RoIBResultByteStreamCnv.h b/Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/RoIBResultByteStreamCnv.h
index 2bfc6ebecfa7b506f4caf7581861b583ff381544..1e6f4be66fc4c6b4b000d0c65cfa6cf28d3d4c2f 100755
--- a/Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/RoIBResultByteStreamCnv.h
+++ b/Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/RoIBResultByteStreamCnv.h
@@ -1,7 +1,7 @@
 // Dear emacs, this is -*- c++ -*-
 
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef TRIGT1RESULTBYTESTREAM_ROIBRESULTBYTESTREAMCNV_H
diff --git a/Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/RoIBResultByteStreamCnv.icc b/Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/RoIBResultByteStreamCnv.icc
index dc1276a561ff490d0284079335e532fd7af8efe3..6cac6272f316a428cf75405b2f1f46afc7e9d6b5 100755
--- a/Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/RoIBResultByteStreamCnv.icc
+++ b/Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/RoIBResultByteStreamCnv.icc
@@ -1,7 +1,7 @@
 // Dear emacs, this is -*- c++ -*-
 
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef TRIGT1RESULTBYTESTREAM_ROIBRESULTBYTESTREAMCNV_ICC
diff --git a/Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/RoIBResultByteStreamTool.h b/Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/RoIBResultByteStreamTool.h
index 9aebc8c73042a56bcc4d224bccbf582ba7412893..8a65af4392049669187f00359cbd9f69717f7f76 100755
--- a/Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/RoIBResultByteStreamTool.h
+++ b/Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/RoIBResultByteStreamTool.h
@@ -1,7 +1,7 @@
 // Dear emacs, this is -*- c++ -*-
 
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef TRIGT1RESULTBYTESTREAM_ROIBRESULTBYTESTREAMTOOL_H
diff --git a/Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/RoIBResultByteStreamTool.icc b/Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/RoIBResultByteStreamTool.icc
index 9f1896aae00361e2e346749092f6507323083af8..33cdc1f7021785baee96356ed7351575aa10aed9 100755
--- a/Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/RoIBResultByteStreamTool.icc
+++ b/Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/RoIBResultByteStreamTool.icc
@@ -1,7 +1,7 @@
 // Dear emacs, this is -*- c++ -*-
 
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef TRIGT1RESULTBYTESTREAM_ROIBRESULTBYTESTREAMTOOL_ICC
@@ -9,9 +9,6 @@
 
 #include <exception>
 
-// Gaudi/Athena include(s):
-#include "GaudiKernel/MsgStream.h"
-
 // eformat include(s):
 #include "eformat/SourceIdentifier.h"
 
@@ -30,8 +27,7 @@ template< class ROBF >
 StatusCode RoIBResultByteStreamTool::convert( const std::vector< ROBF >& robs,
                                               ROIB::RoIBResult*& result ) {
 
-  MsgStream log( msgSvc(), name() );
-  log << MSG::DEBUG << "executing convert() from ROBFragments to RDO" << endmsg;
+  ATH_MSG_DEBUG("executing convert() from ROBFragments to RDO");
 
   /* Create all RDOs */
   ROIB::CTPResult cTPResult;
@@ -86,10 +82,12 @@ StatusCode RoIBResultByteStreamTool::convert( const std::vector< ROBF >& robs,
     DataType status;
     rob.rod_status( status );
     uint32_t nstatus = rob.rod_nstatus();
-    log << MSG::VERBOSE << "Number of status words: " << nstatus << endmsg;
-    for( uint32_t i = 0; i < nstatus; ++i, ++status ) {
-       log << MSG::VERBOSE << "   Status word: 0x" << MSG::hex << std::setw( 8 )
-           << std::setfill( '0' ) << *status << endmsg;
+    ATH_MSG_VERBOSE("Number of status words: " << nstatus);
+    if (msgLvl(MSG::VERBOSE)) {
+      for( uint32_t i = 0; i < nstatus; ++i, ++status ) {
+        ATH_MSG_VERBOSE("   Status word: 0x" << MSG::hex << std::setw( 8 )
+            << std::setfill( '0' ) << *status);
+      }
     }
     rob.rod_status( status );
 
@@ -102,16 +100,16 @@ StatusCode RoIBResultByteStreamTool::convert( const std::vector< ROBF >& robs,
        statInfo = static_cast< uint32_t >( *status );
     }
 
-    log << MSG::DEBUG << "ROB ID 0x" << MSG::hex << robId <<  " ROD ID 0x" 
+    ATH_MSG_DEBUG("ROB ID 0x" << MSG::hex << robId <<  " ROD ID 0x" 
         << rodId << MSG::dec << " ROB fragment size " 
-        << robFragSize << " ROD fragment size " << rodFragSize << endmsg;
+        << robFragSize << " ROD fragment size " << rodFragSize);
 
     /* CTP ROB */
     eformat::helper::SourceIdentifier helpCTPID( eformat::TDAQ_CTP, m_ctpModuleID );
     eformat::helper::SourceIdentifier helpCTPID_II( eformat::TDAQ_CTP, 0 );
     
-    log << MSG::DEBUG << "Check ROD ID against CTP 0x" << MSG::hex 
-	<< helpCTPID.code() << MSG::dec << endmsg;
+    ATH_MSG_DEBUG("Check ROD ID against CTP 0x" << MSG::hex 
+	<< helpCTPID.code() << MSG::dec);
     if( rodId == helpCTPID.code() || 
         // this is a hack to catch the early data with the old CTP
         // firmware, which assigns 0x770000 to both DAQ and LVL2 ROD
@@ -121,10 +119,10 @@ StatusCode RoIBResultByteStreamTool::convert( const std::vector< ROBF >& robs,
         ( rodId == helpCTPID_II.code() && rodFragSize == 46 ) ) {
 
       if( rodId == helpCTPID_II.code() && rodFragSize == 46 ) {
-        log << MSG::DEBUG << "Take CTP ROD fragment with ID 0x" << MSG::hex << rodId << MSG::dec  << endmsg;
+        ATH_MSG_DEBUG("Take CTP ROD fragment with ID 0x" << MSG::hex << rodId << MSG::dec );
       }
-      log << MSG::DEBUG << "   Found CTP ROB." << endmsg;
-      log << MSG::VERBOSE << "   Dumping RoI Words:" << endmsg;
+      ATH_MSG_DEBUG("   Found CTP ROB.");
+      ATH_MSG_VERBOSE("   Dumping RoI Words:");
 
       /* Celebrate finding the ROD */
       cTPFound = true;
@@ -135,14 +133,16 @@ StatusCode RoIBResultByteStreamTool::convert( const std::vector< ROBF >& robs,
       rob.rod_data( data );
       uint32_t ndata = rob.rod_ndata();
       std::vector< ROIB::CTPRoI > cTPContent;
+      cTPContent.reserve(ndata);
       for( uint32_t i = 0; i < ndata; ++i, ++data ) {
-        log << MSG::VERBOSE << "       0x" << MSG::hex << std::setw( 8 )
-            << static_cast< uint32_t >( *data ) << endmsg;
+        ATH_MSG_VERBOSE("       0x" << MSG::hex << std::setw( 8 )
+            << static_cast< uint32_t >( *data ));
         ROIB::CTPRoI thisRoI( static_cast<uint32_t>( *data ) );
         cTPContent.push_back( thisRoI );
       }
       /* Create Trailer */
       std::vector< uint32_t > words;
+      words.reserve(5);
       words.push_back( errorStat );         // error status
       words.push_back( statInfo );          // status info
       words.push_back( 2 );                 // number of status words
@@ -164,8 +164,8 @@ StatusCode RoIBResultByteStreamTool::convert( const std::vector< ROBF >& robs,
     eformat::helper::SourceIdentifier helpMuonID( eformat::TDAQ_MUON_CTP_INTERFACE, m_muCTPIModuleID );
     if( rodId == helpMuonID.code() ) {
 
-      log << MSG::DEBUG << "   Found MuCTPI ROB." << endmsg;
-      log << MSG::VERBOSE << "   Dumping RoI Words:" << endmsg;
+      ATH_MSG_DEBUG( "   Found MuCTPI ROB.");
+      ATH_MSG_VERBOSE( "   Dumping RoI Words:");
 
       /* Celebrate finding the ROB */
       muCTPIFound = true;
@@ -176,15 +176,17 @@ StatusCode RoIBResultByteStreamTool::convert( const std::vector< ROBF >& robs,
       rob.rod_data( data );
       uint32_t ndata = rob.rod_ndata();
       std::vector< ROIB::MuCTPIRoI > muCTPIContent;
+      muCTPIContent.reserve(ndata);
       for( uint32_t i = 0; i < ndata; ++i, ++data ) {
-        log << MSG::VERBOSE << "       0x" << MSG::hex << std::setw( 8 )
-            << static_cast< uint32_t >( *data ) << endmsg;
+        ATH_MSG_VERBOSE("       0x" << MSG::hex << std::setw( 8 )
+            << static_cast< uint32_t >( *data ));
         ROIB::MuCTPIRoI thisRoI( static_cast< uint32_t >( *data ) );
         muCTPIContent.push_back( thisRoI );
       }
 
       /* Create trailer */
       std::vector< uint32_t > words;
+      words.reserve(5);
       words.push_back( errorStat );            // error status
       words.push_back( statInfo );             // status info
       words.push_back( 2 );                    // number of status words
@@ -202,8 +204,8 @@ StatusCode RoIBResultByteStreamTool::convert( const std::vector< ROBF >& robs,
 	 eformat::helper::SourceIdentifier helpJetID_1( eformat::TDAQ_CALO_JET_PROC_ROI, m_jetModuleID[1] );
     if( rodId == helpJetID_0.code() || rodId == helpJetID_1.code() ) {
 
-      log << MSG::DEBUG << "   Found Jet/Energy ROB." << endmsg;
-      log << MSG::VERBOSE << "   Dumping RoI Words:" << endmsg;
+      ATH_MSG_DEBUG("   Found Jet/Energy ROB.");
+      ATH_MSG_VERBOSE("   Dumping RoI Words:");
 
       /* Create header */
       ROIB::Header jetEnergyHead( rodId, evtNum, formatVersion );
@@ -212,14 +214,16 @@ StatusCode RoIBResultByteStreamTool::convert( const std::vector< ROBF >& robs,
       rob.rod_data( data );
       uint32_t ndata = rob.rod_ndata();
       std::vector< ROIB::JetEnergyRoI > jetEnergyContent;
+      jetEnergyContent.reserve(ndata);
       for( uint32_t i = 0; i < ndata; ++i, ++data ) {
-        log << MSG::VERBOSE << "       0x" << MSG::hex << std::setw( 8 )
-            << static_cast< uint32_t >( *data ) << endmsg;
+        ATH_MSG_VERBOSE("       0x" << MSG::hex << std::setw( 8 )
+            << static_cast< uint32_t >( *data ));
         ROIB::JetEnergyRoI thisRoI( static_cast< uint32_t >( *data ) );
         jetEnergyContent.push_back( thisRoI );
       }
       /* Create trailer */
       std::vector< uint32_t > words;
+      words.reserve(5);
       words.push_back( errorStat );               // error status
       words.push_back( statInfo );                // status info
       words.push_back( 2 );                       // number of status words
@@ -244,8 +248,8 @@ StatusCode RoIBResultByteStreamTool::convert( const std::vector< ROBF >& robs,
     if( rodId == helpEMTauID_0.code() || rodId == helpEMTauID_1.code() ||
         rodId == helpEMTauID_2.code() || rodId == helpEMTauID_3.code() ) {
 
-      log << MSG::DEBUG << "   Found EM/Tau ROB." << endmsg;
-      log << MSG::VERBOSE << "   Dumping RoI Words:" << endmsg;
+      ATH_MSG_DEBUG("   Found EM/Tau ROB.");
+      ATH_MSG_VERBOSE("   Dumping RoI Words:");
 
       /* Create header */
       ROIB::Header eMTauHead( rodId, evtNum, formatVersion );
@@ -254,14 +258,16 @@ StatusCode RoIBResultByteStreamTool::convert( const std::vector< ROBF >& robs,
       rob.rod_data( data );
       uint32_t ndata = rob.rod_ndata();
       std::vector<ROIB::EMTauRoI> eMTauContent;
+      eMTauContent.reserve(ndata);
       for( uint32_t i = 0; i < ndata; ++i, ++data ) {
-        log << MSG::VERBOSE << "       0x" << MSG::hex << std::setw( 8 )
-            << static_cast< uint32_t >( *data ) << endmsg;
+        ATH_MSG_VERBOSE("       0x" << MSG::hex << std::setw( 8 )
+            << static_cast< uint32_t >( *data ));
         ROIB::EMTauRoI thisRoI( static_cast<uint32_t>( *data ) );
         eMTauContent.push_back( thisRoI );
       }
       /* Create Trailer */
       std::vector< uint32_t > words;
+      words.reserve(5);
       words.push_back( errorStat );           // error status
       words.push_back( statInfo );            // status info
       words.push_back( 2 );                   // number of status words
@@ -303,19 +309,20 @@ StatusCode RoIBResultByteStreamTool::convert( const std::vector< ROBF >& robs,
       L1TopoRDO l1TopoContent;
       ATH_MSG_VERBOSE( "   Dumping RoI Words:" );
       std::vector<uint32_t> vDataWords;
+      vDataWords.reserve(ndata);
       for ( uint32_t i = 0; i < ndata; ++i, ++data ) {
-	vDataWords.push_back( static_cast<uint32_t>( *data ) );
-	ATH_MSG_VERBOSE( "     0x" << MSG::hex << std::setfill ('0') << std::setw( 8 )  << static_cast<uint32_t>( *data ) << MSG::dec);
+        vDataWords.push_back( static_cast<uint32_t>( *data ) );
+        ATH_MSG_VERBOSE( "     0x" << MSG::hex << std::setfill ('0') << std::setw( 8 )  << static_cast<uint32_t>( *data ) << MSG::dec);
       }
       l1TopoContent.setDataWords(vDataWords);
       l1TopoContent.setSourceID(rodId);
       /* Create Trailer */
       std::vector< uint32_t > words;
       // the two status words
+      words.reserve(5);
       words.push_back( errorStat );         // error status
       words.push_back( statInfo );          // status info
       l1TopoContent.setStatusWords(words);  // copy 2 status words to RDO
-      //
       words.push_back( 2 );                 // number of status words
       words.push_back( ndata );             // number of data words
       words.push_back( 1 );                 // status block position
@@ -352,33 +359,33 @@ StatusCode RoIBResultByteStreamTool::convert( const std::vector< ROBF >& robs,
       eMTauFound[ 0 ] && eMTauFound[ 1 ] && eMTauFound[ 2 ] && eMTauFound[ 3 ] ) {
 
     result = new ROIB::RoIBResult( muCTPIResult, cTPResult, jetEnergyResult, eMTauResult );
-    log << MSG::DEBUG << "All RoI Builder ROB fragments found" << endmsg;
+    ATH_MSG_DEBUG("All RoI Builder ROB fragments found");
 
   } else if( cTPFound && jetEnergyFound[ 0 ] && jetEnergyFound[ 1 ] &&
              eMTauFound[ 0 ] && eMTauFound[ 1 ] && eMTauFound[ 2 ] && eMTauFound[ 3 ] ) {
 
     result = new ROIB::RoIBResult( cTPResult, eMTauResult, jetEnergyResult );
-    log << MSG::DEBUG << "MuCTPI ROB fragment not found, built RoIBResult object without it." << endmsg;
+    ATH_MSG_DEBUG("MuCTPI ROB fragment not found, built RoIBResult object without it.");
 
   } else if( cTPFound && eMTauFound[ 0 ] && eMTauFound[ 1 ] &&
              eMTauFound[ 2 ] && eMTauFound[ 3 ] ) {
 
     result = new ROIB::RoIBResult( cTPResult, eMTauResult );
-    log << MSG::DEBUG << "MuCTPI and Jet/Energy fragments not found, built RoIBResult object without them." << endmsg;
+    ATH_MSG_DEBUG("MuCTPI and Jet/Energy fragments not found, built RoIBResult object without them.");
 
   } else if( cTPFound && muCTPIFound ) {
 	  // jetEnergyResult and eMTauResult are empty
     result = new ROIB::RoIBResult( muCTPIResult, cTPResult, jetEnergyResult, eMTauResult );
-    log << MSG::DEBUG << "Calo fragments not found, built RoIBResult from CTPResult and MuCTPIResult only." << endmsg;
+    ATH_MSG_DEBUG("Calo fragments not found, built RoIBResult from CTPResult and MuCTPIResult only.");
 
   } else if( cTPFound ) {
 
     result = new ROIB::RoIBResult( cTPResult );
-    log << MSG::DEBUG << "MuCTPI and calo fragments not found, built RoIBResult from CTPResult only." << endmsg;
+    ATH_MSG_DEBUG("MuCTPI and calo fragments not found, built RoIBResult from CTPResult only.");
 
   } else {
     result = new ROIB::RoIBResult();
-    log << MSG::DEBUG << "No LVL1 fragments found, create empty RoIBResult." << endmsg;
+    ATH_MSG_DEBUG("No LVL1 fragments found, create empty RoIBResult.");
   }
 
   if( l1TopoFound ){
diff --git a/Trigger/TrigT1/TrigT1ResultByteStream/src/CTPByteStreamCnv.cxx b/Trigger/TrigT1/TrigT1ResultByteStream/src/CTPByteStreamCnv.cxx
index f1469ce7750c618c8ae39b22808a68a65de099d9..23b7841c34e4ed7a251487234873b131693d4208 100755
--- a/Trigger/TrigT1/TrigT1ResultByteStream/src/CTPByteStreamCnv.cxx
+++ b/Trigger/TrigT1/TrigT1ResultByteStream/src/CTPByteStreamCnv.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 
diff --git a/Trigger/TrigT1/TrigT1ResultByteStream/src/CTPByteStreamTool.cxx b/Trigger/TrigT1/TrigT1ResultByteStream/src/CTPByteStreamTool.cxx
index 2ba4234c93b7179050fdd8fa63b4b217d2047f75..f0ef78762999531687c0dcb6b291bf093ee0be42 100755
--- a/Trigger/TrigT1/TrigT1ResultByteStream/src/CTPByteStreamTool.cxx
+++ b/Trigger/TrigT1/TrigT1ResultByteStream/src/CTPByteStreamTool.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 // CTP data format include(s):
diff --git a/Trigger/TrigT1/TrigT1ResultByteStream/src/CTPSrcIdMap.cxx b/Trigger/TrigT1/TrigT1ResultByteStream/src/CTPSrcIdMap.cxx
index ebf0f1aadf672981eb4b465d6f05c0e442216736..beac4995592db8a33cede7d85e4aea6d1f938010 100755
--- a/Trigger/TrigT1/TrigT1ResultByteStream/src/CTPSrcIdMap.cxx
+++ b/Trigger/TrigT1/TrigT1ResultByteStream/src/CTPSrcIdMap.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 
diff --git a/Trigger/TrigT1/TrigT1ResultByteStream/src/L1SrcIdMap.cxx b/Trigger/TrigT1/TrigT1ResultByteStream/src/L1SrcIdMap.cxx
index 18b998cb3b5fd811e192b9c505ab8980cfdcb7ba..e921881c290511b53779e0e7ff3e9f78f8283d6b 100755
--- a/Trigger/TrigT1/TrigT1ResultByteStream/src/L1SrcIdMap.cxx
+++ b/Trigger/TrigT1/TrigT1ResultByteStream/src/L1SrcIdMap.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 
diff --git a/Trigger/TrigT1/TrigT1ResultByteStream/src/MuCTPIByteStreamCnv.cxx b/Trigger/TrigT1/TrigT1ResultByteStream/src/MuCTPIByteStreamCnv.cxx
index 636c7c0691f5346b98fa70a566e93d941ec72b3d..6610c55ed47b906c22483374a7f9b1089b73fd17 100755
--- a/Trigger/TrigT1/TrigT1ResultByteStream/src/MuCTPIByteStreamCnv.cxx
+++ b/Trigger/TrigT1/TrigT1ResultByteStream/src/MuCTPIByteStreamCnv.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 
diff --git a/Trigger/TrigT1/TrigT1ResultByteStream/src/MuCTPIByteStreamTool.cxx b/Trigger/TrigT1/TrigT1ResultByteStream/src/MuCTPIByteStreamTool.cxx
index 37682f660ccef86f9b11f498879daae50458530c..a54ae1195bcb92b3d01be487ab04d6738bdb0191 100755
--- a/Trigger/TrigT1/TrigT1ResultByteStream/src/MuCTPIByteStreamTool.cxx
+++ b/Trigger/TrigT1/TrigT1ResultByteStream/src/MuCTPIByteStreamTool.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #include "TrigT1ResultByteStream/MuCTPIByteStreamTool.h"
diff --git a/Trigger/TrigT1/TrigT1ResultByteStream/src/MuCTPISrcIdMap.cxx b/Trigger/TrigT1/TrigT1ResultByteStream/src/MuCTPISrcIdMap.cxx
index d227080819f8d47c887c377a1e777814855347e7..8db3b7d9a42ee2f1f26e14cf22b1ce6d54ac722a 100755
--- a/Trigger/TrigT1/TrigT1ResultByteStream/src/MuCTPISrcIdMap.cxx
+++ b/Trigger/TrigT1/TrigT1ResultByteStream/src/MuCTPISrcIdMap.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #include "eformat/SourceIdentifier.h"
diff --git a/Trigger/TrigT1/TrigT1ResultByteStream/src/RecCTPByteStreamCnv.cxx b/Trigger/TrigT1/TrigT1ResultByteStream/src/RecCTPByteStreamCnv.cxx
index 0e2da6a2ff4efd06191915eb6fba199edc17cf91..d270aa8e2900fe701b18bcf3ef2bd0d9faf22830 100755
--- a/Trigger/TrigT1/TrigT1ResultByteStream/src/RecCTPByteStreamCnv.cxx
+++ b/Trigger/TrigT1/TrigT1ResultByteStream/src/RecCTPByteStreamCnv.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 
diff --git a/Trigger/TrigT1/TrigT1ResultByteStream/src/RecCTPByteStreamTool.cxx b/Trigger/TrigT1/TrigT1ResultByteStream/src/RecCTPByteStreamTool.cxx
index 1c8d7c07cd4ad03d34d120dfc1dac2d09d47b6c7..f29af7aaf38c9c995455460e6cf6863baaa72609 100755
--- a/Trigger/TrigT1/TrigT1ResultByteStream/src/RecCTPByteStreamTool.cxx
+++ b/Trigger/TrigT1/TrigT1ResultByteStream/src/RecCTPByteStreamTool.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 // Trigger include(s):
diff --git a/Trigger/TrigT1/TrigT1ResultByteStream/src/RecMuCTPIByteStreamCnv.cxx b/Trigger/TrigT1/TrigT1ResultByteStream/src/RecMuCTPIByteStreamCnv.cxx
index e19d179067bb331c80419c7d1e8257d10c20edcd..e495669ae0ec93ef72af8fb89c329b60a5d58018 100755
--- a/Trigger/TrigT1/TrigT1ResultByteStream/src/RecMuCTPIByteStreamCnv.cxx
+++ b/Trigger/TrigT1/TrigT1ResultByteStream/src/RecMuCTPIByteStreamCnv.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 
diff --git a/Trigger/TrigT1/TrigT1ResultByteStream/src/RecMuCTPIByteStreamTool.cxx b/Trigger/TrigT1/TrigT1ResultByteStream/src/RecMuCTPIByteStreamTool.cxx
index 268804a2b38f28a99ca3213f4c3c0eb3af8389d4..dfa48f6f920f6abe621ae28cb692bd530b7f5d8f 100755
--- a/Trigger/TrigT1/TrigT1ResultByteStream/src/RecMuCTPIByteStreamTool.cxx
+++ b/Trigger/TrigT1/TrigT1ResultByteStream/src/RecMuCTPIByteStreamTool.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #include "ByteStreamData/RawEvent.h"
diff --git a/Trigger/TrigT1/TrigT1ResultByteStream/src/RecRoIBResultByteStreamTool.cxx b/Trigger/TrigT1/TrigT1ResultByteStream/src/RecRoIBResultByteStreamTool.cxx
index edc87335dba13430ad709c774522f90e27d8befe..fbdd4c7e2f85b8be7c022e07e5731a03d5a43450 100755
--- a/Trigger/TrigT1/TrigT1ResultByteStream/src/RecRoIBResultByteStreamTool.cxx
+++ b/Trigger/TrigT1/TrigT1ResultByteStream/src/RecRoIBResultByteStreamTool.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 
diff --git a/Trigger/TrigT1/TrigT1ResultByteStream/src/RoIBResultByteStreamTool.cxx b/Trigger/TrigT1/TrigT1ResultByteStream/src/RoIBResultByteStreamTool.cxx
index 0f0fa68ca6b14ef6bcbd3ea25672098de16c5dd0..48994284feeede691d15b40081b361069e70c03b 100755
--- a/Trigger/TrigT1/TrigT1ResultByteStream/src/RoIBResultByteStreamTool.cxx
+++ b/Trigger/TrigT1/TrigT1ResultByteStream/src/RoIBResultByteStreamTool.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #include <sstream>
@@ -78,74 +78,72 @@ StatusCode RoIBResultByteStreamTool::initialize() {
     return sc;
   }
 
-  MsgStream log( msgSvc(), name() );
-
   //
   // Get ByteStreamAddressProviderSvc:
   //
   ServiceHandle< IProperty > p_ByteStreamAddressProviderSvc( "ByteStreamAddressProviderSvc", name() );
   sc = p_ByteStreamAddressProviderSvc.retrieve();
   if( sc.isFailure() ) {
-    log << MSG::ERROR << "Can't get ByteStreamAddressProviderSvc" << endmsg;
+    ATH_MSG_ERROR("Can't get ByteStreamAddressProviderSvc");
     return sc;
   } else {
-    log << MSG::DEBUG << "Connected to " << p_ByteStreamAddressProviderSvc.name() << endmsg;
+    ATH_MSG_DEBUG("Connected to " << p_ByteStreamAddressProviderSvc.name());
 
     UnsignedIntegerProperty ctpModuleID;
     ctpModuleID.setName("CTPModuleID");
     if (ctpModuleID.assign(p_ByteStreamAddressProviderSvc->getProperty("CTPModuleID"))) {
       m_ctpModuleID = ctpModuleID.value() ;
-      log << MSG::DEBUG << " ---> getProperty('CTPModuleID')             = " << ctpModuleID << endmsg;
+      ATH_MSG_DEBUG(" ---> getProperty('CTPModuleID')             = " << ctpModuleID);
     } else {
-      log << MSG::WARNING << p_ByteStreamAddressProviderSvc.name() << "::getProperty('CTPModuleID') failed." << endmsg;
+      ATH_MSG_WARNING(p_ByteStreamAddressProviderSvc.name() << "::getProperty('CTPModuleID') failed.");
     }
 
     UnsignedIntegerProperty muCTPIModuleID;
     muCTPIModuleID.setName("MuCTPIModuleID");
     if (muCTPIModuleID.assign(p_ByteStreamAddressProviderSvc->getProperty("MuCTPIModuleID"))) {
       m_muCTPIModuleID = muCTPIModuleID.value() ;
-      log << MSG::DEBUG << " ---> getProperty('MuCTPIModuleID')          = " << muCTPIModuleID << endmsg;
+      ATH_MSG_DEBUG(" ---> getProperty('MuCTPIModuleID')          = " << muCTPIModuleID);
     } else {
-      log << MSG::WARNING << p_ByteStreamAddressProviderSvc.name() << "::getProperty('MuCTPIModuleID') failed." << endmsg;
+      ATH_MSG_WARNING(p_ByteStreamAddressProviderSvc.name() << "::getProperty('MuCTPIModuleID') failed.");
     }
 
     UnsignedIntegerArrayProperty jetProcModuleID;
     jetProcModuleID.setName("JetProcModuleID");
     if (jetProcModuleID.assign(p_ByteStreamAddressProviderSvc->getProperty("JetProcModuleID"))) {
       m_jetModuleID = jetProcModuleID.value() ;
-      log << MSG::DEBUG << " ---> getProperty('JetProcModuleID')         = " << jetProcModuleID << endmsg;
+      ATH_MSG_DEBUG(" ---> getProperty('JetProcModuleID')         = " << jetProcModuleID);
     } else {
-      log << MSG::WARNING << p_ByteStreamAddressProviderSvc.name() << "::getProperty('JetProcModuleID') failed." << endmsg;
+      ATH_MSG_WARNING(p_ByteStreamAddressProviderSvc.name() << "::getProperty('JetProcModuleID') failed.");
     }
 
     UnsignedIntegerArrayProperty caloClusterProcModuleID;
     caloClusterProcModuleID.setName("CaloClusterProcModuleID");
     if (caloClusterProcModuleID.assign(p_ByteStreamAddressProviderSvc->getProperty("CaloClusterProcModuleID"))) {
       m_emModuleID = caloClusterProcModuleID.value() ;
-      log << MSG::DEBUG << " ---> getProperty('CaloClusterProcModuleID') = " << caloClusterProcModuleID << endmsg;
+      ATH_MSG_DEBUG(" ---> getProperty('CaloClusterProcModuleID') = " << caloClusterProcModuleID);
     } else {
-      log << MSG::WARNING << p_ByteStreamAddressProviderSvc.name() << "::getProperty('CaloClusterProcModuleID') failed." << endmsg;
+      ATH_MSG_WARNING(p_ByteStreamAddressProviderSvc.name() << "::getProperty('CaloClusterProcModuleID') failed.");
     }
 
     UnsignedIntegerArrayProperty l1TopoModuleID;
     l1TopoModuleID.setName("TopoProcModuleID");
     if (l1TopoModuleID.assign(p_ByteStreamAddressProviderSvc->getProperty("TopoProcModuleID"))) {
       m_l1TopoModuleID = l1TopoModuleID.value();
-      log << MSG::DEBUG << " ---> getProperty('TopoProcModuleID') = " << l1TopoModuleID << endmsg;
+      ATH_MSG_DEBUG(" ---> getProperty('TopoProcModuleID') = " << l1TopoModuleID);
     } else {
-      log << MSG::WARNING << p_ByteStreamAddressProviderSvc.name() << "::getProperty('TopoProcModuleID') failed." << endmsg;
+      ATH_MSG_WARNING(p_ByteStreamAddressProviderSvc.name() << "::getProperty('TopoProcModuleID') failed.");
     }
   }
 
-  log<<MSG::DEBUG << " -- Module IDs for: "<<endmsg;
-  log<<MSG::DEBUG << "    CTP                                  = 0x" <<MSG::hex<< m_ctpModuleID <<MSG::dec<<endmsg;
-  log<<MSG::DEBUG << "    muCTPi                               = 0x" <<MSG::hex<< m_muCTPIModuleID <<MSG::dec<<endmsg;
-  log<<MSG::DEBUG << "    Calorimeter Cluster Processor RoI    = 0x" <<MSG::hex<< m_emModuleID[0]
-     << ", 0x" << m_emModuleID[1] << ", 0x" << m_emModuleID[2] << ", 0x" << m_emModuleID[3] <<MSG::dec<<endmsg;
-  log<<MSG::DEBUG << "    Calorimeter Jet/Energy Processor RoI = 0x" <<MSG::hex<< m_jetModuleID[0]
-     << ", 0x" << m_jetModuleID[1] <<MSG::dec<<endmsg;
+  ATH_MSG_DEBUG(" -- Module IDs for: ");
+  ATH_MSG_DEBUG("    CTP                                  = 0x" <<MSG::hex<< m_ctpModuleID <<MSG::dec);
+  ATH_MSG_DEBUG("    muCTPi                               = 0x" <<MSG::hex<< m_muCTPIModuleID <<MSG::dec);
+  ATH_MSG_DEBUG("    Calorimeter Cluster Processor RoI    = 0x" <<MSG::hex<< m_emModuleID[0]
+     << ", 0x" << m_emModuleID[1] << ", 0x" << m_emModuleID[2] << ", 0x" << m_emModuleID[3] <<MSG::dec);
+  ATH_MSG_DEBUG("    Calorimeter Jet/Energy Processor RoI = 0x" <<MSG::hex<< m_jetModuleID[0]
+     << ", 0x" << m_jetModuleID[1] <<MSG::dec);
 
-  //  log<<MSG::DEBUG << "    L1Topo                               = 0x" <<MSG::hex<< m_l1TopoModuleID[0]     << ", 0x" <<  m_l1TopoModuleID[1] <<MSG::dec<<endmsg;
+  //  ATH_MSG_DEBUG("    L1Topo                               = 0x" <<MSG::hex<< m_l1TopoModuleID[0]     << ", 0x" <<  m_l1TopoModuleID[1] <<MSG::dec);
   std::ostringstream topoModulesString;
   for (unsigned int mid: m_l1TopoModuleID){ 
     topoModulesString << L1Topo::formatHex4(mid) << " ";
@@ -169,51 +167,49 @@ StatusCode RoIBResultByteStreamTool::finalize() {
  */
 StatusCode RoIBResultByteStreamTool::convert( ROIB::RoIBResult* result, RawEventWrite* re ) {
 
-  MsgStream log( msgSvc(), name() );
-
   // Clear the event assembler:
   m_fea.clear();
   // Reset lumi-block number to 1
   m_fea.setDetEvtType( 1 );
 
-  log << MSG::DEBUG << "executing convert() from RDO to ROBFragments" << endmsg;
+  ATH_MSG_DEBUG("executing convert() from RDO to ROBFragments");
 
   // I use only this one pointer now to fill the RODs:
   FullEventAssembler< L1SrcIdMap >::RODDATA* theROD;
 
   /** CTP ROD */
-  log << MSG::VERBOSE << "   Dumping CTP RoI words:" << endmsg;
+  ATH_MSG_VERBOSE("   Dumping CTP RoI words:");
   eformat::helper::SourceIdentifier helpCTPID( eformat::TDAQ_CTP, m_ctpModuleID );
   uint32_t rodIdCTP = helpCTPID.code();
   theROD = m_fea.getRodData( rodIdCTP );
   const std::vector< ROIB::CTPRoI >& CTPRoIVec = result->cTPResult().roIVec();
   for( std::vector< ROIB::CTPRoI >::const_iterator j = CTPRoIVec.begin(); j != CTPRoIVec.end(); ++j ) {
-    log << MSG::VERBOSE << "     0x" << MSG::hex << std::setw( 8 ) << j->roIWord() << endmsg;
+    ATH_MSG_VERBOSE( "     0x" << MSG::hex << std::setw( 8 ) << j->roIWord() );
     theROD->push_back( j->roIWord() );
   }
 
   /** Muon ROD */
-  log << MSG::VERBOSE << "   Dumping MuCTPI RoI words:" << endmsg;
+  ATH_MSG_VERBOSE( "   Dumping MuCTPI RoI words:" );
   eformat::helper::SourceIdentifier helpMuonID( eformat::TDAQ_MUON_CTP_INTERFACE, m_muCTPIModuleID );
   uint32_t rodIdMuon = helpMuonID.code();
   theROD = m_fea.getRodData( rodIdMuon );
   const std::vector< ROIB::MuCTPIRoI >& MuCTPIRoIVec = result->muCTPIResult().roIVec();
   for( std::vector< ROIB::MuCTPIRoI >::const_iterator j = MuCTPIRoIVec.begin();
        j != MuCTPIRoIVec.end(); ++j ) {
-    log << MSG::VERBOSE << "     0x" << MSG::hex << std::setw( 8 ) << j->roIWord() << endmsg;
+    ATH_MSG_VERBOSE( "     0x" << MSG::hex << std::setw( 8 ) << j->roIWord() );
     theROD->push_back( j->roIWord() );
   }
 
   /** Jet/Energy ROD */
   const std::vector< ROIB::JetEnergyResult >& jetEnergyResultVector = result->jetEnergyResult();
   for( unsigned int slink = 0; slink < jetEnergyResultVector.size(); ++slink ) {
-    log << MSG::VERBOSE << "   Dumping Jet/Energy " << slink << " RoI words:" << endmsg;
+    ATH_MSG_VERBOSE( "   Dumping Jet/Energy " << slink << " RoI words:" );
     eformat::helper::SourceIdentifier helpJetID( eformat::TDAQ_CALO_JET_PROC_ROI, m_jetModuleID[slink] );
     theROD = m_fea.getRodData( helpJetID.code() );
     const std::vector< ROIB::JetEnergyRoI >& JetEnergyRoIVec = jetEnergyResultVector[ slink ].roIVec();
     for( std::vector< ROIB::JetEnergyRoI >::const_iterator j = JetEnergyRoIVec.begin();
          j != JetEnergyRoIVec.end(); ++j ) {
-      log << MSG::VERBOSE << "     0x" << MSG::hex << std::setw( 8 ) << j->roIWord() << endmsg;
+      ATH_MSG_VERBOSE( "     0x" << MSG::hex << std::setw( 8 ) << j->roIWord() );
       theROD->push_back( j->roIWord() );
     }
   }
@@ -221,42 +217,43 @@ StatusCode RoIBResultByteStreamTool::convert( ROIB::RoIBResult* result, RawEvent
   /* EMTau RODs */
   const std::vector< ROIB::EMTauResult >& eMTauRDOResultVector = result->eMTauResult();
   for( unsigned int slink = 0; slink < eMTauRDOResultVector.size(); ++slink ) {
-    log << MSG::VERBOSE << "   Dumping EM/Tau " << slink << " RoI words:" << endmsg;
+    ATH_MSG_VERBOSE( "   Dumping EM/Tau " << slink << " RoI words:" );
     eformat::helper::SourceIdentifier helpEMTauID( eformat::TDAQ_CALO_CLUSTER_PROC_ROI, m_emModuleID[slink]);
     theROD = m_fea.getRodData( helpEMTauID.code() );
     const std::vector< ROIB::EMTauRoI >& EMTauRoIVec = eMTauRDOResultVector[ slink ].roIVec();
     for( std::vector<ROIB::EMTauRoI>::const_iterator j = EMTauRoIVec.begin();
          j != EMTauRoIVec.end(); ++j ) {
-      log << MSG::VERBOSE << "     0x" << MSG::hex << std::setw( 8 ) << j->roIWord() << endmsg;
+      ATH_MSG_VERBOSE( "     0x" << MSG::hex << std::setw( 8 ) << j->roIWord() );
       theROD->push_back( j->roIWord() );
     }
   }
 
   /** L1Topo ROD */
-  log << MSG::VERBOSE << "   Dumping L1Topo RoI words" << endmsg;
+  ATH_MSG_VERBOSE( "   Dumping L1Topo RoI words" );
   const std::vector< ROIB::L1TopoResult >& l1TopoResultVector = result->l1TopoResult();
-  log << MSG::VERBOSE << "   Dumping L1Topo RoI words for " << l1TopoResultVector.size() << " RODs:" << endmsg;
+  ATH_MSG_VERBOSE( "   Dumping L1Topo RoI words for " << l1TopoResultVector.size() << " RODs:" );
   unsigned int slink(0);
   for (auto & l1tr : l1TopoResultVector){
     uint32_t sourceID = l1tr.rdo().getSourceID(); // needs to be a 16-bit module ID
-    log << MSG::VERBOSE << "  for L1Topo source ID from RDO "  << L1Topo::formatHex8(sourceID) << endmsg;
+    ATH_MSG_VERBOSE( "  for L1Topo source ID from RDO "  << L1Topo::formatHex8(sourceID) );
     if (sourceID == 0 && slink < m_l1TopoModuleID.size()){
       sourceID = eformat::helper::SourceIdentifier( eformat::TDAQ_CALO_TOPO_PROC, m_l1TopoModuleID.at(slink) ).code();
-      log << MSG::DEBUG << "  (source ID in L1TopoRDO was zero so using Property for slink " << slink << ": " << L1Topo::formatHex8(sourceID) << ")" << endmsg;
+      ATH_MSG_DEBUG("  (source ID in L1TopoRDO was zero so using Property for slink " << slink << ": " << L1Topo::formatHex8(sourceID) << ")");
     } 
     else if (sourceID == 0){
       sourceID=eformat::helper::SourceIdentifier( eformat::TDAQ_CALO_TOPO_PROC, 0 ).code();
-      log << MSG::WARNING << "  (source ID in L1TopoRDO was zero, no properties available for slink counter " << slink << ", so as a fall back, constructed module 0 with source ID " << L1Topo::formatHex8(sourceID) << ")" << endmsg;
+      ATH_MSG_WARNING("  (source ID in L1TopoRDO was zero, no properties available for slink counter " << slink << ", so as a fall back, constructed module 0 with source ID " << L1Topo::formatHex8(sourceID) << ")");
     }
     theROD = m_fea.getRodData( sourceID );
     for ( auto & word : l1tr.rdo().getDataWords()){
-      log << MSG::VERBOSE << "     " << MSG::hex << std::setw(8) << std::showbase << word << std::noshowbase << std::dec << endmsg;
+      ATH_MSG_VERBOSE("     " << MSG::hex << std::setw(8) << std::showbase << word << std::noshowbase << std::dec);
       theROD->push_back(word);
     }
     ++slink;
   }
   /** now fill them into the RawEvent re */
-  log << MSG::DEBUG << "Now filling the event with the RoI Builder fragments" << endmsg;
+  ATH_MSG_DEBUG("Now filling the event with the RoI Builder fragments");
+  MsgStream log( msgSvc(), name() );
   m_fea.fill( re, log );
 
   return StatusCode::SUCCESS;
diff --git a/Trigger/TrigT1/TrigT1RoIB/doc/packagedoc.h b/Trigger/TrigT1/TrigT1RoIB/doc/packagedoc.h
index 7a361a29acab55031277362cbed580c57a0f7b58..fdfbc5b95f2bc342ddc272edf6e9aa17043ddf27 100644
--- a/Trigger/TrigT1/TrigT1RoIB/doc/packagedoc.h
+++ b/Trigger/TrigT1/TrigT1RoIB/doc/packagedoc.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 /**
diff --git a/Trigger/TrigT1/TrigT1RoIB/python/TrigT1RoIBConfig.py b/Trigger/TrigT1/TrigT1RoIB/python/TrigT1RoIBConfig.py
index 100b8a2132e02f1f91de450de289fb51044808fb..265c1e32998c488c13b604fe37d3227db1d756f1 100644
--- a/Trigger/TrigT1/TrigT1RoIB/python/TrigT1RoIBConfig.py
+++ b/Trigger/TrigT1/TrigT1RoIB/python/TrigT1RoIBConfig.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 
 
 from TrigT1RoIB.TrigT1RoIBConf import ROIB__RoIBuilder
diff --git a/Trigger/TrigT1/TrigT1RoIB/src/RecRoIBTester.cxx b/Trigger/TrigT1/TrigT1RoIB/src/RecRoIBTester.cxx
index 1c4260893d86efd00b9f69e529a659d1f4571ba6..bb338ce4e53d5bc900ce8d3c2f74c8f35e43c89d 100644
--- a/Trigger/TrigT1/TrigT1RoIB/src/RecRoIBTester.cxx
+++ b/Trigger/TrigT1/TrigT1RoIB/src/RecRoIBTester.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 // $Id: RecRoIBTester.cxx 550415 2013-06-10 09:36:28Z pottgen $
diff --git a/Trigger/TrigT1/TrigT1RoIB/src/RecRoIBTester.h b/Trigger/TrigT1/TrigT1RoIB/src/RecRoIBTester.h
index c01beff0205e8f3df3c6534c12c6daa61de02fe5..ad922acffea6dfeb3b0173b903e02e904941da96 100644
--- a/Trigger/TrigT1/TrigT1RoIB/src/RecRoIBTester.h
+++ b/Trigger/TrigT1/TrigT1RoIB/src/RecRoIBTester.h
@@ -1,7 +1,7 @@
 // Dear emacs, this is -*- c++ -*-
 
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 // $Id: RecRoIBTester.h 500598 2012-05-14 15:39:58Z krasznaa $
diff --git a/Trigger/TrigT1/TrigT1RoIB/src/RoIBDefs.h b/Trigger/TrigT1/TrigT1RoIB/src/RoIBDefs.h
index 9cf82314357c620ca8a77e661cbaeb7dce7f9cb3..0fa69c483d85ec70d37b79e7c0f7bf212d3d9e91 100644
--- a/Trigger/TrigT1/TrigT1RoIB/src/RoIBDefs.h
+++ b/Trigger/TrigT1/TrigT1RoIB/src/RoIBDefs.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 /* **********************************************************
diff --git a/Trigger/TrigT1/TrigT1RoIB/src/RoIBTester.cxx b/Trigger/TrigT1/TrigT1RoIB/src/RoIBTester.cxx
index a43094092980c259f07974bc7140ed11fa334fad..ff566ad3b6b43f43a5e9b9300dd99541f0aa73f7 100644
--- a/Trigger/TrigT1/TrigT1RoIB/src/RoIBTester.cxx
+++ b/Trigger/TrigT1/TrigT1RoIB/src/RoIBTester.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 // $Id: RoIBTester.cxx 500598 2012-05-14 15:39:58Z krasznaa $
diff --git a/Trigger/TrigT1/TrigT1RoIB/src/RoIBTester.h b/Trigger/TrigT1/TrigT1RoIB/src/RoIBTester.h
index a4f0a36894a0435afa8c2d76597017bee408d203..6edd6feeb6d89267a8fb55d2880275f4617301e7 100644
--- a/Trigger/TrigT1/TrigT1RoIB/src/RoIBTester.h
+++ b/Trigger/TrigT1/TrigT1RoIB/src/RoIBTester.h
@@ -1,7 +1,7 @@
 // Dear emacs, this is -*- c++ -*-
 
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 // $Id: RoIBTester.h 500598 2012-05-14 15:39:58Z krasznaa $
diff --git a/Trigger/TrigT1/TrigT1RoIB/src/RoIBuilder.cxx b/Trigger/TrigT1/TrigT1RoIB/src/RoIBuilder.cxx
index 58bd414ac711ae70aac330ebe3d6e9433cdcf159..419dd3824e45362f53db427afdb7a3fcfd68a788 100644
--- a/Trigger/TrigT1/TrigT1RoIB/src/RoIBuilder.cxx
+++ b/Trigger/TrigT1/TrigT1RoIB/src/RoIBuilder.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 // $Id: RoIBuilder.cxx 667020 2015-05-13 20:40:26Z stelzer $
diff --git a/Trigger/TrigT1/TrigT1RoIB/src/RoIBuilder.h b/Trigger/TrigT1/TrigT1RoIB/src/RoIBuilder.h
index d0e5e4eba5682cb3e71be21ecdfd34e3e522135c..0561432237842748100e699401d8e78fe7056c58 100644
--- a/Trigger/TrigT1/TrigT1RoIB/src/RoIBuilder.h
+++ b/Trigger/TrigT1/TrigT1RoIB/src/RoIBuilder.h
@@ -1,7 +1,7 @@
 // Dear emacs, this is -*- c++ -*-
 
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef TRIGT1ROIB_ROIBUILDER_H
diff --git a/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/LVL1TGCTrigger.h b/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/LVL1TGCTrigger.h
index e8ce5e2962102d2f27c0052658253a9d2e8e0043..c3ab2a8fe067e3513d95e5c12438c50fe7560f62 100644
--- a/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/LVL1TGCTrigger.h
+++ b/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/LVL1TGCTrigger.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 // LVL1TGCTrigger.h
diff --git a/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/MakeCoincidenceOut.h b/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/MakeCoincidenceOut.h
index 15b48696837e4356e19a4e464fcf2be3f6479bab..518d5ae04e9c7bdb5bfa333158ca1c2c5f6bf7a7 100644
--- a/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/MakeCoincidenceOut.h
+++ b/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/MakeCoincidenceOut.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 // MakeCoincidenceOut.h
diff --git a/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCASDOut.h b/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCASDOut.h
index c53040acbdd094da2512fb15364175c41fabf377..3133c6e3eb611dd0ec9498d3b0ba23fd733bb365 100644
--- a/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCASDOut.h
+++ b/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCASDOut.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 // ====================================================================
diff --git a/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCBIDOut.hh b/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCBIDOut.hh
index 6304ef2696727bfad3bd5d239f290ca66edbe3c4..394c970d723ec363e055b3db00bedae75527af67 100644
--- a/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCBIDOut.hh
+++ b/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCBIDOut.hh
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef TGCBIDOut_hh
diff --git a/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCBoardConnection.hh b/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCBoardConnection.hh
index 5d416383a54575ce1310928dfe2e99cccb51754c..2e0ffe9a89ddc04df5d9590a8ef09cd28f2855c2 100644
--- a/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCBoardConnection.hh
+++ b/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCBoardConnection.hh
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 //$Id: TGCBoardConnection.hh,v 1.1.1.10 2003-11-03 10:18:17 mishino Exp $
diff --git a/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCCoincidence.hh b/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCCoincidence.hh
index 9702239a9a57896c4db334a54ca0263a10963ada..e87bfeefde270fb4516287afdf5ff6ff2423ea04 100644
--- a/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCCoincidence.hh
+++ b/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCCoincidence.hh
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef TGCCoincidence_h
diff --git a/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCConnectionASDToPP.hh b/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCConnectionASDToPP.hh
index c2fa574c4dcd67cf8b49d33a0e744db49848fd41..cf736a1d658b289eac534fab51a1beeb35cfe9d7 100644
--- a/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCConnectionASDToPP.hh
+++ b/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCConnectionASDToPP.hh
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 //$Id: TGCConnectionASDToPP.hh,v 1.1.1.10 2003-11-03 10:18:17 mishino Exp $
diff --git a/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCConnectionHPBToSL.hh b/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCConnectionHPBToSL.hh
index c46a5ecb8cd65075d10df7b66cfe1dd866a64599..5f43e60316a16711098675df7b83fa580d816e9c 100644
--- a/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCConnectionHPBToSL.hh
+++ b/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCConnectionHPBToSL.hh
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 //  table of connection between High-Pt Board and Sector Logic
diff --git a/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCConnectionInPP.hh b/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCConnectionInPP.hh
index f3b62d6c94f2cf0c65450da78fb794dd3e04fd29..aca24089d2365a2aa103ce51b12b917f99503276 100644
--- a/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCConnectionInPP.hh
+++ b/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCConnectionInPP.hh
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 //$Id: TGCConnectionInPP.hh,v 1.1.1.10 2003-11-03 10:18:17 mishino Exp $
diff --git a/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCConnectionPPToSB.hh b/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCConnectionPPToSB.hh
index 4095cbd60193fe8a830c0efbd533d08c65193a67..033c234163a9a53b047db86e3c501f187045e2f8 100644
--- a/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCConnectionPPToSB.hh
+++ b/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCConnectionPPToSB.hh
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 //  Table of connection between Patch Panel and Slave Board.
diff --git a/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCConnectionPPToSL.hh b/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCConnectionPPToSL.hh
index 58402b8f8eb638ca9f19179bf2be23c65547f715..583ebcd801b436c8ca02e4e31c5fb6717094f332 100644
--- a/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCConnectionPPToSL.hh
+++ b/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCConnectionPPToSL.hh
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 //  Table of connection between Patch Panel and Sector Logic.
diff --git a/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCConnectionSBToHPB.hh b/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCConnectionSBToHPB.hh
index 5ab46294e99e14c52322879a301d11c1313157ca..ddf3822b1add0c7dd9cb5c678ad7e50e0b7f4e90 100644
--- a/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCConnectionSBToHPB.hh
+++ b/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCConnectionSBToHPB.hh
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 //  Table of connection between Slave Board and High-Pt Board.
diff --git a/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCDatabaseManager.hh b/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCDatabaseManager.hh
index e143b36286fe915744d065d49fdd9e2a1c4236f1..808a0b3d251d99d93a9d63e9c53bfba228d856d6 100644
--- a/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCDatabaseManager.hh
+++ b/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCDatabaseManager.hh
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef TGCDatabaseManager_hh
diff --git a/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCDoubletSB.hh b/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCDoubletSB.hh
index 64ba5dc9426588ead7f5e580731d36b6a6ec4963..6a7d036ba9d13947ee66a18b65b14b576e709894 100644
--- a/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCDoubletSB.hh
+++ b/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCDoubletSB.hh
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef TGCDoubletSB_hh
diff --git a/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCElectronicsSystem.hh b/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCElectronicsSystem.hh
index b21c38d2c40ef8b98bdc9f42efc088ae6fb35f47..90020d94c78d5c449a3f9b7bd8198b30777caefc 100644
--- a/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCElectronicsSystem.hh
+++ b/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCElectronicsSystem.hh
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef TGCElectronicsSystem_hh
diff --git a/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCEvent.h b/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCEvent.h
index 4e79b261b99923fef4314f906c59ec8a3fe3499e..271f87525785099a41c1ee80cf3b326fb944e035 100644
--- a/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCEvent.h
+++ b/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCEvent.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 // ====================================================================
diff --git a/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCHighPtBoard.hh b/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCHighPtBoard.hh
index 802dc231fa7f13b3a3dc8f6bcc88d90c61f5ae9d..481428e9a0aeedccd2f0605e40ee9de2615f8a03 100644
--- a/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCHighPtBoard.hh
+++ b/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCHighPtBoard.hh
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef TGCHighPtBoard_hh
diff --git a/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCHighPtBoardOut.hh b/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCHighPtBoardOut.hh
index a7d4c4e8bb68b577eae78ffdbcdc0f6dafca2217..f98a170a895aa8f016e645d8c4fc36f8a5bbed9d 100644
--- a/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCHighPtBoardOut.hh
+++ b/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCHighPtBoardOut.hh
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef TGCHighPtBoardOut_hh
diff --git a/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCHighPtChipOut.hh b/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCHighPtChipOut.hh
index 837785e944e2c77894feb927f630242dee28f480..61cbbee04972abcd13601691a1373a7da7360f92 100644
--- a/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCHighPtChipOut.hh
+++ b/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCHighPtChipOut.hh
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef TGCHighPtChipOut_hh
diff --git a/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCHitPattern.hh b/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCHitPattern.hh
index f7ec56a0655aac723484614e38bb003a2f94adcc..59b676c352176f88f9d2293649f479e69ec8272d 100644
--- a/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCHitPattern.hh
+++ b/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCHitPattern.hh
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 //$Id: TGCHitPattern.hh,v 1.1.1.10 2003-11-03 10:18:17 mishino Exp $
diff --git a/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCIndex.h b/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCIndex.h
index 2fe4f7b46a4a661b3afb77f3da7b0ccf6a482b36..4acee48653356809a392866e28e4888056818a12 100644
--- a/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCIndex.h
+++ b/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCIndex.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 // ====================================================================
diff --git a/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCInnerCoincidenceMap.hh b/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCInnerCoincidenceMap.hh
index 7913919f73150eaf8bc797045e333660a1c7356c..2bc8a39f97cf5b217c76529d38024a28635bd12f 100644
--- a/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCInnerCoincidenceMap.hh
+++ b/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCInnerCoincidenceMap.hh
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef TGCInnerCoincidenceMap_hh
diff --git a/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCInnerSB.hh b/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCInnerSB.hh
index b208b69729bea606ba0e3722bb8b33270511707d..ecc194e7e3c500107ced702f9cb4654fb587fa14 100644
--- a/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCInnerSB.hh
+++ b/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCInnerSB.hh
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef TGCInnerSB_hh
diff --git a/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCInnerTrackletSlot.hh b/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCInnerTrackletSlot.hh
index 72b5c40dd69a7c139d648b5169d14bff819c1b58..ba0c872af10f6a35c4e6508c33110a6eea2ec195 100644
--- a/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCInnerTrackletSlot.hh
+++ b/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCInnerTrackletSlot.hh
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef TGCInnerTrackletSlot_hh
diff --git a/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCInnerTrackletSlotHolder.hh b/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCInnerTrackletSlotHolder.hh
index 6156a40e1430c8194b81f0320f36723fc00e19c8..276d7f79721ba72c25d293ba316c84b6f5d5e3ea 100644
--- a/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCInnerTrackletSlotHolder.hh
+++ b/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCInnerTrackletSlotHolder.hh
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef TGCInnerTrackletSlotHolder_hh
diff --git a/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCNumbering.hh b/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCNumbering.hh
index 64704e6770eeee3d63b8918a5cf855704fafe6b5..98b71c2ea816a68bb911d0ac337831e7a1784965 100644
--- a/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCNumbering.hh
+++ b/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCNumbering.hh
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef TGCNumbering_hh
diff --git a/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCPatchPanel.hh b/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCPatchPanel.hh
index 72d173843a5a9b95ec6fb18eb6043ad226fb9095..30d6ceb2a46542305cd6a0ade9fcd5faa3c17b89 100644
--- a/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCPatchPanel.hh
+++ b/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCPatchPanel.hh
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 //$Id: TGCPatchPanel.hh,v 1.4 2008-08-10 11:36:44 isaya Exp $
diff --git a/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCPatchPanelOut.hh b/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCPatchPanelOut.hh
index b8ef48cc68486fe362c80c2bad838f9dda5b6459..7c52214454db3bc9198ecbdd84b15b405e18ecbd 100644
--- a/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCPatchPanelOut.hh
+++ b/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCPatchPanelOut.hh
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 //$Id: TGCPatchPanelOut.hh,v 1.1.1.10 2003-11-03 10:18:17 mishino Exp $
diff --git a/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCRPhiCoincidenceMap.hh b/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCRPhiCoincidenceMap.hh
index d18c45fea00b8fa86bf37e2dab6bf909eabd37cb..87c10590f527bac0452c9c9664fe6f1d4a2b0887 100644
--- a/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCRPhiCoincidenceMap.hh
+++ b/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCRPhiCoincidenceMap.hh
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef TGCRPhiCoincidenceMap_hh
diff --git a/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCRPhiCoincidenceMatrix.hh b/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCRPhiCoincidenceMatrix.hh
index 7006db83f9d5a03da24926003868af9ccb78d6dd..84b860565c8f754406739710207292e60c367d3c 100644
--- a/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCRPhiCoincidenceMatrix.hh
+++ b/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCRPhiCoincidenceMatrix.hh
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef TGCRPhiCoincidenceMatrix_hh
diff --git a/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCRPhiCoincidenceOut.hh b/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCRPhiCoincidenceOut.hh
index fad4205a6f657ee4603cb0bf1d1307ed88341989..61734c01294a9b38be2a5a1ce1200560b40dcf3f 100644
--- a/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCRPhiCoincidenceOut.hh
+++ b/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCRPhiCoincidenceOut.hh
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef TGCRPhiCoincidenceOut_hh
diff --git a/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCReadoutIndex.h b/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCReadoutIndex.h
index b5d2188e7529ad7e5d2ed63aedfac2acf17e686e..b9f4cbc12c83d6ae950b1d29dd259cb23905b834 100644
--- a/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCReadoutIndex.h
+++ b/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCReadoutIndex.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 // ====================================================================
diff --git a/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCSLPreSelector.hh b/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCSLPreSelector.hh
index 50263b85680508af6c3179d1fb050496647ddda4..20308034b9ee2eb0b00a2323f05827a1d8b07636 100644
--- a/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCSLPreSelector.hh
+++ b/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCSLPreSelector.hh
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef TGCSLPreSelector_hh
diff --git a/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCSLPreSelectorOut.hh b/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCSLPreSelectorOut.hh
index 1129d6ab23843037e2579f4f3a70b85a14b85850..88c5f77ed2c426dff098006b3db86004a8dc9d4c 100644
--- a/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCSLPreSelectorOut.hh
+++ b/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCSLPreSelectorOut.hh
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef TGCSLPreSelectorOut_hh
diff --git a/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCSLSelector.hh b/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCSLSelector.hh
index ca1a5b1b513589e9d87eda00f42df30dddd46d7e..0b3b0a7d44f5569b6fb4de8c707f0a1b9fce793d 100644
--- a/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCSLSelector.hh
+++ b/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCSLSelector.hh
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef TGCSLSelector_hh
diff --git a/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCSLSelectorOut.hh b/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCSLSelectorOut.hh
index 4424ac2ea221ea883d96f70d3860002d1e5c82ce..04f4135a643fb686ef90aab817bb803fc639ff0e 100644
--- a/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCSLSelectorOut.hh
+++ b/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCSLSelectorOut.hh
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef TGCSLSelectorOut_hh
diff --git a/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCSSCController.hh b/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCSSCController.hh
index 19259d8d7af50feb295e5060e75b7cf9cfddaf8a..6959239f39f9537e05b9984d8f1622a1aac183ab 100644
--- a/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCSSCController.hh
+++ b/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCSSCController.hh
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef TGCSSCController_hh
diff --git a/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCSSCControllerOut.hh b/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCSSCControllerOut.hh
index 98a79cfcf68e7f068d334ac002cac2802951ebfe..b8e91acaf9734aef78aa43ad68a2e7c2c26f7517 100644
--- a/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCSSCControllerOut.hh
+++ b/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCSSCControllerOut.hh
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef TGCSSCControllerOut_hh
diff --git a/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCSector.hh b/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCSector.hh
index 2ea8640dc2c788ec5c1061c973a6cd24132d2a42..fd8701b23f8058a574e9267b76056eb690347603 100644
--- a/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCSector.hh
+++ b/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCSector.hh
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef TGCSector_h
diff --git a/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCSectorLogic.hh b/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCSectorLogic.hh
index de58f3970bdde8baa7aab76df8e5ac157a282d0f..d3db2d150e63242a4b9db70de83db139da667100 100644
--- a/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCSectorLogic.hh
+++ b/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCSectorLogic.hh
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef TGGSectorLogic_hh
diff --git a/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCSlaveBoard.hh b/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCSlaveBoard.hh
index d327f5ddc246b6e2f6cdb72dd211eedc132d921d..b42a350a40aba0e200143b662c20a14e161d4d73 100644
--- a/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCSlaveBoard.hh
+++ b/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCSlaveBoard.hh
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef TGCSlaveBoard_hh
diff --git a/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCSlaveBoardOut.hh b/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCSlaveBoardOut.hh
index 67aac6e3f124abf6b5a45a825f025adb28187396..c912bb3197f9242feee5557bf83696d9c46270b9 100644
--- a/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCSlaveBoardOut.hh
+++ b/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCSlaveBoardOut.hh
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef TGCSlaveBoardOut_hh
diff --git a/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCStripDoubletSB.hh b/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCStripDoubletSB.hh
index 02f2a547284711b9fa87789dc005a72e3a0799bf..a5f3b8a8841e2d9dfc6f2674450f1c80e49ae58e 100644
--- a/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCStripDoubletSB.hh
+++ b/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCStripDoubletSB.hh
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef TGCStripDoubletSB_hh
diff --git a/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCStripHighPtBoard.hh b/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCStripHighPtBoard.hh
index 49b2190ae3af5d6382eb0c530e2d16782a227958..27be283a1189fafb8ee3a7d6682b05824c349c63 100644
--- a/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCStripHighPtBoard.hh
+++ b/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCStripHighPtBoard.hh
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef TGCStripHighPtBoard_hh
diff --git a/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCStripTripletSB.hh b/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCStripTripletSB.hh
index 5b373b12a523dae005a7b340838889d545bc0eff..f476f74113d0c31bb422718d37edf8bb0e056669 100644
--- a/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCStripTripletSB.hh
+++ b/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCStripTripletSB.hh
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef TGCStripTripletSB_hh
diff --git a/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCTMDB.h b/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCTMDB.h
index 8768cf8b3490d7c36ef66982bbedebf06348cb08..3ba497770293538d3d4462d6754920324eabc79f 100644
--- a/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCTMDB.h
+++ b/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCTMDB.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 // ====================================================================
diff --git a/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCTMDBOut.h b/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCTMDBOut.h
index 7d527dbaf884c60282c0a5d3f575b58ec09ef34c..7d01b1cdee920b43ac9cca20dc3eafb4b521a069 100644
--- a/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCTMDBOut.h
+++ b/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCTMDBOut.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 // ====================================================================
diff --git a/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCTileMuCoincidenceMap.hh b/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCTileMuCoincidenceMap.hh
index 0952c23c80d039429319ad93b52a91bf790ffd19..f796e314f4412e398597fffaf55300c6b1c56563 100644
--- a/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCTileMuCoincidenceMap.hh
+++ b/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCTileMuCoincidenceMap.hh
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef TGCTileMuCoincidenceMap_hh
diff --git a/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCTimingManager.hh b/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCTimingManager.hh
index f41cd5cc0d63f2404f662d672c75e0fc873e98d7..fbef4bef2d45231488dfa8cac6adb257ce7ceb8b 100644
--- a/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCTimingManager.hh
+++ b/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCTimingManager.hh
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 //$Id: TGCTimingManager.hh,v 1.1.1.10 2003-11-03 10:18:18 mishino Exp $
diff --git a/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCWireDoubletSB.hh b/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCWireDoubletSB.hh
index 68a2cd65c231f4452876e4360268a93bf460fd52..13a70172f897c514507f584826a0df21485286eb 100644
--- a/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCWireDoubletSB.hh
+++ b/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCWireDoubletSB.hh
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef TGCWireDoubletSB_hh
diff --git a/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCWireHighPtBoard.hh b/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCWireHighPtBoard.hh
index fff09d89660a264518d3cb3881d0507e2dc3165e..ab0f0ce392dea86c24701234553da22c6e3b2470 100644
--- a/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCWireHighPtBoard.hh
+++ b/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCWireHighPtBoard.hh
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef TGCWireHighPtBoard_hh
diff --git a/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCWireTripletSB.hh b/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCWireTripletSB.hh
index 6451452d2468209115a3939f1fe4a0277aaa623a..efaf3d527942041514606062870523b36cceeda3 100644
--- a/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCWireTripletSB.hh
+++ b/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCWireTripletSB.hh
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef TGCWireTripletSB_hh
diff --git a/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TrigT1TGC_ClassDEF.h b/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TrigT1TGC_ClassDEF.h
index 3464eae2ab4d57d002ac3c355e70a3256fa2fe7a..c64c5e628bbc1f095722120545eefbbad2d59b8d 100644
--- a/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TrigT1TGC_ClassDEF.h
+++ b/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TrigT1TGC_ClassDEF.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef __TrigT1TGC_ClassDEF_H__
diff --git a/Trigger/TrigT1/TrigT1TGC/doc/packagedoc.h b/Trigger/TrigT1/TrigT1TGC/doc/packagedoc.h
index b61ea3cdaf516e3fb7cbc19cb3b41b51a694f1bb..fa8b72c28b21cae6670cf917dbfdae9958082141 100644
--- a/Trigger/TrigT1/TrigT1TGC/doc/packagedoc.h
+++ b/Trigger/TrigT1/TrigT1TGC/doc/packagedoc.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 /**
diff --git a/Trigger/TrigT1/TrigT1TGC/python/TrigT1TGCConfig.py b/Trigger/TrigT1/TrigT1TGC/python/TrigT1TGCConfig.py
index a4d6f6e2926f7a2ff1cfe522103ec0ffd1ee2370..abadac30133156d1e9cf4491cc8a0c5df735d8e2 100755
--- a/Trigger/TrigT1/TrigT1TGC/python/TrigT1TGCConfig.py
+++ b/Trigger/TrigT1/TrigT1TGC/python/TrigT1TGCConfig.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 
 from TrigT1TGC.TrigT1TGCConf import *
 from AthenaCommon.AlgSequence import AlgSequence
diff --git a/Trigger/TrigT1/TrigT1TGC/python/__init__.py b/Trigger/TrigT1/TrigT1TGC/python/__init__.py
index 8114fb167aff15fc48b099de0f8b64cd603e747e..800c0d2bbdde8d606bdbe8a698c0419a24ac340e 100755
--- a/Trigger/TrigT1/TrigT1TGC/python/__init__.py
+++ b/Trigger/TrigT1/TrigT1TGC/python/__init__.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 
 # File: TrigT1TGCConfig/__init__.py
 
diff --git a/Trigger/TrigT1/TrigT1TGC/src/LVL1TGCTrigger.cxx b/Trigger/TrigT1/TrigT1TGC/src/LVL1TGCTrigger.cxx
index 6df6d365e422fbf116d1c7b4d3e525a6b217ace6..2799e13466fd19029dbc4fc00db1271dd6411ead 100644
--- a/Trigger/TrigT1/TrigT1TGC/src/LVL1TGCTrigger.cxx
+++ b/Trigger/TrigT1/TrigT1TGC/src/LVL1TGCTrigger.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 // STL
diff --git a/Trigger/TrigT1/TrigT1TGC/src/MakeCoincidenceOut.cxx b/Trigger/TrigT1/TrigT1TGC/src/MakeCoincidenceOut.cxx
index af62e2913caa925161165d5a65a674b94e94b1b6..a904c69c4832905d7f3bee9fe8bb1c0ec262e25e 100644
--- a/Trigger/TrigT1/TrigT1TGC/src/MakeCoincidenceOut.cxx
+++ b/Trigger/TrigT1/TrigT1TGC/src/MakeCoincidenceOut.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 //  MakeCoincidenceOut.cxx
diff --git a/Trigger/TrigT1/TrigT1TGC/src/TGCASDOut.cxx b/Trigger/TrigT1/TrigT1TGC/src/TGCASDOut.cxx
index f43a86143efa33634fbf6e639b90f2cea3abc0a6..d79ccb4c0c651dbdb3ad9783bad9a79bd4c02f65 100644
--- a/Trigger/TrigT1/TrigT1TGC/src/TGCASDOut.cxx
+++ b/Trigger/TrigT1/TrigT1TGC/src/TGCASDOut.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 // ====================================================================
diff --git a/Trigger/TrigT1/TrigT1TGC/src/TGCBIDOut.cxx b/Trigger/TrigT1/TrigT1TGC/src/TGCBIDOut.cxx
index 0412e4d552108f2e5f629a439f2824bfd8928fb1..b85d01a43b871b730577b2b3fd82fa5625fa4b0e 100644
--- a/Trigger/TrigT1/TrigT1TGC/src/TGCBIDOut.cxx
+++ b/Trigger/TrigT1/TrigT1TGC/src/TGCBIDOut.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #include "TrigT1TGC/TGCBIDOut.hh"
diff --git a/Trigger/TrigT1/TrigT1TGC/src/TGCBoardConnection.cxx b/Trigger/TrigT1/TrigT1TGC/src/TGCBoardConnection.cxx
index b284ae50c403647d8c563e12ddcbec8a10d0579c..7a2d0e43374cb82010baba7e4dbbab007856b4ec 100644
--- a/Trigger/TrigT1/TrigT1TGC/src/TGCBoardConnection.cxx
+++ b/Trigger/TrigT1/TrigT1TGC/src/TGCBoardConnection.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 //$Id: TGCBoardConnection.cxx,v 1.3 2009-01-08 10:06:48 isaya Exp $
diff --git a/Trigger/TrigT1/TrigT1TGC/src/TGCConnectionASDToPP.cxx b/Trigger/TrigT1/TrigT1TGC/src/TGCConnectionASDToPP.cxx
index 28332eb73b6d0e4be4f7131cfee7219d5b67eb2d..92a2900430c6790312ab299f245b1c3647440787 100644
--- a/Trigger/TrigT1/TrigT1TGC/src/TGCConnectionASDToPP.cxx
+++ b/Trigger/TrigT1/TrigT1TGC/src/TGCConnectionASDToPP.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #include <iostream>
diff --git a/Trigger/TrigT1/TrigT1TGC/src/TGCConnectionHPBToSL.cxx b/Trigger/TrigT1/TrigT1TGC/src/TGCConnectionHPBToSL.cxx
index 66d5b709c45fabbc171d4a62dd081362653270dd..76b7c3b4f248845512cb8a99cfe43fb2c345cfbc 100644
--- a/Trigger/TrigT1/TrigT1TGC/src/TGCConnectionHPBToSL.cxx
+++ b/Trigger/TrigT1/TrigT1TGC/src/TGCConnectionHPBToSL.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 //$Id: TGCConnectionHPBToSL.cxx,v 1.2 2006-06-22 00:26:35 nkanaya Exp $
diff --git a/Trigger/TrigT1/TrigT1TGC/src/TGCConnectionInPP.cxx b/Trigger/TrigT1/TrigT1TGC/src/TGCConnectionInPP.cxx
index 710437c343b40a946421751b1c243cd49f96284b..5c0d04095fd3cbbdb29ae30ae2a3b7ad64d894d3 100644
--- a/Trigger/TrigT1/TrigT1TGC/src/TGCConnectionInPP.cxx
+++ b/Trigger/TrigT1/TrigT1TGC/src/TGCConnectionInPP.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 //$Id: TGCConnectionInPP.cxx,v 1.4 2009-03-20 17:48:53 isaya Exp $
diff --git a/Trigger/TrigT1/TrigT1TGC/src/TGCConnectionPPToSB.cxx b/Trigger/TrigT1/TrigT1TGC/src/TGCConnectionPPToSB.cxx
index 9deb6e6a820203deb6c9f70d3a6e48fbfdd0f652..fe247e6d4f246278e90050c0080000b3c7dfe49a 100644
--- a/Trigger/TrigT1/TrigT1TGC/src/TGCConnectionPPToSB.cxx
+++ b/Trigger/TrigT1/TrigT1TGC/src/TGCConnectionPPToSB.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 //$Id: TGCConnectionPPToSB.cxx,v 1.2 2006-06-22 00:26:35 nkanaya Exp $
diff --git a/Trigger/TrigT1/TrigT1TGC/src/TGCConnectionPPToSL.cxx b/Trigger/TrigT1/TrigT1TGC/src/TGCConnectionPPToSL.cxx
index fe2398e003108e819b6ab1b4b9d8d4b756e32aad..09e1c6438fb9f24b4643deabb9e097ad1765a237 100644
--- a/Trigger/TrigT1/TrigT1TGC/src/TGCConnectionPPToSL.cxx
+++ b/Trigger/TrigT1/TrigT1TGC/src/TGCConnectionPPToSL.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #include "TrigT1TGC/TGCConnectionPPToSL.hh"
diff --git a/Trigger/TrigT1/TrigT1TGC/src/TGCConnectionSBToHPB.cxx b/Trigger/TrigT1/TrigT1TGC/src/TGCConnectionSBToHPB.cxx
index 406ef9b8ba5ff3c037d15406812c2fa40e4741f1..fef3f02744a1adfd015b6becf8652dbdb38a403b 100644
--- a/Trigger/TrigT1/TrigT1TGC/src/TGCConnectionSBToHPB.cxx
+++ b/Trigger/TrigT1/TrigT1TGC/src/TGCConnectionSBToHPB.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 //$Id: TGCConnectionSBToHPB.cxx,v 1.3 2009-03-15 18:07:55 isaya Exp $
diff --git a/Trigger/TrigT1/TrigT1TGC/src/TGCDatabaseManager.cxx b/Trigger/TrigT1/TrigT1TGC/src/TGCDatabaseManager.cxx
index 3d573b9f5834b0a15f2a778509f57695b3f35127..a6ccc51b4ddadf0a684190211d10284114792ddb 100644
--- a/Trigger/TrigT1/TrigT1TGC/src/TGCDatabaseManager.cxx
+++ b/Trigger/TrigT1/TrigT1TGC/src/TGCDatabaseManager.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #include "TrigT1TGC/TGCDatabaseManager.hh"
diff --git a/Trigger/TrigT1/TrigT1TGC/src/TGCDoubletSB.cxx b/Trigger/TrigT1/TrigT1TGC/src/TGCDoubletSB.cxx
index 63acb3bbc0971b952eae3e85525d7561585fae61..d5ed1032576523bc38327223069a0cdce87f5101 100644
--- a/Trigger/TrigT1/TrigT1TGC/src/TGCDoubletSB.cxx
+++ b/Trigger/TrigT1/TrigT1TGC/src/TGCDoubletSB.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #include "TrigT1TGC/TGCDoubletSB.hh"
diff --git a/Trigger/TrigT1/TrigT1TGC/src/TGCElectronicsSystem.cxx b/Trigger/TrigT1/TrigT1TGC/src/TGCElectronicsSystem.cxx
index 4871ef15da93ae8f7ef1f3cbd17d6596ad522f96..fc9c7530def7e6a85a50a4b4853d134ac9cb7d78 100644
--- a/Trigger/TrigT1/TrigT1TGC/src/TGCElectronicsSystem.cxx
+++ b/Trigger/TrigT1/TrigT1TGC/src/TGCElectronicsSystem.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 //$Id: TGCElectronicsSystem.cxx,v 1.13 2009-05-04 11:39:44 isaya Exp $
diff --git a/Trigger/TrigT1/TrigT1TGC/src/TGCEvent.cxx b/Trigger/TrigT1/TrigT1TGC/src/TGCEvent.cxx
index 745902f5e0c093afb9cf192eb23f6856be8abdf6..c5ea6520f621a95230f9c3263e59d3f02f4b203a 100644
--- a/Trigger/TrigT1/TrigT1TGC/src/TGCEvent.cxx
+++ b/Trigger/TrigT1/TrigT1TGC/src/TGCEvent.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 // ====================================================================
diff --git a/Trigger/TrigT1/TrigT1TGC/src/TGCHighPtBoard.cxx b/Trigger/TrigT1/TrigT1TGC/src/TGCHighPtBoard.cxx
index 93d274753e44a1f320efe47c5f7722c75831d4b2..79ef1c2c5c87bf12c3a0bc008a27060d7e82c8cf 100644
--- a/Trigger/TrigT1/TrigT1TGC/src/TGCHighPtBoard.cxx
+++ b/Trigger/TrigT1/TrigT1TGC/src/TGCHighPtBoard.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #include "TrigT1TGC/TGCHighPtBoardOut.hh"
diff --git a/Trigger/TrigT1/TrigT1TGC/src/TGCHighPtBoardOut.cxx b/Trigger/TrigT1/TrigT1TGC/src/TGCHighPtBoardOut.cxx
index 271b680fe3d799c1490842417cc5972230221a69..c4b5c059bee9c2f727795465413d10aac3f15795 100644
--- a/Trigger/TrigT1/TrigT1TGC/src/TGCHighPtBoardOut.cxx
+++ b/Trigger/TrigT1/TrigT1TGC/src/TGCHighPtBoardOut.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #include "TrigT1TGC/TGCHighPtBoardOut.hh"
diff --git a/Trigger/TrigT1/TrigT1TGC/src/TGCHighPtChipOut.cxx b/Trigger/TrigT1/TrigT1TGC/src/TGCHighPtChipOut.cxx
index ef669ba3cf1f7cf6346807e6227064e8a6b72b0e..98e236cfad4abad2d87540feddcc58ea05c051e8 100644
--- a/Trigger/TrigT1/TrigT1TGC/src/TGCHighPtChipOut.cxx
+++ b/Trigger/TrigT1/TrigT1TGC/src/TGCHighPtChipOut.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #include "TrigT1TGC/TGCHighPtChipOut.hh"
diff --git a/Trigger/TrigT1/TrigT1TGC/src/TGCHitPattern.cxx b/Trigger/TrigT1/TrigT1TGC/src/TGCHitPattern.cxx
index 338cc9fd12a7814af1febfbfd8f5c6ce8cd1ad6e..93b874c37d68ef660e2c9c3d195744cba5451a57 100644
--- a/Trigger/TrigT1/TrigT1TGC/src/TGCHitPattern.cxx
+++ b/Trigger/TrigT1/TrigT1TGC/src/TGCHitPattern.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #include "TrigT1TGC/TGCHitPattern.hh"
diff --git a/Trigger/TrigT1/TrigT1TGC/src/TGCIndex.cxx b/Trigger/TrigT1/TrigT1TGC/src/TGCIndex.cxx
index c161946d140f032a10b41d2f9eb01ab5962b82b7..4ef71b2fb41d58ea262d3e588fa9e11a1f78f3bf 100644
--- a/Trigger/TrigT1/TrigT1TGC/src/TGCIndex.cxx
+++ b/Trigger/TrigT1/TrigT1TGC/src/TGCIndex.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 // ====================================================================
diff --git a/Trigger/TrigT1/TrigT1TGC/src/TGCInnerCoincidenceMap.cxx b/Trigger/TrigT1/TrigT1TGC/src/TGCInnerCoincidenceMap.cxx
index 9ba54d032e2e47b0f7f3e53489cfba1c2499f815..2b35f58553cd815855ce309bd2a42601f1f98866 100644
--- a/Trigger/TrigT1/TrigT1TGC/src/TGCInnerCoincidenceMap.cxx
+++ b/Trigger/TrigT1/TrigT1TGC/src/TGCInnerCoincidenceMap.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #include <iostream>
diff --git a/Trigger/TrigT1/TrigT1TGC/src/TGCInnerSB.cxx b/Trigger/TrigT1/TrigT1TGC/src/TGCInnerSB.cxx
index fea94fc1e628f97ed1d8b13b8549490613da5882..03bad2d4869c9b72fa9b15b08a16c3c41c4ed60d 100644
--- a/Trigger/TrigT1/TrigT1TGC/src/TGCInnerSB.cxx
+++ b/Trigger/TrigT1/TrigT1TGC/src/TGCInnerSB.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 // ref. SOS054V06,SOS053V04
diff --git a/Trigger/TrigT1/TrigT1TGC/src/TGCInnerTrackletSlot.cxx b/Trigger/TrigT1/TrigT1TGC/src/TGCInnerTrackletSlot.cxx
index eea9f641b864864f6b5057ac4e86820d97ed4fc2..ead29d98bb9cc91c0e38d908712b16ca24664102 100644
--- a/Trigger/TrigT1/TrigT1TGC/src/TGCInnerTrackletSlot.cxx
+++ b/Trigger/TrigT1/TrigT1TGC/src/TGCInnerTrackletSlot.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #include "TrigT1TGC/TGCInnerTrackletSlot.hh"
diff --git a/Trigger/TrigT1/TrigT1TGC/src/TGCInnerTrackletSlotHolder.cxx b/Trigger/TrigT1/TrigT1TGC/src/TGCInnerTrackletSlotHolder.cxx
index 5345cb0c890758e4d14c6a72b2baade2fb36c7f3..a8952f4b8a4d047f3ace76150d7f7970bef8b5c4 100644
--- a/Trigger/TrigT1/TrigT1TGC/src/TGCInnerTrackletSlotHolder.cxx
+++ b/Trigger/TrigT1/TrigT1TGC/src/TGCInnerTrackletSlotHolder.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #include "TrigT1TGC/TGCInnerTrackletSlotHolder.hh"
diff --git a/Trigger/TrigT1/TrigT1TGC/src/TGCPatchPanel.cxx b/Trigger/TrigT1/TrigT1TGC/src/TGCPatchPanel.cxx
index 1f48a43457dff706872ee6a51c0e82b6e9be9c14..c0ef49582c24779d104417f21faf4f2bf11261b3 100644
--- a/Trigger/TrigT1/TrigT1TGC/src/TGCPatchPanel.cxx
+++ b/Trigger/TrigT1/TrigT1TGC/src/TGCPatchPanel.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #include "TrigT1TGC/TGCPatchPanel.hh"
diff --git a/Trigger/TrigT1/TrigT1TGC/src/TGCPatchPanelOut.cxx b/Trigger/TrigT1/TrigT1TGC/src/TGCPatchPanelOut.cxx
index e4c209545a9a1a7ce94f85a3921ed7273a4e3252..bfd7c5956e1eb52aae3fb86468ac0613b36cdd42 100644
--- a/Trigger/TrigT1/TrigT1TGC/src/TGCPatchPanelOut.cxx
+++ b/Trigger/TrigT1/TrigT1TGC/src/TGCPatchPanelOut.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #include "TrigT1TGC/TGCPatchPanelOut.hh"
diff --git a/Trigger/TrigT1/TrigT1TGC/src/TGCRPhiCoincidenceMap.cxx b/Trigger/TrigT1/TrigT1TGC/src/TGCRPhiCoincidenceMap.cxx
index cbfd125c51b008d0358641c75f5b7b3077a437fd..3856e87c511f84d960a183c5f2782210a5221a05 100644
--- a/Trigger/TrigT1/TrigT1TGC/src/TGCRPhiCoincidenceMap.cxx
+++ b/Trigger/TrigT1/TrigT1TGC/src/TGCRPhiCoincidenceMap.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #include <iostream>
diff --git a/Trigger/TrigT1/TrigT1TGC/src/TGCRPhiCoincidenceMatrix.cxx b/Trigger/TrigT1/TrigT1TGC/src/TGCRPhiCoincidenceMatrix.cxx
index a28de54b06707ef054934acc25296fe6f36a6b06..fc3341a357e383d8cced4ba8db16445414285ae5 100644
--- a/Trigger/TrigT1/TrigT1TGC/src/TGCRPhiCoincidenceMatrix.cxx
+++ b/Trigger/TrigT1/TrigT1TGC/src/TGCRPhiCoincidenceMatrix.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #include "TrigT1TGC/TGCRPhiCoincidenceMatrix.hh"
diff --git a/Trigger/TrigT1/TrigT1TGC/src/TGCRPhiCoincidenceOut.cxx b/Trigger/TrigT1/TrigT1TGC/src/TGCRPhiCoincidenceOut.cxx
index e97f808f82d653781a720c27684ef7c85b165662..964d0a2318a8502877c4104f2d526e2e168e0625 100644
--- a/Trigger/TrigT1/TrigT1TGC/src/TGCRPhiCoincidenceOut.cxx
+++ b/Trigger/TrigT1/TrigT1TGC/src/TGCRPhiCoincidenceOut.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 
diff --git a/Trigger/TrigT1/TrigT1TGC/src/TGCReadoutIndex.cxx b/Trigger/TrigT1/TrigT1TGC/src/TGCReadoutIndex.cxx
index c8b01a740aff839f6a6969cd19e2e27381249a0f..3755664b25ed14ff239d7b30215df831e3726fd8 100644
--- a/Trigger/TrigT1/TrigT1TGC/src/TGCReadoutIndex.cxx
+++ b/Trigger/TrigT1/TrigT1TGC/src/TGCReadoutIndex.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 // ====================================================================
diff --git a/Trigger/TrigT1/TrigT1TGC/src/TGCSLPreSelector.cxx b/Trigger/TrigT1/TrigT1TGC/src/TGCSLPreSelector.cxx
index 5c4221e2d01174ad2469284e2e36f3e106acf030..eba72ec964d2fedb6231c51ee3a71688c6bc09c5 100644
--- a/Trigger/TrigT1/TrigT1TGC/src/TGCSLPreSelector.cxx
+++ b/Trigger/TrigT1/TrigT1TGC/src/TGCSLPreSelector.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #include "TrigT1TGC/TGCSectorLogic.hh"
diff --git a/Trigger/TrigT1/TrigT1TGC/src/TGCSLPreSelectorOut.cxx b/Trigger/TrigT1/TrigT1TGC/src/TGCSLPreSelectorOut.cxx
index 7296a294a02df61bddc5c9e6c42321ce1a4f8294..2341ff37b747aefff24ffaaaf96c5e88db9751fb 100644
--- a/Trigger/TrigT1/TrigT1TGC/src/TGCSLPreSelectorOut.cxx
+++ b/Trigger/TrigT1/TrigT1TGC/src/TGCSLPreSelectorOut.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #include "TrigT1TGC/TGCSLPreSelectorOut.hh"
diff --git a/Trigger/TrigT1/TrigT1TGC/src/TGCSLSelector.cxx b/Trigger/TrigT1/TrigT1TGC/src/TGCSLSelector.cxx
index 79ec1dec43126f41d2ee769af1cbf5dc141fee57..01bd88c103607fabebc82f80ee701200e2ed4d24 100644
--- a/Trigger/TrigT1/TrigT1TGC/src/TGCSLSelector.cxx
+++ b/Trigger/TrigT1/TrigT1TGC/src/TGCSLSelector.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #include "TrigT1TGC/TGCSLSelector.hh"
diff --git a/Trigger/TrigT1/TrigT1TGC/src/TGCSLSelectorOut.cxx b/Trigger/TrigT1/TrigT1TGC/src/TGCSLSelectorOut.cxx
index b99e0a39fe1c943f02def246615a67d9519d1615..341e1c302b8f9039be259118e6007ceec5c68a3e 100644
--- a/Trigger/TrigT1/TrigT1TGC/src/TGCSLSelectorOut.cxx
+++ b/Trigger/TrigT1/TrigT1TGC/src/TGCSLSelectorOut.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #include "TrigT1TGC/TGCSLSelectorOut.hh"
diff --git a/Trigger/TrigT1/TrigT1TGC/src/TGCSSCController.cxx b/Trigger/TrigT1/TrigT1TGC/src/TGCSSCController.cxx
index 450bef383ec510aa3d77da7108454c5c9e930bcc..3338da6a42002e4b94587c6ef1781e73cdcfedd4 100644
--- a/Trigger/TrigT1/TrigT1TGC/src/TGCSSCController.cxx
+++ b/Trigger/TrigT1/TrigT1TGC/src/TGCSSCController.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 //$Id: TGCSSCController.cxx,v 1.6 2009-03-15 18:07:55 isaya Exp $
diff --git a/Trigger/TrigT1/TrigT1TGC/src/TGCSSCControllerOut.cxx b/Trigger/TrigT1/TrigT1TGC/src/TGCSSCControllerOut.cxx
index 5eb40fa61c0efa3e3d554b54eaded889953de06f..190f43d9f58f008319eb61e5a4392135b1578f1b 100644
--- a/Trigger/TrigT1/TrigT1TGC/src/TGCSSCControllerOut.cxx
+++ b/Trigger/TrigT1/TrigT1TGC/src/TGCSSCControllerOut.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 //$Id: TGCSSCControllerOut.cxx,v 1.5 2005-11-29 08:12:40 nkanaya Exp $
diff --git a/Trigger/TrigT1/TrigT1TGC/src/TGCSector.cxx b/Trigger/TrigT1/TrigT1TGC/src/TGCSector.cxx
index ed64618ddad1a6f48ba2074d88cfc02badc21287..914c8db26a42d4ba97a7a95e157f0924c8e6af98 100644
--- a/Trigger/TrigT1/TrigT1TGC/src/TGCSector.cxx
+++ b/Trigger/TrigT1/TrigT1TGC/src/TGCSector.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 //$Id: TGCSector.cxx,v 1.10 2009-05-14 01:28:04 isaya Exp $
diff --git a/Trigger/TrigT1/TrigT1TGC/src/TGCSectorLogic.cxx b/Trigger/TrigT1/TrigT1TGC/src/TGCSectorLogic.cxx
index 894dffee565523b052ff687949ddcbb5dcc52ec9..a1dc6e95b15b7c008cd1315b90113fb7d9bdf2b7 100644
--- a/Trigger/TrigT1/TrigT1TGC/src/TGCSectorLogic.cxx
+++ b/Trigger/TrigT1/TrigT1TGC/src/TGCSectorLogic.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 // $Id: TGCSectorLogic.cxx,v 1.14 2009-03-15 18:07:55 isaya Exp $
diff --git a/Trigger/TrigT1/TrigT1TGC/src/TGCSlaveBoard.cxx b/Trigger/TrigT1/TrigT1TGC/src/TGCSlaveBoard.cxx
index f81bab87773a1557a914c79fb4823e667542a342..37447521607923e3388df7ade4cb205d24620fb1 100644
--- a/Trigger/TrigT1/TrigT1TGC/src/TGCSlaveBoard.cxx
+++ b/Trigger/TrigT1/TrigT1TGC/src/TGCSlaveBoard.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #include "TrigT1TGC/TGCSlaveBoard.hh"
diff --git a/Trigger/TrigT1/TrigT1TGC/src/TGCSlaveBoardOut.cxx b/Trigger/TrigT1/TrigT1TGC/src/TGCSlaveBoardOut.cxx
index 047381b8237e0b2979bafb01ab0d339186966dfc..bd06d8843dd4fca6152f73e81efcbbbac4f8dfe2 100644
--- a/Trigger/TrigT1/TrigT1TGC/src/TGCSlaveBoardOut.cxx
+++ b/Trigger/TrigT1/TrigT1TGC/src/TGCSlaveBoardOut.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #include "TrigT1TGC/TGCSlaveBoardOut.hh"
diff --git a/Trigger/TrigT1/TrigT1TGC/src/TGCStripHighPtBoard.cxx b/Trigger/TrigT1/TrigT1TGC/src/TGCStripHighPtBoard.cxx
index 60021fb025d7b430800fc79c0d333de20dc2b011..9739c2722826b255092e6c31148d46d11f851371 100644
--- a/Trigger/TrigT1/TrigT1TGC/src/TGCStripHighPtBoard.cxx
+++ b/Trigger/TrigT1/TrigT1TGC/src/TGCStripHighPtBoard.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #include "TrigT1TGC/TGCStripHighPtBoard.hh"
diff --git a/Trigger/TrigT1/TrigT1TGC/src/TGCStripTripletSB.cxx b/Trigger/TrigT1/TrigT1TGC/src/TGCStripTripletSB.cxx
index 1da491fd4adeee4b3db542e72aead386454e2a9d..9faa0e27f465d726d030a9004f90f3c18069a29f 100644
--- a/Trigger/TrigT1/TrigT1TGC/src/TGCStripTripletSB.cxx
+++ b/Trigger/TrigT1/TrigT1TGC/src/TGCStripTripletSB.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 //$Id: TGCStripTripletSB.cxx,v 1.6 2009-05-14 01:28:04 isaya Exp $
diff --git a/Trigger/TrigT1/TrigT1TGC/src/TGCTMDB.cxx b/Trigger/TrigT1/TrigT1TGC/src/TGCTMDB.cxx
index 6a7ce7aeacafea7f2a84d6bfa5f70e80992e00ac..4a9384a4e41a81bbc268f497e9907e01afd0dcff 100644
--- a/Trigger/TrigT1/TrigT1TGC/src/TGCTMDB.cxx
+++ b/Trigger/TrigT1/TrigT1TGC/src/TGCTMDB.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 // ====================================================================
diff --git a/Trigger/TrigT1/TrigT1TGC/src/TGCTMDBOut.cxx b/Trigger/TrigT1/TrigT1TGC/src/TGCTMDBOut.cxx
index 57140afbb749e83c734f74367d2b32eb58c83f84..272ac323454ee74b85fafcbe17f4fbe6cb1c9deb 100644
--- a/Trigger/TrigT1/TrigT1TGC/src/TGCTMDBOut.cxx
+++ b/Trigger/TrigT1/TrigT1TGC/src/TGCTMDBOut.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 // ====================================================================
diff --git a/Trigger/TrigT1/TrigT1TGC/src/TGCTileMuCoincidenceMap.cxx b/Trigger/TrigT1/TrigT1TGC/src/TGCTileMuCoincidenceMap.cxx
index 1081ba9a2874ad74d24010a60fde8294930ee6df..f62ef2de556ffee21710d6b38e54da0d67532ced 100644
--- a/Trigger/TrigT1/TrigT1TGC/src/TGCTileMuCoincidenceMap.cxx
+++ b/Trigger/TrigT1/TrigT1TGC/src/TGCTileMuCoincidenceMap.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #include <iostream>
diff --git a/Trigger/TrigT1/TrigT1TGC/src/TGCTimingManager.cxx b/Trigger/TrigT1/TrigT1TGC/src/TGCTimingManager.cxx
index 0cc36e3659ab82ab7fd681c2982070705c60d0ea..36dbc90d1b56b047a9b9f639d39ab3bf324e15d2 100644
--- a/Trigger/TrigT1/TrigT1TGC/src/TGCTimingManager.cxx
+++ b/Trigger/TrigT1/TrigT1TGC/src/TGCTimingManager.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 //$Id: TGCTimingManager.cxx,v 1.4 2009-05-13 02:53:51 isaya Exp $
diff --git a/Trigger/TrigT1/TrigT1TGC/src/TGCWireHighPtBoard.cxx b/Trigger/TrigT1/TrigT1TGC/src/TGCWireHighPtBoard.cxx
index 3f7a8f33f9528fe5080b049d993ea43d1f8a429b..c7a339da633c39b2e0ca04c4e2672f85f9bedeb3 100644
--- a/Trigger/TrigT1/TrigT1TGC/src/TGCWireHighPtBoard.cxx
+++ b/Trigger/TrigT1/TrigT1TGC/src/TGCWireHighPtBoard.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 // ref. SOS063V07,S0S061V04 
diff --git a/Trigger/TrigT1/TrigT1TGC/src/TGCWireTripletSB.cxx b/Trigger/TrigT1/TrigT1TGC/src/TGCWireTripletSB.cxx
index f6b35cc9b2feef119fb3d69767d39079e05837e4..ac41036dd7f527675abc4a5b68c0759bd385de4b 100644
--- a/Trigger/TrigT1/TrigT1TGC/src/TGCWireTripletSB.cxx
+++ b/Trigger/TrigT1/TrigT1TGC/src/TGCWireTripletSB.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 // ref. SOS051V07,S0S052V06 
diff --git a/Trigger/TrigT1/TrigT1TGCRecRoiSvc/TrigT1TGCRecRoiSvc/TGCRecRoiSvc.h b/Trigger/TrigT1/TrigT1TGCRecRoiSvc/TrigT1TGCRecRoiSvc/TGCRecRoiSvc.h
index aa207b5c0a85e7969762d2a61b108e38a7e42d11..4e1d48cf7d71a15198aaabc6a79f9d5189082a91 100755
--- a/Trigger/TrigT1/TrigT1TGCRecRoiSvc/TrigT1TGCRecRoiSvc/TGCRecRoiSvc.h
+++ b/Trigger/TrigT1/TrigT1TGCRecRoiSvc/TrigT1TGCRecRoiSvc/TGCRecRoiSvc.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef TRIGT1_TGCRECROISVC_H
diff --git a/Trigger/TrigT1/TrigT1TGCRecRoiSvc/doc/packagedoc.h b/Trigger/TrigT1/TrigT1TGCRecRoiSvc/doc/packagedoc.h
index fc23249ba83d1a6f5b5aea37343e6c7434df20fe..2d300dd43fb283e941beaada9bf460e97be8610c 100644
--- a/Trigger/TrigT1/TrigT1TGCRecRoiSvc/doc/packagedoc.h
+++ b/Trigger/TrigT1/TrigT1TGCRecRoiSvc/doc/packagedoc.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 /** 
diff --git a/Trigger/TrigT1/TrigT1TGCRecRoiSvc/python/TrigT1TGCRecRoiConfig.py b/Trigger/TrigT1/TrigT1TGCRecRoiSvc/python/TrigT1TGCRecRoiConfig.py
index 203932cc185d4cfa83f1a6b472e5334b69f76771..bc4e2a37f869c4ad43a267c7a1880ce635a1a179 100755
--- a/Trigger/TrigT1/TrigT1TGCRecRoiSvc/python/TrigT1TGCRecRoiConfig.py
+++ b/Trigger/TrigT1/TrigT1TGCRecRoiSvc/python/TrigT1TGCRecRoiConfig.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 
 # $Id: TrigT1TGCRecRoiConfig.py 301207 2010-05-26 12:16:53Z krasznaa $
 #
diff --git a/Trigger/TrigT1/TrigT1TGCRecRoiSvc/python/__init__.py b/Trigger/TrigT1/TrigT1TGCRecRoiSvc/python/__init__.py
index e8d6976fa68bf5b814c7bad47ea9e30d37c72db3..c8a8e1d91ad5bcaa40da51a0471027fedab6d9bc 100755
--- a/Trigger/TrigT1/TrigT1TGCRecRoiSvc/python/__init__.py
+++ b/Trigger/TrigT1/TrigT1TGCRecRoiSvc/python/__init__.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 
 # File: TrigT1TGCRecRoiConfig/__init__.py
 
diff --git a/Trigger/TrigT1/TrigT1TGCRecRoiSvc/src/TGCRecRoiSvc.cxx b/Trigger/TrigT1/TrigT1TGCRecRoiSvc/src/TGCRecRoiSvc.cxx
index 7a3d446243a24a029fe5249a421884c6b71e0322..7e7bc7f19da922f609c92bafe685836248b9d039 100755
--- a/Trigger/TrigT1/TrigT1TGCRecRoiSvc/src/TGCRecRoiSvc.cxx
+++ b/Trigger/TrigT1/TrigT1TGCRecRoiSvc/src/TGCRecRoiSvc.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #include "TrigT1TGCRecRoiSvc/TGCRecRoiSvc.h"
diff --git a/Trigger/TrigT1/TrigT1TRT/TrigT1TRT/TrigT1TRT.h b/Trigger/TrigT1/TrigT1TRT/TrigT1TRT/TrigT1TRT.h
index 6cabb026f1cfe3dcecc6a80da2e30b4ef5c3bf4b..c7b12b3d1577dafb53cdacbe82ffdb7dcffdedbb 100644
--- a/Trigger/TrigT1/TrigT1TRT/TrigT1TRT/TrigT1TRT.h
+++ b/Trigger/TrigT1/TrigT1TRT/TrigT1TRT/TrigT1TRT.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef TRIG_T1_TRT_H
diff --git a/Trigger/TrigT1/TrigT1TRT/src/TrigT1TRT.cxx b/Trigger/TrigT1/TrigT1TRT/src/TrigT1TRT.cxx
index 471174736aa4f4354b550c9e93e08b6c150da0af..572f375aaf872126982f069bbb32345a9f75f644 100644
--- a/Trigger/TrigT1/TrigT1TRT/src/TrigT1TRT.cxx
+++ b/Trigger/TrigT1/TrigT1TRT/src/TrigT1TRT.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #include <stdint.h>
diff --git a/Trigger/TrigT1/TrigT1ZDC/TrigT1ZDC/TrigT1ZDC.h b/Trigger/TrigT1/TrigT1ZDC/TrigT1ZDC/TrigT1ZDC.h
index 0b3fed26fa349d10971302a81f142279027f005e..5d5d92c11b5bb52a12f3f182b37ae5df199881fe 100644
--- a/Trigger/TrigT1/TrigT1ZDC/TrigT1ZDC/TrigT1ZDC.h
+++ b/Trigger/TrigT1/TrigT1ZDC/TrigT1ZDC/TrigT1ZDC.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef TRIG_T1_ZDC_H
diff --git a/Trigger/TrigT1/TrigT1ZDC/doc/packagedoc.h b/Trigger/TrigT1/TrigT1ZDC/doc/packagedoc.h
index f40e1c811ca9e0e807eb79f19e59623f4da67c8f..7b0e1d1cb02fdff451d6d0da62e46c4f3b57b4c0 100644
--- a/Trigger/TrigT1/TrigT1ZDC/doc/packagedoc.h
+++ b/Trigger/TrigT1/TrigT1ZDC/doc/packagedoc.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 /**
diff --git a/Trigger/TrigT1/TrigT1ZDC/src/TrigT1ZDC.cxx b/Trigger/TrigT1/TrigT1ZDC/src/TrigT1ZDC.cxx
index d0556b271fff8ad8b3570ead846200fd8802144a..793b3115e690deb7606d92598cd9bc9b672dd18d 100644
--- a/Trigger/TrigT1/TrigT1ZDC/src/TrigT1ZDC.cxx
+++ b/Trigger/TrigT1/TrigT1ZDC/src/TrigT1ZDC.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #include "TrigT1ZDC/TrigT1ZDC.h"
diff --git a/Trigger/TriggerCommon/TriggerMenu/python/l1/BunchGroupSet.py b/Trigger/TriggerCommon/TriggerMenu/python/l1/BunchGroupSet.py
index 2836d05cd649888e2e5d50fdcd97f5154b07db1a..0ce0e5a4847459e59f5182e95b0f6cbe83320ada 100644
--- a/Trigger/TriggerCommon/TriggerMenu/python/l1/BunchGroupSet.py
+++ b/Trigger/TriggerCommon/TriggerMenu/python/l1/BunchGroupSet.py
@@ -1,6 +1,4 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-
-from copy import deepcopy
+# Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 
 from Limits import Limits
 from Lvl1Flags import Lvl1Flags
diff --git a/Trigger/TriggerCommon/TriggerMenu/python/l1/CTPInfo.py b/Trigger/TriggerCommon/TriggerMenu/python/l1/CTPInfo.py
index c19cb82c9330e77c9b17ef53d6ddb5cb2607989a..9111407367e5320c2e0cf7759182cff3e8ab2459 100644
--- a/Trigger/TriggerCommon/TriggerMenu/python/l1/CTPInfo.py
+++ b/Trigger/TriggerCommon/TriggerMenu/python/l1/CTPInfo.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 
 from BunchGroupSet import BunchGroupSet
 from Lvl1MenuUtil import oldStyle
diff --git a/Trigger/TriggerCommon/TriggerMenu/python/l1/Cabling.py b/Trigger/TriggerCommon/TriggerMenu/python/l1/Cabling.py
index 282e615f20b9bc7b81ebbcbabf592f79c1b7bad8..ddb7272a491f62c70f16ee5630a4f19f23057aec 100644
--- a/Trigger/TriggerCommon/TriggerMenu/python/l1/Cabling.py
+++ b/Trigger/TriggerCommon/TriggerMenu/python/l1/Cabling.py
@@ -1,6 +1,6 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 
-from Limits import Limits
+from Limits import Limits # noqa: F401
 from AthenaCommon.Logging import logging
 log = logging.getLogger("Cabling")
 log.setLevel(logging.INFO)
@@ -117,7 +117,7 @@ class Cabling:
                                 'TE'     : [(0,8,'EN1'),(8,16,'EN2')],
                                 'XE'     : [(0,8,'EN1'),(8,16,'EN2')],
                                 'XS'     : [(0,8,'EN1')],
-                                'MBTSSI' : [(0,12,'NIM1'),(12,24,'NIM2')],
+                                'MBTSSI' : [(0,16,'NIM1'),(16,32,'NIM2')],
                                 'MBTS'   : [(0,1,'NIM1'), (1,2,'NIM2')],
                                 'LUCID'  : [(0,6,'CTPCAL')],
                                 'ZDC'    : [(0,3,'CTPCAL')],
@@ -146,7 +146,7 @@ class Cabling:
     @staticmethod
     def calcBitnum(thrtype):
         # get the widths for the threshold types is defined in L1Common
-        exec("nbits = Limits.%s_bitnum" % thrtype)
+        nbits = getattr(Limits,'%s_bitnum' % thrtype)
         return nbits
 
 
@@ -264,8 +264,7 @@ class InputCable:
         """
         Gets the cable assignment from L1Common
         """
-        exec("cable = Limits.%s_cable" % thrtype)
-        
+        cable = getattr(Limits,'%s_cable' % thrtype)
         # we change the format for run 2, the tuple now contains also the bit multiplicity, as it is not constant per type
         infosize = (len(cable)-1)/cable[0]
 
diff --git a/Trigger/TriggerCommon/TriggerMenu/python/l1/CaloInfo.py b/Trigger/TriggerCommon/TriggerMenu/python/l1/CaloInfo.py
index c2735dafb478d2871e6fb87c102ac06d9cef8f82..ed69578bb3c52973ae0c1ce0fb23da0512033dcb 100644
--- a/Trigger/TriggerCommon/TriggerMenu/python/l1/CaloInfo.py
+++ b/Trigger/TriggerCommon/TriggerMenu/python/l1/CaloInfo.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 
 from Lvl1MenuUtil import log
 from Lvl1MenuUtil import oldStyle
diff --git a/Trigger/TriggerCommon/TriggerMenu/python/l1/CoreLut.py b/Trigger/TriggerCommon/TriggerMenu/python/l1/CoreLut.py
new file mode 100644
index 0000000000000000000000000000000000000000..fe17fae1319f7bad966575c28a413bc5563529c3
--- /dev/null
+++ b/Trigger/TriggerCommon/TriggerMenu/python/l1/CoreLut.py
@@ -0,0 +1,113 @@
+# Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+
+
+class CoreLut(object):
+
+    # LUT  0-19  of size 15 : tip   0 - 299
+    # LUT 20-36  of size 12 : tip 300 - 503
+    # LUT    37  of size  8 : tip 504 - 511
+
+    # maps LUT number to index of first TIP
+    lutDef = {
+        0 : 0,
+        1 : 15,
+        2 : 30,
+        3 : 45,
+        4 : 60,
+        5 : 75,
+        6 : 90,
+        7 : 105,
+        8 : 120,
+        9 : 135,
+        10 : 150,
+        11 : 165,
+        12 : 180,
+        13 : 195,
+        14 : 210,
+        15 : 225,
+        16 : 240,
+        17 : 255,
+        18 : 270,
+        19 : 285,
+        20 : 300,
+        21 : 312,
+        22 : 324,
+        23 : 336,
+        24 : 348,
+        25 : 360,
+        26 : 372,
+        27 : 384,
+        28 : 396,
+        29 : 408,
+        30 : 420,
+        31 : 432,
+        32 : 444,
+        33 : 456,
+        34 : 468,
+        35 : 480,
+        36 : 492,
+        37 : 504
+        }
+
+
+    def __init__(self):
+        pass
+
+    @staticmethod
+    def getLutSize(lutnumber):
+        if lutnumber>=0  and lutnumber<20 : return 15
+        if lutnumber>=20 and lutnumber<37 : return 12
+        if lutnumber==37:                   return 8
+        raise RuntimeError("CoreLut.py getLutSize(): LUT number %i does not exist" % lutnumber)
+
+
+    @staticmethod
+    def getLutRange(lutnumber):
+        if lutnumber>=0 and lutnumber<20 :
+            begin = 15 * lutnumber
+            end   = begin + 14
+        elif lutnumber>=20 and lutnumber<37 :
+            begin = 300 + 12 * (lutnumber-16)
+            end   = begin + 11
+        elif lutnumber==37:
+            begin = 504
+            end   = 511
+        else:
+            raise RuntimeError("CoreLut.py getLutRange(): LUT number %i does not exist" % lutnumber)
+        return (begin,end)
+
+
+
+    @staticmethod
+    def getLutAndBitFromTIP(tip):
+        tip = int(tip)
+        if tip>=0 and tip<300:
+            lut = tip/15
+        elif tip>=300 and tip<504:
+            lut = (tip-300)/12 + 20
+        elif tip>=504 and tip<512:
+            lut = 37
+        else:
+            raise RuntimeError("CoreLut.py getLutAndBitFromTIP(tip): tip %i does not exist" % tip)
+        return lut
+
+
+
+    @staticmethod
+    def getLutAndBit(connector, signal):
+        firstTIPofConnector = [320, 384, 448] # last if 511
+
+        tip = firstTIPofConnector[ connector ] + signal
+            
+        return CoreLut.getLutAndBitFromTIP(tip)
+
+
+    @staticmethod
+    def isOnOneLut(connector, phase, listOfCableBits):
+
+        occupiedLuts = set([ CoreLut.getLutAndBit(connector,2*b + phase)[0] for b in listOfCableBits])
+
+        if len(occupiedLuts)>1:
+            raise RuntimeError("logic stretches over more than one LUT")
+
+coreLut = CoreLut()
diff --git a/Trigger/TriggerCommon/TriggerMenu/python/l1/Limits.py b/Trigger/TriggerCommon/TriggerMenu/python/l1/Limits.py
index 38da63573d2789d490952cdca9c2255c59989878..192d05a182683b60c0e46dd590925da7240b4e3a 100644
--- a/Trigger/TriggerCommon/TriggerMenu/python/l1/Limits.py
+++ b/Trigger/TriggerCommon/TriggerMenu/python/l1/Limits.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 
 """
 This temporarily holds CTP sizes
@@ -50,13 +50,13 @@ class Limits:
     @staticmethod
     def getCTPdataformat(version):
         module = __import__('CTPfragment.CTPdataformat_v%i' % version, globals(), locals(), ['CTPdataformat_v%i' % version], -1)
-        exec("CTPdataformat = module.CTPdataformat_v%i" % version)
+        CTPdataformat = getattr(module,'CTPdataformat_v%i' % version)
         return CTPdataformat
 
     @staticmethod
     def getL1Common(version):
         module = __import__('L1Common.L1Common_v%i' % version, globals(), locals(), ['L1Common_v%i' % version], -1)
-        exec("L1Common = module.L1Common_v%i" % version)
+        L1Common = getattr(module,'L1Common_v%i' % version)
         return L1Common
 
     @staticmethod
diff --git a/Trigger/TriggerCommon/TriggerMenu/python/l1/Logic.py b/Trigger/TriggerCommon/TriggerMenu/python/l1/Logic.py
index ce8e6f034e606b675223d11764d2a769c0c2979d..3e44501697df1c848ee077338aa2422fcfc1672f 100644
--- a/Trigger/TriggerCommon/TriggerMenu/python/l1/Logic.py
+++ b/Trigger/TriggerCommon/TriggerMenu/python/l1/Logic.py
@@ -1,8 +1,8 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 
 __all__ = ['Logic', 'Not']
 
-from copy import copy,deepcopy
+from copy import copy
 
 from Lvl1MenuUtil import log
 
diff --git a/Trigger/TriggerCommon/TriggerMenu/python/l1/Lvl1Condition.py b/Trigger/TriggerCommon/TriggerMenu/python/l1/Lvl1Condition.py
index 882a5f470ec5d7ae47e05e2c274db746a33dedfa..2803ae8d770e127fa8cfc72b40971d8f9d019794 100644
--- a/Trigger/TriggerCommon/TriggerMenu/python/l1/Lvl1Condition.py
+++ b/Trigger/TriggerCommon/TriggerMenu/python/l1/Lvl1Condition.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 
 
 from Logic import Logic
diff --git a/Trigger/TriggerCommon/TriggerMenu/python/l1/Lvl1Flags.py b/Trigger/TriggerCommon/TriggerMenu/python/l1/Lvl1Flags.py
index 80fdc158b1a2a214c8d73c63028e73491a31a656..64ab976b79cbb0272815055c5e65ee444e319a00 100644
--- a/Trigger/TriggerCommon/TriggerMenu/python/l1/Lvl1Flags.py
+++ b/Trigger/TriggerCommon/TriggerMenu/python/l1/Lvl1Flags.py
@@ -1,11 +1,10 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 
 """
 Lvl1 specific flags
 """
 
-from AthenaCommon.JobProperties import JobProperty, JobPropertyContainer, jobproperties
-from TriggerMenu.menu.CommonSliceHelper import AllowedList
+from AthenaCommon.JobProperties import JobProperty, JobPropertyContainer
 from AthenaCommon.Logging import logging
 from Limits import Limits
 
diff --git a/Trigger/TriggerCommon/TriggerMenu/python/l1/Lvl1Menu.py b/Trigger/TriggerCommon/TriggerMenu/python/l1/Lvl1Menu.py
index 22361ed88a3a8efce62825001b66a438bdff2a6f..c099fe517c09f5900def807754cc07352bfb1c49 100644
--- a/Trigger/TriggerCommon/TriggerMenu/python/l1/Lvl1Menu.py
+++ b/Trigger/TriggerCommon/TriggerMenu/python/l1/Lvl1Menu.py
@@ -1,7 +1,7 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 
-from Lvl1Thresholds import LVL1Thresholds, LVL1Threshold, ThresholdValue
-from Lvl1MenuItems import LVL1MenuItems, LVL1MenuItem
+from Lvl1Thresholds import LVL1Thresholds
+from Lvl1MenuItems import LVL1MenuItems
 from Lvl1MonCounters import Lvl1MonCounters
 from CaloInfo import CaloInfo
 from MuctpiInfo import MuctpiInfo
@@ -128,7 +128,6 @@ class Lvl1Menu:
         All other checks should be implemented in TrigConfStorage/src/CheckConsistency.cxx
         This method is only for quick solutions but should be intermediate
         """
-        from Lvl1Flags import Lvl1Flags
 
         success = True
         
diff --git a/Trigger/TriggerCommon/TriggerMenu/python/l1/Lvl1MenuItems.py b/Trigger/TriggerCommon/TriggerMenu/python/l1/Lvl1MenuItems.py
index 1678d4c0c0493352e4d2e97d5dd19f28524932c1..bbdd2db903d24682d24a8632cea131bfc9e84426 100644
--- a/Trigger/TriggerCommon/TriggerMenu/python/l1/Lvl1MenuItems.py
+++ b/Trigger/TriggerCommon/TriggerMenu/python/l1/Lvl1MenuItems.py
@@ -1,6 +1,6 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 
-from PrescaleHelper import getCutFromPrescale, getPrescaleFromCut, maxPrescaleCut
+from PrescaleHelper import getCutFromPrescale, getPrescaleFromCut
 from Lvl1MenuUtil import oldStyle
 
 from AthenaCommon.Logging import logging
@@ -171,7 +171,6 @@ class PrescaleHandler(object):
         self.items = menuitems
         self.itemsByPartition = {}
 
-        from Lvl1Flags import Lvl1Flags
         for item in menuitems:
             self.itemsByPartition.setdefault(item.partition,[]).append(item)
 
diff --git a/Trigger/TriggerCommon/TriggerMenu/python/l1/Lvl1MenuUtil.py b/Trigger/TriggerCommon/TriggerMenu/python/l1/Lvl1MenuUtil.py
index 857b4a7b32a4fe0fdbc3803cce0959d7b47f7996..4fc4c16fdaaf0eb245761f8196b365f9070894d4 100644
--- a/Trigger/TriggerCommon/TriggerMenu/python/l1/Lvl1MenuUtil.py
+++ b/Trigger/TriggerCommon/TriggerMenu/python/l1/Lvl1MenuUtil.py
@@ -1,6 +1,6 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 
-__all__ = ['log', 'idgen', 'binstr', 'get_smk_psk_Name', 'applyLVL1Prescale', 'oldStyle']
+__all__ = ['log', 'idgen', 'binstr', 'get_smk_psk_Name', 'oldStyle']
 
 from AthenaCommon.Logging import logging
 log = logging.getLogger("TriggerConfigL1")
diff --git a/Trigger/TriggerCommon/TriggerMenu/python/l1/Lvl1MonCounters.py b/Trigger/TriggerCommon/TriggerMenu/python/l1/Lvl1MonCounters.py
index 34e84410ab17dc00372a214da7be4164c250319a..2559756c4580d5fab68aeefa082cd8f705aedb47 100644
--- a/Trigger/TriggerCommon/TriggerMenu/python/l1/Lvl1MonCounters.py
+++ b/Trigger/TriggerCommon/TriggerMenu/python/l1/Lvl1MonCounters.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 
 
 
diff --git a/Trigger/TriggerCommon/TriggerMenu/python/l1/Lvl1Thresholds.py b/Trigger/TriggerCommon/TriggerMenu/python/l1/Lvl1Thresholds.py
index 4d0cd678b6acbbf0847c4379a6cb1a6acb530e86..8d889c80abfc20c8f430b61f5fd57167cffafc31 100644
--- a/Trigger/TriggerCommon/TriggerMenu/python/l1/Lvl1Thresholds.py
+++ b/Trigger/TriggerCommon/TriggerMenu/python/l1/Lvl1Thresholds.py
@@ -1,9 +1,8 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 
 from Limits import CaloLimits as CL
 IsolationOff = CL.IsolationOff
 
-from Lvl1MenuUtil import log
 from copy import deepcopy
 
 class ThresholdValue:
diff --git a/Trigger/TriggerCommon/TriggerMenu/python/l1/MuctpiInfo.py b/Trigger/TriggerCommon/TriggerMenu/python/l1/MuctpiInfo.py
index b50ff1f4da5bee275b06c2770d913bb91efbf65a..843a147f60381a4c2c3ed8ed5f1ccf866d548ced 100644
--- a/Trigger/TriggerCommon/TriggerMenu/python/l1/MuctpiInfo.py
+++ b/Trigger/TriggerCommon/TriggerMenu/python/l1/MuctpiInfo.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 
 class MuctpiInfo:
     def __init__(self, low_pt=0, high_pt=0, max_cand=13):
diff --git a/Trigger/TriggerCommon/TriggerMenu/python/l1/PrescaleHelper.py b/Trigger/TriggerCommon/TriggerMenu/python/l1/PrescaleHelper.py
index 39dcb8eeb3660f2fd34c96c9e176d07e7c8c39ca..d6453638378a06b974f5606415e304b3076bf1e3 100644
--- a/Trigger/TriggerCommon/TriggerMenu/python/l1/PrescaleHelper.py
+++ b/Trigger/TriggerCommon/TriggerMenu/python/l1/PrescaleHelper.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 
 """
 The prescaling uses a pseudo-random binary sequence generator of 24 bit width (31 bit internal)
diff --git a/Trigger/TriggerCommon/TriggerMenu/python/l1/TriggerTypeDef.py b/Trigger/TriggerCommon/TriggerMenu/python/l1/TriggerTypeDef.py
index 8732502202b8502db65119a2306d2d90a65f29d4..8bc046d5eeda1281b306a85ad9907f323d7f70fd 100644
--- a/Trigger/TriggerCommon/TriggerMenu/python/l1/TriggerTypeDef.py
+++ b/Trigger/TriggerCommon/TriggerMenu/python/l1/TriggerTypeDef.py
@@ -1,7 +1,4 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-
-
-from TriggerJobOpts.TriggerFlags import TriggerFlags as TF
+# Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 
 class TT:
     """
diff --git a/Trigger/TriggerCommon/TriggerMenu/python/l1/TriggerTypeDefRun1.py b/Trigger/TriggerCommon/TriggerMenu/python/l1/TriggerTypeDefRun1.py
index 6b537c1535093a9e426b481f4f610d63d212f59c..ef07604c0ab2e19a3d669b4306db6e355cb85360 100644
--- a/Trigger/TriggerCommon/TriggerMenu/python/l1/TriggerTypeDefRun1.py
+++ b/Trigger/TriggerCommon/TriggerMenu/python/l1/TriggerTypeDefRun1.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 
 
 from TriggerJobOpts.TriggerFlags import TriggerFlags as TF
diff --git a/Trigger/TriggerCommon/TriggerMenu/python/l1/XMLMenuReader.py b/Trigger/TriggerCommon/TriggerMenu/python/l1/XMLMenuReader.py
index 0d7e538daac132f7b87f68f7e0c932e862c18304..5e46847f99fab0616656c5366ab5b3380a4dbac3 100644
--- a/Trigger/TriggerCommon/TriggerMenu/python/l1/XMLMenuReader.py
+++ b/Trigger/TriggerCommon/TriggerMenu/python/l1/XMLMenuReader.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 
 from Lvl1Thresholds import LVL1Threshold, LVL1TopoInput, ThresholdValue
 from Lvl1MenuItems import LVL1MenuItem
@@ -8,7 +8,7 @@ from PrescaleHelper import getCutFromPrescale
 from Logic import Logic
 from Lvl1Condition import Lvl1InternalTrigger, ThrCondition
 from CaloInfo import MinimumTOBPt
-from Lvl1MonCounters import Lvl1MonCounters, Lvl1CtpinCounter, Lvl1CtpmonCounter
+from Lvl1MonCounters import Lvl1CtpinCounter, Lvl1CtpmonCounter
 
 
 from AthenaCommon.Logging import logging
diff --git a/Trigger/TriggerCommon/TriggerMenu/python/l1/XMLReader.py b/Trigger/TriggerCommon/TriggerMenu/python/l1/XMLReader.py
index 85d90a28916eaea4fd79145f2e8ee9a50e4753ad..917a2abba9fb84e17797897b0eaff949ac895e77 100755
--- a/Trigger/TriggerCommon/TriggerMenu/python/l1/XMLReader.py
+++ b/Trigger/TriggerCommon/TriggerMenu/python/l1/XMLReader.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 
 
 import xml.etree.cElementTree as ET
diff --git a/Trigger/TriggerCommon/TriggerMenu/python/l1/__init__.py b/Trigger/TriggerCommon/TriggerMenu/python/l1/__init__.py
index 74583d364ec2ca794156596c7254d9b234a940c6..10eda52d21555e116affa250b4cc4c7110c820f1 100644
--- a/Trigger/TriggerCommon/TriggerMenu/python/l1/__init__.py
+++ b/Trigger/TriggerCommon/TriggerMenu/python/l1/__init__.py
@@ -1,2 +1,2 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration