diff --git a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/ClusterAbbreviated.h b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/ClusterAbbreviated.h
index 30462960568fb2392637759e2ba12b7364c7f341..e2bd6a1dd735adfba25b5bc0e855d4773c82ba5f 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/ClusterAbbreviated.h
+++ b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/ClusterAbbreviated.h
@@ -1,7 +1,9 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //  ClusterAbbreviated.h
 //  TopoCore
 //  Created by Joerg Stelzer on 11/10/12.
-//  Copyright (c) 2012 Joerg Stelzer. All rights reserved.
 
 #ifndef TCS__ClusterAbbreviated
 #define TCS__ClusterAbbreviated
diff --git a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/ClusterNoSort.h b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/ClusterNoSort.h
index 749c4ff6be713faeb361ae596422339432c54878..56f28012406a7f76356bbdb68b0463ea3936c520 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/ClusterNoSort.h
+++ b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/ClusterNoSort.h
@@ -1,7 +1,9 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //  ClusterNoSort.h
 //  TopoCore
 //  Created by Joerg Stelzer on 11/10/12.
-//  Copyright (c) 2012 Joerg Stelzer. All rights reserved.
 
 #ifndef TCS__ClusterNoSort
 #define TCS__ClusterNoSort
diff --git a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/ClusterSelect.h b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/ClusterSelect.h
index de25723032cc7b24181b4dc36d9009e51ae55ded..8d52b67c2619ea2cc734bf23a236dfe939a7cfef 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/ClusterSelect.h
+++ b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/ClusterSelect.h
@@ -1,7 +1,9 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //  ClusterSelect.h
 //  TopoCore
 //  Created by Joerg Stelzer on 11/10/12.
-//  Copyright (c) 2012 Joerg Stelzer. All rights reserved.
 
 #ifndef TCS__ClusterSelect
 #define TCS__ClusterSelect
diff --git a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/ClusterSort.h b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/ClusterSort.h
index e39c8c98e6c8b6a3e99bee3eaacd04f6c890ef66..3c3bc1967b8403f45e0b7255ed0b36fc4e2f0219 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/ClusterSort.h
+++ b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/ClusterSort.h
@@ -1,7 +1,9 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //  ClusterSort.h
 //  TopoCore
 //  Created by Joerg Stelzer on 11/10/12.
-//  Copyright (c) 2012 Joerg Stelzer. All rights reserved.
 
 #ifndef TCS__ClusterSort
 #define TCS__ClusterSort
diff --git a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/ClusterSortingAlg.h b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/ClusterSortingAlg.h
index 5e1e816475ef63cc27e78e48117c802d5db29d38..fd4e6bfb6866654749e466bd4fd083d1e779a28e 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/ClusterSortingAlg.h
+++ b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/ClusterSortingAlg.h
@@ -1,7 +1,9 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //  ClusterSortingAlg.h
 //  TopoCore
 //  Created by Joerg Stelzer on 11/10/12.
-//  Copyright (c) 2012 Joerg Stelzer. All rights reserved.
 
 #ifndef TCS__ClusterSortingAlg
 #define TCS__ClusterSortingAlg
diff --git a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/DeltaEtaIncl1.h b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/DeltaEtaIncl1.h
index 0e0156e79c9f38795c70d6a459cc43536ad2b6b3..f03bbf78af40f4c50f587fa6682b54800b9d2305 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/DeltaEtaIncl1.h
+++ b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/DeltaEtaIncl1.h
@@ -1,7 +1,9 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //  DeltaEtaIncl1.h
 //  TopoCore
 //  Created by Joerg Stelzer on 11/16/12.
-//  Copyright (c) 2012 Joerg Stelzer. All rights reserved.
 
 #ifndef __TopoCore__DeltaEtaIncl1__
 #define __TopoCore__DeltaEtaIncl1__
diff --git a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/DeltaEtaIncl2.h b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/DeltaEtaIncl2.h
index fba6aa7abfd080b2dbf99426bf26a20c35c3f062..fe2ac2afdbcf361f121b33ee9c0c5ffcd1e4b162 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/DeltaEtaIncl2.h
+++ b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/DeltaEtaIncl2.h
@@ -1,7 +1,9 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //  DeltaEtaIncl2.h
 //  TopoCore
 //  Created by Joerg Stelzer on 11/16/12.
-//  Copyright (c) 2012 Joerg Stelzer. All rights reserved.
 
 #ifndef __TopoCore__DeltaEtaIncl2__
 #define __TopoCore__DeltaEtaIncl2__
diff --git a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/DeltaEtaLeading.h b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/DeltaEtaLeading.h
index 3114a7c1c57cf4d698e90c6ca1b42ce5e639dd48..37fe9ba82230c6b51b413e444ea257350499e694 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/DeltaEtaLeading.h
+++ b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/DeltaEtaLeading.h
@@ -1,7 +1,9 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //  DeltaEtaLeading.h
 //  TopoCore
 //  Created by Joerg Stelzer on 11/16/12.
-//  Copyright (c) 2012 Joerg Stelzer. All rights reserved.
 
 #ifndef __TopoCore__DeltaEtaLeading__
 #define __TopoCore__DeltaEtaLeading__
diff --git a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/DeltaEtaPhiIncl1.h b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/DeltaEtaPhiIncl1.h
index a0af91d98006bd990ed13ee09698b3d73117bb0e..8d89ad81f8e49a73174ef9f32f9a20754e6c2819 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/DeltaEtaPhiIncl1.h
+++ b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/DeltaEtaPhiIncl1.h
@@ -1,7 +1,9 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //  DeltaEtaPhiIncl1.h
 //  TopoCore
 //  Created by Joerg Stelzer on 11/16/12.
-//  Copyright (c) 2012 Joerg Stelzer. All rights reserved.
 
 #ifndef __TopoCore__DeltaEtaPhiIncl1__
 #define __TopoCore__DeltaEtaPhiIncl1__
diff --git a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/DeltaEtaPhiIncl2.h b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/DeltaEtaPhiIncl2.h
index 6a37dd2f3a0187c85d675839e9025442dc55627c..8508fc319d5ef148c611cec6a5681446e32db180 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/DeltaEtaPhiIncl2.h
+++ b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/DeltaEtaPhiIncl2.h
@@ -1,7 +1,9 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //  DeltaEtaPhiIncl2.h
 //  TopoCore
 //  Created by Joerg Stelzer on 11/16/12.
-//  Copyright (c) 2012 Joerg Stelzer. All rights reserved.
 
 #ifndef __TopoCore__DeltaEtaPhiIncl2__
 #define __TopoCore__DeltaEtaPhiIncl2__
diff --git a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/DeltaEtaTestIncl1.h b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/DeltaEtaTestIncl1.h
index 329771bef5f6e90e9ccc9b841f51d85edda59a7b..99b443991eef137c75ce7e9984a27512f5933c37 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/DeltaEtaTestIncl1.h
+++ b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/DeltaEtaTestIncl1.h
@@ -1,7 +1,9 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //  DeltaEtaTestIncl1.h
 //  TopoCore
 //  Created by Joerg Stelzer on 11/16/12.
-//  Copyright (c) 2012 Joerg Stelzer. All rights reserved.
 
 #ifndef __TopoCore__DeltaEtaTestIncl1__
 #define __TopoCore__DeltaEtaTestIncl1__
diff --git a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/DeltaPhiIncl1.h b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/DeltaPhiIncl1.h
index 441ad02fea93c9e1d6043cc309226fd4845e2fe6..b3707e2d65ef0044c5a074164e397895fdb1fd4e 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/DeltaPhiIncl1.h
+++ b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/DeltaPhiIncl1.h
@@ -1,7 +1,9 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //  DeltaPhiIncl1.h
 //  TopoCore
 //  Created by Joerg Stelzer on 11/16/12.
-//  Copyright (c) 2012 Joerg Stelzer. All rights reserved.
 
 #ifndef __TopoCore__DeltaPhiIncl1__
 #define __TopoCore__DeltaPhiIncl1__
diff --git a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/DeltaPhiIncl2.h b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/DeltaPhiIncl2.h
index 8fe6c415f3af4cb9386422551c3651ea32697f63..8e2e650e18b1925332e6d349d409e7ccc195a2aa 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/DeltaPhiIncl2.h
+++ b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/DeltaPhiIncl2.h
@@ -1,7 +1,9 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //  DeltaPhiIncl2.h
 //  TopoCore
 //  Created by Joerg Stelzer on 11/16/12.
-//  Copyright (c) 2012 Joerg Stelzer. All rights reserved.
 
 #ifndef __TopoCore__DeltaPhiIncl2__
 #define __TopoCore__DeltaPhiIncl2__
diff --git a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/DeltaPhiLeading.h b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/DeltaPhiLeading.h
index 0db56d51fdcd9d86d70c284c0366f8ca2eced5b9..98897101984ded7cc7eb331c7b2bc3494ce08717 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/DeltaPhiLeading.h
+++ b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/DeltaPhiLeading.h
@@ -1,7 +1,9 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //  DeltaPhiLeading.h
 //  TopoCore
 //  Created by Joerg Stelzer on 11/16/12.
-//  Copyright (c) 2012 Joerg Stelzer. All rights reserved.
 
 #ifndef __TopoCore__DeltaPhiLeading__
 #define __TopoCore__DeltaPhiLeading__
diff --git a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/DeltaRApproxBoxCutIncl1.h b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/DeltaRApproxBoxCutIncl1.h
index fb183ce3b55fdefa964d0be0ee813b76d8b0defb..3c963c0ab5e8f2a9c6ed22afb54110f788adee8e 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/DeltaRApproxBoxCutIncl1.h
+++ b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/DeltaRApproxBoxCutIncl1.h
@@ -1,7 +1,9 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //  DeltaRApproxBoxCutIncl1.h
 //  TopoCore
 //  Created by Joerg Stelzer on 11/16/12.
-//  Copyright (c) 2012 Joerg Stelzer. All rights reserved.
 
 #ifndef __TopoCore__DeltaRApproxBoxCutIncl1__
 #define __TopoCore__DeltaRApproxBoxCutIncl1__
diff --git a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/DeltaRApproxBoxCutIncl2.h b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/DeltaRApproxBoxCutIncl2.h
index 178c943316b9737194d3db6c4030e52f64570a31..70dde42b74f7ae08256e93302d732685e863ac2e 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/DeltaRApproxBoxCutIncl2.h
+++ b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/DeltaRApproxBoxCutIncl2.h
@@ -1,7 +1,9 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //  DeltaRApproxBoxCutIncl2.h
 //  TopoCore
 //  Created by Joerg Stelzer on 11/16/12.
-//  Copyright (c) 2012 Joerg Stelzer. All rights reserved.
 
 #ifndef __TopoCore__DeltaRApproxBoxCutIncl2__
 #define __TopoCore__DeltaRApproxBoxCutIncl2__
diff --git a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/DeltaRLeading.h b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/DeltaRLeading.h
index 0740330885565217fde0c60ae2a880afb9b49183..9b371cbd06fdd0354b4dc047a48694e9ab63d9dd 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/DeltaRLeading.h
+++ b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/DeltaRLeading.h
@@ -1,7 +1,9 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //  DeltaRLeading.h
 //  TopoCore
 //  Created by Joerg Stelzer on 11/16/12.
-//  Copyright (c) 2012 Joerg Stelzer. All rights reserved.
 
 #ifndef __TopoCore__DeltaRLeading__
 #define __TopoCore__DeltaRLeading__
diff --git a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/DeltaRSqrIncl1.h b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/DeltaRSqrIncl1.h
index 7239c389eb1cad1705c7b38c9b3fca8f713a2db2..3d6907080560de72c3efba7e89972faea409905c 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/DeltaRSqrIncl1.h
+++ b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/DeltaRSqrIncl1.h
@@ -1,7 +1,9 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //  DeltaRSqrIncl1.h
 //  TopoCore
 //  Created by Joerg Stelzer/V Sorin on 9/16/14.
-//  Copyright (c) 2012 Joerg Stelzer. All rights reserved.
 
 #ifndef __TopoCore__DeltaRSqrIncl1__
 #define __TopoCore__DeltaRSqrIncl1__
diff --git a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/DeltaRSqrIncl2.h b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/DeltaRSqrIncl2.h
index 79d5f12198c05217dcf34fcc54ff67370c7e7587..f41d07a57a4093c83b5b567a3f71890314d320e6 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/DeltaRSqrIncl2.h
+++ b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/DeltaRSqrIncl2.h
@@ -1,7 +1,9 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //  DeltaRSqrIncl2.h
 //  TopoCore
 //  Created by Joerg Stelzer/V Sorin on 9/16/14.
-//  Copyright (c) 2012 Joerg Stelzer. All rights reserved.
 
 #ifndef __TopoCore__DeltaRSqrIncl2__
 #define __TopoCore__DeltaRSqrIncl2__
diff --git a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/DisambiguationDRIncl2.h b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/DisambiguationDRIncl2.h
index 4af5a882ef004162148842768ab684f48b6281fc..72c904e50d3dd137383977cb6c0a08fd7df846e1 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/DisambiguationDRIncl2.h
+++ b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/DisambiguationDRIncl2.h
@@ -1,7 +1,9 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //  DisambiguationDRIncl2.h
 //  TopoCore
 //  Created by Joerg Stelzer on 11/16/12.
-//  Copyright (c) 2012 Joerg Stelzer. All rights reserved.
 
 #ifndef __TopoCore__DisambiguationDRIncl2__
 #define __TopoCore__DisambiguationDRIncl2__
diff --git a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/DisambiguationDRIncl3.h b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/DisambiguationDRIncl3.h
index c79a24d1e6df604af0fa1daae7c89294c2e83e57..a02cbdc45aca515efc21754c4850ca96eb3c0c75 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/DisambiguationDRIncl3.h
+++ b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/DisambiguationDRIncl3.h
@@ -1,7 +1,9 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //  DisambiguationDRIncl3.h
 //  TopoCore
 //  Created by Joerg Stelzer on 11/16/12.
-//  Copyright (c) 2012 Joerg Stelzer. All rights reserved.
 
 #ifndef __TopoCore__DisambiguationDRIncl3__
 #define __TopoCore__DisambiguationDRIncl3__
diff --git a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/DisambiguationDetaDPhiIncl3.h b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/DisambiguationDetaDPhiIncl3.h
index 0a0f9eb418cc51d45cf28f45b20c84b54c12502b..8cc5a9f4e2a5774874ee06fee67ef4260920a882 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/DisambiguationDetaDPhiIncl3.h
+++ b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/DisambiguationDetaDPhiIncl3.h
@@ -1,7 +1,9 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //  DisambiguationDetaDPhiIncl3.h
 //  TopoCore
 //  Created by Joerg Stelzer on 11/16/12.
-//  Copyright (c) 2012 Joerg Stelzer. All rights reserved.
 
 #ifndef __TopoCore__DisambiguationDetaDPhiIncl3__
 #define __TopoCore__DisambiguationDetaDPhiIncl3__
diff --git a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/DisambiguationIncl2.h b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/DisambiguationIncl2.h
index dcd82ee4e6884d0e43ccf62c1eb15a009cdc939f..b4aa208ea499c20366c600d8694354c9f51f13e1 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/DisambiguationIncl2.h
+++ b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/DisambiguationIncl2.h
@@ -1,7 +1,9 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //  DisambiguationIncl2.h
 //  TopoCore
 //  Created by Joerg Stelzer on 11/16/12.
-//  Copyright (c) 2012 Joerg Stelzer. All rights reserved.
 
 #ifndef __TopoCore__DisambiguationIncl2__
 #define __TopoCore__DisambiguationIncl2__
diff --git a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/DisambiguationIncl3.h b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/DisambiguationIncl3.h
index d4d8b2c97fb3752457dfc8a3f28e668784725928..7b0de6c9c14d1bcc86bad4d0d30a4c65ff3402c2 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/DisambiguationIncl3.h
+++ b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/DisambiguationIncl3.h
@@ -1,7 +1,9 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //  DisambiguationIncl3.h
 //  TopoCore
 //  Created by Joerg Stelzer on 11/16/12.
-//  Copyright (c) 2012 Joerg Stelzer. All rights reserved.
 
 #ifndef __TopoCore__DisambiguationIncl3__
 #define __TopoCore__DisambiguationIncl3__
diff --git a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/DisambiguationInvmIncl2.h b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/DisambiguationInvmIncl2.h
index 94032ccdbb86987f842ddbb1a84819770125dd28..b483a5db793de4904410d29b683eb809f325f36b 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/DisambiguationInvmIncl2.h
+++ b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/DisambiguationInvmIncl2.h
@@ -1,7 +1,9 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //  DisambiguationInvmIncl2.h
 //  TopoCore
 //  Created by Davide Gerbaudo on 2016-10-10.
-//  Copyright (c) 2016 Davide Gerbaudo. All rights reserved.
 
 #ifndef __TopoCore__DisambiguationInvmIncl2__
 #define __TopoCore__DisambiguationInvmIncl2__
diff --git a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/EtCut.h b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/EtCut.h
index 75406ffd3f4084299d17dd1bcba87a596b59fb81..b3fcba913b43ac29b1fa9bbeef46feac7153dc1f 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/EtCut.h
+++ b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/EtCut.h
@@ -1,7 +1,9 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //  EtCut.h
 //  TopoCore
 //  Created by Joerg Stelzer on 11/16/12.
-//  Copyright (c) 2012 Joerg Stelzer. All rights reserved.
 
 #ifndef __TopoCore__EtCut__
 #define __TopoCore__EtCut__
diff --git a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/GenericArrayCreator.h b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/GenericArrayCreator.h
index 816edba2bbdecf3d67fb90f45789208094f12d1e..67b5465cd259a7c2c662dfee5da2bf3c1bb10833 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/GenericArrayCreator.h
+++ b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/GenericArrayCreator.h
@@ -1,7 +1,9 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //  GenericArrayCreator.h
 //  L1TopoCoreSimulation
 //  Created by Joerg Stelzer on 12/10/12.
-//  Copyright (c) 2012 Joerg Stelzer. All rights reserved.
 
 #ifndef __L1TopoCoreSimulation__GenericArrayCreator__
 #define __L1TopoCoreSimulation__GenericArrayCreator__
diff --git a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/GenericListGenerator.h b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/GenericListGenerator.h
index 43236b0cc11e9af7bb472ffa9659ce1ddfd981c6..71d3c458d7992abe2a9734f7c5ff55dba510ad9d 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/GenericListGenerator.h
+++ b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/GenericListGenerator.h
@@ -1,7 +1,9 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //  GenericListGenerator.h
 //  TopoCore
 //  Created by Joerg Stelzer on 11/10/12.
-//  Copyright (c) 2012 Joerg Stelzer. All rights reserved.
 
 #ifndef TCS__GenericListGenerator
 #define TCS__GenericListGenerator
diff --git a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/InvariantMassInclusive1.h b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/InvariantMassInclusive1.h
index ec95dd3e825d83a8bb724d75c728653a33cf6506..50e59d76394723264fa5a39fd29ac687128cae5c 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/InvariantMassInclusive1.h
+++ b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/InvariantMassInclusive1.h
@@ -1,7 +1,9 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //  InvariantMassInclusive1.h
 //  TopoCore
 //  Created by Joerg Stelzer on 11/16/12.
-//  Copyright (c) 2012 Joerg Stelzer. All rights reserved.
 
 #ifndef __TopoCore__InvariantMassInclusive1__
 #define __TopoCore__InvariantMassInclusive1__
diff --git a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/InvariantMassInclusive2.h b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/InvariantMassInclusive2.h
index ca68e49aef7204a92d9dac43afc291571f80dc7c..d391e15f86227ea5668c450ecb07d8c4dd41949c 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/InvariantMassInclusive2.h
+++ b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/InvariantMassInclusive2.h
@@ -1,7 +1,9 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //  InvariantMassInclusive2.h
 //  TopoCore
 //  Created by Joerg Stelzer on 11/16/12.
-//  Copyright (c) 2012 Joerg Stelzer. All rights reserved.
 
 #ifndef __TopoCore__InvariantMassInclusive2__
 #define __TopoCore__InvariantMassInclusive2__
diff --git a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/JetAbbreviated.h b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/JetAbbreviated.h
index 88dc57dfd6e61b0b8dc8dc581ed7319ec76e799a..e41c85294f88bfc9c7b093f72a8ca664cdd1d4ed 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/JetAbbreviated.h
+++ b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/JetAbbreviated.h
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //  JetAbbreviated.h
 //  TopoCore
 //  Created by Veronica Sorin  14/8/14
diff --git a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/JetHT.h b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/JetHT.h
index befbe1578eebb4ced4da920370bb20570e08510b..902dc290c871ef6957210624548bec458463aa42 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/JetHT.h
+++ b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/JetHT.h
@@ -1,7 +1,9 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //  JetHT.h
 //  TopoCore
 //  Created by Joerg Stelzer on 11/16/12.
-//  Copyright (c) 2012 Joerg Stelzer. All rights reserved.
 
 #ifndef __TopoCore__JetHT__
 #define __TopoCore__JetHT__
diff --git a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/JetMatch.h b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/JetMatch.h
index db2450969e1e39763b62e84ebcc9376cefe51dac..c69d83576c289965153ab31e5eb08ee267a64142 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/JetMatch.h
+++ b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/JetMatch.h
@@ -1,7 +1,9 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //  JetMatch.h
 //  TopoCore
 //  Created by Joerg Stelzer on 11/16/12.
-//  Copyright (c) 2012 Joerg Stelzer. All rights reserved.
 
 #ifndef __TopoCore__JetMatch__
 #define __TopoCore__JetMatch__
diff --git a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/JetNoSort.h b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/JetNoSort.h
index 6e1bcdce4428dc5fd601cdbf9cb81c2af34d8430..c3b3387f03c15bf9846acbbb7acfcbbdca5f092f 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/JetNoSort.h
+++ b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/JetNoSort.h
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //  JetNoSort.h
 //  TopoCore
 //  Created by Veronica Sorin  14/8/14
diff --git a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/JetNoSortMatch.h b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/JetNoSortMatch.h
index cac5b8ae7fbfed0923edcb775227e25b32bd6dbb..5d689ae018f495bf5071d7af2f0787a60b4bf992 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/JetNoSortMatch.h
+++ b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/JetNoSortMatch.h
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //  JetNoSortMatch.h
 //  TopoCore
 //  Created by Veronica Sorin  14/8/14
diff --git a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/JetSelect.h b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/JetSelect.h
index be1eaf7d8e0b57004d384391dd6f98c2d906f8df..b50a7eecf349b8b8029c2ba938135734e1384c82 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/JetSelect.h
+++ b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/JetSelect.h
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //  JetSelect.h
 //  TopoCore
 //  Created by Veronica Sorin  14/8/14
diff --git a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/JetSort.h b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/JetSort.h
index 991887103c03d8f12f067adb896e21089df0c898..dc3a4fbdee821fdb60fbed3a378357a7a41f7450 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/JetSort.h
+++ b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/JetSort.h
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //  JetSort.h
 //  TopoCore
 //  Created by Christoper Willis 12/6/12
diff --git a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/JetSortingAlg.h b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/JetSortingAlg.h
index 452dc71301e21560658bcf5f1a35f93ef29112cc..aaae2ca3211f4b93455011533b3df7721fc4d59e 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/JetSortingAlg.h
+++ b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/JetSortingAlg.h
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //  JetSortingAlg.h
 //  TopoCore
 //  Created by Christoper Willis 12/6/12
diff --git a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/JetSortingAlgSize1.h b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/JetSortingAlgSize1.h
index 311c0624f30dca61a9bd32a564d19e06211a2432..a68b617f5d19e4ab3ad9fe28d87b85c18e5510b5 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/JetSortingAlgSize1.h
+++ b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/JetSortingAlgSize1.h
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //  JetSortingAlgSize1.h
 //  TopoCore
 //  Created by Christoper Willis 12/6/12
diff --git a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/JetSortingAlgSize2.h b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/JetSortingAlgSize2.h
index 00e1f20854589a325e0963735e28e48f90eb9481..63831b4008cbbad290582b57980cceab46c4883d 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/JetSortingAlgSize2.h
+++ b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/JetSortingAlgSize2.h
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //  JetSortingAlgSize2.h
 //  TopoCore
 //  Created by Christoper Willis 12/6/12
diff --git a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/KalmanMETCorrection.h b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/KalmanMETCorrection.h
index d804dfb2d491aa1cb737bf1f848165a51b9cb1a5..e840a9a1ae50695272b1a67bf485706a274d5dad 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/KalmanMETCorrection.h
+++ b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/KalmanMETCorrection.h
@@ -1,7 +1,9 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //  KalmanMETCorrection.h
 //  TopoCore
 //  Created by Joerg Stelzer on 11/16/12.
-//  Copyright (c) 2012 Joerg Stelzer. All rights reserved.
 
 #ifndef __TopoCore__KalmanMETCorrection__
 #define __TopoCore__KalmanMETCorrection__
diff --git a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/LAr.h b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/LAr.h
index c2ddce64d4cc4dd6f8d6a487fbb1af95095b8f0d..9aa23e7f8a1aecb5cb5cc79df655b9ea90e58489 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/LAr.h
+++ b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/LAr.h
@@ -1,7 +1,9 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //  LAr.h
 //  TopoCore
 //  Created by Joerg Stelzer on 11/16/12.
-//  Copyright (c) 2012 Joerg Stelzer. All rights reserved.
 
 #ifndef __TopoCore__LAr__
 #define __TopoCore__LAr__
diff --git a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/METCut.h b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/METCut.h
index 7aa73e7288c3ae6cc3a67d2a5620dd58f80414fa..8493a4957a2614b16a83a80b40b7674692e6533b 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/METCut.h
+++ b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/METCut.h
@@ -1,7 +1,9 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //  METCut.h
 //  TopoCore
 //  Created by Joerg Stelzer on 11/16/12.
-//  Copyright (c) 2012 Joerg Stelzer. All rights reserved.
 
 #ifndef __TopoCore__METCut__
 #define __TopoCore__METCut__
diff --git a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/METNoSort.h b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/METNoSort.h
index 9ff093f65570b03166457ff8fbad8064c4de171c..5ee9b03d49b874cf2404a5337e80ae3d5b594a4e 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/METNoSort.h
+++ b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/METNoSort.h
@@ -1,7 +1,9 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //  METNoSort.h
 //  TopoCore
 //  Created by Joerg Stelzer on 11/10/12.
-//  Copyright (c) 2012 Joerg Stelzer. All rights reserved.
 
 #ifndef TCS__METNoSort
 #define TCS__METNoSort
diff --git a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/METSortingAlg.h b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/METSortingAlg.h
index 76cd04df700baf64175d58f13f35c6dd7882fac5..2d25c17228e9b69dfdc1b14be85007cd330d7982 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/METSortingAlg.h
+++ b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/METSortingAlg.h
@@ -1,7 +1,9 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //  METSortingAlg.h
 //  TopoCore
 //  Created by Joerg Stelzer on 11/10/12.
-//  Copyright (c) 2012 Joerg Stelzer. All rights reserved.
 
 #ifndef TCS__METSortingAlg
 #define TCS__METSortingAlg
diff --git a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/MetSort.h b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/MetSort.h
index 74855dd3fbdd87ee5fc5b3e1af92ab798375ecec..c03fc7221c1c821e347492a5cb2b0ba9c8fc8e80 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/MetSort.h
+++ b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/MetSort.h
@@ -1,7 +1,9 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //  MetSort.h
 //  TopoCore
 //  Created by Joerg Stelzer on 11/10/12.
-//  Copyright (c) 2012 Joerg Stelzer. All rights reserved.
 
 #ifndef TCS__MetSort
 #define TCS__MetSort
diff --git a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/MinDPhiIncl1.h b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/MinDPhiIncl1.h
index 9ca723756edf88efd9f589580109e83e1f7a8eb9..e4ab283a2e0b50c2f7d684991cbf7a47df476916 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/MinDPhiIncl1.h
+++ b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/MinDPhiIncl1.h
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //  MinDPhiIncl1.h
 //  TopoCore
 //  Created by Veronica Sorin 
diff --git a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/MinDPhiIncl2.h b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/MinDPhiIncl2.h
index ca0a608768a64c736d52aa2d984f023ec526170e..dd688dd9b2b2740177b29d9af507e3f17c3aeaa9 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/MinDPhiIncl2.h
+++ b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/MinDPhiIncl2.h
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //  MinDPhiIncl2.h
 //  TopoCore
 //  Created by Veronica Sorin 
diff --git a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/MinDeltaPhiIncl2.h b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/MinDeltaPhiIncl2.h
index b68f858d43539b9a5bd46be32ee73337b109db59..44eecaccf2d1a82f6b3c60f75d70c6418cf6d4ce 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/MinDeltaPhiIncl2.h
+++ b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/MinDeltaPhiIncl2.h
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //  MinDeltaPhiIncl2.h
 //  TopoCore
 //  Created by Veronica Sorin 
diff --git a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/Multiplicity.h b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/Multiplicity.h
index c01a652f70d87f469a6bc0bc729a2b1441c2d401..e2841412240282228fca0c522a04eefd4d87f32a 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/Multiplicity.h
+++ b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/Multiplicity.h
@@ -1,7 +1,9 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //  Multiplicity.h
 //  TopoCore
 //  Created by Joerg Stelzer on 11/16/12.
-//  Copyright (c) 2012 Joerg Stelzer. All rights reserved.
 
 #ifndef __TopoCore__Multiplicity__
 #define __TopoCore__Multiplicity__
diff --git a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/MultiplicityCustom.h b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/MultiplicityCustom.h
index df0464c1dbb0b505b44c61ad7a602c3c3eafd17d..3e837db24f36d540c88176527cf182df1c4c2ff5 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/MultiplicityCustom.h
+++ b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/MultiplicityCustom.h
@@ -1,7 +1,9 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //  MultiplicityCustom.h
 //  TopoCore
 //  Created by Joerg Stelzer on 11/16/12.
-//  Copyright (c) 2012 Joerg Stelzer. All rights reserved.
 
 #ifndef __TopoCore__MultiplicityCustom__
 #define __TopoCore__MultiplicityCustom__
diff --git a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/MuonAbbreviated.h b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/MuonAbbreviated.h
index 9973fbec43c58e73b71eb6e96531fced65bd7b9e..6a6134146e3cdb499664a422da4acd7b6f411aa6 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/MuonAbbreviated.h
+++ b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/MuonAbbreviated.h
@@ -1,7 +1,9 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //  MuonAbbreviated.h
 //  TopoCore
 //  Created by Joerg Stelzer on 11/10/12.
-//  Copyright (c) 2012 Joerg Stelzer. All rights reserved.
 
 #ifndef TCS__MuonAbbreviated
 #define TCS__MuonAbbreviated
diff --git a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/MuonNoSort.h b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/MuonNoSort.h
index 9d6d3d007fd1db9e33dda265a96d556a566deaa1..578db86977a86f558b720e445651bb896391e94d 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/MuonNoSort.h
+++ b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/MuonNoSort.h
@@ -1,7 +1,9 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //  MuonNoSort.h
 //  TopoCore
 //  Created by Joerg Stelzer on 11/10/12.
-//  Copyright (c) 2012 Joerg Stelzer. All rights reserved.
 
 #ifndef TCS__MuonNoSort
 #define TCS__MuonNoSort
diff --git a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/MuonSelect.h b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/MuonSelect.h
index 844e2a18e3253e9a7ab13f4d0052ea91be7c957f..88f23e9440d51e8587e6fd4eaca3f1e2811ac2f0 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/MuonSelect.h
+++ b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/MuonSelect.h
@@ -1,7 +1,9 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //  MuonSelect.h
 //  TopoCore
 //  Created by Joerg Stelzer on 11/10/12.
-//  Copyright (c) 2012 Joerg Stelzer. All rights reserved.
 
 #ifndef TCS__MuonSelect
 #define TCS__MuonSelect
diff --git a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/MuonSort.h b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/MuonSort.h
index edd12eb77c37848f852baa218df488d44e08a42f..9abcdd88c811c2d5e6cfc1875db5b136e7f78c9a 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/MuonSort.h
+++ b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/MuonSort.h
@@ -1,7 +1,9 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //  MuonSort.h
 //  TopoCore
 //  Created by Joerg Stelzer on 11/10/12.
-//  Copyright (c) 2012 Joerg Stelzer. All rights reserved.
 
 #ifndef TCS__MuonSort
 #define TCS__MuonSort
diff --git a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/MuonSort_1BC.h b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/MuonSort_1BC.h
index bbd69dc1c55e491e4abf738dae23b47002dde8fa..385428211034161a2749c1454e7bf5a2e30c81cb 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/MuonSort_1BC.h
+++ b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/MuonSort_1BC.h
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //  MuonSort_1BC.h
 //  TopoCore
 //  Created by Sue Cheatham based on MuonSelect by Joerg Stelzer
diff --git a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/NoMatch.h b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/NoMatch.h
index a7540ddf55811b7b69231fd59d33407a675fb981..c348555de434ea707e3c3e450caa9f06451a0a9b 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/NoMatch.h
+++ b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/NoMatch.h
@@ -1,7 +1,9 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //  NoMatch.h
 //  TopoCore
 //  Created by Joerg Stelzer on 11/16/12.
-//  Copyright (c) 2012 Joerg Stelzer. All rights reserved.
 
 #ifndef __TopoCore__NoMatch__
 #define __TopoCore__NoMatch__
diff --git a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/NotMatch.h b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/NotMatch.h
index b7de0b1d66089c97e47363ca960d87578117dd64..6831f516c3fdc595cfbadeb80c5c9aed3d0ac81e 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/NotMatch.h
+++ b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/NotMatch.h
@@ -1,7 +1,9 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //  NotMatch.h
 //  TopoCore
 //  Created by Joerg Stelzer on 11/16/12.
-//  Copyright (c) 2012 Joerg Stelzer. All rights reserved.
 
 #ifndef __TopoCore__NotMatch__
 #define __TopoCore__NotMatch__
diff --git a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/Ratio.h b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/Ratio.h
index b8b1e7a7b5556a6ca1951715bc74f42984b0b4ba..39d70aae9015d7ade94b299ac561f121941aea8a 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/Ratio.h
+++ b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/Ratio.h
@@ -1,7 +1,9 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //  Ratio.h
 //  TopoCore
 //  Created by Joerg Stelzer on 11/16/12.
-//  Copyright (c) 2012 Joerg Stelzer. All rights reserved.
 
 #ifndef __TopoCore__Ratio__
 #define __TopoCore__Ratio__
diff --git a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/Ratio2.h b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/Ratio2.h
index 43ef169839706afe2dc664e2713039512a444351..215e9ff840f4a850656dde8b689d361ae1f9a142 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/Ratio2.h
+++ b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/Ratio2.h
@@ -1,7 +1,9 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //  Ratio2.h
 //  TopoCore
 //  Created by Joerg Stelzer on 11/16/12.
-//  Copyright (c) 2012 Joerg Stelzer. All rights reserved.
 
 #ifndef __TopoCore__Ratio2__
 #define __TopoCore__Ratio2__
diff --git a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/RatioMatch.h b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/RatioMatch.h
index 302ea7eac70dc3c7ae5c34d6605cdf7a008a196e..3f5f8b25bca397f95e025e03f5f474673f2a5745 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/RatioMatch.h
+++ b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/RatioMatch.h
@@ -1,7 +1,9 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //  RatioMatch.h
 //  TopoCore
 //  Created by Joerg Stelzer on 11/16/12.
-//  Copyright (c) 2012 Joerg Stelzer. All rights reserved.
 
 #ifndef __TopoCore__RatioMatch__
 #define __TopoCore__RatioMatch__
diff --git a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/RatioSum.h b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/RatioSum.h
index d7d086d675704fd01d2eff5e6d2b911a35acf0f8..71073179c0e03a44ec7642ae0a6eeeb11da5c80d 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/RatioSum.h
+++ b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/RatioSum.h
@@ -1,7 +1,9 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //  RatioSum.h
 //  TopoCore
 //  Created by Joerg Stelzer on 11/16/12.
-//  Copyright (c) 2012 Joerg Stelzer. All rights reserved.
 
 #ifndef __TopoCore__RatioSum__
 #define __TopoCore__RatioSum__
diff --git a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/SimpleCone.h b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/SimpleCone.h
index b8017a6b5e2465e5ee4e0654d2e57385eaf6cb2e..65e58b368f0c1b0cc3e18d997d3a38f3be0dea10 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/SimpleCone.h
+++ b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/SimpleCone.h
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //  SimpleCone.h
 
 #ifndef __TopoCore__SimpleCone__
diff --git a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/Sum.h b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/Sum.h
index d1b512b4fa2f2d174820e0212a6aeb1d8152c596..929ea1f7c061ef62e2563e3fbb021e0e2533cd29 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/Sum.h
+++ b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/Sum.h
@@ -1,7 +1,9 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //  Sum.h
 //  TopoCore
 //  Created by Joerg Stelzer on 11/16/12.
-//  Copyright (c) 2012 Joerg Stelzer. All rights reserved.
 
 #ifndef __TopoCore__Sum__
 #define __TopoCore__Sum__
diff --git a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/SumEtLeading.h b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/SumEtLeading.h
index 08a4623351475f9def36b530bfa100d411493f7b..50030b219c883017b30970ad34ec895014a859fd 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/SumEtLeading.h
+++ b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/SumEtLeading.h
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //  SumEtLeading.h
 //  TopoCore
 
diff --git a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/TransverseMassInclusive1.h b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/TransverseMassInclusive1.h
index 7eb47f506ff1ec34ce0408cf0d2ffec1d610ed3c..106205fa92e109b358d7ee518ae2cd4c7055fdc9 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/TransverseMassInclusive1.h
+++ b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/TransverseMassInclusive1.h
@@ -1,7 +1,9 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //  TransverseMassInclusive1.h
 //  TopoCore
 //  Created by Joerg Stelzer on 11/16/12.
-//  Copyright (c) 2012 Joerg Stelzer. All rights reserved.
 
 #ifndef __TopoCore__TransverseMassInclusive1__
 #define __TopoCore__TransverseMassInclusive1__
diff --git a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/ClusterAbbreviated.cxx b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/ClusterAbbreviated.cxx
index d0fadb2545b969118a2d191606c8854bda31dcac..0d85547549739cfadf31f297c38bdc7c3e909c29 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/ClusterAbbreviated.cxx
+++ b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/ClusterAbbreviated.cxx
@@ -1,7 +1,9 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //  ClusterAbbreviated.cxx
 //  TopoCore
 //  Created by V Sorin, Joerg Stelzer 
-//  Copyright (c) 2012 Joerg Stelzer. All rights reserved.
 //  Algorithm to select the abbreviated list of clusters , no order is applied
 //
 #include "L1TopoAlgorithms/ClusterAbbreviated.h"
diff --git a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/ClusterNoSort.cxx b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/ClusterNoSort.cxx
index 619da6c41c726f9978edd7820369dca460770921..34f6085a8ddfa4b29b71368f5af8424e61d0929e 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/ClusterNoSort.cxx
+++ b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/ClusterNoSort.cxx
@@ -1,7 +1,9 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //  ClusterNoSort.cxx
 //  TopoCore
 //  Created by V Sorin, Joerg Stelzer 
-//  Copyright (c) 2012 Joerg Stelzer. All rights reserved.
 //  Algorithm to  create the all list of clusters , no order is applied
 //
 #include "L1TopoAlgorithms/ClusterNoSort.h"
diff --git a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/ClusterSelect.cxx b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/ClusterSelect.cxx
index 679c4b84ce3fc14faf716fe5b496d14ae430f044..619535b3320e78c3dce5348aac8711c24ac578ba 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/ClusterSelect.cxx
+++ b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/ClusterSelect.cxx
@@ -1,7 +1,9 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //  ClusterSelect.cxx
 //  TopoCore
 //  Created by V Sorin, Joerg Stelzer 
-//  Copyright (c) 2012 Joerg Stelzer. All rights reserved.
 //  Algorithm to select the abbreviated list of clusters , no order is applied
 //
 #include "L1TopoAlgorithms/ClusterSelect.h"
diff --git a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/ClusterSort.cxx b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/ClusterSort.cxx
index faec1bed8319e46c53ea4f4176e245034c03449d..f9992a961247f983a1068f026d4e63d8840198e1 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/ClusterSort.cxx
+++ b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/ClusterSort.cxx
@@ -1,7 +1,9 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //  ClusterSort.cxx
 //  TopoCore
 //  Created by Joerg Stelzer on 11/10/12.
-//  Copyright (c) 2012 Joerg Stelzer. All rights reserved.
 //  algorithm to create sorted lists for clusters, et order applied
 //
 #include "L1TopoAlgorithms/ClusterSort.h"
diff --git a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/ClusterSortingAlg.cxx b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/ClusterSortingAlg.cxx
index 73c75afbf47a442ab4620d9995bdf2a5c4c86264..969be0fa953aa85f21f3d0006b69ff7865188cd1 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/ClusterSortingAlg.cxx
+++ b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/ClusterSortingAlg.cxx
@@ -1,7 +1,9 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //  ClusterSortingAlg.cxx
 //  TopoCore
 //  Created by V Sorin, Joerg Stelzer .
-//  Copyright (c) 2012 Joerg Stelzer. All rights reserved.
 //  algorithm to make list of cluster, pt order applied
 //
 #include "L1TopoAlgorithms/ClusterSortingAlg.h"
diff --git a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/DeltaEtaIncl1.cxx b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/DeltaEtaIncl1.cxx
index 5bece99bc547dcff0fddfe0cf873c0fcc89b3707..f860bf1651b96fd51165bba15a173efb55d1fcd2 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/DeltaEtaIncl1.cxx
+++ b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/DeltaEtaIncl1.cxx
@@ -1,8 +1,10 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 /*********************************
  * DeltaEtaIncl1.cpp
  * Created by Joerg Stelzer on 11/16/12.
  * Modified by V Sorin 2014
- * Copyright (c) 2012 Joerg Stelzer. All rights reserved.
  *
  * @brief algorithm calculates the eta-distance between two TOB from one list and applies delta-eta criteria
  *
diff --git a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/DeltaEtaIncl2.cxx b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/DeltaEtaIncl2.cxx
index 1167f0c680bfa6c450fce83f587572a2f2d36306..b73fe3bcefaa4bfe1e5e49a15364c8d1f10ec83e 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/DeltaEtaIncl2.cxx
+++ b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/DeltaEtaIncl2.cxx
@@ -1,8 +1,10 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 /*********************************
  * DeltaEtaIncl2.cpp
  * Created by Joerg Stelzer on 11/16/12.
  * Modified V Sorin 2014
- * Copyright (c) 2012 Joerg Stelzer. All rights reserved.
  *
  * @brief algorithm calculates the eta-distance between two lists and applies delta-eta criteria
  *
diff --git a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/DeltaEtaPhiIncl1.cxx b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/DeltaEtaPhiIncl1.cxx
index 07de5f93933e5f66e31c0b542b481e8b6231658a..cac99d09e2f9e1cb273a1e76c59fd2031e8fc67c 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/DeltaEtaPhiIncl1.cxx
+++ b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/DeltaEtaPhiIncl1.cxx
@@ -1,8 +1,10 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 /*********************************
  * DeltaEtaPhiIncl1.cpp
  * Created by Joerg Stelzer on 11/16/12.
  * Modified by V Sorin 
- * Copyright (c) 2012 Joerg Stelzer. All rights reserved.
  *
  * @brief algorithm calculates the eta and  phi-distance between one lists and applies box cut criteria
  *
diff --git a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/DeltaEtaPhiIncl2.cxx b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/DeltaEtaPhiIncl2.cxx
index f4c67f29b350d21e282bf8c69b4d9595bb71fb16..01458d4c54d56229283d0c6c99dad805d7fdeab0 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/DeltaEtaPhiIncl2.cxx
+++ b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/DeltaEtaPhiIncl2.cxx
@@ -1,7 +1,9 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 /*********************************
  * DeltaEtaPhiIncl2.cpp
  * Created by Joerg Stelzer on 11/16/12.
- * Copyright (c) 2012 Joerg Stelzer. All rights reserved.
  * Modified by V SOrin 2014
  * @brief algorithm calculates the eta and  phi-distance between  two lists and applies box cut  criteria
  *
diff --git a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/DeltaPhiIncl1.cxx b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/DeltaPhiIncl1.cxx
index c36831c2d8ea39ac69c48f95475a667bf4ac1c89..af1988ba129867fc0d7bfc9659cae567fdcb3188 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/DeltaPhiIncl1.cxx
+++ b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/DeltaPhiIncl1.cxx
@@ -1,8 +1,10 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 /*********************************
  * DeltaPhiIncl1.cpp
  * Created by Joerg Stelzer on 11/16/12.
  * Modified by V SOrin 2014
- * Copyright (c) 2012 Joerg Stelzer. All rights reserved.
  *
  * @brief algorithm calculates the phi-distance between one  lists and applies delta-phi criteria
  *
diff --git a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/DeltaPhiIncl2.cxx b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/DeltaPhiIncl2.cxx
index 333755964673ab9dcc703a913b673aeb2d95a417..ce02468851ca7eda77a790b016c4529f002b77b6 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/DeltaPhiIncl2.cxx
+++ b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/DeltaPhiIncl2.cxx
@@ -1,8 +1,10 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 /*********************************
  * DeltaPhiIncl2.cpp
  * Created by Joerg Stelzer on 11/16/12.
  * Modified by V Sorin
- * Copyright (c) 2012 Joerg Stelzer. All rights reserved.
  *
  * @brief algorithm calculates the phi-distance between  two lists and applies delta-phi criteria
  *
diff --git a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/DeltaRApproxBoxCutIncl1.cxx b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/DeltaRApproxBoxCutIncl1.cxx
index 356247482dd565a79e2d5a7f82105152b70d3901..75854ce226cd4f6549a12f22c4eac221f43afe4b 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/DeltaRApproxBoxCutIncl1.cxx
+++ b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/DeltaRApproxBoxCutIncl1.cxx
@@ -1,8 +1,10 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 /*********************************
  * DeltaRApproxBoxCutIncl1.cpp
  * Created by Joerg Stelzer on 11/16/12.
  * Modified by V Sorin 
- * Copyright (c) 2012 Joerg Stelzer. All rights reserved.
  *
  * @brief algorithm calculates the eta and  phi-distance between one lists and applies box cut criteria
  *
diff --git a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/DeltaRApproxBoxCutIncl2.cxx b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/DeltaRApproxBoxCutIncl2.cxx
index c6703713e2dc61e23cb035730b11057291eda541..2569d6c767b53116ce8ad237d6bc67814dad8757 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/DeltaRApproxBoxCutIncl2.cxx
+++ b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/DeltaRApproxBoxCutIncl2.cxx
@@ -1,7 +1,9 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 /*********************************
  * DeltaRApproxBoxCutIncl2.cpp
  * Created by Joerg Stelzer on 11/16/12.
- * Copyright (c) 2012 Joerg Stelzer. All rights reserved.
  * Modified by V SOrin 2014
  * @brief algorithm calculates the eta and  phi-distance between  two lists and applies box cut  criteria
  *
diff --git a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/DeltaRSqrIncl1.cxx b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/DeltaRSqrIncl1.cxx
index ad49f5dcb7b58a496f2521f264145291b607384d..7ad084a1dae534d70c3f6288e403fdc9839c214b 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/DeltaRSqrIncl1.cxx
+++ b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/DeltaRSqrIncl1.cxx
@@ -1,7 +1,9 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 /*********************************
  * DeltaRSqrIncl1.cpp
  * Created by Joerg Stelzer / V Sorin on 9/16/14.
- * Copyright (c) 2012 Joerg Stelzer. All rights reserved.
  *
  * @brief algorithm calculates the R2-distance between objects in one  list and applies dR criteria
  *
diff --git a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/DeltaRSqrIncl2.cxx b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/DeltaRSqrIncl2.cxx
index d2dbc70d625015f0cb5adad20a76c86825a656d6..ab193155c7cb3c02abe91f1e44e5cdbe6888e94d 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/DeltaRSqrIncl2.cxx
+++ b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/DeltaRSqrIncl2.cxx
@@ -1,7 +1,9 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 /*********************************
  * DeltaRSqrIncl2.cpp
  * Created by Joerg Stelzer / V Sorin on 9/16/14.
- * Copyright (c) 2012 Joerg Stelzer. All rights reserved.
  *
  * @brief algorithm calculates the R2-distance between two lists and applies dR criteria
  *
diff --git a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/DisambiguationDRIncl2.cxx b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/DisambiguationDRIncl2.cxx
index 4818fb6bc7a7bf0fc1a1a3f9107671a1f1517063..01acb08916269649dceae7cf43ada866733bb776 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/DisambiguationDRIncl2.cxx
+++ b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/DisambiguationDRIncl2.cxx
@@ -1,7 +1,9 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 /*********************************
  * DisambiguationDRIncl2.cpp
  * Created by Joerg Stelzer / V Sorin on 9/16/14.
- * Copyright (c) 2012 Joerg Stelzer. All rights reserved.
  * 
  * @brief algorithm calculates the dR distance between objects in two lists, 
  * but minimum value uses > instead of >= as dr algos
diff --git a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/DisambiguationDRIncl3.cxx b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/DisambiguationDRIncl3.cxx
index 1e6640868c36290ecc1e6673e714f19fb94dce47..b1cb364612812b5a2cf4b75bd48e29ccf694e857 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/DisambiguationDRIncl3.cxx
+++ b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/DisambiguationDRIncl3.cxx
@@ -1,7 +1,9 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 /*********************************
  * DisambiguationDRIncl3.cpp
  * Created by Joerg Stelzer / V Sorin on 9/16/14.
- * Copyright (c) 2012 Joerg Stelzer. All rights reserved.
  * 
  * @brief algorithm calculates the dR distance between objects in three lists, check EM vs TAU , if those not match
  * check agains 3rd object, passed if no match with 3rd
diff --git a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/DisambiguationDetaDPhiIncl3.cxx b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/DisambiguationDetaDPhiIncl3.cxx
index d2e5dc6bb9584413ce8bd44e4ded8ed6e2fdbde8..9b079155c5f8ab8f9cf907b831edd6692ae5d879 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/DisambiguationDetaDPhiIncl3.cxx
+++ b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/DisambiguationDetaDPhiIncl3.cxx
@@ -1,7 +1,9 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 /*********************************
  * DisambiguationDetaDPhiIncl3.cpp
  * Created by Joerg Stelzer / V Sorin on 9/16/14.
- * Copyright (c) 2012 Joerg Stelzer. All rights reserved.
  * 
  * @brief algorithm calculates the dR distance between objects in three lists, check first two with eta/phi differences, if pass
  * check dR agains 3rd object, passed if no match with 3rd
diff --git a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/DisambiguationIncl2.cxx b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/DisambiguationIncl2.cxx
index c66d4e0004608e2a1191628f29fb07799dadbf4c..bd71ac1513b6a0195a95d58414bc4f571d461317 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/DisambiguationIncl2.cxx
+++ b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/DisambiguationIncl2.cxx
@@ -1,7 +1,9 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 /*********************************
  * DisambiguationIncl2.cpp
  * Created by Joerg Stelzer / V Sorin on 2014.
- * Copyright (c) 2012 Joerg Stelzer. All rights reserved.
  *
  * @brief algorithm calculates the dR distance between objects in two lists, accept if at least a pair does not match in dR 
  *
diff --git a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/DisambiguationIncl3.cxx b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/DisambiguationIncl3.cxx
index 365e01d44ed095033c7b29eb9cf9d7d2aef9c1bc..40aae7cfee8b5bf51822117f598f874e047273f3 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/DisambiguationIncl3.cxx
+++ b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/DisambiguationIncl3.cxx
@@ -1,7 +1,9 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 /*********************************
  * DisambiguationIncl3.cpp
  * Created by Joerg Stelzer / V Sorin on 9/16/14.
- * Copyright (c) 2012 Joerg Stelzer. All rights reserved.
  *
  * @brief algorithm calculates the dR distance between objects in three lists, check EM vs TAU , if those not match, check agains 3rd object, passed if no match with 3rd 
  *
diff --git a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/DisambiguationInvmIncl2.cxx b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/DisambiguationInvmIncl2.cxx
index 382324de890d99c239693a26efd40a678c7297d9..c2364e3bfc134538f1ca35ce8f105a466f601d7a 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/DisambiguationInvmIncl2.cxx
+++ b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/DisambiguationInvmIncl2.cxx
@@ -1,7 +1,9 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 /*********************************
  * DisambiguationInvmIncl2.cpp
  * Created by Davide Gerbaudo on 2016-10-10.
- * Copyright (c) 2016 Davide Gerbaudo. All rights reserved.
  *
  * @brief compute the INVMASS**2 between distinct objects from two lists and applies invmass criteria
  *
diff --git a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/EtCut.cxx b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/EtCut.cxx
index 7a9806eb2dfb2f209d6692e73d1fc71f81b041b2..bc27f4d188bd60765de34db7bd41a2b721cc1390 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/EtCut.cxx
+++ b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/EtCut.cxx
@@ -1,8 +1,10 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 /*********************************
  * LAr.cpp
  * Created by Joerg Stelzer on 11/16/12.
  * Modified by V SOrin 2014
- * Copyright (c) 2012 Joerg Stelzer. All rights reserved.
  *
  * @brief algorithm calculates the phi-distance between one  lists and applies delta-phi criteria
  *
diff --git a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/GenericArrayCreator.cxx b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/GenericArrayCreator.cxx
index 03d17aa2e9e30d9202e436ca4c5bc2870996326c..c1c5dee0db633ba0e64176e12e5537648a60e85a 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/GenericArrayCreator.cxx
+++ b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/GenericArrayCreator.cxx
@@ -1,7 +1,9 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //  GenericArrayCreator.cxx
 //  L1TopoCoreSimulation
 //  Created by Joerg Stelzer on 12/10/12.
-//  Copyright (c) 2012 Joerg Stelzer. All rights reserved.
 
 #include "L1TopoAlgorithms/GenericArrayCreator.h"
 #include "L1TopoEvent/ClusterTOBArray.h"
diff --git a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/GenericListGenerator.cxx b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/GenericListGenerator.cxx
index a6927e23d7bb360e3c10dd0449d8f7625ca9fe94..ee4a9466b7d3b6a69ef8c5ffcb1df39d70b3f829 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/GenericListGenerator.cxx
+++ b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/GenericListGenerator.cxx
@@ -1,9 +1,11 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //  GenericListGenerator.cxx
 //  TopoCore
 //  Created by Joerg Stelzer on 11/10/12.
 //  Modified by V Sorin 2014
 //  algorithm to generate the all lists from TOBs
-//  Copyright (c) 2012 Joerg Stelzer. All rights reserved.
 
 #include "L1TopoAlgorithms/GenericListGenerator.h"
 #include "L1TopoEvent/ClusterTOBArray.h"
diff --git a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/InvariantMassInclusive1.cxx b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/InvariantMassInclusive1.cxx
index dc34560b453d565e5dda145038fad0449942fd77..5d0ac1249ef0c077aa818bdd3bdf426ed596b10c 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/InvariantMassInclusive1.cxx
+++ b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/InvariantMassInclusive1.cxx
@@ -1,7 +1,9 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 /*********************************
  * InvariantMassInclusive1.cpp
  * Created by V Sorin 2014.
- * Copyright (c) 2012 Joerg Stelzer. All rights reserved.
  * 
  * @brief algorithm calculates the sqr of the INVMASS between TOBs from one  list and applies invmass criteria
  *
diff --git a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/InvariantMassInclusive2.cxx b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/InvariantMassInclusive2.cxx
index 4a1b94bc3fe9bb8844cb24a644d25e689671fdb3..325ab75bc928c443cb6d5708174e3eaa6ae9b1bd 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/InvariantMassInclusive2.cxx
+++ b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/InvariantMassInclusive2.cxx
@@ -1,7 +1,9 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 /*********************************
  * InvariantMassInclusive2.cpp
  * Created by V SOrin 2014.
- * Copyright (c) 2012 Joerg Stelzer. All rights reserved.
  *
  * @brief algorithm calculates the sqr of the INVMASS between  two lists and applies invmass criteria
  *
diff --git a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/JetAbbreviated.cxx b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/JetAbbreviated.cxx
index b1b7f357f6d9e926050029839fbaacba887cde98..487ce46ed3fd94881ee342e2301a1e52c76b6de0 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/JetAbbreviated.cxx
+++ b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/JetAbbreviated.cxx
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //  JetAbbreviated.cxx
 //  TopoCore
 //  Created by Veronica Sorin on 14/8/14.
diff --git a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/JetHT.cxx b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/JetHT.cxx
index 45bbe08dd16f6e2137d8589c652222f859c1a6d3..ed69da95ea859f3e5b4fcac9ccfe0349b08903ba 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/JetHT.cxx
+++ b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/JetHT.cxx
@@ -1,7 +1,9 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 /*********************************
  * JetHT.cpp
  * Created by Joerg Stelzer on 11/16/12.
- * Copyright (c) 2012 Joerg Stelzer. All rights reserved.
  *
  * @brief algorithm calculates the sum of jets ET, makes cut on HT criteria 
  *
diff --git a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/JetMatch.cxx b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/JetMatch.cxx
index 8974318ae019dbab15d5a7261cd721ec70fca976..bb8371872bb3aa0f3b4c1706a0c852a101eadde3 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/JetMatch.cxx
+++ b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/JetMatch.cxx
@@ -1,7 +1,9 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 /*********************************
  * JetMatch.cpp
  * Created by V.Sorin, Joerg Stelzer on 11/16/12.
- * Copyright (c) 2012 Joerg Stelzer. All rights reserved.
  *
  * @brief algorithm calculates mult of jets passing cuts on 8x8 and 4x4 sizes, cut on mult of jets 
  *
diff --git a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/JetNoSort.cxx b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/JetNoSort.cxx
index 5a881a413ff308cf5b8fe68936181d0175d6d6d3..0477925c8d4f0e4fd67783d3eab10f863e58e468 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/JetNoSort.cxx
+++ b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/JetNoSort.cxx
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //  JetNoSort.cxx
 //  TopoCore
 //  Created by Veronica Sorin on 14/8/14.
diff --git a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/JetNoSortMatch.cxx b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/JetNoSortMatch.cxx
index 85d3ce987b0b522cf87866510f24f742217faf66..36e58e05ab68c12b4c87f823a1f185bc0ce605c6 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/JetNoSortMatch.cxx
+++ b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/JetNoSortMatch.cxx
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //  JetNoSortMatch.cxx
 //  TopoCore
 //  Created by Veronica Sorin on 14/8/14.
diff --git a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/JetSelect.cxx b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/JetSelect.cxx
index ff151bc09bf5ebf95d260ae36856296dfe34ded5..af05f78acc3d89e903991e51b39786098e5bcc84 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/JetSelect.cxx
+++ b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/JetSelect.cxx
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //  JetSelect.cxx
 //  TopoCore
 //  Created by Veronica Sorin on 14/8/14.
diff --git a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/JetSort.cxx b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/JetSort.cxx
index 3682b11c0ed8d585a1859dc2d65c3afce453d578..d942e91e25fc1b5578524f1dd34c0042d84cf9e0 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/JetSort.cxx
+++ b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/JetSort.cxx
@@ -1,7 +1,9 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //  JetSort.cxx
 //  TopoCore
 //  Created by Joerg Stelzer on 11/10/12.
-//  Copyright (c) 2012 Joerg Stelzer. All rights reserved.
 //  algorithm to make sorted Jets lists
 //
 #include "L1TopoAlgorithms/JetSort.h"
diff --git a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/JetSortingAlg.cxx b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/JetSortingAlg.cxx
index 1261265787c372f4cd17885a882949dbed0e5575..030df94201e9da709964be3050fdfff05c5b609a 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/JetSortingAlg.cxx
+++ b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/JetSortingAlg.cxx
@@ -1,7 +1,9 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //  JetSortingAlg.cxx
 //  TopoCore
 //  Created by Joerg Stelzer on 11/10/12.
-//  Copyright (c) 2012 Joerg Stelzer. All rights reserved.
 
 #include "L1TopoAlgorithms/JetSortingAlg.h"
 #include "L1TopoEvent/TOBArray.h"
diff --git a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/JetSortingAlgSize1.cxx b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/JetSortingAlgSize1.cxx
index e2327cd9466978c664fe18f2498b072aa5e8f405..1f4208df7ee5e465ddc25983ed8ad86da270f15b 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/JetSortingAlgSize1.cxx
+++ b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/JetSortingAlgSize1.cxx
@@ -1,7 +1,9 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //  JetSortingAlgSize1.cxx
 //  TopoCore
 //  Created by Joerg Stelzer on 11/10/12.
-//  Copyright (c) 2012 Joerg Stelzer. All rights reserved.
 
 #include "L1TopoAlgorithms/JetSortingAlgSize1.h"
 
diff --git a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/JetSortingAlgSize2.cxx b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/JetSortingAlgSize2.cxx
index 4181dd09dfa195558a8c5d9c814bba91eb7aca97..c3d39e19ea8971317fd65f55afa6186de1ea45c5 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/JetSortingAlgSize2.cxx
+++ b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/JetSortingAlgSize2.cxx
@@ -1,7 +1,9 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //  JetSortingAlgSize1.cxx
 //  TopoCore
 //  Created by Joerg Stelzer on 11/10/12.
-//  Copyright (c) 2012 Joerg Stelzer. All rights reserved.
 
 #include "L1TopoAlgorithms/JetSortingAlgSize2.h"
 
diff --git a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/KalmanMETCorrection.cxx b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/KalmanMETCorrection.cxx
index 4700a682358bc253ae577271352a100a80e650bf..ec70506c4d6336be195212a6cf07564ee2685fc5 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/KalmanMETCorrection.cxx
+++ b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/KalmanMETCorrection.cxx
@@ -1,7 +1,9 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 /*********************************
  * KalmanMETCorrection.cpp
  * Created by Joerg Stelzer on 11/16/12.
- * Copyright (c) 2012 Joerg Stelzer. All rights reserved.
  *
  * @brief algorithm calculates the KF correction per jet , get new XE and apply cut 
  *
diff --git a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/LAr.cxx b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/LAr.cxx
index 769f22856a071ac62f8b73477462e1beaf536ac8..6de767b978ca4a25050c1da23d0dc284e11bf602 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/LAr.cxx
+++ b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/LAr.cxx
@@ -1,8 +1,10 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 /*********************************
  * LAr.cpp
  * Created by Joerg Stelzer on 11/16/12.
  * Modified by V SOrin 2014
- * Copyright (c) 2012 Joerg Stelzer. All rights reserved.
  *
  * @brief algorithm calculates the phi-distance between one  lists and applies delta-phi criteria
  *
diff --git a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/METCut.cxx b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/METCut.cxx
index 8f7513ad545d5a8567adf3750fec167951ca8224..fc3e8d43c3a85528c269c28457114de1774940e3 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/METCut.cxx
+++ b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/METCut.cxx
@@ -1,7 +1,9 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 /*********************************
  * METCut.cpp
  * Created by Joerg Stelzer on 11/16/12.
- * Copyright (c) 2012 Joerg Stelzer. All rights reserved.
  *
  * @brief algorithm calculates the phi-distance between one or two lists and applies delta-phi criteria
  *
diff --git a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/METNoSort.cxx b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/METNoSort.cxx
index 3fc13c714e3d018d6ed36d5a848e3a012f52e757..a48f1a22a3c59b111c255cb09d1fd47abb140cf2 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/METNoSort.cxx
+++ b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/METNoSort.cxx
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //  METNoSort.cxx
 //  author: Joerg Stelzer
 //  creation: 27/08/14.
diff --git a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/METSortingAlg.cxx b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/METSortingAlg.cxx
index d1dfabf1f32b19a22934f0cbc0188a043aa8b056..4ef04d26f40504819b12bddb49c0bcc6517dc65c 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/METSortingAlg.cxx
+++ b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/METSortingAlg.cxx
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //  file: METSortingAlg.cxx
 //  author: Joerg Stelzer
 //  creation: 27/08/14.
diff --git a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/MetSort.cxx b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/MetSort.cxx
index 90070c6369ff3f5d62ea3f87bb4755765983cbf0..7edecf894d731e1f3793c741d86b6b95ed32e179 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/MetSort.cxx
+++ b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/MetSort.cxx
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //  MetSort.cxx
 //  author: Joerg Stelzer
 //  creation: 27/08/14.
diff --git a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/MinDeltaPhiIncl2.cxx b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/MinDeltaPhiIncl2.cxx
index d2960db1046d353f9ccf573cdb4a9c6f5e696cbb..7d46a71fd87dea5e412efcba378b7986b9c40d2b 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/MinDeltaPhiIncl2.cxx
+++ b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/MinDeltaPhiIncl2.cxx
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 /*********************************
  * MinDeltaPhiIncl2.cpp
  * Created by Veronica Sorin  on 14/8/14.
diff --git a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/Multiplicity.cxx b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/Multiplicity.cxx
index 78f4c7de08d9d621e05b0f73b5c6767c18c9d1d4..75f6f565faa971237525fecb18d7788d662970f7 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/Multiplicity.cxx
+++ b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/Multiplicity.cxx
@@ -1,8 +1,10 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 /*********************************
  * Multiplicity.cpp
  * Created by Joerg Stelzer on 11/16/12.
  * Modified by V SOrin 2014
- * Copyright (c) 2012 Joerg Stelzer. All rights reserved.
  *
  * @brief algorithm that check muon multiplicity and return 2 output lines, which will give information on how many muons were found
  * line 1: 0 or 1, line 1 and 2 : 2 or more, uses 2 bits
diff --git a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/MultiplicityCustom.cxx b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/MultiplicityCustom.cxx
index 480e70d56323eeab8c5f15bae0d010376e187e8d..110d71dbad20156e4b520f94bef3715eff5d625b 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/MultiplicityCustom.cxx
+++ b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/MultiplicityCustom.cxx
@@ -1,8 +1,10 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 /*********************************
  * MultiplicityCustom.cpp
  * Created by Joerg Stelzer on 11/16/12.
  * Modified by V SOrin 2014
- * Copyright (c) 2012 Joerg Stelzer. All rights reserved.
  *
  * algo that just apply et cut and then multiplicity of remaining TOBs
  * @param NumberLeading
diff --git a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/MuonAbbreviated.cxx b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/MuonAbbreviated.cxx
index b100b7e53fa000c37a9bc9b620ec57d69432e1bd..3cf02404ff6960283c4ba267539c113515353abd 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/MuonAbbreviated.cxx
+++ b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/MuonAbbreviated.cxx
@@ -1,7 +1,9 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //  MuonAbbreviated.cxx
 //  TopoCore
 //  Created by Joerg Stelzer on 11/10/12.
-//  Copyright (c) 2012 Joerg Stelzer. All rights reserved.
 
 #include "L1TopoAlgorithms/MuonAbbreviated.h"
 #include "L1TopoEvent/TOBArray.h"
diff --git a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/MuonNoSort.cxx b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/MuonNoSort.cxx
index 7c7726f1292ab91c8f2ca789ae2e0740f2d42f45..db978d54abc99e62ee3b0ba3e7a6bd8d48169e2c 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/MuonNoSort.cxx
+++ b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/MuonNoSort.cxx
@@ -1,7 +1,9 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //  MuonNoSort.cxx
 //  TopoCore
 //  Created by Joerg Stelzer, V Sorin 2014.
-//  Copyright (c) 2012 Joerg Stelzer. All rights reserved.
 //  algorithm to make sorted muon lists
 //
 #include "L1TopoAlgorithms/MuonNoSort.h"
diff --git a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/MuonSelect.cxx b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/MuonSelect.cxx
index 2f8496469e7ac12dbf5589ce2ddccc22314338cd..d12949bed15b7e6dcd8f03f26036a4fd1b2e9ea5 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/MuonSelect.cxx
+++ b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/MuonSelect.cxx
@@ -1,7 +1,9 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //  MuonSelect.cxx
 //  TopoCore
 //  Created by Joerg Stelzer, V Sorin 2014.
-//  Copyright (c) 2012 Joerg Stelzer. All rights reserved.
 //  algorithm to make abbreviated muon lists
 //
 #include "L1TopoAlgorithms/MuonSelect.h"
diff --git a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/MuonSort.cxx b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/MuonSort.cxx
index b17a3553a38a26b8a38b0690a74aab052a0f412f..f4f0239222914d0c92be73534db09c5fc2f7354e 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/MuonSort.cxx
+++ b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/MuonSort.cxx
@@ -1,7 +1,9 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //  MuonSort.cxx
 //  TopoCore
 //  Created by Joerg Stelzer on 11/10/12.
-//  Copyright (c) 2012 Joerg Stelzer. All rights reserved.
 //  algorithm to create sorted lists for muons, et order applied
 //
 #include "L1TopoAlgorithms/MuonSort.h"
diff --git a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/MuonSort_1BC.cxx b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/MuonSort_1BC.cxx
index 6b7d1c55f1a85e067389aeae883728669c0cdaae..a1f6321b4dce3b1a4de722bd7323a934cd66fa76 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/MuonSort_1BC.cxx
+++ b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/MuonSort_1BC.cxx
@@ -1,7 +1,9 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //  MuonSort_1BC.cxx
 //  TopoCore
 //  Created by Sue Cheatham based on MuonSelect created by Joerg Stelzer, V Sorin 2014.  Selects LateMuons from BC+1
-//  Copyright (c) 2012 Joerg Stelzer. All rights reserved.
 //  algorithm to make abbreviated latemuon lists
 //
 #include "L1TopoAlgorithms/MuonSort_1BC.h"
diff --git a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/NotMatch.cxx b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/NotMatch.cxx
index af3e9c7cc8a7b36e572e0450d733ae48604c90de..12ab5e8d85837274842056f7ce1efe8a0bc0c4b9 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/NotMatch.cxx
+++ b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/NotMatch.cxx
@@ -1,7 +1,9 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 /*********************************
  * NotMatch.cpp
  * Created by Joerg Stelzer / V Sorin on 9/16/14.
- * Copyright (c) 2012 Joerg Stelzer. All rights reserved.
  *
  * @brief algorithm calculates the phi-distance between one or two lists and applies delta-phi criteria
  *
diff --git a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/Ratio.cxx b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/Ratio.cxx
index 66cd79a052917a91ab9e66f1569ea63c0ff654f2..2b927a3450b5d82cd433b5a13445472201ee2140 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/Ratio.cxx
+++ b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/Ratio.cxx
@@ -1,7 +1,9 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 /*********************************
  * Ratio.cpp
  * Created by Joerg Stelzer on 11/16/12.
- * Copyright (c) 2012 Joerg Stelzer. All rights reserved.
  *
  * @brief algorithm calculates the phi-distance between one or two lists and applies delta-phi criteria
  *
diff --git a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/Ratio2.cxx b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/Ratio2.cxx
index 2cf583f8b1cb391bfbc0760325e951dd9800e73f..68d98a05da33b5f44c717e4fde14ec178650b683 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/Ratio2.cxx
+++ b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/Ratio2.cxx
@@ -1,7 +1,9 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 /*********************************
  * Ratio2.cpp
  * Created by Joerg Stelzer on 11/16/12.
- * Copyright (c) 2012 Joerg Stelzer. All rights reserved.
  *
  * @brief algorithm calculates the phi-distance between one or two lists and applies delta-phi criteria
  *
diff --git a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/RatioMatch.cxx b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/RatioMatch.cxx
index 82ee9258c2720351d4c6e1787887bf2de249df44..fe3a84986c5e3315a00629e78401bb59c40fc52c 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/RatioMatch.cxx
+++ b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/RatioMatch.cxx
@@ -1,7 +1,9 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 /*********************************
  * RatioMatch.cpp
  * Created by Joerg Stelzer on 11/16/12.
- * Copyright (c) 2012 Joerg Stelzer. All rights reserved.
  *
  * @brief algorithm calculates the phi-distance between one or two lists and applies delta-phi criteria
  *
diff --git a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/RatioSum.cxx b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/RatioSum.cxx
index e2332a88400709efc434c6740a5458c13818101b..164f4e7f0d45009c7adb1eafafaff97353570379 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/RatioSum.cxx
+++ b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/RatioSum.cxx
@@ -1,7 +1,9 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 /*********************************
  * RatioSum.cpp
  * Created by Joerg Stelzer on 11/16/12.
- * Copyright (c) 2012 Joerg Stelzer. All rights reserved.
  *
  * @brief algorithm to select W tag-and-probe events using MET/sumET
  *
diff --git a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/SimpleCone.cxx b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/SimpleCone.cxx
index 7c92941760a335a5b44582c3a5f58843920fd7f6..d41df902f9b256e74faf89f2a8bc4e50fff7d728 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/SimpleCone.cxx
+++ b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/SimpleCone.cxx
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 /*********************************
  * SimpleCone.cpp
  *
diff --git a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/TransverseMassInclusive1.cxx b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/TransverseMassInclusive1.cxx
index 645959d0e50fc7e4b945f9607777a8161d8812cc..73c5249ef198f7f3e99f870058f1f2f7edbf9115 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/TransverseMassInclusive1.cxx
+++ b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/TransverseMassInclusive1.cxx
@@ -1,7 +1,9 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 /*********************************
  * TransverseMassInclusive1.cpp
  * Created by V Sorin 2014.
- * Copyright (c) 2012 Joerg Stelzer. All rights reserved.
  * 
  * @brief algorithm calculates the sqr of the transverse MASS between one  list and XE and applies mass criteria
  *
diff --git a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/src/test/L1TopoGenPyAlg.cxx b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/src/test/L1TopoGenPyAlg.cxx
index 981e80ac1b7a7d10d8584ee327fd4e16660e57b7..4b819a7dedfccb1f43f0e6dd33c62280b04ad750 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/src/test/L1TopoGenPyAlg.cxx
+++ b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/src/test/L1TopoGenPyAlg.cxx
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 #include "L1TopoInterfaces/AlgFactory.h"
 #include "L1TopoInterfaces/ConfigurableAlg.h"
 
diff --git a/Trigger/TrigT1/L1Topo/L1TopoCommon/L1TopoCommon/Exception.h b/Trigger/TrigT1/L1Topo/L1TopoCommon/L1TopoCommon/Exception.h
index 7f92107a44b49da749ac7e2c16c2e59f31b13cb0..2576db5fd8a6fda74e2a9062dcc7e1af433a077e 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoCommon/L1TopoCommon/Exception.h
+++ b/Trigger/TrigT1/L1Topo/L1TopoCommon/L1TopoCommon/Exception.h
@@ -1,7 +1,9 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //  ConfigException.h
 //  TopoCore
 //  Created by Joerg Stelzer on 11/18/12.
-//  Copyright (c) 2012 Joerg Stelzer. All rights reserved.
 
 #ifndef __TopoCore__Exception__
 #define __TopoCore__Exception__
diff --git a/Trigger/TrigT1/L1Topo/L1TopoCommon/L1TopoCommon/StatusCode.h b/Trigger/TrigT1/L1Topo/L1TopoCommon/L1TopoCommon/StatusCode.h
index 6a5ccbdde3dd58ed152ac4a073d506b95d100b98..6c1ace043d89a6f329765019b04af82069087cbe 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoCommon/L1TopoCommon/StatusCode.h
+++ b/Trigger/TrigT1/L1Topo/L1TopoCommon/L1TopoCommon/StatusCode.h
@@ -1,7 +1,9 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //  StatusCode.h
 //  TopoCore
 //  Created by Joerg Stelzer on 11/10/12.
-//  Copyright (c) 2012 Joerg Stelzer. All rights reserved.
 
 #ifndef __TopoCore__StatusCode__
 #define __TopoCore__StatusCode__
diff --git a/Trigger/TrigT1/L1Topo/L1TopoCommon/L1TopoCommon/Types.h b/Trigger/TrigT1/L1Topo/L1TopoCommon/L1TopoCommon/Types.h
index 639ad85e11ef3d93dc0f372e4e3c447f7b267f9b..218181519c4a8b336a0fd9b3a218de2b0b6aa337 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoCommon/L1TopoCommon/Types.h
+++ b/Trigger/TrigT1/L1Topo/L1TopoCommon/L1TopoCommon/Types.h
@@ -1,7 +1,9 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //  Types.h
 //  L1TopoCoreSimulation
 //  Created by Joerg Stelzer on 11/22/12.
-//  Copyright (c) 2012 Joerg Stelzer. All rights reserved.
 
 #ifndef __L1TopoCoreSimulation__Types__
 #define __L1TopoCoreSimulation__Types__
diff --git a/Trigger/TrigT1/L1Topo/L1TopoCommon/Root/Exception.cxx b/Trigger/TrigT1/L1Topo/L1TopoCommon/Root/Exception.cxx
index 6a996365bfef04d849f01c7af02305fa030605f3..78fa397389730f0b0605ea82192ce295987f412c 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoCommon/Root/Exception.cxx
+++ b/Trigger/TrigT1/L1Topo/L1TopoCommon/Root/Exception.cxx
@@ -1,6 +1,8 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //  ConfigException.cxx
 //  TopoCore
 //  Created by Joerg Stelzer on 11/18/12.
-//  Copyright (c) 2012 Joerg Stelzer. All rights reserved.
 
 #include "L1TopoCommon/Exception.h"
diff --git a/Trigger/TrigT1/L1Topo/L1TopoCommon/Root/StatusCode.cxx b/Trigger/TrigT1/L1Topo/L1TopoCommon/Root/StatusCode.cxx
index 1726d25ca30ab741d85df01d695308c1e70dfd34..f5a719d04dde406b2af7ce0cb7d8617c76a8e75c 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoCommon/Root/StatusCode.cxx
+++ b/Trigger/TrigT1/L1Topo/L1TopoCommon/Root/StatusCode.cxx
@@ -1,7 +1,9 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //  StatusCode.cxx
 //  TopoCore
 //  Created by Joerg Stelzer on 11/10/12.
-//  Copyright (c) 2012 Joerg Stelzer. All rights reserved.
 
 #include "L1TopoCommon/StatusCode.h"
 
diff --git a/Trigger/TrigT1/L1Topo/L1TopoConfig/L1TopoConfig/LayoutConstraints.h b/Trigger/TrigT1/L1Topo/L1TopoConfig/L1TopoConfig/LayoutConstraints.h
index b8298dfad67469a4d4e66ce26622199193befc73..3d3385b93c5a9cb1923d31bb2e588fde38ae3e97 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoConfig/L1TopoConfig/LayoutConstraints.h
+++ b/Trigger/TrigT1/L1Topo/L1TopoConfig/L1TopoConfig/LayoutConstraints.h
@@ -1,7 +1,9 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //  LayoutConstraints.h
 //  TopoCore
 //  Created by Joerg Stelzer on 11/18/12.
-//  Copyright (c) 2012 Joerg Stelzer. All rights reserved.
 //  Class provides static access to limits of the hardware
 
 #ifndef __TopoCore__LayoutConstraints__
diff --git a/Trigger/TrigT1/L1Topo/L1TopoConfig/Root/LayoutConstraints.cxx b/Trigger/TrigT1/L1Topo/L1TopoConfig/Root/LayoutConstraints.cxx
index c0ed089977d78b0672d194811c48cd35674be5f1..9fe89422e9f4357af0cd8b5972d536e3c261be5b 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoConfig/Root/LayoutConstraints.cxx
+++ b/Trigger/TrigT1/L1Topo/L1TopoConfig/Root/LayoutConstraints.cxx
@@ -1,7 +1,9 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //  LayoutConstraints.cxx
 //  TopoCore
 //  Created by Joerg Stelzer on 11/18/12.
-//  Copyright (c) 2012 Joerg Stelzer. All rights reserved.
 
 #include "L1TopoConfig/LayoutConstraints.h"
 
diff --git a/Trigger/TrigT1/L1Topo/L1TopoCoreSim/L1TopoCoreSim/Connector.h b/Trigger/TrigT1/L1Topo/L1TopoCoreSim/L1TopoCoreSim/Connector.h
index 2f4bb68e1633595d7951988c9e41121acda422d0..181b1aaefdfde8e6b10e04d04b131299135f181f 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoCoreSim/L1TopoCoreSim/Connector.h
+++ b/Trigger/TrigT1/L1Topo/L1TopoCoreSim/L1TopoCoreSim/Connector.h
@@ -1,7 +1,9 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //  Connector.h
 //  L1TopoCoreSimulation
 //  Created by Joerg Stelzer on 11/20/12.
-//  Copyright (c) 2012 Joerg Stelzer. All rights reserved.
 
 #ifndef L1TopoCoreSimulation_Connector
 #define L1TopoCoreSimulation_Connector
diff --git a/Trigger/TrigT1/L1Topo/L1TopoCoreSim/L1TopoCoreSim/DecisionConnector.h b/Trigger/TrigT1/L1Topo/L1TopoCoreSim/L1TopoCoreSim/DecisionConnector.h
index 25a08baba3b4c6a96540209b659cd2dbe4110c54..ab0d079d3e8071f8de0822048e7c40c0322191b7 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoCoreSim/L1TopoCoreSim/DecisionConnector.h
+++ b/Trigger/TrigT1/L1Topo/L1TopoCoreSim/L1TopoCoreSim/DecisionConnector.h
@@ -1,7 +1,9 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //  DecisionConnector.h
 //  L1TopoCoreSimulation
 //  Created by Joerg Stelzer on 11/20/12.
-//  Copyright (c) 2012 Joerg Stelzer. All rights reserved.
 
 #ifndef L1TopoCoreSimulation_DecisionConnector
 #define L1TopoCoreSimulation_DecisionConnector
diff --git a/Trigger/TrigT1/L1Topo/L1TopoCoreSim/L1TopoCoreSim/GlobalDecision.h b/Trigger/TrigT1/L1Topo/L1TopoCoreSim/L1TopoCoreSim/GlobalDecision.h
index ccf6cf34923ef35dc1356c6fb7e85efd2157acf8..3a26d6abc053160a6c070ef4e8c262249aacbfe0 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoCoreSim/L1TopoCoreSim/GlobalDecision.h
+++ b/Trigger/TrigT1/L1Topo/L1TopoCoreSim/L1TopoCoreSim/GlobalDecision.h
@@ -1,7 +1,9 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //  GlobalDecision.h
 //  L1TopoCoreSimulation
 //  Created by Joerg Stelzer on 11/25/12.
-//  Copyright (c) 2012 Joerg Stelzer. All rights reserved.
 
 #ifndef L1TopoCoreSimulation_GlobalDecision
 #define L1TopoCoreSimulation_GlobalDecision
diff --git a/Trigger/TrigT1/L1Topo/L1TopoCoreSim/L1TopoCoreSim/InputConnector.h b/Trigger/TrigT1/L1Topo/L1TopoCoreSim/L1TopoCoreSim/InputConnector.h
index 3db81b0ed3b7c87638060599f7fe12e1aabd3059..ae737e37d190f2f59b947c920a9b30ebfa3615d6 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoCoreSim/L1TopoCoreSim/InputConnector.h
+++ b/Trigger/TrigT1/L1Topo/L1TopoCoreSim/L1TopoCoreSim/InputConnector.h
@@ -1,7 +1,9 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //  Connector.h
 //  L1TopoCoreSimulation
 //  Created by Joerg Stelzer on 11/20/12.
-//  Copyright (c) 2012 Joerg Stelzer. All rights reserved.
 
 #ifndef L1TopoCoreSimulation_InputConnector
 #define L1TopoCoreSimulation_InputConnector
diff --git a/Trigger/TrigT1/L1Topo/L1TopoCoreSim/L1TopoCoreSim/SortingConnector.h b/Trigger/TrigT1/L1Topo/L1TopoCoreSim/L1TopoCoreSim/SortingConnector.h
index a90f61968ea560e947a190f4afdba2c4a67ca709..c8d359148da04701edf8e611d96d584a2e7ed825 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoCoreSim/L1TopoCoreSim/SortingConnector.h
+++ b/Trigger/TrigT1/L1Topo/L1TopoCoreSim/L1TopoCoreSim/SortingConnector.h
@@ -1,7 +1,9 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //  Connector.h
 //  L1TopoCoreSimulation
 //  Created by Joerg Stelzer on 11/20/12.
-//  Copyright (c) 2012 Joerg Stelzer. All rights reserved.
 
 #ifndef L1TopoCoreSimulation_SortingConnector
 #define L1TopoCoreSimulation_SortingConnector
diff --git a/Trigger/TrigT1/L1Topo/L1TopoCoreSim/L1TopoCoreSim/StandaloneL1TopoHistSvc.h b/Trigger/TrigT1/L1Topo/L1TopoCoreSim/L1TopoCoreSim/StandaloneL1TopoHistSvc.h
index 22e3e1c55b9c4f0252fcf9e48bf445c1f5194e4a..096ace9d7e8fad29b78f7fbc947ceb876181d1ec 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoCoreSim/L1TopoCoreSim/StandaloneL1TopoHistSvc.h
+++ b/Trigger/TrigT1/L1Topo/L1TopoCoreSim/L1TopoCoreSim/StandaloneL1TopoHistSvc.h
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 #ifndef STANDALONEL1TOPOHISTSVC_H
 #define STANDALONEL1TOPOHISTSVC_H
 
diff --git a/Trigger/TrigT1/L1Topo/L1TopoCoreSim/L1TopoCoreSim/TopoASCIIReader.h b/Trigger/TrigT1/L1Topo/L1TopoCoreSim/L1TopoCoreSim/TopoASCIIReader.h
index db1297e59b8abe487dcf1ac90051a5bcb835d104..e4901d1d4d3024e285054d09ec31bed6b8b39a92 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoCoreSim/L1TopoCoreSim/TopoASCIIReader.h
+++ b/Trigger/TrigT1/L1Topo/L1TopoCoreSim/L1TopoCoreSim/TopoASCIIReader.h
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //  TopoASCIIReader.h
 //  L1TopoCoreSimulation
 
diff --git a/Trigger/TrigT1/L1Topo/L1TopoCoreSim/L1TopoCoreSim/TopoCoreSimResult.h b/Trigger/TrigT1/L1Topo/L1TopoCoreSim/L1TopoCoreSim/TopoCoreSimResult.h
index 31e687d3df9fcd76ed9a3fa6b7799ec9b85b2c38..88aecb9e2eb424adffc8d650a18b315a4c302309 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoCoreSim/L1TopoCoreSim/TopoCoreSimResult.h
+++ b/Trigger/TrigT1/L1Topo/L1TopoCoreSim/L1TopoCoreSim/TopoCoreSimResult.h
@@ -1,7 +1,9 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //  TopoCoreSimResult.h
 //  L1TopoEvent
 //  Created by Joerg Stelzer on 11/29/12.
-//  Copyright (c) 2012 Joerg Stelzer. All rights reserved.
 
 #ifndef __L1TopoEvent__TopoCoreSimResult__
 #define __L1TopoEvent__TopoCoreSimResult__
diff --git a/Trigger/TrigT1/L1Topo/L1TopoCoreSim/L1TopoCoreSim/TopoSteering.h b/Trigger/TrigT1/L1Topo/L1TopoCoreSim/L1TopoCoreSim/TopoSteering.h
index abd78702286745abaa83704ef64f256c850f7ce0..027874bef902c0ee1728682783305e3bc246e56a 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoCoreSim/L1TopoCoreSim/TopoSteering.h
+++ b/Trigger/TrigT1/L1Topo/L1TopoCoreSim/L1TopoCoreSim/TopoSteering.h
@@ -1,7 +1,9 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //  TopoSteering.h
 //  L1TopoCoreSimulation
 //  Created by Joerg Stelzer on 11/20/12.
-//  Copyright (c) 2012 Joerg Stelzer. All rights reserved.
 
 #ifndef __L1TopoCoreSimulation__TopoSteering__
 #define __L1TopoCoreSimulation__TopoSteering__
diff --git a/Trigger/TrigT1/L1Topo/L1TopoCoreSim/L1TopoCoreSim/TopoSteeringStructure.h b/Trigger/TrigT1/L1Topo/L1TopoCoreSim/L1TopoCoreSim/TopoSteeringStructure.h
index 08f861eb8f42d209aeaadd9ad64f5282a1ddcb96..119c899410ad9c17321b720892bf858570fd3383 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoCoreSim/L1TopoCoreSim/TopoSteeringStructure.h
+++ b/Trigger/TrigT1/L1Topo/L1TopoCoreSim/L1TopoCoreSim/TopoSteeringStructure.h
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 #include "L1TopoCommon/StatusCode.h"
 
 #include <vector>
diff --git a/Trigger/TrigT1/L1Topo/L1TopoCoreSim/Root/Connector.cxx b/Trigger/TrigT1/L1Topo/L1TopoCoreSim/Root/Connector.cxx
index 375500ad11f563deef0c1b1d4267238511f0ae1e..1c28d45996bce0c8135664d205e580a8e5b70338 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoCoreSim/Root/Connector.cxx
+++ b/Trigger/TrigT1/L1Topo/L1TopoCoreSim/Root/Connector.cxx
@@ -1,7 +1,9 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //  Connector.cxx
 //  L1TopoCoreSimulation
 //  Created by Joerg Stelzer on 11/20/12.
-//  Copyright (c) 2012 Joerg Stelzer. All rights reserved.
 
 #include "L1TopoCoreSim/Connector.h"
 
diff --git a/Trigger/TrigT1/L1Topo/L1TopoCoreSim/Root/DecisionConnector.cxx b/Trigger/TrigT1/L1Topo/L1TopoCoreSim/Root/DecisionConnector.cxx
index aa2577d5a140be0c479848c16a93b6778feda14a..1586c6c8bae5090a6aad6889fdd0d0bf723b3b90 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoCoreSim/Root/DecisionConnector.cxx
+++ b/Trigger/TrigT1/L1Topo/L1TopoCoreSim/Root/DecisionConnector.cxx
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //  DecisionConnector.cxx
 //  L1TopoCoreSimulation
 //  Created by Joerg Stelzer on 11/09/13.
diff --git a/Trigger/TrigT1/L1Topo/L1TopoCoreSim/Root/GlobalDecision.cxx b/Trigger/TrigT1/L1Topo/L1TopoCoreSim/Root/GlobalDecision.cxx
index e3162457e6bb53c2387fdc1cfc63ab08787c58e5..5cda4eb980e6d420439ffd4f360a66d853aa54aa 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoCoreSim/Root/GlobalDecision.cxx
+++ b/Trigger/TrigT1/L1Topo/L1TopoCoreSim/Root/GlobalDecision.cxx
@@ -1,7 +1,9 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //  GlobalDecision.cxx
 //  L1TopoCoreSimulation
 //  Created by Joerg Stelzer on 11/25/12.
-//  Copyright (c) 2012 Joerg Stelzer. All rights reserved.
 
 #include <iomanip>
 
diff --git a/Trigger/TrigT1/L1Topo/L1TopoCoreSim/Root/InputConnector.cxx b/Trigger/TrigT1/L1Topo/L1TopoCoreSim/Root/InputConnector.cxx
index eab05baebb4d2f450f5302f9bfccbd3314531edc..7434bb2a27a270db64a26a4a5f6fc2b7f11f60f7 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoCoreSim/Root/InputConnector.cxx
+++ b/Trigger/TrigT1/L1Topo/L1TopoCoreSim/Root/InputConnector.cxx
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //  InputConnector.cxx
 //  L1TopoCoreSimulation
 //  Created by Joerg Stelzer on 11/09/13.
diff --git a/Trigger/TrigT1/L1Topo/L1TopoCoreSim/Root/SortingConnector.cxx b/Trigger/TrigT1/L1Topo/L1TopoCoreSim/Root/SortingConnector.cxx
index 9047a5b8d449b009259f812a2585107a65621f4e..dbe436dd9875092aa193512d7590c98e96252656 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoCoreSim/Root/SortingConnector.cxx
+++ b/Trigger/TrigT1/L1Topo/L1TopoCoreSim/Root/SortingConnector.cxx
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //  SortingConnector.cxx
 //  L1TopoCoreSimulation
 //  Created by Joerg Stelzer on 11/09/13.
diff --git a/Trigger/TrigT1/L1Topo/L1TopoCoreSim/Root/StandaloneL1TopoHistSvc.cxx b/Trigger/TrigT1/L1Topo/L1TopoCoreSim/Root/StandaloneL1TopoHistSvc.cxx
index 486cf1d8f415ca1bc3e83484df796907ec5caacf..211b0bedec8eef752989985c1d521c1448e24e71 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoCoreSim/Root/StandaloneL1TopoHistSvc.cxx
+++ b/Trigger/TrigT1/L1Topo/L1TopoCoreSim/Root/StandaloneL1TopoHistSvc.cxx
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 #include "L1TopoCoreSim/StandaloneL1TopoHistSvc.h"
 #include "TFile.h"
 #include "TH1.h"
diff --git a/Trigger/TrigT1/L1Topo/L1TopoCoreSim/Root/TopoASCIIReader.cxx b/Trigger/TrigT1/L1Topo/L1TopoCoreSim/Root/TopoASCIIReader.cxx
index cfbc1e1c3cd71d1888d362a90e7a7f361ae288c5..2e8c9cb6cd99b6cec2161d5738c8f328355379b3 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoCoreSim/Root/TopoASCIIReader.cxx
+++ b/Trigger/TrigT1/L1Topo/L1TopoCoreSim/Root/TopoASCIIReader.cxx
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //  TopoASCIIReader.cpp
 
 #include "L1TopoCoreSim/TopoASCIIReader.h"
diff --git a/Trigger/TrigT1/L1Topo/L1TopoCoreSim/Root/TopoCoreSimResult.cxx b/Trigger/TrigT1/L1Topo/L1TopoCoreSim/Root/TopoCoreSimResult.cxx
index d65696ad6aa53b4a4f2758eba3a29ff758e15ac8..f1dcd5ee5395193680b12047d826906b2edd9b6c 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoCoreSim/Root/TopoCoreSimResult.cxx
+++ b/Trigger/TrigT1/L1Topo/L1TopoCoreSim/Root/TopoCoreSimResult.cxx
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //  TopoCoreSimResult.cxx
 //  L1TopoEvent
 //  @authors
diff --git a/Trigger/TrigT1/L1Topo/L1TopoCoreSim/Root/TopoSteering.cxx b/Trigger/TrigT1/L1Topo/L1TopoCoreSim/Root/TopoSteering.cxx
index 4b775c09862f0acfc601732889984a46998c7de1..05b8f7b48acfc6cbb1feafbf634ea39a7202fcc4 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoCoreSim/Root/TopoSteering.cxx
+++ b/Trigger/TrigT1/L1Topo/L1TopoCoreSim/Root/TopoSteering.cxx
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //  TopoSteering.cxx
 //  Framework to execute simulation algorithms
 
diff --git a/Trigger/TrigT1/L1Topo/L1TopoCoreSim/Root/TopoSteeringStructure.cxx b/Trigger/TrigT1/L1Topo/L1TopoCoreSim/Root/TopoSteeringStructure.cxx
index 88e6dfbf5208abcc19992de631f91aafbcf7f2fc..3975004d2665109986513fcb3020946f17eb009a 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoCoreSim/Root/TopoSteeringStructure.cxx
+++ b/Trigger/TrigT1/L1Topo/L1TopoCoreSim/Root/TopoSteeringStructure.cxx
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 #include "L1TopoCoreSim/TopoSteeringStructure.h"
 
 #include "L1TopoCommon/StringUtils.h"
diff --git a/Trigger/TrigT1/L1Topo/L1TopoCoreSim/Root/test/TopoStandAlone.cxx b/Trigger/TrigT1/L1Topo/L1TopoCoreSim/Root/test/TopoStandAlone.cxx
index 443b92164ed357a73b5da9b68ee1c55037df5dc1..d18a255eb4a7083c543d539d83cbaad39cbb4a0b 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoCoreSim/Root/test/TopoStandAlone.cxx
+++ b/Trigger/TrigT1/L1Topo/L1TopoCoreSim/Root/test/TopoStandAlone.cxx
@@ -1,9 +1,11 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //
 //  main.cpp
 //  TestTopo
 //
 //  Created by Joerg Stelzer on 11/10/12.
-//  Copyright (c) 2012 Joerg Stelzer. All rights reserved.
 //
 
 #include <iostream>
diff --git a/Trigger/TrigT1/L1Topo/L1TopoCoreSim/Root/test/TopoTest.cxx b/Trigger/TrigT1/L1Topo/L1TopoCoreSim/Root/test/TopoTest.cxx
index bc7458e6a5b6543ce18dad09936e42f41b8930b9..d9618f74f55f81cf3c3bcba387060431d0379ca8 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoCoreSim/Root/test/TopoTest.cxx
+++ b/Trigger/TrigT1/L1Topo/L1TopoCoreSim/Root/test/TopoTest.cxx
@@ -1,9 +1,11 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //
 //  main.cpp
 //  TestTopo
 //
 //  Created by Joerg Stelzer on 11/10/12.
-//  Copyright (c) 2012 Joerg Stelzer. All rights reserved.
 //
 
 #include <iostream>
diff --git a/Trigger/TrigT1/L1Topo/L1TopoCoreSim/src/test/TopoStandAlone.cxx b/Trigger/TrigT1/L1Topo/L1TopoCoreSim/src/test/TopoStandAlone.cxx
index 00267704854ed35ec27c95044b291526f5f57bdf..4f9d7389549c542b19265436d61962b407dffc66 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoCoreSim/src/test/TopoStandAlone.cxx
+++ b/Trigger/TrigT1/L1Topo/L1TopoCoreSim/src/test/TopoStandAlone.cxx
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 #include <iostream>
 #include <vector>
 #include <memory>
diff --git a/Trigger/TrigT1/L1Topo/L1TopoCoreSim/src/test/TopoSteeringTest.cxx b/Trigger/TrigT1/L1Topo/L1TopoCoreSim/src/test/TopoSteeringTest.cxx
index 8f889ed99232e4e7cd52e837abd9f3285318a092..01b69f27458827fc15e568dfb4471769b7b00bbf 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoCoreSim/src/test/TopoSteeringTest.cxx
+++ b/Trigger/TrigT1/L1Topo/L1TopoCoreSim/src/test/TopoSteeringTest.cxx
@@ -1,9 +1,11 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //
 //  main.cpp
 //  TestTopo
 //
 //  Created by Joerg Stelzer on 11/10/12.
-//  Copyright (c) 2012 Joerg Stelzer. All rights reserved.
 //
 
 #include <iostream>
diff --git a/Trigger/TrigT1/L1Topo/L1TopoCoreSim/src/test/TopoTestSteeringConfig.cxx b/Trigger/TrigT1/L1Topo/L1TopoCoreSim/src/test/TopoTestSteeringConfig.cxx
index 84453f079c40afeb16b90f74f287a3a1f5496027..7717d75645ef69cbeda12b55af88836be201ff8a 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoCoreSim/src/test/TopoTestSteeringConfig.cxx
+++ b/Trigger/TrigT1/L1Topo/L1TopoCoreSim/src/test/TopoTestSteeringConfig.cxx
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 // test the loading of the topo menu xml and configuration of the topo steering
 
 #include <iostream>
diff --git a/Trigger/TrigT1/L1Topo/L1TopoEvent/L1TopoEvent/BaseTOB.h b/Trigger/TrigT1/L1Topo/L1TopoEvent/L1TopoEvent/BaseTOB.h
index 99186d6f06f40f7fa043e548654e964423205160..feeaa081a4cd470ebada19b6cc6b849534cdab05 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoEvent/L1TopoEvent/BaseTOB.h
+++ b/Trigger/TrigT1/L1Topo/L1TopoEvent/L1TopoEvent/BaseTOB.h
@@ -1,7 +1,9 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //  BaseTOB.h
 //  TopoCore
 //  Created by Joerg Stelzer on 11/10/12.
-//  Copyright (c) 2012 Joerg Stelzer. All rights reserved.
 
 #ifndef __TopoCore__BaseTOB__
 #define __TopoCore__BaseTOB__
diff --git a/Trigger/TrigT1/L1Topo/L1TopoEvent/L1TopoEvent/ClusterTOB.h b/Trigger/TrigT1/L1Topo/L1TopoEvent/L1TopoEvent/ClusterTOB.h
index 4e5c2ed7c16c9824ec57cc615969263c7529b953..65b7a77f2efd1ab4d6a1e107326a96df821ae352 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoEvent/L1TopoEvent/ClusterTOB.h
+++ b/Trigger/TrigT1/L1Topo/L1TopoEvent/L1TopoEvent/ClusterTOB.h
@@ -1,7 +1,9 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //  ClusterTOB.h
 //  TopoCore
 //  Created by Joerg Stelzer on 11/10/12.
-//  Copyright (c) 2012 Joerg Stelzer. All rights reserved.
 
 #ifndef __TopoCore__ClusterTOB__
 #define __TopoCore__ClusterTOB__
diff --git a/Trigger/TrigT1/L1Topo/L1TopoEvent/L1TopoEvent/ClusterTOBArray.h b/Trigger/TrigT1/L1Topo/L1TopoEvent/L1TopoEvent/ClusterTOBArray.h
index 00a76e2e1e9a3da94696ed38ae683bcd0d48e6b4..b27bd0321838f30e85e512760c72826ee0047abc 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoEvent/L1TopoEvent/ClusterTOBArray.h
+++ b/Trigger/TrigT1/L1Topo/L1TopoEvent/L1TopoEvent/ClusterTOBArray.h
@@ -1,7 +1,9 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //  ClusterTOBArray.h
 //  TopoCore
 //  Created by Joerg Stelzer on 11/17/12.
-//  Copyright (c) 2012 Joerg Stelzer. All rights reserved.
 
 #ifndef __TopoCore__ClusterTOBArray__
 #define __TopoCore__ClusterTOBArray__
diff --git a/Trigger/TrigT1/L1Topo/L1TopoEvent/L1TopoEvent/CompositeTOB.h b/Trigger/TrigT1/L1Topo/L1TopoEvent/L1TopoEvent/CompositeTOB.h
index fab8d90948b1cbd7d80ebc4b4a1d1c4230ff9018..d5352832375d3b2fd82e35597aaf9bd1b90b9aef 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoEvent/L1TopoEvent/CompositeTOB.h
+++ b/Trigger/TrigT1/L1Topo/L1TopoEvent/L1TopoEvent/CompositeTOB.h
@@ -1,7 +1,9 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //  CompositeTOB.h
 //  TopoCore
 //  Created by Joerg Stelzer on 11/18/12.
-//  Copyright (c) 2012 Joerg Stelzer. All rights reserved.
 
 #ifndef __TopoCore__CompositeTOB__
 #define __TopoCore__CompositeTOB__
diff --git a/Trigger/TrigT1/L1Topo/L1TopoEvent/L1TopoEvent/DataArray.h b/Trigger/TrigT1/L1Topo/L1TopoEvent/L1TopoEvent/DataArray.h
index f36ce53a303d90af54d9abd6dde4721ad28f3e14..15f5448e9f765a568ee0e293c7ed800cf63c193d 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoEvent/L1TopoEvent/DataArray.h
+++ b/Trigger/TrigT1/L1Topo/L1TopoEvent/L1TopoEvent/DataArray.h
@@ -1,7 +1,9 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //  DataArray.h
 //  L1TopoEvent
 //  Created by Joerg Stelzer on 11/22/12.
-//  Copyright (c) 2012 Joerg Stelzer. All rights reserved.
 
 #ifndef __L1TopoEvent__DataArray__
 #define __L1TopoEvent__DataArray__
diff --git a/Trigger/TrigT1/L1Topo/L1TopoEvent/L1TopoEvent/DataArrayImpl.h b/Trigger/TrigT1/L1Topo/L1TopoEvent/L1TopoEvent/DataArrayImpl.h
index 462a2693d7299776cbadc3e46f40c7c120a5142d..f4d77f9a09b3cdc20edcbad6d3fc0df14ccfee6a 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoEvent/L1TopoEvent/DataArrayImpl.h
+++ b/Trigger/TrigT1/L1Topo/L1TopoEvent/L1TopoEvent/DataArrayImpl.h
@@ -1,7 +1,9 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //  DataArrayImpl.h
 //  L1TopoEvent
 //  Created by Joerg Stelzer on 12/10/12.
-//  Copyright (c) 2012 Joerg Stelzer. All rights reserved.
 
 #ifndef __L1TopoEvent__DataArrayImpl__
 #define __L1TopoEvent__DataArrayImpl__
diff --git a/Trigger/TrigT1/L1Topo/L1TopoEvent/L1TopoEvent/GenericTOB.h b/Trigger/TrigT1/L1Topo/L1TopoEvent/L1TopoEvent/GenericTOB.h
index 6b0492e4b7b41b40a4662760798965ed9b4d7149..0dfd7741903d626c013c298affe511a95c6930f1 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoEvent/L1TopoEvent/GenericTOB.h
+++ b/Trigger/TrigT1/L1Topo/L1TopoEvent/L1TopoEvent/GenericTOB.h
@@ -1,7 +1,9 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //  GeneralTOP.h
 //  TopoCore
 //  Created by Joerg Stelzer on 11/10/12.
-//  Copyright (c) 2012 Joerg Stelzer. All rights reserved.
 
 #ifndef __TopoCore__GeneralTOP__
 #define __TopoCore__GeneralTOP__
diff --git a/Trigger/TrigT1/L1Topo/L1TopoEvent/L1TopoEvent/Heap.h b/Trigger/TrigT1/L1Topo/L1TopoEvent/L1TopoEvent/Heap.h
index 33e7b4aca6874af3f902b31a2aa64eb6622f089f..107212c6150e4f78df507fe30557ca282da9c285 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoEvent/L1TopoEvent/Heap.h
+++ b/Trigger/TrigT1/L1Topo/L1TopoEvent/L1TopoEvent/Heap.h
@@ -1,7 +1,9 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //  Heap.h
 //  L1TopoEvent
 //  Created by Joerg Stelzer on 11/23/12.
-//  Copyright (c) 2012 Joerg Stelzer. All rights reserved.
 
 #ifndef __L1TopoEvent__Heap__
 #define __L1TopoEvent__Heap__
diff --git a/Trigger/TrigT1/L1Topo/L1TopoEvent/L1TopoEvent/InputTOBArray.h b/Trigger/TrigT1/L1Topo/L1TopoEvent/L1TopoEvent/InputTOBArray.h
index dbbbe375cc9ec26e4aba7823dd7ac3d8727abc57..81e8eddbeeb0e6da37de08c9dd60d3c82a65b6f8 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoEvent/L1TopoEvent/InputTOBArray.h
+++ b/Trigger/TrigT1/L1Topo/L1TopoEvent/L1TopoEvent/InputTOBArray.h
@@ -1,7 +1,9 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //  InputTOBArray.h
 //  TopoCore
 //  Created by Joerg Stelzer on 11/17/12.
-//  Copyright (c) 2012 Joerg Stelzer. All rights reserved.
 
 #ifndef __TopoCore__InputTOBArray__
 #define __TopoCore__InputTOBArray__
diff --git a/Trigger/TrigT1/L1Topo/L1TopoEvent/L1TopoEvent/JetTOB.h b/Trigger/TrigT1/L1Topo/L1TopoEvent/L1TopoEvent/JetTOB.h
index cb343689f74de0de39c3900c0f5e18eb7d0cbf28..b0cae30716865f725800925dda96cd1d57b482a7 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoEvent/L1TopoEvent/JetTOB.h
+++ b/Trigger/TrigT1/L1Topo/L1TopoEvent/L1TopoEvent/JetTOB.h
@@ -1,7 +1,9 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //  JetTOB.h
 //  TopoCore
 //  Created by Joerg Stelzer on 11/10/12.
-//  Copyright (c) 2012 Joerg Stelzer. All rights reserved.
 
 #ifndef __TopoCore__JetTOB__
 #define __TopoCore__JetTOB__
diff --git a/Trigger/TrigT1/L1Topo/L1TopoEvent/L1TopoEvent/JetTOBArray.h b/Trigger/TrigT1/L1Topo/L1TopoEvent/L1TopoEvent/JetTOBArray.h
index 5bbf4da779cb548569ecae10cbe35013c4296448..61949a4fda682ec14e8b131656615d53f5145542 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoEvent/L1TopoEvent/JetTOBArray.h
+++ b/Trigger/TrigT1/L1Topo/L1TopoEvent/L1TopoEvent/JetTOBArray.h
@@ -1,7 +1,9 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //  JetTOBArray.h
 //  TopoCore
 //  Created by Joerg Stelzer on 11/17/12.
-//  Copyright (c) 2012 Joerg Stelzer. All rights reserved.
 
 #ifndef __TopoCore__JetTOBArray__
 #define __TopoCore__JetTOBArray__
diff --git a/Trigger/TrigT1/L1Topo/L1TopoEvent/L1TopoEvent/LateMuonTOB.h b/Trigger/TrigT1/L1Topo/L1TopoEvent/L1TopoEvent/LateMuonTOB.h
index 1aa19694fba5d2d17cadee1d495963cd2fa7ae65..0283a86c6bbce62626830e4370fc9557a8db3b34 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoEvent/L1TopoEvent/LateMuonTOB.h
+++ b/Trigger/TrigT1/L1Topo/L1TopoEvent/L1TopoEvent/LateMuonTOB.h
@@ -1,7 +1,9 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //  LateMuonTOB.h 
 //  TopoCore
 //  Based on MuonTOB.h Created by Joerg Stelzer on 11/10/12.
-//  Copyright (c) 2012 Joerg Stelzer. All rights reserved.
 
 #ifndef __TopoCore__LateMuonTOB__
 #define __TopoCore__LateMuonTOB__
diff --git a/Trigger/TrigT1/L1Topo/L1TopoEvent/L1TopoEvent/LateMuonTOBArray.h b/Trigger/TrigT1/L1Topo/L1TopoEvent/L1TopoEvent/LateMuonTOBArray.h
index ed4315c3bd4c33ebc14445a858912bdb35943899..1680d91b6e16e6e8b4a257254658bd84514ff64c 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoEvent/L1TopoEvent/LateMuonTOBArray.h
+++ b/Trigger/TrigT1/L1Topo/L1TopoEvent/L1TopoEvent/LateMuonTOBArray.h
@@ -1,7 +1,9 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //  LateMuonTOBArray.h
 //  TopoCore
 //  Based on MuonTOBArray Created by Joerg Stelzer on 11/17/12.
-//  Copyright (c) 2012 Joerg Stelzer. All rights reserved.
 
 #ifndef __TopoCore__LateMuonTOBArray__
 #define __TopoCore__LateMuonTOBArray__
diff --git a/Trigger/TrigT1/L1Topo/L1TopoEvent/L1TopoEvent/MetTOB.h b/Trigger/TrigT1/L1Topo/L1TopoEvent/L1TopoEvent/MetTOB.h
index ee4da463643590ac78ba9127c3147f4de2667725..c500adff1b8a0b49f0540036cf6e809e48a2f40c 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoEvent/L1TopoEvent/MetTOB.h
+++ b/Trigger/TrigT1/L1Topo/L1TopoEvent/L1TopoEvent/MetTOB.h
@@ -1,7 +1,9 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //  MetTOB.h
 //  TopoCore
 //  Created by Joerg Stelzer on 11/10/12.
-//  Copyright (c) 2012 Joerg Stelzer. All rights reserved.
 
 #ifndef __TopoCore__MetTOB__
 #define __TopoCore__MetTOB__
diff --git a/Trigger/TrigT1/L1Topo/L1TopoEvent/L1TopoEvent/MetTOBArray.h b/Trigger/TrigT1/L1Topo/L1TopoEvent/L1TopoEvent/MetTOBArray.h
index d2a2e86241666404a2210fa40403fb9eddc73feb..1c4ede29fad3fbca7e8013c7eb91f55409c9329e 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoEvent/L1TopoEvent/MetTOBArray.h
+++ b/Trigger/TrigT1/L1Topo/L1TopoEvent/L1TopoEvent/MetTOBArray.h
@@ -1,7 +1,9 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //  MetTOBArray.h
 //  TopoCore
 //  Created by Joerg Stelzer on 11/17/12.
-//  Copyright (c) 2012 Joerg Stelzer. All rights reserved.
 
 #ifndef __TopoCore__MetTOBArray__
 #define __TopoCore__MetTOBArray__
diff --git a/Trigger/TrigT1/L1Topo/L1TopoEvent/L1TopoEvent/MuonNextBCTOB.h b/Trigger/TrigT1/L1Topo/L1TopoEvent/L1TopoEvent/MuonNextBCTOB.h
index dff4fa164fb2dd0e85bb138d5b4c56cb1c019c05..62b18d7b0778ed11f86d1eb761bc1c6d05f199f8 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoEvent/L1TopoEvent/MuonNextBCTOB.h
+++ b/Trigger/TrigT1/L1Topo/L1TopoEvent/L1TopoEvent/MuonNextBCTOB.h
@@ -1,7 +1,9 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //  MuonNextBCTOB.h
 //  TopoCore
 //  Baesd on MuonTOB.h Created by Joerg Stelzer on 11/10/12.
-//  Copyright (c) 2012 Joerg Stelzer. All rights reserved.
 
 #ifndef __TopoCore__MuonNextBCTOB__
 #define __TopoCore__MuonNextBCTOB__
diff --git a/Trigger/TrigT1/L1Topo/L1TopoEvent/L1TopoEvent/MuonNextBCTOBArray.h b/Trigger/TrigT1/L1Topo/L1TopoEvent/L1TopoEvent/MuonNextBCTOBArray.h
index ccc5bd8a13dd0274a69694401a0a94647a996072..0da4ea08495ab4ae1a7116a339382c6f9a7efc74 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoEvent/L1TopoEvent/MuonNextBCTOBArray.h
+++ b/Trigger/TrigT1/L1Topo/L1TopoEvent/L1TopoEvent/MuonNextBCTOBArray.h
@@ -1,7 +1,9 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //  LateMuonTOBArray.h
 //  TopoCore
 //  Based on MuonTOBArray Created by Joerg Stelzer on 11/17/12.
-//  Copyright (c) 2012 Joerg Stelzer. All rights reserved.
 
 #ifndef __TopoCore__MuonNextBCTOBArray__
 #define __TopoCore__MuonNextBCTOBArray__
diff --git a/Trigger/TrigT1/L1Topo/L1TopoEvent/L1TopoEvent/MuonTOB.h b/Trigger/TrigT1/L1Topo/L1TopoEvent/L1TopoEvent/MuonTOB.h
index 3cd7d8005bebe89b40e70edbb1612c0b24f082dd..185c438ece0c3dea974be92fc0ddf4d07b9b8797 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoEvent/L1TopoEvent/MuonTOB.h
+++ b/Trigger/TrigT1/L1Topo/L1TopoEvent/L1TopoEvent/MuonTOB.h
@@ -1,7 +1,9 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //  MuonTOB.h
 //  TopoCore
 //  Created by Joerg Stelzer on 11/10/12.
-//  Copyright (c) 2012 Joerg Stelzer. All rights reserved.
 
 #ifndef __TopoCore__MuonTOB__
 #define __TopoCore__MuonTOB__
diff --git a/Trigger/TrigT1/L1Topo/L1TopoEvent/L1TopoEvent/MuonTOBArray.h b/Trigger/TrigT1/L1Topo/L1TopoEvent/L1TopoEvent/MuonTOBArray.h
index 55f7fb08be3e2af904897baefcbeb8f38a51d536..7684a30276af58b5eb9d3f28c38c0242b16d03df 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoEvent/L1TopoEvent/MuonTOBArray.h
+++ b/Trigger/TrigT1/L1Topo/L1TopoEvent/L1TopoEvent/MuonTOBArray.h
@@ -1,7 +1,9 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //  MuonTOBArray.h
 //  TopoCore
 //  Created by Joerg Stelzer on 11/17/12.
-//  Copyright (c) 2012 Joerg Stelzer. All rights reserved.
 
 #ifndef __TopoCore__MuonTOBArray__
 #define __TopoCore__MuonTOBArray__
diff --git a/Trigger/TrigT1/L1Topo/L1TopoEvent/L1TopoEvent/TOBArray.h b/Trigger/TrigT1/L1Topo/L1TopoEvent/L1TopoEvent/TOBArray.h
index bacd18fc6700f1fed78d13e20d6ef1dc5ab3bc50..5ee72dc371f51f078d9b2be2a8f3ca1e4d6ab04d 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoEvent/L1TopoEvent/TOBArray.h
+++ b/Trigger/TrigT1/L1Topo/L1TopoEvent/L1TopoEvent/TOBArray.h
@@ -1,7 +1,9 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //  TOBArray.h
 //  TopoCore
 //  Created by Joerg Stelzer on 11/17/12.
-//  Copyright (c) 2012 Joerg Stelzer. All rights reserved.
 
 #ifndef __TopoCore__TOBArray__
 #define __TopoCore__TOBArray__
diff --git a/Trigger/TrigT1/L1Topo/L1TopoEvent/L1TopoEvent/TopoInputEvent.h b/Trigger/TrigT1/L1Topo/L1TopoEvent/L1TopoEvent/TopoInputEvent.h
index 6f8f7285cf65fa3daf238acb2e85c80123783486..d2f12ff157a49ff375d44d2ae069bacfe9aa4281 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoEvent/L1TopoEvent/TopoInputEvent.h
+++ b/Trigger/TrigT1/L1Topo/L1TopoEvent/L1TopoEvent/TopoInputEvent.h
@@ -1,7 +1,9 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //  TopoInputEvent.h
 //  L1TopoEvent
 //  Created by Joerg Stelzer on 11/21/12.
-//  Copyright (c) 2012 Joerg Stelzer. All rights reserved.
 
 #ifndef __L1TopoEvent__TopoInputEvent__
 #define __L1TopoEvent__TopoInputEvent__
diff --git a/Trigger/TrigT1/L1Topo/L1TopoEvent/Root/BaseTOB.cxx b/Trigger/TrigT1/L1Topo/L1TopoEvent/Root/BaseTOB.cxx
index 8168e3eb8914f99b43d2ec896f5f115c6adb6223..9ca9585912dac84bd1788f48f8143c2aaccc37a7 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoEvent/Root/BaseTOB.cxx
+++ b/Trigger/TrigT1/L1Topo/L1TopoEvent/Root/BaseTOB.cxx
@@ -1,7 +1,9 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //  BaseTOB.cxx
 //  TopoCore
 //  Created by Joerg Stelzer on 11/10/12.
-//  Copyright (c) 2012 Joerg Stelzer. All rights reserved.
 
 #include "L1TopoEvent/BaseTOB.h"
 #include "L1TopoCommon/Exception.h"
diff --git a/Trigger/TrigT1/L1Topo/L1TopoEvent/Root/ClusterTOB.cxx b/Trigger/TrigT1/L1Topo/L1TopoEvent/Root/ClusterTOB.cxx
index 2b12e7d141e3779f1b9bdf18d1fc8899488dac21..8341ff8ddc681e7cb02e11371631d31a465cf028 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoEvent/Root/ClusterTOB.cxx
+++ b/Trigger/TrigT1/L1Topo/L1TopoEvent/Root/ClusterTOB.cxx
@@ -1,7 +1,9 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //  ClusterTOB.cpp
 //  TopoCore
 //  Created by Joerg Stelzer on 11/10/12.
-//  Copyright (c) 2012 Joerg Stelzer. All rights reserved.
 
 #include "L1TopoEvent/ClusterTOB.h"
 
diff --git a/Trigger/TrigT1/L1Topo/L1TopoEvent/Root/ClusterTOBArray.cxx b/Trigger/TrigT1/L1Topo/L1TopoEvent/Root/ClusterTOBArray.cxx
index c4a6bda7237237cf4ede936ad765ea82d30e082b..3adae3dd652979e6b2b11900115d660ddbc9d6c0 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoEvent/Root/ClusterTOBArray.cxx
+++ b/Trigger/TrigT1/L1Topo/L1TopoEvent/Root/ClusterTOBArray.cxx
@@ -1,7 +1,9 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //  ClusterTOBArray.cxx
 //  TopoCore
 //  Created by Joerg Stelzer on 11/17/12.
-//  Copyright (c) 2012 Joerg Stelzer. All rights reserved.
 
 #include "L1TopoEvent/ClusterTOBArray.h"
 
diff --git a/Trigger/TrigT1/L1Topo/L1TopoEvent/Root/CompositeTOB.cxx b/Trigger/TrigT1/L1Topo/L1TopoEvent/Root/CompositeTOB.cxx
index f81eda6f918ff42b9c91baf603279bfd1455c9fa..da8b28e93687353dba4c454a46bf93d99abe5654 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoEvent/Root/CompositeTOB.cxx
+++ b/Trigger/TrigT1/L1Topo/L1TopoEvent/Root/CompositeTOB.cxx
@@ -1,7 +1,9 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //  CompositeTOB.cxx
 //  TopoCore
 //  Created by Joerg Stelzer on 11/18/12.
-//  Copyright (c) 2012 Joerg Stelzer. All rights reserved.
 
 #include "L1TopoEvent/CompositeTOB.h"
 
diff --git a/Trigger/TrigT1/L1Topo/L1TopoEvent/Root/DataArray.cxx b/Trigger/TrigT1/L1Topo/L1TopoEvent/Root/DataArray.cxx
index bd9b9bf0b049995f17a5785b945276f9904b9372..976706206d6f5ac1df52943e4dbce9177841a618 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoEvent/Root/DataArray.cxx
+++ b/Trigger/TrigT1/L1Topo/L1TopoEvent/Root/DataArray.cxx
@@ -1,7 +1,9 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //  DataArray.cxx
 //  L1TopoEvent
 //  Created by Joerg Stelzer on 11/22/12.
-//  Copyright (c) 2012 Joerg Stelzer. All rights reserved.
 
 #include "L1TopoEvent/DataArray.h"
 
diff --git a/Trigger/TrigT1/L1Topo/L1TopoEvent/Root/DataArrayImpl.cxx b/Trigger/TrigT1/L1Topo/L1TopoEvent/Root/DataArrayImpl.cxx
index d524efc8691c8db8cfd0c0682c7e621493dbf4b3..564bcfaeccfd07523bead0b5ffd77f65cfd3194b 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoEvent/Root/DataArrayImpl.cxx
+++ b/Trigger/TrigT1/L1Topo/L1TopoEvent/Root/DataArrayImpl.cxx
@@ -1,7 +1,9 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //  DataArrayImpl.cxx
 //  L1TopoEvent
 //  Created by Joerg Stelzer on 12/10/12.
-//  Copyright (c) 2012 Joerg Stelzer. All rights reserved.
 
 #include "L1TopoEvent/DataArrayImpl.h"
 
diff --git a/Trigger/TrigT1/L1Topo/L1TopoEvent/Root/GenericTOB.cxx b/Trigger/TrigT1/L1Topo/L1TopoEvent/Root/GenericTOB.cxx
index 21c1d5a741501a0c6aba6b7270f1978599916fd0..cb21cd0718abead6b842b63b675f18d202c93d61 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoEvent/Root/GenericTOB.cxx
+++ b/Trigger/TrigT1/L1Topo/L1TopoEvent/Root/GenericTOB.cxx
@@ -1,7 +1,9 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //  GeneralTOP.cpp
 //  TopoCore
 //  Created by Joerg Stelzer on 11/10/12.
-//  Copyright (c) 2012 Joerg Stelzer. All rights reserved.
 
 #include "L1TopoEvent/GenericTOB.h"
 
diff --git a/Trigger/TrigT1/L1Topo/L1TopoEvent/Root/Heap.cxx b/Trigger/TrigT1/L1Topo/L1TopoEvent/Root/Heap.cxx
index b7dba285c91c27726b1340b54e4fda28315dfe0c..ee62c087b68825f1341056dca0ba734c25a082a6 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoEvent/Root/Heap.cxx
+++ b/Trigger/TrigT1/L1Topo/L1TopoEvent/Root/Heap.cxx
@@ -1,7 +1,9 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //  Heap.cxx
 //  L1TopoEvent
 //  Created by Joerg Stelzer on 11/23/12.
-//  Copyright (c) 2012 Joerg Stelzer. All rights reserved.
 
 #include "L1TopoEvent/Heap.h"
 
diff --git a/Trigger/TrigT1/L1Topo/L1TopoEvent/Root/InputTOBArray.cxx b/Trigger/TrigT1/L1Topo/L1TopoEvent/Root/InputTOBArray.cxx
index 8022e03d5f4c96c911d9b52fc8a0f6009560968f..4e3f7b817eadf457da3a40ef5910ca61501075c9 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoEvent/Root/InputTOBArray.cxx
+++ b/Trigger/TrigT1/L1Topo/L1TopoEvent/Root/InputTOBArray.cxx
@@ -1,7 +1,9 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //  InputTOBArray.cxx
 //  TopoCore
 //  Created by Joerg Stelzer on 11/17/12.
-//  Copyright (c) 2012 Joerg Stelzer. All rights reserved.
 
 #include "L1TopoEvent/InputTOBArray.h"
 
diff --git a/Trigger/TrigT1/L1Topo/L1TopoEvent/Root/JetTOB.cxx b/Trigger/TrigT1/L1Topo/L1TopoEvent/Root/JetTOB.cxx
index 13b6db0b2e0accf058526b5572a6bf5bc6448f53..ab6de2a7c58677351ba207056d1274106b868d5f 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoEvent/Root/JetTOB.cxx
+++ b/Trigger/TrigT1/L1Topo/L1TopoEvent/Root/JetTOB.cxx
@@ -1,7 +1,9 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //  JetTOB.cpp
 //  TopoCore
 //  Created by Joerg Stelzer on 11/10/12.
-//  Copyright (c) 2012 Joerg Stelzer. All rights reserved.
 
 #include "L1TopoEvent/JetTOB.h"
 //#include "L1TopoEvent/GenericTOB.h"
diff --git a/Trigger/TrigT1/L1Topo/L1TopoEvent/Root/JetTOBArray.cxx b/Trigger/TrigT1/L1Topo/L1TopoEvent/Root/JetTOBArray.cxx
index 0774889870e502e158e45b0c97d4b7e0fef93115..77e43a9c457c4583db0448dec5dacf10bed30de9 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoEvent/Root/JetTOBArray.cxx
+++ b/Trigger/TrigT1/L1Topo/L1TopoEvent/Root/JetTOBArray.cxx
@@ -1,7 +1,9 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //  JetTOBArray.cxx
 //  TopoCore
 //  Created by Joerg Stelzer on 11/17/12.
-//  Copyright (c) 2012 Joerg Stelzer. All rights reserved.
 // cw added
 
 #include "L1TopoEvent/JetTOBArray.h"
diff --git a/Trigger/TrigT1/L1Topo/L1TopoEvent/Root/LateMuonTOB.cxx b/Trigger/TrigT1/L1Topo/L1TopoEvent/Root/LateMuonTOB.cxx
index f0b52ebe84f9189719a2b676abf4180b3aad1a5f..72f6568fe9e8973df690f6afb5f3d0e41a69b1f8 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoEvent/Root/LateMuonTOB.cxx
+++ b/Trigger/TrigT1/L1Topo/L1TopoEvent/Root/LateMuonTOB.cxx
@@ -1,7 +1,9 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //  LateMuonTOB.cpp
 //  TopoCore
 //  Based on MuonTOB created by Joerg Stelzer on 11/10/12.
-//  Copyright (c) 2012 Joerg Stelzer. All rights reserved.
 
 #include "L1TopoEvent/LateMuonTOB.h"
 
diff --git a/Trigger/TrigT1/L1Topo/L1TopoEvent/Root/LateMuonTOBArray.cxx b/Trigger/TrigT1/L1Topo/L1TopoEvent/Root/LateMuonTOBArray.cxx
index b1b314f95372ea0e614d2187137635462153fe4d..949fec961ddd22ff3986a30adc58a78562f1ed07 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoEvent/Root/LateMuonTOBArray.cxx
+++ b/Trigger/TrigT1/L1Topo/L1TopoEvent/Root/LateMuonTOBArray.cxx
@@ -1,7 +1,9 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //  LateMuonTOBArray.cxx
 //  TopoCore
 //  Based on MuonTOBArray created by Joerg Stelzer on 11/17/12.
-//  Copyright (c) 2012 Joerg Stelzer. All rights reserved.
 
 #include "L1TopoEvent/LateMuonTOBArray.h"
 
diff --git a/Trigger/TrigT1/L1Topo/L1TopoEvent/Root/MetTOB.cxx b/Trigger/TrigT1/L1Topo/L1TopoEvent/Root/MetTOB.cxx
index 0613d8c38a5fec5b0ce8c54d97f5aa5f1f6782f5..6719ac5466bc88aa152a902dd77b692d2a614d78 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoEvent/Root/MetTOB.cxx
+++ b/Trigger/TrigT1/L1Topo/L1TopoEvent/Root/MetTOB.cxx
@@ -1,7 +1,9 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //  MetTOB.cpp
 //  TopoCore
 //  Created by Joerg Stelzer on 11/10/12.
-//  Copyright (c) 2012 Joerg Stelzer. All rights reserved.
 
 #include "L1TopoEvent/MetTOB.h"
 
diff --git a/Trigger/TrigT1/L1Topo/L1TopoEvent/Root/MetTOBArray.cxx b/Trigger/TrigT1/L1Topo/L1TopoEvent/Root/MetTOBArray.cxx
index 764892130b7fafee9d473036364c36e76447d2cb..648430b3eb84824a0180949f9c0897e1c0d325ef 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoEvent/Root/MetTOBArray.cxx
+++ b/Trigger/TrigT1/L1Topo/L1TopoEvent/Root/MetTOBArray.cxx
@@ -1,7 +1,9 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //  MetTOBArray.cxx
 //  TopoCore
 //  Created by Joerg Stelzer on 11/17/12.
-//  Copyright (c) 2012 Joerg Stelzer. All rights reserved.
 
 #include "L1TopoEvent/MetTOBArray.h"
 
diff --git a/Trigger/TrigT1/L1Topo/L1TopoEvent/Root/MuonNextBCTOB.cxx b/Trigger/TrigT1/L1Topo/L1TopoEvent/Root/MuonNextBCTOB.cxx
index a5e7795be418d964b168ca5ff2420dfb21eb33c3..c532ced9d4baf60662f5788aebaf8013f4470fcd 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoEvent/Root/MuonNextBCTOB.cxx
+++ b/Trigger/TrigT1/L1Topo/L1TopoEvent/Root/MuonNextBCTOB.cxx
@@ -1,7 +1,9 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //  MuonNextBCTOB.cpp
 //  TopoCore
 //  Based on MuonTOB Created by Joerg Stelzer on 11/10/12.
-//  Copyright (c) 2012 Joerg Stelzer. All rights reserved.
 
 #include "L1TopoEvent/MuonNextBCTOB.h"
 
diff --git a/Trigger/TrigT1/L1Topo/L1TopoEvent/Root/MuonNextBCTOBArray.cxx b/Trigger/TrigT1/L1Topo/L1TopoEvent/Root/MuonNextBCTOBArray.cxx
index 0de6bf13850f7cc135371cc82159058f9544aa7c..721866357d1def3ba0c8bb6d94f138844e60163c 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoEvent/Root/MuonNextBCTOBArray.cxx
+++ b/Trigger/TrigT1/L1Topo/L1TopoEvent/Root/MuonNextBCTOBArray.cxx
@@ -1,7 +1,9 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //  MuonNextBCTOBArray.cxx
 //  TopoCore
 //  Based on MuonTOBArray Created by Joerg Stelzer on 11/17/12.
-//  Copyright (c) 2012 Joerg Stelzer. All rights reserved.
 
 #include "L1TopoEvent/MuonNextBCTOBArray.h"
 
diff --git a/Trigger/TrigT1/L1Topo/L1TopoEvent/Root/MuonTOB.cxx b/Trigger/TrigT1/L1Topo/L1TopoEvent/Root/MuonTOB.cxx
index 8ba498e8a715aa580cf92f67cbfadba23b89a91d..2c32999924322ac02c062de79a627e75fabb1765 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoEvent/Root/MuonTOB.cxx
+++ b/Trigger/TrigT1/L1Topo/L1TopoEvent/Root/MuonTOB.cxx
@@ -1,7 +1,9 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //  MuonTOB.cpp
 //  TopoCore
 //  Created by Joerg Stelzer on 11/10/12.
-//  Copyright (c) 2012 Joerg Stelzer. All rights reserved.
 
 #include "L1TopoEvent/MuonTOB.h"
 
diff --git a/Trigger/TrigT1/L1Topo/L1TopoEvent/Root/MuonTOBArray.cxx b/Trigger/TrigT1/L1Topo/L1TopoEvent/Root/MuonTOBArray.cxx
index 4dfd04211de6248358f4081323d417d9dfe91e8b..f2ba8067393dc645c1dffd7e3b96ca63bbc5532a 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoEvent/Root/MuonTOBArray.cxx
+++ b/Trigger/TrigT1/L1Topo/L1TopoEvent/Root/MuonTOBArray.cxx
@@ -1,7 +1,9 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //  MuonTOBArray.cxx
 //  TopoCore
 //  Created by Joerg Stelzer on 11/17/12.
-//  Copyright (c) 2012 Joerg Stelzer. All rights reserved.
 
 #include "L1TopoEvent/MuonTOBArray.h"
 
diff --git a/Trigger/TrigT1/L1Topo/L1TopoEvent/Root/TOBArray.cxx b/Trigger/TrigT1/L1Topo/L1TopoEvent/Root/TOBArray.cxx
index bd2c119998f987c884c343ea4cf8ed1a868ce745..44b2d7b608206462ee27569e1ad5f40e0b08c796 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoEvent/Root/TOBArray.cxx
+++ b/Trigger/TrigT1/L1Topo/L1TopoEvent/Root/TOBArray.cxx
@@ -1,7 +1,9 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //  TOBArray.cxx
 //  TopoCore
 //  Created by Joerg Stelzer on 11/17/12.
-//  Copyright (c) 2012 Joerg Stelzer. All rights reserved.
 
 #include "L1TopoEvent/TOBArray.h"
 #include "L1TopoEvent/CompositeTOB.h"
diff --git a/Trigger/TrigT1/L1Topo/L1TopoEvent/Root/TopoInputEvent.cxx b/Trigger/TrigT1/L1Topo/L1TopoEvent/Root/TopoInputEvent.cxx
index 462b39d5a339bff576fdc27e2be8793c2f6a78d1..561c0b43bef736efb9e17b2ad67f327def708a79 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoEvent/Root/TopoInputEvent.cxx
+++ b/Trigger/TrigT1/L1Topo/L1TopoEvent/Root/TopoInputEvent.cxx
@@ -1,7 +1,9 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //  TopoInputEvent.cxx
 //  L1TopoEvent
 //  Created by Joerg Stelzer on 11/21/12.
-//  Copyright (c) 2012 Joerg Stelzer. All rights reserved.
 
 #include "L1TopoEvent/TopoInputEvent.h"
 #include <fstream>
diff --git a/Trigger/TrigT1/L1Topo/L1TopoInterfaces/L1TopoInterfaces/AlgFactory.h b/Trigger/TrigT1/L1Topo/L1TopoInterfaces/L1TopoInterfaces/AlgFactory.h
index 0cb0f32abe46fb8ed8e6560c316b5e5c2d5a7f55..e64e78851abfffffee7d55ca1ab069aa8f40b31a 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoInterfaces/L1TopoInterfaces/AlgFactory.h
+++ b/Trigger/TrigT1/L1Topo/L1TopoInterfaces/L1TopoInterfaces/AlgFactory.h
@@ -1,7 +1,9 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //  AlgFactory.h
 //  L1TopoCoreSimulation
 //  Created by Joerg Stelzer on 11/20/12.
-//  Copyright (c) 2012 Joerg Stelzer. All rights reserved.
 
 #ifndef __L1TopoCoreSimulation__AlgFactory__
 #define __L1TopoCoreSimulation__AlgFactory__
diff --git a/Trigger/TrigT1/L1Topo/L1TopoInterfaces/L1TopoInterfaces/ConfigurableAlg.h b/Trigger/TrigT1/L1Topo/L1TopoInterfaces/L1TopoInterfaces/ConfigurableAlg.h
index 16a1836d67cc14f374e24f3809c4b8543c4b1411..83f840c8bf8ab0b16422f2c2f94da18309254b6a 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoInterfaces/L1TopoInterfaces/ConfigurableAlg.h
+++ b/Trigger/TrigT1/L1Topo/L1TopoInterfaces/L1TopoInterfaces/ConfigurableAlg.h
@@ -1,7 +1,9 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //  BaseTOBoAlg.h
 //  TopoCore
 //  Created by Joerg Stelzer on 11/10/12.
-//  Copyright (c) 2012 Joerg Stelzer. All rights reserved.
 
 #ifndef TCS_ConfigurableAlg
 #define TCS_ConfigurableAlg
diff --git a/Trigger/TrigT1/L1Topo/L1TopoInterfaces/L1TopoInterfaces/Decision.h b/Trigger/TrigT1/L1Topo/L1TopoInterfaces/L1TopoInterfaces/Decision.h
index 8909873bcf0707b3c8bd62eea7141d89ff88a1cc..24bcc6160607f8c1c4a3f6447a3f2e8a1cbcc631 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoInterfaces/L1TopoInterfaces/Decision.h
+++ b/Trigger/TrigT1/L1Topo/L1TopoInterfaces/L1TopoInterfaces/Decision.h
@@ -1,7 +1,9 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //  Decision.h
 //  TopoCore
 //  Created by Joerg Stelzer on 11/16/12.
-//  Copyright (c) 2012 Joerg Stelzer. All rights reserved.
 
 #ifndef __TopoCore__Decision__
 #define __TopoCore__Decision__
diff --git a/Trigger/TrigT1/L1Topo/L1TopoInterfaces/L1TopoInterfaces/DecisionAlg.h b/Trigger/TrigT1/L1Topo/L1TopoInterfaces/L1TopoInterfaces/DecisionAlg.h
index 82af27af3d6b7e44cc76e5cc80da59755a1f54f7..ca75e662c2041965b8473c49cffa0eb5774b8faa 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoInterfaces/L1TopoInterfaces/DecisionAlg.h
+++ b/Trigger/TrigT1/L1Topo/L1TopoInterfaces/L1TopoInterfaces/DecisionAlg.h
@@ -1,7 +1,9 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //  DecisionAlg.h
 //  TopoCore
 //  Created by Joerg Stelzer on 11/15/12.
-//  Copyright (c) 2012 Joerg Stelzer. All rights reserved.
 
 #ifndef TCS_DecisionAlg
 #define TCS_DecisionAlg
diff --git a/Trigger/TrigT1/L1Topo/L1TopoInterfaces/L1TopoInterfaces/IL1TopoHistSvc.h b/Trigger/TrigT1/L1Topo/L1TopoInterfaces/L1TopoInterfaces/IL1TopoHistSvc.h
index 8ddc8060299e3eb71e387f91c0bba4c28b5840b4..41a70676b0fce20d7df8cd7a36d4dcbe7b4a84c6 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoInterfaces/L1TopoInterfaces/IL1TopoHistSvc.h
+++ b/Trigger/TrigT1/L1Topo/L1TopoInterfaces/L1TopoInterfaces/IL1TopoHistSvc.h
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 #ifndef IL1TOPOHISTSVC_H
 #define IL1TOPOHISTSVC_H
 
diff --git a/Trigger/TrigT1/L1Topo/L1TopoInterfaces/L1TopoInterfaces/Parameter.h b/Trigger/TrigT1/L1Topo/L1TopoInterfaces/L1TopoInterfaces/Parameter.h
index 3664b16f96a60f4b900254c4df0d6f0e3c344e78..5379ee1d4c3eea8b41979bf2988abeffef2cbc83 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoInterfaces/L1TopoInterfaces/Parameter.h
+++ b/Trigger/TrigT1/L1Topo/L1TopoInterfaces/L1TopoInterfaces/Parameter.h
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 /*  Parameter.h
  *  L1TopoInterfaces
  *
diff --git a/Trigger/TrigT1/L1Topo/L1TopoInterfaces/L1TopoInterfaces/ParameterSpace.h b/Trigger/TrigT1/L1Topo/L1TopoInterfaces/L1TopoInterfaces/ParameterSpace.h
index e5f74cab905bf74ed91b2e2c510270309454652a..ae7218aae766aade7f7608c8d909132346c13db9 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoInterfaces/L1TopoInterfaces/ParameterSpace.h
+++ b/Trigger/TrigT1/L1Topo/L1TopoInterfaces/L1TopoInterfaces/ParameterSpace.h
@@ -1,7 +1,9 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //  ParameterSpace.h
 //  TopoCore
 //  Created by Joerg Stelzer on 11/18/12.
-//  Copyright (c) 2012 Joerg Stelzer. All rights reserved.
 
 #ifndef __TopoCore__ParameterSpace__
 #define __TopoCore__ParameterSpace__
diff --git a/Trigger/TrigT1/L1Topo/L1TopoInterfaces/L1TopoInterfaces/SortingAlg.h b/Trigger/TrigT1/L1Topo/L1TopoInterfaces/L1TopoInterfaces/SortingAlg.h
index abd2571b9e3ad0640ae068de8a30d9172d1545aa..8bd78127048222462e8d3d21777eedab5f50fe18 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoInterfaces/L1TopoInterfaces/SortingAlg.h
+++ b/Trigger/TrigT1/L1Topo/L1TopoInterfaces/L1TopoInterfaces/SortingAlg.h
@@ -1,7 +1,9 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //  SortingAlg.h
 //  TopoCore
 //  Created by Joerg Stelzer on 11/16/12.
-//  Copyright (c) 2012 Joerg Stelzer. All rights reserved.
 
 #ifndef TCS_SortingAlg
 #define TCS_SortingAlg
diff --git a/Trigger/TrigT1/L1Topo/L1TopoInterfaces/Root/AlgFactory.cxx b/Trigger/TrigT1/L1Topo/L1TopoInterfaces/Root/AlgFactory.cxx
index 2e27e0460b85f53a0a14f5adb56a6d07d4ec08bb..1aace1a17906e2529225f66aa7eb5a6095a02224 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoInterfaces/Root/AlgFactory.cxx
+++ b/Trigger/TrigT1/L1Topo/L1TopoInterfaces/Root/AlgFactory.cxx
@@ -1,7 +1,9 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //  AlgFactory.cxx
 //  L1TopoCoreSimulation
 //  Created by Joerg Stelzer on 11/20/12.
-//  Copyright (c) 2012 Joerg Stelzer. All rights reserved.
 
 #include "L1TopoInterfaces/AlgFactory.h"
 #include "L1TopoInterfaces/ConfigurableAlg.h"
diff --git a/Trigger/TrigT1/L1Topo/L1TopoInterfaces/Root/ConfigurableAlg.cxx b/Trigger/TrigT1/L1Topo/L1TopoInterfaces/Root/ConfigurableAlg.cxx
index b2c6e0cf5b320511d726622ce7ac9dc2140b75bd..44776e990438296d1e0586d577abdf1838fada6f 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoInterfaces/Root/ConfigurableAlg.cxx
+++ b/Trigger/TrigT1/L1Topo/L1TopoInterfaces/Root/ConfigurableAlg.cxx
@@ -1,7 +1,9 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //  BaseTOBoAlg.cpp
 //  TopoCore
 //  Created by Joerg Stelzer on 11/10/12.
-//  Copyright (c) 2012 Joerg Stelzer. All rights reserved.
 
 #include "L1TopoInterfaces/ConfigurableAlg.h"
 #include "L1TopoCommon/Exception.h"
diff --git a/Trigger/TrigT1/L1Topo/L1TopoInterfaces/Root/Decision.cxx b/Trigger/TrigT1/L1Topo/L1TopoInterfaces/Root/Decision.cxx
index fb670e6ffe57da3b3a8a6e80da17f0a0307ecac5..9456c14297bac01bb5747b21f960a067c5fd2629 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoInterfaces/Root/Decision.cxx
+++ b/Trigger/TrigT1/L1Topo/L1TopoInterfaces/Root/Decision.cxx
@@ -1,7 +1,9 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //  Decision.cxx
 //  TopoCore
 //  Created by Joerg Stelzer on 11/16/12.
-//  Copyright (c) 2012 Joerg Stelzer. All rights reserved.
 
 #include "L1TopoInterfaces/Decision.h"
 #include "L1TopoCommon/Exception.h"
diff --git a/Trigger/TrigT1/L1Topo/L1TopoInterfaces/Root/DecisionAlg.cxx b/Trigger/TrigT1/L1Topo/L1TopoInterfaces/Root/DecisionAlg.cxx
index 30c8837cb5d0c6175b5dd3249864a9d0442ce355..75883ca62d57755680c69cd6bc6979773ecf181a 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoInterfaces/Root/DecisionAlg.cxx
+++ b/Trigger/TrigT1/L1Topo/L1TopoInterfaces/Root/DecisionAlg.cxx
@@ -1,7 +1,9 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //  DecisionAlg.cxx
 //  TopoCore
 //  Created by Joerg Stelzer on 11/15/12.
-//  Copyright (c) 2012 Joerg Stelzer. All rights reserved.
 
 #include "L1TopoInterfaces/DecisionAlg.h"
 
diff --git a/Trigger/TrigT1/L1Topo/L1TopoInterfaces/Root/Parameter.cxx b/Trigger/TrigT1/L1Topo/L1TopoInterfaces/Root/Parameter.cxx
index 6295427b775a0e4d8f1e82efd97e30b32757a81a..28d76066425a3cfe870b384951c36ea095cf2b7b 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoInterfaces/Root/Parameter.cxx
+++ b/Trigger/TrigT1/L1Topo/L1TopoInterfaces/Root/Parameter.cxx
@@ -1,7 +1,9 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //  Parameter.cxx
 //  TopoCore
 //  Created by Joerg Stelzer on 11/18/12.
-//  Copyright (c) 2012 Joerg Stelzer. All rights reserved.
 
 #include "L1TopoInterfaces/Parameter.h"
 
diff --git a/Trigger/TrigT1/L1Topo/L1TopoInterfaces/Root/ParameterSpace.cxx b/Trigger/TrigT1/L1Topo/L1TopoInterfaces/Root/ParameterSpace.cxx
index 17e6acb78c94c4842f2324dbb5ae8560bd9caa3f..c70162b18dd66082c3b818f608cd0b9c05aa7945 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoInterfaces/Root/ParameterSpace.cxx
+++ b/Trigger/TrigT1/L1Topo/L1TopoInterfaces/Root/ParameterSpace.cxx
@@ -1,7 +1,9 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //  ParameterSpace.cxx
 //  TopoCore
 //  Created by Joerg Stelzer on 11/18/12.
-//  Copyright (c) 2012 Joerg Stelzer. All rights reserved.
 
 #include "L1TopoInterfaces/ParameterSpace.h"
 #include "L1TopoCommon/Exception.h"
diff --git a/Trigger/TrigT1/L1Topo/L1TopoInterfaces/Root/SortingAlg.cxx b/Trigger/TrigT1/L1Topo/L1TopoInterfaces/Root/SortingAlg.cxx
index d9d862f167e701c6884dbdceb707f566fad3553d..f1a038cf4eaf401e377683c84be70807de56710b 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoInterfaces/Root/SortingAlg.cxx
+++ b/Trigger/TrigT1/L1Topo/L1TopoInterfaces/Root/SortingAlg.cxx
@@ -1,7 +1,9 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //  SortingAlg.cxx
 //  TopoCore
 //  Created by Joerg Stelzer on 11/16/12.
-//  Copyright (c) 2012 Joerg Stelzer. All rights reserved.
 
 #include "L1TopoInterfaces/SortingAlg.h"
 
diff --git a/Trigger/TrigT1/L1Topo/L1TopoSimulationUtils/L1TopoSimulationUtils/Hyperbolic.h b/Trigger/TrigT1/L1Topo/L1TopoSimulationUtils/L1TopoSimulationUtils/Hyperbolic.h
index 68e985424fcae20655371fe61f14174539a7e43d..926d789e1a52eff3727a2755d9c1791b86144d75 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoSimulationUtils/L1TopoSimulationUtils/Hyperbolic.h
+++ b/Trigger/TrigT1/L1Topo/L1TopoSimulationUtils/L1TopoSimulationUtils/Hyperbolic.h
@@ -1,8 +1,10 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 /*********************************
  * Hyperbolic.h
  * Created by Ignacio Aracena June 2015
  * <ignacio.aracena@cern.ch> 
- * Copyright (c) 2015 Ignacio Aracena. All rights reserved.
  *
  * @brief Lookup table for hyperbolic functions.
  *
diff --git a/Trigger/TrigT1/L1Topo/L1TopoSimulationUtils/L1TopoSimulationUtils/L1TopoDataTypes.h b/Trigger/TrigT1/L1Topo/L1TopoSimulationUtils/L1TopoSimulationUtils/L1TopoDataTypes.h
index e9446efd4b36c8c01c17e365931d438c6f196061..9bb22c40c45863c8fc1d730708bdabb3281e6888 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoSimulationUtils/L1TopoSimulationUtils/L1TopoDataTypes.h
+++ b/Trigger/TrigT1/L1Topo/L1TopoSimulationUtils/L1TopoSimulationUtils/L1TopoDataTypes.h
@@ -1,8 +1,10 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 /*********************************
  * L1TopoDataTypes.h
  * author : Ignacio Aracena <ignacio.aracena@cern.ch>
  * Created May 2015
- * Copyright (c) 2015 Ignacio Aracena. All rights reserved.
  *
  * @brief Tools for handling fixed point Qm.n numbers
 **********************************/
diff --git a/Trigger/TrigT1/L1Topo/L1TopoSimulationUtils/L1TopoSimulationUtils/Trigo.h b/Trigger/TrigT1/L1Topo/L1TopoSimulationUtils/L1TopoSimulationUtils/Trigo.h
index 8c034a09aafda7e004eed93b877d67a7a6dec6bf..846f4c4ff19d0b176cdf8f7e717678e070bd1da9 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoSimulationUtils/L1TopoSimulationUtils/Trigo.h
+++ b/Trigger/TrigT1/L1Topo/L1TopoSimulationUtils/L1TopoSimulationUtils/Trigo.h
@@ -1,8 +1,10 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 /*********************************
  * Trigo.h
  * Created by Ignacio Aracena June 2015 
  * <ignacio.aracena@cern.ch> 
- * Copyright (c) 2015 Ignacio Aracena. All rights reserved.
  *
  * @brief Lookup table for trigonometric functions
  *
diff --git a/Trigger/TrigT1/L1Topo/L1TopoSimulationUtils/Root/Hyperbolic.cxx b/Trigger/TrigT1/L1Topo/L1TopoSimulationUtils/Root/Hyperbolic.cxx
index ea316a166a79f2294570d3a7320b4b19e6dcd790..312a34021f5d088be266cd19a6a7b6c41b56005e 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoSimulationUtils/Root/Hyperbolic.cxx
+++ b/Trigger/TrigT1/L1Topo/L1TopoSimulationUtils/Root/Hyperbolic.cxx
@@ -1,8 +1,10 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 /*********************************
  * Hyperbolic.cxx
  * author : Ignacio Aracena <ignacio.aracena@cern.ch>
  * Created June 2015
- * Copyright (c) 2015 Ignacio Aracena. All rights reserved.
  *
  * @brief Lookup table for hyperbolic functions.
  *        Values is in Qm.n format m=11, n = 7
diff --git a/Trigger/TrigT1/L1Topo/L1TopoSimulationUtils/Root/L1TopoDataTypes.cxx b/Trigger/TrigT1/L1Topo/L1TopoSimulationUtils/Root/L1TopoDataTypes.cxx
index 7a8393f195287248816f586066f8d9a4c88c4dde..3c446e9d268e133b21ae2cf040afaf14611cc899 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoSimulationUtils/Root/L1TopoDataTypes.cxx
+++ b/Trigger/TrigT1/L1Topo/L1TopoSimulationUtils/Root/L1TopoDataTypes.cxx
@@ -1,8 +1,10 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 /*********************************
  * L1TopoDataTypes.cpp
  * author : Ignacio Aracena <ignacio.aracena@cern.ch>
  * Created June 2015
- * Copyright (c) 2015 Ignacio Aracena. All rights reserved.
  *
  * @brief Tools for handling fixed point Qm.n numbers
  *
diff --git a/Trigger/TrigT1/L1Topo/L1TopoSimulationUtils/Root/Trigo.cxx b/Trigger/TrigT1/L1Topo/L1TopoSimulationUtils/Root/Trigo.cxx
index 62af5b50ae445e30521ac04f07d8d02c93b941b6..9761e5895b749b84f41ea42b6b5d3d21361d6845 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoSimulationUtils/Root/Trigo.cxx
+++ b/Trigger/TrigT1/L1Topo/L1TopoSimulationUtils/Root/Trigo.cxx
@@ -1,8 +1,10 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 /*********************************
  * Trigo.cxx
  * author : Ignacio Aracena <ignacio.aracena@cern.ch>
  * Created June 2015
- * Copyright (c) 2015 Ignacio Aracena. All rights reserved.
  *
  * @brief Lookup table for trigonometric functions.
  *        Resolution is in PI/32. Values is in Qm.n format 
diff --git a/Trigger/TrigT1/TrigT1CaloCalibConditions/TrigT1CaloCalibConditions/L1CaloDerivedRunPars.h b/Trigger/TrigT1/TrigT1CaloCalibConditions/TrigT1CaloCalibConditions/L1CaloDerivedRunPars.h
index 0175550d7e1c7cad4c821faa8ef052ee2c08126e..e6da63e47fc11471c76d02263bf2c297321ce5ab 100644
--- a/Trigger/TrigT1/TrigT1CaloCalibConditions/TrigT1CaloCalibConditions/L1CaloDerivedRunPars.h
+++ b/Trigger/TrigT1/TrigT1CaloCalibConditions/TrigT1CaloCalibConditions/L1CaloDerivedRunPars.h
@@ -1,5 +1,8 @@
 // -*- C++ -*-
 #ifndef TRIGT1CALOCALIBCONDITIONS_L1CALODERIVEDRUNPARS_H
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 #define TRIGT1CALOCALIBCONDITIONS_L1CALODERIVEDRUNPARS_H
 
 #include <string>
diff --git a/Trigger/TrigT1/TrigT1CaloCalibConditions/TrigT1CaloCalibConditions/L1CaloDerivedRunParsContainer.h b/Trigger/TrigT1/TrigT1CaloCalibConditions/TrigT1CaloCalibConditions/L1CaloDerivedRunParsContainer.h
index 9864f85b029ba49e69062664a39153f773f117fb..607cf9cb05552b18065d278accfe4a4b14676edf 100644
--- a/Trigger/TrigT1/TrigT1CaloCalibConditions/TrigT1CaloCalibConditions/L1CaloDerivedRunParsContainer.h
+++ b/Trigger/TrigT1/TrigT1CaloCalibConditions/TrigT1CaloCalibConditions/L1CaloDerivedRunParsContainer.h
@@ -1,5 +1,8 @@
 // -*- C++ -*-
 #ifndef TRIGT1CALOCALIBCONDITIONS_L1CALODERIVEDRUNPARSCONTAINER_H
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 #define TRIGT1CALOCALIBCONDITIONS_L1CALODERIVEDRUNPARSCONTAINER_H
 
 #include <map>
diff --git a/Trigger/TrigT1/TrigT1CaloCalibConditions/TrigT1CaloCalibConditions/L1CaloPprChanStrategy.h b/Trigger/TrigT1/TrigT1CaloCalibConditions/TrigT1CaloCalibConditions/L1CaloPprChanStrategy.h
index 1c69c125aa39932476e8c5f4241f67b7f41caed8..66fc2cb94d3897bd7347c4b3dc0df4a69f299b00 100644
--- a/Trigger/TrigT1/TrigT1CaloCalibConditions/TrigT1CaloCalibConditions/L1CaloPprChanStrategy.h
+++ b/Trigger/TrigT1/TrigT1CaloCalibConditions/TrigT1CaloCalibConditions/L1CaloPprChanStrategy.h
@@ -1,5 +1,8 @@
 // -*- C++ -*-
 #ifndef TRIGT1CALOCALIBCONDITIONS_L1CALOPPRCHANSTRATEGY_H
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 #define TRIGT1CALOCALIBCONDITIONS_L1CALOPPRCHANSTRATEGY_H
 
 #include <iostream>
diff --git a/Trigger/TrigT1/TrigT1CaloCalibConditions/TrigT1CaloCalibConditions/L1CaloPprChanStrategyContainer.h b/Trigger/TrigT1/TrigT1CaloCalibConditions/TrigT1CaloCalibConditions/L1CaloPprChanStrategyContainer.h
index 7b0270b38a3479b6dd6997d94eae005cdf7dd452..77a2e334b47723de4f2c62675d91d808fb12cea3 100644
--- a/Trigger/TrigT1/TrigT1CaloCalibConditions/TrigT1CaloCalibConditions/L1CaloPprChanStrategyContainer.h
+++ b/Trigger/TrigT1/TrigT1CaloCalibConditions/TrigT1CaloCalibConditions/L1CaloPprChanStrategyContainer.h
@@ -1,5 +1,8 @@
 // -*- C++ -*-
 #ifndef TRIGT1CALOCALIBCONDITIONS_L1CALOPPRCHANSTRATEGYCONTAINER_H
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 #define TRIGT1CALOCALIBCONDITIONS_L1CALOPPRCHANSTRATEGYCONTAINER_H
 
 #include <map>
diff --git a/Trigger/TrigT1/TrigT1CaloCalibConditions/TrigT1CaloCalibConditions/L1CaloReadoutConfig.h b/Trigger/TrigT1/TrigT1CaloCalibConditions/TrigT1CaloCalibConditions/L1CaloReadoutConfig.h
index b49eb4758a3451d8404e30c87c87c0a5e2752859..6d33e538378f2891150461c69675cffc9b179bf7 100644
--- a/Trigger/TrigT1/TrigT1CaloCalibConditions/TrigT1CaloCalibConditions/L1CaloReadoutConfig.h
+++ b/Trigger/TrigT1/TrigT1CaloCalibConditions/TrigT1CaloCalibConditions/L1CaloReadoutConfig.h
@@ -1,5 +1,8 @@
 // -*- C++ -*-
 #ifndef TRIGT1CALOCALIBCONDITIONS_L1CALOREADOUTCONFIG_H
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 #define TRIGT1CALOCALIBCONDITIONS_L1CALOREADOUTCONFIG_H
 
 #include <string>
diff --git a/Trigger/TrigT1/TrigT1CaloCalibConditions/TrigT1CaloCalibConditions/L1CaloReadoutConfigContainer.h b/Trigger/TrigT1/TrigT1CaloCalibConditions/TrigT1CaloCalibConditions/L1CaloReadoutConfigContainer.h
index be57b446718ccffec5513d969301bed2c8ee4315..bc941851108906c61a3b7b8e1abb203cc5f7e8f9 100644
--- a/Trigger/TrigT1/TrigT1CaloCalibConditions/TrigT1CaloCalibConditions/L1CaloReadoutConfigContainer.h
+++ b/Trigger/TrigT1/TrigT1CaloCalibConditions/TrigT1CaloCalibConditions/L1CaloReadoutConfigContainer.h
@@ -1,5 +1,8 @@
 // -*- C++ -*-
 #ifndef TRIGT1CALOCALIBCONDITIONS_L1CALOREADOUTCONFIGCONTAINER_H
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 #define TRIGT1CALOCALIBCONDITIONS_L1CALOREADOUTCONFIGCONTAINER_H
 
 #include <map>
diff --git a/Trigger/TrigT1/TrigT1CaloCalibConditions/TrigT1CaloCalibConditions/L1CaloRunParameters.h b/Trigger/TrigT1/TrigT1CaloCalibConditions/TrigT1CaloCalibConditions/L1CaloRunParameters.h
index af3c2833709f7d4110165c84eb6b2c2b3c8efd4d..fae55ace17423f16495e3b6c121331599274761f 100644
--- a/Trigger/TrigT1/TrigT1CaloCalibConditions/TrigT1CaloCalibConditions/L1CaloRunParameters.h
+++ b/Trigger/TrigT1/TrigT1CaloCalibConditions/TrigT1CaloCalibConditions/L1CaloRunParameters.h
@@ -1,5 +1,8 @@
 // -*- C++ -*-
 #ifndef TRIGT1CALOCALIBCONDITIONS_L1CALORUNPARAMETERS_H
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 #define TRIGT1CALOCALIBCONDITIONS_L1CALORUNPARAMETERS_H
 
 #include <string>
diff --git a/Trigger/TrigT1/TrigT1CaloCalibConditions/TrigT1CaloCalibConditions/L1CaloRunParametersContainer.h b/Trigger/TrigT1/TrigT1CaloCalibConditions/TrigT1CaloCalibConditions/L1CaloRunParametersContainer.h
index 6e392ef67e6d67c53d1c9128248d8736901667b5..c6ebe6a237e2936db5b50cf8d5755bcd2df3ac0d 100644
--- a/Trigger/TrigT1/TrigT1CaloCalibConditions/TrigT1CaloCalibConditions/L1CaloRunParametersContainer.h
+++ b/Trigger/TrigT1/TrigT1CaloCalibConditions/TrigT1CaloCalibConditions/L1CaloRunParametersContainer.h
@@ -1,5 +1,8 @@
 // -*- C++ -*-
 #ifndef TRIGT1CALOCALIBCONDITIONS_L1CALORUNPARAMETERSCONTAINER_H
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 #define TRIGT1CALOCALIBCONDITIONS_L1CALORUNPARAMETERSCONTAINER_H
 
 #include <map>
diff --git a/Trigger/TrigT1/TrigT1CaloCalibConditions/src/L1CaloDerivedRunPars.cxx b/Trigger/TrigT1/TrigT1CaloCalibConditions/src/L1CaloDerivedRunPars.cxx
index 78245b139345cdfc12f63e73264f2ebf5b088cf6..38da7013ed2a62a77e8eaf5e22fb20d6b98077ee 100644
--- a/Trigger/TrigT1/TrigT1CaloCalibConditions/src/L1CaloDerivedRunPars.cxx
+++ b/Trigger/TrigT1/TrigT1CaloCalibConditions/src/L1CaloDerivedRunPars.cxx
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 #include "TrigT1CaloCalibConditions/L1CaloDerivedRunPars.h"
 
 #include <iomanip>
diff --git a/Trigger/TrigT1/TrigT1CaloCalibConditions/src/L1CaloDerivedRunParsContainer.cxx b/Trigger/TrigT1/TrigT1CaloCalibConditions/src/L1CaloDerivedRunParsContainer.cxx
index f6dd5769deb3e71c95f5469d41b7836ed94ccc9b..c1641fe96aee8b249447376f36d68dd25ff57826 100644
--- a/Trigger/TrigT1/TrigT1CaloCalibConditions/src/L1CaloDerivedRunParsContainer.cxx
+++ b/Trigger/TrigT1/TrigT1CaloCalibConditions/src/L1CaloDerivedRunParsContainer.cxx
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 #include "TrigT1CaloCalibConditions/L1CaloDerivedRunParsContainer.h"
 
 #include <algorithm>
diff --git a/Trigger/TrigT1/TrigT1CaloCalibConditions/src/L1CaloPprChanStrategy.cxx b/Trigger/TrigT1/TrigT1CaloCalibConditions/src/L1CaloPprChanStrategy.cxx
index 567e3b144372f0b3f07d3e8638836faf5a1913f4..57f3495305b8050ae5dc3d87403749be584639fd 100644
--- a/Trigger/TrigT1/TrigT1CaloCalibConditions/src/L1CaloPprChanStrategy.cxx
+++ b/Trigger/TrigT1/TrigT1CaloCalibConditions/src/L1CaloPprChanStrategy.cxx
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 #include "TrigT1CaloCalibConditions/L1CaloPprChanStrategy.h"
 
 #include <iostream>
diff --git a/Trigger/TrigT1/TrigT1CaloCalibConditions/src/L1CaloPprChanStrategyContainer.cxx b/Trigger/TrigT1/TrigT1CaloCalibConditions/src/L1CaloPprChanStrategyContainer.cxx
index 3308e1d72e2ca0c85d8ebb7c322782aba5490021..149a1eb2fd5f7e9816ad8febd8e0e1644ead1952 100644
--- a/Trigger/TrigT1/TrigT1CaloCalibConditions/src/L1CaloPprChanStrategyContainer.cxx
+++ b/Trigger/TrigT1/TrigT1CaloCalibConditions/src/L1CaloPprChanStrategyContainer.cxx
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 #include "TrigT1CaloCalibConditions/L1CaloPprChanStrategyContainer.h"
 
 #include <algorithm>
diff --git a/Trigger/TrigT1/TrigT1CaloCalibConditions/src/L1CaloReadoutConfig.cxx b/Trigger/TrigT1/TrigT1CaloCalibConditions/src/L1CaloReadoutConfig.cxx
index 4d19d22c319322d59aed0ea7d7971a6209436af1..a6d436118788397320212787b0e78d17ef6348a6 100644
--- a/Trigger/TrigT1/TrigT1CaloCalibConditions/src/L1CaloReadoutConfig.cxx
+++ b/Trigger/TrigT1/TrigT1CaloCalibConditions/src/L1CaloReadoutConfig.cxx
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 #include "TrigT1CaloCalibConditions/L1CaloReadoutConfig.h"
 
 L1CaloReadoutConfig::L1CaloReadoutConfig(unsigned int channelId, const std::string& description, unsigned int baselinePointer, unsigned int numFadcSlices, unsigned int l1aFadcSlice, unsigned int numLutSlices, unsigned int l1aLutSlice, unsigned int numProcSlices, unsigned int l1aProcSlice, unsigned int numTopoSlices, unsigned int l1aTopoSlice, unsigned int latencyPpmFadc, unsigned int latencyPpmLut, unsigned int latencyCpmInput, unsigned int latencyCpmHits, unsigned int latencyCpmRoi, unsigned int latencyJemInput, unsigned int latencyJemRoi, unsigned int latencyCpCmxBackplane, unsigned int latencyCpCmxLocal, unsigned int latencyCpCmxCable, unsigned int latencyCpCmxSystem, unsigned int latencyCpCmxInfo, unsigned int latencyJetCmxBackplane, unsigned int latencyJetCmxLocal, unsigned int latencyJetCmxCable, unsigned int latencyJetCmxSystem, unsigned int latencyJetCmxInfo, unsigned int latencyJetCmxRoi, unsigned int latencyEnergyCmxBackplane, unsigned int latencyEnergyCmxLocal, unsigned int latencyEnergyCmxCable, unsigned int latencyEnergyCmxSystem, unsigned int latencyEnergyCmxInfo, unsigned int latencyEnergyCmxRoi, unsigned int latencyTopo, unsigned int internalLatencyJemJet, unsigned int internalLatencyJemSum, unsigned int bcOffsetJemJet, unsigned int bcOffsetJemSum, int bcOffsetCmx, int bcOffsetTopo, const std::string& formatTypePpm, const std::string& formatTypeCpJep, const std::string& formatTypeTopo, unsigned int compressionThresholdPpm, unsigned int compressionThresholdCpJep, unsigned int compressionThresholdTopo, unsigned int compressionBaselinePpm, unsigned int readout80ModePpm)
diff --git a/Trigger/TrigT1/TrigT1CaloCalibConditions/src/L1CaloReadoutConfigContainer.cxx b/Trigger/TrigT1/TrigT1CaloCalibConditions/src/L1CaloReadoutConfigContainer.cxx
index 1d03d8c9060f31accba600cea8ad5670f1ee55eb..1b1577dda44a0fdc80be7f2df8305029fbfc05b7 100644
--- a/Trigger/TrigT1/TrigT1CaloCalibConditions/src/L1CaloReadoutConfigContainer.cxx
+++ b/Trigger/TrigT1/TrigT1CaloCalibConditions/src/L1CaloReadoutConfigContainer.cxx
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 #include "TrigT1CaloCalibConditions/L1CaloReadoutConfigContainer.h"
 
 #include <algorithm>
diff --git a/Trigger/TrigT1/TrigT1CaloCalibConditions/src/L1CaloRunParameters.cxx b/Trigger/TrigT1/TrigT1CaloCalibConditions/src/L1CaloRunParameters.cxx
index 5597826a89d35360e03b54630debce481a460eb1..82992529ba05cd7d4d30d005fc3deb3ff2c74c84 100644
--- a/Trigger/TrigT1/TrigT1CaloCalibConditions/src/L1CaloRunParameters.cxx
+++ b/Trigger/TrigT1/TrigT1CaloCalibConditions/src/L1CaloRunParameters.cxx
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 #include "TrigT1CaloCalibConditions/L1CaloRunParameters.h"
 
 L1CaloRunParameters::L1CaloRunParameters(unsigned int channelId, const std::string& runType, const std::string& runActionName, unsigned int runActionVersion, const std::string& readoutConfig, unsigned int readoutConfigID, const std::string& ttcConfiguration, unsigned int ttcConfigurationID, const std::string& triggerMenu, const std::string& calibration, const std::string& conditions)
diff --git a/Trigger/TrigT1/TrigT1CaloCalibConditions/src/L1CaloRunParametersContainer.cxx b/Trigger/TrigT1/TrigT1CaloCalibConditions/src/L1CaloRunParametersContainer.cxx
index 06d629e4b6ba55ad4d935c68090065f15d4506a3..aaaaf39574f590189e36312d04c207b0d32c021e 100644
--- a/Trigger/TrigT1/TrigT1CaloCalibConditions/src/L1CaloRunParametersContainer.cxx
+++ b/Trigger/TrigT1/TrigT1CaloCalibConditions/src/L1CaloRunParametersContainer.cxx
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 #include "TrigT1CaloCalibConditions/L1CaloRunParametersContainer.h"
 
 #include <algorithm>
diff --git a/Trigger/TrigT1/TrigT1CaloCalibToolInterfaces/TrigT1CaloCalibToolInterfaces/IL1CaloCells2TriggerTowers.h b/Trigger/TrigT1/TrigT1CaloCalibToolInterfaces/TrigT1CaloCalibToolInterfaces/IL1CaloCells2TriggerTowers.h
index d46e5559b443b04bfb5854da22e74a1152dba3e6..0f1f6991f977780ac2114ada8c205bf9a19368ec 100644
--- a/Trigger/TrigT1/TrigT1CaloCalibToolInterfaces/TrigT1CaloCalibToolInterfaces/IL1CaloCells2TriggerTowers.h
+++ b/Trigger/TrigT1/TrigT1CaloCalibToolInterfaces/TrigT1CaloCalibToolInterfaces/IL1CaloCells2TriggerTowers.h
@@ -1,14 +1,10 @@
+/*
+  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.                                   *
-//  *                                                                         *
 //  *   Author: John Morris (john.morris@cern.ch)                             *
 //  *           Queen Mary University of London                               *
 //  *                                                                         *
-//  ***************************************************************************/
 
 //
 // Pure abstract base class interface to L1CaloCells2TriggerTowers
diff --git a/Trigger/TrigT1/TrigT1CaloCalibToolInterfaces/TrigT1CaloCalibToolInterfaces/IL1CaloFcal23Cells2RxMappingTool.h b/Trigger/TrigT1/TrigT1CaloCalibToolInterfaces/TrigT1CaloCalibToolInterfaces/IL1CaloFcal23Cells2RxMappingTool.h
index 23e84438bbe6c2d1bf4f0d215c8cda55bc5107b6..5e0aeaface322b98538c21b36659a927fbd9c7a7 100644
--- a/Trigger/TrigT1/TrigT1CaloCalibToolInterfaces/TrigT1CaloCalibToolInterfaces/IL1CaloFcal23Cells2RxMappingTool.h
+++ b/Trigger/TrigT1/TrigT1CaloCalibToolInterfaces/TrigT1CaloCalibToolInterfaces/IL1CaloFcal23Cells2RxMappingTool.h
@@ -1,14 +1,10 @@
+/*
+  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.                                   *
-//  *                                                                         *
 //  *   Author: John Morris (john.morris@cern.ch)                             *
 //  *           Queen Mary University of London                               *
 //  *                                                                         *
-//  ***************************************************************************/
 
 //
 // Pure abstract base class interface to the L1CaloFcal23Cells2RxMappingTool
diff --git a/Trigger/TrigT1/TrigT1CaloCalibToolInterfaces/TrigT1CaloCalibToolInterfaces/IL1CaloLArTowerEnergy.h b/Trigger/TrigT1/TrigT1CaloCalibToolInterfaces/TrigT1CaloCalibToolInterfaces/IL1CaloLArTowerEnergy.h
index a7701f258d9eda9879d197ff8200ce94052c8298..7b54cadd47feeab335e64e12e547dfe88c4445c3 100644
--- a/Trigger/TrigT1/TrigT1CaloCalibToolInterfaces/TrigT1CaloCalibToolInterfaces/IL1CaloLArTowerEnergy.h
+++ b/Trigger/TrigT1/TrigT1CaloCalibToolInterfaces/TrigT1CaloCalibToolInterfaces/IL1CaloLArTowerEnergy.h
@@ -1,14 +1,10 @@
+/*
+  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.                                   *
-//  *                                                                         *
 //  *   Author: John Morris (john.morris@cern.ch)                             *
 //  *           Queen Mary University of London                               *
 //  *                                                                         *
-//  ***************************************************************************/
 
 //
 // Pure abstract base class interface to L1CaloLArTowerEnergy
diff --git a/Trigger/TrigT1/TrigT1CaloCalibToolInterfaces/TrigT1CaloCalibToolInterfaces/IL1CaloMonitoringCaloTool.h b/Trigger/TrigT1/TrigT1CaloCalibToolInterfaces/TrigT1CaloCalibToolInterfaces/IL1CaloMonitoringCaloTool.h
index e1bae54b72aef6eb616beb282e21a38db2d2832d..798efc6ef090e1b63d92895528e0b34661275163 100644
--- a/Trigger/TrigT1/TrigT1CaloCalibToolInterfaces/TrigT1CaloCalibToolInterfaces/IL1CaloMonitoringCaloTool.h
+++ b/Trigger/TrigT1/TrigT1CaloCalibToolInterfaces/TrigT1CaloCalibToolInterfaces/IL1CaloMonitoringCaloTool.h
@@ -1,13 +1,9 @@
+/*
+  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.                                   *
-//  *                                                                         *
 //  *   Author: Peter Faulkner
 //  *                                                                         *
-//  ***************************************************************************/
 
 //
 // Pure abstract base class interface to L1CaloMonitoringCaloTool
diff --git a/Trigger/TrigT1/TrigT1CaloCalibToolInterfaces/TrigT1CaloCalibToolInterfaces/IL1CaloOfflineTriggerTowerTools.h b/Trigger/TrigT1/TrigT1CaloCalibToolInterfaces/TrigT1CaloCalibToolInterfaces/IL1CaloOfflineTriggerTowerTools.h
index 121222d87a0f111d3956cd9b3212d743b067c71e..ea7890602495368c84b94c40db1ada8c72c7bbdd 100644
--- a/Trigger/TrigT1/TrigT1CaloCalibToolInterfaces/TrigT1CaloCalibToolInterfaces/IL1CaloOfflineTriggerTowerTools.h
+++ b/Trigger/TrigT1/TrigT1CaloCalibToolInterfaces/TrigT1CaloCalibToolInterfaces/IL1CaloOfflineTriggerTowerTools.h
@@ -1,14 +1,10 @@
+/*
+  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.                                   *
-//  *                                                                         *
 //  *   Author: John Morris (john.morris@cern.ch)                             *
 //  *           Queen Mary University of London                               *
 //  *                                                                         *
-//  ***************************************************************************/
 
 //
 // Pure abstract base class interface to L1CaloOfflineTriggerTowerTools
diff --git a/Trigger/TrigT1/TrigT1CaloCalibToolInterfaces/TrigT1CaloCalibToolInterfaces/IL1CaloTTIdTools.h b/Trigger/TrigT1/TrigT1CaloCalibToolInterfaces/TrigT1CaloCalibToolInterfaces/IL1CaloTTIdTools.h
index bd9d8c8634e68f28d0e14791baa35d35a53efd01..883751d9d1e792e6cc70831274079152d45133c3 100644
--- a/Trigger/TrigT1/TrigT1CaloCalibToolInterfaces/TrigT1CaloCalibToolInterfaces/IL1CaloTTIdTools.h
+++ b/Trigger/TrigT1/TrigT1CaloCalibToolInterfaces/TrigT1CaloCalibToolInterfaces/IL1CaloTTIdTools.h
@@ -1,14 +1,10 @@
+/*
+  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.                                   *
-//  *                                                                         *
 //  *   Author: John Morris (john.morris@cern.ch)                             *
 //  *           Queen Mary University of London                               *
 //  *                                                                         *
-//  ***************************************************************************/
 
 //
 // Pure abstract base class interface to L1CaloTTIdTools
diff --git a/Trigger/TrigT1/TrigT1CaloCalibToolInterfaces/TrigT1CaloCalibToolInterfaces/IL1CaloxAODOfflineTriggerTowerTools.h b/Trigger/TrigT1/TrigT1CaloCalibToolInterfaces/TrigT1CaloCalibToolInterfaces/IL1CaloxAODOfflineTriggerTowerTools.h
index 89706ea661981bcee3362f97822d25f5cfc4309b..d502266c9ac075cae2809e67b99bbfd1afcbd2f1 100644
--- a/Trigger/TrigT1/TrigT1CaloCalibToolInterfaces/TrigT1CaloCalibToolInterfaces/IL1CaloxAODOfflineTriggerTowerTools.h
+++ b/Trigger/TrigT1/TrigT1CaloCalibToolInterfaces/TrigT1CaloCalibToolInterfaces/IL1CaloxAODOfflineTriggerTowerTools.h
@@ -1,14 +1,10 @@
+/*
+  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.                                   *
-//  *                                                                         *
 //  *   Author: John Morris (john.morris@cern.ch)                             *
 //  *           Queen Mary University of London                               *
 //  *                                                                         *
-//  ***************************************************************************/
 
 #ifndef _TRIGGER_TRIGT1_TRIGT1CALOCALIBTOOLINTERFACES_IL1CALOXAODOFFLINETRIGGERTOWERTOOLS_H_
 #define _TRIGGER_TRIGT1_TRIGT1CALOCALIBTOOLINTERFACES_IL1CALOXAODOFFLINETRIGGERTOWERTOOLS_H_
diff --git a/Trigger/TrigT1/TrigT1CaloCalibTools/TrigT1CaloCalibTools/L1CaloFcal23Cells2RxMappingTool.h b/Trigger/TrigT1/TrigT1CaloCalibTools/TrigT1CaloCalibTools/L1CaloFcal23Cells2RxMappingTool.h
index a7703d0f48e9fe1bd292d5084e373fa3a33d6aec..902dda21fcb3efc80027207ccb8adacd484ef5bb 100644
--- a/Trigger/TrigT1/TrigT1CaloCalibTools/TrigT1CaloCalibTools/L1CaloFcal23Cells2RxMappingTool.h
+++ b/Trigger/TrigT1/TrigT1CaloCalibTools/TrigT1CaloCalibTools/L1CaloFcal23Cells2RxMappingTool.h
@@ -1,14 +1,10 @@
+/*
+  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.                                   *
-//  *                                                                         *
 //  *   Author: John Morris (john.morris@cern.ch)                             *
 //  *           Queen Mary University of London                               *
 //  *                                                                         *
-//  ***************************************************************************/
 
 //
 // Mapping tool for Fcal 23 calo cells to receivers
diff --git a/Trigger/TrigT1/TrigT1CaloCalibTools/TrigT1CaloCalibTools/L1CaloOfflineTriggerTowerTools.h b/Trigger/TrigT1/TrigT1CaloCalibTools/TrigT1CaloCalibTools/L1CaloOfflineTriggerTowerTools.h
index 26f251ae47896cde62a3dad92aa0f3792384d16d..663aaf1c7515e768eeeef5af40810936cfd6e22b 100644
--- a/Trigger/TrigT1/TrigT1CaloCalibTools/TrigT1CaloCalibTools/L1CaloOfflineTriggerTowerTools.h
+++ b/Trigger/TrigT1/TrigT1CaloCalibTools/TrigT1CaloCalibTools/L1CaloOfflineTriggerTowerTools.h
@@ -1,14 +1,10 @@
+/*
+  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.                                   *
-//  *                                                                         *
 //  *   Author: John Morris (john.morris@cern.ch)                             *
 //  *           Queen Mary University of London                               *
 //  *                                                                         *
-//  ***************************************************************************/
 
 
 #ifndef TRIGGER_TRIGT1_TRIGT1CALOCALIBTOOLS_L1CALOOFFLINETRIGGERTOWERTOOLS_H
diff --git a/Trigger/TrigT1/TrigT1CaloCalibTools/TrigT1CaloCalibTools/L1CaloxAODOfflineTriggerTowerTools.h b/Trigger/TrigT1/TrigT1CaloCalibTools/TrigT1CaloCalibTools/L1CaloxAODOfflineTriggerTowerTools.h
index e182175a3157ce115223c97ca2bcca03ee682188..9f2f676e74df985813871c3e9355930a9027acd1 100644
--- a/Trigger/TrigT1/TrigT1CaloCalibTools/TrigT1CaloCalibTools/L1CaloxAODOfflineTriggerTowerTools.h
+++ b/Trigger/TrigT1/TrigT1CaloCalibTools/TrigT1CaloCalibTools/L1CaloxAODOfflineTriggerTowerTools.h
@@ -1,14 +1,10 @@
+/*
+  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.                                   *
-//  *                                                                         *
 //  *   Author: John Morris (john.morris@cern.ch)                             *
 //  *           Queen Mary University of London                               *
 //  *                                                                         *
-//  ***************************************************************************/
 
 
 #ifndef _TRIGGER_TRIGT1_TRIGT1CALOCALIBTOOLS_L1CALOXAODOFFLINETRIGERTOWERTOOLS_H_
diff --git a/Trigger/TrigT1/TrigT1CaloCalibTools/TrigT1CaloCalibTools/TriggerTowerThinningAlg.h b/Trigger/TrigT1/TrigT1CaloCalibTools/TrigT1CaloCalibTools/TriggerTowerThinningAlg.h
index a55eeea6213fe1b22d978867e2f5f8f3db176201..e21fb182a94414e4ec5429153b2fb5f23a7e0e83 100644
--- a/Trigger/TrigT1/TrigT1CaloCalibTools/TrigT1CaloCalibTools/TriggerTowerThinningAlg.h
+++ b/Trigger/TrigT1/TrigT1CaloCalibTools/TrigT1CaloCalibTools/TriggerTowerThinningAlg.h
@@ -1,14 +1,10 @@
+/*
+  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.                                   *
-//  *                                                                         *
 //  *   Author: John Morris (john.morris@cern.ch)                             *
 //  *           Queen Mary University of London                               *
 //  *                                                                         *
-//  ***************************************************************************/
 
 #ifndef _TRIGGER_TRIGT1_TRIGT1CALOCALIBTOOLS_TRIGGERTOWERTHINNINGALG_H_
 #define _TRIGGER_TRIGT1_TRIGT1CALOCALIBTOOLS_TRIGGERTOWERTHINNINGALG_H_
diff --git a/Trigger/TrigT1/TrigT1CaloCalibTools/src/L1CaloFcal23Cells2RxMappingTool.cxx b/Trigger/TrigT1/TrigT1CaloCalibTools/src/L1CaloFcal23Cells2RxMappingTool.cxx
index c7d90240b1b0543c4b5552a2b73e554439a68566..143c5defac863892c2711080159293ab83abe23e 100644
--- a/Trigger/TrigT1/TrigT1CaloCalibTools/src/L1CaloFcal23Cells2RxMappingTool.cxx
+++ b/Trigger/TrigT1/TrigT1CaloCalibTools/src/L1CaloFcal23Cells2RxMappingTool.cxx
@@ -1,14 +1,10 @@
+/*
+  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.                                   *
-//  *                                                                         *
 //  *   Author: John Morris (john.morris@cern.ch)                             *
 //  *           Queen Mary University of London                               *
 //  *                                                                         *
-//  ***************************************************************************/
 
 #include "TrigT1CaloCalibTools/L1CaloFcal23Cells2RxMappingTool.h"
 
diff --git a/Trigger/TrigT1/TrigT1CaloCalibTools/src/L1CaloOfflineTriggerTowerTools.cxx b/Trigger/TrigT1/TrigT1CaloCalibTools/src/L1CaloOfflineTriggerTowerTools.cxx
index 87e955a1bf384e0e380d735bfb133b98e9b420e9..7c25a981dfe782c72e83ef7d53c20758f394bb87 100644
--- a/Trigger/TrigT1/TrigT1CaloCalibTools/src/L1CaloOfflineTriggerTowerTools.cxx
+++ b/Trigger/TrigT1/TrigT1CaloCalibTools/src/L1CaloOfflineTriggerTowerTools.cxx
@@ -1,14 +1,10 @@
+/*
+  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.                                   *
-//  *                                                                         *
 //  *   Author: John Morris (john.morris@cern.ch)                             *
 //  *           Queen Mary University of London                               *
 //  *                                                                         *
-//  ***************************************************************************/
 
 // Like it says above, please chop up this code until it does what you want !
 
diff --git a/Trigger/TrigT1/TrigT1CaloCalibTools/src/L1CaloxAODOfflineTriggerTowerTools.cxx b/Trigger/TrigT1/TrigT1CaloCalibTools/src/L1CaloxAODOfflineTriggerTowerTools.cxx
index 26ba9a24e8c12e43eb777f80999a93c725f9b191..063b38344acbb6e899d0fa8b93e31b2e87a546b6 100644
--- a/Trigger/TrigT1/TrigT1CaloCalibTools/src/L1CaloxAODOfflineTriggerTowerTools.cxx
+++ b/Trigger/TrigT1/TrigT1CaloCalibTools/src/L1CaloxAODOfflineTriggerTowerTools.cxx
@@ -1,14 +1,10 @@
+/*
+  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.                                   *
-//  *                                                                         *
 //  *   Author: John Morris (john.morris@cern.ch)                             *
 //  *           Queen Mary University of London                               *
 //  *                                                                         *
-//  ***************************************************************************/
 
 // Like it says above, please chop up this code until it does what you want !
 
diff --git a/Trigger/TrigT1/TrigT1CaloCalibTools/src/TriggerTowerThinningAlg.cxx b/Trigger/TrigT1/TrigT1CaloCalibTools/src/TriggerTowerThinningAlg.cxx
index 49b5f92788e33f829945940a6d0a5d64eac9021d..12ba00eeb80dcdfddb3fa3ba5bb9251a89ebea58 100644
--- a/Trigger/TrigT1/TrigT1CaloCalibTools/src/TriggerTowerThinningAlg.cxx
+++ b/Trigger/TrigT1/TrigT1CaloCalibTools/src/TriggerTowerThinningAlg.cxx
@@ -1,14 +1,10 @@
+/*
+  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.                                   *
-//  *                                                                         *
 //  *   Author: John Morris (john.morris@cern.ch)                             *
 //  *           Queen Mary University of London                               *
 //  *                                                                         *
-//  ***************************************************************************/
 
 /**
    @class TriggerTowerThinningAlg
diff --git a/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/CMMCPHits.h b/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/CMMCPHits.h
index 36b45a888fa68ed69f7701563a52781ee496e6d0..ea43ce361be5c92376a40690430224af469c778c 100755
--- a/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/CMMCPHits.h
+++ b/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/CMMCPHits.h
@@ -1,19 +1,13 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //***************************************************************************
 //                           CMMCPHits.h  -  description
 //                              -------------------
 //     begin                : 25 05 2006
-//     copyright            : (C) 2006 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_H
   #define CMMCPHits_H
diff --git a/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/CMMCPHitsCollection.h b/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/CMMCPHitsCollection.h
index e7956867ed877bb63b41898b5127fd18b2d155a9..5c52a6586f068e8da84308de742492ec9c2262dc 100755
--- a/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/CMMCPHitsCollection.h
+++ b/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/CMMCPHitsCollection.h
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 #ifndef TRIGT1CAL_CMMCPHitsCOLLECTION_H
 #define TRIGT1CAL_CMMCPHitsCOLLECTION_H
 
diff --git a/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/CMMCPHits_ClassDEF.h b/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/CMMCPHits_ClassDEF.h
index f569adeaf152c2aeb798464233213500239264e1..94125a1c303126715814e1162ba6b60b85df0ada 100755
--- a/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/CMMCPHits_ClassDEF.h
+++ b/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/CMMCPHits_ClassDEF.h
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 #ifndef CMMCPHits_ClassDEF_H
 #define CMMCPHits_ClassDEF_H
 //Put here the CLASS_DEF macros for the STL containers you put in StoreGate
diff --git a/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/CMMEtSums.h b/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/CMMEtSums.h
index e84c78877515cc9af94468bd394877383d3cdba2..b8765ea0c6e9f522be46833c215a3c7bd6fcfb2c 100755
--- a/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/CMMEtSums.h
+++ b/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/CMMEtSums.h
@@ -1,17 +1,14 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //***************************************************************************
 //                           CMMEtSums.h  -  description
 //                              -------------------
 //     begin                : 25 05 2006
-//     copyright            : (C) 2006 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.                                   *
 //*                                                                         *
 //***************************************************************************/
   
diff --git a/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/CMMEtSumsCollection.h b/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/CMMEtSumsCollection.h
index 86bb5c95131ee1fa453705ba737b10030186f55a..357284993d2103dde47564c79faee4cc62d063ac 100755
--- a/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/CMMEtSumsCollection.h
+++ b/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/CMMEtSumsCollection.h
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 #ifndef TRIGT1CAL_CMMEtSumsCOLLECTION_H
 #define TRIGT1CAL_CMMEtSumsCOLLECTION_H
 
diff --git a/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/CMMEtSums_ClassDEF.h b/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/CMMEtSums_ClassDEF.h
index b7f5a24b8907248bbcbbc9ad7215879267a20cfb..895d94747dd46797c545070bbc5aac34bc228b04 100755
--- a/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/CMMEtSums_ClassDEF.h
+++ b/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/CMMEtSums_ClassDEF.h
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 #ifndef CMMEtSums_ClassDEF_H
 #define CMMEtSums_ClassDEF_H
 //Put here the CLASS_DEF macros for the STL containers you put in StoreGate
diff --git a/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/CMMJetHits.h b/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/CMMJetHits.h
index 1f2b42f106724773306a100f4ca6cc26aedf1a1e..e608241fafd81449790f11b55a9335f28f5e856c 100755
--- a/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/CMMJetHits.h
+++ b/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/CMMJetHits.h
@@ -1,19 +1,13 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //***************************************************************************
 //                           CMMJetHits.h  -  description
 //                              -------------------
 //     begin                : 25 05 2006
-//     copyright            : (C) 2006 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_H
   #define CMMJetHits_H
diff --git a/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/CMMJetHitsCollection.h b/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/CMMJetHitsCollection.h
index b051c4c66d1fddd2f0961cb89ac167d630b98244..ab88ba93a13f9b5d4c800f4533ddebd2675c715b 100755
--- a/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/CMMJetHitsCollection.h
+++ b/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/CMMJetHitsCollection.h
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 #ifndef TRIGT1CAL_CMMJetHitsCOLLECTION_H
 #define TRIGT1CAL_CMMJetHitsCOLLECTION_H
 
diff --git a/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/CMMJetHits_ClassDEF.h b/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/CMMJetHits_ClassDEF.h
index 104466169bf8e655aec3a1cd94f88665ec20b16d..7af5f6370b4a5f0770adaf6b0af179982b0c438d 100755
--- a/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/CMMJetHits_ClassDEF.h
+++ b/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/CMMJetHits_ClassDEF.h
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 #ifndef CMMJetHits_ClassDEF_H
 #define CMMJetHits_ClassDEF_H
 //Put here the CLASS_DEF macros for the STL containers you put in StoreGate
diff --git a/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/CMMRoI.h b/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/CMMRoI.h
index 8ec6b5add7bdd318ccc6ed53ecfe5fb97103bb48..65ce72265a615454d280644fb9f8e38cf8d6f679 100755
--- a/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/CMMRoI.h
+++ b/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/CMMRoI.h
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 #ifndef TRIGT1CALO_CMMROI_H
 #define TRIGT1CALO_CMMROI_H
 
diff --git a/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/CMXCPHits.h b/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/CMXCPHits.h
index 6637f95c25fc872d16c012b230302ef9dfa745cc..5de0c047299f9b0e17ce8587420079b183c4668f 100755
--- a/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/CMXCPHits.h
+++ b/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/CMXCPHits.h
@@ -1,11 +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 CMXCPHits_H
   #define CMXCPHits_H
diff --git a/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/CMXCPHitsCollection.h b/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/CMXCPHitsCollection.h
index ebf5222541a3f50973a92d3414f83142e4cb5d35..fa0ec6a603aaa476f0d93baf75dd88f983df2119 100755
--- a/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/CMXCPHitsCollection.h
+++ b/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/CMXCPHitsCollection.h
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 #ifndef TRIGT1CAL_CMXCPHitsCOLLECTION_H
 #define TRIGT1CAL_CMXCPHitsCOLLECTION_H
 
diff --git a/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/CMXCPHits_ClassDEF.h b/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/CMXCPHits_ClassDEF.h
index 0ba30dc6f369dbc1a47a7c5f48402eeb3135c272..311be1eb2a27dc9280a3138ef5f7650eb51c3bc0 100755
--- a/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/CMXCPHits_ClassDEF.h
+++ b/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/CMXCPHits_ClassDEF.h
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 #ifndef CMXCPHits_ClassDEF_H
 #define CMXCPHits_ClassDEF_H
 //Put here the CLASS_DEF macros for the STL containers you put in StoreGate
diff --git a/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/CMXCPTob.h b/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/CMXCPTob.h
index 3ea0cf6c7e7ff3d6057d0ad9724cf75637993050..0114ba60871452e24e29e987424d8af3726880e4 100755
--- a/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/CMXCPTob.h
+++ b/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/CMXCPTob.h
@@ -1,11 +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 CMXCPTob_H
   #define CMXCPTob_H
diff --git a/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/CMXCPTobCollection.h b/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/CMXCPTobCollection.h
index e450320c15ba714172d2bfd2ad8b20201c830fee..63c770361045a215a1a221d6fec5714084a27084 100755
--- a/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/CMXCPTobCollection.h
+++ b/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/CMXCPTobCollection.h
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 #ifndef TRIGT1CAL_CMXCPTobCOLLECTION_H
 #define TRIGT1CAL_CMXCPTobCOLLECTION_H
 
diff --git a/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/CMXCPTob_ClassDEF.h b/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/CMXCPTob_ClassDEF.h
index f18eade446e0b3691ea646c748ca3e5adeb38fd4..7ab6cfa6c3bd8faba9516efae38bdfc9f591fc84 100755
--- a/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/CMXCPTob_ClassDEF.h
+++ b/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/CMXCPTob_ClassDEF.h
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 #ifndef CMXCPTob_ClassDEF_H
 #define CMXCPTob_ClassDEF_H
 //Put here the CLASS_DEF macros for the STL containers you put in StoreGate
diff --git a/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/CMXEtSums.h b/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/CMXEtSums.h
index 4347328ef3e2ef2786c022e099f507f17c902eaf..b64b29a21b96d0a9b039b39da1582dde04253947 100755
--- a/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/CMXEtSums.h
+++ b/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/CMXEtSums.h
@@ -1,10 +1,8 @@
+/*
+  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.                                   *
 //*                                                                         *
 //***************************************************************************/
   
diff --git a/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/CMXEtSumsCollection.h b/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/CMXEtSumsCollection.h
index 4d699e7fb898ff520b5b2bf095ccc1a7e3390a91..f9023903904662eb1d87691c4ff1040da9f4b609 100755
--- a/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/CMXEtSumsCollection.h
+++ b/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/CMXEtSumsCollection.h
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 #ifndef TRIGT1CAL_CMXEtSumsCOLLECTION_H
 #define TRIGT1CAL_CMXEtSumsCOLLECTION_H
 
diff --git a/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/CMXEtSums_ClassDEF.h b/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/CMXEtSums_ClassDEF.h
index 98cd06b1f71e48dc1da3547454e6a492bb5b54ba..cbbeb8ce756e2976efb17ac100cd834a017a5a6c 100755
--- a/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/CMXEtSums_ClassDEF.h
+++ b/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/CMXEtSums_ClassDEF.h
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 #ifndef CMXEtSums_ClassDEF_H
 #define CMXEtSums_ClassDEF_H
 //Put here the CLASS_DEF macros for the STL containers you put in StoreGate
diff --git a/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/CMXJetHits.h b/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/CMXJetHits.h
index 443013127af78674838610697e82bf3d5eeab963..76c7ddd7f796c5dcf538891160c1f2a627d620ca 100755
--- a/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/CMXJetHits.h
+++ b/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/CMXJetHits.h
@@ -1,11 +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_H
   #define CMXJetHits_H
diff --git a/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/CMXJetHitsCollection.h b/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/CMXJetHitsCollection.h
index 5fc4d7ad131cfa61f7c3b1218cb24401b75c9cf8..c9f30ef16574633594c47522b758f7111d3aeec2 100755
--- a/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/CMXJetHitsCollection.h
+++ b/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/CMXJetHitsCollection.h
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 #ifndef TRIGT1CAL_CMXJetHitsCOLLECTION_H
 #define TRIGT1CAL_CMXJetHitsCOLLECTION_H
 
diff --git a/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/CMXJetHits_ClassDEF.h b/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/CMXJetHits_ClassDEF.h
index 3c4d92c00d45d0de97b285ab2cb560151c0afd6e..dad432845737414cd61038e94e16575ed751fe61 100755
--- a/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/CMXJetHits_ClassDEF.h
+++ b/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/CMXJetHits_ClassDEF.h
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 #ifndef CMXJetHits_ClassDEF_H
 #define CMXJetHits_ClassDEF_H
 //Put here the CLASS_DEF macros for the STL containers you put in StoreGate
diff --git a/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/CMXJetTob.h b/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/CMXJetTob.h
index ebfecf67a696375b7084a197e6ce1d6cb4bcedfb..62e1038c3568d931319930d859c5bb6e71f3a073 100755
--- a/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/CMXJetTob.h
+++ b/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/CMXJetTob.h
@@ -1,11 +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_H
   #define CMXJetTob_H
diff --git a/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/CMXJetTobCollection.h b/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/CMXJetTobCollection.h
index 06b006a4f2bfe659c3a0cd4f361dbef95fd915fe..8c17d55c04f164e34b4de0c111594bebc13d2e46 100755
--- a/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/CMXJetTobCollection.h
+++ b/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/CMXJetTobCollection.h
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 #ifndef TRIGT1CAL_CMXJetTobCOLLECTION_H
 #define TRIGT1CAL_CMXJetTobCOLLECTION_H
 
diff --git a/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/CMXJetTob_ClassDEF.h b/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/CMXJetTob_ClassDEF.h
index 1c0ec3a3311c33d875d20fdb9f3299f5bb62bcbb..8fb61051bca6d37a664fd2d8e2e6bf2fe0384312 100755
--- a/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/CMXJetTob_ClassDEF.h
+++ b/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/CMXJetTob_ClassDEF.h
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 #ifndef CMXJetTob_ClassDEF_H
 #define CMXJetTob_ClassDEF_H
 //Put here the CLASS_DEF macros for the STL containers you put in StoreGate
diff --git a/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/CMXRoI.h b/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/CMXRoI.h
index 1c19fac6b2b21e502ca2e66d6c9b6ea9c816b2a2..5bb939264058e095a0bbf1295b6825bbcbb8416f 100755
--- a/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/CMXRoI.h
+++ b/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/CMXRoI.h
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 #ifndef TRIGT1CALO_CMXROI_H
 #define TRIGT1CALO_CMXROI_H
 
diff --git a/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/CPBSCollection.h b/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/CPBSCollection.h
index e9c659f1564a06e940955217d75dc379011c0410..99b65cf3107f20ee5a16536d00d823c604bf7e81 100755
--- a/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/CPBSCollection.h
+++ b/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/CPBSCollection.h
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 #ifndef TRIGT1CALO_CPBSCOLLECTION_H
 #define TRIGT1CALO_CPBSCOLLECTION_H
 
diff --git a/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/CPBSCollectionV1.h b/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/CPBSCollectionV1.h
index 00c9d634ae30987ea480e076265c79b00695aedc..9f0368805ba3222ffc6a52389555a41b85587886 100755
--- a/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/CPBSCollectionV1.h
+++ b/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/CPBSCollectionV1.h
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 #ifndef TRIGT1CALO_CPBSCOLLECTIONV1_H
 #define TRIGT1CALO_CPBSCOLLECTIONV1_H
 
diff --git a/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/CPBSCollectionV2.h b/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/CPBSCollectionV2.h
index 453f5139f57d4b5681dc7e84d637344fe57c6328..818a03475c2f1958b492df8f07cacbaf6532ee5f 100755
--- a/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/CPBSCollectionV2.h
+++ b/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/CPBSCollectionV2.h
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 #ifndef TRIGT1CALO_CPBSCOLLECTIONV2_H
 #define TRIGT1CALO_CPBSCOLLECTIONV2_H
 
diff --git a/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/CPCMXTopoData.h b/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/CPCMXTopoData.h
index 7ea969499a4d95efa02ae97051ba76cfaaf33a8f..db09849d7805409da775553b94841ee05a2ce5af 100755
--- a/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/CPCMXTopoData.h
+++ b/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/CPCMXTopoData.h
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 /* **********************************************************
 *
 * Emulation of TOB link from one CP CMX to L1Topo
diff --git a/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/CPCMXTopoDataCollection.h b/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/CPCMXTopoDataCollection.h
index 02b15f649c6ae113880878a4584fcbb3b69895ba..2aed66ea8e1b5bfd3949d9dda8d8e9123ec8732d 100755
--- a/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/CPCMXTopoDataCollection.h
+++ b/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/CPCMXTopoDataCollection.h
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 #ifndef TRIGT1CAL_CPCMXTOPODATACOLLECTION_H
 #define TRIGT1CAL_CPCMXTOPODATACOLLECTION_H
 
diff --git a/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/CPCMXTopoData_ClassDEF.h b/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/CPCMXTopoData_ClassDEF.h
index 03990ad274d6ff585a975f835d38e06395f7c13a..cccdb14d4f44ac372b20d62dae4d1efd63da59a8 100755
--- a/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/CPCMXTopoData_ClassDEF.h
+++ b/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/CPCMXTopoData_ClassDEF.h
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 #ifndef CPCMXTopoData_ClassDEF_H
 #define CPCMXTopoData_ClassDEF_H
 //Put here the CLASS_DEF macros for the STL containers you put in StoreGate
diff --git a/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/CPMCMXData.h b/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/CPMCMXData.h
index 5df0cf00c13d655c2b05a7d97a1111c8682d0c2c..ada1c728742a83c1aab303fc0d18663cbb906b9b 100644
--- a/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/CPMCMXData.h
+++ b/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/CPMCMXData.h
@@ -1,20 +1,14 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 
  //***************************************************************************
  //                           CPMCMXData.h  -  description
  //                              -------------------
  //     begin                : 04 04 2014
- //     copyright            : (C) 2013 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 CPMCMXDATA_H
   #define CPMCMXDATA_H
diff --git a/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/CPMCMXData_ClassDEF.h b/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/CPMCMXData_ClassDEF.h
index d8448d502531574d26dbda8714743b10d1167ad7..8fb0d273208355ba9ca246fa6d7e640f50ea7dad 100755
--- a/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/CPMCMXData_ClassDEF.h
+++ b/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/CPMCMXData_ClassDEF.h
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 #ifndef CPMCMXData_ClassDEF_H
 #define CPMCMXData_ClassDEF_H
 //Put here the CLASS_DEF macros for the STL containers you put in StoreGate
diff --git a/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/CPMHits.h b/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/CPMHits.h
index 02f4c8df7806f76e784f273fbb323a48d4479783..9ef882827c9c2511a9631ea7fa235fc2d9b27a3d 100755
--- a/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/CPMHits.h
+++ b/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/CPMHits.h
@@ -1,20 +1,14 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 
  //***************************************************************************
  //                           CPMHits.h  -  description
  //                              -------------------
  //     begin                : 25 05 2006
- //     copyright            : (C) 2006 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_H
   #define CPMHits_H
diff --git a/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/CPMHitsCollection.h b/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/CPMHitsCollection.h
index 294ce08d749073a994758962e814d2611a5e0c53..2f5f7335a1aa005987c3909747836e5aa38e3fed 100755
--- a/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/CPMHitsCollection.h
+++ b/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/CPMHitsCollection.h
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 #ifndef TRIGT1CAL_CPMHITSCOLLECTION_H
 #define TRIGT1CAL_CPMHITSCOLLECTION_H
 
diff --git a/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/CPMHits_ClassDEF.h b/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/CPMHits_ClassDEF.h
index 5b783f61eb5d4b14f157293b81cb63f3b546673d..37216268d6e418266df309c553b09133edb61f6c 100755
--- a/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/CPMHits_ClassDEF.h
+++ b/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/CPMHits_ClassDEF.h
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 #ifndef CPMHits_ClassDEF_H
 #define CPMHits_ClassDEF_H
 //Put here the CLASS_DEF macros for the STL containers you put in StoreGate
diff --git a/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/CPMRoI.h b/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/CPMRoI.h
index 165d281a641ffa2ef3ff81b9653a8865cd2797d9..7256734755a415966e9a71c2d36ff921fb4014ae 100755
--- a/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/CPMRoI.h
+++ b/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/CPMRoI.h
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 #ifndef TRIGT1CALO_CPMROI_H
 #define TRIGT1CALO_CPMROI_H
 
diff --git a/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/CPMRoICollection.h b/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/CPMRoICollection.h
index da0334794a73c589b4003d6a9e19eca42f9b5b27..e33edda0e2ecd8938ad6a172fcbc9da2ba9a92b0 100755
--- a/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/CPMRoICollection.h
+++ b/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/CPMRoICollection.h
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 #ifndef TRIGT1CAL_CPMRoICOLLECTION_H
 #define TRIGT1CAL_CPMRoICOLLECTION_H
 
diff --git a/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/CPMRoI_ClassDEF.h b/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/CPMRoI_ClassDEF.h
index 95ff50a2f206fe9a76804cfcd90b9ab4b7878ce2..678fe7a5a4249e2afae4b66a3de6374d7e8569b2 100755
--- a/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/CPMRoI_ClassDEF.h
+++ b/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/CPMRoI_ClassDEF.h
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 #ifndef CPMRoI_ClassDEF_H
 #define CPMRoI_ClassDEF_H
 //Put here the CLASS_DEF macros for the STL containers you put in StoreGate
diff --git a/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/CPMTobRoI.h b/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/CPMTobRoI.h
index 124be0b54b7a7e8d4f946b15f977326b55136799..6c0d6869f75d3e3797108aafdcf76d9add2b9f9a 100755
--- a/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/CPMTobRoI.h
+++ b/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/CPMTobRoI.h
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 #ifndef TRIGT1CALO_CPMTOBROI_H
 #define TRIGT1CALO_CPMTOBROI_H
 
diff --git a/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/CPMTobRoICollection.h b/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/CPMTobRoICollection.h
index 461d3bd6a985dd70951268d8b651b42d19c7f4b7..9e5aea84f6fa113a580e4fb3426b4a6b1457046c 100755
--- a/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/CPMTobRoICollection.h
+++ b/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/CPMTobRoICollection.h
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 #ifndef TRIGT1CAL_CPMTobRoICOLLECTION_H
 #define TRIGT1CAL_CPMTobRoICOLLECTION_H
 
diff --git a/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/CPMTobRoI_ClassDEF.h b/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/CPMTobRoI_ClassDEF.h
index 4636501c68e4812b206ace875018dbd8130d0a31..8fcb1f24fd09a31efa16c6c426480f2136b5c685 100755
--- a/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/CPMTobRoI_ClassDEF.h
+++ b/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/CPMTobRoI_ClassDEF.h
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 #ifndef CPMTobRoI_ClassDEF_H
 #define CPMTobRoI_ClassDEF_H
 //Put here the CLASS_DEF macros for the STL containers you put in StoreGate
diff --git a/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/CPMTower.h b/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/CPMTower.h
index 977bed741391f1761207a6586ed983f9e646ecfb..925479d8eac29afff161e362e5baca0bac715dc6 100755
--- a/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/CPMTower.h
+++ b/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/CPMTower.h
@@ -1,20 +1,14 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 
  //***************************************************************************
  //                           CPMTower.h  -  description
  //                              -------------------
  //     begin                : Thurs Dec 14 2006
- //     copyright            : (C) 2006 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_H
 #define CPMTower_H
diff --git a/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/CPMTowerCollection.h b/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/CPMTowerCollection.h
index d3d3f4c258564f8485ac95dd996531766435a3a9..7b11540ec5eba19746e55e77ff1a638b657ff6f4 100755
--- a/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/CPMTowerCollection.h
+++ b/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/CPMTowerCollection.h
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 #ifndef TRIGT1CAL_CPMTowerCOLLECTION_H
 #define TRIGT1CAL_CPMTowerCOLLECTION_H
 
diff --git a/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/CPMTower_ClassDEF.h b/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/CPMTower_ClassDEF.h
index 278139f69f8250c2b3ff4228dc2b27d6e4dd6fd4..2330f0e5db66b0385e96029469e3bc102e51850f 100755
--- a/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/CPMTower_ClassDEF.h
+++ b/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/CPMTower_ClassDEF.h
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 #ifndef CPMTower_ClassDEF_H
 #define CPMTower_ClassDEF_H
 //Put here the CLASS_DEF macros for the STL containers you put in StoreGate
diff --git a/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/CPTopoTOB.h b/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/CPTopoTOB.h
index fcc63526d9b55998ff6d5708ef17e7885bf44fae..1c3ae4607d40015ad558e85951ac349cb2c91264 100755
--- a/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/CPTopoTOB.h
+++ b/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/CPTopoTOB.h
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 #ifndef TRIGT1CALO_CPTOPOTOB_H
 #define TRIGT1CALO_CPTOPOTOB_H
 
diff --git a/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/EmTauROI.h b/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/EmTauROI.h
index 114543abad85aced1ad376040040198b89a95eac..7bdf990a418b5ad261f39f7674cafeb5993fca5c 100755
--- a/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/EmTauROI.h
+++ b/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/EmTauROI.h
@@ -1,19 +1,13 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 /***************************************************************************
                           emtauroi.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 EMTAUROI_H
 #define EMTAUROI_H
diff --git a/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/EmTauROI_ClassDEF.h b/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/EmTauROI_ClassDEF.h
index 0f1201f38b7e8fb50f9150935f26c1b65b5f023b..026e4575cce98923b3fcd6e240d509f919688571 100755
--- a/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/EmTauROI_ClassDEF.h
+++ b/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/EmTauROI_ClassDEF.h
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 #ifndef EmTauROI_ClassDEF_H
 #define EmTauROI_ClassDEF_H
 //Put here the CLASS_DEF macros for the STL containers you put in StoreGate
diff --git a/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/EnergyCMXData.h b/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/EnergyCMXData.h
index 11a3fb712bc70195167bb41b744361cbfb7133a0..9d5ebb51b1c951c549aeb5c5a5e5a8155f35443a 100644
--- a/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/EnergyCMXData.h
+++ b/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/EnergyCMXData.h
@@ -1,20 +1,14 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 
  //***************************************************************************
  //                           EnergyCMXData.h  -  description
  //                              -------------------
  //     begin                : 04 04 2014
- //     copyright            : (C) 2013 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 ENERGYCMXDATA_H
   #define ENERGYCMXDATA_H
diff --git a/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/EnergyCMXData_ClassDEF.h b/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/EnergyCMXData_ClassDEF.h
index 0ec8c8d986a1f23229123bbc5a8f229d3c54e27a..649a347ec31d734b86a201c8f5fc102b688c05da 100755
--- a/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/EnergyCMXData_ClassDEF.h
+++ b/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/EnergyCMXData_ClassDEF.h
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 #ifndef EnergyCMXData_ClassDEF_H
 #define EnergyCMXData_ClassDEF_H
 //Put here the CLASS_DEF macros for the STL containers you put in StoreGate
diff --git a/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/EnergyRoI.h b/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/EnergyRoI.h
index 6e92c49ba6bd237f98af1ecb2f84957e760ec11f..dc82a0ba7422eb8a1c65b1306de6911086e1a888 100755
--- a/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/EnergyRoI.h
+++ b/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/EnergyRoI.h
@@ -1,19 +1,13 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 /***************************************************************************
                           EnergyRoI.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 EnergyRoI_H
 #define EnergyRoI_H
diff --git a/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/EnergyRoI_ClassDEF.h b/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/EnergyRoI_ClassDEF.h
index 3f0455f06b5a43ce48d94464588cf3acd48c5072..ace01c88c7f58915013670ee30ff1fb921abcf84 100755
--- a/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/EnergyRoI_ClassDEF.h
+++ b/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/EnergyRoI_ClassDEF.h
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 #ifndef ENERGYROI_CLASSDEF_H
 #define ENERGYROI_CLASSDEF_H
 //Put here the CLASS_DEF macros for the STL containers you put in StoreGate
diff --git a/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/EnergyTopoData.h b/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/EnergyTopoData.h
index 141e21ba2cc1e74690fa4dfd2e7fd691ed768020..03519be7f9a24fdc89f2f613ea0f89b07db742e0 100755
--- a/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/EnergyTopoData.h
+++ b/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/EnergyTopoData.h
@@ -1,19 +1,13 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 /***************************************************************************
                           EnergyTopoData.h  -  description
                              -------------------
     begin                : Tuesday September 02 2014
-    copyright            : (C) 2014 by Ala 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 EnergyTopoData_H
 #define EnergyTopoData_H
diff --git a/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/EnergyTopoData_ClassDEF.h b/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/EnergyTopoData_ClassDEF.h
index 074339f401b9dae3ef332ad56291315456576f55..589c2dd6370e954eb39eede7d8c171bc02be836f 100755
--- a/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/EnergyTopoData_ClassDEF.h
+++ b/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/EnergyTopoData_ClassDEF.h
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 #ifndef ENERGYTOPODATA_CLASSDEF_H
 #define ENERGYTOPODATA_CLASSDEF_H
 //Put here the CLASS_DEF macros for the STL containers you put in StoreGate
diff --git a/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/JEMEtSums.h b/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/JEMEtSums.h
index e5a9807a4bff96348722d27bf556e494c17a63b3..aea389cbc84c0ad36ac112b6519d056d8e4e4d0d 100755
--- a/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/JEMEtSums.h
+++ b/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/JEMEtSums.h
@@ -1,20 +1,14 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 
  //***************************************************************************
  //                           JEMEtSums.h  -  description
  //                              -------------------
  //     begin                : 25 05 2006
- //     copyright            : (C) 2006 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_H
   #define JEMEtSums_H
diff --git a/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/JEMEtSumsCollection.h b/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/JEMEtSumsCollection.h
index 64f4a530c0ba02bebc5fc20572e662c962545ec9..87bec5d2aedd0349b8ea4dc2b649ce9478ac3199 100755
--- a/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/JEMEtSumsCollection.h
+++ b/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/JEMEtSumsCollection.h
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 #ifndef TRIGT1CAL_JEMEtSumsCOLLECTION_H
 #define TRIGT1CAL_JEMEtSumsCOLLECTION_H
 
diff --git a/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/JEMEtSums_ClassDEF.h b/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/JEMEtSums_ClassDEF.h
index bceda934b86180db66a13c032d7465f5f9f0b126..847bcf14e03d3b69d591b421aafde9f81caa57ea 100755
--- a/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/JEMEtSums_ClassDEF.h
+++ b/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/JEMEtSums_ClassDEF.h
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 #ifndef JEMEtSums_ClassDEF_H
 #define JEMEtSums_ClassDEF_H
 //Put here the CLASS_DEF macros for the STL containers you put in StoreGate
diff --git a/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/JEMHits.h b/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/JEMHits.h
index 7829f3d501404f7abb1c43b7f74302ca1e48cd8a..c44e2895b63a4c4f7619a03773464a5fd11d48a6 100755
--- a/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/JEMHits.h
+++ b/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/JEMHits.h
@@ -1,20 +1,14 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 
  //***************************************************************************
  //                           JEMHits.h  -  description
  //                              -------------------
  //     begin                : 25 05 2006
- //     copyright            : (C) 2006 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_H
   #define JEMHits_H
diff --git a/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/JEMHitsCollection.h b/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/JEMHitsCollection.h
index d93709e3f7f6aef1add4215540d852014472758f..b2a9f3fcf8e6e934b69adc86f2a5375187138c38 100755
--- a/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/JEMHitsCollection.h
+++ b/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/JEMHitsCollection.h
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 #ifndef TRIGT1CAL_JEMHitsCOLLECTION_H
 #define TRIGT1CAL_JEMHitsCOLLECTION_H
 
diff --git a/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/JEMHits_ClassDEF.h b/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/JEMHits_ClassDEF.h
index cf8c80aaf8f844f2615f60afa651d4506fea8fb9..94ca13693c16a6d5f544f79c345d040f6820343b 100755
--- a/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/JEMHits_ClassDEF.h
+++ b/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/JEMHits_ClassDEF.h
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 #ifndef JEMHits_ClassDEF_H
 #define JEMHits_ClassDEF_H
 //Put here the CLASS_DEF macros for the STL containers you put in StoreGate
diff --git a/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/JEMRoI.h b/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/JEMRoI.h
index 6e1e57e9f217e5d6bbdfbc696de49d8de2ad243a..6652807edc487e6840db49209701a4e3b00bf6b9 100755
--- a/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/JEMRoI.h
+++ b/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/JEMRoI.h
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 #ifndef TRIGT1CALO_JEMROI_H
 #define TRIGT1CALO_JEMROI_H
 
diff --git a/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/JEMRoICollection.h b/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/JEMRoICollection.h
index bf28ff196a291aee74975a1c9b2f19a8fa0712f4..847ef66e3251dd013a4b5c92cce0637a00803595 100755
--- a/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/JEMRoICollection.h
+++ b/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/JEMRoICollection.h
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 #ifndef TRIGT1CAL_JEMRoICOLLECTION_H
 #define TRIGT1CAL_JEMRoICOLLECTION_H
 
diff --git a/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/JEMRoI_ClassDEF.h b/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/JEMRoI_ClassDEF.h
index ba852190c21b6da146ec8b9e94ac18a769197d69..eb92b5f55c7418578feb1ba6420a0ce4afe0d0dc 100755
--- a/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/JEMRoI_ClassDEF.h
+++ b/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/JEMRoI_ClassDEF.h
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 #ifndef JEMRoI_ClassDEF_H
 #define JEMRoI_ClassDEF_H
 //Put here the CLASS_DEF macros for the STL containers you put in StoreGate
diff --git a/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/JEMTobRoI.h b/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/JEMTobRoI.h
index 4b25ef5541aa2a3369fbecb9a2a6f3973f8556fd..0d22199c0a58ce4cda1a39c6033e02cca4b15890 100755
--- a/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/JEMTobRoI.h
+++ b/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/JEMTobRoI.h
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 #ifndef TRIGT1CALO_JEMTOBROI_H
 #define TRIGT1CALO_JEMTOBROI_H
 
diff --git a/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/JEMTobRoICollection.h b/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/JEMTobRoICollection.h
index 6fec619faaade16906199c5aeda41b174cb0a078..bd2f702f20358d3961c2e41bb1f4fe120f16305d 100755
--- a/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/JEMTobRoICollection.h
+++ b/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/JEMTobRoICollection.h
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 #ifndef TRIGT1CAL_JEMTobRoICOLLECTION_H
 #define TRIGT1CAL_JEMTobRoICOLLECTION_H
 
diff --git a/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/JEMTobRoI_ClassDEF.h b/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/JEMTobRoI_ClassDEF.h
index 59dd1416501d8af2b7cd763e77d0049ec8520b4d..a85f6462d9363b3418b514d68ee910589fca5aa0 100755
--- a/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/JEMTobRoI_ClassDEF.h
+++ b/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/JEMTobRoI_ClassDEF.h
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 #ifndef JEMTobRoI_ClassDEF_H
 #define JEMTobRoI_ClassDEF_H
 //Put here the CLASS_DEF macros for the STL containers you put in StoreGate
diff --git a/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/JEPBSCollection.h b/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/JEPBSCollection.h
index a566a19986a2637527a38ca3412be84887e3b63b..ea0cb06ace2b489391364514fc4d20139f66adc8 100755
--- a/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/JEPBSCollection.h
+++ b/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/JEPBSCollection.h
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 #ifndef TRIGT1CALO_JEPBSCOLLECTION_H
 #define TRIGT1CALO_JEPBSCOLLECTION_H
 
diff --git a/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/JEPBSCollectionV1.h b/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/JEPBSCollectionV1.h
index 6d2ce1976a1f663a68f5c5234811afe2768ea237..46c8281da5c804b42e190b65a1651e646e5fc0ed 100755
--- a/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/JEPBSCollectionV1.h
+++ b/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/JEPBSCollectionV1.h
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 #ifndef TRIGT1CALO_JEPBSCOLLECTIONV1_H
 #define TRIGT1CALO_JEPBSCOLLECTIONV1_H
 
diff --git a/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/JEPBSCollectionV2.h b/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/JEPBSCollectionV2.h
index 0a96a516e6e328ad967a6872a88bdc983ebbc7c2..1abd8c1d381141c96392851181e45cc62323d968 100755
--- a/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/JEPBSCollectionV2.h
+++ b/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/JEPBSCollectionV2.h
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 #ifndef TRIGT1CALO_JEPBSCOLLECTIONV2_H
 #define TRIGT1CALO_JEPBSCOLLECTIONV2_H
 
diff --git a/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/JEPRoIBSCollection.h b/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/JEPRoIBSCollection.h
index 7140ebd9c40fb609cdc780d9b47294e400c29d20..1d5a9050f1e1a6700acb488e63659c78337fb41c 100755
--- a/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/JEPRoIBSCollection.h
+++ b/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/JEPRoIBSCollection.h
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 #ifndef TRIGT1CALO_JEPROIBSCOLLECTION_H
 #define TRIGT1CALO_JEPROIBSCOLLECTION_H
 
diff --git a/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/JEPRoIBSCollectionV1.h b/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/JEPRoIBSCollectionV1.h
index 5d2edbdc466b1c587d13db0c2c2206b0b718a8b0..8a6d0577596b8e104bfaf213b85ed69f0f6a141b 100755
--- a/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/JEPRoIBSCollectionV1.h
+++ b/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/JEPRoIBSCollectionV1.h
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 #ifndef TRIGT1CALO_JEPROIBSCOLLECTIONV1_H
 #define TRIGT1CALO_JEPROIBSCOLLECTIONV1_H
 
diff --git a/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/JEPRoIBSCollectionV2.h b/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/JEPRoIBSCollectionV2.h
index f2567af875eb587d9ab01aed2c88262f686379a1..283b6c04e1c7ee7009d05ad677faaebc84694786 100755
--- a/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/JEPRoIBSCollectionV2.h
+++ b/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/JEPRoIBSCollectionV2.h
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 #ifndef TRIGT1CALO_JEPROIBSCOLLECTIONV2_H
 #define TRIGT1CALO_JEPROIBSCOLLECTIONV2_H
 
diff --git a/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/JetCMXData.h b/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/JetCMXData.h
index 7634d7efeb2381a020ead6eefd3ec66ca2144785..8fe3e3bd96244bb1d6580ad00a8b056ab249f92c 100644
--- a/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/JetCMXData.h
+++ b/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/JetCMXData.h
@@ -1,20 +1,14 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 
  //***************************************************************************
  //                           JetCMXData.h  -  description
  //                              -------------------
  //     begin                : 04 04 2014
- //     copyright            : (C) 2013 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 JETCMXDATA_H
   #define JETCMXDATA_H
diff --git a/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/JetCMXData_ClassDEF.h b/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/JetCMXData_ClassDEF.h
index a7e4807cdbc9f3926955c544284532aa62db79a0..253e3dd97620ba6155d8ca183c9b889a94dd74e0 100755
--- a/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/JetCMXData_ClassDEF.h
+++ b/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/JetCMXData_ClassDEF.h
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 #ifndef JetCMXData_ClassDEF_H
 #define JetCMXData_ClassDEF_H
 //Put here the CLASS_DEF macros for the STL containers you put in StoreGate
diff --git a/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/JetCMXTopoData.h b/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/JetCMXTopoData.h
index 052e2d876952d5f819a4618b0071aae850cb6637..28b7b3733c33d071a4a1387fa70be66e68c93dcb 100755
--- a/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/JetCMXTopoData.h
+++ b/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/JetCMXTopoData.h
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 /* **********************************************************
 *
 * Emulation of TOB link from one CP CMX to L1Topo
diff --git a/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/JetCMXTopoDataCollection.h b/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/JetCMXTopoDataCollection.h
index 46a6875b41eb43229e3403ee664a8d58efbffdca..41a507fbdfc9bc6518dc15bfe29f612e14bc039f 100644
--- a/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/JetCMXTopoDataCollection.h
+++ b/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/JetCMXTopoDataCollection.h
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 #ifndef TRIGT1CAL_JETCMXTOPODATACOLLECTION_H
 #define TRIGT1CAL_JETCMXTOPODATACOLLECTION_H
 
diff --git a/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/JetCMXTopoData_ClassDEF.h b/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/JetCMXTopoData_ClassDEF.h
index 557d53332434533890670ede1310fc3cbb111344..e18581f8b023135b6ef2d9f66a5449da5383513e 100644
--- a/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/JetCMXTopoData_ClassDEF.h
+++ b/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/JetCMXTopoData_ClassDEF.h
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 #ifndef JetCMXTopoData_ClassDEF_H
 #define JetCMXTopoData_ClassDEF_H
 //Put here the CLASS_DEF macros for the STL containers you put in StoreGate
diff --git a/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/JetElement.h b/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/JetElement.h
index 93c62c254ce1011a2b1c31a0b6bd43f175495c76..4f93f7cde391443e615bf794edb7e43e64917f65 100755
--- a/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/JetElement.h
+++ b/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/JetElement.h
@@ -1,20 +1,14 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 
 //***************************************************************************
 //                           JetElement.h  -  description
 //                              -------------------
 //     begin                : Mon Sep 25 2000
-//     copyright            : (C) 2000 by Edward Moyse
 //     email                : e.moyse@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 JetElement_H
 #define JetElement_H
diff --git a/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/JetElementCollection.h b/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/JetElementCollection.h
index a0606e93d968d33599f6bdaab67d0158d05f1978..dfc41a57583029bc874903ed6f250fff4ea50f17 100755
--- a/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/JetElementCollection.h
+++ b/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/JetElementCollection.h
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 #ifndef TRIGT1CALO_JETELEMENTCOLLECTION
 #define TRIGT1CALO_JETELEMENTCOLLECTION
 
diff --git a/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/JetElement_ClassDEF.h b/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/JetElement_ClassDEF.h
index 31a79eab2ec3b002cb870d57dddfdae57b136244..ff8e1fd174e8c193030304de27ae9e766e24f21f 100755
--- a/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/JetElement_ClassDEF.h
+++ b/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/JetElement_ClassDEF.h
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 #ifndef JetElement_ClassDEF_H
 #define JetElement_ClassDEF_H
 //Put here the CLASS_DEF macros for the STL containers you put in StoreGate
diff --git a/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/JetEtRoI.h b/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/JetEtRoI.h
index 1b9ba2c8aa9da2a5c8cdfcb3357b605ce0c9cf0a..62559a39387356ff63090c169dfdf410566fc685 100755
--- a/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/JetEtRoI.h
+++ b/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/JetEtRoI.h
@@ -1,19 +1,13 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 /***************************************************************************
                           JetEtRoI.h  -  description
                              -------------------
     begin                : Thursday 2 Feb 2006
-    copyright            : (C) 2006 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 JetEtRoI_H
 #define JetEtRoI_H
diff --git a/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/JetEtRoI_ClassDEF.h b/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/JetEtRoI_ClassDEF.h
index 2de962a2fa4f11d0d28f97d0edc45ec974e1c4f3..7ec69ac3a431cb77239dfadb8261d26622178591 100755
--- a/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/JetEtRoI_ClassDEF.h
+++ b/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/JetEtRoI_ClassDEF.h
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 #ifndef JETETROI_CLASSDEF_H
 #define JETETROI_CLASSDEF_H
 //Put here the CLASS_DEF macros for the STL containers you put in StoreGate
diff --git a/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/JetInput.h b/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/JetInput.h
index 726eab88b97ff5fb4975c4977ca7296c8e225e32..858cfd6c65073b0190c179f853517c857c79e896 100755
--- a/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/JetInput.h
+++ b/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/JetInput.h
@@ -1,20 +1,14 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 
  //***************************************************************************
  //                           JetInput.h  -  description
  //                              -------------------
  //     begin                : Tue 17 Jan 2006
- //     copyright            : (C) 2006 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 JetInput_H
   #define JetInput_H
diff --git a/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/JetInput_ClassDEF.h b/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/JetInput_ClassDEF.h
index 4ffcf05cafdfb72f92f2b4ad6a7721f7c18fcf8a..7ac48cc107505ac17b28359b8823f69d3c382d47 100755
--- a/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/JetInput_ClassDEF.h
+++ b/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/JetInput_ClassDEF.h
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 #ifndef JetInput_ClassDEF_H
 #define JetInput_ClassDEF_H
 //Put here the CLASS_DEF macros for the STL containers you put in StoreGate
diff --git a/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/JetROI.h b/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/JetROI.h
index 408fd7ae43a9f7c951fb4cf8b5f20ac4fec20095..29ea23345779d82e68d8b7e18a60d52cc8d94eaa 100755
--- a/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/JetROI.h
+++ b/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/JetROI.h
@@ -1,19 +1,13 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 /***************************************************************************
                           Jetroi.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 JetROI_H
 #define JetROI_H
diff --git a/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/JetROI_ClassDEF.h b/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/JetROI_ClassDEF.h
index f8a2e29f6e0382d393616108692cffee08d5bbc8..02ef53cfea6e46b6e00c0df479aa5ba186f77aa8 100755
--- a/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/JetROI_ClassDEF.h
+++ b/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/JetROI_ClassDEF.h
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 #ifndef JetROI_ClassDEF_H
 #define JetROI_ClassDEF_H
 //Put here the CLASS_DEF macros for the STL containers you put in StoreGate
diff --git a/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/JetTopoTOB.h b/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/JetTopoTOB.h
index 098949297d63a896d14a93973d7b7108957ccc58..8d4af1767db34e97e3f00fdcab2ffcdf9154c047 100755
--- a/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/JetTopoTOB.h
+++ b/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/JetTopoTOB.h
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 #ifndef TRIGT1CALO_JETTOPOTOB_H
 #define TRIGT1CALO_JETTOPOTOB_H
 
diff --git a/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/RODHeader.h b/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/RODHeader.h
index 2e54cd47f928ceff5a4744dd7f0dca45f0690577..38fa2281cbd81bc18c7ead750d3c192d7a3b85a0 100644
--- a/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/RODHeader.h
+++ b/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/RODHeader.h
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 #ifndef TRIGT1CALO_RODHEADER_H
 #define TRIGT1CALO_RODHEADER_H
 
diff --git a/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/RODHeaderCollection.h b/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/RODHeaderCollection.h
index fc6f1ef41e26b0df3e831ff873ab1d67c6bd3f90..531815d2a0342f8ff927949635fe4f09bae8250a 100755
--- a/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/RODHeaderCollection.h
+++ b/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/RODHeaderCollection.h
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 #ifndef TRIGT1CAL_RODHeaderCOLLECTION_H
 #define TRIGT1CAL_RODHeaderCOLLECTION_H
 
diff --git a/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/RODHeader_ClassDEF.h b/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/RODHeader_ClassDEF.h
index c07af92ed24e543f6ea632825adf3a16ca0f51f0..6caee5f8c3ab0ac7893ed87e69360ee116eda58b 100644
--- a/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/RODHeader_ClassDEF.h
+++ b/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/RODHeader_ClassDEF.h
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 #ifndef RODHeader_ClassDEF_H
 #define RODHeader_ClassDEF_H
 //Put here the CLASS_DEF macros for the STL containers you put in StoreGate
diff --git a/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/TrigT1CaloEventDict.h b/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/TrigT1CaloEventDict.h
index fd17c138d556c38c87349003aee0aa05a5ab9dd1..aaba186fb4e50a369e342fd3faec57bf4b6d41bd 100755
--- a/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/TrigT1CaloEventDict.h
+++ b/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/TrigT1CaloEventDict.h
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 #ifndef TRIGT1CALO_TRIGT1CALODICT_H
 #define TRIGT1CALO_TRIGT1CALODICT_H
 
diff --git a/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/TriggerTower.h b/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/TriggerTower.h
index a0a1377f4402ef0f88436a0c69d14b8d0604e0be..7685ec6146aeb91a3300332d4e9ef1d21c10090b 100755
--- a/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/TriggerTower.h
+++ b/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/TriggerTower.h
@@ -1,20 +1,14 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 
  //***************************************************************************
  //                           TriggerTower.h  -  description
  //                              -------------------
  //     begin                : Mon Sep 25 2000
- //     copyright            : (C) 2000 by Edward Moyse
  //     email                : e.moyse@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 TriggerTower_H
 #define TriggerTower_H
diff --git a/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/TriggerTowerCollection.h b/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/TriggerTowerCollection.h
index b8e2b6ec562bc752e890735cb8879aa794ba4916..4abdc6bf3de6c40a929643582040b233d61cb561 100755
--- a/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/TriggerTowerCollection.h
+++ b/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/TriggerTowerCollection.h
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 #ifndef TRIGT1CAL_TRIGGERTOWERCOLLECTION_H
 #define TRIGT1CAL_TRIGGERTOWERCOLLECTION_H
 
diff --git a/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/TriggerTower_ClassDEF.h b/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/TriggerTower_ClassDEF.h
index b937ec7c90cd9607694191d369096156e374f011..a4f9c6ffd022f3c36b1c36ab46c4f0c3f676e698 100755
--- a/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/TriggerTower_ClassDEF.h
+++ b/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/TriggerTower_ClassDEF.h
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 #ifndef TriggerTower_ClassDEF_H
 #define TriggerTower_ClassDEF_H
 //Put here the CLASS_DEF macros for the STL containers you put in StoreGate
diff --git a/Trigger/TrigT1/TrigT1CaloEvent/src/CMMCPHits.cxx b/Trigger/TrigT1/TrigT1CaloEvent/src/CMMCPHits.cxx
index 5ecd62fcf7449573df78edb6547ba51c9f48a868..6705f1b347ca367ce3c9ac1ca89e72f6c602174f 100755
--- a/Trigger/TrigT1/TrigT1CaloEvent/src/CMMCPHits.cxx
+++ b/Trigger/TrigT1/TrigT1CaloEvent/src/CMMCPHits.cxx
@@ -1,19 +1,13 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 /***************************************************************************
                           CMMCPHits.cpp  -  description
                              -------------------
     begin                : 25 05 2006
-    copyright            : (C) 2006 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.                                   *
- *                                                                         *
- ***************************************************************************/
 
 
 
diff --git a/Trigger/TrigT1/TrigT1CaloEvent/src/CMMEtSums.cxx b/Trigger/TrigT1/TrigT1CaloEvent/src/CMMEtSums.cxx
index 93b0a244bbc85a81f2eec8985a36c3fcc59076ff..8e9ea8ed9ff5799d117bf7a58cd4f20f0e77747a 100755
--- a/Trigger/TrigT1/TrigT1CaloEvent/src/CMMEtSums.cxx
+++ b/Trigger/TrigT1/TrigT1CaloEvent/src/CMMEtSums.cxx
@@ -1,19 +1,13 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 /***************************************************************************
                           CMMEtSums.cpp  -  description
                              -------------------
     begin                : 25 05 2006
-    copyright            : (C) 2006 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.                                   *
- *                                                                         *
- ***************************************************************************/
 
 
 
diff --git a/Trigger/TrigT1/TrigT1CaloEvent/src/CMMJetHits.cxx b/Trigger/TrigT1/TrigT1CaloEvent/src/CMMJetHits.cxx
index 1184ed1fa2af2ceaf059c8591f283868e31e433a..34ccb2c7a0a878e983c09823f3b9d04501d55712 100755
--- a/Trigger/TrigT1/TrigT1CaloEvent/src/CMMJetHits.cxx
+++ b/Trigger/TrigT1/TrigT1CaloEvent/src/CMMJetHits.cxx
@@ -1,19 +1,13 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 /***************************************************************************
                           CMMJetHits.cpp  -  description
                              -------------------
     begin                : 25 05 2006
-    copyright            : (C) 2006 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.                                   *
- *                                                                         *
- ***************************************************************************/
 
 
 
diff --git a/Trigger/TrigT1/TrigT1CaloEvent/src/CMMRoI.cxx b/Trigger/TrigT1/TrigT1CaloEvent/src/CMMRoI.cxx
index 15442bcd30f82e0a7c8fb46f87ae30c6809f2fb3..ea618ddb0633419ceee09c2c63be3f476778fa0f 100755
--- a/Trigger/TrigT1/TrigT1CaloEvent/src/CMMRoI.cxx
+++ b/Trigger/TrigT1/TrigT1CaloEvent/src/CMMRoI.cxx
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 
 #include "TrigT1CaloEvent/CMMRoI.h"
 
diff --git a/Trigger/TrigT1/TrigT1CaloEvent/src/CMXCPHits.cxx b/Trigger/TrigT1/TrigT1CaloEvent/src/CMXCPHits.cxx
index c552c3f4674100909915025688a1a30e2ba686aa..e35ccdd3f0c96f6fed8b39465855dbd02001d4c3 100755
--- a/Trigger/TrigT1/TrigT1CaloEvent/src/CMXCPHits.cxx
+++ b/Trigger/TrigT1/TrigT1CaloEvent/src/CMXCPHits.cxx
@@ -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.                                   *
- *                                                                         *
- ***************************************************************************/
 
 
 
diff --git a/Trigger/TrigT1/TrigT1CaloEvent/src/CMXCPTob.cxx b/Trigger/TrigT1/TrigT1CaloEvent/src/CMXCPTob.cxx
index e6bcecaac5038b8b6e1fec46ccac67a782ac22a1..e7c8c2ddecc3dc6cfd3900d180540866a46a040e 100755
--- a/Trigger/TrigT1/TrigT1CaloEvent/src/CMXCPTob.cxx
+++ b/Trigger/TrigT1/TrigT1CaloEvent/src/CMXCPTob.cxx
@@ -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.                                   *
- *                                                                         *
- ***************************************************************************/
 
 
 
diff --git a/Trigger/TrigT1/TrigT1CaloEvent/src/CMXEtSums.cxx b/Trigger/TrigT1/TrigT1CaloEvent/src/CMXEtSums.cxx
index e7897e42ce1020c885f4ca54eeb8786cc4fbed02..25a70e1d424994a3670cd382e70440231e9b73c3 100755
--- a/Trigger/TrigT1/TrigT1CaloEvent/src/CMXEtSums.cxx
+++ b/Trigger/TrigT1/TrigT1CaloEvent/src/CMXEtSums.cxx
@@ -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.                                   *
- *                                                                         *
- ***************************************************************************/
 
 
 
diff --git a/Trigger/TrigT1/TrigT1CaloEvent/src/CMXJetHits.cxx b/Trigger/TrigT1/TrigT1CaloEvent/src/CMXJetHits.cxx
index 8a567e1929f1e6453ca5058ce21a3765341ba27b..98234d3a5367b50b8a0f8f70cf867dfb3ee936bd 100755
--- a/Trigger/TrigT1/TrigT1CaloEvent/src/CMXJetHits.cxx
+++ b/Trigger/TrigT1/TrigT1CaloEvent/src/CMXJetHits.cxx
@@ -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.                                   *
- *                                                                         *
- ***************************************************************************/
 
 
 
diff --git a/Trigger/TrigT1/TrigT1CaloEvent/src/CMXJetTob.cxx b/Trigger/TrigT1/TrigT1CaloEvent/src/CMXJetTob.cxx
index ecc60f3b38eed1f3109c0ae01bebfaee0b1d116e..f07f78a7524340e11084302a868a9f3dbc95d201 100755
--- a/Trigger/TrigT1/TrigT1CaloEvent/src/CMXJetTob.cxx
+++ b/Trigger/TrigT1/TrigT1CaloEvent/src/CMXJetTob.cxx
@@ -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.                                   *
- *                                                                         *
- ***************************************************************************/
 
 
 
diff --git a/Trigger/TrigT1/TrigT1CaloEvent/src/CMXRoI.cxx b/Trigger/TrigT1/TrigT1CaloEvent/src/CMXRoI.cxx
index 5582920c0d84dd4efbaebd69282148082d34fd23..5f4192af84c8b6c1e9c10b9012ac036e0b824227 100755
--- a/Trigger/TrigT1/TrigT1CaloEvent/src/CMXRoI.cxx
+++ b/Trigger/TrigT1/TrigT1CaloEvent/src/CMXRoI.cxx
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 
 #include "TrigT1CaloEvent/CMXRoI.h"
 
diff --git a/Trigger/TrigT1/TrigT1CaloEvent/src/CPBSCollection.cxx b/Trigger/TrigT1/TrigT1CaloEvent/src/CPBSCollection.cxx
index 1d3b705bac9fe35dfb555ff3c0882fc7b2637b66..113a3e09f2236e22722b1c38d2ea4ea2f7c71fc0 100755
--- a/Trigger/TrigT1/TrigT1CaloEvent/src/CPBSCollection.cxx
+++ b/Trigger/TrigT1/TrigT1CaloEvent/src/CPBSCollection.cxx
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 
 #include "TrigT1CaloEvent/CMMCPHits.h"
 #include "TrigT1CaloEvent/CPMHits.h"
diff --git a/Trigger/TrigT1/TrigT1CaloEvent/src/CPBSCollectionV1.cxx b/Trigger/TrigT1/TrigT1CaloEvent/src/CPBSCollectionV1.cxx
index 235ebb0a9b156f031917cac6874c91653409bf88..a500f07e10ebb6bfe38178506ab21c6904309e31 100755
--- a/Trigger/TrigT1/TrigT1CaloEvent/src/CPBSCollectionV1.cxx
+++ b/Trigger/TrigT1/TrigT1CaloEvent/src/CPBSCollectionV1.cxx
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 
 #include "TrigT1CaloEvent/CMMCPHits.h"
 #include "TrigT1CaloEvent/CPMHits.h"
diff --git a/Trigger/TrigT1/TrigT1CaloEvent/src/CPBSCollectionV2.cxx b/Trigger/TrigT1/TrigT1CaloEvent/src/CPBSCollectionV2.cxx
index 68c23c1014cfbc1f309765d2ca84350ade1ed043..51941be244f27d487d5fc554dfac97177bc607d0 100755
--- a/Trigger/TrigT1/TrigT1CaloEvent/src/CPBSCollectionV2.cxx
+++ b/Trigger/TrigT1/TrigT1CaloEvent/src/CPBSCollectionV2.cxx
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 
 #include "TrigT1CaloEvent/CMXCPHits.h"
 #include "TrigT1CaloEvent/CMXCPTob.h"
diff --git a/Trigger/TrigT1/TrigT1CaloEvent/src/CPCMXTopoData.cxx b/Trigger/TrigT1/TrigT1CaloEvent/src/CPCMXTopoData.cxx
index 49ecbbead42f6b11a6905b45ea5d926522e67a9b..d7cf6e2a5e19e1eb5e5ef4b2676cc2a30a842a1b 100755
--- a/Trigger/TrigT1/TrigT1CaloEvent/src/CPCMXTopoData.cxx
+++ b/Trigger/TrigT1/TrigT1CaloEvent/src/CPCMXTopoData.cxx
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 
 // Local include(s):
 #include "TrigT1CaloEvent/CPCMXTopoData.h"
diff --git a/Trigger/TrigT1/TrigT1CaloEvent/src/CPMCMXData.cxx b/Trigger/TrigT1/TrigT1CaloEvent/src/CPMCMXData.cxx
index 3add77719a59fec2d7a6cf1d1eb28fb6ba0c7a6f..2de3d78c1f6ce9835b6685826a6772e91300cf24 100755
--- a/Trigger/TrigT1/TrigT1CaloEvent/src/CPMCMXData.cxx
+++ b/Trigger/TrigT1/TrigT1CaloEvent/src/CPMCMXData.cxx
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 
 #include "TrigT1CaloEvent/CPMCMXData.h"
 
diff --git a/Trigger/TrigT1/TrigT1CaloEvent/src/CPMHits.cxx b/Trigger/TrigT1/TrigT1CaloEvent/src/CPMHits.cxx
index 3bd3f8a9182ab462d3d1830df86064f8bbd77954..389a0aaee4886724f911009a6d95559afcb7edb1 100755
--- a/Trigger/TrigT1/TrigT1CaloEvent/src/CPMHits.cxx
+++ b/Trigger/TrigT1/TrigT1CaloEvent/src/CPMHits.cxx
@@ -1,19 +1,13 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 /***************************************************************************
                           CPMHits.cpp  -  description
                              -------------------
     begin                : 25 05 2006
-    copyright            : (C) 2006 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.                                   *
- *                                                                         *
- ***************************************************************************/
 
 
 
diff --git a/Trigger/TrigT1/TrigT1CaloEvent/src/CPMRoI.cxx b/Trigger/TrigT1/TrigT1CaloEvent/src/CPMRoI.cxx
index e52f73ad2dae79b57d4eab3e983cde2d464b0759..7d74aa931eb16dad617b72894b05b5ffb3b4eb69 100755
--- a/Trigger/TrigT1/TrigT1CaloEvent/src/CPMRoI.cxx
+++ b/Trigger/TrigT1/TrigT1CaloEvent/src/CPMRoI.cxx
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 
 #include "TrigT1CaloEvent/CPMRoI.h"
 
diff --git a/Trigger/TrigT1/TrigT1CaloEvent/src/CPMTobRoI.cxx b/Trigger/TrigT1/TrigT1CaloEvent/src/CPMTobRoI.cxx
index e2a2b4dab456b6e9577ae5025942bd63e7f2e54c..41c8f9b33b3e9b9040bfb0f655494487ffad6d64 100755
--- a/Trigger/TrigT1/TrigT1CaloEvent/src/CPMTobRoI.cxx
+++ b/Trigger/TrigT1/TrigT1CaloEvent/src/CPMTobRoI.cxx
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 
 #include "TrigT1CaloEvent/CPMTobRoI.h"
 
diff --git a/Trigger/TrigT1/TrigT1CaloEvent/src/CPMTower.cxx b/Trigger/TrigT1/TrigT1CaloEvent/src/CPMTower.cxx
index 1b9ed5e416523bd97ad4f904e026d2f612433d8d..327ebea748260c7b9e0e3879da30a0362ad0f1d1 100755
--- a/Trigger/TrigT1/TrigT1CaloEvent/src/CPMTower.cxx
+++ b/Trigger/TrigT1/TrigT1CaloEvent/src/CPMTower.cxx
@@ -1,19 +1,13 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 /***************************************************************************
                           CPMTower.cpp  -  description
                              -------------------
         begin                : Thurs Dec 14 2006
-        copyright            : (C) 2006 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.                                   *
- *                                                                         *
- ***************************************************************************/
 
 #include "TrigT1CaloEvent/CPMTower.h"
 
diff --git a/Trigger/TrigT1/TrigT1CaloEvent/src/CPTopoTOB.cxx b/Trigger/TrigT1/TrigT1CaloEvent/src/CPTopoTOB.cxx
index 9a84514045b870c2da8647f79a0cbcafe7bfa938..a6b4d559686679fa093567e2d728af88cfcabd89 100755
--- a/Trigger/TrigT1/TrigT1CaloEvent/src/CPTopoTOB.cxx
+++ b/Trigger/TrigT1/TrigT1CaloEvent/src/CPTopoTOB.cxx
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 
 #include "TrigT1CaloEvent/CPTopoTOB.h"
 #include <cmath>
diff --git a/Trigger/TrigT1/TrigT1CaloEvent/src/EmTauROI.cxx b/Trigger/TrigT1/TrigT1CaloEvent/src/EmTauROI.cxx
index 1b9cf356aa5ef830b2cb88084b402d83ca8d8738..1eaf153d97d140c313b7731cd96ef86a7f1d4a36 100755
--- a/Trigger/TrigT1/TrigT1CaloEvent/src/EmTauROI.cxx
+++ b/Trigger/TrigT1/TrigT1CaloEvent/src/EmTauROI.cxx
@@ -1,19 +1,13 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 /***************************************************************************
                           emtauroi.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 "TrigT1CaloEvent/EmTauROI.h"
 
diff --git a/Trigger/TrigT1/TrigT1CaloEvent/src/EnergyCMXData.cxx b/Trigger/TrigT1/TrigT1CaloEvent/src/EnergyCMXData.cxx
index d0c637e48e1ae437b47d6fb88d637806870895cd..070fc5fb6729abe63b53737e4f49f708d6480e0a 100755
--- a/Trigger/TrigT1/TrigT1CaloEvent/src/EnergyCMXData.cxx
+++ b/Trigger/TrigT1/TrigT1CaloEvent/src/EnergyCMXData.cxx
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 
 #include "TrigT1CaloEvent/EnergyCMXData.h"
 
diff --git a/Trigger/TrigT1/TrigT1CaloEvent/src/EnergyTopoData.cxx b/Trigger/TrigT1/TrigT1CaloEvent/src/EnergyTopoData.cxx
index 8f9f69793c3518d0b2b427ee2ac91c5aab0da84d..47d53f1e2c72d7ad0a1bf193bdabca1a528b4682 100755
--- a/Trigger/TrigT1/TrigT1CaloEvent/src/EnergyTopoData.cxx
+++ b/Trigger/TrigT1/TrigT1CaloEvent/src/EnergyTopoData.cxx
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 
 #include "TrigT1CaloEvent/EnergyTopoData.h"
 
diff --git a/Trigger/TrigT1/TrigT1CaloEvent/src/JEMEtSums.cxx b/Trigger/TrigT1/TrigT1CaloEvent/src/JEMEtSums.cxx
index c2465da0465346401890183fb83a8d7f195256e2..ee081d1c99a20e3cc0b3e80b52ba838d7cd10782 100755
--- a/Trigger/TrigT1/TrigT1CaloEvent/src/JEMEtSums.cxx
+++ b/Trigger/TrigT1/TrigT1CaloEvent/src/JEMEtSums.cxx
@@ -1,19 +1,13 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 /***************************************************************************
                           JEMEtSums.cpp  -  description
                              -------------------
     begin                : 25 05 2006
-    copyright            : (C) 2006 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.                                   *
- *                                                                         *
- ***************************************************************************/
 
 
 
diff --git a/Trigger/TrigT1/TrigT1CaloEvent/src/JEMHits.cxx b/Trigger/TrigT1/TrigT1CaloEvent/src/JEMHits.cxx
index 6830d171e706cd996ae55d7be20e968dc4fe0e67..c1993a44e444aac0a8fafaf1bd0f27e3e61b4310 100755
--- a/Trigger/TrigT1/TrigT1CaloEvent/src/JEMHits.cxx
+++ b/Trigger/TrigT1/TrigT1CaloEvent/src/JEMHits.cxx
@@ -1,19 +1,13 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 /***************************************************************************
                           JEMHits.cpp  -  description
                              -------------------
     begin                : 25 05 2006
-    copyright            : (C) 2006 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.                                   *
- *                                                                         *
- ***************************************************************************/
 
 
 
diff --git a/Trigger/TrigT1/TrigT1CaloEvent/src/JEMRoI.cxx b/Trigger/TrigT1/TrigT1CaloEvent/src/JEMRoI.cxx
index 4a253e8ccc906d75a03b42fd3ed19f8fb7a80f6a..564d4c048c1f9539d150a9694b6eb0ed6db36910 100755
--- a/Trigger/TrigT1/TrigT1CaloEvent/src/JEMRoI.cxx
+++ b/Trigger/TrigT1/TrigT1CaloEvent/src/JEMRoI.cxx
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 
 #include "TrigT1CaloEvent/JEMRoI.h"
 
diff --git a/Trigger/TrigT1/TrigT1CaloEvent/src/JEMTobRoI.cxx b/Trigger/TrigT1/TrigT1CaloEvent/src/JEMTobRoI.cxx
index 4e4a23b2459b013820795a97aa6a3f0c661dde14..598309d09dcea733d897b60b22f0185abe64e681 100755
--- a/Trigger/TrigT1/TrigT1CaloEvent/src/JEMTobRoI.cxx
+++ b/Trigger/TrigT1/TrigT1CaloEvent/src/JEMTobRoI.cxx
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 
 #include "TrigT1CaloEvent/JEMTobRoI.h"
 
diff --git a/Trigger/TrigT1/TrigT1CaloEvent/src/JEPBSCollection.cxx b/Trigger/TrigT1/TrigT1CaloEvent/src/JEPBSCollection.cxx
index f25c90e866498f4c92499bcb4e9d4c2d742db6dd..1769329426258466cf785c5b54500fbab2d03efc 100755
--- a/Trigger/TrigT1/TrigT1CaloEvent/src/JEPBSCollection.cxx
+++ b/Trigger/TrigT1/TrigT1CaloEvent/src/JEPBSCollection.cxx
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 
 #include "TrigT1CaloEvent/CMMEtSums.h"
 #include "TrigT1CaloEvent/CMMJetHits.h"
diff --git a/Trigger/TrigT1/TrigT1CaloEvent/src/JEPBSCollectionV1.cxx b/Trigger/TrigT1/TrigT1CaloEvent/src/JEPBSCollectionV1.cxx
index 11983c24d7e8aee6d46837b93a8985ed5a93d4e8..5f4559ba0d0c1db6bcd736734866737c9fe43fbe 100644
--- a/Trigger/TrigT1/TrigT1CaloEvent/src/JEPBSCollectionV1.cxx
+++ b/Trigger/TrigT1/TrigT1CaloEvent/src/JEPBSCollectionV1.cxx
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 
 #include "TrigT1CaloEvent/CMMEtSums.h"
 #include "TrigT1CaloEvent/CMMJetHits.h"
diff --git a/Trigger/TrigT1/TrigT1CaloEvent/src/JEPBSCollectionV2.cxx b/Trigger/TrigT1/TrigT1CaloEvent/src/JEPBSCollectionV2.cxx
index 759dd9fc5dfd6b96c38871b6d4a5e0a54f1a7c66..f7037f47d784b54f5512ffc19d177fc8aa1842f4 100644
--- a/Trigger/TrigT1/TrigT1CaloEvent/src/JEPBSCollectionV2.cxx
+++ b/Trigger/TrigT1/TrigT1CaloEvent/src/JEPBSCollectionV2.cxx
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 
 #include "TrigT1CaloEvent/CMMEtSums.h"
 #include "TrigT1CaloEvent/CMMJetHits.h"
diff --git a/Trigger/TrigT1/TrigT1CaloEvent/src/JEPRoIBSCollection.cxx b/Trigger/TrigT1/TrigT1CaloEvent/src/JEPRoIBSCollection.cxx
index 8ca705337a47a589e3591add7026de6e6e0240f7..c14da3d4dde9f3b48be49f12ca4ac44d3708860a 100755
--- a/Trigger/TrigT1/TrigT1CaloEvent/src/JEPRoIBSCollection.cxx
+++ b/Trigger/TrigT1/TrigT1CaloEvent/src/JEPRoIBSCollection.cxx
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 
 #include "TrigT1CaloEvent/CMMEtSums.h"
 #include "TrigT1CaloEvent/CMMJetHits.h"
diff --git a/Trigger/TrigT1/TrigT1CaloEvent/src/JEPRoIBSCollectionV1.cxx b/Trigger/TrigT1/TrigT1CaloEvent/src/JEPRoIBSCollectionV1.cxx
index 48e6ab95bc0fc98693ad810bc2a54dd0134893b4..58f8c80c3de1068ed330adf0642a71e38128a0dc 100755
--- a/Trigger/TrigT1/TrigT1CaloEvent/src/JEPRoIBSCollectionV1.cxx
+++ b/Trigger/TrigT1/TrigT1CaloEvent/src/JEPRoIBSCollectionV1.cxx
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 
 #include "TrigT1CaloEvent/CMMEtSums.h"
 #include "TrigT1CaloEvent/CMMJetHits.h"
diff --git a/Trigger/TrigT1/TrigT1CaloEvent/src/JEPRoIBSCollectionV2.cxx b/Trigger/TrigT1/TrigT1CaloEvent/src/JEPRoIBSCollectionV2.cxx
index 41d32ac60ebb4c6f18bd5e8363100e00a4576478..081dfacd22425e6d769713d7947dccf64dad9fda 100755
--- a/Trigger/TrigT1/TrigT1CaloEvent/src/JEPRoIBSCollectionV2.cxx
+++ b/Trigger/TrigT1/TrigT1CaloEvent/src/JEPRoIBSCollectionV2.cxx
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 
 #include "TrigT1CaloEvent/CMXEtSums.h"
 #include "TrigT1CaloEvent/CMXRoI.h"
diff --git a/Trigger/TrigT1/TrigT1CaloEvent/src/JetCMXData.cxx b/Trigger/TrigT1/TrigT1CaloEvent/src/JetCMXData.cxx
index d651d75bad4acd07a575a7e244f351338cf0febd..c2b20a8e624969ad0b423c5d81f6da4255591e2e 100755
--- a/Trigger/TrigT1/TrigT1CaloEvent/src/JetCMXData.cxx
+++ b/Trigger/TrigT1/TrigT1CaloEvent/src/JetCMXData.cxx
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 
 #include "TrigT1CaloEvent/JetCMXData.h"
 
diff --git a/Trigger/TrigT1/TrigT1CaloEvent/src/JetCMXTopoData.cxx b/Trigger/TrigT1/TrigT1CaloEvent/src/JetCMXTopoData.cxx
index 9106d20d8aa1a883fa5fd9e074e14115837b1d7f..0f085c12b5e086ea30c533bd05f58a7eca8b3cb7 100755
--- a/Trigger/TrigT1/TrigT1CaloEvent/src/JetCMXTopoData.cxx
+++ b/Trigger/TrigT1/TrigT1CaloEvent/src/JetCMXTopoData.cxx
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 
 // Local include(s):
 #include "TrigT1CaloEvent/JetCMXTopoData.h"
diff --git a/Trigger/TrigT1/TrigT1CaloEvent/src/JetElement.cxx b/Trigger/TrigT1/TrigT1CaloEvent/src/JetElement.cxx
index e2aec36fa29eba7edd3c39b858c2ba24d4f36394..70f1ff3372b960f7ddde20dda41617e2329f1e1c 100755
--- a/Trigger/TrigT1/TrigT1CaloEvent/src/JetElement.cxx
+++ b/Trigger/TrigT1/TrigT1CaloEvent/src/JetElement.cxx
@@ -1,19 +1,13 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 /***************************************************************************
                           JetElement.cpp  -  description
                              -------------------
     begin                : Mon Sep 25 2000
-    copyright            : (C) 2000 by Edward Moyse
     email                : e.moyse@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.                                   *
- *                                                                         *
- ***************************************************************************/
 
 
 
diff --git a/Trigger/TrigT1/TrigT1CaloEvent/src/JetInput.cxx b/Trigger/TrigT1/TrigT1CaloEvent/src/JetInput.cxx
index 89bff526867f57c9ba38afdb8378c84a924ebb03..ed9afc4877c6f63c490b356c346f280e6b31945f 100755
--- a/Trigger/TrigT1/TrigT1CaloEvent/src/JetInput.cxx
+++ b/Trigger/TrigT1/TrigT1CaloEvent/src/JetInput.cxx
@@ -1,19 +1,13 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 /***************************************************************************
                           JetInput.cpp  -  description
                              -------------------
     begin                : Tue 17 Jan 2006
-    copyright            : (C) 2006 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.                                   *
- *                                                                         *
- ***************************************************************************/
 
 
 
diff --git a/Trigger/TrigT1/TrigT1CaloEvent/src/JetROI.cxx b/Trigger/TrigT1/TrigT1CaloEvent/src/JetROI.cxx
index 4bd8d8bebe401b6c3082611ca8464885cdc4b612..df43670b901c6b7c7b6444c68dfc75ee1ae6dd4c 100755
--- a/Trigger/TrigT1/TrigT1CaloEvent/src/JetROI.cxx
+++ b/Trigger/TrigT1/TrigT1CaloEvent/src/JetROI.cxx
@@ -1,19 +1,13 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 /***************************************************************************
                           Jetroi.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 "TrigT1CaloEvent/JetROI.h"
 namespace LVL1 {
diff --git a/Trigger/TrigT1/TrigT1CaloEvent/src/JetTopoTOB.cxx b/Trigger/TrigT1/TrigT1CaloEvent/src/JetTopoTOB.cxx
index 2298c61c3ef5d397159f41b6685cbc3b25d0af74..7b1a7fc04fbf3c46d3de49fd26b7382458ccb71f 100755
--- a/Trigger/TrigT1/TrigT1CaloEvent/src/JetTopoTOB.cxx
+++ b/Trigger/TrigT1/TrigT1CaloEvent/src/JetTopoTOB.cxx
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 
 #include "TrigT1CaloEvent/JetTopoTOB.h"
 #include <cmath>
diff --git a/Trigger/TrigT1/TrigT1CaloEvent/src/RODHeader.cxx b/Trigger/TrigT1/TrigT1CaloEvent/src/RODHeader.cxx
index 9c13ccc54c3f47401d873bb2126979745c692aea..04b719ef36adb1975b882447f3672d2aac3416a2 100644
--- a/Trigger/TrigT1/TrigT1CaloEvent/src/RODHeader.cxx
+++ b/Trigger/TrigT1/TrigT1CaloEvent/src/RODHeader.cxx
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 
 #include "TrigT1CaloEvent/RODHeader.h"
 
diff --git a/Trigger/TrigT1/TrigT1CaloEvent/src/TriggerTower.cxx b/Trigger/TrigT1/TrigT1CaloEvent/src/TriggerTower.cxx
index e9afadfb7803b872fb575d04b70170e0b6ea7305..43aa9ece90251e22e3d465d009458da40dc9f2b3 100755
--- a/Trigger/TrigT1/TrigT1CaloEvent/src/TriggerTower.cxx
+++ b/Trigger/TrigT1/TrigT1CaloEvent/src/TriggerTower.cxx
@@ -1,19 +1,13 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 /***************************************************************************
                           TriggerTower.cpp  -  description
                              -------------------
     begin                : Mon Sep 25 2000
-    copyright            : (C) 2000 by Edward Moyse
     email                : e.moyse@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 "TrigT1CaloEvent/TriggerTower.h"
 
diff --git a/Trigger/TrigT1/TrigT1CaloSim/TrigT1CaloSim/CPCMX.h b/Trigger/TrigT1/TrigT1CaloSim/TrigT1CaloSim/CPCMX.h
index ebf4d25c51d3497be479cd6620e7132d31961d3d..4b0528b2175653f18cd9abc95af0d14422c678a6 100755
--- a/Trigger/TrigT1/TrigT1CaloSim/TrigT1CaloSim/CPCMX.h
+++ b/Trigger/TrigT1/TrigT1CaloSim/TrigT1CaloSim/CPCMX.h
@@ -1,18 +1,16 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 
  /***************************************************************************
                            CPCMX.h  -  description
                               -------------------
      begin                : Mon Jul 28 2014
-     copyright            : (C) 2014 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 CPCMX_H
diff --git a/Trigger/TrigT1/TrigT1CaloSim/TrigT1CaloSim/CPMSim.h b/Trigger/TrigT1/TrigT1CaloSim/TrigT1CaloSim/CPMSim.h
index 5b8f5e2f0111de0d8d50d465ccc3031ade8ad683..9ec804ee2635aeab2cec3efdaa4209136eb7bf19 100755
--- a/Trigger/TrigT1/TrigT1CaloSim/TrigT1CaloSim/CPMSim.h
+++ b/Trigger/TrigT1/TrigT1CaloSim/TrigT1CaloSim/CPMSim.h
@@ -1,18 +1,16 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 
  /***************************************************************************
                            CPMSim.h  -  description
                               -------------------
      begin                : Wed Mar 05 2014
-     copyright            : (C) 2014 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 CPMSim_H
diff --git a/Trigger/TrigT1/TrigT1CaloSim/TrigT1CaloSim/EnergyCMX.h b/Trigger/TrigT1/TrigT1CaloSim/TrigT1CaloSim/EnergyCMX.h
index 7742feac9f15e87051bcff817bb665ccd9aca394..35af3985a3b2b066bfe397174344e894f76a0d07 100755
--- a/Trigger/TrigT1/TrigT1CaloSim/TrigT1CaloSim/EnergyCMX.h
+++ b/Trigger/TrigT1/TrigT1CaloSim/TrigT1CaloSim/EnergyCMX.h
@@ -1,9 +1,11 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 
  /***************************************************************************
                            EnergyCMX.h  -  description
                               -------------------
       begin                : 04 04 2014
-      copyright            : (C) 2014 by Alan Watson
       email                : Alan.Watson@cern.ch
   ***************************************************************************/
 
diff --git a/Trigger/TrigT1/TrigT1CaloSim/TrigT1CaloSim/JEMEnergySim.h b/Trigger/TrigT1/TrigT1CaloSim/TrigT1CaloSim/JEMEnergySim.h
index e648a053216eb9108e074a3b0966f257de28eb86..263d4ffdb615022d0cc92a19324cd21073a76790 100644
--- a/Trigger/TrigT1/TrigT1CaloSim/TrigT1CaloSim/JEMEnergySim.h
+++ b/Trigger/TrigT1/TrigT1CaloSim/TrigT1CaloSim/JEMEnergySim.h
@@ -1,9 +1,11 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 
  /***************************************************************************
                            JEMEnergySim.h  -  description
                               -------------------
      begin                : Monday 12 May 2014
-     copyright            : (C) 2014 by Alan Watson
      email                : Alan.Watson@CERN.CH
   ***************************************************************************/
 
diff --git a/Trigger/TrigT1/TrigT1CaloSim/TrigT1CaloSim/JEMJetSim.h b/Trigger/TrigT1/TrigT1CaloSim/TrigT1CaloSim/JEMJetSim.h
index 32f521c98f78a5fd92c1c9aa183853292dd16609..3513b0ee645f748521f87dac299d652c5120ae2e 100755
--- a/Trigger/TrigT1/TrigT1CaloSim/TrigT1CaloSim/JEMJetSim.h
+++ b/Trigger/TrigT1/TrigT1CaloSim/TrigT1CaloSim/JEMJetSim.h
@@ -1,18 +1,16 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 
  /***************************************************************************
                            JEMJetSim.h  -  description
                               -------------------
      begin                : Wed Mar 12 2014
-     copyright            : (C) 2014 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 JEMJetSim_H
diff --git a/Trigger/TrigT1/TrigT1CaloSim/TrigT1CaloSim/JetCMX.h b/Trigger/TrigT1/TrigT1CaloSim/TrigT1CaloSim/JetCMX.h
index 61e95ba7dbd76b03040930beeb6b8d7d35277ffb..ecc9a75fb7542a404f3f45e159d979c20b79c967 100755
--- a/Trigger/TrigT1/TrigT1CaloSim/TrigT1CaloSim/JetCMX.h
+++ b/Trigger/TrigT1/TrigT1CaloSim/TrigT1CaloSim/JetCMX.h
@@ -1,18 +1,16 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 
  /***************************************************************************
                            JetCMX.h  -  description
                               -------------------
      begin                : Mon Jul 28 2014
-     copyright            : (C) 2014 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 JetCMX_H
diff --git a/Trigger/TrigT1/TrigT1CaloSim/TrigT1CaloSim/OverlayRun2TriggerTowerMaker.h b/Trigger/TrigT1/TrigT1CaloSim/TrigT1CaloSim/OverlayRun2TriggerTowerMaker.h
index 22d52b05320f0a1200e453d3308d3a707249f189..b5b32b239519d252bd04cfe63f360e9e8e1ebaaf 100644
--- a/Trigger/TrigT1/TrigT1CaloSim/TrigT1CaloSim/OverlayRun2TriggerTowerMaker.h
+++ b/Trigger/TrigT1/TrigT1CaloSim/TrigT1CaloSim/OverlayRun2TriggerTowerMaker.h
@@ -1,5 +1,8 @@
 // -*- C++ -*-
 // ================================================
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 // OverlayRun2TriggerTowerMaker class description
 // ================================================
 //
diff --git a/Trigger/TrigT1/TrigT1CaloSim/TrigT1CaloSim/ReprocessTriggerTowers.h b/Trigger/TrigT1/TrigT1CaloSim/TrigT1CaloSim/ReprocessTriggerTowers.h
index 2d9c4e5f761737700c065730ec4e6be562c3253f..d19acc82ce1cab04c184d16fc18369953edc7988 100644
--- a/Trigger/TrigT1/TrigT1CaloSim/TrigT1CaloSim/ReprocessTriggerTowers.h
+++ b/Trigger/TrigT1/TrigT1CaloSim/TrigT1CaloSim/ReprocessTriggerTowers.h
@@ -1,18 +1,16 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 
  /***************************************************************************
                            ReprocessTriggerTowers.h  -  description
                               -------------------
      begin                : Tue May 18 2010
-     copyright            : (C) 2010 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 ReprocessTriggerTowers_H
diff --git a/Trigger/TrigT1/TrigT1CaloSim/TrigT1CaloSim/RoIROD.h b/Trigger/TrigT1/TrigT1CaloSim/TrigT1CaloSim/RoIROD.h
index 154fc8678fb100961ee337212071ae368ba51a7c..91f230f18619a97b92b3c51112e8c81616f55233 100755
--- a/Trigger/TrigT1/TrigT1CaloSim/TrigT1CaloSim/RoIROD.h
+++ b/Trigger/TrigT1/TrigT1CaloSim/TrigT1CaloSim/RoIROD.h
@@ -1,19 +1,13 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 /***************************************************************************
                           RoIROD.h  -  description
                              -------------------
     begin                : Mon Jul 28 2014
-    copyright            : (C) 2014 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 _RoIROD_H_
 #define _RoIROD_H_
diff --git a/Trigger/TrigT1/TrigT1CaloSim/TrigT1CaloSim/Tester.h b/Trigger/TrigT1/TrigT1CaloSim/TrigT1CaloSim/Tester.h
index 6985b21e94b66d8742c94ba243635a25ab45df24..2c2380db9f84e45960063849f8945656fb889048 100755
--- a/Trigger/TrigT1/TrigT1CaloSim/TrigT1CaloSim/Tester.h
+++ b/Trigger/TrigT1/TrigT1CaloSim/TrigT1CaloSim/Tester.h
@@ -1,19 +1,13 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 /***************************************************************************
                           Tester.h  -  description
                              -------------------
     begin                : Wed Dec 13 2000
-    copyright            : (C) 2000 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 _TESTER_H_
 #define _TESTER_H_
 
diff --git a/Trigger/TrigT1/TrigT1CaloSim/src/CPCMX.cxx b/Trigger/TrigT1/TrigT1CaloSim/src/CPCMX.cxx
index 7e174ed2b750d12a1b113514d7634fb54f39fee2..ef3b7e79432acbeba72890fd0077a2e2d0da35e7 100755
--- a/Trigger/TrigT1/TrigT1CaloSim/src/CPCMX.cxx
+++ b/Trigger/TrigT1/TrigT1CaloSim/src/CPCMX.cxx
@@ -1,9 +1,11 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 
 // /***************************************************************************
 //                           CPCMX.cxx  -  description
 //                              -------------------
 //     begin                : Mon Jul 28 2014
-//     copyright            : (C) 2014 by Alan Watson
 //     email                : Alan.Watson@CERN.CH
 //  ***************************************************************************/
 //
diff --git a/Trigger/TrigT1/TrigT1CaloSim/src/CPMSim.cxx b/Trigger/TrigT1/TrigT1CaloSim/src/CPMSim.cxx
index c5abd1980209ae1b40626ac1ed28ac958880e62a..e0b7f08c12fd132180de83c08673e6374690b169 100755
--- a/Trigger/TrigT1/TrigT1CaloSim/src/CPMSim.cxx
+++ b/Trigger/TrigT1/TrigT1CaloSim/src/CPMSim.cxx
@@ -1,9 +1,11 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 
 // /***************************************************************************
 //                           CPMSim.cxx  -  description
 //                              -------------------
 //     begin                : Wed Mar 05 2014
-//     copyright            : (C) 2014 by Alan Watson
 //     email                : Alan.Watson@CERN.CH
 //  ***************************************************************************/
 //
diff --git a/Trigger/TrigT1/TrigT1CaloSim/src/EnergyCMX.cxx b/Trigger/TrigT1/TrigT1CaloSim/src/EnergyCMX.cxx
index a1bedefd7e69cb8e66d0488b01a01220373be202..248daf385853de688aac9da0b82a9b988bb072d3 100755
--- a/Trigger/TrigT1/TrigT1CaloSim/src/EnergyCMX.cxx
+++ b/Trigger/TrigT1/TrigT1CaloSim/src/EnergyCMX.cxx
@@ -1,9 +1,11 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 
 // /***************************************************************************
 //                           EnergyCMX.cxx  -  description
 //                              -------------------
  //     begin                : 04 04 2014
- //     copyright            : (C) 2014 by Alan Watson
  //     email                : Alan.Watson@cern.ch
 //  ***************************************************************************/
 //
@@ -11,14 +13,6 @@
 // EnergyCMX class Implementation
 // ================================================
 //
-/***************************************************************************
- *                                                                         *
- *   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.                                   *
- *                                                                         *
- ***************************************************************************/
 //
 //
 //
diff --git a/Trigger/TrigT1/TrigT1CaloSim/src/JEMEnergySim.cxx b/Trigger/TrigT1/TrigT1CaloSim/src/JEMEnergySim.cxx
index 2fd4fbe6080b0757b264b6cabe5df3ca707e1ff9..79e0a7ba89de4538ef64de24071c023c55ceffd3 100644
--- a/Trigger/TrigT1/TrigT1CaloSim/src/JEMEnergySim.cxx
+++ b/Trigger/TrigT1/TrigT1CaloSim/src/JEMEnergySim.cxx
@@ -1,9 +1,11 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 
 // /***************************************************************************
 //                           JEMEnergySim.cxx  -  description
 //                              -------------------
 //     begin                : Monday 12 May 2014
-//     copyright            : (C) 2014 by Alan Watson
 //     email                : Alan.Watson@CERN.CH
 //  ***************************************************************************/
 //
diff --git a/Trigger/TrigT1/TrigT1CaloSim/src/JEMJetSim.cxx b/Trigger/TrigT1/TrigT1CaloSim/src/JEMJetSim.cxx
index fdea247886ff7605bd6957aa6fad22530dcda869..d37d3787a8b0e3f7378ae15664e8b8488c4e06df 100755
--- a/Trigger/TrigT1/TrigT1CaloSim/src/JEMJetSim.cxx
+++ b/Trigger/TrigT1/TrigT1CaloSim/src/JEMJetSim.cxx
@@ -1,9 +1,11 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 
 // /***************************************************************************
 //                           JEMJetSim.cxx  -  description
 //                              -------------------
 //     begin                : Wed Mar 12 2014
-//     copyright            : (C) 2014 by Alan Watson
 //     email                : Alan.Watson@CERN.CH
 //  ***************************************************************************/
 //
diff --git a/Trigger/TrigT1/TrigT1CaloSim/src/JetCMX.cxx b/Trigger/TrigT1/TrigT1CaloSim/src/JetCMX.cxx
index 60eb9e03d4213ceeb44a90531b4878f248da3a96..d4ec72d0909abf7101a2c3e9cabb6d140617e5d4 100755
--- a/Trigger/TrigT1/TrigT1CaloSim/src/JetCMX.cxx
+++ b/Trigger/TrigT1/TrigT1CaloSim/src/JetCMX.cxx
@@ -1,9 +1,11 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 
 // /***************************************************************************
 //                           JetCMX.cxx  -  description
 //                              -------------------
 //     begin                : Mon Jul 28 2014
-//     copyright            : (C) 2014 by Alan Watson
 //     email                : Alan.Watson@CERN.CH
 //  ***************************************************************************/
 //
diff --git a/Trigger/TrigT1/TrigT1CaloSim/src/OverlayRun2TriggerTowerMaker.cxx b/Trigger/TrigT1/TrigT1CaloSim/src/OverlayRun2TriggerTowerMaker.cxx
index 0cd5fdb11e87e5f790393a6f4020a35e387ec754..94c5215f816723183186de4387a58edd553ddf5f 100644
--- a/Trigger/TrigT1/TrigT1CaloSim/src/OverlayRun2TriggerTowerMaker.cxx
+++ b/Trigger/TrigT1/TrigT1CaloSim/src/OverlayRun2TriggerTowerMaker.cxx
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 // ================================================
 // OverlayRun2TriggerTowerMaker class Implementation
 // ================================================
diff --git a/Trigger/TrigT1/TrigT1CaloSim/src/ReprocessTriggerTowers.cxx b/Trigger/TrigT1/TrigT1CaloSim/src/ReprocessTriggerTowers.cxx
index 1aac30d525ef92cfc8d8fb6f4af5c757f87db0d4..644d2d9de105cc422f9b8155b9dd51162851fad9 100644
--- a/Trigger/TrigT1/TrigT1CaloSim/src/ReprocessTriggerTowers.cxx
+++ b/Trigger/TrigT1/TrigT1CaloSim/src/ReprocessTriggerTowers.cxx
@@ -1,8 +1,10 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 // /***************************************************************************
 //                           ReprocessTriggerTowers.cxx  -  description
 //                              -------------------
 //     begin                : Tue May 18 2010
-//     copyright            : (C) 2010 by Alan Watson
 //     email                : Alan.Watson@CERN.CH
 //  ***************************************************************************/
 //
diff --git a/Trigger/TrigT1/TrigT1CaloSim/src/RoIROD.cxx b/Trigger/TrigT1/TrigT1CaloSim/src/RoIROD.cxx
index 70784ac0718480f3cc62b637b43446b560e301aa..38de92b8423f675a273648abd2dacfe890e47d5e 100755
--- a/Trigger/TrigT1/TrigT1CaloSim/src/RoIROD.cxx
+++ b/Trigger/TrigT1/TrigT1CaloSim/src/RoIROD.cxx
@@ -1,8 +1,10 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 /***************************************************************************
                           RoIROD.cxx  -  description
                              -------------------
     begin                : Mon Jul 28 2014
-    copyright            : (C) 2014 by Alan Watson
     email                : Alan.Watson@CERN.CH
  ***************************************************************************/
 
diff --git a/Trigger/TrigT1/TrigT1CaloSim/src/Tester.cxx b/Trigger/TrigT1/TrigT1CaloSim/src/Tester.cxx
index 9c1b4454c61f17b3d733cd50f6c87b763fd7fcc9..77dd8cb27ee949187eec3e512ed4a914348cd6bb 100755
--- a/Trigger/TrigT1/TrigT1CaloSim/src/Tester.cxx
+++ b/Trigger/TrigT1/TrigT1CaloSim/src/Tester.cxx
@@ -1,22 +1,16 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 /***************************************************************************
                           Tester.cxx  -  description
                              -------------------
     begin                : Mon Apr 23 2001
-    copyright            : (C) 2000 by moyse
     email                : e.moyse@qmw.ac.uk
  ***************************************************************************/
 //
 //    updated: June 20, M. Wielers
 //             move to Storegate
 // 
-/***************************************************************************
- *                                                                         *
- *   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.                                   *
- *                                                                         *
- ***************************************************************************/
 // ================================================
 // Tester class Implementation
 // ================================================
diff --git a/Trigger/TrigT1/TrigT1CaloToolInterfaces/TrigT1CaloToolInterfaces/IL1CPCMXTools.h b/Trigger/TrigT1/TrigT1CaloToolInterfaces/TrigT1CaloToolInterfaces/IL1CPCMXTools.h
index df6f00b4bf8c7b0427dafea9b9a27d89172d382a..50fb9d48f8c17b071f01641b079a4f4339477c55 100644
--- a/Trigger/TrigT1/TrigT1CaloToolInterfaces/TrigT1CaloToolInterfaces/IL1CPCMXTools.h
+++ b/Trigger/TrigT1/TrigT1CaloToolInterfaces/TrigT1CaloToolInterfaces/IL1CPCMXTools.h
@@ -3,7 +3,7 @@
 */
 
 ///////////////////////////////////////////////////////////////////
-// IL1CPCMXTools.h, (c) ATLAS Detector software
+// IL1CPCMXTools.h, 
 ///////////////////////////////////////////////////////////////////
 #ifndef ILVL1L1CPCMXTOOLS_H
 #define ILVL1L1CPCMXTOOLS_H
diff --git a/Trigger/TrigT1/TrigT1CaloToolInterfaces/TrigT1CaloToolInterfaces/IL1CPHitsTools.h b/Trigger/TrigT1/TrigT1CaloToolInterfaces/TrigT1CaloToolInterfaces/IL1CPHitsTools.h
index 4fa3d60d45a1d0ac6b2c235709efd763c7cf268e..6cdcb6076ba535ae009d890873e67508262cbc11 100644
--- a/Trigger/TrigT1/TrigT1CaloToolInterfaces/TrigT1CaloToolInterfaces/IL1CPHitsTools.h
+++ b/Trigger/TrigT1/TrigT1CaloToolInterfaces/TrigT1CaloToolInterfaces/IL1CPHitsTools.h
@@ -3,7 +3,7 @@
 */
 
 ///////////////////////////////////////////////////////////////////
-// IL1CPHitsTools.h, (c) ATLAS Detector software
+// IL1CPHitsTools.h, 
 ///////////////////////////////////////////////////////////////////
 #ifndef ILVL1L1CPHITSTOOLS_H
 #define ILVL1L1CPHITSTOOLS_H
diff --git a/Trigger/TrigT1/TrigT1CaloToolInterfaces/TrigT1CaloToolInterfaces/IL1CPMTools.h b/Trigger/TrigT1/TrigT1CaloToolInterfaces/TrigT1CaloToolInterfaces/IL1CPMTools.h
index 3742de35ad2bd04c6b04e99b38ffb6b9062b894a..9bdf179fcd3d3c2c21a71d854e095dc6b16acc3a 100644
--- a/Trigger/TrigT1/TrigT1CaloToolInterfaces/TrigT1CaloToolInterfaces/IL1CPMTools.h
+++ b/Trigger/TrigT1/TrigT1CaloToolInterfaces/TrigT1CaloToolInterfaces/IL1CPMTools.h
@@ -1,15 +1,10 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 ///////////////////////////////////////////////////////////////////
-// L1CPMTools.h, (c) Alan Watson
+// L1CPMTools.h, 
 ///////////////////////////////////////////////////////////////////
 
- /***************************************************************************
-  *                                                                         *
-  *   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 ILVL1L1CPMTOOLS_H
 #define ILVL1L1CPMTOOLS_H
diff --git a/Trigger/TrigT1/TrigT1CaloToolInterfaces/TrigT1CaloToolInterfaces/IL1CPMTowerTools.h b/Trigger/TrigT1/TrigT1CaloToolInterfaces/TrigT1CaloToolInterfaces/IL1CPMTowerTools.h
index 3901ec7bfc5d8fa30183dfa5e06a862fdf289d19..dcdce1d3d76a295f353966c35edac6bbb3223bad 100755
--- a/Trigger/TrigT1/TrigT1CaloToolInterfaces/TrigT1CaloToolInterfaces/IL1CPMTowerTools.h
+++ b/Trigger/TrigT1/TrigT1CaloToolInterfaces/TrigT1CaloToolInterfaces/IL1CPMTowerTools.h
@@ -3,7 +3,7 @@
 */
 
 ///////////////////////////////////////////////////////////////////
-// IL1CPMTowerTools.h, (c) ATLAS Detector software
+// IL1CPMTowerTools.h, 
 ///////////////////////////////////////////////////////////////////
 #ifndef ILVL1L1CPMTOWERTOOLS_H
 #define ILVL1L1CPMTOWERTOOLS_H
diff --git a/Trigger/TrigT1/TrigT1CaloToolInterfaces/TrigT1CaloToolInterfaces/IL1DynamicPedestalProvider.h b/Trigger/TrigT1/TrigT1CaloToolInterfaces/TrigT1CaloToolInterfaces/IL1DynamicPedestalProvider.h
index d3e1def7715595ff2e1cba23892aeccad020d246..74314ff3ef89cef7602ca109a7872c62e01ee6f1 100644
--- a/Trigger/TrigT1/TrigT1CaloToolInterfaces/TrigT1CaloToolInterfaces/IL1DynamicPedestalProvider.h
+++ b/Trigger/TrigT1/TrigT1CaloToolInterfaces/TrigT1CaloToolInterfaces/IL1DynamicPedestalProvider.h
@@ -1,17 +1,11 @@
 // -*- C++ -*-
 ///////////////////////////////////////////////////////////////////
-// IL1DynamicPedestalProvider.h, (c) Veit Scharf
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+// IL1DynamicPedestalProvider.h,
 ///////////////////////////////////////////////////////////////////
 
- /***************************************************************************
-  *                                                                         *
-  *   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 TRIGT1CALOTOOLINTERFACES_IL1DYNAMICPEDESTALPROVIDER_H
 #define TRIGT1CALOTOOLINTERFACES_IL1DYNAMICPEDESTALPROVIDER_H
 
diff --git a/Trigger/TrigT1/TrigT1CaloToolInterfaces/TrigT1CaloToolInterfaces/IL1EmTauTools.h b/Trigger/TrigT1/TrigT1CaloToolInterfaces/TrigT1CaloToolInterfaces/IL1EmTauTools.h
index 8e83f3495a0222300e73220370ea7feae1ed7b7d..9e1fefbcbe6f833fc10b5c565d0dcf9014e05275 100755
--- a/Trigger/TrigT1/TrigT1CaloToolInterfaces/TrigT1CaloToolInterfaces/IL1EmTauTools.h
+++ b/Trigger/TrigT1/TrigT1CaloToolInterfaces/TrigT1CaloToolInterfaces/IL1EmTauTools.h
@@ -3,7 +3,7 @@
 */
 
 ///////////////////////////////////////////////////////////////////
-// IL1EmTauTools.h, (c) ATLAS Detector software
+// IL1EmTauTools.h, 
 ///////////////////////////////////////////////////////////////////
 #ifndef ILVL1L1EMTAUTOOLS_H
 #define ILVL1L1EMTAUTOOLS_H
diff --git a/Trigger/TrigT1/TrigT1CaloToolInterfaces/TrigT1CaloToolInterfaces/IL1EnergyCMXTools.h b/Trigger/TrigT1/TrigT1CaloToolInterfaces/TrigT1CaloToolInterfaces/IL1EnergyCMXTools.h
index ed5a068a3cce7d60d4f7d01d8bc837ce710a9255..ce00544d6f584cfc54345de8dcb4824bcebe6235 100644
--- a/Trigger/TrigT1/TrigT1CaloToolInterfaces/TrigT1CaloToolInterfaces/IL1EnergyCMXTools.h
+++ b/Trigger/TrigT1/TrigT1CaloToolInterfaces/TrigT1CaloToolInterfaces/IL1EnergyCMXTools.h
@@ -3,7 +3,7 @@
 */
 
 ///////////////////////////////////////////////////////////////////
-// IL1EnergyCMXTools.h, (c) ATLAS Detector software
+// IL1EnergyCMXTools.h, 
 ///////////////////////////////////////////////////////////////////
 #ifndef ILVL1L1ENERGYCMXTOOLS_H
 #define ILVL1L1ENERGYCMXTOOLS_H
diff --git a/Trigger/TrigT1/TrigT1CaloToolInterfaces/TrigT1CaloToolInterfaces/IL1EtTools.h b/Trigger/TrigT1/TrigT1CaloToolInterfaces/TrigT1CaloToolInterfaces/IL1EtTools.h
index ca9a5cd9112665431a8b3ba66d323e92b593c2ae..5d997a81bf652a2d28f229be3e29818bc16cf946 100755
--- a/Trigger/TrigT1/TrigT1CaloToolInterfaces/TrigT1CaloToolInterfaces/IL1EtTools.h
+++ b/Trigger/TrigT1/TrigT1CaloToolInterfaces/TrigT1CaloToolInterfaces/IL1EtTools.h
@@ -3,7 +3,7 @@
 */
 
 ///////////////////////////////////////////////////////////////////
-// IL1EtTools.h, (c) ATLAS Detector software
+// IL1EtTools.h, 
 ///////////////////////////////////////////////////////////////////
 #ifndef ILVL1L1ETTOOLS_H
 #define ILVL1L1ETTOOLS_H
diff --git a/Trigger/TrigT1/TrigT1CaloToolInterfaces/TrigT1CaloToolInterfaces/IL1JEMJetTools.h b/Trigger/TrigT1/TrigT1CaloToolInterfaces/TrigT1CaloToolInterfaces/IL1JEMJetTools.h
index b2075abc4e63a83029e785057e0ce234aff031a2..b8e6c8cf6abe818c5c71a317181cf4d311dc066d 100644
--- a/Trigger/TrigT1/TrigT1CaloToolInterfaces/TrigT1CaloToolInterfaces/IL1JEMJetTools.h
+++ b/Trigger/TrigT1/TrigT1CaloToolInterfaces/TrigT1CaloToolInterfaces/IL1JEMJetTools.h
@@ -3,7 +3,7 @@
 */
 
 ///////////////////////////////////////////////////////////////////
-// IL1JEMJetTools.h, (c) ATLAS Detector software
+// IL1JEMJetTools.h, 
 ///////////////////////////////////////////////////////////////////
 #ifndef ILVL1L1JEMJETTOOLS_H
 #define ILVL1L1JEMJETTOOLS_H
diff --git a/Trigger/TrigT1/TrigT1CaloToolInterfaces/TrigT1CaloToolInterfaces/IL1JEPEtSumsTools.h b/Trigger/TrigT1/TrigT1CaloToolInterfaces/TrigT1CaloToolInterfaces/IL1JEPEtSumsTools.h
index d34b78798071c0d63f7a043489de8c0ecdc12d00..d5f46af7483a67c8964accc574587fe7a6107798 100644
--- a/Trigger/TrigT1/TrigT1CaloToolInterfaces/TrigT1CaloToolInterfaces/IL1JEPEtSumsTools.h
+++ b/Trigger/TrigT1/TrigT1CaloToolInterfaces/TrigT1CaloToolInterfaces/IL1JEPEtSumsTools.h
@@ -3,7 +3,7 @@
 */
 
 ///////////////////////////////////////////////////////////////////
-// IL1JEPEtSumsTools.h, (c) ATLAS Detector software
+// IL1JEPEtSumsTools.h, 
 ///////////////////////////////////////////////////////////////////
 #ifndef ILVL1L1JEPETSUMSTOOLS_H
 #define ILVL1L1JEPETSUMSTOOLS_H
diff --git a/Trigger/TrigT1/TrigT1CaloToolInterfaces/TrigT1CaloToolInterfaces/IL1JEPHitsTools.h b/Trigger/TrigT1/TrigT1CaloToolInterfaces/TrigT1CaloToolInterfaces/IL1JEPHitsTools.h
index ee51146920d7847976fd8b71a6115eea1bb107a2..7590f84d54f26276e5323b8a7f046d3471c91ff3 100644
--- a/Trigger/TrigT1/TrigT1CaloToolInterfaces/TrigT1CaloToolInterfaces/IL1JEPHitsTools.h
+++ b/Trigger/TrigT1/TrigT1CaloToolInterfaces/TrigT1CaloToolInterfaces/IL1JEPHitsTools.h
@@ -3,7 +3,7 @@
 */
 
 ///////////////////////////////////////////////////////////////////
-// IL1JEPHitsTools.h, (c) ATLAS Detector software
+// IL1JEPHitsTools.h, 
 ///////////////////////////////////////////////////////////////////
 #ifndef ILVL1L1JEPHITSTOOLS_H
 #define ILVL1L1JEPHITSTOOLS_H
diff --git a/Trigger/TrigT1/TrigT1CaloToolInterfaces/TrigT1CaloToolInterfaces/IL1JetCMXTools.h b/Trigger/TrigT1/TrigT1CaloToolInterfaces/TrigT1CaloToolInterfaces/IL1JetCMXTools.h
index 029c745dc9b1a1ad9e225133c4e3c70660cb8526..3925e657b139a2c0658f75a1a9011b82e8b877cf 100644
--- a/Trigger/TrigT1/TrigT1CaloToolInterfaces/TrigT1CaloToolInterfaces/IL1JetCMXTools.h
+++ b/Trigger/TrigT1/TrigT1CaloToolInterfaces/TrigT1CaloToolInterfaces/IL1JetCMXTools.h
@@ -3,7 +3,7 @@
 */
 
 ///////////////////////////////////////////////////////////////////
-// IL1JetCMXTools.h, (c) ATLAS Detector software
+// IL1JetCMXTools.h, 
 ///////////////////////////////////////////////////////////////////
 #ifndef ILVL1L1JETCMXTOOLS_H
 #define ILVL1L1JETCMXTOOLS_H
diff --git a/Trigger/TrigT1/TrigT1CaloToolInterfaces/TrigT1CaloToolInterfaces/IL1JetElementTools.h b/Trigger/TrigT1/TrigT1CaloToolInterfaces/TrigT1CaloToolInterfaces/IL1JetElementTools.h
index 719547e6c0975560ec583a95f608622bf19432d3..ef3a6b5a53c74c468a2e5e3ef703ac13f22e0766 100755
--- a/Trigger/TrigT1/TrigT1CaloToolInterfaces/TrigT1CaloToolInterfaces/IL1JetElementTools.h
+++ b/Trigger/TrigT1/TrigT1CaloToolInterfaces/TrigT1CaloToolInterfaces/IL1JetElementTools.h
@@ -3,7 +3,7 @@
 */
 
 ///////////////////////////////////////////////////////////////////
-// IL1JetElementTools.h, (c) ATLAS Detector software
+// IL1JetElementTools.h, 
 ///////////////////////////////////////////////////////////////////
 #ifndef ILVL1L1JETELEMENTTOOLS_H
 #define ILVL1L1JETELEMENTTOOLS_H
diff --git a/Trigger/TrigT1/TrigT1CaloToolInterfaces/TrigT1CaloToolInterfaces/IL1JetEtTools.h b/Trigger/TrigT1/TrigT1CaloToolInterfaces/TrigT1CaloToolInterfaces/IL1JetEtTools.h
index 2edffc68aec1c3333a4e29b8a14e086f74961f3c..26f5b6b402a6de36230a7d5fc296bde04e5e3b23 100644
--- a/Trigger/TrigT1/TrigT1CaloToolInterfaces/TrigT1CaloToolInterfaces/IL1JetEtTools.h
+++ b/Trigger/TrigT1/TrigT1CaloToolInterfaces/TrigT1CaloToolInterfaces/IL1JetEtTools.h
@@ -3,7 +3,7 @@
 */
 
 ///////////////////////////////////////////////////////////////////
-// IL1JetEtTools.h, (c) ATLAS Detector software
+// IL1JetEtTools.h, 
 ///////////////////////////////////////////////////////////////////
 #ifndef ILVL1L1JETETTOOLS_H
 #define ILVL1L1JETETTOOLS_H
diff --git a/Trigger/TrigT1/TrigT1CaloToolInterfaces/TrigT1CaloToolInterfaces/IL1JetTools.h b/Trigger/TrigT1/TrigT1CaloToolInterfaces/TrigT1CaloToolInterfaces/IL1JetTools.h
index 14d74c4a21d87b3da803b64633af8934fe03b4d9..5412340ae9ec7c24c9098fda35c43cc35585d446 100755
--- a/Trigger/TrigT1/TrigT1CaloToolInterfaces/TrigT1CaloToolInterfaces/IL1JetTools.h
+++ b/Trigger/TrigT1/TrigT1CaloToolInterfaces/TrigT1CaloToolInterfaces/IL1JetTools.h
@@ -3,7 +3,7 @@
 */
 
 ///////////////////////////////////////////////////////////////////
-// IL1JetTools.h, (c) ATLAS Detector software
+// IL1JetTools.h, 
 ///////////////////////////////////////////////////////////////////
 #ifndef ILVL1L1JETTOOLS_H
 #define ILVL1L1JETTOOLS_H
diff --git a/Trigger/TrigT1/TrigT1CaloToolInterfaces/TrigT1CaloToolInterfaces/IL1RoITools.h b/Trigger/TrigT1/TrigT1CaloToolInterfaces/TrigT1CaloToolInterfaces/IL1RoITools.h
index 99407e113651afbc60e4feb31d8bcbca9ff4a780..d27205071bd61b163e74de02021d54e1589b875d 100644
--- a/Trigger/TrigT1/TrigT1CaloToolInterfaces/TrigT1CaloToolInterfaces/IL1RoITools.h
+++ b/Trigger/TrigT1/TrigT1CaloToolInterfaces/TrigT1CaloToolInterfaces/IL1RoITools.h
@@ -3,7 +3,7 @@
 */
 
 ///////////////////////////////////////////////////////////////////
-// IL1RoITools.h, (c) ATLAS Detector software
+// IL1RoITools.h, 
 ///////////////////////////////////////////////////////////////////
 #ifndef ILVL1L1ROITOOLS_H
 #define ILVL1L1ROITOOLS_H
diff --git a/Trigger/TrigT1/TrigT1CaloToolInterfaces/TrigT1CaloToolInterfaces/IL1TriggerTowerTool.h b/Trigger/TrigT1/TrigT1CaloToolInterfaces/TrigT1CaloToolInterfaces/IL1TriggerTowerTool.h
index 18b25eb59a5e876491639bd97cc964cf21e27002..38068379883595e5344caaa51f585ae255222570 100644
--- a/Trigger/TrigT1/TrigT1CaloToolInterfaces/TrigT1CaloToolInterfaces/IL1TriggerTowerTool.h
+++ b/Trigger/TrigT1/TrigT1CaloToolInterfaces/TrigT1CaloToolInterfaces/IL1TriggerTowerTool.h
@@ -1,16 +1,10 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 ///////////////////////////////////////////////////////////////////
-// L1TriggerTowerTool.h, (c) Alan Watson
+// L1TriggerTowerTool.h, 
 ///////////////////////////////////////////////////////////////////
 
- /***************************************************************************
-  *                                                                         *
-  *   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 IL1TRIGGERTOWERTOOL_H
 #define IL1TRIGGERTOWERTOOL_H
 
diff --git a/Trigger/TrigT1/TrigT1CaloTools/TrigT1CaloTools/L1CPCMXTools.h b/Trigger/TrigT1/TrigT1CaloTools/TrigT1CaloTools/L1CPCMXTools.h
index 92494af66c4f74b69a5ef365e0ad13496a7bbc3d..6489d3e3361368c2e3df6221c4aac32de7878e64 100644
--- a/Trigger/TrigT1/TrigT1CaloTools/TrigT1CaloTools/L1CPCMXTools.h
+++ b/Trigger/TrigT1/TrigT1CaloTools/TrigT1CaloTools/L1CPCMXTools.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 LVL1L1CPCMXTOOLS_H
 #define LVL1L1CPCMXTOOLS_H
diff --git a/Trigger/TrigT1/TrigT1CaloTools/TrigT1CaloTools/L1CPHitsTools.h b/Trigger/TrigT1/TrigT1CaloTools/TrigT1CaloTools/L1CPHitsTools.h
index aeef928ddf477d7f21bad4ee63e36bc5c27a6648..71f9513c7d0518584d96dec051a8b02962d92e59 100644
--- a/Trigger/TrigT1/TrigT1CaloTools/TrigT1CaloTools/L1CPHitsTools.h
+++ b/Trigger/TrigT1/TrigT1CaloTools/TrigT1CaloTools/L1CPHitsTools.h
@@ -1,13 +1,12 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 ///////////////////////////////////////////////////////////////////
-// L1CPHitsTools.h, (c) Alan Watson
+// L1CPHitsTools.h, 
 ///////////////////////////////////////////////////////////////////
 
  /***************************************************************************
   *                                                                         *
-  *   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.                                   *
   *                                                                         *
   ***************************************************************************/
 
diff --git a/Trigger/TrigT1/TrigT1CaloTools/TrigT1CaloTools/L1CPMTools.h b/Trigger/TrigT1/TrigT1CaloTools/TrigT1CaloTools/L1CPMTools.h
index 59a6b8a7fd808ef148da8cd2811e3bf6cb84aab4..fdf6c462174e84b2ff04762d0b436dad2e929b7b 100644
--- a/Trigger/TrigT1/TrigT1CaloTools/TrigT1CaloTools/L1CPMTools.h
+++ b/Trigger/TrigT1/TrigT1CaloTools/TrigT1CaloTools/L1CPMTools.h
@@ -1,13 +1,12 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 ///////////////////////////////////////////////////////////////////
-// L1CPMTools.h, (c) Alan Watson
+// L1CPMTools.h, 
 ///////////////////////////////////////////////////////////////////
 
  /***************************************************************************
   *                                                                         *
-  *   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.                                   *
   *                                                                         *
   ***************************************************************************/
 
diff --git a/Trigger/TrigT1/TrigT1CaloTools/TrigT1CaloTools/L1CPMTowerTools.h b/Trigger/TrigT1/TrigT1CaloTools/TrigT1CaloTools/L1CPMTowerTools.h
index 3e1694199d14096466517e5b27429e4167b0434c..8961940846f6d4a6fd4c5a4e4081624fc82040d2 100755
--- a/Trigger/TrigT1/TrigT1CaloTools/TrigT1CaloTools/L1CPMTowerTools.h
+++ b/Trigger/TrigT1/TrigT1CaloTools/TrigT1CaloTools/L1CPMTowerTools.h
@@ -1,13 +1,12 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 ///////////////////////////////////////////////////////////////////
-// L1CPMTowerTools.h, (c) Alan Watson
+// L1CPMTowerTools.h, 
 ///////////////////////////////////////////////////////////////////
 
  /***************************************************************************
   *                                                                         *
-  *   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.                                   *
   *                                                                         *
   ***************************************************************************/
 
diff --git a/Trigger/TrigT1/TrigT1CaloTools/TrigT1CaloTools/L1DatabaseOverrideForDataTool.h b/Trigger/TrigT1/TrigT1CaloTools/TrigT1CaloTools/L1DatabaseOverrideForDataTool.h
index 17a68f1803734cfe7a1cce10d7cdb8b904d0c4f4..c96a048119b7d6eb96d71da9dc4859fdf25071fe 100644
--- a/Trigger/TrigT1/TrigT1CaloTools/TrigT1CaloTools/L1DatabaseOverrideForDataTool.h
+++ b/Trigger/TrigT1/TrigT1CaloTools/TrigT1CaloTools/L1DatabaseOverrideForDataTool.h
@@ -1,4 +1,7 @@
 // -*- C++ -*-
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 /**
  * @file L1DatabaseOverrideForData.h
  * @author Veit Scharf <veit.scharf@cern.ch>
diff --git a/Trigger/TrigT1/TrigT1CaloTools/TrigT1CaloTools/L1DynamicPedestalProviderRoot.h b/Trigger/TrigT1/TrigT1CaloTools/TrigT1CaloTools/L1DynamicPedestalProviderRoot.h
index bd8789757e28b5b6c15bb85201fe2c8133b68d83..9a939970e2662e9ada7435a3580083b0dbb38a62 100644
--- a/Trigger/TrigT1/TrigT1CaloTools/TrigT1CaloTools/L1DynamicPedestalProviderRoot.h
+++ b/Trigger/TrigT1/TrigT1CaloTools/TrigT1CaloTools/L1DynamicPedestalProviderRoot.h
@@ -1,4 +1,8 @@
-/** -*- C++ -*-
+/** -*- C++ -*- */
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+/**
  * @file TrigT1CaloTools/L1DynamicPedestalProviderRoot.h
  * @author V. Scharf <vscharf@kip.uni-heidelberg.de>
  * @date June 2014
diff --git a/Trigger/TrigT1/TrigT1CaloTools/TrigT1CaloTools/L1DynamicPedestalProviderTxt.h b/Trigger/TrigT1/TrigT1CaloTools/TrigT1CaloTools/L1DynamicPedestalProviderTxt.h
index e9021614f9c25750ba40a516ab06a2acb89c79c9..90e4e2e7826fde46d1d9f36af7c608042d2339ff 100644
--- a/Trigger/TrigT1/TrigT1CaloTools/TrigT1CaloTools/L1DynamicPedestalProviderTxt.h
+++ b/Trigger/TrigT1/TrigT1CaloTools/TrigT1CaloTools/L1DynamicPedestalProviderTxt.h
@@ -1,4 +1,8 @@
-/** -*- C++ -*-
+/** -*- C++ -*-*/
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+/* 
  * @file TrigT1CaloTools/L1DynamicPedestalProviderTxt.h
  * @author V. Scharf <vscharf@kip.uni-heidelberg.de>
  * @date June 2014
diff --git a/Trigger/TrigT1/TrigT1CaloTools/TrigT1CaloTools/L1EmTauTools.h b/Trigger/TrigT1/TrigT1CaloTools/TrigT1CaloTools/L1EmTauTools.h
index 92d843db2adb415dfc2641862a22126fc6b1d97c..67142caff056311fc63682a15878c2469e653c98 100755
--- a/Trigger/TrigT1/TrigT1CaloTools/TrigT1CaloTools/L1EmTauTools.h
+++ b/Trigger/TrigT1/TrigT1CaloTools/TrigT1CaloTools/L1EmTauTools.h
@@ -1,13 +1,12 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 ///////////////////////////////////////////////////////////////////
-// L1EmTauTools.h, (c) Alan Watson
+// L1EmTauTools.h, 
 ///////////////////////////////////////////////////////////////////
 
  /***************************************************************************
   *                                                                         *
-  *   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.                                   *
   *                                                                         *
   ***************************************************************************/
 
diff --git a/Trigger/TrigT1/TrigT1CaloTools/TrigT1CaloTools/L1EnergyCMXTools.h b/Trigger/TrigT1/TrigT1CaloTools/TrigT1CaloTools/L1EnergyCMXTools.h
index 95f74963276f085a3d06f47274b647aa7a8de623..c70dc70096f5208e371c27dea052adbc92c100ae 100644
--- a/Trigger/TrigT1/TrigT1CaloTools/TrigT1CaloTools/L1EnergyCMXTools.h
+++ b/Trigger/TrigT1/TrigT1CaloTools/TrigT1CaloTools/L1EnergyCMXTools.h
@@ -1,10 +1,9 @@
+/*
+  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.                                   *
   *                                                                         *
   ***************************************************************************/
 
diff --git a/Trigger/TrigT1/TrigT1CaloTools/TrigT1CaloTools/L1EtTools.h b/Trigger/TrigT1/TrigT1CaloTools/TrigT1CaloTools/L1EtTools.h
index 8fe8074044c9fd61714e88a558198173209453c4..ff510a944ad340b9a1809df58f73c7a76cde9a57 100755
--- a/Trigger/TrigT1/TrigT1CaloTools/TrigT1CaloTools/L1EtTools.h
+++ b/Trigger/TrigT1/TrigT1CaloTools/TrigT1CaloTools/L1EtTools.h
@@ -1,13 +1,12 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 ///////////////////////////////////////////////////////////////////
-// L1EtTools.h, (c) Alan Watson
+// L1EtTools.h, 
 ///////////////////////////////////////////////////////////////////
 
  /***************************************************************************
   *                                                                         *
-  *   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.                                   *
   *                                                                         *
   ***************************************************************************/
 
diff --git a/Trigger/TrigT1/TrigT1CaloTools/TrigT1CaloTools/L1JEMJetTools.h b/Trigger/TrigT1/TrigT1CaloTools/TrigT1CaloTools/L1JEMJetTools.h
index f82844e8f197795c914507a8c1a66f345585a82f..38d9efadd640ce0180eba0ff430328b785771f44 100644
--- a/Trigger/TrigT1/TrigT1CaloTools/TrigT1CaloTools/L1JEMJetTools.h
+++ b/Trigger/TrigT1/TrigT1CaloTools/TrigT1CaloTools/L1JEMJetTools.h
@@ -1,13 +1,12 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 ///////////////////////////////////////////////////////////////////
-// L1JEMJetTools.h, (c) Alan Watson
+// L1JEMJetTools.h, 
 ///////////////////////////////////////////////////////////////////
 
  /***************************************************************************
   *                                                                         *
-  *   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.                                   *
   *                                                                         *
   ***************************************************************************/
 
diff --git a/Trigger/TrigT1/TrigT1CaloTools/TrigT1CaloTools/L1JEPEtSumsTools.h b/Trigger/TrigT1/TrigT1CaloTools/TrigT1CaloTools/L1JEPEtSumsTools.h
index 6444f06c0f6ff773a352afbb2916d758b4d4cfac..adc04f575dc62935db789f8e1107e23231ebb036 100644
--- a/Trigger/TrigT1/TrigT1CaloTools/TrigT1CaloTools/L1JEPEtSumsTools.h
+++ b/Trigger/TrigT1/TrigT1CaloTools/TrigT1CaloTools/L1JEPEtSumsTools.h
@@ -1,13 +1,12 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 ///////////////////////////////////////////////////////////////////
-// L1JEPEtSumsTools.h, (c) Alan Watson
+// L1JEPEtSumsTools.h, 
 ///////////////////////////////////////////////////////////////////
 
  /***************************************************************************
   *                                                                         *
-  *   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.                                   *
   *                                                                         *
   ***************************************************************************/
 
diff --git a/Trigger/TrigT1/TrigT1CaloTools/TrigT1CaloTools/L1JEPHitsTools.h b/Trigger/TrigT1/TrigT1CaloTools/TrigT1CaloTools/L1JEPHitsTools.h
index a6149a2eb9ad6cf7b273352265b8ee124050dbe7..6c7ec007f080b584a4ccd25c343f259852d2cc68 100644
--- a/Trigger/TrigT1/TrigT1CaloTools/TrigT1CaloTools/L1JEPHitsTools.h
+++ b/Trigger/TrigT1/TrigT1CaloTools/TrigT1CaloTools/L1JEPHitsTools.h
@@ -1,13 +1,12 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 ///////////////////////////////////////////////////////////////////
-// L1JEPHitsTools.h, (c) Alan Watson
+// L1JEPHitsTools.h, 
 ///////////////////////////////////////////////////////////////////
 
  /***************************************************************************
   *                                                                         *
-  *   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.                                   *
   *                                                                         *
   ***************************************************************************/
 
diff --git a/Trigger/TrigT1/TrigT1CaloTools/TrigT1CaloTools/L1JetCMXTools.h b/Trigger/TrigT1/TrigT1CaloTools/TrigT1CaloTools/L1JetCMXTools.h
index 22a23e6db8b16aae86d6f51b08a5213ed0fb085b..416a5da64ae962365ef17d13e4c585309b500971 100644
--- a/Trigger/TrigT1/TrigT1CaloTools/TrigT1CaloTools/L1JetCMXTools.h
+++ b/Trigger/TrigT1/TrigT1CaloTools/TrigT1CaloTools/L1JetCMXTools.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 LVL1L1JETCMXTOOLS_H
 #define LVL1L1JETCMXTOOLS_H
diff --git a/Trigger/TrigT1/TrigT1CaloTools/TrigT1CaloTools/L1JetElementTools.h b/Trigger/TrigT1/TrigT1CaloTools/TrigT1CaloTools/L1JetElementTools.h
index 5b38b07fdd975295c1d9a1a56e49544c8b603826..749d4d309bad7b5d99ca9ac7de974028a599a4ce 100755
--- a/Trigger/TrigT1/TrigT1CaloTools/TrigT1CaloTools/L1JetElementTools.h
+++ b/Trigger/TrigT1/TrigT1CaloTools/TrigT1CaloTools/L1JetElementTools.h
@@ -1,13 +1,12 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 ///////////////////////////////////////////////////////////////////
-// L1JetElementTools.h, (c) Alan Watson
+// L1JetElementTools.h, 
 ///////////////////////////////////////////////////////////////////
 
  /***************************************************************************
   *                                                                         *
-  *   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.                                   *
   *                                                                         *
   ***************************************************************************/
 
diff --git a/Trigger/TrigT1/TrigT1CaloTools/TrigT1CaloTools/L1JetEtTools.h b/Trigger/TrigT1/TrigT1CaloTools/TrigT1CaloTools/L1JetEtTools.h
index 8f93de45b850cc95e59980fe5c618028e248cba0..031a6119862e6d7efbc8616fa5d49001d746728c 100644
--- a/Trigger/TrigT1/TrigT1CaloTools/TrigT1CaloTools/L1JetEtTools.h
+++ b/Trigger/TrigT1/TrigT1CaloTools/TrigT1CaloTools/L1JetEtTools.h
@@ -1,13 +1,12 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 ///////////////////////////////////////////////////////////////////
-// L1JetEtTools.h, (c) Alan Watson
+// L1JetEtTools.h, 
 ///////////////////////////////////////////////////////////////////
 
  /***************************************************************************
   *                                                                         *
-  *   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.                                   *
   *                                                                         *
   ***************************************************************************/
 
diff --git a/Trigger/TrigT1/TrigT1CaloTools/TrigT1CaloTools/L1JetTools.h b/Trigger/TrigT1/TrigT1CaloTools/TrigT1CaloTools/L1JetTools.h
index e3264e7a881b0f9ed5ae885275955d247954291b..5066a207770510637fb799aa18ab1ee07b309439 100755
--- a/Trigger/TrigT1/TrigT1CaloTools/TrigT1CaloTools/L1JetTools.h
+++ b/Trigger/TrigT1/TrigT1CaloTools/TrigT1CaloTools/L1JetTools.h
@@ -1,13 +1,12 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 ///////////////////////////////////////////////////////////////////
-// L1JetTools.h, (c) Alan Watson
+// L1JetTools.h, 
 ///////////////////////////////////////////////////////////////////
 
  /***************************************************************************
   *                                                                         *
-  *   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.                                   *
   *                                                                         *
   ***************************************************************************/
 
diff --git a/Trigger/TrigT1/TrigT1CaloTools/TrigT1CaloTools/L1NonlinearLutDatabaseOverrideTool.h b/Trigger/TrigT1/TrigT1CaloTools/TrigT1CaloTools/L1NonlinearLutDatabaseOverrideTool.h
index 54a666985fbde6067a7357760061b92bbc8f237f..5d8f52850089275167a0b338ffec1a32b26b21bd 100644
--- a/Trigger/TrigT1/TrigT1CaloTools/TrigT1CaloTools/L1NonlinearLutDatabaseOverrideTool.h
+++ b/Trigger/TrigT1/TrigT1CaloTools/TrigT1CaloTools/L1NonlinearLutDatabaseOverrideTool.h
@@ -1,4 +1,7 @@
 // -*- C++ -*-
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 /**
  * @file L1NonlinearLutDatabaseOverrideTool.h
  * @author Veit Scharf <veit.scharf@cern.ch>
diff --git a/Trigger/TrigT1/TrigT1CaloTools/TrigT1CaloTools/L1RoITools.h.old b/Trigger/TrigT1/TrigT1CaloTools/TrigT1CaloTools/L1RoITools.h.old
index 58fe2a3552767ee4812ca879b8c597e1fdb6cf91..38ba98d4fd39dde732ab791a54ae674f5dafe4b7 100644
--- a/Trigger/TrigT1/TrigT1CaloTools/TrigT1CaloTools/L1RoITools.h.old
+++ b/Trigger/TrigT1/TrigT1CaloTools/TrigT1CaloTools/L1RoITools.h.old
@@ -1,13 +1,9 @@
 ///////////////////////////////////////////////////////////////////
-// L1RoITools.h, (c) Alan Watson
+// L1RoITools.h, 
 ///////////////////////////////////////////////////////////////////
 
  /***************************************************************************
   *                                                                         *
-  *   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.                                   *
   *                                                                         *
   ***************************************************************************/
 
diff --git a/Trigger/TrigT1/TrigT1CaloTools/TrigT1CaloTools/L1TriggerTowerTool.h b/Trigger/TrigT1/TrigT1CaloTools/TrigT1CaloTools/L1TriggerTowerTool.h
index 83ab1e17f5455b302576cff4d205741d814f7cd8..a1cff9f8d86d7cfddab9db1fce8e7fa0428b40a6 100644
--- a/Trigger/TrigT1/TrigT1CaloTools/TrigT1CaloTools/L1TriggerTowerTool.h
+++ b/Trigger/TrigT1/TrigT1CaloTools/TrigT1CaloTools/L1TriggerTowerTool.h
@@ -1,13 +1,12 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 ///////////////////////////////////////////////////////////////////
-// L1TriggerTowerTool.h, (c) Alan Watson
+// L1TriggerTowerTool.h, 
 ///////////////////////////////////////////////////////////////////
 
  /***************************************************************************
   *                                                                         *
-  *   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.                                   *
   *                                                                         *
   ***************************************************************************/
 
diff --git a/Trigger/TrigT1/TrigT1CaloTools/src/L1CPCMXTools.cxx b/Trigger/TrigT1/TrigT1CaloTools/src/L1CPCMXTools.cxx
index 378b509501dadad52e20ab201581059badb6837b..94f4301553574fc138d7efcc551e3a2489d17a21 100644
--- a/Trigger/TrigT1/TrigT1CaloTools/src/L1CPCMXTools.cxx
+++ b/Trigger/TrigT1/TrigT1CaloTools/src/L1CPCMXTools.cxx
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 
 #include <map>
 #include <memory>
diff --git a/Trigger/TrigT1/TrigT1CaloTools/src/L1CPHitsTools.cxx b/Trigger/TrigT1/TrigT1CaloTools/src/L1CPHitsTools.cxx
index 747329fec3b84cb48ad1e8cb151d8e64bf0df338..ded963ae1ef09c7c4de34099ec9075bee0dc683e 100644
--- a/Trigger/TrigT1/TrigT1CaloTools/src/L1CPHitsTools.cxx
+++ b/Trigger/TrigT1/TrigT1CaloTools/src/L1CPHitsTools.cxx
@@ -1,5 +1,8 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 ///////////////////////////////////////////////////////////////////
-// L1CPHitsTools.cxx, (c) Alan Watson (see header file for license)
+// L1CPHitsTools.cxx,  
 ///////////////////////////////////////////////////////////////////
 
 #include <map>
diff --git a/Trigger/TrigT1/TrigT1CaloTools/src/L1CPMTools.cxx b/Trigger/TrigT1/TrigT1CaloTools/src/L1CPMTools.cxx
index da8ce6c15fd9c971ccb5c6e3fc8dabc552b55d14..881add3f24aa503bbf777e09e10dffd7ef05c749 100644
--- a/Trigger/TrigT1/TrigT1CaloTools/src/L1CPMTools.cxx
+++ b/Trigger/TrigT1/TrigT1CaloTools/src/L1CPMTools.cxx
@@ -1,5 +1,8 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 ///////////////////////////////////////////////////////////////////
-// L1CPMTools.cxx, (c) Alan Watson (see header file for license)
+// L1CPMTools.cxx,  
 ///////////////////////////////////////////////////////////////////
 
 #include "TrigT1CaloTools/L1CPMTools.h"
diff --git a/Trigger/TrigT1/TrigT1CaloTools/src/L1CPMTowerTools.cxx b/Trigger/TrigT1/TrigT1CaloTools/src/L1CPMTowerTools.cxx
index 881d1cbcbc99c061a0161c44a21956b028c3a850..bf03f1644287e8fe7c5131131f2abf7fa6218c5b 100755
--- a/Trigger/TrigT1/TrigT1CaloTools/src/L1CPMTowerTools.cxx
+++ b/Trigger/TrigT1/TrigT1CaloTools/src/L1CPMTowerTools.cxx
@@ -1,5 +1,8 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 ///////////////////////////////////////////////////////////////////
-// L1CPMTowerTools.cxx, (c) Alan Watson (see header file for license)
+// L1CPMTowerTools.cxx,  
 ///////////////////////////////////////////////////////////////////
 
 #include "TrigT1CaloTools/L1CPMTowerTools.h"
diff --git a/Trigger/TrigT1/TrigT1CaloTools/src/L1DatabaseOverrideForDataTool.cxx b/Trigger/TrigT1/TrigT1CaloTools/src/L1DatabaseOverrideForDataTool.cxx
index 79ce7a24c49c6476ebced017649bbbd9507d196b..8c607d1bf46386cdf886ebd423ce954a370430d1 100644
--- a/Trigger/TrigT1/TrigT1CaloTools/src/L1DatabaseOverrideForDataTool.cxx
+++ b/Trigger/TrigT1/TrigT1CaloTools/src/L1DatabaseOverrideForDataTool.cxx
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 #include "TrigT1CaloTools/L1DatabaseOverrideForDataTool.h"
 
 #include "TrigT1CaloCalibConditions/L1CaloPprChanDefaultsContainer.h"
diff --git a/Trigger/TrigT1/TrigT1CaloTools/src/L1DynamicPedestalProviderRoot.cxx b/Trigger/TrigT1/TrigT1CaloTools/src/L1DynamicPedestalProviderRoot.cxx
index 6cf29dab2dc996a71c357979058a467bd7c1c417..26ce045a1ecf96dd27157401d486ce6f81a8ad74 100644
--- a/Trigger/TrigT1/TrigT1CaloTools/src/L1DynamicPedestalProviderRoot.cxx
+++ b/Trigger/TrigT1/TrigT1CaloTools/src/L1DynamicPedestalProviderRoot.cxx
@@ -1,5 +1,8 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //////////////////////////////////////////////////////////////////////
-//  L1DynamicPedestalProviderRoot.cxx (c) Veit Scjarf
+//  L1DynamicPedestalProviderRoot.cxx 
 ///////////////////////////////////////////////////////////////////////
 
 #include "TrigT1CaloTools/L1DynamicPedestalProviderRoot.h"
diff --git a/Trigger/TrigT1/TrigT1CaloTools/src/L1DynamicPedestalProviderTxt.cxx b/Trigger/TrigT1/TrigT1CaloTools/src/L1DynamicPedestalProviderTxt.cxx
index ace02143d5f5a5b1b25dd722fcfda590583ad893..51e4a3e96c82230474c60ab2c439f37b1755b0c2 100644
--- a/Trigger/TrigT1/TrigT1CaloTools/src/L1DynamicPedestalProviderTxt.cxx
+++ b/Trigger/TrigT1/TrigT1CaloTools/src/L1DynamicPedestalProviderTxt.cxx
@@ -1,5 +1,8 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //////////////////////////////////////////////////////////////////////
-//  L1DynamicPedestalProviderTxt.cxx (c) Veit Scjarf
+//  L1DynamicPedestalProviderTxt.cxx 
 ///////////////////////////////////////////////////////////////////////
 
 #include "TrigT1CaloTools/L1DynamicPedestalProviderTxt.h"
diff --git a/Trigger/TrigT1/TrigT1CaloTools/src/L1EmTauTools.cxx b/Trigger/TrigT1/TrigT1CaloTools/src/L1EmTauTools.cxx
index 449986d1aebbd6b17772aac68d85c5cc3caaf4bc..4269e01afec4f0c7c53be6eab320262d2a6b93af 100755
--- a/Trigger/TrigT1/TrigT1CaloTools/src/L1EmTauTools.cxx
+++ b/Trigger/TrigT1/TrigT1CaloTools/src/L1EmTauTools.cxx
@@ -1,5 +1,8 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 ///////////////////////////////////////////////////////////////////
-// L1EmTauTools.cxx, (c) Alan Watson (see header file for license)
+// L1EmTauTools.cxx,  
 ///////////////////////////////////////////////////////////////////
 
 #include "TrigT1CaloTools/L1EmTauTools.h"
diff --git a/Trigger/TrigT1/TrigT1CaloTools/src/L1EnergyCMXTools.cxx b/Trigger/TrigT1/TrigT1CaloTools/src/L1EnergyCMXTools.cxx
index 31141eba78b091e650c661f97006376b24b713e8..775b14ff42bb8233bd113a8f2f44fdee3748efad 100644
--- a/Trigger/TrigT1/TrigT1CaloTools/src/L1EnergyCMXTools.cxx
+++ b/Trigger/TrigT1/TrigT1CaloTools/src/L1EnergyCMXTools.cxx
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 
 #include <map>
 #include <utility>
diff --git a/Trigger/TrigT1/TrigT1CaloTools/src/L1EtTools.cxx b/Trigger/TrigT1/TrigT1CaloTools/src/L1EtTools.cxx
index 092aa05201c97e32bd3e1cefd1932196e3245a3f..cdb54eb30146f9b79373a1c7ddb73c654c77aede 100755
--- a/Trigger/TrigT1/TrigT1CaloTools/src/L1EtTools.cxx
+++ b/Trigger/TrigT1/TrigT1CaloTools/src/L1EtTools.cxx
@@ -1,5 +1,8 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 ///////////////////////////////////////////////////////////////////
-// L1EtTools.cxx, (c) Alan Watson (see header file for license)
+// L1EtTools.cxx,  
 ///////////////////////////////////////////////////////////////////
 
 #include "TrigT1CaloTools/L1EtTools.h"
diff --git a/Trigger/TrigT1/TrigT1CaloTools/src/L1JEMJetTools.cxx b/Trigger/TrigT1/TrigT1CaloTools/src/L1JEMJetTools.cxx
index 3aebea21e54fb0314b936fccad108ab850c1d03e..5f6bb9b753e2c207daacd53013258adac65dcc33 100644
--- a/Trigger/TrigT1/TrigT1CaloTools/src/L1JEMJetTools.cxx
+++ b/Trigger/TrigT1/TrigT1CaloTools/src/L1JEMJetTools.cxx
@@ -1,5 +1,8 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 ///////////////////////////////////////////////////////////////////
-// L1JEMJetTools.cxx, (c) Alan Watson (see header file for license)
+// L1JEMJetTools.cxx,  
 ///////////////////////////////////////////////////////////////////
 
 #include "TrigT1CaloTools/L1JEMJetTools.h"
diff --git a/Trigger/TrigT1/TrigT1CaloTools/src/L1JEPEtSumsTools.cxx b/Trigger/TrigT1/TrigT1CaloTools/src/L1JEPEtSumsTools.cxx
index 397666dfbf57cf827114491585d45bcbdcf6f475..6993e894dee04d92f8f3a44a7b250d48ba594acc 100644
--- a/Trigger/TrigT1/TrigT1CaloTools/src/L1JEPEtSumsTools.cxx
+++ b/Trigger/TrigT1/TrigT1CaloTools/src/L1JEPEtSumsTools.cxx
@@ -1,5 +1,8 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 ///////////////////////////////////////////////////////////////////
-// L1JEPEtSumsTools.cxx, (c) Alan Watson (see header file for license)
+// L1JEPEtSumsTools.cxx,  
 ///////////////////////////////////////////////////////////////////
 
 #include <map>
diff --git a/Trigger/TrigT1/TrigT1CaloTools/src/L1JEPHitsTools.cxx b/Trigger/TrigT1/TrigT1CaloTools/src/L1JEPHitsTools.cxx
index 2df3da2e593425a214ff3239ee8c2201d0844514..3a49b66617a5b493713b21f5d045a699cff50ca1 100644
--- a/Trigger/TrigT1/TrigT1CaloTools/src/L1JEPHitsTools.cxx
+++ b/Trigger/TrigT1/TrigT1CaloTools/src/L1JEPHitsTools.cxx
@@ -1,5 +1,8 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 ///////////////////////////////////////////////////////////////////
-// L1JEPHitsTools.cxx, (c) Alan Watson (see header file for license)
+// L1JEPHitsTools.cxx,  
 ///////////////////////////////////////////////////////////////////
 
 #include <map>
diff --git a/Trigger/TrigT1/TrigT1CaloTools/src/L1JetCMXTools.cxx b/Trigger/TrigT1/TrigT1CaloTools/src/L1JetCMXTools.cxx
index 6b27a66a25d44cd6fac38e94941e299b1fd75cf9..f41145f738f57a2fe0959b99b878f6587ac01901 100644
--- a/Trigger/TrigT1/TrigT1CaloTools/src/L1JetCMXTools.cxx
+++ b/Trigger/TrigT1/TrigT1CaloTools/src/L1JetCMXTools.cxx
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 #include <algorithm>
 #include <map>
 #include <numeric>
diff --git a/Trigger/TrigT1/TrigT1CaloTools/src/L1JetElementTools.cxx b/Trigger/TrigT1/TrigT1CaloTools/src/L1JetElementTools.cxx
index 88b434a8c371f073b029ef52bfaf1cf0ab01be2e..35b1ec9ee08cae51d4d97ec37754ffc2ccc7fd8e 100755
--- a/Trigger/TrigT1/TrigT1CaloTools/src/L1JetElementTools.cxx
+++ b/Trigger/TrigT1/TrigT1CaloTools/src/L1JetElementTools.cxx
@@ -1,5 +1,8 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 ///////////////////////////////////////////////////////////////////
-// L1JetElementTools.cxx, (c) Alan Watson (see header file for license)
+// L1JetElementTools.cxx,  
 ///////////////////////////////////////////////////////////////////
 
 #include "TrigT1CaloTools/L1JetElementTools.h"
diff --git a/Trigger/TrigT1/TrigT1CaloTools/src/L1JetEtTools.cxx b/Trigger/TrigT1/TrigT1CaloTools/src/L1JetEtTools.cxx
index 2bdb3db5fc6c3b942513f15e5e30e0e8d17ce235..87d64a0745403cfbc974d33c38fd17546507a5da 100644
--- a/Trigger/TrigT1/TrigT1CaloTools/src/L1JetEtTools.cxx
+++ b/Trigger/TrigT1/TrigT1CaloTools/src/L1JetEtTools.cxx
@@ -1,5 +1,8 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 ///////////////////////////////////////////////////////////////////
-// L1JetEtTools.cxx, (c) Alan Watson (see header file for license)
+// L1JetEtTools.cxx,  
 ///////////////////////////////////////////////////////////////////
 
 #include "TrigT1CaloTools/L1JetEtTools.h"
diff --git a/Trigger/TrigT1/TrigT1CaloTools/src/L1JetTools.cxx b/Trigger/TrigT1/TrigT1CaloTools/src/L1JetTools.cxx
index 03b3f2c3579a2fa6ccb5147b6b76d02aa030c06b..59814c0386c99a86250a1f734ab73618bd87e34e 100755
--- a/Trigger/TrigT1/TrigT1CaloTools/src/L1JetTools.cxx
+++ b/Trigger/TrigT1/TrigT1CaloTools/src/L1JetTools.cxx
@@ -1,5 +1,8 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 ///////////////////////////////////////////////////////////////////
-// L1JetTools.cxx, (c) Alan Watson (see header file for license)
+// L1JetTools.cxx,  
 ///////////////////////////////////////////////////////////////////
 
 #include "TrigT1CaloTools/L1JetTools.h"
diff --git a/Trigger/TrigT1/TrigT1CaloTools/src/L1NonlinearLutDatabaseOverrideTool.cxx b/Trigger/TrigT1/TrigT1CaloTools/src/L1NonlinearLutDatabaseOverrideTool.cxx
index 97bd604538e5e73629af33a909d75e3d8d5ace83..003f9ad9ab5959c586c6bc577bc47e09567da657 100644
--- a/Trigger/TrigT1/TrigT1CaloTools/src/L1NonlinearLutDatabaseOverrideTool.cxx
+++ b/Trigger/TrigT1/TrigT1CaloTools/src/L1NonlinearLutDatabaseOverrideTool.cxx
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 #include "TrigT1CaloTools/L1NonlinearLutDatabaseOverrideTool.h"
 
 #include "TrigT1CaloCalibConditions/L1CaloPprChanDefaultsContainer.h"
diff --git a/Trigger/TrigT1/TrigT1CaloTools/src/L1RoITools.cxx.old b/Trigger/TrigT1/TrigT1CaloTools/src/L1RoITools.cxx.old
index 0f306aa853552b4ea0ff42bf89ecf802be34ef24..b61c86c030a572fe33163a004d01968990b41156 100644
--- a/Trigger/TrigT1/TrigT1CaloTools/src/L1RoITools.cxx.old
+++ b/Trigger/TrigT1/TrigT1CaloTools/src/L1RoITools.cxx.old
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////
-// L1RoITools.cxx, (c) Alan Watson (see header file for license)
+// L1RoITools.cxx,  
 ///////////////////////////////////////////////////////////////////
 
 #include "TrigT1CaloTools/L1RoITools.h"
diff --git a/Trigger/TrigT1/TrigT1CaloTools/src/L1TriggerTowerTool.cxx b/Trigger/TrigT1/TrigT1CaloTools/src/L1TriggerTowerTool.cxx
index 619b4a60232fceac3defb715efebefbdd8b1e293..7161c2c5589d96df4afbee1cf8ceab63f7fee20a 100644
--- a/Trigger/TrigT1/TrigT1CaloTools/src/L1TriggerTowerTool.cxx
+++ b/Trigger/TrigT1/TrigT1CaloTools/src/L1TriggerTowerTool.cxx
@@ -1,5 +1,8 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //////////////////////////////////////////////////////////////////////
-//  L1TriggerTowerTool.cxx (c) Alan Watson
+//  L1TriggerTowerTool.cxx 
 ///////////////////////////////////////////////////////////////////////
 #include "TrigT1CaloTools/L1TriggerTowerTool.h"
 
diff --git a/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/BinAndCoord.h b/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/BinAndCoord.h
index 035031e35d8672f0056ca054426741aad199a78b..3c278b02840dc2913ca5e41acc28323e5af05a87 100755
--- a/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/BinAndCoord.h
+++ b/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/BinAndCoord.h
@@ -1,19 +1,13 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 /***************************************************************************
                           BinAndCoord.h  -  description
                              -------------------
     begin                : 7/03/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.                                   *
- *                                                                         *
- ***************************************************************************/
 
 
 
diff --git a/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/CPAlgorithm.h b/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/CPAlgorithm.h
index 0566461cfd80db5c9cd3762642b2b8b31d804ed6..aa8bbea0ed0b78ce6ab657c59599ce698408ebb1 100755
--- a/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/CPAlgorithm.h
+++ b/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/CPAlgorithm.h
@@ -1,20 +1,14 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 /***************************************************************************
                           CPAlgorithm.h  -  description
                              -------------------
     begin                : Tues Sep 11 2007
-    copyright            : (C) 2007 Alan Watson
                            Loosely evolved from Ed Moyse's InternalEmTauRoI
     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 CPALGORITHM_H
 #define CPALGORITHM_H
diff --git a/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/CPMTobAlgorithm.h b/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/CPMTobAlgorithm.h
index b5f6e7bb783126a8f365ebcb301e9720b23c3be3..8a9f64460fe37b5fd382872bc76ede7cae7615fb 100644
--- a/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/CPMTobAlgorithm.h
+++ b/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/CPMTobAlgorithm.h
@@ -1,19 +1,13 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 /***************************************************************************
                           CPMTobAlgorithm.h  -  description
                              -------------------
     begin                : Thu 6 Mar 2014
-    copyright            : (C) 2014 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 CPMTobAlgorithm_H
 #define CPMTobAlgorithm_H
diff --git a/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/ClusterProcessorModuleKey.h b/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/ClusterProcessorModuleKey.h
index a1da24dd2d94f74e9a625e5609e7a1c710c59b98..918a7ac6492a59071a3512d63d0afefc9ebb4cbd 100755
--- a/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/ClusterProcessorModuleKey.h
+++ b/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/ClusterProcessorModuleKey.h
@@ -1,19 +1,13 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 /***************************************************************************
                           ClusterProcessorModuleKey.h  -  description
                              -------------------
     begin                : Monday August 20 2001
-    copyright            : (C) 2000 by Edward Moyse
     email                : e.moyse@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 ClusterProcessorModuleKey_H
 #define ClusterProcessorModuleKey_H
diff --git a/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/CoordToHardware.h b/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/CoordToHardware.h
index 32f774d69b7078d7e49142d7e03a72e6370d8b23..865417a298ce8ccab6e4e2c579537609e3c6c2d1 100755
--- a/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/CoordToHardware.h
+++ b/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/CoordToHardware.h
@@ -1,19 +1,13 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 /***************************************************************************
                           CoordToHardware.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 COORDTOHARDWARE_H
 #define COORDTOHARDWARE_H
diff --git a/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/CrateEnergy.h b/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/CrateEnergy.h
index ded753dcd34ad3a93ce8669623227cf42a8ab9c5..e30d6ad2a66c7ae60833cf1921115a8c45dd2895 100755
--- a/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/CrateEnergy.h
+++ b/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/CrateEnergy.h
@@ -1,19 +1,13 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 /***************************************************************************
                           CrateEnergy.h  -  description
                              -------------------
     begin                : 05/09/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.                                   *
- *                                                                         *
- ***************************************************************************/
 
 
 
diff --git a/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/DataError.h b/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/DataError.h
index d66f96b597b4b7091621efb7357d53f91a8853bc..7904e216ee341e80046abc300100ff8d52971691 100644
--- a/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/DataError.h
+++ b/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/DataError.h
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 #ifndef TRIGT1CALO_DATAERROR_H
 #define TRIGT1CALO_DATAERROR_H
 
diff --git a/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/ICoordinate.h b/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/ICoordinate.h
index 10a000f9b93b3b0dca9120a9b8ae1a85517afcad..4e1ac778ca762bc042699916a3a6c4fbcb99d6aa 100755
--- a/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/ICoordinate.h
+++ b/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/ICoordinate.h
@@ -1,19 +1,13 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 /***************************************************************************
                           ICoordinate.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.                                   *
- *                                                                         *
- ***************************************************************************/
 
 
 
diff --git a/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/InternalTriggerTower.h b/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/InternalTriggerTower.h
index b886b691dde8308b11db689046b7ca86fde47980..ab4fe0f989e5cb37c928c2f6c503595e264bd855 100755
--- a/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/InternalTriggerTower.h
+++ b/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/InternalTriggerTower.h
@@ -1,20 +1,14 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 
  //***************************************************************************
  //                     InternalTriggerTower.h  -  description
  //                              -------------------
  //     begin                : Fri Sep 30 2005
- //     copyright            : (C) 2005 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 InternalTriggerTower_H
 #define InternalTriggerTower_H
diff --git a/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/InternalTriggerTower_ClassDEF.h b/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/InternalTriggerTower_ClassDEF.h
index d7fc97ba74e348cb2f478adf25537dbb83d5d41f..94685ac03768cf6448c0d53b519fc29dda4b47b9 100755
--- a/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/InternalTriggerTower_ClassDEF.h
+++ b/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/InternalTriggerTower_ClassDEF.h
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 #ifndef InternalTriggerTower_ClassDEF_H
 #define InternalTriggerTower_ClassDEF_H
 //Put here the CLASS_DEF macros for the STL containers you put in StoreGate
diff --git a/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/JEMJetAlgorithm.h b/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/JEMJetAlgorithm.h
index dd2ba1fb7af18d78ccf91401e4ecfdd68908ebf4..007c1706e995bdb9977f2172f02d3eb85093198c 100755
--- a/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/JEMJetAlgorithm.h
+++ b/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/JEMJetAlgorithm.h
@@ -1,19 +1,13 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 /***************************************************************************
                           JEMJetAlgorithm.h  -  description
                              -------------------
     begin                : Thurs Mar 13 2014
-    copyright            : (C) 2014 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 JETALGORITHM_H
 #define JETALGORITHM_H
diff --git a/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/JetAlgorithm.h b/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/JetAlgorithm.h
index 9677aea9ed822919dbdf8b72e21d712d957fb285..2e6047a216942ca0d1ec085efaa12b07e32df45c 100755
--- a/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/JetAlgorithm.h
+++ b/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/JetAlgorithm.h
@@ -1,19 +1,13 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 /***************************************************************************
                           JetAlgorithm.h  -  description
                              -------------------
     begin                : Tues Sep 11 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 JETALGORITHM_H
 #define JETALGORITHM_H
diff --git a/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/JetElementKey.h b/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/JetElementKey.h
index 94aef96b549c9a83a920c1eac42d3c52361aaa3a..85e0b6c69e2e897ce2119b2d3732c21d85a72dcc 100755
--- a/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/JetElementKey.h
+++ b/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/JetElementKey.h
@@ -1,19 +1,13 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 /***************************************************************************
                           JetElementKey.h  -  description
                              -------------------
     begin                : Friday Jan 20 2006
-    copyright            : (C) 2006 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 JetElementKey_H
 #define JetElementKey_H
diff --git a/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/JetElementKeyBase.h b/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/JetElementKeyBase.h
index d9b09b33ac91ac4d69ceb5c12bcc4f5c71bd3908..1bf0884ab409abf0d3eb8d17602b4e2bacd63aa4 100755
--- a/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/JetElementKeyBase.h
+++ b/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/JetElementKeyBase.h
@@ -1,21 +1,15 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 /***************************************************************************
                           JetElementKeyBase.h  -  description
                              -------------------
     begin                : Monday August 20 2001
-    copyright            : (C) 2000 by Edward Moyse
     email                : e.moyse@qmw.ac.uk
      
   Converted to base class JetElementKeyBase by Alan Watson, 20/01/06
 ***************************************************************************/
 
-/***************************************************************************
- *                                                                         *
- *   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 JetElementKeyBase_H
 #define JetElementKeyBase_H
diff --git a/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/JetEnergyModuleKey.h b/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/JetEnergyModuleKey.h
index 5f5d0d4bfd96dd84822b6e6ab13c8764a8be026a..b4a93aa5390b1c8f830ae03e15990f62d8d88794 100755
--- a/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/JetEnergyModuleKey.h
+++ b/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/JetEnergyModuleKey.h
@@ -1,19 +1,13 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 /***************************************************************************
                           JetEnergyModuleKey.h  -  description
                              -------------------
     begin                : Monday August 20 2001
-    copyright            : (C) 2000 by Edward Moyse
     email                : e.moyse@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 JETENERGYMODULEKEY_H
 #define JETENERGYMODULEKEY_H
diff --git a/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/JetInputKey.h b/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/JetInputKey.h
index 948ed5c6722e7280c07110f62062fafdb1a566c9..60957aa2c0b85f025d73c2f5cf43ec13c17a9350 100755
--- a/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/JetInputKey.h
+++ b/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/JetInputKey.h
@@ -1,19 +1,13 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 /***************************************************************************
                           JetInputKey.h  -  description
                              -------------------
     begin                : Fri Jan 21 2006
-    copyright            : (C) 2006 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 JetInputKey_H
 #define JetInputKey_H
diff --git a/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/KeyUtilities.h b/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/KeyUtilities.h
index 28e5121a5cd16469fdfdf5ccb8545523de1b3b67..d174d4a5689ecf8cb6c0a7a181d729b94a98b36d 100755
--- a/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/KeyUtilities.h
+++ b/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/KeyUtilities.h
@@ -1,19 +1,13 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 /***************************************************************************
                           KeyUtilities.h  -  description
                              -------------------
     begin                : Monday August 20 2001
-    copyright            : (C) 2000 by Edward Moyse
     email                : e.moyse@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 KeyUtilities_H
 #define KeyUtilities_H
diff --git a/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/L1TopoDataMaker.h b/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/L1TopoDataMaker.h
index 1c390770d51b3f682b53a2d61316a2e2fa489cc6..ae5aeb5a9195fab26046d92d1517a2934ad61b7d 100644
--- a/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/L1TopoDataMaker.h
+++ b/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/L1TopoDataMaker.h
@@ -1,13 +1,12 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 ///////////////////////////////////////////////////////////////////
-// L1TopoDataMaker.h, (c) Alan Watson
+// L1TopoDataMaker.h, 
 ///////////////////////////////////////////////////////////////////
 
  /***************************************************************************
   *                                                                         *
-  *   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.                                   *
   *                                                                         *
   ***************************************************************************/
 
diff --git a/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/ModuleEnergy.h b/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/ModuleEnergy.h
index 385e6daaacfcc331a2d8c0bdbabc99bf2238b4ee..347bdf0c44dc58969430c8f7b5a657b0d2ccd6b9 100755
--- a/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/ModuleEnergy.h
+++ b/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/ModuleEnergy.h
@@ -1,19 +1,13 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 /***************************************************************************
                           ModuleEnergy.h  -  description
                              -------------------
     begin                : Tues Sep 4 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 MODULEENERGY_H
 #define MODULEENERGY_H
diff --git a/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/Parity.h b/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/Parity.h
index a9383aca89239596a4b11db7ba80b9508aa13a63..c19c1b97e6e84aff4ec1001e22e47914437f0de3 100755
--- a/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/Parity.h
+++ b/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/Parity.h
@@ -1,19 +1,13 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 /***************************************************************************
                           Parity.h  -  description
                              -------------------
     begin                : Fri Jun 28 2002
-    copyright            : (C) 2002 by Edward 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.                                   *
- *                                                                         *
- ***************************************************************************/
 
 #ifndef PARITY_H
 #define PARITY_H
diff --git a/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/QuadLinear.h b/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/QuadLinear.h
index 66804fe6597e2161b0a9c406b6df184e5b08f0fc..9258b0c281382166a48d154ff3f74c2eb18f6f4f 100755
--- a/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/QuadLinear.h
+++ b/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/QuadLinear.h
@@ -1,19 +1,13 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 /***************************************************************************
                           QuadLinear.h  -  description
                              -------------------
     begin                : 31-05-2006 
-    copyright            : (C) 2006 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 QUADLINEAR_H
  #define QUADLINEAR_H
diff --git a/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/SystemEnergy.h b/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/SystemEnergy.h
index b600bc19438a5ec9172fd7d0c173c36b1181af81..617041eb1f8479b263aba7ef111ecc9b877a2fdc 100755
--- a/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/SystemEnergy.h
+++ b/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/SystemEnergy.h
@@ -1,19 +1,13 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 /***************************************************************************
                           SystemEnergy.h  -  description
                              -------------------
     begin                : 06/09/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.                                   *
- *                                                                         *
- ***************************************************************************/
 
 
 
diff --git a/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/TriggerTowerKey.h b/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/TriggerTowerKey.h
index 23e9bde77e990668afaf4b3996c92a2fec455cc0..ee241d33cadeb2ef2f64d52cd23966fdc80871f1 100755
--- a/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/TriggerTowerKey.h
+++ b/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/TriggerTowerKey.h
@@ -1,19 +1,13 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 /***************************************************************************
                           TriggerTowerKey.h  -  description
                              -------------------
     begin                : Tue Sep 26 2000
-    copyright            : (C) 2000 by Edward Moyse
     email                : e.moyse@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 TRIGGERTOWERKEY_H
 
diff --git a/Trigger/TrigT1/TrigT1CaloUtils/src/CPAlgorithm.cxx b/Trigger/TrigT1/TrigT1CaloUtils/src/CPAlgorithm.cxx
index 6986a1d6959582efddb3b9dfcf1bba5757148707..c31cadc26083d26e2a85a8d1c7ed929c949b02b9 100755
--- a/Trigger/TrigT1/TrigT1CaloUtils/src/CPAlgorithm.cxx
+++ b/Trigger/TrigT1/TrigT1CaloUtils/src/CPAlgorithm.cxx
@@ -1,20 +1,14 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 /***************************************************************************
                           CPAlgorithm.cxx  -  description
                              -------------------
     begin                : Tues Sep 11 2007
-    copyright            : (C) 2007 Alan Watson
                            Very loosely derived from Ed Moyse's InternalEmTauRoI
     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.                                   *
- *                                                                         *
- ***************************************************************************/
 #include "TrigT1CaloUtils/CPAlgorithm.h"
 
 #include "TrigConfL1Data/L1DataDef.h"
diff --git a/Trigger/TrigT1/TrigT1CaloUtils/src/CPMTobAlgorithm.cxx b/Trigger/TrigT1/TrigT1CaloUtils/src/CPMTobAlgorithm.cxx
index 8f3ee75935eecb141bd8c1f93b989fb00b103e4a..4799faf0734e014c3e476344c54c235126cb006f 100644
--- a/Trigger/TrigT1/TrigT1CaloUtils/src/CPMTobAlgorithm.cxx
+++ b/Trigger/TrigT1/TrigT1CaloUtils/src/CPMTobAlgorithm.cxx
@@ -1,20 +1,14 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 /***************************************************************************
                           CPMTobAlgorithm.cxx  -  description
                              -------------------
     begin                : Thu 6 Mar 2014
-    copyright            : (C) 2014 Alan Watson
                            Derived from CPAlgorithm (Run 1 version)
     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.                                   *
- *                                                                         *
- ***************************************************************************/
 #include "TrigT1CaloUtils/CPMTobAlgorithm.h"
 #include "TrigConfL1Data/L1DataDef.h"
 #include "TrigT1Interfaces/TrigT1CaloDefs.h"
diff --git a/Trigger/TrigT1/TrigT1CaloUtils/src/ClusterProcessorModuleKey.cxx b/Trigger/TrigT1/TrigT1CaloUtils/src/ClusterProcessorModuleKey.cxx
index 4255632f9d6a09e844cb1a75366e2669286e5947..8183ff52f1eb5ff7803d02d6cfb0261f11c64067 100755
--- a/Trigger/TrigT1/TrigT1CaloUtils/src/ClusterProcessorModuleKey.cxx
+++ b/Trigger/TrigT1/TrigT1CaloUtils/src/ClusterProcessorModuleKey.cxx
@@ -1,19 +1,13 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 /***************************************************************************
                           ClusterProcessorModuleKey.cpp  -  description
                              -------------------
     begin                : Tue Sep 26 2000
-    copyright            : (C) 2000 by Edward Moyse
     email                : e.moyse@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
 #include "TrigT1CaloUtils/ClusterProcessorModuleKey.h"
diff --git a/Trigger/TrigT1/TrigT1CaloUtils/src/CoordToHardware.cxx b/Trigger/TrigT1/TrigT1CaloUtils/src/CoordToHardware.cxx
index d2eb1ac30c2242c6e62b8656d7eb7af91b0c4eeb..1e20430eea32fbb7dd8f1c5aa751258fe6600f31 100755
--- a/Trigger/TrigT1/TrigT1CaloUtils/src/CoordToHardware.cxx
+++ b/Trigger/TrigT1/TrigT1CaloUtils/src/CoordToHardware.cxx
@@ -1,19 +1,13 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 /***************************************************************************
                           CoordToHardware.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
 #include "TrigT1CaloUtils/CoordToHardware.h"
 #else
diff --git a/Trigger/TrigT1/TrigT1CaloUtils/src/CrateEnergy.cxx b/Trigger/TrigT1/TrigT1CaloUtils/src/CrateEnergy.cxx
index 1abf6aa91ba1bd4fe1a3d0c98af037869555e1a6..a4849f1b42f06e5e03d6018ebf49b37fec570546 100755
--- a/Trigger/TrigT1/TrigT1CaloUtils/src/CrateEnergy.cxx
+++ b/Trigger/TrigT1/TrigT1CaloUtils/src/CrateEnergy.cxx
@@ -1,19 +1,13 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 /***************************************************************************
                           CrateEnergy.h  -  description
                              -------------------
     begin                : 06/09/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.                                   *
- *                                                                         *
- ***************************************************************************/
 
 #include "TrigT1CaloUtils/CrateEnergy.h"
 
diff --git a/Trigger/TrigT1/TrigT1CaloUtils/src/DataError.cxx b/Trigger/TrigT1/TrigT1CaloUtils/src/DataError.cxx
index dfe8e04cce2121f0b5c9742d749e85e5e022d69a..c8e4e12796f5e2d3f364bf5ea971ea4361692fd4 100644
--- a/Trigger/TrigT1/TrigT1CaloUtils/src/DataError.cxx
+++ b/Trigger/TrigT1/TrigT1CaloUtils/src/DataError.cxx
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 
 #include "TrigT1CaloUtils/DataError.h"
 
diff --git a/Trigger/TrigT1/TrigT1CaloUtils/src/ICoordinate.cxx b/Trigger/TrigT1/TrigT1CaloUtils/src/ICoordinate.cxx
index 971fda29e9ddaa9df85c42b89f48dca950254e18..c109ad978f55bcf24f9353c0761a8324675ab6e2 100755
--- a/Trigger/TrigT1/TrigT1CaloUtils/src/ICoordinate.cxx
+++ b/Trigger/TrigT1/TrigT1CaloUtils/src/ICoordinate.cxx
@@ -1,8 +1,10 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 /***************************************************************************
                           ICoordinate.cxx  -  description
                              -------------------
     begin                : 26/02/2002
-    copyright            : (C) 2002 by moyse
     email                : e.moyse@qmul.ac.uk
  ***************************************************************************/
 
diff --git a/Trigger/TrigT1/TrigT1CaloUtils/src/InternalTriggerTower.cxx b/Trigger/TrigT1/TrigT1CaloUtils/src/InternalTriggerTower.cxx
index a2b420536ac0d2ade5fb9c35c82a96784a222fde..df697d047faa812af517ac85360f3c9e33a5f620 100755
--- a/Trigger/TrigT1/TrigT1CaloUtils/src/InternalTriggerTower.cxx
+++ b/Trigger/TrigT1/TrigT1CaloUtils/src/InternalTriggerTower.cxx
@@ -1,19 +1,13 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 /***************************************************************************
                           TriggerTower.cpp  -  description
                              -------------------
     begin                : Fri Sep 30 2005
-    copyright            : (C) 2005 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.                                   *
- *                                                                         *
- ***************************************************************************/
 
 #include "TrigT1CaloUtils/InternalTriggerTower.h"
 
diff --git a/Trigger/TrigT1/TrigT1CaloUtils/src/JEMJetAlgorithm.cxx b/Trigger/TrigT1/TrigT1CaloUtils/src/JEMJetAlgorithm.cxx
index 027847bcd0b44295ea5c935aaac3a9d502296420..b8ffca7120766c6375dc2d59aca61ac3e6230224 100755
--- a/Trigger/TrigT1/TrigT1CaloUtils/src/JEMJetAlgorithm.cxx
+++ b/Trigger/TrigT1/TrigT1CaloUtils/src/JEMJetAlgorithm.cxx
@@ -1,19 +1,13 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 /***************************************************************************
                           JEMJetAlgorithm.cxx  -  description
                              -------------------
     begin                : Thurs Mar 13 2014
-    copyright            : (C) 2014 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.                                   *
- *                                                                         *
- ***************************************************************************/
 #include "TrigT1CaloUtils/JEMJetAlgorithm.h"
 #include "TrigConfL1Data/L1DataDef.h"
 #include "TrigT1Interfaces/TrigT1CaloDefs.h"
diff --git a/Trigger/TrigT1/TrigT1CaloUtils/src/JetAlgorithm.cxx b/Trigger/TrigT1/TrigT1CaloUtils/src/JetAlgorithm.cxx
index 7380352315f5e2f7de09c099525e6de74621b83d..259c9b822572f31a2f04dca2edf40a0248b85fba 100755
--- a/Trigger/TrigT1/TrigT1CaloUtils/src/JetAlgorithm.cxx
+++ b/Trigger/TrigT1/TrigT1CaloUtils/src/JetAlgorithm.cxx
@@ -1,19 +1,13 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 /***************************************************************************
                           JetAlgorithm.cxx  -  description
                              -------------------
     begin                : Tues Sep 11 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.                                   *
- *                                                                         *
- ***************************************************************************/
 #include "TrigT1CaloUtils/JetAlgorithm.h"
 #include "TrigConfL1Data/L1DataDef.h"
 #include "TrigConfL1Data/CTPConfig.h"
diff --git a/Trigger/TrigT1/TrigT1CaloUtils/src/JetElementKey.cxx b/Trigger/TrigT1/TrigT1CaloUtils/src/JetElementKey.cxx
index ca3054e161c9f972c7c19c12b373393bd583b6aa..59642c765d2cb715c1a8f59ec77525f9c734debf 100755
--- a/Trigger/TrigT1/TrigT1CaloUtils/src/JetElementKey.cxx
+++ b/Trigger/TrigT1/TrigT1CaloUtils/src/JetElementKey.cxx
@@ -1,19 +1,13 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 /***************************************************************************
                           JetElementKey.cpp  -  description
                              -------------------
     begin                : Tue Sep 26 2000
-    copyright            : (C) 2000 by Edward Moyse
     email                : e.moyse@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
 #include "TrigT1CaloUtils/JetElementKey.h"
diff --git a/Trigger/TrigT1/TrigT1CaloUtils/src/JetElementKeyBase.cxx b/Trigger/TrigT1/TrigT1CaloUtils/src/JetElementKeyBase.cxx
index c65822b14c6e8326458ba2b66b5956ad26dd4ede..7df0625c4cd565bedc2037d46345966479dbbd6d 100755
--- a/Trigger/TrigT1/TrigT1CaloUtils/src/JetElementKeyBase.cxx
+++ b/Trigger/TrigT1/TrigT1CaloUtils/src/JetElementKeyBase.cxx
@@ -1,21 +1,15 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 /***************************************************************************
                            JetElementKeyBase.cpp  -  description
                              -------------------
     begin                : Tue Sep 26 2000
-    copyright            : (C) 2000 by Edward Moyse
     email                : e.moyse@qmw.ac.uk
     
   Converted to base class JetElementKeyBase by Alan Watson, 20/01/06
  ***************************************************************************/
 
-/***************************************************************************
- *                                                                         *
- *   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 "TrigT1CaloUtils/JetElementKeyBase.h"
diff --git a/Trigger/TrigT1/TrigT1CaloUtils/src/JetEnergyModuleKey.cxx b/Trigger/TrigT1/TrigT1CaloUtils/src/JetEnergyModuleKey.cxx
index 86a40a0309bc20c0d87677e157c2a605fe307f81..195a4d8b3e8350561ded017feb5e2290e112407c 100755
--- a/Trigger/TrigT1/TrigT1CaloUtils/src/JetEnergyModuleKey.cxx
+++ b/Trigger/TrigT1/TrigT1CaloUtils/src/JetEnergyModuleKey.cxx
@@ -1,19 +1,13 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 /***************************************************************************
                           JetEnergyModuleKey.cpp  -  description
                              -------------------
     begin                : Tue Sep 26 2000
-    copyright            : (C) 2000 by Edward Moyse
     email                : e.moyse@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
 #include "TrigT1Interfaces/TrigT1CaloDefs.h"
diff --git a/Trigger/TrigT1/TrigT1CaloUtils/src/JetInputKey.cxx b/Trigger/TrigT1/TrigT1CaloUtils/src/JetInputKey.cxx
index 9ec344e39055b160f55180831d8fc08e9278b94b..43cb32053ba7c5b4bf605cc201fd6e02416e7743 100755
--- a/Trigger/TrigT1/TrigT1CaloUtils/src/JetInputKey.cxx
+++ b/Trigger/TrigT1/TrigT1CaloUtils/src/JetInputKey.cxx
@@ -1,19 +1,13 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 /***************************************************************************
                           JetInputKey.cpp  -  description
                              -------------------
     begin                : Fri Jan 21 2006
-    copyright            : (C) 2006 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  TRIGGERSPACE
 // running in Athena
 #include "TrigT1CaloUtils/JetInputKey.h"
diff --git a/Trigger/TrigT1/TrigT1CaloUtils/src/KeyUtilities.cxx b/Trigger/TrigT1/TrigT1CaloUtils/src/KeyUtilities.cxx
index 2e99972d309b4cb110143a50d4be4c325da970b0..e427f08d2c924e9dfc875f5645d0c56a7b3378da 100755
--- a/Trigger/TrigT1/TrigT1CaloUtils/src/KeyUtilities.cxx
+++ b/Trigger/TrigT1/TrigT1CaloUtils/src/KeyUtilities.cxx
@@ -1,19 +1,13 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 /***************************************************************************
                           KeyUtilities.cpp  -  description
                              -------------------
     begin                : Tue Sep 26 2000
-    copyright            : (C) 2000 by Edward Moyse
     email                : e.moyse@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/TrigT1CaloUtils/src/L1TopoDataMaker.cxx b/Trigger/TrigT1/TrigT1CaloUtils/src/L1TopoDataMaker.cxx
index fd81e884bf6887f77c4cfc8b7350a1af99f06b9e..c4ccaba54af9a70dbd542a8210ff65714c08bc1b 100644
--- a/Trigger/TrigT1/TrigT1CaloUtils/src/L1TopoDataMaker.cxx
+++ b/Trigger/TrigT1/TrigT1CaloUtils/src/L1TopoDataMaker.cxx
@@ -1,5 +1,8 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 ///////////////////////////////////////////////////////////////////
-// L1TopoDataMaker.cxx, (c) Alan Watson (see header file for license)
+// L1TopoDataMaker.cxx, 
 ///////////////////////////////////////////////////////////////////
 
 #include "TrigT1CaloUtils/L1TopoDataMaker.h"
diff --git a/Trigger/TrigT1/TrigT1CaloUtils/src/ModuleEnergy.cxx b/Trigger/TrigT1/TrigT1CaloUtils/src/ModuleEnergy.cxx
index dac479bbb865861699604398c84cd7050c051069..4551eba7fe044b9dec477ed294747a257692fcd8 100755
--- a/Trigger/TrigT1/TrigT1CaloUtils/src/ModuleEnergy.cxx
+++ b/Trigger/TrigT1/TrigT1CaloUtils/src/ModuleEnergy.cxx
@@ -1,20 +1,14 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 /***************************************************************************
                           ModuleEnergy.cxx  -  description
                              -------------------
     begin                : Tues Sep 4 2007
-    copyright            : (C) 2007 Alan Watson
                            Loosely based on Ed Moyse's JetEnergyModule
     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.                                   *
- *                                                                         *
- ***************************************************************************/
 #include "TrigT1CaloUtils/ModuleEnergy.h"
 #include "TrigT1CaloUtils/QuadLinear.h"
 
diff --git a/Trigger/TrigT1/TrigT1CaloUtils/src/Parity.cxx b/Trigger/TrigT1/TrigT1CaloUtils/src/Parity.cxx
index cca836cdce2f0bd9160297b14d13563ec96a2ca6..b473da1aa215ea51a229ef10a1879ca4614fd9da 100755
--- a/Trigger/TrigT1/TrigT1CaloUtils/src/Parity.cxx
+++ b/Trigger/TrigT1/TrigT1CaloUtils/src/Parity.cxx
@@ -1,19 +1,13 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 /***************************************************************************
                           Parity.cpp  -  description
                              -------------------
     begin                : Fri Jun 28 2002
-    copyright            : (C) 2002 by Edward 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 "TrigT1CaloUtils/Parity.h"
 
diff --git a/Trigger/TrigT1/TrigT1CaloUtils/src/QuadLinear.cxx b/Trigger/TrigT1/TrigT1CaloUtils/src/QuadLinear.cxx
index baba18093d172cbc2176070d6da9947ebcbcca2e..3a7322f9db94a186d5b159f10be082a857342141 100755
--- a/Trigger/TrigT1/TrigT1CaloUtils/src/QuadLinear.cxx
+++ b/Trigger/TrigT1/TrigT1CaloUtils/src/QuadLinear.cxx
@@ -1,19 +1,13 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 /***************************************************************************
                           QuadLinear.cxx  -  description
                              -------------------
     begin                : 31-05-2006 
-    copyright            : (C) 2006 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.                                   *
- *                                                                         *
- ***************************************************************************/
 #include "TrigT1CaloUtils/QuadLinear.h"
 
 namespace LVL1 {
diff --git a/Trigger/TrigT1/TrigT1CaloUtils/src/SystemEnergy.cxx b/Trigger/TrigT1/TrigT1CaloUtils/src/SystemEnergy.cxx
index 61ab9e6b05db23e06571586bb15862591064d729..c056897e459f4fe75bc588b53f1fcb1079dba619 100755
--- a/Trigger/TrigT1/TrigT1CaloUtils/src/SystemEnergy.cxx
+++ b/Trigger/TrigT1/TrigT1CaloUtils/src/SystemEnergy.cxx
@@ -1,19 +1,13 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 /***************************************************************************
                           SystemEnergy.h  -  description
                              -------------------
     begin                : 06/09/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.                                   *
- *                                                                         *
- ***************************************************************************/
 
 #include "TrigT1CaloUtils/SystemEnergy.h"
 #include "TrigT1Interfaces/TrigT1CaloDefs.h"
diff --git a/Trigger/TrigT1/TrigT1CaloUtils/src/TriggerTowerKey.cxx b/Trigger/TrigT1/TrigT1CaloUtils/src/TriggerTowerKey.cxx
index 0f05ff57448b4f342709c14b92b86ebb60cd2905..af1af7a5ad2bff14fab1f44ec6b3e8c576d20932 100755
--- a/Trigger/TrigT1/TrigT1CaloUtils/src/TriggerTowerKey.cxx
+++ b/Trigger/TrigT1/TrigT1CaloUtils/src/TriggerTowerKey.cxx
@@ -1,19 +1,13 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 /***************************************************************************
                           TriggerTowerKey.cpp  -  description
                              -------------------
     begin                : Tue Sep 26 2000
-    copyright            : (C) 2000 by Edward Moyse
     email                : e.moyse@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/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/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 b37990342d668eb2f05f86d4cc813b150e2e8cb9..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
 
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 8a7e29985cabb351ec9a26741b42a8ab4a14cd0c..ebe5a475933fae1015ea0035b40a470f442433f9 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 450587f0902ac75835eb567ce65ce4624edafdbd..618dd41a981520164c9dbf18ae24acd6d60a04ee 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 d7ba8a76952f7937035e66fe9c5af8f49736a0f9..3edfa2413bcb5df5068edd7e6b5222adb3b87609 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 dcfaffd556e8b4e36f44cab7c55e05e690a05c93..aaf1bdecc2e5218e81df590cfa86a60df5790644 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 756925 2016-06-22 13:31:16Z ddimond $
 /***************************************************************************
                         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 a5da6537cb9af9bfd525466fa0c63ebb7ae2b92e..63a6d04503c7e469e60222082a8ad3e573f5e793 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 756925 2016-06-22 13:31:16Z ddimond $
 /***************************************************************************
                          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 08e16eb2490c6d5da26671b1158b5899e2653110..a693eb67f58a09a9ec9b2f286234920c712d8836 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(){