diff --git a/AtlasTest/DatabaseTest/IOVDbTestAlg/src/IOVDbTestAlg_entries.cxx b/AtlasTest/DatabaseTest/IOVDbTestAlg/src/IOVDbTestAlg_entries.cxx
index 4cb36bb1e0773e7d9d847b617649395e24840e9c..784dc4d5b305b78ebc4695f5b5a96d2d2f8f4274 100644
--- a/AtlasTest/DatabaseTest/IOVDbTestAlg/src/IOVDbTestAlg_entries.cxx
+++ b/AtlasTest/DatabaseTest/IOVDbTestAlg/src/IOVDbTestAlg_entries.cxx
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
#include "IOVDbTestAlg/IOVDbTestAlg.h"
#include "IOVDbTestAlg/IOVDbTestCoolDCS.h"
diff --git a/AtlasTest/GoogleTestTools/GoogleTestTools/InitGaudiGoogleTest.h b/AtlasTest/GoogleTestTools/GoogleTestTools/InitGaudiGoogleTest.h
index d4d3f097f58f9a5fa5eeadefdfae0255a016e08d..61b89a17cbe28b5a7c880f14443833192d53ddf4 100644
--- a/AtlasTest/GoogleTestTools/GoogleTestTools/InitGaudiGoogleTest.h
+++ b/AtlasTest/GoogleTestTools/GoogleTestTools/InitGaudiGoogleTest.h
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
// -*- mode: c++ -*-
/**
diff --git a/AtlasTest/GoogleTestTools/src/InitGaudiGoogleTest.cxx b/AtlasTest/GoogleTestTools/src/InitGaudiGoogleTest.cxx
index eb92fb39eb3b46e7b97dd4c6b68cc1c5cd47efe9..28ee5909916d78ad0852a02616e93cd89abf4eb4 100644
--- a/AtlasTest/GoogleTestTools/src/InitGaudiGoogleTest.cxx
+++ b/AtlasTest/GoogleTestTools/src/InitGaudiGoogleTest.cxx
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
#include "GoogleTestTools/InitGaudiGoogleTest.h"
diff --git a/AtlasTest/GoogleTestTools/test/gt_GoogleTestTools.cxx b/AtlasTest/GoogleTestTools/test/gt_GoogleTestTools.cxx
index bd246906cd68ac31f1fdb8f631b45bf482be99e3..216a1850a7b21628cbce08b613c466658cb1653d 100644
--- a/AtlasTest/GoogleTestTools/test/gt_GoogleTestTools.cxx
+++ b/AtlasTest/GoogleTestTools/test/gt_GoogleTestTools.cxx
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
#include "GoogleTestTools/InitGaudiGoogleTest.h"
diff --git a/Calorimeter/CaloCnv/CaloDetMgrDetDescrCnv/src/CaloDetMgrDetDescrCnv_entries.cxx b/Calorimeter/CaloCnv/CaloDetMgrDetDescrCnv/src/CaloDetMgrDetDescrCnv_entries.cxx
index e77254dd942bb88e8590707b18e0c009f93e3db5..e30f411dfa43c887daa7848bd2b90a710fc6df7f 100644
--- a/Calorimeter/CaloCnv/CaloDetMgrDetDescrCnv/src/CaloDetMgrDetDescrCnv_entries.cxx
+++ b/Calorimeter/CaloCnv/CaloDetMgrDetDescrCnv/src/CaloDetMgrDetDescrCnv_entries.cxx
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
#include "CaloDetMgrDetDescrCnv/CaloMgrDetDescrCnv.h"
#include "CaloDetMgrDetDescrCnv/CaloSuperCellMgrDetDescrCnv.h"
diff --git a/Calorimeter/CaloCnv/CaloIdCnv/src/CaloIdCnv_entries.cxx b/Calorimeter/CaloCnv/CaloIdCnv/src/CaloIdCnv_entries.cxx
index d11249193162bcd3be6f4e8fc2a7febd4ddb96cd..8210811485704c6a1324d14e9389095822215a14 100644
--- a/Calorimeter/CaloCnv/CaloIdCnv/src/CaloIdCnv_entries.cxx
+++ b/Calorimeter/CaloCnv/CaloIdCnv/src/CaloIdCnv_entries.cxx
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
#include "CaloIdCnv/CaloIdMgrDetDescrCnv.h"
#include "CaloIdCnv/CaloCell_IDDetDescrCnv.h"
#include "CaloIdCnv/CaloCell_SuperCell_IDDetDescrCnv.h"
diff --git a/Calorimeter/CaloCnv/CaloTTDetDescrCnv/src/CaloTTDetDescrCnv_entries.cxx b/Calorimeter/CaloCnv/CaloTTDetDescrCnv/src/CaloTTDetDescrCnv_entries.cxx
index bc8dffb13d386e7b1a09cd718f184cf1fda46431..0186997eaed38cf270eb58c1d541caac3b544e9e 100644
--- a/Calorimeter/CaloCnv/CaloTTDetDescrCnv/src/CaloTTDetDescrCnv_entries.cxx
+++ b/Calorimeter/CaloCnv/CaloTTDetDescrCnv/src/CaloTTDetDescrCnv_entries.cxx
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
#include "CaloTTMgrDetDescrCnv.h"
DECLARE_CONVERTER( CaloTTMgrDetDescrCnv )
diff --git a/Calorimeter/CaloEvent/CaloEvent/CaloBCIDAverage.h b/Calorimeter/CaloEvent/CaloEvent/CaloBCIDAverage.h
index 2bb8e71924511e774f1fa7fab2f558331465e3d0..3cfff422b07e98c09b3257c1c950c4f43dcd2cc7 100644
--- a/Calorimeter/CaloEvent/CaloEvent/CaloBCIDAverage.h
+++ b/Calorimeter/CaloEvent/CaloEvent/CaloBCIDAverage.h
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
#ifndef CALOEVENT_CALOBCIDAVERAGE_H
#define CALOEVENT_CALOBCIDAVERAGE_H
diff --git a/Calorimeter/CaloEvent/CaloEvent/CaloTester.h b/Calorimeter/CaloEvent/CaloEvent/CaloTester.h
index 582885b7e1a0b63c18f79cb1104bb36e72e1e42b..41697334992b7377480c5a0731b17df17daab3d2 100644
--- a/Calorimeter/CaloEvent/CaloEvent/CaloTester.h
+++ b/Calorimeter/CaloEvent/CaloEvent/CaloTester.h
@@ -1,6 +1,8 @@
// This file's extension implies that it's C, but it's really -*- C++ -*-.
/*
- * Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration.
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+/*
*/
/**
* @file CaloEvent/CaloTester.h
diff --git a/Calorimeter/CaloEvent/src/CaloBCIDAverage.cxx b/Calorimeter/CaloEvent/src/CaloBCIDAverage.cxx
index 19f98b741e279747d35e7c79c17b8a41c310e9e3..90261097cb8b2646454bed2505d2490236e29cd6 100644
--- a/Calorimeter/CaloEvent/src/CaloBCIDAverage.cxx
+++ b/Calorimeter/CaloEvent/src/CaloBCIDAverage.cxx
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
#include "CaloEvent/CaloBCIDAverage.h"
diff --git a/Calorimeter/CaloEvent/src/CaloCellContainerVector.cxx b/Calorimeter/CaloEvent/src/CaloCellContainerVector.cxx
index 4fe862c5b9e312585462c1523751338f0b77ca3c..e622e11c0f1e225b832338c73dfc299613577b7d 100644
--- a/Calorimeter/CaloEvent/src/CaloCellContainerVector.cxx
+++ b/Calorimeter/CaloEvent/src/CaloCellContainerVector.cxx
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
#include "CaloEvent/CaloCellContainerVector.h"
diff --git a/Calorimeter/CaloEvent/src/CaloTester.cxx b/Calorimeter/CaloEvent/src/CaloTester.cxx
index 2e9065102c4526a543d59567199216031fdafc99..4fab261a27b1bc264ac6a45df20f33bacbb46242 100644
--- a/Calorimeter/CaloEvent/src/CaloTester.cxx
+++ b/Calorimeter/CaloEvent/src/CaloTester.cxx
@@ -1,5 +1,7 @@
/*
- * Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration.
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+/*
*/
/**
* @file CaloEvent/src/CaloTester.cxx
diff --git a/Calorimeter/CaloEvent/test/CaloTester_test.cxx b/Calorimeter/CaloEvent/test/CaloTester_test.cxx
index d96672424483738839cd81589fa6355bc12ee4b5..f1d49525bc558db7a1d0f32d5c89d0c61c6d951e 100644
--- a/Calorimeter/CaloEvent/test/CaloTester_test.cxx
+++ b/Calorimeter/CaloEvent/test/CaloTester_test.cxx
@@ -1,5 +1,7 @@
/*
- * Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration.
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+/*
*/
/**
* @file CaloEvent/test/CaloTester_test.cxx
diff --git a/Calorimeter/CaloIdentifier/CaloIdentifier/CaloHelpersTest.h b/Calorimeter/CaloIdentifier/CaloIdentifier/CaloHelpersTest.h
index bd74a57965ee6267cf00d4c20cec809ecc9fd381..60576e0b2b66c57e6418ccbe5cdec6f6525dca7b 100644
--- a/Calorimeter/CaloIdentifier/CaloIdentifier/CaloHelpersTest.h
+++ b/Calorimeter/CaloIdentifier/CaloIdentifier/CaloHelpersTest.h
@@ -1,6 +1,8 @@
// This file's extension implies that it's C, but it's really -*- C++ -*-.
/*
- * Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration.
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+/*
*/
/**
* @file CaloIdentifier/CaloHelpersTest.h
diff --git a/Calorimeter/CaloIdentifier/src/CaloHelpersTest.cxx b/Calorimeter/CaloIdentifier/src/CaloHelpersTest.cxx
index 7d9fbe28ea0dff38d5a51dc7c770c61ff0bca19b..3f1180950f7ba486402de302963f9dbce38b17f4 100644
--- a/Calorimeter/CaloIdentifier/src/CaloHelpersTest.cxx
+++ b/Calorimeter/CaloIdentifier/src/CaloHelpersTest.cxx
@@ -1,5 +1,7 @@
/*
- * Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration.
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+/*
*/
/**
* @file CaloIdentifier/src/CaloHelpersTest.cxx
diff --git a/Calorimeter/CaloIdentifier/test/CaloHelpersTest_test.cxx b/Calorimeter/CaloIdentifier/test/CaloHelpersTest_test.cxx
index 1503e3f02e7217dc9ca780b4c30d6002f46f5a70..ac561ccbea06bd81650e2d80d466177a2dcb7152 100644
--- a/Calorimeter/CaloIdentifier/test/CaloHelpersTest_test.cxx
+++ b/Calorimeter/CaloIdentifier/test/CaloHelpersTest_test.cxx
@@ -1,5 +1,7 @@
/*
- * Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration.
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+/*
*/
/**
* @file CaloIdentifier/test/CaloHelpersTest_test.cxx
diff --git a/Calorimeter/CaloRec/src/CaloClusterMomentsMaker_DigiHSTruth.cxx b/Calorimeter/CaloRec/src/CaloClusterMomentsMaker_DigiHSTruth.cxx
index f3b032fb7fb3f352499ae0081b4bb0c70fc2c5d7..6e08483aa3825d0e90c0fa9132ab3919c91e9c5d 100755
--- a/Calorimeter/CaloRec/src/CaloClusterMomentsMaker_DigiHSTruth.cxx
+++ b/Calorimeter/CaloRec/src/CaloClusterMomentsMaker_DigiHSTruth.cxx
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
//-----------------------------------------------------------------------
// File and Version Information:
// $Id: CaloClusterMomentsMaker.cxx,v 1.23 2009-04-22 19:50:46 ssnyder Exp $
diff --git a/Calorimeter/CaloRec/src/CaloClusterMomentsMaker_DigiHSTruth.h b/Calorimeter/CaloRec/src/CaloClusterMomentsMaker_DigiHSTruth.h
index d10ec87db5b6ad0181fcd05dd54d7f676bf94e87..4d9b2523a4f76fdfa1855b24c07e0fecab88f9c8 100755
--- a/Calorimeter/CaloRec/src/CaloClusterMomentsMaker_DigiHSTruth.h
+++ b/Calorimeter/CaloRec/src/CaloClusterMomentsMaker_DigiHSTruth.h
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
//Dear emacs, this is -*-c++-*-
#ifndef CALOCLUSTERMOMENTSMAKER_DigiHSTruth_H
#define CALOCLUSTERMOMENTSMAKER_DigiHSTruth_H
diff --git a/Calorimeter/CaloRec/test/CaloCellContainerFromClusterTool_test.cxx b/Calorimeter/CaloRec/test/CaloCellContainerFromClusterTool_test.cxx
index b5150c7c79d337123c8199edee50d02c9788d2d5..0324f8a0fd315e4f31a7086fa02273879db34599 100644
--- a/Calorimeter/CaloRec/test/CaloCellContainerFromClusterTool_test.cxx
+++ b/Calorimeter/CaloRec/test/CaloCellContainerFromClusterTool_test.cxx
@@ -1,5 +1,7 @@
/*
- * Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration.
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+/*
*/
/**
* @file CaloRec/test/CaloCellContainerFromClusterTool_test.cxx
diff --git a/Control/AthContainers/AthContainers/tools/AtomicConstAccessor.h b/Control/AthContainers/AthContainers/tools/AtomicConstAccessor.h
index 59e9e4a5b86f7f6f54fd7bbbe495ba19a61f136b..91c23d9e87511fd4050e4031a2a63e58f7b0afcf 100644
--- a/Control/AthContainers/AthContainers/tools/AtomicConstAccessor.h
+++ b/Control/AthContainers/AthContainers/tools/AtomicConstAccessor.h
@@ -1,4 +1,7 @@
// This file's extension implies that it's C, but it's really -*- C++ -*-.
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
/**
* @file AthContainers/tools/AtomicConstAccessor.h
* @author scott snyder <snyder@bnl.gov>
diff --git a/Control/AthContainers/AthContainers/tools/AtomicConstAccessor.icc b/Control/AthContainers/AthContainers/tools/AtomicConstAccessor.icc
index 33d04a18c858c6b240e86c57b848045cacacda0b..ea6d90640da4750df27da50041e2e666e1984bd8 100644
--- a/Control/AthContainers/AthContainers/tools/AtomicConstAccessor.icc
+++ b/Control/AthContainers/AthContainers/tools/AtomicConstAccessor.icc
@@ -1,4 +1,7 @@
// This file's extension implies that it's C, but it's really -*- C++ -*-.
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
/**
* @file AthContainers/tools/AtomicConstAccessor.icc
* @author scott snyder <snyder@bnl.gov>
diff --git a/Control/AthContainers/AthContainers/tools/AtomicDecorator.h b/Control/AthContainers/AthContainers/tools/AtomicDecorator.h
index 9c6aa135dbeb20a393dce2beb4c6fdc01e811980..d70ac90399785f954b609c656fca5acc8007d5b0 100644
--- a/Control/AthContainers/AthContainers/tools/AtomicDecorator.h
+++ b/Control/AthContainers/AthContainers/tools/AtomicDecorator.h
@@ -1,4 +1,7 @@
// This file's extension implies that it's C, but it's really -*- C++ -*-.
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
/**
* @file AthContainers/tools/AtomicDecorator.h
* @author scott snyder <snyder@bnl.gov>
diff --git a/Control/AthContainers/AthContainers/tools/AtomicDecorator.icc b/Control/AthContainers/AthContainers/tools/AtomicDecorator.icc
index 40a8c07012001762569db26b844c27916c0203b0..6dbb7d6bae7e2f7ed44b28bd44165142d825ca30 100644
--- a/Control/AthContainers/AthContainers/tools/AtomicDecorator.icc
+++ b/Control/AthContainers/AthContainers/tools/AtomicDecorator.icc
@@ -1,4 +1,7 @@
// This file's extension implies that it's C, but it's really -*- C++ -*-.
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
/**
* @file AthContainers/tools/AtomicDecorator.icc
* @author scott snyder <snyder@bnl.gov>
diff --git a/Control/AthContainers/test/AtomicConstAccessor_test.cxx b/Control/AthContainers/test/AtomicConstAccessor_test.cxx
index 0a5d3052a3a1cfecb49c09fe845913d9442e5dfb..d92b2955cf924feb52dc00abb6807863353cec8a 100644
--- a/Control/AthContainers/test/AtomicConstAccessor_test.cxx
+++ b/Control/AthContainers/test/AtomicConstAccessor_test.cxx
@@ -1,5 +1,7 @@
/*
- * Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration.
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+/*
*/
/**
* @file AthContainers/test/AtomicConstAccessor_test.cxx
diff --git a/Control/AthContainers/test/AtomicDecorator_test.cxx b/Control/AthContainers/test/AtomicDecorator_test.cxx
index 5fa99b5ff23237f0ccd2824504d174d43d859020..71a8261fb28cfe701a9f421a6a9b593c77cd9e53 100644
--- a/Control/AthContainers/test/AtomicDecorator_test.cxx
+++ b/Control/AthContainers/test/AtomicDecorator_test.cxx
@@ -1,5 +1,7 @@
/*
- * Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration.
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+/*
*/
/**
* @file AthContainers/test/AtomicDecorator_test.cxx
diff --git a/Control/AthContainersRoot/AthContainersRoot/test/Foo.h b/Control/AthContainersRoot/AthContainersRoot/test/Foo.h
index 5e889daeb785ff02b36abc45456513580c025a51..ee717c56b48b6a5820c25069ea634804c53add13 100644
--- a/Control/AthContainersRoot/AthContainersRoot/test/Foo.h
+++ b/Control/AthContainersRoot/AthContainersRoot/test/Foo.h
@@ -1,6 +1,8 @@
// This file's extension implies that it's C, but it's really -*- C++ -*-.
/*
- * Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration.
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+/*
*/
/**
* @file AthContainersRoot/Foo.h
diff --git a/Control/AthToolSupport/AsgExampleTools/AsgExampleTools/IUnitTestTool1.h b/Control/AthToolSupport/AsgExampleTools/AsgExampleTools/IUnitTestTool1.h
index 09b1ed4b54e83a4f76c2735cdb650204e6408258..efe6146a60bb30ab2a383dad8689f73765f6ac73 100644
--- a/Control/AthToolSupport/AsgExampleTools/AsgExampleTools/IUnitTestTool1.h
+++ b/Control/AthToolSupport/AsgExampleTools/AsgExampleTools/IUnitTestTool1.h
@@ -1,7 +1,7 @@
#ifndef ASG_TOOLS__I_UNIT_TEST_TOOL1_H
#define ASG_TOOLS__I_UNIT_TEST_TOOL1_H
-// Copyright Iowa State University 2016.
+//
// Author: Nils Krumnack
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/Control/AthToolSupport/AsgExampleTools/AsgExampleTools/IUnitTestTool2.h b/Control/AthToolSupport/AsgExampleTools/AsgExampleTools/IUnitTestTool2.h
index b8b3abec6374ca8eab70a5f0c540b41670f2e510..42671f14e7a10657dde9f65322239ab3fba863cd 100644
--- a/Control/AthToolSupport/AsgExampleTools/AsgExampleTools/IUnitTestTool2.h
+++ b/Control/AthToolSupport/AsgExampleTools/AsgExampleTools/IUnitTestTool2.h
@@ -1,7 +1,7 @@
#ifndef ASG_TOOLS__I_UNIT_TEST_TOOL2_H
#define ASG_TOOLS__I_UNIT_TEST_TOOL2_H
-// Copyright Iowa State University 2016.
+//
// Author: Nils Krumnack
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/Control/AthToolSupport/AsgExampleTools/AsgExampleTools/IUnitTestTool3.h b/Control/AthToolSupport/AsgExampleTools/AsgExampleTools/IUnitTestTool3.h
index 1feccafca179408f1910f28a4acf57edca05bb2b..70a6c39f49ac922b25a717fa228d234878efd990 100644
--- a/Control/AthToolSupport/AsgExampleTools/AsgExampleTools/IUnitTestTool3.h
+++ b/Control/AthToolSupport/AsgExampleTools/AsgExampleTools/IUnitTestTool3.h
@@ -1,7 +1,7 @@
#ifndef ASG_TOOLS__I_UNIT_TEST_TOOL3_H
#define ASG_TOOLS__I_UNIT_TEST_TOOL3_H
-// Copyright Iowa State University 2016.
+//
// Author: Nils Krumnack
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/Control/AthToolSupport/AsgExampleTools/AsgExampleTools/UnitTestTool1.h b/Control/AthToolSupport/AsgExampleTools/AsgExampleTools/UnitTestTool1.h
index c7d12afa318fc52afc9f987401914049ffa6f2a2..42a35fbf7e109c44c99f10f96929cd3067e0b2ab 100644
--- a/Control/AthToolSupport/AsgExampleTools/AsgExampleTools/UnitTestTool1.h
+++ b/Control/AthToolSupport/AsgExampleTools/AsgExampleTools/UnitTestTool1.h
@@ -1,7 +1,7 @@
#ifndef ASG_TOOLS__UNIT_TEST_TOOL1_H
#define ASG_TOOLS__UNIT_TEST_TOOL1_H
-// Copyright Iowa State University 2016.
+//
// Author: Nils Krumnack
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/Control/AthToolSupport/AsgExampleTools/AsgExampleTools/UnitTestTool1A.h b/Control/AthToolSupport/AsgExampleTools/AsgExampleTools/UnitTestTool1A.h
index abf91ea880331a4e5898123589336710b4badf02..2ee55922c4950563610fd6571461774b7bcda813 100644
--- a/Control/AthToolSupport/AsgExampleTools/AsgExampleTools/UnitTestTool1A.h
+++ b/Control/AthToolSupport/AsgExampleTools/AsgExampleTools/UnitTestTool1A.h
@@ -1,7 +1,7 @@
#ifndef ASG_TOOLS__UNIT_TEST_TOOL1A_H
#define ASG_TOOLS__UNIT_TEST_TOOL1A_H
-// Copyright Iowa State University 2016.
+//
// Author: Nils Krumnack
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/Control/AthToolSupport/AsgExampleTools/AsgExampleTools/UnitTestTool2.h b/Control/AthToolSupport/AsgExampleTools/AsgExampleTools/UnitTestTool2.h
index 8819f94b55414afe5e91d63b6f7797b989c44cc7..80131f0b0251001f3db390569475423c78dcc6e1 100644
--- a/Control/AthToolSupport/AsgExampleTools/AsgExampleTools/UnitTestTool2.h
+++ b/Control/AthToolSupport/AsgExampleTools/AsgExampleTools/UnitTestTool2.h
@@ -1,7 +1,7 @@
#ifndef ASG_TOOLS__UNIT_TEST_TOOL2_H
#define ASG_TOOLS__UNIT_TEST_TOOL2_H
-// Copyright Iowa State University 2016.
+//
// Author: Nils Krumnack
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/Control/AthToolSupport/AsgExampleTools/AsgExampleTools/UnitTestTool3.h b/Control/AthToolSupport/AsgExampleTools/AsgExampleTools/UnitTestTool3.h
index f6c89ba3c3ab6d03b3dc2c6d339c7b1559df952c..ae9fa3c75bf9b7baee9a4585a8048dd81488268b 100644
--- a/Control/AthToolSupport/AsgExampleTools/AsgExampleTools/UnitTestTool3.h
+++ b/Control/AthToolSupport/AsgExampleTools/AsgExampleTools/UnitTestTool3.h
@@ -1,7 +1,7 @@
#ifndef ASG_TOOLS__UNIT_TEST_TOOL3_H
#define ASG_TOOLS__UNIT_TEST_TOOL3_H
-// Copyright Iowa State University 2016.
+//
// Author: Nils Krumnack
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/Control/AthToolSupport/AsgExampleTools/Root/UnitTestTool1.cxx b/Control/AthToolSupport/AsgExampleTools/Root/UnitTestTool1.cxx
index c7d4fdcdd49f98904555ae5bf9e21eb0e238cb36..e71958046e4fc886aceab18ea870ca42828b2e0a 100644
--- a/Control/AthToolSupport/AsgExampleTools/Root/UnitTestTool1.cxx
+++ b/Control/AthToolSupport/AsgExampleTools/Root/UnitTestTool1.cxx
@@ -1,4 +1,4 @@
-// Copyright Iowa State University 2016.
+//
// Author: Nils Krumnack
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/Control/AthToolSupport/AsgExampleTools/Root/UnitTestTool1A.cxx b/Control/AthToolSupport/AsgExampleTools/Root/UnitTestTool1A.cxx
index acbcc6f6df0d4277cc5dff7da9152963fce03640..664c672f3174feb1a054fe9756e63970845a386b 100644
--- a/Control/AthToolSupport/AsgExampleTools/Root/UnitTestTool1A.cxx
+++ b/Control/AthToolSupport/AsgExampleTools/Root/UnitTestTool1A.cxx
@@ -1,4 +1,4 @@
-// Copyright Iowa State University 2016.
+//
// Author: Nils Krumnack
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/Control/AthToolSupport/AsgExampleTools/Root/UnitTestTool2.cxx b/Control/AthToolSupport/AsgExampleTools/Root/UnitTestTool2.cxx
index fd12d8d0e5f57a5d51400a80b3cae28490b8ee9a..a2cb7e57304767fcf59d100a441a6e72f6af8fa3 100644
--- a/Control/AthToolSupport/AsgExampleTools/Root/UnitTestTool2.cxx
+++ b/Control/AthToolSupport/AsgExampleTools/Root/UnitTestTool2.cxx
@@ -1,4 +1,4 @@
-// Copyright Iowa State University 2016.
+//
// Author: Nils Krumnack
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/Control/AthToolSupport/AsgExampleTools/Root/UnitTestTool3.cxx b/Control/AthToolSupport/AsgExampleTools/Root/UnitTestTool3.cxx
index 606f9fcfd66d2ec473393788896c99d226cf3adf..ad4d3b95eef8800f564698d623d3622c1602c577 100644
--- a/Control/AthToolSupport/AsgExampleTools/Root/UnitTestTool3.cxx
+++ b/Control/AthToolSupport/AsgExampleTools/Root/UnitTestTool3.cxx
@@ -1,4 +1,4 @@
-// Copyright Iowa State University 2016.
+//
// Author: Nils Krumnack
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/Control/AthToolSupport/AsgExampleTools/test/gt_AnaToolHandle_test.cxx b/Control/AthToolSupport/AsgExampleTools/test/gt_AnaToolHandle_test.cxx
index 40179d8fa6397249110865e4d52b3ba29a4077ca..f80079b942e90f8530c2e42ce3392bb267913c59 100644
--- a/Control/AthToolSupport/AsgExampleTools/test/gt_AnaToolHandle_test.cxx
+++ b/Control/AthToolSupport/AsgExampleTools/test/gt_AnaToolHandle_test.cxx
@@ -1,4 +1,4 @@
-// Copyright Iowa State University 2016.
+//
// Author: Nils Krumnack
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/Control/AthToolSupport/AsgExampleTools/test/gt_ToolHandle_test.cxx b/Control/AthToolSupport/AsgExampleTools/test/gt_ToolHandle_test.cxx
index 670792010f328cebe85ed8dfde02f0354f75051f..a401c47660c929686e1021084dbec73f02f1b90a 100644
--- a/Control/AthToolSupport/AsgExampleTools/test/gt_ToolHandle_test.cxx
+++ b/Control/AthToolSupport/AsgExampleTools/test/gt_ToolHandle_test.cxx
@@ -1,4 +1,4 @@
-// Copyright Iowa State University 2016.
+//
// Author: Nils Krumnack
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/Control/AthToolSupport/AsgExampleTools/test/inc_IUnitTestTool1.cxx b/Control/AthToolSupport/AsgExampleTools/test/inc_IUnitTestTool1.cxx
index 4740a34f12b39fa58c0c75aaa403cdd0fc8c9bb6..5566d08b99582f0dd722fe97049883782fe699ee 100644
--- a/Control/AthToolSupport/AsgExampleTools/test/inc_IUnitTestTool1.cxx
+++ b/Control/AthToolSupport/AsgExampleTools/test/inc_IUnitTestTool1.cxx
@@ -1,4 +1,4 @@
-// Copyright Iowa State University 2016.
+//
// Author: Nils Krumnack
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/Control/AthToolSupport/AsgExampleTools/test/inc_IUnitTestTool2.cxx b/Control/AthToolSupport/AsgExampleTools/test/inc_IUnitTestTool2.cxx
index 4c3d23f68f38c10f94d06613d5f0a3d96fba2d66..45c56a519000d530eae0b68192a6cc9831b15bae 100644
--- a/Control/AthToolSupport/AsgExampleTools/test/inc_IUnitTestTool2.cxx
+++ b/Control/AthToolSupport/AsgExampleTools/test/inc_IUnitTestTool2.cxx
@@ -1,4 +1,4 @@
-// Copyright Iowa State University 2016.
+//
// Author: Nils Krumnack
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/Control/AthToolSupport/AsgTools/AsgTools/AnaToolHandle.h b/Control/AthToolSupport/AsgTools/AsgTools/AnaToolHandle.h
index 65d6c0014a87d941cedaff376f4c83bb471643a2..19f5b17a73d452e7f3f7378fe7b5039a51cf64b5 100644
--- a/Control/AthToolSupport/AsgTools/AsgTools/AnaToolHandle.h
+++ b/Control/AthToolSupport/AsgTools/AsgTools/AnaToolHandle.h
@@ -1,7 +1,7 @@
#ifndef ASG_TOOLS__ANA_TOOL_HANDLE_H
#define ASG_TOOLS__ANA_TOOL_HANDLE_H
-// Copyright Iowa State University 2014.
+//
// Author: Nils Krumnack
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/Control/AthToolSupport/AsgTools/AsgTools/Deprecated.h b/Control/AthToolSupport/AsgTools/AsgTools/Deprecated.h
index 7fc0839027a571b5d1cb5bef1639d6cd59349a04..625dabfdc0f41aecaa65758d4eaa65fbf358aab5 100644
--- a/Control/AthToolSupport/AsgTools/AsgTools/Deprecated.h
+++ b/Control/AthToolSupport/AsgTools/AsgTools/Deprecated.h
@@ -1,7 +1,7 @@
#ifndef ASG_TOOLS__DEPRECATED_H
#define ASG_TOOLS__DEPRECATED_H
-// Copyright Iowa State University 2016.
+//
// Author: Nils Krumnack
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/Control/AthToolSupport/AsgTools/AsgTools/IMessagePrinter.h b/Control/AthToolSupport/AsgTools/AsgTools/IMessagePrinter.h
index fbea449f8790423b35a6646df3c732b0ac65bc0e..568b18c19c361ff3de3ecefae2ce506675f19918 100644
--- a/Control/AthToolSupport/AsgTools/AsgTools/IMessagePrinter.h
+++ b/Control/AthToolSupport/AsgTools/AsgTools/IMessagePrinter.h
@@ -1,7 +1,7 @@
#ifndef ASG_TOOLS__I_MESSAGE_PRINTER_H
#define ASG_TOOLS__I_MESSAGE_PRINTER_H
-// Copyright Iowa State University 2017.
+//
// Author: Nils Krumnack
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/Control/AthToolSupport/AsgTools/AsgTools/INamedInterface.h b/Control/AthToolSupport/AsgTools/AsgTools/INamedInterface.h
index 8b3c34a98eabf29a807f4033a4ab9bea67acad4b..31412f7407a337009dbc0aef96f0cb38cb7e0295 100644
--- a/Control/AthToolSupport/AsgTools/AsgTools/INamedInterface.h
+++ b/Control/AthToolSupport/AsgTools/AsgTools/INamedInterface.h
@@ -1,7 +1,7 @@
#ifndef ASG_TOOLS__I_NAMED_INTERFACE_H
#define ASG_TOOLS__I_NAMED_INTERFACE_H
-// Copyright Iowa State University 2017.
+//
// Author: Nils Krumnack
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/Control/AthToolSupport/AsgTools/AsgTools/MessageCheck.h b/Control/AthToolSupport/AsgTools/AsgTools/MessageCheck.h
index 2a6730a608d030972e6de39fec8b5566d9a41559..26f279c47dc6df6064098f15e6457ba6a72fd0a4 100644
--- a/Control/AthToolSupport/AsgTools/AsgTools/MessageCheck.h
+++ b/Control/AthToolSupport/AsgTools/AsgTools/MessageCheck.h
@@ -1,7 +1,7 @@
#ifndef ASG_TOOLS__MESSAGE_CHECK_H
#define ASG_TOOLS__MESSAGE_CHECK_H
-// Copyright Iowa State University 2014.
+//
// Author: Nils Krumnack
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/Control/AthToolSupport/AsgTools/AsgTools/MessagePrinter.h b/Control/AthToolSupport/AsgTools/AsgTools/MessagePrinter.h
index ade1b961546c4cd4387b21d480c8b0a08274b91d..d6f11b298cc08c1458b8798ed23fbd5b8f5625d5 100644
--- a/Control/AthToolSupport/AsgTools/AsgTools/MessagePrinter.h
+++ b/Control/AthToolSupport/AsgTools/AsgTools/MessagePrinter.h
@@ -1,7 +1,7 @@
#ifndef ASG_TOOLS__MESSAGE_PRINTER_H
#define ASG_TOOLS__MESSAGE_PRINTER_H
-// Copyright Iowa State University 2017.
+//
// Author: Nils Krumnack
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/Control/AthToolSupport/AsgTools/AsgTools/MessagePrinterErrorCollect.h b/Control/AthToolSupport/AsgTools/AsgTools/MessagePrinterErrorCollect.h
index 8f938acb677f0512e8f3eceff60d7677a303ec0a..cbe207f01ea459d88ed48c4f5c2f551bcb909a54 100644
--- a/Control/AthToolSupport/AsgTools/AsgTools/MessagePrinterErrorCollect.h
+++ b/Control/AthToolSupport/AsgTools/AsgTools/MessagePrinterErrorCollect.h
@@ -1,7 +1,7 @@
#ifndef ASG_TOOLS__MESSAGE_PRINTER_ERROR_COLLECT_H
#define ASG_TOOLS__MESSAGE_PRINTER_ERROR_COLLECT_H
-// Copyright Iowa State University 2017.
+//
// Author: Nils Krumnack
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/Control/AthToolSupport/AsgTools/AsgTools/MessagePrinterMock.h b/Control/AthToolSupport/AsgTools/AsgTools/MessagePrinterMock.h
index 72708f90ec0248542e4312a8ee2e1ecdf05e1a7f..32a55787cb7dea04d4391528a0d97fc806271c38 100644
--- a/Control/AthToolSupport/AsgTools/AsgTools/MessagePrinterMock.h
+++ b/Control/AthToolSupport/AsgTools/AsgTools/MessagePrinterMock.h
@@ -1,7 +1,7 @@
#ifndef ASG_TOOLS__MESSAGE_PRINTER_MOCK_H
#define ASG_TOOLS__MESSAGE_PRINTER_MOCK_H
-// Copyright Iowa State University 2017.
+//
// Author: Nils Krumnack
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/Control/AthToolSupport/AsgTools/AsgTools/MessagePrinterOverlay.h b/Control/AthToolSupport/AsgTools/AsgTools/MessagePrinterOverlay.h
index 8d939e3e0d669ead05913e0aa66f572577561c7a..b090d1e7182339a892f74e0813793aed5d52d4cd 100644
--- a/Control/AthToolSupport/AsgTools/AsgTools/MessagePrinterOverlay.h
+++ b/Control/AthToolSupport/AsgTools/AsgTools/MessagePrinterOverlay.h
@@ -1,7 +1,7 @@
#ifndef ASG_TOOLS__MESSAGE_PRINTER_OVERLAY_H
#define ASG_TOOLS__MESSAGE_PRINTER_OVERLAY_H
-// Copyright Iowa State University 2017.
+//
// Author: Nils Krumnack
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/Control/AthToolSupport/AsgTools/AsgTools/UnitTest.h b/Control/AthToolSupport/AsgTools/AsgTools/UnitTest.h
index 1bf196f5dd26476988b8615fff13c9705e9827a7..b64098a72e58f72083b765b7a3677732f8ff3537 100644
--- a/Control/AthToolSupport/AsgTools/AsgTools/UnitTest.h
+++ b/Control/AthToolSupport/AsgTools/AsgTools/UnitTest.h
@@ -1,7 +1,7 @@
#ifndef ASG_TOOLS__UNIT_TEST_H
#define ASG_TOOLS__UNIT_TEST_H
-// Copyright Iowa State University 2016.
+//
// Author: Nils Krumnack
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/Control/AthToolSupport/AsgTools/Root/AnaToolHandle.cxx b/Control/AthToolSupport/AsgTools/Root/AnaToolHandle.cxx
index 3949e48bc0d391335de040dbb85b786601886abf..6677692c1249a86c678740b8ca5c02a1daa17643 100644
--- a/Control/AthToolSupport/AsgTools/Root/AnaToolHandle.cxx
+++ b/Control/AthToolSupport/AsgTools/Root/AnaToolHandle.cxx
@@ -1,4 +1,4 @@
-// Copyright Iowa State University 2015.
+//
// Author: Nils Krumnack
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/Control/AthToolSupport/AsgTools/Root/INamedInterface.cxx b/Control/AthToolSupport/AsgTools/Root/INamedInterface.cxx
index c0498c83b3eef94ad08f33d579f1518167f84673..94cc82a9aa40fee0b9dedbf1aa9d5411db8e9cd5 100644
--- a/Control/AthToolSupport/AsgTools/Root/INamedInterface.cxx
+++ b/Control/AthToolSupport/AsgTools/Root/INamedInterface.cxx
@@ -1,4 +1,4 @@
-// Copyright Iowa State University 2017.
+//
// Author: Nils Krumnack
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/Control/AthToolSupport/AsgTools/Root/MessageCheck.cxx b/Control/AthToolSupport/AsgTools/Root/MessageCheck.cxx
index 258e301973ff35d8bf53258dc0c66abf25b79d84..1b94b1d0635ba0bb68505fad760db5d235cf52d4 100644
--- a/Control/AthToolSupport/AsgTools/Root/MessageCheck.cxx
+++ b/Control/AthToolSupport/AsgTools/Root/MessageCheck.cxx
@@ -1,4 +1,4 @@
-// Copyright Iowa State University 2014.
+//
// Author: Nils Krumnack
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/Control/AthToolSupport/AsgTools/Root/MessagePrinter.cxx b/Control/AthToolSupport/AsgTools/Root/MessagePrinter.cxx
index 1351426f4c2db811dcfdb9e446444ba9425d3ca4..51887898f440a69fe2c0131c50a5b9ac5ec36dae 100644
--- a/Control/AthToolSupport/AsgTools/Root/MessagePrinter.cxx
+++ b/Control/AthToolSupport/AsgTools/Root/MessagePrinter.cxx
@@ -1,4 +1,4 @@
-// Copyright Iowa State University 2017.
+//
// Author: Nils Krumnack
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/Control/AthToolSupport/AsgTools/Root/MessagePrinterErrorCollect.cxx b/Control/AthToolSupport/AsgTools/Root/MessagePrinterErrorCollect.cxx
index 0562f61b68323df8fdf96b21091011fa4798245b..fe304e405f8ef6bee25840680c29190f15f2498f 100644
--- a/Control/AthToolSupport/AsgTools/Root/MessagePrinterErrorCollect.cxx
+++ b/Control/AthToolSupport/AsgTools/Root/MessagePrinterErrorCollect.cxx
@@ -1,4 +1,4 @@
-// Copyright Iowa State University 2017.
+//
// Author: Nils Krumnack
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/Control/AthToolSupport/AsgTools/Root/MessagePrinterOverlay.cxx b/Control/AthToolSupport/AsgTools/Root/MessagePrinterOverlay.cxx
index cc6ee59475b88db404a8cf9a4fada7a447b9bbab..f36fac889169a29575964cf3c7768999b4b4a305 100644
--- a/Control/AthToolSupport/AsgTools/Root/MessagePrinterOverlay.cxx
+++ b/Control/AthToolSupport/AsgTools/Root/MessagePrinterOverlay.cxx
@@ -1,4 +1,4 @@
-// Copyright Iowa State University 2017.
+//
// Author: Nils Krumnack
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/Control/AthToolSupport/AsgTools/Root/UnitTest.cxx b/Control/AthToolSupport/AsgTools/Root/UnitTest.cxx
index 20bea88fe1d25cc08ef2dd838d409da5fb5a9a3c..109daa959841af529c416e572ff80d23c76740f4 100644
--- a/Control/AthToolSupport/AsgTools/Root/UnitTest.cxx
+++ b/Control/AthToolSupport/AsgTools/Root/UnitTest.cxx
@@ -1,4 +1,4 @@
-// Copyright Iowa State University 2016.
+//
// Author: Nils Krumnack
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/Control/AthToolSupport/AsgTools/test/gt_AsgTool.cxx b/Control/AthToolSupport/AsgTools/test/gt_AsgTool.cxx
index 11707f192749223341b2a100d16feff3d27857a0..0b8b04cd473fe79841d669109c008272600e98df 100644
--- a/Control/AthToolSupport/AsgTools/test/gt_AsgTool.cxx
+++ b/Control/AthToolSupport/AsgTools/test/gt_AsgTool.cxx
@@ -1,4 +1,4 @@
-// Copyright Iowa State University 2017.
+//
// Author: Nils Krumnack
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/Control/AthToolSupport/AsgTools/test/gt_MessageCheck.cxx b/Control/AthToolSupport/AsgTools/test/gt_MessageCheck.cxx
index 6bbec039df0a17c17a0324b80afe363738d54b1f..af989c815a6730ccf3c42b31b1e9fbf0a19daa37 100644
--- a/Control/AthToolSupport/AsgTools/test/gt_MessageCheck.cxx
+++ b/Control/AthToolSupport/AsgTools/test/gt_MessageCheck.cxx
@@ -1,4 +1,4 @@
-// Copyright Iowa State University 2017.
+//
// Author: Nils Krumnack
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/Control/AthToolSupport/AsgTools/test/gt_TProperty.cxx b/Control/AthToolSupport/AsgTools/test/gt_TProperty.cxx
index 4aa2b6fca3a1f37f5529624a753d86504af2fad6..d5352d06125eadc8585b76b99b9eb000f5875b43 100644
--- a/Control/AthToolSupport/AsgTools/test/gt_TProperty.cxx
+++ b/Control/AthToolSupport/AsgTools/test/gt_TProperty.cxx
@@ -1,4 +1,4 @@
-// Copyright Iowa State University 2016.
+//
// Author: Nils Krumnack
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/Control/AthToolSupport/AsgTools/test/gt_UnitTest_test.cxx b/Control/AthToolSupport/AsgTools/test/gt_UnitTest_test.cxx
index b9ef569163f14055019e8ac14892c9692c197279..d6742d00dcfb467414c052f0ec43447d45aee00f 100644
--- a/Control/AthToolSupport/AsgTools/test/gt_UnitTest_test.cxx
+++ b/Control/AthToolSupport/AsgTools/test/gt_UnitTest_test.cxx
@@ -1,4 +1,4 @@
-// Copyright Iowa State University 2016.
+//
// Author: Nils Krumnack
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/Control/AthToolSupport/AsgTools/test/inc_Deprecated.cxx b/Control/AthToolSupport/AsgTools/test/inc_Deprecated.cxx
index f36c7431c2fd1fdc3b78f4039766e15004fb6dd8..aafedc813e4933b04af9b1a112c00f5a6adbb393 100644
--- a/Control/AthToolSupport/AsgTools/test/inc_Deprecated.cxx
+++ b/Control/AthToolSupport/AsgTools/test/inc_Deprecated.cxx
@@ -1,4 +1,4 @@
-// Copyright Iowa State University 2016.
+//
// Author: Nils Krumnack
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/Control/AthToolSupport/AsgTools/test/inc_MessageCheck.cxx b/Control/AthToolSupport/AsgTools/test/inc_MessageCheck.cxx
index db843888a6f53997da811a4c8b8b627a5700270d..2ef17543767a809acb96008509c09d79b2bdab30 100644
--- a/Control/AthToolSupport/AsgTools/test/inc_MessageCheck.cxx
+++ b/Control/AthToolSupport/AsgTools/test/inc_MessageCheck.cxx
@@ -1,4 +1,4 @@
-// Copyright Iowa State University 2014.
+//
// Author: Nils Krumnack
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/Control/AthToolSupport/AsgTools/test/ut_MessageCheck.cxx b/Control/AthToolSupport/AsgTools/test/ut_MessageCheck.cxx
index 17988fb38464980efbb0c62bb3112fd58a11cbc8..4ca6c9e3489bfb86430b302b488a40fe3699efeb 100644
--- a/Control/AthToolSupport/AsgTools/test/ut_MessageCheck.cxx
+++ b/Control/AthToolSupport/AsgTools/test/ut_MessageCheck.cxx
@@ -1,4 +1,4 @@
-// Copyright Iowa State University 2015.
+//
// Author: Nils Krumnack
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/Control/AthViews/AthViews/IViewsMergerTool.h b/Control/AthViews/AthViews/IViewsMergerTool.h
index 15ecf2e531dd2cee3268fc8eb6969cc13ebbf451..7e2f7ffe86b129e3b76c82b899158bfc9f090242 100644
--- a/Control/AthViews/AthViews/IViewsMergerTool.h
+++ b/Control/AthViews/AthViews/IViewsMergerTool.h
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
#ifndef AthViews_IViewsMergerTool_h
#define AthViews_IViewsMergerTool_h
diff --git a/Control/AthenaBaseComps/AthenaBaseComps/AthAlgStartVisitor.h b/Control/AthenaBaseComps/AthenaBaseComps/AthAlgStartVisitor.h
index a181387773e43cfd62f4e5676ea6e5d9d411ce10..42ea3fc6d0263f30a64d8a6458eebd25da658209 100644
--- a/Control/AthenaBaseComps/AthenaBaseComps/AthAlgStartVisitor.h
+++ b/Control/AthenaBaseComps/AthenaBaseComps/AthAlgStartVisitor.h
@@ -1,6 +1,8 @@
// This file's extension implies that it's C, but it's really -*- C++ -*-.
/*
- * Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration.
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+/*
*/
// $Id$
/**
diff --git a/Control/AthenaBaseComps/AthenaBaseComps/AthProperties.h b/Control/AthenaBaseComps/AthenaBaseComps/AthProperties.h
index 7cac544672e7fdd9ae5555417886f357c38d455e..9694034e06ef7201ba7605eaab6aff9554cca17e 100644
--- a/Control/AthenaBaseComps/AthenaBaseComps/AthProperties.h
+++ b/Control/AthenaBaseComps/AthenaBaseComps/AthProperties.h
@@ -1,6 +1,8 @@
// This file's extension implies that it's C, but it's really -*- C++ -*-.
/*
- * Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration.
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+/*
*/
/**
* @file AthenaBaseComps/AthProperties.h
diff --git a/Control/AthenaBaseComps/src/AthAlgStartVisitor.cxx b/Control/AthenaBaseComps/src/AthAlgStartVisitor.cxx
index a0805c843680351e16fc56903792f6cec810f13f..11587fc9ba21428c30f90e425ecf86fac92b4935 100644
--- a/Control/AthenaBaseComps/src/AthAlgStartVisitor.cxx
+++ b/Control/AthenaBaseComps/src/AthAlgStartVisitor.cxx
@@ -1,5 +1,7 @@
/*
- * Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration.
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+/*
*/
// $Id$
/**
diff --git a/Control/AthenaBaseComps/test/AthAlgStartVisitor_test.cxx b/Control/AthenaBaseComps/test/AthAlgStartVisitor_test.cxx
index 6547a7718787859363b4b0f86bc4e17aa54a17ab..706e39a3fb397a5e49ed246c87bc1f9249b0a4d6 100644
--- a/Control/AthenaBaseComps/test/AthAlgStartVisitor_test.cxx
+++ b/Control/AthenaBaseComps/test/AthAlgStartVisitor_test.cxx
@@ -1,5 +1,7 @@
/*
- * Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration.
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+/*
*/
/**
* @file AthenaBaseComps/test/AthAlgStartVisitor_test.cxx
diff --git a/Control/AthenaExamples/AthAsgExUnittest/AthAsgExUnittest/MyPackageDict.h b/Control/AthenaExamples/AthAsgExUnittest/AthAsgExUnittest/MyPackageDict.h
index d1a7c560a7f3a79d2ae682824f25d7457dd2de9e..8373e93bb0e1430ae3176bec1671f2cff09c8d52 100644
--- a/Control/AthenaExamples/AthAsgExUnittest/AthAsgExUnittest/MyPackageDict.h
+++ b/Control/AthenaExamples/AthAsgExUnittest/AthAsgExUnittest/MyPackageDict.h
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
#ifndef ATHASGEXUNITTEST_MYPACKAGEDICT_H
#define ATHASGEXUNITTEST_MYPACKAGEDICT_H
diff --git a/Control/AthenaExamples/AthAsgExUnittest/test/gt_AthAsgExUnittest.cxx b/Control/AthenaExamples/AthAsgExUnittest/test/gt_AthAsgExUnittest.cxx
index 384d891d7d05652faa88f81a8497f2b675ae48c5..3d53c4c1b0a9de1eaaaa1958d8e618f31225a68d 100644
--- a/Control/AthenaExamples/AthAsgExUnittest/test/gt_AthAsgExUnittest.cxx
+++ b/Control/AthenaExamples/AthAsgExUnittest/test/gt_AthAsgExUnittest.cxx
@@ -1,6 +1,8 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
//
-// Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
//
#include "GoogleTestTools/InitGaudiGoogleTest.h"
diff --git a/Control/AthenaExamples/AthExUnittest/AthExUnittest/AthExUnittestDict.h b/Control/AthenaExamples/AthExUnittest/AthExUnittest/AthExUnittestDict.h
index 2e92493bfc013525e9b2a9d1b27b1ed712816f5e..7134dd4826c39a2021556cda4f6943c3787de08f 100644
--- a/Control/AthenaExamples/AthExUnittest/AthExUnittest/AthExUnittestDict.h
+++ b/Control/AthenaExamples/AthExUnittest/AthExUnittest/AthExUnittestDict.h
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
#ifndef ATHEXUNITTEST_ATHEXUNITTESTDICT_H
#define ATHEXUNITTEST_ATHEXUNITTESTDICT_H
diff --git a/Control/AthenaKernel/AthenaKernel/CondCont.h b/Control/AthenaKernel/AthenaKernel/CondCont.h
index e2a503cc6267d3981aa5cb4c30839dcade0ef62a..a32ff6bf79b662794e9c08cc391c22b13a3c5208 100644
--- a/Control/AthenaKernel/AthenaKernel/CondCont.h
+++ b/Control/AthenaKernel/AthenaKernel/CondCont.h
@@ -1,5 +1,7 @@
/*
- * Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration.
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+/*
*/
//
/**
diff --git a/Control/AthenaKernel/AthenaKernel/CondCont.icc b/Control/AthenaKernel/AthenaKernel/CondCont.icc
index a0800550a337e36425bc971195745ff08021068e..292038da230e1adefc331cc2adc076116bedf9e9 100644
--- a/Control/AthenaKernel/AthenaKernel/CondCont.icc
+++ b/Control/AthenaKernel/AthenaKernel/CondCont.icc
@@ -1,5 +1,7 @@
/*
- * Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration.
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+/*
*/
// $Id$
/**
diff --git a/Control/AthenaKernel/AthenaKernel/IConditionsCleanerSvc.h b/Control/AthenaKernel/AthenaKernel/IConditionsCleanerSvc.h
index b9930dd0eb590ebf0ed9f5309100c0c5d95da4a9..19f99212947a40fe8cc3fe08801bb8dceee5236b 100644
--- a/Control/AthenaKernel/AthenaKernel/IConditionsCleanerSvc.h
+++ b/Control/AthenaKernel/AthenaKernel/IConditionsCleanerSvc.h
@@ -1,6 +1,8 @@
// This file's extension implies that it's C, but it's really -*- C++ -*-.
/*
- * Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration.
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+/*
*/
/**
* @file AthenaKernel/IConditionsCleanerSvc.h
diff --git a/Control/AthenaKernel/AthenaKernel/MetaContDataBucket.h b/Control/AthenaKernel/AthenaKernel/MetaContDataBucket.h
index 328edd271c08c8c4757b363a1474178f3699a8ba..70a270d4db3d3b5ee0e07862ccaa04a9212311d7 100644
--- a/Control/AthenaKernel/AthenaKernel/MetaContDataBucket.h
+++ b/Control/AthenaKernel/AthenaKernel/MetaContDataBucket.h
@@ -1,6 +1,8 @@
// This file's extension implies that it's C, but it's really -*- C++ -*-.
/*
- * Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration.
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+/*
*/
// $Id$
/**
diff --git a/Control/AthenaKernel/AthenaKernel/MetaContDataBucket.icc b/Control/AthenaKernel/AthenaKernel/MetaContDataBucket.icc
index dc955792d5ae715292cc147854fb8ca6d082d49d..eb336e0636ac9f5864232c3e6700711fd40760b6 100644
--- a/Control/AthenaKernel/AthenaKernel/MetaContDataBucket.icc
+++ b/Control/AthenaKernel/AthenaKernel/MetaContDataBucket.icc
@@ -1,5 +1,7 @@
/*
- * Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration.
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+/*
*/
// $Id$
/**
diff --git a/Control/AthenaKernel/AthenaKernel/RecyclableDataObject.h b/Control/AthenaKernel/AthenaKernel/RecyclableDataObject.h
index 45f3fd46d626a8cba67144f9e7ce0f48c1b465a2..0bdb0b2aa3ac7dedca1b0a775005d90781911af1 100644
--- a/Control/AthenaKernel/AthenaKernel/RecyclableDataObject.h
+++ b/Control/AthenaKernel/AthenaKernel/RecyclableDataObject.h
@@ -1,6 +1,8 @@
// This file's extension implies that it's C, but it's really -*- C++ -*-.
/*
- * Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration.
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+/*
*/
/**
* @file AthenaKernel/RecyclableDataObject.h
diff --git a/Control/AthenaKernel/AthenaKernel/RecyclableDataObject.icc b/Control/AthenaKernel/AthenaKernel/RecyclableDataObject.icc
index 870f26dad722e462a340db311e42fdabe9805d98..e59c827a560d25fd2104075bb24ccc18bdcff4ef 100644
--- a/Control/AthenaKernel/AthenaKernel/RecyclableDataObject.icc
+++ b/Control/AthenaKernel/AthenaKernel/RecyclableDataObject.icc
@@ -1,6 +1,8 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
// $Id$
/*
- * Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration.
*/
/**
* @file AthenaKernel/RecyclableDataObject.icc
diff --git a/Control/AthenaKernel/src/CondCont.cxx b/Control/AthenaKernel/src/CondCont.cxx
index 519e61aa7f10211f6e728efdda27114a588035bf..05abcf361abe329a1c39136a28611041cbe29c6b 100644
--- a/Control/AthenaKernel/src/CondCont.cxx
+++ b/Control/AthenaKernel/src/CondCont.cxx
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
// $Id$
/**
* @file AthenaKernel/src/CondCont.cpp
diff --git a/Control/AthenaKernel/src/IAthRNGSvc.cxx b/Control/AthenaKernel/src/IAthRNGSvc.cxx
index 2e06210df50677ed070e4f6709612673c939ce10..fd3219fac9eeea73a4cd6934541661d2ece3a1bc 100644
--- a/Control/AthenaKernel/src/IAthRNGSvc.cxx
+++ b/Control/AthenaKernel/src/IAthRNGSvc.cxx
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
#include "AthenaKernel/IAthRNGSvc.h"
//anchor instantiation of vtable
IAthRNGSvc::~IAthRNGSvc() {}
diff --git a/Control/AthenaKernel/src/StoreID.cxx b/Control/AthenaKernel/src/StoreID.cxx
index 2235959a9d4ddd79d23248a0cc93c579b73b3ae2..c9d491eefa809cf1d8e2fd18ef9c24b56dc7f8ae 100644
--- a/Control/AthenaKernel/src/StoreID.cxx
+++ b/Control/AthenaKernel/src/StoreID.cxx
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
#include "AthenaKernel/StoreID.h"
#include <string>
#include <vector>
diff --git a/Control/AthenaKernel/test/CondCont_test.cxx b/Control/AthenaKernel/test/CondCont_test.cxx
index 4bc3b0aef41d85411c637b5814240d5507beae20..569f0d50d0a89fb398398d417ba38a9d31614da3 100644
--- a/Control/AthenaKernel/test/CondCont_test.cxx
+++ b/Control/AthenaKernel/test/CondCont_test.cxx
@@ -1,5 +1,7 @@
/*
- * Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration.
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+/*
*/
// $Id$
/**
diff --git a/Control/AthenaKernel/test/MetaContDataBucket_test.cxx b/Control/AthenaKernel/test/MetaContDataBucket_test.cxx
index 677be7bb0616254741d842dbef360a0e31a3e8e2..727127e2559e72e8ba426f8596abd509d794f0e1 100644
--- a/Control/AthenaKernel/test/MetaContDataBucket_test.cxx
+++ b/Control/AthenaKernel/test/MetaContDataBucket_test.cxx
@@ -1,5 +1,7 @@
/*
- * Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration.
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+/*
*/
// $Id$
diff --git a/Control/AthenaKernel/test/RecyclableDataObject_test.cxx b/Control/AthenaKernel/test/RecyclableDataObject_test.cxx
index dfa48c25972365c3c0f76c5714a604fbaaaaa02a..631bc849af37d81295f88170045c2d3c5a982a94 100644
--- a/Control/AthenaKernel/test/RecyclableDataObject_test.cxx
+++ b/Control/AthenaKernel/test/RecyclableDataObject_test.cxx
@@ -1,5 +1,7 @@
/*
- * Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration.
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+/*
*/
// $Id$
/**
diff --git a/Control/AthenaKernel/test/TopBase_test.cxx b/Control/AthenaKernel/test/TopBase_test.cxx
index 9075de21b649cd724cd479a8eea0cc886aa68f59..2b4cb64003548133aeabf7323560ac6e3277aafc 100644
--- a/Control/AthenaKernel/test/TopBase_test.cxx
+++ b/Control/AthenaKernel/test/TopBase_test.cxx
@@ -1,5 +1,7 @@
/*
- * Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration.
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+/*
*/
/**
diff --git a/Control/AthenaMonitoring/doc/Monitored_page.h b/Control/AthenaMonitoring/doc/Monitored_page.h
index fd1bef8af3424b71d7f6f1b130c07e4b83ae278f..e006ceb42e816ca1f2b8cf5b49740d13930e0522 100644
--- a/Control/AthenaMonitoring/doc/Monitored_page.h
+++ b/Control/AthenaMonitoring/doc/Monitored_page.h
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
/**
@namespace Monitored
diff --git a/Control/AthenaServices/src/AthIncFirerAlg.cxx b/Control/AthenaServices/src/AthIncFirerAlg.cxx
index 8d126b4688234545cc0ddd086da5b72ef4f233cb..0c594908e51811c1f608322d1c838c848bc00f22 100644
--- a/Control/AthenaServices/src/AthIncFirerAlg.cxx
+++ b/Control/AthenaServices/src/AthIncFirerAlg.cxx
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
#include "AthIncFirerAlg.h"
#include "GaudiKernel/IIncidentSvc.h"
#include "GaudiKernel/Incident.h"
diff --git a/Control/AthenaServices/src/AthIncFirerAlg.h b/Control/AthenaServices/src/AthIncFirerAlg.h
index 017da68379ea14456e6059fea77feb30610699f7..8c7676080d28816adda93f109d5dd34507294452 100644
--- a/Control/AthenaServices/src/AthIncFirerAlg.h
+++ b/Control/AthenaServices/src/AthIncFirerAlg.h
@@ -1,4 +1,7 @@
// -- -*- C++ -*-
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
#ifndef __ATH_INCIDENT_FIRER_ALG_H
#define __ATH_INCIDENT_FIRER_ALG_H
diff --git a/Control/AthenaServices/src/ConditionsCleanerSvc.cxx b/Control/AthenaServices/src/ConditionsCleanerSvc.cxx
index bfca1af1ac6b5314bb0fe089ba4b406451573119..bbe8e480feea775ddb41d0bd80f7c2121c810fdf 100644
--- a/Control/AthenaServices/src/ConditionsCleanerSvc.cxx
+++ b/Control/AthenaServices/src/ConditionsCleanerSvc.cxx
@@ -1,5 +1,7 @@
/*
- * Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration.
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+/*
*/
/**
* @file AthenaServices/src/ConditionsCleanerSvc.cxx
diff --git a/Control/AthenaServices/src/ConditionsCleanerSvc.h b/Control/AthenaServices/src/ConditionsCleanerSvc.h
index 88453c8cda04de8c9e4a7373ed7472931579cad8..d51a4bb56ce7fea8f62f3f822e2a2897c6aed332 100644
--- a/Control/AthenaServices/src/ConditionsCleanerSvc.h
+++ b/Control/AthenaServices/src/ConditionsCleanerSvc.h
@@ -1,6 +1,8 @@
// This file's extension implies that it's C, but it's really -*- C++ -*-.
/*
- * Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration.
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+/*
*/
/**
* @file AthenaServices/src/ConditionsCleanerSvc.h
diff --git a/Control/AthenaServices/src/DelayedConditionsCleanerSvc.cxx b/Control/AthenaServices/src/DelayedConditionsCleanerSvc.cxx
index ea73fc3415faef01b53348ec507543e51490cc7b..bddcbdf3bd687bee41dcfcde4b5840c84c3c8016 100644
--- a/Control/AthenaServices/src/DelayedConditionsCleanerSvc.cxx
+++ b/Control/AthenaServices/src/DelayedConditionsCleanerSvc.cxx
@@ -1,5 +1,7 @@
/*
- * Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration.
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+/*
*/
/**
* @file AthenaServices/src/DelayedConditionsCleanerSvc.cxx
diff --git a/Control/AthenaServices/src/DelayedConditionsCleanerSvc.h b/Control/AthenaServices/src/DelayedConditionsCleanerSvc.h
index 2cf4898e751203ba079cdf3c2e2acbc762092105..b9bc5681a5bb3e872386a49f27ad7f10ee48fe79 100644
--- a/Control/AthenaServices/src/DelayedConditionsCleanerSvc.h
+++ b/Control/AthenaServices/src/DelayedConditionsCleanerSvc.h
@@ -1,6 +1,8 @@
// This file's extension implies that it's C, but it's really -*- C++ -*-.
/*
- * Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration.
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+/*
*/
/**
* @file AthenaServices/src/DelayedConditionsCleanerSvc.h
diff --git a/Control/AthenaServices/test/ConditionsCleanerSvc_test.cxx b/Control/AthenaServices/test/ConditionsCleanerSvc_test.cxx
index 3215a0cceb3a434cafc4fb7d34478e46a23be592..75c8216289f76de7150bff291990250445f3d145 100644
--- a/Control/AthenaServices/test/ConditionsCleanerSvc_test.cxx
+++ b/Control/AthenaServices/test/ConditionsCleanerSvc_test.cxx
@@ -1,5 +1,7 @@
/*
- * Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration.
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+/*
*/
/**
* @file AthenaServices/test/ConditionsCleanerSvc_test.cxx
diff --git a/Control/AthenaServices/test/DelayedConditionsCleanerSvc_test.cxx b/Control/AthenaServices/test/DelayedConditionsCleanerSvc_test.cxx
index f36a61ef030414f1bdb8d4a9e55b514543f3d0f2..ab3de39fd834cc11782b73a6a478eb7b0feba452 100644
--- a/Control/AthenaServices/test/DelayedConditionsCleanerSvc_test.cxx
+++ b/Control/AthenaServices/test/DelayedConditionsCleanerSvc_test.cxx
@@ -1,5 +1,7 @@
/*
- * Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration.
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+/*
*/
/**
* @file AthenaServices/test/DelayedConditionsCleanerSvc_test.cxx
diff --git a/Control/CxxUtils/CxxUtils/CachedPointer.icc b/Control/CxxUtils/CxxUtils/CachedPointer.icc
index c4a6f33f3a15861afbdc2c72c934b117597db9ee..325d0ddb1a8a912c5082816cee2c5d1a6b09d781 100644
--- a/Control/CxxUtils/CxxUtils/CachedPointer.icc
+++ b/Control/CxxUtils/CxxUtils/CachedPointer.icc
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
// $Id$
/**
* @file CxxUtils/CachedPointer.icc
diff --git a/Control/CxxUtils/CxxUtils/CachedValue.h b/Control/CxxUtils/CxxUtils/CachedValue.h
index 7e9fb71698177a628a1df3735962db50c8f00b99..f18762e76d833b230fb7103943bffc6c4ab1c003 100644
--- a/Control/CxxUtils/CxxUtils/CachedValue.h
+++ b/Control/CxxUtils/CxxUtils/CachedValue.h
@@ -1,6 +1,8 @@
// This file's extension implies that it's C, but it's really -*- C++ -*-.
/*
- * Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration.
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+/*
*/
// $Id$
/**
diff --git a/Control/CxxUtils/CxxUtils/CachedValue.icc b/Control/CxxUtils/CxxUtils/CachedValue.icc
index af8d0a3a71c0fc98891402fbba7c8208cced8e5a..e7b433c1fb619f1288c09fcaffa46bd57b1579df 100644
--- a/Control/CxxUtils/CxxUtils/CachedValue.icc
+++ b/Control/CxxUtils/CxxUtils/CachedValue.icc
@@ -1,5 +1,7 @@
/*
- * Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration.
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+/*
*/
/**
* @file CxxUtils/CachedValue.icc
diff --git a/Control/CxxUtils/CxxUtils/ConcurrentBitset.h b/Control/CxxUtils/CxxUtils/ConcurrentBitset.h
index add96c3fbf61116cf7cd7355a1558f95bd475591..2d513251ea0eab08f3cd3f9305ec8084ae62c29f 100644
--- a/Control/CxxUtils/CxxUtils/ConcurrentBitset.h
+++ b/Control/CxxUtils/CxxUtils/ConcurrentBitset.h
@@ -1,6 +1,8 @@
// This file's extension implies that it's C, but it's really -*- C++ -*-.
/*
- * Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration.
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+/*
*/
// $Id$
/**
diff --git a/Control/CxxUtils/CxxUtils/ConcurrentBitset.icc b/Control/CxxUtils/CxxUtils/ConcurrentBitset.icc
index 299f330c85f35cd536aac12e2116d2b749014f44..998f843074aedfbeff172c505d6c1fb9495d7c8d 100644
--- a/Control/CxxUtils/CxxUtils/ConcurrentBitset.icc
+++ b/Control/CxxUtils/CxxUtils/ConcurrentBitset.icc
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
// $Id$
/**
* @file CxxUtils/ConcurrentBitset.icc
diff --git a/Control/CxxUtils/CxxUtils/ConcurrentRangeMap.h b/Control/CxxUtils/CxxUtils/ConcurrentRangeMap.h
index 01bec029f011622b27710732e999a0f6482beec9..e71ce573c8385f216ce149a0f820f1fad90b53e3 100644
--- a/Control/CxxUtils/CxxUtils/ConcurrentRangeMap.h
+++ b/Control/CxxUtils/CxxUtils/ConcurrentRangeMap.h
@@ -1,6 +1,8 @@
// This file's extension implies that it's C, but it's really -*- C++ -*-.
/*
- * Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration.
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+/*
*/
// $Id$
/**
diff --git a/Control/CxxUtils/CxxUtils/ConcurrentRangeMap.icc b/Control/CxxUtils/CxxUtils/ConcurrentRangeMap.icc
index d9e999ebd10b0d3e97c3e7d4d47b7904bd617bff..0e2bb545e55b84d768b6c2e12267aa4a119524e9 100644
--- a/Control/CxxUtils/CxxUtils/ConcurrentRangeMap.icc
+++ b/Control/CxxUtils/CxxUtils/ConcurrentRangeMap.icc
@@ -1,5 +1,7 @@
/*
- * Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration.
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+/*
*/
// $Id$
/**
diff --git a/Control/CxxUtils/CxxUtils/MurmurHash2.h b/Control/CxxUtils/CxxUtils/MurmurHash2.h
index 8af951e905587ad034e215885abc45e61bece62a..f07a1e86b92b6dcddc2f35764665f46c8fd7ea23 100644
--- a/Control/CxxUtils/CxxUtils/MurmurHash2.h
+++ b/Control/CxxUtils/CxxUtils/MurmurHash2.h
@@ -1,4 +1,7 @@
// This file's extension implies that it's C, but it's really -*- C++ -*-.
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
/*
* Public domain; see below.
*/
@@ -18,7 +21,6 @@
//-----------------------------------------------------------------------------
// MurmurHash2 was written by Austin Appleby, and is placed in the public
-// domain. The author hereby disclaims copyright to this source code.
//-----------------------------------------------------------------------------
diff --git a/Control/CxxUtils/CxxUtils/Ring.h b/Control/CxxUtils/CxxUtils/Ring.h
index ccac3cae23186764318fc91abd91e905d65cc825..6257d422cc8023caba067eb073c7390eeb0c82ff 100644
--- a/Control/CxxUtils/CxxUtils/Ring.h
+++ b/Control/CxxUtils/CxxUtils/Ring.h
@@ -1,6 +1,8 @@
// This file's extension implies that it's C, but it's really -*- C++ -*-.
/*
- * Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration.
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+/*
*/
/**
* @file CxxUtils/Ring.h
diff --git a/Control/CxxUtils/CxxUtils/Ring.icc b/Control/CxxUtils/CxxUtils/Ring.icc
index 48192d9f1f73ee102767452d44dd0540bfddcaa6..da7b723f6bde229979fc7eb57cbdff2a2ae31cac 100644
--- a/Control/CxxUtils/CxxUtils/Ring.icc
+++ b/Control/CxxUtils/CxxUtils/Ring.icc
@@ -1,5 +1,7 @@
/*
- * Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration.
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+/*
*/
/**
* @file CxxUtils/Ring.icc
diff --git a/Control/CxxUtils/CxxUtils/bitmask.h b/Control/CxxUtils/CxxUtils/bitmask.h
index ef2c3d0c1542a96ecd9cc964b475e96859848f8f..3ca08687d5fea36e5870dd1b9e792615148b7bee 100644
--- a/Control/CxxUtils/CxxUtils/bitmask.h
+++ b/Control/CxxUtils/CxxUtils/bitmask.h
@@ -1,6 +1,8 @@
// This file's extension implies that it's C, but it's really -*- C++ -*-.
/*
- * Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration.
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+/*
*/
/**
* @file CxxUtils/bitmask.h
diff --git a/Control/CxxUtils/CxxUtils/crc64.h b/Control/CxxUtils/CxxUtils/crc64.h
index 9a673edbb032a18e82a7e17cbd75e15b65cea62b..0b601472aa7c410a5d8149e2458406e0541b9970 100644
--- a/Control/CxxUtils/CxxUtils/crc64.h
+++ b/Control/CxxUtils/CxxUtils/crc64.h
@@ -1,6 +1,8 @@
// This file's extension implies that it's C, but it's really -*- C++ -*-.
/*
- * Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration.
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+/*
*/
// $Id$
/**
diff --git a/Control/CxxUtils/CxxUtils/features.h b/Control/CxxUtils/CxxUtils/features.h
index 2d8affb47a35f17b5dddcb86f3e921c0cb4030d6..440c364199ade2cd67f1229591e7de4459f5b88e 100644
--- a/Control/CxxUtils/CxxUtils/features.h
+++ b/Control/CxxUtils/CxxUtils/features.h
@@ -1,6 +1,8 @@
// This file's extension implies that it's C, but it's really -*- C++ -*-.
/*
- * Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration.
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+/*
*/
/**
* @file CxxUtils/features.h
diff --git a/Control/CxxUtils/CxxUtils/ubsan_suppress.h b/Control/CxxUtils/CxxUtils/ubsan_suppress.h
index 79d3c0fddb863df8de199c2c87ce1b9ba099438a..8513b6eb9649bc0fce8183a21d6be29bd1d00efc 100644
--- a/Control/CxxUtils/CxxUtils/ubsan_suppress.h
+++ b/Control/CxxUtils/CxxUtils/ubsan_suppress.h
@@ -1,4 +1,7 @@
// This file's extension implies that it's C, but it's really -*- C++ -*-.
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
// $Id$
/**
* @file CxxUtils/ubsan_suppress.h
diff --git a/Control/CxxUtils/Root/ConcurrentBitset.cxx b/Control/CxxUtils/Root/ConcurrentBitset.cxx
index 0cc542f94b1bc6071023df7f32d3a3a48b76678c..aae51efc4e1bd23431ae1dbe085ea88d8e4bd221 100644
--- a/Control/CxxUtils/Root/ConcurrentBitset.cxx
+++ b/Control/CxxUtils/Root/ConcurrentBitset.cxx
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
// $Id$
/**
* @file CxxUtils/src/ConcurrentBitset.cxx
diff --git a/Control/CxxUtils/Root/MurmurHash2.cxx b/Control/CxxUtils/Root/MurmurHash2.cxx
index 4311c5b2a00e11f9e7282b00d041d5822a863799..64d27e4a11857983c5d298e2edb52bad07347586 100644
--- a/Control/CxxUtils/Root/MurmurHash2.cxx
+++ b/Control/CxxUtils/Root/MurmurHash2.cxx
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
/*
* Public domain; see below.
*/
@@ -13,7 +16,6 @@
//-----------------------------------------------------------------------------
// MurmurHash2 was written by Austin Appleby, and is placed in the public
-// domain. The author hereby disclaims copyright to this source code.
// Note - This code makes a few assumptions about how your machine behaves -
diff --git a/Control/CxxUtils/Root/crc64.cxx b/Control/CxxUtils/Root/crc64.cxx
index 212ee335aec9ea24e370b5991c055b95b3ca4dff..cb91f43abf9ac2bf3cc70c578d7d8ecf53a6b0b0 100644
--- a/Control/CxxUtils/Root/crc64.cxx
+++ b/Control/CxxUtils/Root/crc64.cxx
@@ -1,5 +1,7 @@
/*
- * Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration.
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+/*
*/
/**
* @file CxxUtils/Root/crc64.cxx
diff --git a/Control/CxxUtils/Root/ubsan_suppress.cxx b/Control/CxxUtils/Root/ubsan_suppress.cxx
index 72aecc4850b5c1847ca77152446a034d02e238bb..7b8619eec1ff5d1299b05cdd5652db98ccb64c58 100644
--- a/Control/CxxUtils/Root/ubsan_suppress.cxx
+++ b/Control/CxxUtils/Root/ubsan_suppress.cxx
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
/**
* @file CxxUtils/Root/ubsan_suppress.cxx
* @author scott snyder <snyder@bnl.gov>
diff --git a/Control/CxxUtils/test/ConcurrentBitset_test.cxx b/Control/CxxUtils/test/ConcurrentBitset_test.cxx
index 2efd1811d246877b3e007093f599cfa493c75b86..22cb557282f45418459aebbdf534b8437962e937 100644
--- a/Control/CxxUtils/test/ConcurrentBitset_test.cxx
+++ b/Control/CxxUtils/test/ConcurrentBitset_test.cxx
@@ -1,5 +1,7 @@
/*
- * Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration.
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+/*
*/
// $Id$
diff --git a/Control/CxxUtils/test/ConcurrentRangeMap_test.cxx b/Control/CxxUtils/test/ConcurrentRangeMap_test.cxx
index 39aacda37f4c3662b0bd5048e87eb9bb8f196432..41660f6010ee75add05d666ca61b6afd0677346d 100644
--- a/Control/CxxUtils/test/ConcurrentRangeMap_test.cxx
+++ b/Control/CxxUtils/test/ConcurrentRangeMap_test.cxx
@@ -1,5 +1,7 @@
/*
- * Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration.
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+/*
*/
// $Id$
diff --git a/Control/CxxUtils/test/MurmurHash2_test.cxx b/Control/CxxUtils/test/MurmurHash2_test.cxx
index 9931ea8e5efd176c0447793184871365318bb93f..509bd378d8ab9cf2b938615f589c2b2884d27cf3 100644
--- a/Control/CxxUtils/test/MurmurHash2_test.cxx
+++ b/Control/CxxUtils/test/MurmurHash2_test.cxx
@@ -1,5 +1,7 @@
/*
- * Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration.
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+/*
*/
/**
* @file CxxUtils/Root/MurmurHash2.cxx
diff --git a/Control/CxxUtils/test/Ring_test.cxx b/Control/CxxUtils/test/Ring_test.cxx
index 23812c1d335938b2b66ef75e4f53e5e6808aea76..ca3a8a1a1df1f9bcf23453bea40eacf08fc7f725 100644
--- a/Control/CxxUtils/test/Ring_test.cxx
+++ b/Control/CxxUtils/test/Ring_test.cxx
@@ -1,5 +1,7 @@
/*
- * Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration.
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+/*
*/
/**
* @file CxxUtils/test/Ring_test.cxx
diff --git a/Control/CxxUtils/test/crc64_test.cxx b/Control/CxxUtils/test/crc64_test.cxx
index 3b94272d26e15fb3a8eea3ff6f857cb0482309de..d3526b8857df9aa30893c367216dc9861a4f7168 100644
--- a/Control/CxxUtils/test/crc64_test.cxx
+++ b/Control/CxxUtils/test/crc64_test.cxx
@@ -1,5 +1,7 @@
/*
- * Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration.
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+/*
*/
/**
* @file CxxUtils/test/crc64_test.cxx
diff --git a/Control/DataModelTest/DataModelTestDataCommon/DataModelTestDataCommon/S3.h b/Control/DataModelTest/DataModelTestDataCommon/DataModelTestDataCommon/S3.h
index 71568d141c61bd5cdcb651580c5ab5b1472f8205..167ce4a366b061974361709a36616778cb25fff1 100644
--- a/Control/DataModelTest/DataModelTestDataCommon/DataModelTestDataCommon/S3.h
+++ b/Control/DataModelTest/DataModelTestDataCommon/DataModelTestDataCommon/S3.h
@@ -1,6 +1,8 @@
// This file's extension implies that it's C, but it's really -*- C++ -*-.
/*
- * Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration.
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+/*
*/
// $Id$
/**
diff --git a/Control/DataModelTest/DataModelTestDataCommon/DataModelTestDataCommon/S3Cond.h b/Control/DataModelTest/DataModelTestDataCommon/DataModelTestDataCommon/S3Cond.h
index dfe169113d6e1b3529eebb9f38f6e2b780f8f513..9f8bfde06fec1b15c0e9a5d6db107da2ecd19134 100644
--- a/Control/DataModelTest/DataModelTestDataCommon/DataModelTestDataCommon/S3Cond.h
+++ b/Control/DataModelTest/DataModelTestDataCommon/DataModelTestDataCommon/S3Cond.h
@@ -1,6 +1,8 @@
// This file's extension implies that it's C, but it's really -*- C++ -*-.
/*
- * Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration.
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+/*
*/
// $Id$
/**
diff --git a/Control/DataModelTest/DataModelTestDataCommon/src/CondAlg1.cxx b/Control/DataModelTest/DataModelTestDataCommon/src/CondAlg1.cxx
index 0d7f4caf263d2b535fc27b85d06a6110728d6436..d6738c64ceb0298fd5fecefd50ec56cb350fe460 100644
--- a/Control/DataModelTest/DataModelTestDataCommon/src/CondAlg1.cxx
+++ b/Control/DataModelTest/DataModelTestDataCommon/src/CondAlg1.cxx
@@ -1,5 +1,7 @@
/*
- * Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration.
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+/*
*/
// $Id$
/**
diff --git a/Control/DataModelTest/DataModelTestDataCommon/src/CondAlg2.cxx b/Control/DataModelTest/DataModelTestDataCommon/src/CondAlg2.cxx
index c99eed58fc06ce53d35870f1daf539e3f3fb9ada..efb47aa0229eb0a72e514da47dd6356fe51c974c 100644
--- a/Control/DataModelTest/DataModelTestDataCommon/src/CondAlg2.cxx
+++ b/Control/DataModelTest/DataModelTestDataCommon/src/CondAlg2.cxx
@@ -1,5 +1,7 @@
/*
- * Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration.
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+/*
*/
// $Id$
/**
diff --git a/Control/DataModelTest/DataModelTestDataCommon/src/CondAlg2.h b/Control/DataModelTest/DataModelTestDataCommon/src/CondAlg2.h
index 69694c55c4b69e4fea333962d2a69048a6086d0d..b7d15a3b952dfefb4e9936ee548e0abb42ec10a0 100644
--- a/Control/DataModelTest/DataModelTestDataCommon/src/CondAlg2.h
+++ b/Control/DataModelTest/DataModelTestDataCommon/src/CondAlg2.h
@@ -1,6 +1,8 @@
// This file's extension implies that it's C, but it's really -*- C++ -*-.
/*
- * Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration.
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+/*
*/
// $Id$
/**
diff --git a/Control/DataModelTest/DataModelTestDataCommon/src/CondReaderAlg.cxx b/Control/DataModelTest/DataModelTestDataCommon/src/CondReaderAlg.cxx
index 857844c074f03a928d0bc1a704c0f4cd70ea4cb8..4eb72456a4e0f260c449ee60a7712be0a02ae08d 100644
--- a/Control/DataModelTest/DataModelTestDataCommon/src/CondReaderAlg.cxx
+++ b/Control/DataModelTest/DataModelTestDataCommon/src/CondReaderAlg.cxx
@@ -1,5 +1,7 @@
/*
- * Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration.
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+/*
*/
// $Id$
/**
diff --git a/Control/DataModelTest/DataModelTestDataCommon/src/CondReaderAlg.h b/Control/DataModelTest/DataModelTestDataCommon/src/CondReaderAlg.h
index 58d158d42ed75a75238b78530394f0af34898755..da8490c6f5adca1762ac080fe491014842430e7c 100644
--- a/Control/DataModelTest/DataModelTestDataCommon/src/CondReaderAlg.h
+++ b/Control/DataModelTest/DataModelTestDataCommon/src/CondReaderAlg.h
@@ -1,6 +1,8 @@
// This file's extension implies that it's C, but it's really -*- C++ -*-.
/*
- * Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration.
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+/*
*/
// $Id$
/**
diff --git a/Control/DataModelTest/DataModelTestDataCommon/src/CondWriterAlg.cxx b/Control/DataModelTest/DataModelTestDataCommon/src/CondWriterAlg.cxx
index ac4774c6a7f58d5d6fe996c97c3e14e5d9951048..efca5ac2d94a089cebef975719ca9da95a4ebd07 100644
--- a/Control/DataModelTest/DataModelTestDataCommon/src/CondWriterAlg.cxx
+++ b/Control/DataModelTest/DataModelTestDataCommon/src/CondWriterAlg.cxx
@@ -1,5 +1,7 @@
/*
- * Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration.
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+/*
*/
// $Id$
/**
diff --git a/Control/DataModelTest/DataModelTestDataCommon/src/CondWriterAlg.h b/Control/DataModelTest/DataModelTestDataCommon/src/CondWriterAlg.h
index dab470ced320ffe3740a7b79436fff7d4d8faa9e..1d18d75683ec26e417e59cf77d086ec837e2473e 100644
--- a/Control/DataModelTest/DataModelTestDataCommon/src/CondWriterAlg.h
+++ b/Control/DataModelTest/DataModelTestDataCommon/src/CondWriterAlg.h
@@ -1,6 +1,8 @@
// This file's extension implies that it's C, but it's really -*- C++ -*-.
/*
- * Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration.
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+/*
*/
// $Id$
/**
diff --git a/Control/IOVSvc/test/IOVSvc_test.cxx b/Control/IOVSvc/test/IOVSvc_test.cxx
index 059fd75c1af9401497fd2ba08ebf275b4bfa44c4..e9a95c5989052d8b984e6c7d4384b1db9d620246 100644
--- a/Control/IOVSvc/test/IOVSvc_test.cxx
+++ b/Control/IOVSvc/test/IOVSvc_test.cxx
@@ -1,5 +1,7 @@
/*
- * Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration.
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+/*
*/
/**
* @file IOVSvc/test/IOVSvc_test.cxx
diff --git a/Control/RngComps/test/RNGWrapper_test.cxx b/Control/RngComps/test/RNGWrapper_test.cxx
index 1fe194891100b2a4965a1cd04319d55b1875deba..71daa17993b4447bdebe274549d204f8309ed2ae 100644
--- a/Control/RngComps/test/RNGWrapper_test.cxx
+++ b/Control/RngComps/test/RNGWrapper_test.cxx
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
#include <cmath>
#include <limits>
diff --git a/Control/StoreGate/StoreGate/ReadDecorHandleKey.icc b/Control/StoreGate/StoreGate/ReadDecorHandleKey.icc
index aacea9649b659d0e28d42a65e3d2423b49272e48..87a7a5c461814cfcf02afd050de572a025229fcc 100644
--- a/Control/StoreGate/StoreGate/ReadDecorHandleKey.icc
+++ b/Control/StoreGate/StoreGate/ReadDecorHandleKey.icc
@@ -1,5 +1,7 @@
/*
- * Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration.
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+/*
*/
// $Id$
/**
diff --git a/Control/StoreGate/StoreGate/SGIterator.h b/Control/StoreGate/StoreGate/SGIterator.h
index d6b35304a3c8c4d8e01e9cde8b7d50f8c7082e2c..8c172b78c63b0718aa7730915b1a359d1ef5106a 100644
--- a/Control/StoreGate/StoreGate/SGIterator.h
+++ b/Control/StoreGate/StoreGate/SGIterator.h
@@ -1,6 +1,8 @@
// This file's extension implies that it's C, but it's really -*- C++ -*-.
/*
- * Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration.
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+/*
*/
/**
* @file StoreGate/SGIterator.h
diff --git a/Control/StoreGate/StoreGate/SGIterator.icc b/Control/StoreGate/StoreGate/SGIterator.icc
index bffd7219f5fd7a729b5e87f8dcf1cb727128015a..34269250de1b97bf6128a34f9ebc97c2d8223f26 100644
--- a/Control/StoreGate/StoreGate/SGIterator.icc
+++ b/Control/StoreGate/StoreGate/SGIterator.icc
@@ -1,5 +1,7 @@
/*
- * Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration.
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+/*
*/
/**
* @file StoreGate/SGIterator.icc
diff --git a/Control/StoreGate/StoreGate/VarHandleKey.icc b/Control/StoreGate/StoreGate/VarHandleKey.icc
index b102b15967b11671c84f42517dd8b0df2a8801e2..39415cc71ede3f83fcc9f8146b26114d967a61ca 100644
--- a/Control/StoreGate/StoreGate/VarHandleKey.icc
+++ b/Control/StoreGate/StoreGate/VarHandleKey.icc
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
// $Id$
/**
* @file StoreGate/VarHandleKey.icc
diff --git a/Control/StoreGate/src/SGIterator.cxx b/Control/StoreGate/src/SGIterator.cxx
index 57dbf8fbb20314980e387ea63d7731577fe2ebba..f24397c4b2ff2d775414bb6aa798bfad67bac2da 100644
--- a/Control/StoreGate/src/SGIterator.cxx
+++ b/Control/StoreGate/src/SGIterator.cxx
@@ -1,5 +1,7 @@
/*
- * Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration.
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+/*
*/
/**
* @file StoreGate/src/SGIterator.cxx
diff --git a/Control/StoreGate/test/ReadDecorHandleKeyArray_test.cxx b/Control/StoreGate/test/ReadDecorHandleKeyArray_test.cxx
index 5bd8eb508f10b6c64fa491630e70e25a2a49aec2..f4eec712e5e15d882782f80f1e49477dd53b03cd 100644
--- a/Control/StoreGate/test/ReadDecorHandleKeyArray_test.cxx
+++ b/Control/StoreGate/test/ReadDecorHandleKeyArray_test.cxx
@@ -1,5 +1,7 @@
/*
- * Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration.
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+/*
*/
// $Id$
diff --git a/Control/StoreGate/test/ReadDecorHandle_test.cxx b/Control/StoreGate/test/ReadDecorHandle_test.cxx
index abc58278a36b67a0b0488c71710a91bc4805f1de..fa2f249216da831d63345020e3c257bef7cb8a26 100644
--- a/Control/StoreGate/test/ReadDecorHandle_test.cxx
+++ b/Control/StoreGate/test/ReadDecorHandle_test.cxx
@@ -1,5 +1,7 @@
/*
- * Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration.
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+/*
*/
// $Id$
diff --git a/Control/StoreGate/test/WriteDecorHandleKeyArray_test.cxx b/Control/StoreGate/test/WriteDecorHandleKeyArray_test.cxx
index 0fb732f000965010f0e163da4bd27ad339c9098e..a4aa44fff66ac50a40fd354a06fafbe114c7ea0e 100644
--- a/Control/StoreGate/test/WriteDecorHandleKeyArray_test.cxx
+++ b/Control/StoreGate/test/WriteDecorHandleKeyArray_test.cxx
@@ -1,5 +1,7 @@
/*
- * Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration.
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+/*
*/
// $Id$
diff --git a/Control/StoreGate/test/WriteDecorHandle_test.cxx b/Control/StoreGate/test/WriteDecorHandle_test.cxx
index 97838022445e2d230610d12135800539b0e7fec4..8e263d543f8fdad0208763237ef5c25ee8fd87bd 100644
--- a/Control/StoreGate/test/WriteDecorHandle_test.cxx
+++ b/Control/StoreGate/test/WriteDecorHandle_test.cxx
@@ -1,5 +1,7 @@
/*
- * Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration.
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+/*
*/
// $Id$
diff --git a/DataQuality/HanConfigGenerator/src/addnode.cxx b/DataQuality/HanConfigGenerator/src/addnode.cxx
index fd296d3d48a508a482973364c489a0d08c39c41b..ca7908be41328f1b041e08b1e41c025d717cf01a 100644
--- a/DataQuality/HanConfigGenerator/src/addnode.cxx
+++ b/DataQuality/HanConfigGenerator/src/addnode.cxx
@@ -4,7 +4,7 @@
//
// @author M.Sutton
//
-// Copyright (C) 2016 M.Sutton (sutt@cern.ch)
+//
//
// $Id: addnode.cxx, v0.0 Thu 21 Apr 2016 20:31:53 CEST sutt $
diff --git a/DataQuality/HanConfigGenerator/src/addnode.h b/DataQuality/HanConfigGenerator/src/addnode.h
index 18fbfbf3638e6a968a56c72563cf961e2385533d..769e833421d668f3cdc7a15212483265dcbca002 100644
--- a/DataQuality/HanConfigGenerator/src/addnode.h
+++ b/DataQuality/HanConfigGenerator/src/addnode.h
@@ -4,7 +4,7 @@
//
//
//
-// Copyright (C) 2016 M.Sutton (sutt@cern.ch)
+//
//
// $Id: addnode.h, v0.0 Thu 21 Apr 2016 20:31:49 CEST sutt $
diff --git a/DataQuality/HanConfigGenerator/src/hcg.cxx b/DataQuality/HanConfigGenerator/src/hcg.cxx
index 31e72915eaafd77ca1f8000621a44360d46bb910..c8092885ed0d5a6df0e3256882b509dc58c79715 100644
--- a/DataQuality/HanConfigGenerator/src/hcg.cxx
+++ b/DataQuality/HanConfigGenerator/src/hcg.cxx
@@ -5,7 +5,7 @@
//
// @author M.Sutton
//
-// Copyright (C) 2013 M.Sutton (sutt@cern.ch)
+//
//
// $Id: hanconfig.cxx, v0.0 Thu 12 March 2015 14:13:47 CEST sutt $
diff --git a/DataQuality/HanConfigGenerator/src/node.h b/DataQuality/HanConfigGenerator/src/node.h
index cbf5fcfaf59fe81089f145cad48236fb77c7f0fb..0d332193fadd31fe343a6ecf2f7058cf9156ff75 100644
--- a/DataQuality/HanConfigGenerator/src/node.h
+++ b/DataQuality/HanConfigGenerator/src/node.h
@@ -4,7 +4,7 @@
//
//
//
-// Copyright (C) 2016 M.Sutton (sutt@cern.ch)
+//
//
// $Id: node.h, v0.0 Fri 8 Apr 2016 00:57:16 CEST sutt $
diff --git a/Database/CoolLumiUtilities/CoolLumiUtilities/OnlineLumiCalibrationCondData.h b/Database/CoolLumiUtilities/CoolLumiUtilities/OnlineLumiCalibrationCondData.h
index 19a23324bd6a6fad4d440decf10629dd6d426640..1e13d8da5ee383de1085e691b2086b2d514d8dfd 100644
--- a/Database/CoolLumiUtilities/CoolLumiUtilities/OnlineLumiCalibrationCondData.h
+++ b/Database/CoolLumiUtilities/CoolLumiUtilities/OnlineLumiCalibrationCondData.h
@@ -1,6 +1,8 @@
// This file's extension implies that it's C, but it's really -*- C++ -*-.
/*
- * Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration.
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+/*
*/
/**
* @file CoolLumiUtilities/OnlineLumiCalibrationCondData.h
diff --git a/Database/CoolLumiUtilities/src/OnlineLumiCalibrationCondAlg.cxx b/Database/CoolLumiUtilities/src/OnlineLumiCalibrationCondAlg.cxx
index 81783c7e1cb8dcdbf6411ae32eaa732f495547fa..46a404d1307315526b50efc44408ca6fb21910d8 100644
--- a/Database/CoolLumiUtilities/src/OnlineLumiCalibrationCondAlg.cxx
+++ b/Database/CoolLumiUtilities/src/OnlineLumiCalibrationCondAlg.cxx
@@ -1,5 +1,7 @@
/*
- * Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration.
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+/*
*/
/**
* @file CoolLumiUtilities/src/OnlineLumiCalibrationCondAlg.cxx
diff --git a/Database/CoolLumiUtilities/src/OnlineLumiCalibrationCondAlg.h b/Database/CoolLumiUtilities/src/OnlineLumiCalibrationCondAlg.h
index d267e68b5e2e56b7586026fdb7ce3c5faf87d86f..6cb3c813ceff6016edd26fcc8d65a606c1e5cd4a 100644
--- a/Database/CoolLumiUtilities/src/OnlineLumiCalibrationCondAlg.h
+++ b/Database/CoolLumiUtilities/src/OnlineLumiCalibrationCondAlg.h
@@ -1,6 +1,8 @@
// This file's extension implies that it's C, but it's really -*- C++ -*-.
/*
- * Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration.
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+/*
*/
/**
* @file CoolLumiUtilities/src/OnlineLumiCalibrationCondAlg.h
diff --git a/Database/CoolLumiUtilities/test/OnlineLumiCalibrationCondAlg_test.cxx b/Database/CoolLumiUtilities/test/OnlineLumiCalibrationCondAlg_test.cxx
index 3eaea94dc88902d47e7489eab7181d84c52a85f2..3190206a4dc8d7cd798492b04bd478427d4d2a31 100644
--- a/Database/CoolLumiUtilities/test/OnlineLumiCalibrationCondAlg_test.cxx
+++ b/Database/CoolLumiUtilities/test/OnlineLumiCalibrationCondAlg_test.cxx
@@ -1,5 +1,7 @@
/*
- * Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration.
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+/*
*/
/**
* @file CoolLumiUtilities/test/OnlineLumiCalibrationCondAlg_test.cxx
diff --git a/Database/CoolLumiUtilities/test/OnlineLumiCalibrationCondData_test.cxx b/Database/CoolLumiUtilities/test/OnlineLumiCalibrationCondData_test.cxx
index 51556557be793569068aa104297ca237460e3dfb..3bf913ad06f460cf98ca673362f7a502ababb3b7 100644
--- a/Database/CoolLumiUtilities/test/OnlineLumiCalibrationCondData_test.cxx
+++ b/Database/CoolLumiUtilities/test/OnlineLumiCalibrationCondData_test.cxx
@@ -1,5 +1,7 @@
/*
- * Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration.
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+/*
*/
/**
* @file CoolLumiUtilities/test/OnlineLumiCalibrationCondData_test.cxx
diff --git a/Database/IOVDbSvc/src/FolderTypes.cxx b/Database/IOVDbSvc/src/FolderTypes.cxx
index 30df55a01ca0eec719668aee31732d9814e12fea..0f803d8cb89a14063febe666a542de67c850c282 100644
--- a/Database/IOVDbSvc/src/FolderTypes.cxx
+++ b/Database/IOVDbSvc/src/FolderTypes.cxx
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
#include "FolderTypes.h"
#include "AthenaKernel/IClassIDSvc.h"
#include "IOVDbStringFunctions.h"
diff --git a/Database/IOVDbSvc/test/IOVDbSvc_test.cxx b/Database/IOVDbSvc/test/IOVDbSvc_test.cxx
index a213adb00e9a2c6dea8c1447b21a78f670765e5e..dd12052eea3c73657a0da371d0a7b03c1ea9cac3 100644
--- a/Database/IOVDbSvc/test/IOVDbSvc_test.cxx
+++ b/Database/IOVDbSvc/test/IOVDbSvc_test.cxx
@@ -1,5 +1,7 @@
/*
- * Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration.
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+/*
*/
/**
* @file IOVDbSvc/test/IOVDbSvc_test.cxx
diff --git a/DetectorDescription/IRegionSelector/IRegionSelector/IRegSelSvc.h b/DetectorDescription/IRegionSelector/IRegionSelector/IRegSelSvc.h
index d4f5ca1cc3b1a1dfa7652d0c6c3a4435f818f702..d024c32f9f7a02d4dfe6ea78854565b3ae1cc922 100644
--- a/DetectorDescription/IRegionSelector/IRegionSelector/IRegSelSvc.h
+++ b/DetectorDescription/IRegionSelector/IRegionSelector/IRegSelSvc.h
@@ -1,10 +1,12 @@
// emacs: this is -*- c++ -*-
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
//
// IRegSelSvc.h
//
// Interface for the RegionSelector (RegSelSvc) service
//
-// Copyright (C) 2007 M.Sutton (sutt@hep.ucl.ac.uk)
//
// $Id: IRegSelSvc.h,v 1.1.1.1 2008-11-19 15:33:35 sutt Exp $
diff --git a/DetectorDescription/IRegionSelector/IRegionSelector/IRoiDescriptor.h b/DetectorDescription/IRegionSelector/IRegionSelector/IRoiDescriptor.h
index afe44cf63a477e9310863d52c42eea5e14661205..20e8d083676fd253cc3d74f08f64545bff1e7f05 100644
--- a/DetectorDescription/IRegionSelector/IRegionSelector/IRoiDescriptor.h
+++ b/DetectorDescription/IRegionSelector/IRegionSelector/IRoiDescriptor.h
@@ -1,11 +1,13 @@
// emacs: this is -*- c++ -*-
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
//
// @file IRoiDescriptor.h
//
// RoiDescriptor interface - only basic accessors
//
// @author sutt@cern.ch
-// Copyright (C) 2013 M.Sutton (sutt@cern.ch)
//
// $Id: IRoiDescriptor.h, v0.0 Fri 14 Jun 2013 00:52:09 CEST sutt $
diff --git a/DetectorDescription/IRegionSelector/IRegionSelector/RoiUtil.h b/DetectorDescription/IRegionSelector/IRegionSelector/RoiUtil.h
index 7dd1f2797c3d9c0a792b67214b5c4c5f5e767bfe..fa3d0f02bbd6175d1135b82e8505cc8ff3b1ff3c 100644
--- a/DetectorDescription/IRegionSelector/IRegionSelector/RoiUtil.h
+++ b/DetectorDescription/IRegionSelector/IRegionSelector/RoiUtil.h
@@ -1,4 +1,7 @@
// emacs: this is -*- c++ -*-
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
//
// @file RoiUtil.h
//
@@ -6,7 +9,6 @@
// to improve encapsulation
//
//
-// Copyright (C) 2015 M.Sutton (sutt@cern.ch)
//
// $Id: RoiUtil.h, v0.0 Sat 31 Oct 2015 09:55:29 CET sutt $
diff --git a/DetectorDescription/IdDictDetDescrCnv/src/IdDictDetDescrCnv_entries.cxx b/DetectorDescription/IdDictDetDescrCnv/src/IdDictDetDescrCnv_entries.cxx
index 4e6cda010def89d1922d097fe07d7728b7257fe7..6a0ccc30f0b63a424b0f3abb6833b0d4e03b8b56 100644
--- a/DetectorDescription/IdDictDetDescrCnv/src/IdDictDetDescrCnv_entries.cxx
+++ b/DetectorDescription/IdDictDetDescrCnv/src/IdDictDetDescrCnv_entries.cxx
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
#include "IdDictDetDescrCnv.h"
#include "AtlasIDDetDescrCnv.h"
#include "IdDictCnvTest.h"
diff --git a/DetectorDescription/RegSelLUT/RegSelLUT/RegSelEtaPhiLUT.h b/DetectorDescription/RegSelLUT/RegSelLUT/RegSelEtaPhiLUT.h
index 0e10762736ca6b5ab10d99008f39ec039bf777e6..39e700bb348f04de6ea86b437638d61a3b0437e4 100644
--- a/DetectorDescription/RegSelLUT/RegSelLUT/RegSelEtaPhiLUT.h
+++ b/DetectorDescription/RegSelLUT/RegSelLUT/RegSelEtaPhiLUT.h
@@ -1,4 +1,7 @@
// emacs: this is -*- c++ -*-
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
//
// @file RegSelEtaPhiLUT.h
//
@@ -23,7 +26,6 @@
// to completely contain the outer radius of the SCT
//
//
-// Copyright (C) 2011 M.Sutton (sutt@cern.ch)
//
// $Id: RegSelEtaPhiLUT.h, v0.0 Sat 25 Jun 2011 18:47:25 BST sutt $
diff --git a/DetectorDescription/RegSelLUT/RegSelLUT/RegSelEtaPhiModule.h b/DetectorDescription/RegSelLUT/RegSelLUT/RegSelEtaPhiModule.h
index fb353a3ba61bee6a2c78a2b1d6c5413be6677c16..70ec48170001bed28a500570a9f36bcfa6ec685b 100644
--- a/DetectorDescription/RegSelLUT/RegSelLUT/RegSelEtaPhiModule.h
+++ b/DetectorDescription/RegSelLUT/RegSelLUT/RegSelEtaPhiModule.h
@@ -1,4 +1,7 @@
// emacs: this is -*- c++ -*-
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
//
// @file RegSelEtaPhiModule.h
//
@@ -7,7 +10,6 @@
// designed so can easily test whether two "modules"
// overlap, and objects can be sorted by payload.
//
-// Copyright (C) 2011 M.Sutton (sutt@cern.ch)
//
// $Id: RegSelEtaPhiModule.h, v0.0 Sat 25 Jun 2011 10:30:34 BST sutt $
diff --git a/DetectorDescription/RegSelLUT/RegSelLUT/RegSelROB.h b/DetectorDescription/RegSelLUT/RegSelLUT/RegSelROB.h
index c95b72d7b919341cb8b55a3e2d87d0efebde4168..fefdad39316c7b1e25ef62dcd08494bc27a2acba 100644
--- a/DetectorDescription/RegSelLUT/RegSelLUT/RegSelROB.h
+++ b/DetectorDescription/RegSelLUT/RegSelLUT/RegSelROB.h
@@ -1,10 +1,12 @@
// emacs: this is -*- c++ -*-
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
//
// @file RegSelROB.h
//
//
//
-// Copyright (C) 2010 M.Sutton (sutt@cern.ch)
//
// $Id: RegSelROB.h, v0.0 Thu 14 Oct 2010 18:06:34 BST sutt $
diff --git a/DetectorDescription/RegSelLUT/src/RegSelEtaPhiLUT.cxx b/DetectorDescription/RegSelLUT/src/RegSelEtaPhiLUT.cxx
index bcd52b914e40a35a8b8289054aff7cc0b90172d1..19cf6b36b1dce7726f21e8cc4c257a77d48464b7 100644
--- a/DetectorDescription/RegSelLUT/src/RegSelEtaPhiLUT.cxx
+++ b/DetectorDescription/RegSelLUT/src/RegSelEtaPhiLUT.cxx
@@ -1,4 +1,7 @@
// emacs: this is -*- c++ -*-
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
//
// @file RegSelEtaPhiLUT.h
//
@@ -24,7 +27,6 @@
// to completely contain the outer radius of the SCT
//
//
-// Copyright (C) 2011 M.Sutton (sutt@cern.ch)
//
// $Id: RegSelEtaPhiLUT.h, v0.0 Sat 25 Jun 2011 18:47:25 BST sutt $
diff --git a/DetectorDescription/RegSelLUT/src/RegSelROB.cxx b/DetectorDescription/RegSelLUT/src/RegSelROB.cxx
index ad7f2a61f70b83362b54494914ac92dabdbfcb48..94d34fb674cf9d6f719168feaeba2f5193e7b42d 100644
--- a/DetectorDescription/RegSelLUT/src/RegSelROB.cxx
+++ b/DetectorDescription/RegSelLUT/src/RegSelROB.cxx
@@ -1,10 +1,12 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
//
// @file RegSelROB.cxx
//
//
// @author M.Sutton
//
-// Copyright (C) 2010 M.Sutton (sutt@cern.ch)
//
// $Id: RegSelROB.cxx, v0.0 Thu 14 Oct 2010 18:08:00 BST sutt $
diff --git a/DetectorDescription/RoiDescriptor/RoiDescriptor/RoiDescriptor.h b/DetectorDescription/RoiDescriptor/RoiDescriptor/RoiDescriptor.h
index 0e1b79b836e27f3b860d49e237dcf761f8676fa1..9a919337bceb5a93dbdcf4423364e00aa243b80b 100644
--- a/DetectorDescription/RoiDescriptor/RoiDescriptor/RoiDescriptor.h
+++ b/DetectorDescription/RoiDescriptor/RoiDescriptor/RoiDescriptor.h
@@ -1,4 +1,7 @@
// emacs: this is -*- c++ -*-
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
//
// @file RoiDescriptor.h
//
@@ -6,7 +9,6 @@
// for enforcement of correct roi sizes
//
// @author sutt@cern.ch
-// Copyright (C) 2013 M.Sutton (sutt@cern.ch)
//
// $Id: RoiDescriptor.h, v0.0 Fri 08 Jun 2013 23:52:09 CEST sutt $
diff --git a/DetectorDescription/RoiDescriptor/Root/RoiUtil.cxx b/DetectorDescription/RoiDescriptor/Root/RoiUtil.cxx
index e23a992de21528f5416573e5d832f7c9060e6399..875ff20b7495468a7cc33c10aff368ce2efd265c 100644
--- a/DetectorDescription/RoiDescriptor/Root/RoiUtil.cxx
+++ b/DetectorDescription/RoiDescriptor/Root/RoiUtil.cxx
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
//
// @file RoiUtil.cxx
//
@@ -6,7 +9,6 @@
//
// @author M.Sutton
//
-// Copyright (C) 2015 M.Sutton (sutt@cern.ch)
//
// $Id: RoiUtil.cxx, v0.0 Sat 31 Oct 2015 09:54:33 CET sutt $
diff --git a/Event/EventCommonTPCnv/test/HepLorentzVectorCnv_p1_test.cxx b/Event/EventCommonTPCnv/test/HepLorentzVectorCnv_p1_test.cxx
index 1827bab967ffb8bc58519c25373e4aedb7cf3104..222bc5020b1ba9417a3fa36ea2bdc726058d56e9 100644
--- a/Event/EventCommonTPCnv/test/HepLorentzVectorCnv_p1_test.cxx
+++ b/Event/EventCommonTPCnv/test/HepLorentzVectorCnv_p1_test.cxx
@@ -1,5 +1,7 @@
/*
- * Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration.
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+/*
*/
/**
* @file EventCommonTPCnv/test/HepLorentzVectorCnv_p1_test.cxx
diff --git a/Event/EventCommonTPCnv/test/INav4MomAssocsCnv_p1_test.cxx b/Event/EventCommonTPCnv/test/INav4MomAssocsCnv_p1_test.cxx
index 6fed93a42b55c89dcbcb9a823ff67c0cec31a745..4d2f0c0cf599d11c896c61401dd2625116b0e145 100644
--- a/Event/EventCommonTPCnv/test/INav4MomAssocsCnv_p1_test.cxx
+++ b/Event/EventCommonTPCnv/test/INav4MomAssocsCnv_p1_test.cxx
@@ -1,5 +1,7 @@
/*
- * Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration.
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+/*
*/
/**
* @file EventCommonTPCnv/test/INav4MomAssocsCnv_p1_test.cxx
diff --git a/Event/EventCommonTPCnv/test/INav4MomAssocsCnv_p2_test.cxx b/Event/EventCommonTPCnv/test/INav4MomAssocsCnv_p2_test.cxx
index 61e396d3af539281d3aa53157ba6325cf613cfc4..66ab68de32ac87050a474ef7fe631937c0e78a98 100644
--- a/Event/EventCommonTPCnv/test/INav4MomAssocsCnv_p2_test.cxx
+++ b/Event/EventCommonTPCnv/test/INav4MomAssocsCnv_p2_test.cxx
@@ -1,5 +1,7 @@
/*
- * Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration.
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+/*
*/
/**
* @file EventCommonTPCnv/test/INav4MomAssocsCnv_p2_test.cxx
diff --git a/Event/EventCommonTPCnv/test/INav4MomAssocsCnv_p3_test.cxx b/Event/EventCommonTPCnv/test/INav4MomAssocsCnv_p3_test.cxx
index a545621778a7e92d1d38b3f57cea95bd5aa21866..f56f6aa4c7edfc79aaf98c301adef61bf1b38b74 100644
--- a/Event/EventCommonTPCnv/test/INav4MomAssocsCnv_p3_test.cxx
+++ b/Event/EventCommonTPCnv/test/INav4MomAssocsCnv_p3_test.cxx
@@ -1,5 +1,7 @@
/*
- * Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration.
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+/*
*/
/**
* @file EventCommonTPCnv/test/INav4MomAssocsCnv_p3_test.cxx
diff --git a/Event/EventCommonTPCnv/test/P4EEtaPhiMCnv_p1_test.cxx b/Event/EventCommonTPCnv/test/P4EEtaPhiMCnv_p1_test.cxx
index a1bd578cb3919e2f5da9e2b56a760df691b1e139..adf9cc98eb4587e9c741a0ab511bf1b206383638 100644
--- a/Event/EventCommonTPCnv/test/P4EEtaPhiMCnv_p1_test.cxx
+++ b/Event/EventCommonTPCnv/test/P4EEtaPhiMCnv_p1_test.cxx
@@ -1,5 +1,7 @@
/*
- * Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration.
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+/*
*/
/**
* @file EventCommonTPCnv/test/P4EEtaPhiMCnv_p1_test.cxx
diff --git a/Event/EventCommonTPCnv/test/P4EEtaPhiMCnv_p2_test.cxx b/Event/EventCommonTPCnv/test/P4EEtaPhiMCnv_p2_test.cxx
index 8107f534170b5f659b0b496e5d1a7cb3358e088d..41cd8b3cc69abf8a336ed68341da18a9a7caddbf 100644
--- a/Event/EventCommonTPCnv/test/P4EEtaPhiMCnv_p2_test.cxx
+++ b/Event/EventCommonTPCnv/test/P4EEtaPhiMCnv_p2_test.cxx
@@ -1,5 +1,7 @@
/*
- * Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration.
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+/*
*/
/**
* @file EventCommonTPCnv/test/P4EEtaPhiMCnv_p2_test.cxx
diff --git a/Event/EventCommonTPCnv/test/P4IPtCotThPhiMCnv_p1_test.cxx b/Event/EventCommonTPCnv/test/P4IPtCotThPhiMCnv_p1_test.cxx
index 777926da488d7828c9d4a93c0a31ad82ca97f614..de1d3510e29005ef2c2bb1f8c388a7264fbe112f 100644
--- a/Event/EventCommonTPCnv/test/P4IPtCotThPhiMCnv_p1_test.cxx
+++ b/Event/EventCommonTPCnv/test/P4IPtCotThPhiMCnv_p1_test.cxx
@@ -1,5 +1,7 @@
/*
- * Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration.
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+/*
*/
/**
* @file EventCommonTPCnv/test/P4IPtCotThPhiMCnv_p1_test.cxx
diff --git a/Event/EventCommonTPCnv/test/P4ImplEEtaPhiMCnv_p1_test.cxx b/Event/EventCommonTPCnv/test/P4ImplEEtaPhiMCnv_p1_test.cxx
index 158272cfc4d67d649f4570e4f44c712df6e00842..7eb80e4e2923b2488f8ad665497f55a73d18a4b1 100644
--- a/Event/EventCommonTPCnv/test/P4ImplEEtaPhiMCnv_p1_test.cxx
+++ b/Event/EventCommonTPCnv/test/P4ImplEEtaPhiMCnv_p1_test.cxx
@@ -1,5 +1,7 @@
/*
- * Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration.
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+/*
*/
/**
* @file EventCommonTPCnv/test/P4ImplEEtaPhiMCnv_p1_test.cxx
diff --git a/Event/EventCommonTPCnv/test/P4ImplEEtaPhiMCnv_p2_test.cxx b/Event/EventCommonTPCnv/test/P4ImplEEtaPhiMCnv_p2_test.cxx
index 1ba14709865c6e78af6dec28802f9fc438cd3427..b003b177a82abf9c828b9d2fef3a279778159cea 100644
--- a/Event/EventCommonTPCnv/test/P4ImplEEtaPhiMCnv_p2_test.cxx
+++ b/Event/EventCommonTPCnv/test/P4ImplEEtaPhiMCnv_p2_test.cxx
@@ -1,5 +1,7 @@
/*
- * Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration.
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+/*
*/
/**
* @file EventCommonTPCnv/test/P4ImplEEtaPhiMCnv_p2_test.cxx
diff --git a/Event/EventCommonTPCnv/test/P4ImplPtEtaPhiMCnv_p1_test.cxx b/Event/EventCommonTPCnv/test/P4ImplPtEtaPhiMCnv_p1_test.cxx
index 3a871a73021abb4a796b5565ae114d374f37246d..193c23a4fe3c5073ccc30c60ff01b3dffb4b17c3 100644
--- a/Event/EventCommonTPCnv/test/P4ImplPtEtaPhiMCnv_p1_test.cxx
+++ b/Event/EventCommonTPCnv/test/P4ImplPtEtaPhiMCnv_p1_test.cxx
@@ -1,5 +1,7 @@
/*
- * Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration.
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+/*
*/
/**
* @file EventCommonTPCnv/test/P4ImplPtEtaPhiMCnv_p1_test.cxx
diff --git a/Event/EventCommonTPCnv/test/P4ImplPtEtaPhiMCnv_p2_test.cxx b/Event/EventCommonTPCnv/test/P4ImplPtEtaPhiMCnv_p2_test.cxx
index 1a5ec3102965568395599ddbc1ada26b193eb73d..20ebb62d2eb69caa5b0236ea316b3fbb9a6bdb86 100644
--- a/Event/EventCommonTPCnv/test/P4ImplPtEtaPhiMCnv_p2_test.cxx
+++ b/Event/EventCommonTPCnv/test/P4ImplPtEtaPhiMCnv_p2_test.cxx
@@ -1,5 +1,7 @@
/*
- * Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration.
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+/*
*/
/**
* @file EventCommonTPCnv/test/P4ImplPtEtaPhiMCnv_p2_test.cxx
diff --git a/Event/EventCommonTPCnv/test/P4PtEtaPhiMCnv_p1_test.cxx b/Event/EventCommonTPCnv/test/P4PtEtaPhiMCnv_p1_test.cxx
index a6149e31c152c8c05a5b2e7183f5d4b7e66f4d5f..d557b8b839b160eec0909fb4e1f6d4b807be3d67 100644
--- a/Event/EventCommonTPCnv/test/P4PtEtaPhiMCnv_p1_test.cxx
+++ b/Event/EventCommonTPCnv/test/P4PtEtaPhiMCnv_p1_test.cxx
@@ -1,5 +1,7 @@
/*
- * Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration.
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+/*
*/
/**
* @file EventCommonTPCnv/test/P4PtEtaPhiMCnv_p1_test.cxx
diff --git a/Event/EventCommonTPCnv/test/P4PtEtaPhiMCnv_p2_test.cxx b/Event/EventCommonTPCnv/test/P4PtEtaPhiMCnv_p2_test.cxx
index 076b088e9ad84bbf1453ff5043433ec202bfe030..c48c84ba98613643383b6f60d8ecc2f4c0ba4951 100644
--- a/Event/EventCommonTPCnv/test/P4PtEtaPhiMCnv_p2_test.cxx
+++ b/Event/EventCommonTPCnv/test/P4PtEtaPhiMCnv_p2_test.cxx
@@ -1,5 +1,7 @@
/*
- * Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration.
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+/*
*/
/**
* @file EventCommonTPCnv/test/P4PtEtaPhiMCnv_p2_test.cxx
diff --git a/Event/EventCommonTPCnv/test/P4PxPyPzECnv_p1_test.cxx b/Event/EventCommonTPCnv/test/P4PxPyPzECnv_p1_test.cxx
index e9e5bdc0f4d854c4211d61c9f5e99773325dcb4e..e72695e13cda888d52160fd234b6e1bb4d3e52c3 100644
--- a/Event/EventCommonTPCnv/test/P4PxPyPzECnv_p1_test.cxx
+++ b/Event/EventCommonTPCnv/test/P4PxPyPzECnv_p1_test.cxx
@@ -1,5 +1,7 @@
/*
- * Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration.
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+/*
*/
/**
* @file EventCommonTPCnv/test/P4PxPyPzECnv_p1_test.cxx
diff --git a/Event/EventContainers/src/IdentifiableContainerBase.cxx b/Event/EventContainers/src/IdentifiableContainerBase.cxx
index ea259a7c6d7b297d2136d9272b5c5f09293ed6ed..3010aa56fc49749014f7b7a58b46220c70cf2123 100644
--- a/Event/EventContainers/src/IdentifiableContainerBase.cxx
+++ b/Event/EventContainers/src/IdentifiableContainerBase.cxx
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
#include "EventContainers/IdentifiableContainerBase.h"
#include <algorithm>
#include "EventContainers/IDC_WriteHandleBase.h"
diff --git a/Event/EventInfoMgt/src/EventInfoMgt_entries.cxx b/Event/EventInfoMgt/src/EventInfoMgt_entries.cxx
index e05a3b5f0bc633b6c5b061180c9252b58c14c4bd..fb3fe98b025e19b7b33197653963bec46b88c12a 100644
--- a/Event/EventInfoMgt/src/EventInfoMgt_entries.cxx
+++ b/Event/EventInfoMgt/src/EventInfoMgt_entries.cxx
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
#include "TagInfoMgr.h"
DECLARE_COMPONENT( TagInfoMgr )
diff --git a/Event/xAOD/xAODCore/test/ut_xaodcore_auxinfobase_test.cxx b/Event/xAOD/xAODCore/test/ut_xaodcore_auxinfobase_test.cxx
index 0a1060ffd5b5353cfa68c2f12fc597759f6d8130..cddff3c39f58cdbe1a1ed652a0d5c001bde7b072 100644
--- a/Event/xAOD/xAODCore/test/ut_xaodcore_auxinfobase_test.cxx
+++ b/Event/xAOD/xAODCore/test/ut_xaodcore_auxinfobase_test.cxx
@@ -1,5 +1,7 @@
/*
- * Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration.
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+/*
*/
/**
* @file xAODCore/test/AuxInfoBase_test.cxx
diff --git a/Event/xAOD/xAODEventInfo/test/ut_xaodeventinfo_eventauxinfo_v1_test.cxx b/Event/xAOD/xAODEventInfo/test/ut_xaodeventinfo_eventauxinfo_v1_test.cxx
index 64d4e7557546961a13c99eda7eed3d891273c9ee..a65e8ec5f488fa293b4cbb950d253ed302ef5f9c 100644
--- a/Event/xAOD/xAODEventInfo/test/ut_xaodeventinfo_eventauxinfo_v1_test.cxx
+++ b/Event/xAOD/xAODEventInfo/test/ut_xaodeventinfo_eventauxinfo_v1_test.cxx
@@ -1,5 +1,7 @@
/*
- * Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration.
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+/*
*/
/**
* @file xAODEventInfo/test/ut_xoadeventinfo_eventauxinfo_v1_test.cxx
diff --git a/Event/xAOD/xAODEventInfo/test/ut_xaodeventinfo_eventinfo_v1_test.cxx b/Event/xAOD/xAODEventInfo/test/ut_xaodeventinfo_eventinfo_v1_test.cxx
index 397deff7d29f14aab635268fe7ecb0aa96b828f9..203fabe9a0afd515426fa4eb9fcb179c7414ddae 100644
--- a/Event/xAOD/xAODEventInfo/test/ut_xaodeventinfo_eventinfo_v1_test.cxx
+++ b/Event/xAOD/xAODEventInfo/test/ut_xaodeventinfo_eventinfo_v1_test.cxx
@@ -1,5 +1,7 @@
/*
- * Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration.
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+/*
*/
/**
* @file xAODEventInfo/test/ut_xoadeventinfo_eventinfo_v1_test.cxx
diff --git a/Event/xAOD/xAODEventInfo/test/ut_xaodeventinfo_eventinfoauxcontainer_v1_test.cxx b/Event/xAOD/xAODEventInfo/test/ut_xaodeventinfo_eventinfoauxcontainer_v1_test.cxx
index 373ea79b52d2bf97504b4f78d7d41a9090274b17..4bb02e4d5b3e71d36af25eb22513258ce30a35d4 100644
--- a/Event/xAOD/xAODEventInfo/test/ut_xaodeventinfo_eventinfoauxcontainer_v1_test.cxx
+++ b/Event/xAOD/xAODEventInfo/test/ut_xaodeventinfo_eventinfoauxcontainer_v1_test.cxx
@@ -1,5 +1,7 @@
/*
- * Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration.
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+/*
*/
/**
* @file xAODEventInfo/test/ut_xoadeventinfo_eventinfoauxcontainer_v1_test.cxx
diff --git a/Event/xAOD/xAODPFlow/Root/TrackCaloClusterAuxContainer_v1.cxx b/Event/xAOD/xAODPFlow/Root/TrackCaloClusterAuxContainer_v1.cxx
index df82f81684de53f20ea3f1ce2a5bd3f0e9f74041..0e30b4017cebc3567c4c61b5f9a2b1fd19844814 100644
--- a/Event/xAOD/xAODPFlow/Root/TrackCaloClusterAuxContainer_v1.cxx
+++ b/Event/xAOD/xAODPFlow/Root/TrackCaloClusterAuxContainer_v1.cxx
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
// $Id: TrackCaloClusterAuxContainer_v1.cxx $
// Local include(s):
diff --git a/Event/xAOD/xAODPFlow/Root/TrackCaloCluster_v1.cxx b/Event/xAOD/xAODPFlow/Root/TrackCaloCluster_v1.cxx
index b25987581e213be7190900c0c5f8fa304378e19f..c1436eee557f5acdaede9e9d99237daff6c50f31 100644
--- a/Event/xAOD/xAODPFlow/Root/TrackCaloCluster_v1.cxx
+++ b/Event/xAOD/xAODPFlow/Root/TrackCaloCluster_v1.cxx
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
// $Id: TrackCaloCluster_v1.cxx $
// Misc includes
diff --git a/Event/xAOD/xAODPFlow/xAODPFlow/TrackCaloCluster.h b/Event/xAOD/xAODPFlow/xAODPFlow/TrackCaloCluster.h
index 3b5562fdf6ed43a151e2e8b13b3d5edb9057236d..f566d2547eb6749114fa3441218abb5b28364be2 100644
--- a/Event/xAOD/xAODPFlow/xAODPFlow/TrackCaloCluster.h
+++ b/Event/xAOD/xAODPFlow/xAODPFlow/TrackCaloCluster.h
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
#ifndef XAODPFLOW_TRACKCALOCLUSTER_H
#define XAODPFLOW_TRACKCALOCLUSTER_H
diff --git a/Event/xAOD/xAODPFlow/xAODPFlow/TrackCaloClusterAuxContainer.h b/Event/xAOD/xAODPFlow/xAODPFlow/TrackCaloClusterAuxContainer.h
index 4cd164649d6c463bd12b514122754367492295aa..f57f89320a6e12349ed29d84ac8f183ad1d5b75c 100644
--- a/Event/xAOD/xAODPFlow/xAODPFlow/TrackCaloClusterAuxContainer.h
+++ b/Event/xAOD/xAODPFlow/xAODPFlow/TrackCaloClusterAuxContainer.h
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
#ifndef XAODPFLOW_TRACKCALOCLUSTERAUXCONTAINER_H
#define XAODPFLOW_TRACKCALOCLUSTERAUXCONTAINER_H
diff --git a/Event/xAOD/xAODPFlow/xAODPFlow/TrackCaloClusterContainer.h b/Event/xAOD/xAODPFlow/xAODPFlow/TrackCaloClusterContainer.h
index b69677f7842789315d2a6ac7dbfb37413a876c10..c6e2d102151a3185b172cb323d6274a9ed95b2ba 100644
--- a/Event/xAOD/xAODPFlow/xAODPFlow/TrackCaloClusterContainer.h
+++ b/Event/xAOD/xAODPFlow/xAODPFlow/TrackCaloClusterContainer.h
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
#ifndef XAODPFLOW_TRACKCALOCLUSTERCONTAINER_H
#define XAODPFLOW_TRACKCALOCLUSTERCONTAINER_H
diff --git a/Event/xAOD/xAODPFlow/xAODPFlow/versions/TrackCaloClusterAuxContainer_v1.h b/Event/xAOD/xAODPFlow/xAODPFlow/versions/TrackCaloClusterAuxContainer_v1.h
index 0061e3877e8132ee91368f8ed001d260b3c77107..175e0cef7914d215f8b5196833ebe0d28b886ecc 100644
--- a/Event/xAOD/xAODPFlow/xAODPFlow/versions/TrackCaloClusterAuxContainer_v1.h
+++ b/Event/xAOD/xAODPFlow/xAODPFlow/versions/TrackCaloClusterAuxContainer_v1.h
@@ -1,4 +1,7 @@
// Dear emacs, this is -*- c++ -*-
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
// $Id: TrackCaloClusterAuxContainer_v1.h $
#ifndef XAODPFLOW_VERSIONS_TRACKCALOCLUSTERAUXCONTAINER_V1_H
#define XAODPFLOW_VERSIONS_TRACKCALOCLUSTERAUXCONTAINER_V1_H
diff --git a/Event/xAOD/xAODPFlow/xAODPFlow/versions/TrackCaloClusterContainer_v1.h b/Event/xAOD/xAODPFlow/xAODPFlow/versions/TrackCaloClusterContainer_v1.h
index a5a84f2e5369b4ac142a80dd2c25a5f8b2886d0c..dd996e8abaff467428d8fcc01687e0335476e909 100644
--- a/Event/xAOD/xAODPFlow/xAODPFlow/versions/TrackCaloClusterContainer_v1.h
+++ b/Event/xAOD/xAODPFlow/xAODPFlow/versions/TrackCaloClusterContainer_v1.h
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
#ifndef XAODPFLOW_VERSIONS_TRACKCALOCLUSTERCONTAINER_V1_H
#define XAODPFLOW_VERSIONS_TRACKCALOCLUSTERCONTAINER_V1_H
diff --git a/Event/xAOD/xAODPFlow/xAODPFlow/versions/TrackCaloCluster_v1.h b/Event/xAOD/xAODPFlow/xAODPFlow/versions/TrackCaloCluster_v1.h
index 1500b49b40362f5003a5d371dae997ec85d7795a..6e03e60f2b5d554f8bc74ccbaa7a32d07055a395 100644
--- a/Event/xAOD/xAODPFlow/xAODPFlow/versions/TrackCaloCluster_v1.h
+++ b/Event/xAOD/xAODPFlow/xAODPFlow/versions/TrackCaloCluster_v1.h
@@ -1,4 +1,7 @@
// Dear emacs, this is -*- c++ -*-
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
// $Id: TrackCaloCluster_v1.h $
#ifndef XAODPFLOW_VERSIONS_TRACKCALOCLUSTER_V1_H
#define XAODPFLOW_VERSIONS_TRACKCALOCLUSTER_V1_H
diff --git a/Event/xAOD/xAODPFlowAthenaPool/src/xAODTrackCaloClusterAuxContainerCnv.cxx b/Event/xAOD/xAODPFlowAthenaPool/src/xAODTrackCaloClusterAuxContainerCnv.cxx
index eecf338caa74572f40d3faad16aba44a86585bdc..e54c070e3790fe81838b645a8cfc34773c2bfab2 100644
--- a/Event/xAOD/xAODPFlowAthenaPool/src/xAODTrackCaloClusterAuxContainerCnv.cxx
+++ b/Event/xAOD/xAODPFlowAthenaPool/src/xAODTrackCaloClusterAuxContainerCnv.cxx
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
// $Id: xAODTrackCaloClusterAuxContainerCnv.cxx 791368 2017-01-05 08:55:07Z hrivnac $
// System include(s):
diff --git a/Event/xAOD/xAODPFlowAthenaPool/src/xAODTrackCaloClusterAuxContainerCnv.h b/Event/xAOD/xAODPFlowAthenaPool/src/xAODTrackCaloClusterAuxContainerCnv.h
index 5f3f0969c8c1650468a04f5c62a1eb24fca3d458..7e7126968dcf7181dc0e065c927e5028a702defc 100644
--- a/Event/xAOD/xAODPFlowAthenaPool/src/xAODTrackCaloClusterAuxContainerCnv.h
+++ b/Event/xAOD/xAODPFlowAthenaPool/src/xAODTrackCaloClusterAuxContainerCnv.h
@@ -1,4 +1,7 @@
// Dear emacs, this is -*- c++ -*-
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
// $Id: xAODTrackCaloClusterAuxContainerCnv.h $
#ifndef XAODPFLOWATHENAPOOL_XAODTRACKCALOCLUSTERAUXCONTAINERCNV_H
#define XAODPFLOWATHENAPOOL_XAODTRACKCALOCLUSTERAUXCONTAINERCNV_H
diff --git a/Event/xAOD/xAODPFlowAthenaPool/src/xAODTrackCaloClusterAuxContainerCnv_v1.cxx b/Event/xAOD/xAODPFlowAthenaPool/src/xAODTrackCaloClusterAuxContainerCnv_v1.cxx
index a6fb823fa13497a609779d530c790a861df3cbc9..9e40cc1dc848aef5a1650445bb40c429c55e47ea 100644
--- a/Event/xAOD/xAODPFlowAthenaPool/src/xAODTrackCaloClusterAuxContainerCnv_v1.cxx
+++ b/Event/xAOD/xAODPFlowAthenaPool/src/xAODTrackCaloClusterAuxContainerCnv_v1.cxx
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
// $Id$
// System include(s):
diff --git a/Event/xAOD/xAODPFlowAthenaPool/src/xAODTrackCaloClusterAuxContainerCnv_v1.h b/Event/xAOD/xAODPFlowAthenaPool/src/xAODTrackCaloClusterAuxContainerCnv_v1.h
index 83974b557efa01ded35607b1929563d222f690ce..2af411694d9e84af1e25b4ebf37ab354f006075b 100644
--- a/Event/xAOD/xAODPFlowAthenaPool/src/xAODTrackCaloClusterAuxContainerCnv_v1.h
+++ b/Event/xAOD/xAODPFlowAthenaPool/src/xAODTrackCaloClusterAuxContainerCnv_v1.h
@@ -1,4 +1,7 @@
// Dear emacs, this is -*- c++ -*-
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
// $Id$
#ifndef XAODPFLOWATHENAPOOL_XAODTRACKCALOCLUSTERAUXCONTAINERCNV_V1_H
#define XAODPFLOWATHENAPOOL_XAODTRACKCALOCLUSTERAUXCONTAINERCNV_V1_H
diff --git a/Event/xAOD/xAODPFlowAthenaPool/src/xAODTrackCaloClusterContainerCnv.cxx b/Event/xAOD/xAODPFlowAthenaPool/src/xAODTrackCaloClusterContainerCnv.cxx
index a1d2cc125f1140fe840ddd42f388443697e55385..4094d8b0bdf26d01e79757fb494514cb993d3729 100644
--- a/Event/xAOD/xAODPFlowAthenaPool/src/xAODTrackCaloClusterContainerCnv.cxx
+++ b/Event/xAOD/xAODPFlowAthenaPool/src/xAODTrackCaloClusterContainerCnv.cxx
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
// $Id: xAODTrackCaloClusterContainerCnv.cxx $
// System include(s):
diff --git a/Event/xAOD/xAODPFlowAthenaPool/src/xAODTrackCaloClusterContainerCnv.h b/Event/xAOD/xAODPFlowAthenaPool/src/xAODTrackCaloClusterContainerCnv.h
index c487abf416ee349a64ffdc9f328788d25d49965b..d879f1144173e3ddd967aa48296f96f2a38957bb 100644
--- a/Event/xAOD/xAODPFlowAthenaPool/src/xAODTrackCaloClusterContainerCnv.h
+++ b/Event/xAOD/xAODPFlowAthenaPool/src/xAODTrackCaloClusterContainerCnv.h
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
#ifndef XAODPFLOWATHENAPOOL_XAODTRACKCALOCLUSTERCONTAINERCNV_H
#define XAODPFLOWATHENAPOOL_XAODTRACKCALOCLUSTERCONTAINERCNV_H
diff --git a/Event/xAOD/xAODTrigMuon/Root/TrigMuonDefs.cxx b/Event/xAOD/xAODTrigMuon/Root/TrigMuonDefs.cxx
index 6fb9aadadeed1ddfde24d4a7bf3aaeeb16c5cfd4..c9f34230858e0049085ba76ac21eb53afd92705e 100644
--- a/Event/xAOD/xAODTrigMuon/Root/TrigMuonDefs.cxx
+++ b/Event/xAOD/xAODTrigMuon/Root/TrigMuonDefs.cxx
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
#include "xAODTrigMuon/TrigMuonDefs.h"
#include <math.h>
#include <iostream>
diff --git a/Event/xAOD/xAODTrigger/Root/RoiDescriptorStoreAuxInfo_v1.cxx b/Event/xAOD/xAODTrigger/Root/RoiDescriptorStoreAuxInfo_v1.cxx
index 238a747a3491bdafb36f8632372f744dad93677b..d5acd1b47b3daf991f3540ad14ab914f55e9d41f 100644
--- a/Event/xAOD/xAODTrigger/Root/RoiDescriptorStoreAuxInfo_v1.cxx
+++ b/Event/xAOD/xAODTrigger/Root/RoiDescriptorStoreAuxInfo_v1.cxx
@@ -1,10 +1,12 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
//
// @file RoiDescriptorStoreAuxInfo_v1.cxx
//
//
// @author M.Sutton
//
-// Copyright (C) 2015 M.Sutton (sutt@cern.ch)
//
// $Id: RoiDescriptorStoreAuxInfo_v1.cxx, v0.0 Wed 11 Nov 2015 14:51:11 CET sutt $
diff --git a/Event/xAOD/xAODTrigger/Root/RoiDescriptorStore_v1.cxx b/Event/xAOD/xAODTrigger/Root/RoiDescriptorStore_v1.cxx
index de35e2c45a614ce2e031e4e355c293602d237093..0ccbecc5f279f463fa22f4b8ad5e4717e62c21ea 100644
--- a/Event/xAOD/xAODTrigger/Root/RoiDescriptorStore_v1.cxx
+++ b/Event/xAOD/xAODTrigger/Root/RoiDescriptorStore_v1.cxx
@@ -1,10 +1,12 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
//
// @file RoiDescriptorStore_v1.cxx
//
//
// @author M.Sutton
//
-// Copyright (C) 2015 M.Sutton (sutt@cern.ch)
//
// $Id: RoiDescriptorStore_v1.cxx, v0.0 Wed 11 Nov 2015 14:51:11 CET sutt $
diff --git a/Event/xAOD/xAODTrigger/xAODTrigger/RoiDescriptorStore.h b/Event/xAOD/xAODTrigger/xAODTrigger/RoiDescriptorStore.h
index 350ef90b0f7325ab05ea15015d5286102449bda5..c7cd3f25bc2196b35aff980dd215820bfc6287e0 100644
--- a/Event/xAOD/xAODTrigger/xAODTrigger/RoiDescriptorStore.h
+++ b/Event/xAOD/xAODTrigger/xAODTrigger/RoiDescriptorStore.h
@@ -1,8 +1,10 @@
// emacs: this is -*- c++ -*-
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
//
// @file IRoiDecsriptorStorage.h
//
-// Copyright (C) 2015 M.Sutton (sutt@cern.ch)
//
// $Id: RoiDescriptorStoreAuxInfo.h v0.0 Wed 11 Nov 2015 14:36:15 CET sutt $
#ifndef XAODTRIGGER_ROIDESCRIPTORSTORE_H
diff --git a/Event/xAOD/xAODTrigger/xAODTrigger/RoiDescriptorStoreAuxInfo.h b/Event/xAOD/xAODTrigger/xAODTrigger/RoiDescriptorStoreAuxInfo.h
index 1140017fa231e2d6bd021ce81ca887da5927e9fe..a50474a23b03e02480df0669a55a8f553d7bb762 100644
--- a/Event/xAOD/xAODTrigger/xAODTrigger/RoiDescriptorStoreAuxInfo.h
+++ b/Event/xAOD/xAODTrigger/xAODTrigger/RoiDescriptorStoreAuxInfo.h
@@ -1,8 +1,10 @@
// emacs: this is -*- c++ -*-
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
//
// @file IRoiDecsriptorStorageAuxInfo.h
//
-// Copyright (C) 2015 M.Sutton (sutt@cern.ch)
//
// $Id: RoiDescriptorStoreAuxInfo.h v0.0 Wed 11 Nov 2015 14:36:15 CET sutt $
diff --git a/Event/xAOD/xAODTrigger/xAODTrigger/versions/RoiDescriptorStoreAuxInfo_v1.h b/Event/xAOD/xAODTrigger/xAODTrigger/versions/RoiDescriptorStoreAuxInfo_v1.h
index 8b913d6e03bbc9248c9ae99f06c431cd3c7808f8..44ed8e782891886e1f5c07ea567fed53542e5b1e 100644
--- a/Event/xAOD/xAODTrigger/xAODTrigger/versions/RoiDescriptorStoreAuxInfo_v1.h
+++ b/Event/xAOD/xAODTrigger/xAODTrigger/versions/RoiDescriptorStoreAuxInfo_v1.h
@@ -1,11 +1,13 @@
// emacs: this is -*- c++ -*-
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
//
// @file IRoiDecsriptorStorageAuxInfo_v1.h
//
// Class holding the data handled by RoiDescriptorStore_v1
// This is the auxiliary class holding the serialised RoiDescriptor
// information in xAOD files.
-// Copyright (C) 2015 M.Sutton (sutt@cern.ch)
//
// $Id: RoiDescriptorStoreAuxInfo_v1.h v0.0 Wed 11 Nov 2015 14:36:15 CET sutt $
diff --git a/Event/xAOD/xAODTrigger/xAODTrigger/versions/RoiDescriptorStore_v1.h b/Event/xAOD/xAODTrigger/xAODTrigger/versions/RoiDescriptorStore_v1.h
index 01c23431aa63aa42cc3b066529a1630153bc429c..d855e640c755a092c3979e2fbf158f801d14ed36 100644
--- a/Event/xAOD/xAODTrigger/xAODTrigger/versions/RoiDescriptorStore_v1.h
+++ b/Event/xAOD/xAODTrigger/xAODTrigger/versions/RoiDescriptorStore_v1.h
@@ -1,4 +1,7 @@
// emacs: this is -*- c++ -*-
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
//
// @file IRoiDecsriptorStorage_v1.h
//
@@ -9,7 +12,6 @@
// regular users should only ever access the IRoiDescriptors
// through the TrigDecisionTool
//
-// Copyright (C) 2015 M.Sutton (sutt@cern.ch)
//
// $Id: RoiDescriptorStore_v1.h v0.0 Wed 11 Nov 2015 14:36:15 CET sutt $
diff --git a/ForwardDetectors/ALFA/ALFA_Geometry/ALFA_Geometry/ALFA_SvdCalc.h b/ForwardDetectors/ALFA/ALFA_Geometry/ALFA_Geometry/ALFA_SvdCalc.h
index 1d8c78c540f92ced2ce6f9829d978f4404c8d671..02e76967002f3ca0dc0a8e1b8efe7be2c14e8685 100644
--- a/ForwardDetectors/ALFA/ALFA_Geometry/ALFA_Geometry/ALFA_SvdCalc.h
+++ b/ForwardDetectors/ALFA/ALFA_Geometry/ALFA_Geometry/ALFA_SvdCalc.h
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
/************************************************************
* *
@@ -5,9 +8,7 @@
* institution for use, copying, or redistribution of *
* this code and associated documentation, provided *
* that such code and documentation are not sold for *
- * profit and the following copyright notice is retained *
* in the code and documentation: *
- * Copyright (c) held by Dianne Cook *
* All Rights Reserved. *
* *
* Questions and comments are welcome, and I request *
diff --git a/ForwardDetectors/ForwardIdCnv/src/ForwardIdCnv_entries.cxx b/ForwardDetectors/ForwardIdCnv/src/ForwardIdCnv_entries.cxx
index 57aab600d5f7c8019ed4be4b20de3ebc9fd7e5ef..801fe9e0b6340430fedc7561a6106c1cb7e3b0df 100644
--- a/ForwardDetectors/ForwardIdCnv/src/ForwardIdCnv_entries.cxx
+++ b/ForwardDetectors/ForwardIdCnv/src/ForwardIdCnv_entries.cxx
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
#include "ZdcIDDetDescrCnv.h"
DECLARE_CONVERTER( ZdcIDDetDescrCnv )
diff --git a/Generators/GeneratorObjectsTPCnv/src/initMcEventCollection.cxx b/Generators/GeneratorObjectsTPCnv/src/initMcEventCollection.cxx
index 63b84505e7af17d9676031dc58601ca7947585aa..50bbb46a4483132ad09f83b26bf9e29f235a669e 100644
--- a/Generators/GeneratorObjectsTPCnv/src/initMcEventCollection.cxx
+++ b/Generators/GeneratorObjectsTPCnv/src/initMcEventCollection.cxx
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
#include "GeneratorObjectsTPCnv/initMcEventCollection.h"
// HepMC includes
diff --git a/Generators/Herwig_i/src/componentsRpv/HerwigRpv_i_entries.cxx b/Generators/Herwig_i/src/componentsRpv/HerwigRpv_i_entries.cxx
index dfe362e80ec00ec6c10f0168229ee8870e13b2a3..f8a0088505e275bdbc27c9838b5cfca80c1c8ea5 100644
--- a/Generators/Herwig_i/src/componentsRpv/HerwigRpv_i_entries.cxx
+++ b/Generators/Herwig_i/src/componentsRpv/HerwigRpv_i_entries.cxx
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
#include "Herwig_i/HerwigRpv.h"
DECLARE_COMPONENT( HerwigRpv )
diff --git a/Generators/McEventSelector/src/McEventSelector_entries.cxx b/Generators/McEventSelector/src/McEventSelector_entries.cxx
index ea30ab2561dcd93b55fd7921bdd46adee8b5968f..9f92f8a0de5caeb3e4c5acf433003341a43fcc0f 100644
--- a/Generators/McEventSelector/src/McEventSelector_entries.cxx
+++ b/Generators/McEventSelector/src/McEventSelector_entries.cxx
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
#include "McEventSelector/McEventCnv.h"
#include "McEventSelector/McCnvSvc.h"
#include "McEventSelector/McEventSelector.h"
diff --git a/Generators/Pythia8_i/src/UserHooks/PowhegBB4L.cxx b/Generators/Pythia8_i/src/UserHooks/PowhegBB4L.cxx
index 0691844b636bec8154c2fa7faed92ee90b9afb3a..29efbb86061b173160b0b7b6ca3d92d546ab73e8 100644
--- a/Generators/Pythia8_i/src/UserHooks/PowhegBB4L.cxx
+++ b/Generators/Pythia8_i/src/UserHooks/PowhegBB4L.cxx
@@ -1,5 +1,7 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
// PowhegHooksBB4L.h
-// Copyright (C) 2017 Tomas Jezo, Markus Seidel, Ben Nachman
// Author: Tomas Jezo, Markus Seidel and Ben Nachman based on
// PowhegHooks.h by Richard Corke
diff --git a/Generators/Pythia8_i/src/UserHooks/SettableColourReconnection.cxx b/Generators/Pythia8_i/src/UserHooks/SettableColourReconnection.cxx
index 2d183c61b9a0b0f21d0ff9766dbcfc09407b7e1e..156390a6033bf6017372c004bfbac1b0c90b3563 100644
--- a/Generators/Pythia8_i/src/UserHooks/SettableColourReconnection.cxx
+++ b/Generators/Pythia8_i/src/UserHooks/SettableColourReconnection.cxx
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
#include "Pythia8_i/UserHooksFactory.h"
#include "Pythia8Plugins/ColourReconnectionHooks.h"
#include "UserSetting.h"
diff --git a/Generators/Pythia8_i/src/UserHooks/SingleTopWideEta.cxx b/Generators/Pythia8_i/src/UserHooks/SingleTopWideEta.cxx
index 3439f84fc3ac947374ac4ad1c5648cf577759c1f..16ba8e6cc0351ce5404954d472dd9ba6ac453772 100644
--- a/Generators/Pythia8_i/src/UserHooks/SingleTopWideEta.cxx
+++ b/Generators/Pythia8_i/src/UserHooks/SingleTopWideEta.cxx
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
#include "Pythia8_i/UserHooksFactory.h"
#include "Pythia8/PhaseSpace.h"
diff --git a/Generators/PythiaExo_i/src/PythiaGS_i_entries.cxx b/Generators/PythiaExo_i/src/PythiaGS_i_entries.cxx
index 5f304c767711b573649e2e0ac6525baab25e1cbe..bf762795206bd8d6e448a0ffb0e1b1fd4377e1b3 100644
--- a/Generators/PythiaExo_i/src/PythiaGS_i_entries.cxx
+++ b/Generators/PythiaExo_i/src/PythiaGS_i_entries.cxx
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
#include "PythiaExo_i/PythiaGS.h"
DECLARE_COMPONENT( PythiaGS )
diff --git a/Generators/PythiaExo_i/src/PythiaLLP_i_entries.cxx b/Generators/PythiaExo_i/src/PythiaLLP_i_entries.cxx
index 14a318a2dcd92383d01d10fe929905a4ece8e10d..3be316fc823457a27dff0830e0e73709f53835fe 100644
--- a/Generators/PythiaExo_i/src/PythiaLLP_i_entries.cxx
+++ b/Generators/PythiaExo_i/src/PythiaLLP_i_entries.cxx
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
#include "PythiaExo_i/PythiaLLP.h"
DECLARE_COMPONENT( PythiaLLP )
diff --git a/Generators/PythiaExo_i/src/PythiaMono_i_entries.cxx b/Generators/PythiaExo_i/src/PythiaMono_i_entries.cxx
index 8991fdd4c1353710d4c63dcc82ccb36569c9c12d..3dc4b433604b35f7b071aadb4a462e222df66b5d 100644
--- a/Generators/PythiaExo_i/src/PythiaMono_i_entries.cxx
+++ b/Generators/PythiaExo_i/src/PythiaMono_i_entries.cxx
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
#include "PythiaExo_i/PythiaMono.h"
DECLARE_COMPONENT( PythiaMono )
diff --git a/Generators/PythiaExo_i/src/PythiaResMod_i_entries.cxx b/Generators/PythiaExo_i/src/PythiaResMod_i_entries.cxx
index 35f9e20d5061294c0fdc94b0b4d98ef7534571b4..929df1e915728c33872ed29c22a825e90e66a876 100644
--- a/Generators/PythiaExo_i/src/PythiaResMod_i_entries.cxx
+++ b/Generators/PythiaExo_i/src/PythiaResMod_i_entries.cxx
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
#include "PythiaExo_i/PythiaResMod.h"
DECLARE_COMPONENT( PythiaResMod )
diff --git a/Generators/PythiaExo_i/src/PythiaTau3Mu_i_entries.cxx b/Generators/PythiaExo_i/src/PythiaTau3Mu_i_entries.cxx
index ab561ef2e651af4c7bc1e299f032b58538bf5ccd..d49b0f34687ac1780aefdce6e592343b402decc2 100644
--- a/Generators/PythiaExo_i/src/PythiaTau3Mu_i_entries.cxx
+++ b/Generators/PythiaExo_i/src/PythiaTau3Mu_i_entries.cxx
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
#include "PythiaExo_i/PythiaTau3Mu.h"
DECLARE_COMPONENT( PythiaTau3Mu )
diff --git a/Generators/PythiaExo_i/src/PythiaTopMdiff_i_entries.cxx b/Generators/PythiaExo_i/src/PythiaTopMdiff_i_entries.cxx
index d66fdc2ab208d254601956f93787d651b889f24b..c226ba4bcdfe3f0527225e7a4f55dd984cdd29c5 100644
--- a/Generators/PythiaExo_i/src/PythiaTopMdiff_i_entries.cxx
+++ b/Generators/PythiaExo_i/src/PythiaTopMdiff_i_entries.cxx
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
#include "PythiaExo_i/PythiaTopMdiff.h"
DECLARE_COMPONENT( PythiaTopMdiff )
diff --git a/HLT/Trigger/TrigControl/TrigServices/src/THistSvcHLT.cxx b/HLT/Trigger/TrigControl/TrigServices/src/THistSvcHLT.cxx
index d8c09abd4dce652ba1fef48ec1e1cce1a76974ff..e253e0663f7307316a0ec35c01411735fcb765ef 100644
--- a/HLT/Trigger/TrigControl/TrigServices/src/THistSvcHLT.cxx
+++ b/HLT/Trigger/TrigControl/TrigServices/src/THistSvcHLT.cxx
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
/*
* This is a copy of GaudiSvc/src/THistSvc with THistSvc renamed to THistSvcHLT
* to allow inheritance of this class by TrigMonTHistSvc.
diff --git a/HLT/Trigger/TrigControl/TrigServices/src/THistSvcHLT.h b/HLT/Trigger/TrigControl/TrigServices/src/THistSvcHLT.h
index 8c976be132e6ede7cfaf45f637cfdb4a70db9b53..5832fc6f574fa0319a9cfa7222498117423f5a67 100644
--- a/HLT/Trigger/TrigControl/TrigServices/src/THistSvcHLT.h
+++ b/HLT/Trigger/TrigControl/TrigServices/src/THistSvcHLT.h
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
/*
* This is a copy of GaudiSvc/src/THistSvc with THistSvc renamed to THistSvcHLT
* to allow inheritance of this class by TrigMonTHistSvc.
diff --git a/HLT/Trigger/TrigControl/TrigServices/src/THistSvcHLT.icc b/HLT/Trigger/TrigControl/TrigServices/src/THistSvcHLT.icc
index 9595c3a580e6b9b9c1d288618d742daf6e098e03..253211016f9c84bb56fea1f2c8d5cb8f3da7676f 100644
--- a/HLT/Trigger/TrigControl/TrigServices/src/THistSvcHLT.icc
+++ b/HLT/Trigger/TrigControl/TrigServices/src/THistSvcHLT.icc
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
/*
* This is a copy of GaudiSvc/src/THistSvc with THistSvc renamed to THistSvcHLT
* to allow inheritance of this class by TrigMonTHistSvc.
diff --git a/InnerDetector/InDetCalibAlgs/InDetBeamSpotFinder/rootScripts/BeamspotCutEvaluation/AtlasStyle.h b/InnerDetector/InDetCalibAlgs/InDetBeamSpotFinder/rootScripts/BeamspotCutEvaluation/AtlasStyle.h
index 85b027e457afba708da04f8128a4e13fc0a3b01e..11f7e8954cc58190188d443a76df49bd0b804855 100644
--- a/InnerDetector/InDetCalibAlgs/InDetBeamSpotFinder/rootScripts/BeamspotCutEvaluation/AtlasStyle.h
+++ b/InnerDetector/InDetCalibAlgs/InDetBeamSpotFinder/rootScripts/BeamspotCutEvaluation/AtlasStyle.h
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
//
// @file AtlasStyle.h
//
@@ -6,7 +9,6 @@
//
// @author M.Sutton
//
-// Copyright (C) 2010 Atlas Collaboration
//
// $Id: AtlasStyle.h, v0.0 Thu 25 Mar 2010 10:34:20 CET $
diff --git a/InnerDetector/InDetCalibAlgs/InDetBeamSpotFinder/rootScripts/BeamspotCutEvaluation/AtlasUtils.h b/InnerDetector/InDetCalibAlgs/InDetBeamSpotFinder/rootScripts/BeamspotCutEvaluation/AtlasUtils.h
index e1480fde7ca3d36f870de2ed824e5ea41d0d6c55..9aa2199bb34ddd0c1505d7c1f8bc6421cddf6928 100644
--- a/InnerDetector/InDetCalibAlgs/InDetBeamSpotFinder/rootScripts/BeamspotCutEvaluation/AtlasUtils.h
+++ b/InnerDetector/InDetCalibAlgs/InDetBeamSpotFinder/rootScripts/BeamspotCutEvaluation/AtlasUtils.h
@@ -1,10 +1,12 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
//
// @file AtlasUtils.h
//
//
// @author M.Sutton
//
-// Copyright (C) 2010 Atlas Collaboration
//
// $Id: AtlasUtils.h, v0.0 Thu 25 Mar 2010 10:34:20 CET $
diff --git a/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/src/IElementStreamer.cxx b/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/src/IElementStreamer.cxx
index f60cc25aa3078fb16e3cb716c1dc15b066a95cb3..c449b1c61468ac425b91c7ed571b0c6f80b61f31 100644
--- a/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/src/IElementStreamer.cxx
+++ b/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/src/IElementStreamer.cxx
@@ -1,9 +1,11 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
/*
* IElementStreamer.cpp
* Formatter
*
* Created by sroe on 12/01/2010.
- * Copyright 2010 CERN. All rights reserved.
*
*/
#include "IElementStreamer.h"
diff --git a/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/src/IElementStreamer.h b/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/src/IElementStreamer.h
index 5856d23a87d306b01e2581056d0a1b6c1e76ef4c..dfeb16ccf1c068b1dfc1e18e74f51a4b87f7e665 100644
--- a/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/src/IElementStreamer.h
+++ b/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/src/IElementStreamer.h
@@ -1,9 +1,11 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
/*
* IElementStreamer.h
* Formatter
*
* Created by sroe on 12/01/2010.
- * Copyright 2010 CERN. All rights reserved.
*
*/
#ifndef IElementStreamer_h
diff --git a/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/src/XmlStreamer.cxx b/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/src/XmlStreamer.cxx
index 89750e21c04984e3ef916f8de765cbbeb71ec381..8cb1e0dfeab31e7f10e61d82e25f5e415c2602d8 100644
--- a/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/src/XmlStreamer.cxx
+++ b/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/src/XmlStreamer.cxx
@@ -1,9 +1,11 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
/*
* XmlStreamer.cpp
* Formatter
*
* Created by sroe on 12/01/2010.
- * Copyright 2010 CERN. All rights reserved.
*
*/
diff --git a/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/src/XmlStreamer.h b/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/src/XmlStreamer.h
index c3fb9b62e7a0c8657757f46b49a72da1deec0654..62bcf2df6dd4fae287dc50dab121ab77c263079c 100644
--- a/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/src/XmlStreamer.h
+++ b/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/src/XmlStreamer.h
@@ -1,9 +1,11 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
/*
* XmlStreamer.h
* Formatter
*
* Created by sroe on 12/01/2010.
- * Copyright 2010 CERN. All rights reserved.
*
*/
#ifndef XmlStreamer_h
diff --git a/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/SpecialPixelMapCondAlg.cxx b/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/SpecialPixelMapCondAlg.cxx
index 16ca558d36b213bfaaebda72b2b5fb4a5a2d3ac1..052303a79ff4e757707a8d2449d0e17a11c9f3ad 100644
--- a/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/SpecialPixelMapCondAlg.cxx
+++ b/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/SpecialPixelMapCondAlg.cxx
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
#include "SpecialPixelMapCondAlg.h"
#include "InDetIdentifier/PixelID.h"
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_SimpleHisto.h b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_SimpleHisto.h
index 1617d1382ce635ce5eb22a3f796429f0ca139124..9a05115b1c6cbf17327d48ecb7a05f951eb138f4 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_SimpleHisto.h
+++ b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_SimpleHisto.h
@@ -7,7 +7,6 @@
* C++ projects
*
* Created by sroe on 13/11/2009.
- * Copyright 2009 CERN. All rights reserved.
*
**/
#ifndef SCT_SimpleHisto_h
diff --git a/InnerDetector/InDetConditions/TRT_ConditionsAlgs/src/TRTStrawStatusWrite.cxx b/InnerDetector/InDetConditions/TRT_ConditionsAlgs/src/TRTStrawStatusWrite.cxx
index e0f7f5586360b758bab86ac18438a07b4b4df154..29ac44249aeaf3a25f432a7c1b16da1af93e86cc 100755
--- a/InnerDetector/InDetConditions/TRT_ConditionsAlgs/src/TRTStrawStatusWrite.cxx
+++ b/InnerDetector/InDetConditions/TRT_ConditionsAlgs/src/TRTStrawStatusWrite.cxx
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
//////////////////////////////
//TRTStrawStatusWrite.cxx
////////////////////////////
diff --git a/InnerDetector/InDetDetDescr/SCT_Cabling/src/SCT_CablingUtilities.cxx b/InnerDetector/InDetDetDescr/SCT_Cabling/src/SCT_CablingUtilities.cxx
index d885b1931a251df8c497e98cb862f2741af915ff..d4644fd0ea9f28852b435470995357f7096ad14a 100644
--- a/InnerDetector/InDetDetDescr/SCT_Cabling/src/SCT_CablingUtilities.cxx
+++ b/InnerDetector/InDetDetDescr/SCT_Cabling/src/SCT_CablingUtilities.cxx
@@ -1,10 +1,12 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
/*
* SCT_CablingUtilities.cxx
* SCT_Cabling
*
* Created by sroe on 14/11/2008.
- * Copyright 2008 CERN. All rights reserved.
*
*/
#include <iostream>
diff --git a/InnerDetector/InDetDetDescr/SCT_Cabling/src/SCT_OnlineId.cxx b/InnerDetector/InDetDetDescr/SCT_Cabling/src/SCT_OnlineId.cxx
index 59e52d4a9cfbd24ea78165845c66e4fc2bfcfdd2..c1b55e48d42ed2f23a8715644e9c0aea6c8b5aff 100644
--- a/InnerDetector/InDetDetDescr/SCT_Cabling/src/SCT_OnlineId.cxx
+++ b/InnerDetector/InDetDetDescr/SCT_Cabling/src/SCT_OnlineId.cxx
@@ -1,9 +1,11 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
/*
* SCT_OnlineId.cxx
* SCT_Cabling
*
* Created by sroe on 21/10/2008.
- * Copyright 2008 CERN. All rights reserved.
*
*/
diff --git a/InnerDetector/InDetDetDescr/SCT_Cabling/src/SCT_SerialNumber.cxx b/InnerDetector/InDetDetDescr/SCT_Cabling/src/SCT_SerialNumber.cxx
index 12c30e9d72a59d3978b7acec5be2c315ce24717b..37c878e14ab811937304e7d8ab70143bf0e61b2e 100644
--- a/InnerDetector/InDetDetDescr/SCT_Cabling/src/SCT_SerialNumber.cxx
+++ b/InnerDetector/InDetDetDescr/SCT_Cabling/src/SCT_SerialNumber.cxx
@@ -1,9 +1,11 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
/*
* SCT_SerialNumber.cxx
* SCT_Cabling
*
* Created by sroe on 21/10/2008.
- * Copyright 2008 CERN. All rights reserved.
*
*/
diff --git a/InnerDetector/InDetDetDescrCnv/InDetIdCnv/src/InDetIdCnv_entries.cxx b/InnerDetector/InDetDetDescrCnv/InDetIdCnv/src/InDetIdCnv_entries.cxx
index 06d053ac9e886ff7f7bb45afd5d41f87a1ebcaa8..22861608a17a4f8df561e3fd935315dc87828258 100644
--- a/InnerDetector/InDetDetDescrCnv/InDetIdCnv/src/InDetIdCnv_entries.cxx
+++ b/InnerDetector/InDetDetDescrCnv/InDetIdCnv/src/InDetIdCnv_entries.cxx
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
#include "PixelIDDetDescrCnv.h"
#include "SCT_IDDetDescrCnv.h"
#include "SiliconIDDetDescrCnv.h"
diff --git a/InnerDetector/InDetEventCnv/InDetEventAthenaPool/src/CreateTransientTemplate.cxx b/InnerDetector/InDetEventCnv/InDetEventAthenaPool/src/CreateTransientTemplate.cxx
index df1ecd58416547f88eabca79d92f70de7479d812..dd43021392ede0fa0d19cbb423ab153e1466984e 100644
--- a/InnerDetector/InDetEventCnv/InDetEventAthenaPool/src/CreateTransientTemplate.cxx
+++ b/InnerDetector/InDetEventCnv/InDetEventAthenaPool/src/CreateTransientTemplate.cxx
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
#include "CreateTransientTemplate.h"
#include <iostream>
#include <signal.h>
diff --git a/InnerDetector/InDetEventCnv/InDetEventAthenaPool/src/CreateTransientTemplate.h b/InnerDetector/InDetEventCnv/InDetEventAthenaPool/src/CreateTransientTemplate.h
index c89d0ae54a2a61995d9da07950148cbb2dfbf550..888accaf39e0a94fea41dc728acebd757cb0a1f6 100644
--- a/InnerDetector/InDetEventCnv/InDetEventAthenaPool/src/CreateTransientTemplate.h
+++ b/InnerDetector/InDetEventCnv/InDetEventAthenaPool/src/CreateTransientTemplate.h
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
#ifndef INDETEVENTATHENAPOOL_CREATETRANSIENTTEMPLATE_H
#define INDETEVENTATHENAPOOL_CREATETRANSIENTTEMPLATE_H
diff --git a/InnerDetector/InDetMonitoring/InDetAlignmentMonitoring/utils/include/AtlasLabels.h b/InnerDetector/InDetMonitoring/InDetAlignmentMonitoring/utils/include/AtlasLabels.h
index 4c1cec434393f18f964ea85b54cb9122e68ca430..255658d633005d433869f47d6699e8f4117ba2bd 100644
--- a/InnerDetector/InDetMonitoring/InDetAlignmentMonitoring/utils/include/AtlasLabels.h
+++ b/InnerDetector/InDetMonitoring/InDetAlignmentMonitoring/utils/include/AtlasLabels.h
@@ -7,7 +7,6 @@
//
// @author M.Sutton
//
-// Copyright (C) 2010 Atlas Collaboration
//
// $Id: AtlasLabels.h, v0.0 Thu 25 Mar 2010 10:34:20 CET $
diff --git a/InnerDetector/InDetMonitoring/InDetAlignmentMonitoring/utils/include/AtlasStyle.h b/InnerDetector/InDetMonitoring/InDetAlignmentMonitoring/utils/include/AtlasStyle.h
index 3e1adfe89675f990254e86da02114d81cd05f1d4..64d9787b370815b539e77ee2af772fe3ed8097c6 100644
--- a/InnerDetector/InDetMonitoring/InDetAlignmentMonitoring/utils/include/AtlasStyle.h
+++ b/InnerDetector/InDetMonitoring/InDetAlignmentMonitoring/utils/include/AtlasStyle.h
@@ -10,7 +10,6 @@
//
// @author M.Sutton
//
-// Copyright (C) 2010 Atlas Collaboration
//
// $Id: AtlasStyle.h, v0.0 Thu 25 Mar 2010 10:34:20 CET $
diff --git a/InnerDetector/InDetMonitoring/InDetAlignmentMonitoring/utils/include/AtlasUtils.h b/InnerDetector/InDetMonitoring/InDetAlignmentMonitoring/utils/include/AtlasUtils.h
index 179676eaf51fc204be2404a0132505a42f3333d0..b96af52ef2a553144c42e48c1184ac9c6ca1aff1 100644
--- a/InnerDetector/InDetMonitoring/InDetAlignmentMonitoring/utils/include/AtlasUtils.h
+++ b/InnerDetector/InDetMonitoring/InDetAlignmentMonitoring/utils/include/AtlasUtils.h
@@ -8,7 +8,6 @@
//
// @author M.Sutton
//
-// Copyright (C) 2010 Atlas Collaboration
//
// $Id: AtlasUtils.h, v0.0 Thu 25 Mar 2010 10:34:20 CET $
diff --git a/InnerDetector/InDetMonitoring/PixelMonitoring/src/Components.cxx b/InnerDetector/InDetMonitoring/PixelMonitoring/src/Components.cxx
index 84e2664939bcf0b676372f1156e0f16ae8e15431..739ef7683d5a4cfd73e67750d9d92a626aa70fab 100644
--- a/InnerDetector/InDetMonitoring/PixelMonitoring/src/Components.cxx
+++ b/InnerDetector/InDetMonitoring/PixelMonitoring/src/Components.cxx
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
#include "PixelMonitoring/Components.h"
namespace PixMon {
diff --git a/InnerDetector/InDetMonitoring/SCT_Monitoring/SCT_Monitoring/SCT_ClusterStruct.h b/InnerDetector/InDetMonitoring/SCT_Monitoring/SCT_Monitoring/SCT_ClusterStruct.h
index e06c3bc7f36fc62d54b9e5bb23e676719043432c..317cc07664f4de6fd13e6f2fa258792225be9e0a 100755
--- a/InnerDetector/InDetMonitoring/SCT_Monitoring/SCT_Monitoring/SCT_ClusterStruct.h
+++ b/InnerDetector/InDetMonitoring/SCT_Monitoring/SCT_Monitoring/SCT_ClusterStruct.h
@@ -1,9 +1,11 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
/*
* SCT_ClusterStruct.h
*
*
* Created by Shaun Roe on 24/05/2005.
- * Copyright (c) 2005 CERN. All rights reserved.
*
*/
diff --git a/InnerDetector/InDetRecTools/SiClusterizationTool/src/TTrainedNetworkCondAlg.cxx b/InnerDetector/InDetRecTools/SiClusterizationTool/src/TTrainedNetworkCondAlg.cxx
index 9df71da8143ec7e382676ea87edf0e8cb548d07e..3f47737b3fb28040103c9bb394aab63b2313fd27 100644
--- a/InnerDetector/InDetRecTools/SiClusterizationTool/src/TTrainedNetworkCondAlg.cxx
+++ b/InnerDetector/InDetRecTools/SiClusterizationTool/src/TTrainedNetworkCondAlg.cxx
@@ -1,5 +1,7 @@
/*
- * Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+/*
* */
#include "TTrainedNetworkCondAlg.h"
diff --git a/InnerDetector/InDetTrigRecAlgs/InDetTrigPrepRawDataFormat/InDetTrigPrepRawDataFormat/FTK_TrackMaker.h b/InnerDetector/InDetTrigRecAlgs/InDetTrigPrepRawDataFormat/InDetTrigPrepRawDataFormat/FTK_TrackMaker.h
index c729a6931c64722ac08aa9d80e1e222a1948cb5e..02c4465524c9f16fdda0e1a1aa20c144f67a8b30 100755
--- a/InnerDetector/InDetTrigRecAlgs/InDetTrigPrepRawDataFormat/InDetTrigPrepRawDataFormat/FTK_TrackMaker.h
+++ b/InnerDetector/InDetTrigRecAlgs/InDetTrigPrepRawDataFormat/InDetTrigPrepRawDataFormat/FTK_TrackMaker.h
@@ -1,5 +1,7 @@
/*
- Copyright (C) 1995-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+/*
*/
/////////////////////////////////////////////////////////////////////////////
diff --git a/InnerDetector/InDetTrigRecAlgs/InDetTrigPrepRawDataFormat/src/FTK_TrackMaker.cxx b/InnerDetector/InDetTrigRecAlgs/InDetTrigPrepRawDataFormat/src/FTK_TrackMaker.cxx
index 69be4d12d836793aa27416a0a69bdec75360cff6..353ab93f7c1be324cd1c58c3fbcee4025a9079c5 100755
--- a/InnerDetector/InDetTrigRecAlgs/InDetTrigPrepRawDataFormat/src/FTK_TrackMaker.cxx
+++ b/InnerDetector/InDetTrigRecAlgs/InDetTrigPrepRawDataFormat/src/FTK_TrackMaker.cxx
@@ -1,5 +1,7 @@
/*
- Copyright (C) 1995-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+/*
*/
//***************************************************************************
diff --git a/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/ErrorHandler.h b/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/ErrorHandler.h
index 8cd285e131ed87eb838b551544cdbd1c46a8b773..7b7bcd9784a8aa3aafbed563a34aa37ddb36fad9 100644
--- a/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/ErrorHandler.h
+++ b/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/ErrorHandler.h
@@ -1,9 +1,11 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
//
// ErrorHandler.h
// HDef
//
// Created by sroe on 18/03/2016.
-// Copyright © 2016 sroe. All rights reserved.
//
#ifndef ErrorHandler_h
diff --git a/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/IReadHistoDef.h b/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/IReadHistoDef.h
index a547a2018d6e0a8f483c7e2ef5d0983344cfc6c3..1a62cf9fe7eda885a15d747da74c0b8be075dd67 100644
--- a/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/IReadHistoDef.h
+++ b/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/IReadHistoDef.h
@@ -1,9 +1,11 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
//
// IReadHistoDef.h
// HDef
//
// Created by sroe on 08/07/2015.
-// Copyright (c) 2015 sroe. All rights reserved.
//
#ifndef IReadHistoDef_h
diff --git a/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/ReadFromText.h b/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/ReadFromText.h
index b8522cbad3bb410e7fd6f781728e2c715e87a184..fe4e7934f643cef6c796b684df2417feb90f6e1a 100644
--- a/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/ReadFromText.h
+++ b/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/ReadFromText.h
@@ -1,9 +1,11 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
//
// ReadFromText.h
// HDef
//
// Created by sroe on 16/07/2015.
-// Copyright (c) 2015 sroe. All rights reserved.
//
#ifndef ReadFromText_h
diff --git a/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/ReadFromXml.cxx b/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/ReadFromXml.cxx
index 760caa07519a909afd02de087fbd4949607c7bbc..fc8bba18d0a44e65b24c8e678a1eb9a772201958 100644
--- a/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/ReadFromXml.cxx
+++ b/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/ReadFromXml.cxx
@@ -1,9 +1,11 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
//
// ReadFromXml.cxx
// HDef
//
// Created by sroe on 15/03/2016.
-// Copyright © 2016 sroe. All rights reserved.
//
#include "ReadFromXml.h"
diff --git a/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/ReadFromXml.h b/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/ReadFromXml.h
index 0a80be36de00a0400a86917e7e6522f31e6d2e2a..84f2814a6c87d3274fe0c2e7ebf8a09ba93ba85a 100644
--- a/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/ReadFromXml.h
+++ b/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/ReadFromXml.h
@@ -1,9 +1,11 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
//
// ReadFromXml.h
// HDef
//
// Created by sroe on 15/03/2016.
-// Copyright © 2016 sroe. All rights reserved.
//
#ifndef IDVPM_ReadFromXml_h
diff --git a/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/ReadFromXmlDom.cxx b/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/ReadFromXmlDom.cxx
index 48b8ea70118f5d2eda0f5a90fa2df0255a5c8401..41d23e837a7c44d46f62f9f113ef60244b0941fe 100644
--- a/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/ReadFromXmlDom.cxx
+++ b/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/ReadFromXmlDom.cxx
@@ -1,9 +1,11 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
//
// ReadFromXmlDom.cxx
// HDef
//
// Created by sroe on 15/03/2016.
-// Copyright © 2016 sroe. All rights reserved.
//
#include "ReadFromXmlDom.h"
diff --git a/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/ReadFromXmlDom.h b/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/ReadFromXmlDom.h
index 624ca65bdf8a1613380af590739f9a963ff706d1..96d9e0b9406f56c2d88c11e0468f85653c57c27b 100644
--- a/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/ReadFromXmlDom.h
+++ b/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/ReadFromXmlDom.h
@@ -1,9 +1,11 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
//
// ReadFromXmlDom.h
// HDef
//
// Created by sroe on 15/03/2016.
-// Copyright © 2016 sroe. All rights reserved.
//
#ifndef IDVPM_ReadFromXmlDom_h
diff --git a/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/SingleHistogramDefinition.cxx b/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/SingleHistogramDefinition.cxx
index c4135e2b28e67430d4e60de2302f119012d37a25..20c7dab9d9876a4c92af9179e885524e1150625e 100644
--- a/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/SingleHistogramDefinition.cxx
+++ b/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/SingleHistogramDefinition.cxx
@@ -1,9 +1,11 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
//
// SingleHistogramDefinition.cpp
// HDef
//
// Created by sroe on 13/07/2015.
-// Copyright (c) 2015 sroe. All rights reserved.
//
#include "InDetPhysValMonitoring/SingleHistogramDefinition.h"
diff --git a/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/XmlContentHandlers.h b/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/XmlContentHandlers.h
index f2032802e96601f920102bc440ae9ccc210a19b6..4ff85275f055a3137b3f48f9d10385a508e12643 100644
--- a/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/XmlContentHandlers.h
+++ b/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/XmlContentHandlers.h
@@ -1,9 +1,11 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
//
// XmlContentHandlers.hpp
// HDef
//
// Created by sroe on 16/03/2016.
-// Copyright © 2016 sroe. All rights reserved.
//
#ifndef XmlContentHandlers_h
diff --git a/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/xmlUtilities.h b/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/xmlUtilities.h
index 42e90a98344135d17dbf827b0b88bf995795ed55..1236432ded767903933389e7177185a91d83f98b 100644
--- a/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/xmlUtilities.h
+++ b/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/xmlUtilities.h
@@ -1,9 +1,11 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
//
// xmlUtilities.h
// HDef
//
// Created by sroe on 15/03/2016.
-// Copyright © 2016 sroe. All rights reserved.
//
#ifndef xmlUtilities_h
diff --git a/LArCalorimeter/LArCabling/src/LArOnOffIdMapping.cxx b/LArCalorimeter/LArCabling/src/LArOnOffIdMapping.cxx
index c7cca836504bcc74d23c6ad04249d75eaca8fa61..71bd2cb7eb55e38a7c220476a6156f2eff9c879d 100644
--- a/LArCalorimeter/LArCabling/src/LArOnOffIdMapping.cxx
+++ b/LArCalorimeter/LArCabling/src/LArOnOffIdMapping.cxx
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
#include "LArCabling/LArOnOffIdMapping.h"
LArOnOffIdMapping::LArOnOffIdMapping(const LArOnlineID_Base* onlineId, const CaloCell_Base_ID * caloId) :
diff --git a/LArCalorimeter/LArCnv/LArIdCnv/src/LArIdCnv_entries.cxx b/LArCalorimeter/LArCnv/LArIdCnv/src/LArIdCnv_entries.cxx
index 4bf87e9a6a7059179f88ebcd77f4b1039c441236..4619bf110f59d08938dec74c3e0739b9e79cadd3 100644
--- a/LArCalorimeter/LArCnv/LArIdCnv/src/LArIdCnv_entries.cxx
+++ b/LArCalorimeter/LArCnv/LArIdCnv/src/LArIdCnv_entries.cxx
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
#include "LArIdCnv/LArIdMgrDetDescrCnv.h"
#include "LArIdCnv/LArOnlineIDDetDescrCnv.h"
#include "LArIdCnv/LArOnline_SuperCellIDDetDescrCnv.h"
diff --git a/LArCalorimeter/LArG4/LArG4FastSimSvc/LArG4FastSimSvc/ILArG4FastSimSvc.h b/LArCalorimeter/LArG4/LArG4FastSimSvc/LArG4FastSimSvc/ILArG4FastSimSvc.h
index f2eb315c8e5555f6a7f29501ba3c275cd28e2aae..6b41f3a77c4bda5a06407917ea807c9f0524bf8d 100644
--- a/LArCalorimeter/LArG4/LArG4FastSimSvc/LArG4FastSimSvc/ILArG4FastSimSvc.h
+++ b/LArCalorimeter/LArG4/LArG4FastSimSvc/LArG4FastSimSvc/ILArG4FastSimSvc.h
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
#ifndef LARG4FASTSIMSVC_ILARG4FASTSIMSVC_H
#define LARG4FASTSIMSVC_ILARG4FASTSIMSVC_H
diff --git a/LArCalorimeter/LArG4/LArG4FastSimSvc/LArG4FastSimSvc/LArG4FastSimSvc.h b/LArCalorimeter/LArG4/LArG4FastSimSvc/LArG4FastSimSvc/LArG4FastSimSvc.h
index b61d1b46a3a88d6e0951314196fc6360d39e21a2..d7db102b987839750b9ef41335010d6a85f799e6 100644
--- a/LArCalorimeter/LArG4/LArG4FastSimSvc/LArG4FastSimSvc/LArG4FastSimSvc.h
+++ b/LArCalorimeter/LArG4/LArG4FastSimSvc/LArG4FastSimSvc/LArG4FastSimSvc.h
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
#ifndef LARG4FASTSIMSVC_LARG4FASTSIMSVC_H
#define LARG4FASTSIMSVC_LARG4FASTSIMSVC_H
diff --git a/LArCalorimeter/LArG4/LArG4FastSimSvc/src/LArG4FastSimSvc.cxx b/LArCalorimeter/LArG4/LArG4FastSimSvc/src/LArG4FastSimSvc.cxx
index 211372698fa01d8d3f8420d59e978394c02a490f..8f9cd16c0b24e3dfbb29909fae695f3f3089467a 100644
--- a/LArCalorimeter/LArG4/LArG4FastSimSvc/src/LArG4FastSimSvc.cxx
+++ b/LArCalorimeter/LArG4/LArG4FastSimSvc/src/LArG4FastSimSvc.cxx
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
// include header file
#include "LArG4FastSimSvc/LArG4FastSimSvc.h"
diff --git a/LArCalorimeter/LArMonTools/src/LArNoiseCorrelationMon.cxx b/LArCalorimeter/LArMonTools/src/LArNoiseCorrelationMon.cxx
index 0059ea6aba28974319bf61db7a40876ff321648f..328a6035e6b873c52ca7390ab36efbec196f3946 100755
--- a/LArCalorimeter/LArMonTools/src/LArNoiseCorrelationMon.cxx
+++ b/LArCalorimeter/LArMonTools/src/LArNoiseCorrelationMon.cxx
@@ -1,5 +1,7 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+/*
*/
diff --git a/LArCalorimeter/LArRawConditions/src/LArADC2MeV.cxx b/LArCalorimeter/LArRawConditions/src/LArADC2MeV.cxx
index ac844c72115ae0c7f4d38ce5cbc5db8d7c6eb07e..dffb8479b0fe99244196c7aadb37c465bef43a96 100644
--- a/LArCalorimeter/LArRawConditions/src/LArADC2MeV.cxx
+++ b/LArCalorimeter/LArRawConditions/src/LArADC2MeV.cxx
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
#include "LArRawConditions/LArADC2MeV.h"
#include "LArIdentifier/LArOnlineID_Base.h"
diff --git a/LArCalorimeter/LArRawConditions/src/LArAutoCorrTotal.cxx b/LArCalorimeter/LArRawConditions/src/LArAutoCorrTotal.cxx
index ff630544554a6901f4040cb27eed94d3d973df6b..272e1af9fb55031e2076fd96357b3e0af192e5f4 100644
--- a/LArCalorimeter/LArRawConditions/src/LArAutoCorrTotal.cxx
+++ b/LArCalorimeter/LArRawConditions/src/LArAutoCorrTotal.cxx
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
#include "LArRawConditions/LArAutoCorrTotal.h"
#include "LArIdentifier/LArOnlineID_Base.h"
diff --git a/LArCalorimeter/LArTest/LArConditionsTest/src/LArConditionsTest_entries.cxx b/LArCalorimeter/LArTest/LArConditionsTest/src/LArConditionsTest_entries.cxx
index d60ae9cb1dd8d4e82bd6d748d83a514bb1f7a068..51e8f14f3c8e905ee37e9b3b7be539492012156b 100644
--- a/LArCalorimeter/LArTest/LArConditionsTest/src/LArConditionsTest_entries.cxx
+++ b/LArCalorimeter/LArTest/LArConditionsTest/src/LArConditionsTest_entries.cxx
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
#include "LArConditionsTest/LArConditionsTestAlg.h"
#include "LArConditionsTest/LArCondDataTest.h"
//#include "LArConditionsTest/FixLArIdMap.h"
diff --git a/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/MuonEventAthenaPool/CreateTransientTemplates.h b/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/MuonEventAthenaPool/CreateTransientTemplates.h
index a92b00acb23f73282219d6737f934f085dea3992..68ed04f5d6b3e7bb3e20b4b050578cb1aa3fa1fd 100644
--- a/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/MuonEventAthenaPool/CreateTransientTemplates.h
+++ b/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/MuonEventAthenaPool/CreateTransientTemplates.h
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
#ifndef MUONEVENTATHENAPOOL_CREATETRANSIENTTEMPLATES_H
#define MUONEVENTATHENAPOOL_CREATETRANSIENTTEMPLATES_H
diff --git a/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/src/CreateTransientTemplates.cxx b/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/src/CreateTransientTemplates.cxx
index 9ea2ad87b86edf0308fee9b1a864e27b34347794..611692b537e005a78740b5dde8610847d9144a42 100644
--- a/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/src/CreateTransientTemplates.cxx
+++ b/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/src/CreateTransientTemplates.cxx
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
#include "MuonEventAthenaPool/CreateTransientTemplates.h"
#include <iostream>
#include <signal.h>
diff --git a/MuonSpectrometer/MuonCnv/MuonEventTPCnv/MuonEventTPCnv/CreateTransientTemplates.h b/MuonSpectrometer/MuonCnv/MuonEventTPCnv/MuonEventTPCnv/CreateTransientTemplates.h
index 7e354da930ea4ea04f6ab0fd74a412dfd1cea2ce..826caee9fbe57ad703f20db8c767a4128e06fb95 100644
--- a/MuonSpectrometer/MuonCnv/MuonEventTPCnv/MuonEventTPCnv/CreateTransientTemplates.h
+++ b/MuonSpectrometer/MuonCnv/MuonEventTPCnv/MuonEventTPCnv/CreateTransientTemplates.h
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
#ifndef MUONEVENTTPCNV_CREATETRANSIENT_H
#define MUONEVENTTPCNV_CREATETRANSIENT_H
diff --git a/MuonSpectrometer/MuonCnv/MuonEventTPCnv/src/CreateTransientTemplates.cxx b/MuonSpectrometer/MuonCnv/MuonEventTPCnv/src/CreateTransientTemplates.cxx
index ec11a136321650aa3a8fafb5fbc38ccafca18cca..8f2114adbf45580bcc1e25c775718ac8b7a34739 100644
--- a/MuonSpectrometer/MuonCnv/MuonEventTPCnv/src/CreateTransientTemplates.cxx
+++ b/MuonSpectrometer/MuonCnv/MuonEventTPCnv/src/CreateTransientTemplates.cxx
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
#include "MuonEventTPCnv/CreateTransientTemplates.h"
#include <iostream>
diff --git a/MuonSpectrometer/MuonCnv/MuonIdCnv/src/MuonIdCnv_entries.cxx b/MuonSpectrometer/MuonCnv/MuonIdCnv/src/MuonIdCnv_entries.cxx
index 06bc5a2d6a70b9c914aca43193eedf3c1d866026..a3668edeced95a7076c799b612a94f9ae6dbbfba 100644
--- a/MuonSpectrometer/MuonCnv/MuonIdCnv/src/MuonIdCnv_entries.cxx
+++ b/MuonSpectrometer/MuonCnv/MuonIdCnv/src/MuonIdCnv_entries.cxx
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
#include "MDT_IDDetDescrCnv.h"
#include "CSC_IDDetDescrCnv.h"
#include "RPC_IDDetDescrCnv.h"
diff --git a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondTest/src/MuonCondTest_entries.cxx b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondTest/src/MuonCondTest_entries.cxx
index b5b20fe8f67590afd6529ad08256ecf8369cbe61..25eb630a517bd0cdf356e4e7e050d08fa4619dbf 100644
--- a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondTest/src/MuonCondTest_entries.cxx
+++ b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondTest/src/MuonCondTest_entries.cxx
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
#include "MuonCondTest/AlignCondAthTest.h"
#include "MuonCondTest/MuonDetectorStatusTest.h"
//#include "MuonCondTest/RpcStatusTest.h"
diff --git a/MuonSpectrometer/MuonDetDescr/MuonRegionSelector/MuonRegionSelector/CSC_RegionSelectorTable.h b/MuonSpectrometer/MuonDetDescr/MuonRegionSelector/MuonRegionSelector/CSC_RegionSelectorTable.h
index 2129028f5ff52abbee20847a1b2efc91218d26cd..51834a6aed6a5d72d39b4bc8094fd9d25521acef 100644
--- a/MuonSpectrometer/MuonDetDescr/MuonRegionSelector/MuonRegionSelector/CSC_RegionSelectorTable.h
+++ b/MuonSpectrometer/MuonDetDescr/MuonRegionSelector/MuonRegionSelector/CSC_RegionSelectorTable.h
@@ -1,10 +1,12 @@
// emacs: this is -*- c++ -*-
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
//
// @file CSC_RegionSelectorTable.h
//
//
//
-// Copyright (C) 2007 M.Sutton (sutt@cern.ch)
//
// $Id: CSC_RegionSelectorTable.h, v0.0 Tue 4 Aug 2009 16:34:52 BST sutt $
diff --git a/MuonSpectrometer/MuonDetDescr/MuonRegionSelector/MuonRegionSelector/MDT_RegionSelectorTable.h b/MuonSpectrometer/MuonDetDescr/MuonRegionSelector/MuonRegionSelector/MDT_RegionSelectorTable.h
index 43c6cd708f35fd45e7ddb59473d108ceab0e3e3e..a63104942b050a8673296911ee78606dd32ca4c4 100644
--- a/MuonSpectrometer/MuonDetDescr/MuonRegionSelector/MuonRegionSelector/MDT_RegionSelectorTable.h
+++ b/MuonSpectrometer/MuonDetDescr/MuonRegionSelector/MuonRegionSelector/MDT_RegionSelectorTable.h
@@ -1,10 +1,12 @@
// emacs: this is -*- c++ -*-
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
//
// @file MDT_RegionSelectorTable.h
//
//
//
-// Copyright (C) 2007 M.Sutton (sutt@cern.ch)
//
// $Id: MDT_RegionSelectorTable.h, v0.0 Tue 4 Aug 2009 16:34:52 BST sutt $
diff --git a/MuonSpectrometer/MuonDetDescr/MuonRegionSelector/MuonRegionSelector/RPC_RegSelLUT.h b/MuonSpectrometer/MuonDetDescr/MuonRegionSelector/MuonRegionSelector/RPC_RegSelLUT.h
index 44ec30c47bfa8cefb74d7a5ce77daaf9728347e7..1680872bc926c854b88543d9755696e464ef3e3d 100644
--- a/MuonSpectrometer/MuonDetDescr/MuonRegionSelector/MuonRegionSelector/RPC_RegSelLUT.h
+++ b/MuonSpectrometer/MuonDetDescr/MuonRegionSelector/MuonRegionSelector/RPC_RegSelLUT.h
@@ -1,4 +1,7 @@
//-*- C++ -*-
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
/**
* A class derived from RegSelSiLUT.
* It overwrites virtual methods returning hashIds,
diff --git a/MuonSpectrometer/MuonDetDescr/MuonRegionSelector/MuonRegionSelector/RPC_RegionSelectorTable.h b/MuonSpectrometer/MuonDetDescr/MuonRegionSelector/MuonRegionSelector/RPC_RegionSelectorTable.h
index 9bf60ab54b99d6e5f3bca923fc46798efbf3bf5c..31d7d0cea6df1a16d52bf7aa55956dd21919d17b 100644
--- a/MuonSpectrometer/MuonDetDescr/MuonRegionSelector/MuonRegionSelector/RPC_RegionSelectorTable.h
+++ b/MuonSpectrometer/MuonDetDescr/MuonRegionSelector/MuonRegionSelector/RPC_RegionSelectorTable.h
@@ -1,10 +1,12 @@
// emacs: this is -*- C++ -*-
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
//
// @file RPC_RegionSelectorTable.h
//
//
//
-// Copyright (C) 2007 M.Sutton (sutt@cern.ch)
//
// $Id: RPC_RegionSelectorTable.h, v0.0 Tue 4 Aug 2009 16:34:52 BST sutt $
diff --git a/MuonSpectrometer/MuonDetDescr/MuonRegionSelector/MuonRegionSelector/TGC_RegionSelectorTable.h b/MuonSpectrometer/MuonDetDescr/MuonRegionSelector/MuonRegionSelector/TGC_RegionSelectorTable.h
index f90f5dd7d39a579e977a277bcd08a3e07ca37ad6..2fc641480c2caecc797e3cfd2b8dc02a8d5c2349 100644
--- a/MuonSpectrometer/MuonDetDescr/MuonRegionSelector/MuonRegionSelector/TGC_RegionSelectorTable.h
+++ b/MuonSpectrometer/MuonDetDescr/MuonRegionSelector/MuonRegionSelector/TGC_RegionSelectorTable.h
@@ -1,10 +1,12 @@
// emacs: this is -*- c++ -*-
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
//
// @file TGC_RegionSelectorTable.h
//
//
//
-// Copyright (C) 2007 M.Sutton (sutt@cern.ch)
//
// $Id: TGC_RegionSelectorTable.h, v0.0 Tue 4 Aug 2009 16:34:52 BST sutt $
diff --git a/MuonSpectrometer/MuonDetDescr/MuonRegionSelector/src/CSC_RegionSelectorTable.cxx b/MuonSpectrometer/MuonDetDescr/MuonRegionSelector/src/CSC_RegionSelectorTable.cxx
index 68b7d26d6b72dfd98024c4116457c7325745e0c6..5661f9a41ff3cfbf932b953826050aa274b0fdf9 100644
--- a/MuonSpectrometer/MuonDetDescr/MuonRegionSelector/src/CSC_RegionSelectorTable.cxx
+++ b/MuonSpectrometer/MuonDetDescr/MuonRegionSelector/src/CSC_RegionSelectorTable.cxx
@@ -1,10 +1,12 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
//
// @file CSC_RegionSelectorTable.cxx
//
//
//
//
-// Copyright (C) 2007 M.Sutton (sutt@cern.ch)
//
// $Id: CSC_RegionSelectorTable.cxx, v0.0 Tue 4 Aug 2009 16:38:38 BST sutt $
diff --git a/MuonSpectrometer/MuonDetDescr/MuonRegionSelector/src/MDT_RegionSelectorTable.cxx b/MuonSpectrometer/MuonDetDescr/MuonRegionSelector/src/MDT_RegionSelectorTable.cxx
index 17754e0a30562da60887e944c23dc80952272b04..c60ae80e83aa6d3c72a453c19f6158a572a6acd2 100644
--- a/MuonSpectrometer/MuonDetDescr/MuonRegionSelector/src/MDT_RegionSelectorTable.cxx
+++ b/MuonSpectrometer/MuonDetDescr/MuonRegionSelector/src/MDT_RegionSelectorTable.cxx
@@ -1,10 +1,12 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
//
// @file MDT_RegionSelectorTable.cxx
//
//
//
//
-// Copyright (C) 2007 M.Sutton (sutt@cern.ch)
//
// $Id: MDT_RegionSelectorTable.cxx, v0.0 Tue 4 Aug 2009 16:38:38 BST sutt $
diff --git a/MuonSpectrometer/MuonDetDescr/MuonRegionSelector/src/RPC_RegSelLUT.cxx b/MuonSpectrometer/MuonDetDescr/MuonRegionSelector/src/RPC_RegSelLUT.cxx
index a67d836bcc4593080d4713e826aebc59f650aa4e..4030e41a4078f4f4adf80c4aba4358d6f1a3948a 100644
--- a/MuonSpectrometer/MuonDetDescr/MuonRegionSelector/src/RPC_RegSelLUT.cxx
+++ b/MuonSpectrometer/MuonDetDescr/MuonRegionSelector/src/RPC_RegSelLUT.cxx
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
#include "MuonRegionSelector/RPC_RegSelLUT.h"
diff --git a/MuonSpectrometer/MuonDetDescr/MuonRegionSelector/src/RPC_RegionSelectorTable.cxx b/MuonSpectrometer/MuonDetDescr/MuonRegionSelector/src/RPC_RegionSelectorTable.cxx
index a793d71da659a0c4e963368b00fe85c58fbe8c49..850400e7649c0ef16da0105d1bc16f57a6551108 100644
--- a/MuonSpectrometer/MuonDetDescr/MuonRegionSelector/src/RPC_RegionSelectorTable.cxx
+++ b/MuonSpectrometer/MuonDetDescr/MuonRegionSelector/src/RPC_RegionSelectorTable.cxx
@@ -1,10 +1,12 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
//
// @file RPC_RegionSelectorTable.cxx
//
//
//
//
-// Copyright (C) 2007 M.Sutton (sutt@cern.ch)
//
// $Id: RPC_RegionSelectorTable.cxx, v0.0 Tue 4 Aug 2009 16:38:38 BST sutt $
diff --git a/MuonSpectrometer/MuonDetDescr/MuonRegionSelector/src/TGC_RegionSelectorTable.cxx b/MuonSpectrometer/MuonDetDescr/MuonRegionSelector/src/TGC_RegionSelectorTable.cxx
index 91f8e6ae5e782127a760b8209172ce85273f6e4f..34aae77e9ab7fa5643566ad9a5557385ef8b0a03 100644
--- a/MuonSpectrometer/MuonDetDescr/MuonRegionSelector/src/TGC_RegionSelectorTable.cxx
+++ b/MuonSpectrometer/MuonDetDescr/MuonRegionSelector/src/TGC_RegionSelectorTable.cxx
@@ -1,10 +1,12 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
//
// @file TGC_RegionSelectorTable.cxx
//
//
//
//
-// Copyright (x1C) 2007 M.Sutton (sutt@cern.ch)
//
// $Id: TGC_RegionSelectorTable.cxx, v0.0 Tue 4 Aug 2009 16:38:38 BST sutt $
diff --git a/MuonSpectrometer/MuonReconstruction/MuonSegmentMakers/MuonSegmentMakerTools/MuonPatternSegmentMaker/MuonPatternSegmentMaker/MuonPatternCalibration.h b/MuonSpectrometer/MuonReconstruction/MuonSegmentMakers/MuonSegmentMakerTools/MuonPatternSegmentMaker/MuonPatternSegmentMaker/MuonPatternCalibration.h
index 7d037516efa7a45746548597d487d7cbcbdffeee..0d92f11d32c74ab1777e474c494fc0d9252553bc 100644
--- a/MuonSpectrometer/MuonReconstruction/MuonSegmentMakers/MuonSegmentMakerTools/MuonPatternSegmentMaker/MuonPatternSegmentMaker/MuonPatternCalibration.h
+++ b/MuonSpectrometer/MuonReconstruction/MuonSegmentMakers/MuonSegmentMakerTools/MuonPatternSegmentMaker/MuonPatternSegmentMaker/MuonPatternCalibration.h
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
#ifndef MUON_MUONPATTERNCALIBRATION_H
#define MUON_MUONPATTERNCALIBRATION_H
diff --git a/MuonSpectrometer/MuonReconstruction/MuonSegmentMakers/MuonSegmentMakerTools/MuonPatternSegmentMaker/MuonPatternSegmentMaker/MuonPatternSegmentMaker.h b/MuonSpectrometer/MuonReconstruction/MuonSegmentMakers/MuonSegmentMakerTools/MuonPatternSegmentMaker/MuonPatternSegmentMaker/MuonPatternSegmentMaker.h
index 4229755c7d5c08f7805488614e1caae955309342..7a3a84e6d1134849f4e441603b76e95fd488e3bb 100644
--- a/MuonSpectrometer/MuonReconstruction/MuonSegmentMakers/MuonSegmentMakerTools/MuonPatternSegmentMaker/MuonPatternSegmentMaker/MuonPatternSegmentMaker.h
+++ b/MuonSpectrometer/MuonReconstruction/MuonSegmentMakers/MuonSegmentMakerTools/MuonPatternSegmentMaker/MuonPatternSegmentMaker/MuonPatternSegmentMaker.h
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
#ifndef MUON_MUONPATTERNSEGMENTMAKER_MUONPATTERNSEGMENTMAKER_H
#define MUON_MUONPATTERNSEGMENTMAKER_MUONPATTERNSEGMENTMAKER_H
diff --git a/MuonSpectrometer/MuonReconstruction/MuonSegmentMakers/MuonSegmentMakerTools/MuonPatternSegmentMaker/src/MuonPatternCalibration.cxx b/MuonSpectrometer/MuonReconstruction/MuonSegmentMakers/MuonSegmentMakerTools/MuonPatternSegmentMaker/src/MuonPatternCalibration.cxx
index 3ee3660c383c39fefe5ddba0389b124c6fb553b1..f9b0e89d543e4ed376964b358b96b392840a5a57 100644
--- a/MuonSpectrometer/MuonReconstruction/MuonSegmentMakers/MuonSegmentMakerTools/MuonPatternSegmentMaker/src/MuonPatternCalibration.cxx
+++ b/MuonSpectrometer/MuonReconstruction/MuonSegmentMakers/MuonSegmentMakerTools/MuonPatternSegmentMaker/src/MuonPatternCalibration.cxx
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
#include "MuonPatternSegmentMaker/MuonPatternCalibration.h"
#include "MuonRecHelperTools/MuonEDMPrinterTool.h"
diff --git a/MuonSpectrometer/MuonReconstruction/MuonSegmentMakers/MuonSegmentMakerTools/MuonPatternSegmentMaker/src/MuonPatternSegmentMaker.cxx b/MuonSpectrometer/MuonReconstruction/MuonSegmentMakers/MuonSegmentMakerTools/MuonPatternSegmentMaker/src/MuonPatternSegmentMaker.cxx
index bfdb26db2a3c9935d624299432c730471106ecd2..cdd900833f0de94419b7bd024904d4916cd06f73 100644
--- a/MuonSpectrometer/MuonReconstruction/MuonSegmentMakers/MuonSegmentMakerTools/MuonPatternSegmentMaker/src/MuonPatternSegmentMaker.cxx
+++ b/MuonSpectrometer/MuonReconstruction/MuonSegmentMakers/MuonSegmentMakerTools/MuonPatternSegmentMaker/src/MuonPatternSegmentMaker.cxx
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
#include "MuonPatternSegmentMaker/MuonPatternSegmentMaker.h"
#include "MuonRecHelperTools/MuonEDMPrinterTool.h"
diff --git a/MuonSpectrometer/MuonValidation/MuonPRDTest/macros/NSWHitsTree.c b/MuonSpectrometer/MuonValidation/MuonPRDTest/macros/NSWHitsTree.c
index 8e3c234fc74583122fdfb9c17684e0118b5533aa..26fc2ef1cde0e240415f0c77e58bbcd310d8221b 100644
--- a/MuonSpectrometer/MuonValidation/MuonPRDTest/macros/NSWHitsTree.c
+++ b/MuonSpectrometer/MuonValidation/MuonPRDTest/macros/NSWHitsTree.c
@@ -1,8 +1,10 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
//
// NSWHitsTree.c
//
// Created by Ourania Sidiropoulou on 1/03/2013.
-// Copyright (c) 2013 CERN - PH/ADE. All rights reserved.
//
#define NSWHitsTree_cxx
diff --git a/MuonSpectrometer/MuonValidation/MuonPRDTest/test/NSWHitsTree.c b/MuonSpectrometer/MuonValidation/MuonPRDTest/test/NSWHitsTree.c
index 1dd5f99f8350896bb5565c8a48f91f58d508abbf..ea7d8f79d331fb2aea443640f55040625a090712 100644
--- a/MuonSpectrometer/MuonValidation/MuonPRDTest/test/NSWHitsTree.c
+++ b/MuonSpectrometer/MuonValidation/MuonPRDTest/test/NSWHitsTree.c
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
/*
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
diff --git a/MuonSpectrometer/MuonValidation/MuonSimValUtils/MuonSimValUtils/MuonChamberNameConverter.h b/MuonSpectrometer/MuonValidation/MuonSimValUtils/MuonSimValUtils/MuonChamberNameConverter.h
index 6d016ed8db3884feccb133a969aa45ee6c01b120..aef40ac1c3f609332b1e7301a0597aca55fa0692 100755
--- a/MuonSpectrometer/MuonValidation/MuonSimValUtils/MuonSimValUtils/MuonChamberNameConverter.h
+++ b/MuonSpectrometer/MuonValidation/MuonSimValUtils/MuonSimValUtils/MuonChamberNameConverter.h
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
#ifndef MUONCHAMBERNAMECONVERTER_H
#define MUONCHAMBERNAMECONVERTER_H
diff --git a/MuonSpectrometer/MuonValidation/MuonSimValUtils/MuonSimValUtils/MuonChambersRange.h b/MuonSpectrometer/MuonValidation/MuonSimValUtils/MuonSimValUtils/MuonChambersRange.h
index 7b97ae4ca9c1379e484a813159c9fd597ed6d125..ae1e14bed9079e78cd6f1122eafac02e3628f482 100755
--- a/MuonSpectrometer/MuonValidation/MuonSimValUtils/MuonSimValUtils/MuonChambersRange.h
+++ b/MuonSpectrometer/MuonValidation/MuonSimValUtils/MuonSimValUtils/MuonChambersRange.h
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
#ifndef MUONCHAMBERSRANGE_H
#define MUONCHAMBERSRANGE_H
diff --git a/MuonSpectrometer/MuonValidation/MuonSimValUtils/MuonSimValUtils/MuonIntToStrName.h b/MuonSpectrometer/MuonValidation/MuonSimValUtils/MuonSimValUtils/MuonIntToStrName.h
index 678eff35b72ab19b5d367568b25c84e111b43be7..77ec208b2e46c17ae81de995e0efb0082462983a 100755
--- a/MuonSpectrometer/MuonValidation/MuonSimValUtils/MuonSimValUtils/MuonIntToStrName.h
+++ b/MuonSpectrometer/MuonValidation/MuonSimValUtils/MuonSimValUtils/MuonIntToStrName.h
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
#ifndef MUONSTRTOINTNAME_H
#define MUONSTRTOINTNAME_H
diff --git a/MuonSpectrometer/MuonValidation/MuonSimValUtils/MuonSimValUtils/MuonStrToIntName.h b/MuonSpectrometer/MuonValidation/MuonSimValUtils/MuonSimValUtils/MuonStrToIntName.h
index 019e48d4b009b3b5fc8537cdd20510b458f4a769..89b8e0a95bf3622ed97ad47b941c5aa707de7559 100755
--- a/MuonSpectrometer/MuonValidation/MuonSimValUtils/MuonSimValUtils/MuonStrToIntName.h
+++ b/MuonSpectrometer/MuonValidation/MuonSimValUtils/MuonSimValUtils/MuonStrToIntName.h
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
#ifndef MUONSTRTOINTNAME_H
#define MUONSTRTOINTNAME_H
diff --git a/MuonSpectrometer/MuonValidation/MuonSimValUtils/src/MuonChamberNameConverter.cxx b/MuonSpectrometer/MuonValidation/MuonSimValUtils/src/MuonChamberNameConverter.cxx
index 546c5fd77bf7c9285d9a742c403a3914ae9b141d..ff7981c6a7c828c6c99496d76648146dba16e14a 100755
--- a/MuonSpectrometer/MuonValidation/MuonSimValUtils/src/MuonChamberNameConverter.cxx
+++ b/MuonSpectrometer/MuonValidation/MuonSimValUtils/src/MuonChamberNameConverter.cxx
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
#include "MuonSimValUtils/MuonChamberNameConverter.h"
#include <cstdlib>
diff --git a/MuonSpectrometer/MuonValidation/MuonSimValUtils/src/MuonChambersRange.cxx b/MuonSpectrometer/MuonValidation/MuonSimValUtils/src/MuonChambersRange.cxx
index 9646809e725bd02b4afad849074a9bcea8577e50..36b5103f8980a3c91bd41a0b974a6cdf7cd303d7 100755
--- a/MuonSpectrometer/MuonValidation/MuonSimValUtils/src/MuonChambersRange.cxx
+++ b/MuonSpectrometer/MuonValidation/MuonSimValUtils/src/MuonChambersRange.cxx
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
#include "MuonSimValUtils/MuonChambersRange.h"
#include <cstdlib>
diff --git a/MuonSpectrometer/MuonValidation/MuonSimValUtils/src/MuonIntToStrName.cxx b/MuonSpectrometer/MuonValidation/MuonSimValUtils/src/MuonIntToStrName.cxx
index 668c5a8554916dc7822a1d00fab09a54e0a5951c..33b000994c770af69e4464b9b0db73291519e9f1 100755
--- a/MuonSpectrometer/MuonValidation/MuonSimValUtils/src/MuonIntToStrName.cxx
+++ b/MuonSpectrometer/MuonValidation/MuonSimValUtils/src/MuonIntToStrName.cxx
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
#include "MuonSimValUtils/MuonStrToIntName.h"
using namespace std;
diff --git a/MuonSpectrometer/MuonValidation/MuonSimValUtils/src/MuonStrToIntName.cxx b/MuonSpectrometer/MuonValidation/MuonSimValUtils/src/MuonStrToIntName.cxx
index 26c2c9289b81e8d63dcf97edb979f0a6fb5c1fa7..71c907f5a0574b2adc5d3c9ab5d1572caca5638c 100755
--- a/MuonSpectrometer/MuonValidation/MuonSimValUtils/src/MuonStrToIntName.cxx
+++ b/MuonSpectrometer/MuonValidation/MuonSimValUtils/src/MuonStrToIntName.cxx
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
#include "MuonSimValUtils/MuonStrToIntName.h"
using namespace std;
diff --git a/PhysicsAnalysis/AnalysisCommon/AssociationUtils/AssociationUtils/AltMuJetOverlapTool.h b/PhysicsAnalysis/AnalysisCommon/AssociationUtils/AssociationUtils/AltMuJetOverlapTool.h
index e8471787512e657eeee541d227f97a4abfaeef32..ccda06622e3933203630d0f18ded78c1b543f619 100644
--- a/PhysicsAnalysis/AnalysisCommon/AssociationUtils/AssociationUtils/AltMuJetOverlapTool.h
+++ b/PhysicsAnalysis/AnalysisCommon/AssociationUtils/AssociationUtils/AltMuJetOverlapTool.h
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
#ifndef ASSOCIATIONUTILS_ALTMUJETOVERLAPTOOL_H
#define ASSOCIATIONUTILS_ALTMUJETOVERLAPTOOL_H
diff --git a/PhysicsAnalysis/AnalysisCommon/AssociationUtils/AssociationUtils/BJetHelper.h b/PhysicsAnalysis/AnalysisCommon/AssociationUtils/AssociationUtils/BJetHelper.h
index 35020c3bda1f0362e02fd54d37427d448efa7946..f888152f590f61da488b6106a0735f93b3b44289 100644
--- a/PhysicsAnalysis/AnalysisCommon/AssociationUtils/AssociationUtils/BJetHelper.h
+++ b/PhysicsAnalysis/AnalysisCommon/AssociationUtils/AssociationUtils/BJetHelper.h
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
#ifndef ASSOCIATIONUTILS_BJETHELPER_H
#define ASSOCIATIONUTILS_BJETHELPER_H
diff --git a/PhysicsAnalysis/AnalysisCommon/AssociationUtils/AssociationUtils/BaseOverlapTool.h b/PhysicsAnalysis/AnalysisCommon/AssociationUtils/AssociationUtils/BaseOverlapTool.h
index 450f6ae9963dbfe475327c5fc513db6abf14f9c3..6e8c507772e4d3ff2d41fe7507d301f7f3638f63 100644
--- a/PhysicsAnalysis/AnalysisCommon/AssociationUtils/AssociationUtils/BaseOverlapTool.h
+++ b/PhysicsAnalysis/AnalysisCommon/AssociationUtils/AssociationUtils/BaseOverlapTool.h
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
#ifndef ASSOCIATIONUTILS_BASEOVERLAPTOOL_H
#define ASSOCIATIONUTILS_BASEOVERLAPTOOL_H
diff --git a/PhysicsAnalysis/AnalysisCommon/AssociationUtils/AssociationUtils/DeltaRMatcher.h b/PhysicsAnalysis/AnalysisCommon/AssociationUtils/AssociationUtils/DeltaRMatcher.h
index 5c6d202627c8d23a565f1026b0e1b6377ab4ccbf..355ab3549b53827a26c6b9e12c998420ff4f4ac2 100644
--- a/PhysicsAnalysis/AnalysisCommon/AssociationUtils/AssociationUtils/DeltaRMatcher.h
+++ b/PhysicsAnalysis/AnalysisCommon/AssociationUtils/AssociationUtils/DeltaRMatcher.h
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
#ifndef ASSOCIATIONUTILS_DELTARMATCHER_H
#define ASSOCIATIONUTILS_DELTARMATCHER_H
diff --git a/PhysicsAnalysis/AnalysisCommon/AssociationUtils/AssociationUtils/DeltaROverlapTool.h b/PhysicsAnalysis/AnalysisCommon/AssociationUtils/AssociationUtils/DeltaROverlapTool.h
index 3486aa484834b50cd97e853888d0727f5dfd66ae..8a8029556cf6b62f2f5b043f348bccd726a3d14f 100644
--- a/PhysicsAnalysis/AnalysisCommon/AssociationUtils/AssociationUtils/DeltaROverlapTool.h
+++ b/PhysicsAnalysis/AnalysisCommon/AssociationUtils/AssociationUtils/DeltaROverlapTool.h
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
#ifndef ASSOCIATIONUTILS_OVERLAPTOOLDR_H
#define ASSOCIATIONUTILS_OVERLAPTOOLDR_H
diff --git a/PhysicsAnalysis/AnalysisCommon/AssociationUtils/AssociationUtils/EleEleOverlapTool.h b/PhysicsAnalysis/AnalysisCommon/AssociationUtils/AssociationUtils/EleEleOverlapTool.h
index 51b264a12d0ce56316fc69b9b73ce843611d3b66..714f84640a14678c22278813d9182bd19ac5ef36 100644
--- a/PhysicsAnalysis/AnalysisCommon/AssociationUtils/AssociationUtils/EleEleOverlapTool.h
+++ b/PhysicsAnalysis/AnalysisCommon/AssociationUtils/AssociationUtils/EleEleOverlapTool.h
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
#ifndef ASSOCIATIONUTILS_ELEELEOVERLAPTOOL_H
#define ASSOCIATIONUTILS_ELEELEOVERLAPTOOL_H
diff --git a/PhysicsAnalysis/AnalysisCommon/AssociationUtils/AssociationUtils/EleJetOverlapTool.h b/PhysicsAnalysis/AnalysisCommon/AssociationUtils/AssociationUtils/EleJetOverlapTool.h
index ed614abe108d08ba0aeb26cf2d7a1e80c844b430..b1808b22b37dbf0a536fca0c6c3b770cd766f3da 100644
--- a/PhysicsAnalysis/AnalysisCommon/AssociationUtils/AssociationUtils/EleJetOverlapTool.h
+++ b/PhysicsAnalysis/AnalysisCommon/AssociationUtils/AssociationUtils/EleJetOverlapTool.h
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
#ifndef ASSOCIATIONUTILS_ELEJETOVERLAPTOOL_H
#define ASSOCIATIONUTILS_ELEJETOVERLAPTOOL_H
diff --git a/PhysicsAnalysis/AnalysisCommon/AssociationUtils/AssociationUtils/EleMuSharedTrkOverlapTool.h b/PhysicsAnalysis/AnalysisCommon/AssociationUtils/AssociationUtils/EleMuSharedTrkOverlapTool.h
index 9baa2d07e42d7e5077680792faa7cb42f979bf5e..0345e7b2d4bacc0c29559fe709dc46e4cadfbf5d 100644
--- a/PhysicsAnalysis/AnalysisCommon/AssociationUtils/AssociationUtils/EleMuSharedTrkOverlapTool.h
+++ b/PhysicsAnalysis/AnalysisCommon/AssociationUtils/AssociationUtils/EleMuSharedTrkOverlapTool.h
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
#ifndef ASSOCIATIONUTILS_SHAREDTRKOVERLAPTOOL_H
#define ASSOCIATIONUTILS_SHAREDTRKOVERLAPTOOL_H
diff --git a/PhysicsAnalysis/AnalysisCommon/AssociationUtils/AssociationUtils/IObjectAssociator.h b/PhysicsAnalysis/AnalysisCommon/AssociationUtils/AssociationUtils/IObjectAssociator.h
index 2c29ef3ef99429de81a6292ef4e7067beed7c26e..5db21b79844b93ac0642630fda4fd53f9cd5d0f9 100644
--- a/PhysicsAnalysis/AnalysisCommon/AssociationUtils/AssociationUtils/IObjectAssociator.h
+++ b/PhysicsAnalysis/AnalysisCommon/AssociationUtils/AssociationUtils/IObjectAssociator.h
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
#ifndef ASSOCIATIONUTILS_IOBJECTASSOCIATOR_H
#define ASSOCIATIONUTILS_IOBJECTASSOCIATOR_H
diff --git a/PhysicsAnalysis/AnalysisCommon/AssociationUtils/AssociationUtils/IOverlapRemovalTool.h b/PhysicsAnalysis/AnalysisCommon/AssociationUtils/AssociationUtils/IOverlapRemovalTool.h
index e704a19e7b7c69f80f442be2935ff5204eb4712c..160bfccdc7b66d495eee3f5bd19e1361726ba472 100644
--- a/PhysicsAnalysis/AnalysisCommon/AssociationUtils/AssociationUtils/IOverlapRemovalTool.h
+++ b/PhysicsAnalysis/AnalysisCommon/AssociationUtils/AssociationUtils/IOverlapRemovalTool.h
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
#ifndef ASSOCIATIONUTILS_IOVERLAPREMOVALTOOL2_H
#define ASSOCIATIONUTILS_IOVERLAPREMOVALTOOL2_H
diff --git a/PhysicsAnalysis/AnalysisCommon/AssociationUtils/AssociationUtils/IOverlapRemovalToolLegacy.h b/PhysicsAnalysis/AnalysisCommon/AssociationUtils/AssociationUtils/IOverlapRemovalToolLegacy.h
index 3d89860899dab16d7878a3eeed7ddf59ae228583..d7e56186f01fc036b1095d12eea27343815e7760 100644
--- a/PhysicsAnalysis/AnalysisCommon/AssociationUtils/AssociationUtils/IOverlapRemovalToolLegacy.h
+++ b/PhysicsAnalysis/AnalysisCommon/AssociationUtils/AssociationUtils/IOverlapRemovalToolLegacy.h
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
#ifndef ASSOCIATIONUTILS_IOVERLAPREMOVALTOOL_H
#define ASSOCIATIONUTILS_IOVERLAPREMOVALTOOL_H
diff --git a/PhysicsAnalysis/AnalysisCommon/AssociationUtils/AssociationUtils/IOverlapTool.h b/PhysicsAnalysis/AnalysisCommon/AssociationUtils/AssociationUtils/IOverlapTool.h
index 4dfab2204644aad89c2435c24de172970d3240b8..946d1451375350802df63e69471843b891de2f35 100644
--- a/PhysicsAnalysis/AnalysisCommon/AssociationUtils/AssociationUtils/IOverlapTool.h
+++ b/PhysicsAnalysis/AnalysisCommon/AssociationUtils/AssociationUtils/IOverlapTool.h
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
#ifndef ASSOCIATIONUTILS_IOVERLAPTOOL_H
#define ASSOCIATIONUTILS_IOVERLAPTOOL_H
diff --git a/PhysicsAnalysis/AnalysisCommon/AssociationUtils/AssociationUtils/MacroChecks.h b/PhysicsAnalysis/AnalysisCommon/AssociationUtils/AssociationUtils/MacroChecks.h
index 1d76d7c794e4901cc2f63bc3f7588459a6f3baa1..683dc97b1bf9004eee9cdefc8e42f893e60dab46 100644
--- a/PhysicsAnalysis/AnalysisCommon/AssociationUtils/AssociationUtils/MacroChecks.h
+++ b/PhysicsAnalysis/AnalysisCommon/AssociationUtils/AssociationUtils/MacroChecks.h
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
#ifndef ASSOCIATIONUTILS_MACROCHECKS_H
#define ASSOCIATIONUTILS_MACROCHECKS_H
diff --git a/PhysicsAnalysis/AnalysisCommon/AssociationUtils/AssociationUtils/MuJetGhostDRMatcher.h b/PhysicsAnalysis/AnalysisCommon/AssociationUtils/AssociationUtils/MuJetGhostDRMatcher.h
index 7e30dbb035425389ed4e7cbf514aac1eac907644..205eefa1851782b08883d7104d89bcaa0d32daba 100644
--- a/PhysicsAnalysis/AnalysisCommon/AssociationUtils/AssociationUtils/MuJetGhostDRMatcher.h
+++ b/PhysicsAnalysis/AnalysisCommon/AssociationUtils/AssociationUtils/MuJetGhostDRMatcher.h
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
#ifndef ASSOCIATIONUTILS_MUJETGHOSTMATCHER_H
#define ASSOCIATIONUTILS_MUJETGHOSTMATCHER_H
diff --git a/PhysicsAnalysis/AnalysisCommon/AssociationUtils/AssociationUtils/MuJetOverlapTool.h b/PhysicsAnalysis/AnalysisCommon/AssociationUtils/AssociationUtils/MuJetOverlapTool.h
index e4b33bcb917c65888875629cdf506dc9fb9125ab..5d779cee00bacf6ce1f03c023577c66abee881ac 100644
--- a/PhysicsAnalysis/AnalysisCommon/AssociationUtils/AssociationUtils/MuJetOverlapTool.h
+++ b/PhysicsAnalysis/AnalysisCommon/AssociationUtils/AssociationUtils/MuJetOverlapTool.h
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
#ifndef ASSOCIATIONUTILS_MUJETOVERLAPTOOL_H
#define ASSOCIATIONUTILS_MUJETOVERLAPTOOL_H
diff --git a/PhysicsAnalysis/AnalysisCommon/AssociationUtils/AssociationUtils/ORToolBox.h b/PhysicsAnalysis/AnalysisCommon/AssociationUtils/AssociationUtils/ORToolBox.h
index 3d9125d89624248d058754fdac2af72791046724..8dd068ec2bdeeb290c4f6db282c74c357a812a6f 100644
--- a/PhysicsAnalysis/AnalysisCommon/AssociationUtils/AssociationUtils/ORToolBox.h
+++ b/PhysicsAnalysis/AnalysisCommon/AssociationUtils/AssociationUtils/ORToolBox.h
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
#ifndef ASSOCIATIONUTILS_ORTOOLBOX_H
#define ASSOCIATIONUTILS_ORTOOLBOX_H
diff --git a/PhysicsAnalysis/AnalysisCommon/AssociationUtils/AssociationUtils/ObjLinkOverlapTool.h b/PhysicsAnalysis/AnalysisCommon/AssociationUtils/AssociationUtils/ObjLinkOverlapTool.h
index 53679c7a88e288490188fffe7d81b30a1fda16ff..ae7ab7ea9c38c1247507fb2660ede939883a5c61 100644
--- a/PhysicsAnalysis/AnalysisCommon/AssociationUtils/AssociationUtils/ObjLinkOverlapTool.h
+++ b/PhysicsAnalysis/AnalysisCommon/AssociationUtils/AssociationUtils/ObjLinkOverlapTool.h
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
#ifndef ASSOCIATIONUTILS_OBJLINKOVERLAPTOOL_H
#define ASSOCIATIONUTILS_OBJLINKOVERLAPTOOL_H
diff --git a/PhysicsAnalysis/AnalysisCommon/AssociationUtils/AssociationUtils/OverlapDecorationHelper.h b/PhysicsAnalysis/AnalysisCommon/AssociationUtils/AssociationUtils/OverlapDecorationHelper.h
index 80894685185428033d6a0bb9c1a0084a4f1803d9..6f9f6ae7d20aa79e17b3742658c69df7bfd587b8 100644
--- a/PhysicsAnalysis/AnalysisCommon/AssociationUtils/AssociationUtils/OverlapDecorationHelper.h
+++ b/PhysicsAnalysis/AnalysisCommon/AssociationUtils/AssociationUtils/OverlapDecorationHelper.h
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
#ifndef ASSOCIATIONUTILS_OVERLAPDECORATIONHELPER_H
#define ASSOCIATIONUTILS_OVERLAPDECORATIONHELPER_H
diff --git a/PhysicsAnalysis/AnalysisCommon/AssociationUtils/AssociationUtils/OverlapLinkHelper.h b/PhysicsAnalysis/AnalysisCommon/AssociationUtils/AssociationUtils/OverlapLinkHelper.h
index b47a393cab48e862aa0da1ee0e8bb0af0e4989ee..2bc506f08dbe81b9467af83f9695dc7b7d81e5c7 100644
--- a/PhysicsAnalysis/AnalysisCommon/AssociationUtils/AssociationUtils/OverlapLinkHelper.h
+++ b/PhysicsAnalysis/AnalysisCommon/AssociationUtils/AssociationUtils/OverlapLinkHelper.h
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
#ifndef ASSOCIATIONUTILS_OVERLAPLINKHELPER_H
#define ASSOCIATIONUTILS_OVERLAPLINKHELPER_H
diff --git a/PhysicsAnalysis/AnalysisCommon/AssociationUtils/AssociationUtils/OverlapRemovalDefs.h b/PhysicsAnalysis/AnalysisCommon/AssociationUtils/AssociationUtils/OverlapRemovalDefs.h
index f4da83a5bf781c492644414990f4b57e55c4066e..b9c1ad05630271d30f2a0e151614f282dcbd8aed 100644
--- a/PhysicsAnalysis/AnalysisCommon/AssociationUtils/AssociationUtils/OverlapRemovalDefs.h
+++ b/PhysicsAnalysis/AnalysisCommon/AssociationUtils/AssociationUtils/OverlapRemovalDefs.h
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
#ifndef ASSOCIATIONUTILS_OVERLAPREMOVALDEFS_H
#define ASSOCIATIONUTILS_OVERLAPREMOVALDEFS_H
diff --git a/PhysicsAnalysis/AnalysisCommon/AssociationUtils/AssociationUtils/OverlapRemovalInit.h b/PhysicsAnalysis/AnalysisCommon/AssociationUtils/AssociationUtils/OverlapRemovalInit.h
index 43b356c1ab70397796826165c678a3df3f3112b4..b40e325f2f44ae8147f4e9a07e04294eafbf105a 100644
--- a/PhysicsAnalysis/AnalysisCommon/AssociationUtils/AssociationUtils/OverlapRemovalInit.h
+++ b/PhysicsAnalysis/AnalysisCommon/AssociationUtils/AssociationUtils/OverlapRemovalInit.h
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
#ifndef ASSOCIATIONUTILS_OVERLAPREMOVALINIT_H
#define ASSOCIATIONUTILS_OVERLAPREMOVALINIT_H
diff --git a/PhysicsAnalysis/AnalysisCommon/AssociationUtils/AssociationUtils/OverlapRemovalTool.h b/PhysicsAnalysis/AnalysisCommon/AssociationUtils/AssociationUtils/OverlapRemovalTool.h
index 3e02460f1f09887e35f4ffcad24c606b989607fb..1ced8868109189dd078ef36bfe055e424743b0cf 100644
--- a/PhysicsAnalysis/AnalysisCommon/AssociationUtils/AssociationUtils/OverlapRemovalTool.h
+++ b/PhysicsAnalysis/AnalysisCommon/AssociationUtils/AssociationUtils/OverlapRemovalTool.h
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
#ifndef ASSOCIATIONUTILS_OVERLAPREMOVALTOOL2_H
#define ASSOCIATIONUTILS_OVERLAPREMOVALTOOL2_H
diff --git a/PhysicsAnalysis/AnalysisCommon/AssociationUtils/AssociationUtils/OverlapRemovalToolLegacy.h b/PhysicsAnalysis/AnalysisCommon/AssociationUtils/AssociationUtils/OverlapRemovalToolLegacy.h
index 094187274cab7372cc7d2a0c45acb054b75b4e6e..6f75cc5ca9cb5839552d552b8e8ff002944fd042 100644
--- a/PhysicsAnalysis/AnalysisCommon/AssociationUtils/AssociationUtils/OverlapRemovalToolLegacy.h
+++ b/PhysicsAnalysis/AnalysisCommon/AssociationUtils/AssociationUtils/OverlapRemovalToolLegacy.h
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
#ifndef ASSOCIATIONUTILS_OVERLAPREMOVALTOOL_H
#define ASSOCIATIONUTILS_OVERLAPREMOVALTOOL_H
diff --git a/PhysicsAnalysis/AnalysisCommon/AssociationUtils/AssociationUtils/TauAntiTauJetOverlapTool.h b/PhysicsAnalysis/AnalysisCommon/AssociationUtils/AssociationUtils/TauAntiTauJetOverlapTool.h
index d981469122c7c163d5e8c23ae063eac00d21e6e1..4f53f961e8d4d6a914ce5e79b0066d601ee6bccc 100644
--- a/PhysicsAnalysis/AnalysisCommon/AssociationUtils/AssociationUtils/TauAntiTauJetOverlapTool.h
+++ b/PhysicsAnalysis/AnalysisCommon/AssociationUtils/AssociationUtils/TauAntiTauJetOverlapTool.h
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
#ifndef ASSOCIATIONUTILS_TAU_ANTITAU_JET_OVERLAPTOOL_H
#define ASSOCIATIONUTILS_TAU_ANTITAU_JET_OVERLAPTOOL_H
diff --git a/PhysicsAnalysis/AnalysisCommon/AssociationUtils/AssociationUtils/TauJetOverlapTool.h b/PhysicsAnalysis/AnalysisCommon/AssociationUtils/AssociationUtils/TauJetOverlapTool.h
index 7affc6c5a6e7b3dc76fcb0c4535bb657490a51c5..958c524b268bb7de8795ea7f20b578f8868dcc92 100644
--- a/PhysicsAnalysis/AnalysisCommon/AssociationUtils/AssociationUtils/TauJetOverlapTool.h
+++ b/PhysicsAnalysis/AnalysisCommon/AssociationUtils/AssociationUtils/TauJetOverlapTool.h
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
#ifndef ASSOCIATIONUTILS_TAUJETOVERLAPTOOL_H
#define ASSOCIATIONUTILS_TAUJETOVERLAPTOOL_H
diff --git a/PhysicsAnalysis/AnalysisCommon/AssociationUtils/AssociationUtils/TauLooseEleOverlapTool.h b/PhysicsAnalysis/AnalysisCommon/AssociationUtils/AssociationUtils/TauLooseEleOverlapTool.h
index 4eec4ce61d8df70ffd2dae9f02cc61e220482235..d9a8db61e2a6b4f80a45e018ebe82a0348c5e542 100644
--- a/PhysicsAnalysis/AnalysisCommon/AssociationUtils/AssociationUtils/TauLooseEleOverlapTool.h
+++ b/PhysicsAnalysis/AnalysisCommon/AssociationUtils/AssociationUtils/TauLooseEleOverlapTool.h
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
#ifndef ASSOCIATIONUTILS_TAULOOSEELEOVERLAPTOOL_H
#define ASSOCIATIONUTILS_TAULOOSEELEOVERLAPTOOL_H
diff --git a/PhysicsAnalysis/AnalysisCommon/AssociationUtils/AssociationUtils/TauLooseMuOverlapTool.h b/PhysicsAnalysis/AnalysisCommon/AssociationUtils/AssociationUtils/TauLooseMuOverlapTool.h
index 3924243acbf83d3feafeee1f2bbf1b5ae5e778af..b0f82101c6dfc260a8aeceb2c5d3ed2ac552af06 100644
--- a/PhysicsAnalysis/AnalysisCommon/AssociationUtils/AssociationUtils/TauLooseMuOverlapTool.h
+++ b/PhysicsAnalysis/AnalysisCommon/AssociationUtils/AssociationUtils/TauLooseMuOverlapTool.h
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
#ifndef ASSOCIATIONUTILS_TAULOOSEMUOVERLAPTOOL_H
#define ASSOCIATIONUTILS_TAULOOSEMUOVERLAPTOOL_H
diff --git a/PhysicsAnalysis/AnalysisCommon/AssociationUtils/AssociationUtils/ToolBox.h b/PhysicsAnalysis/AnalysisCommon/AssociationUtils/AssociationUtils/ToolBox.h
index e6fb09c5d782fc26c9b7f48ed12676c53c8ed31b..ecddb9d71cce76a9aa5f22ee531184266056289e 100644
--- a/PhysicsAnalysis/AnalysisCommon/AssociationUtils/AssociationUtils/ToolBox.h
+++ b/PhysicsAnalysis/AnalysisCommon/AssociationUtils/AssociationUtils/ToolBox.h
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
#ifndef ASSOCIATIONUTILS_TOOLBOX_H
#define ASSOCIATIONUTILS_TOOLBOX_H
diff --git a/PhysicsAnalysis/AnalysisCommon/AssociationUtils/Root/AltMuJetOverlapTool.cxx b/PhysicsAnalysis/AnalysisCommon/AssociationUtils/Root/AltMuJetOverlapTool.cxx
index 3abcb4a9c2a8fb453ba4b027d18fde39cbd61f1d..6ec0e8a36a53b1dd0d42cfd15e150a2d49d4981d 100644
--- a/PhysicsAnalysis/AnalysisCommon/AssociationUtils/Root/AltMuJetOverlapTool.cxx
+++ b/PhysicsAnalysis/AnalysisCommon/AssociationUtils/Root/AltMuJetOverlapTool.cxx
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
// System includes
#include <typeinfo>
#include <limits>
diff --git a/PhysicsAnalysis/AnalysisCommon/AssociationUtils/Root/BJetHelper.cxx b/PhysicsAnalysis/AnalysisCommon/AssociationUtils/Root/BJetHelper.cxx
index 89ef8473d23496184f199cf1ebacfc484b7253a8..9ddcd1c6d9f6d025359ffcaf73d6f16fef3b8f35 100644
--- a/PhysicsAnalysis/AnalysisCommon/AssociationUtils/Root/BJetHelper.cxx
+++ b/PhysicsAnalysis/AnalysisCommon/AssociationUtils/Root/BJetHelper.cxx
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
// Local includes
#include "AssociationUtils/BJetHelper.h"
diff --git a/PhysicsAnalysis/AnalysisCommon/AssociationUtils/Root/BaseOverlapTool.cxx b/PhysicsAnalysis/AnalysisCommon/AssociationUtils/Root/BaseOverlapTool.cxx
index 28fc4ce1dfb8ace70c1bea6dccfac7f30cfe4cce..24c7f75af7a53fe55be418422da7f7c74692fbe6 100644
--- a/PhysicsAnalysis/AnalysisCommon/AssociationUtils/Root/BaseOverlapTool.cxx
+++ b/PhysicsAnalysis/AnalysisCommon/AssociationUtils/Root/BaseOverlapTool.cxx
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
// Framework includes
#include "CxxUtils/make_unique.h"
diff --git a/PhysicsAnalysis/AnalysisCommon/AssociationUtils/Root/DeltaRMatcher.cxx b/PhysicsAnalysis/AnalysisCommon/AssociationUtils/Root/DeltaRMatcher.cxx
index e7c03727f26cb73c2d40affa97f4e9ce30b30815..ee75a83eaf7b1f3168602d0f510657f141f901b7 100644
--- a/PhysicsAnalysis/AnalysisCommon/AssociationUtils/Root/DeltaRMatcher.cxx
+++ b/PhysicsAnalysis/AnalysisCommon/AssociationUtils/Root/DeltaRMatcher.cxx
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
// Framework includes
#include "FourMomUtils/xAODP4Helpers.h"
diff --git a/PhysicsAnalysis/AnalysisCommon/AssociationUtils/Root/DeltaROverlapTool.cxx b/PhysicsAnalysis/AnalysisCommon/AssociationUtils/Root/DeltaROverlapTool.cxx
index c04cfe124fe6ac78ef4d363d34d645e34d06127d..b591258a02ad222125dedf0a3edffd33af1e9048 100644
--- a/PhysicsAnalysis/AnalysisCommon/AssociationUtils/Root/DeltaROverlapTool.cxx
+++ b/PhysicsAnalysis/AnalysisCommon/AssociationUtils/Root/DeltaROverlapTool.cxx
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
// Primary include
#include "AssociationUtils/DeltaROverlapTool.h"
diff --git a/PhysicsAnalysis/AnalysisCommon/AssociationUtils/Root/EleEleOverlapTool.cxx b/PhysicsAnalysis/AnalysisCommon/AssociationUtils/Root/EleEleOverlapTool.cxx
index 54fa5e3ad7dc3bc7aeafb2c4e1659467894c2255..3fc0696d0d931e44cc5a3f0aff063633e2584c1e 100644
--- a/PhysicsAnalysis/AnalysisCommon/AssociationUtils/Root/EleEleOverlapTool.cxx
+++ b/PhysicsAnalysis/AnalysisCommon/AssociationUtils/Root/EleEleOverlapTool.cxx
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
// System includes
#include <typeinfo>
#include <exception>
diff --git a/PhysicsAnalysis/AnalysisCommon/AssociationUtils/Root/EleJetOverlapTool.cxx b/PhysicsAnalysis/AnalysisCommon/AssociationUtils/Root/EleJetOverlapTool.cxx
index 345adb390140010a51a15933c841c0452634de87..1629b209724ed3f71301466b59b59b709e1d9778 100644
--- a/PhysicsAnalysis/AnalysisCommon/AssociationUtils/Root/EleJetOverlapTool.cxx
+++ b/PhysicsAnalysis/AnalysisCommon/AssociationUtils/Root/EleJetOverlapTool.cxx
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
// System includes
#include <typeinfo>
diff --git a/PhysicsAnalysis/AnalysisCommon/AssociationUtils/Root/EleMuSharedTrkOverlapTool.cxx b/PhysicsAnalysis/AnalysisCommon/AssociationUtils/Root/EleMuSharedTrkOverlapTool.cxx
index 92d6d47470520d4dab9a586be9ab02f77723750c..ef9b464f1a392a06a47f4e64d90c5ef191c49c9c 100644
--- a/PhysicsAnalysis/AnalysisCommon/AssociationUtils/Root/EleMuSharedTrkOverlapTool.cxx
+++ b/PhysicsAnalysis/AnalysisCommon/AssociationUtils/Root/EleMuSharedTrkOverlapTool.cxx
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
// System includes
#include <typeinfo>
diff --git a/PhysicsAnalysis/AnalysisCommon/AssociationUtils/Root/LinkDef.h b/PhysicsAnalysis/AnalysisCommon/AssociationUtils/Root/LinkDef.h
index 0e993e6cdfa367c88409e014998120af48433d01..6de3cc4588024a5c4eaf39c222507bd40e1383ed 100644
--- a/PhysicsAnalysis/AnalysisCommon/AssociationUtils/Root/LinkDef.h
+++ b/PhysicsAnalysis/AnalysisCommon/AssociationUtils/Root/LinkDef.h
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
#ifndef ASSOCIATIONUTILS_LINKDEF_H
#define ASSOCIATIONUTILS_LINKDEF_H
diff --git a/PhysicsAnalysis/AnalysisCommon/AssociationUtils/Root/MuJetGhostDRMatcher.cxx b/PhysicsAnalysis/AnalysisCommon/AssociationUtils/Root/MuJetGhostDRMatcher.cxx
index a04903fc1a2f98a952f95ce8eefff8b9ab98183a..4ee3a33eb42f7839b93d5f5021eff28f72df32a4 100644
--- a/PhysicsAnalysis/AnalysisCommon/AssociationUtils/Root/MuJetGhostDRMatcher.cxx
+++ b/PhysicsAnalysis/AnalysisCommon/AssociationUtils/Root/MuJetGhostDRMatcher.cxx
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
// Infrastructure
#include "CxxUtils/make_unique.h"
#include "AthContainers/AuxElement.h"
diff --git a/PhysicsAnalysis/AnalysisCommon/AssociationUtils/Root/MuJetOverlapTool.cxx b/PhysicsAnalysis/AnalysisCommon/AssociationUtils/Root/MuJetOverlapTool.cxx
index de4de30c60e2e71812416454eaebd52999c4b20f..29a7b592a84977c7eae1730a0df12e96895598b4 100644
--- a/PhysicsAnalysis/AnalysisCommon/AssociationUtils/Root/MuJetOverlapTool.cxx
+++ b/PhysicsAnalysis/AnalysisCommon/AssociationUtils/Root/MuJetOverlapTool.cxx
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
// System includes
#include <typeinfo>
diff --git a/PhysicsAnalysis/AnalysisCommon/AssociationUtils/Root/ORToolBox.cxx b/PhysicsAnalysis/AnalysisCommon/AssociationUtils/Root/ORToolBox.cxx
index dc87911147a45d04388512ad4c2682c469e40b01..ac8df74fb8b16f23b22c2e92390f1ec1bf6a2705 100644
--- a/PhysicsAnalysis/AnalysisCommon/AssociationUtils/Root/ORToolBox.cxx
+++ b/PhysicsAnalysis/AnalysisCommon/AssociationUtils/Root/ORToolBox.cxx
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
// This should only be compiled in RootCore
#ifdef ROOTCORE
diff --git a/PhysicsAnalysis/AnalysisCommon/AssociationUtils/Root/ObjLinkOverlapTool.cxx b/PhysicsAnalysis/AnalysisCommon/AssociationUtils/Root/ObjLinkOverlapTool.cxx
index 50fe8a5166c0f65e5fb4be6f2a2ffabac2dcfcb7..0731cea47a3ba3bf493dbf3aca287ff260e2fd04 100644
--- a/PhysicsAnalysis/AnalysisCommon/AssociationUtils/Root/ObjLinkOverlapTool.cxx
+++ b/PhysicsAnalysis/AnalysisCommon/AssociationUtils/Root/ObjLinkOverlapTool.cxx
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
// Framework inclues
#include "CxxUtils/make_unique.h"
diff --git a/PhysicsAnalysis/AnalysisCommon/AssociationUtils/Root/OverlapDecorationHelper.cxx b/PhysicsAnalysis/AnalysisCommon/AssociationUtils/Root/OverlapDecorationHelper.cxx
index 221a586d0255cb5fedf38d18978ef30804a77247..6b4028c1f6277cc50afe7b66fee3f7012745a85f 100644
--- a/PhysicsAnalysis/AnalysisCommon/AssociationUtils/Root/OverlapDecorationHelper.cxx
+++ b/PhysicsAnalysis/AnalysisCommon/AssociationUtils/Root/OverlapDecorationHelper.cxx
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
// Local includes
#include "AssociationUtils/OverlapDecorationHelper.h"
diff --git a/PhysicsAnalysis/AnalysisCommon/AssociationUtils/Root/OverlapLinkHelper.cxx b/PhysicsAnalysis/AnalysisCommon/AssociationUtils/Root/OverlapLinkHelper.cxx
index e075e0c827e994feac4741bf755caab9a92af344..7b4e7c4a26f20a5286a593e74c8662d78c0f5e45 100644
--- a/PhysicsAnalysis/AnalysisCommon/AssociationUtils/Root/OverlapLinkHelper.cxx
+++ b/PhysicsAnalysis/AnalysisCommon/AssociationUtils/Root/OverlapLinkHelper.cxx
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
// Local includes
#include "AssociationUtils/OverlapLinkHelper.h"
diff --git a/PhysicsAnalysis/AnalysisCommon/AssociationUtils/Root/OverlapRemovalInit.cxx b/PhysicsAnalysis/AnalysisCommon/AssociationUtils/Root/OverlapRemovalInit.cxx
index 20a3336ac4e5ae132d726ab83a00d2738c93444b..f449dd8f506ea9427658c9ca01f5bb65c639a28c 100644
--- a/PhysicsAnalysis/AnalysisCommon/AssociationUtils/Root/OverlapRemovalInit.cxx
+++ b/PhysicsAnalysis/AnalysisCommon/AssociationUtils/Root/OverlapRemovalInit.cxx
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
// System includes
#include <limits>
diff --git a/PhysicsAnalysis/AnalysisCommon/AssociationUtils/Root/OverlapRemovalTool.cxx b/PhysicsAnalysis/AnalysisCommon/AssociationUtils/Root/OverlapRemovalTool.cxx
index 7e21ed4eff6e8ba0e5292cad7be599674ead7f22..a0e3c9e97e20f4d04e79b2ac94fe75ec2ba0441e 100644
--- a/PhysicsAnalysis/AnalysisCommon/AssociationUtils/Root/OverlapRemovalTool.cxx
+++ b/PhysicsAnalysis/AnalysisCommon/AssociationUtils/Root/OverlapRemovalTool.cxx
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
// Framework includes
#include "CxxUtils/make_unique.h"
diff --git a/PhysicsAnalysis/AnalysisCommon/AssociationUtils/Root/OverlapRemovalToolLegacy.cxx b/PhysicsAnalysis/AnalysisCommon/AssociationUtils/Root/OverlapRemovalToolLegacy.cxx
index 837c484eda97872aadd90047035af08dc17e18e6..95cba9aab4749d50bbcc248838e0c08cb6eabf94 100644
--- a/PhysicsAnalysis/AnalysisCommon/AssociationUtils/Root/OverlapRemovalToolLegacy.cxx
+++ b/PhysicsAnalysis/AnalysisCommon/AssociationUtils/Root/OverlapRemovalToolLegacy.cxx
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
// EDM includes
#include "AthContainers/AuxElement.h"
#include "xAODEgamma/ElectronxAODHelpers.h"
diff --git a/PhysicsAnalysis/AnalysisCommon/AssociationUtils/Root/TauAntiTauJetOverlapTool.cxx b/PhysicsAnalysis/AnalysisCommon/AssociationUtils/Root/TauAntiTauJetOverlapTool.cxx
index e960be81e63bd926c19786e5557722613205058e..f89d508d8cd6e24634b2b012975ab25793f58bc3 100644
--- a/PhysicsAnalysis/AnalysisCommon/AssociationUtils/Root/TauAntiTauJetOverlapTool.cxx
+++ b/PhysicsAnalysis/AnalysisCommon/AssociationUtils/Root/TauAntiTauJetOverlapTool.cxx
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
// System includes
#include <typeinfo>
diff --git a/PhysicsAnalysis/AnalysisCommon/AssociationUtils/Root/TauJetOverlapTool.cxx b/PhysicsAnalysis/AnalysisCommon/AssociationUtils/Root/TauJetOverlapTool.cxx
index 13d00e4e31cc763c37b5a75a2039caaebb15ea68..e3260911f9716928e7b05546f08d6bc77950356f 100644
--- a/PhysicsAnalysis/AnalysisCommon/AssociationUtils/Root/TauJetOverlapTool.cxx
+++ b/PhysicsAnalysis/AnalysisCommon/AssociationUtils/Root/TauJetOverlapTool.cxx
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
// System includes
#include <typeinfo>
diff --git a/PhysicsAnalysis/AnalysisCommon/AssociationUtils/Root/TauLooseEleOverlapTool.cxx b/PhysicsAnalysis/AnalysisCommon/AssociationUtils/Root/TauLooseEleOverlapTool.cxx
index 49e5c026c418f3c7af3e14ce412b7e3174d70469..9979de538da9d34d01f0d329928ccae34dde230d 100644
--- a/PhysicsAnalysis/AnalysisCommon/AssociationUtils/Root/TauLooseEleOverlapTool.cxx
+++ b/PhysicsAnalysis/AnalysisCommon/AssociationUtils/Root/TauLooseEleOverlapTool.cxx
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
// System includes
#include <typeinfo>
diff --git a/PhysicsAnalysis/AnalysisCommon/AssociationUtils/Root/TauLooseMuOverlapTool.cxx b/PhysicsAnalysis/AnalysisCommon/AssociationUtils/Root/TauLooseMuOverlapTool.cxx
index 5ef68dd87cf51b18a71c3b73298bdb3e364b048e..ecf5b3f9ff468e04e8d12a9ddaba9229b5e525bc 100644
--- a/PhysicsAnalysis/AnalysisCommon/AssociationUtils/Root/TauLooseMuOverlapTool.cxx
+++ b/PhysicsAnalysis/AnalysisCommon/AssociationUtils/Root/TauLooseMuOverlapTool.cxx
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
// System includes
#include <typeinfo>
diff --git a/PhysicsAnalysis/AnalysisCommon/AssociationUtils/Root/ToolBox.cxx b/PhysicsAnalysis/AnalysisCommon/AssociationUtils/Root/ToolBox.cxx
index 0bc9203b3fc21e63c64261d521a26a75c6a3abf0..0381b5e084a7c36463770c7570f6229bf7f59548 100644
--- a/PhysicsAnalysis/AnalysisCommon/AssociationUtils/Root/ToolBox.cxx
+++ b/PhysicsAnalysis/AnalysisCommon/AssociationUtils/Root/ToolBox.cxx
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
// Local includes
#include "AssociationUtils/ToolBox.h"
diff --git a/PhysicsAnalysis/AnalysisCommon/AssociationUtils/src/ORToolBoxTestAlg.cxx b/PhysicsAnalysis/AnalysisCommon/AssociationUtils/src/ORToolBoxTestAlg.cxx
index d7d998c54db7aaa55ae2ea5780bb2f5a4ddc8921..2f1cde97bf05a38cb89384c727ce052912d055d9 100644
--- a/PhysicsAnalysis/AnalysisCommon/AssociationUtils/src/ORToolBoxTestAlg.cxx
+++ b/PhysicsAnalysis/AnalysisCommon/AssociationUtils/src/ORToolBoxTestAlg.cxx
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
#include "ORToolBoxTestAlg.h"
#include "AssociationUtils/OverlapRemovalDefs.h"
#include "AssociationUtils/OverlapRemovalInit.h"
diff --git a/PhysicsAnalysis/AnalysisCommon/AssociationUtils/src/ORToolBoxTestAlg.h b/PhysicsAnalysis/AnalysisCommon/AssociationUtils/src/ORToolBoxTestAlg.h
index ae44b798b0b71467f06786bf9f81183853c4fe1e..176fcca099827e758031ef1e9608cb0edab009ff 100644
--- a/PhysicsAnalysis/AnalysisCommon/AssociationUtils/src/ORToolBoxTestAlg.h
+++ b/PhysicsAnalysis/AnalysisCommon/AssociationUtils/src/ORToolBoxTestAlg.h
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
#ifndef ASSOCIATIONUTILS_ORTOOLBOXTESTALG_H
#define ASSOCIATIONUTILS_ORTOOLBOXTESTALG_H
diff --git a/PhysicsAnalysis/AnalysisCommon/AssociationUtils/src/OverlapRemovalTestAlg.cxx b/PhysicsAnalysis/AnalysisCommon/AssociationUtils/src/OverlapRemovalTestAlg.cxx
index fe02427055ab92359c9e447a988745edff99895c..f27b03125e4cc6e72fa519a08a86d0028759c517 100644
--- a/PhysicsAnalysis/AnalysisCommon/AssociationUtils/src/OverlapRemovalTestAlg.cxx
+++ b/PhysicsAnalysis/AnalysisCommon/AssociationUtils/src/OverlapRemovalTestAlg.cxx
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
// EDM includes
// Local includes
diff --git a/PhysicsAnalysis/AnalysisCommon/AssociationUtils/src/OverlapRemovalTestAlg.h b/PhysicsAnalysis/AnalysisCommon/AssociationUtils/src/OverlapRemovalTestAlg.h
index 330eca7f59e7b420c9cb9edaa77a7bbd6554de01..1a928c202154f1263621902e47b1fa51cf847366 100644
--- a/PhysicsAnalysis/AnalysisCommon/AssociationUtils/src/OverlapRemovalTestAlg.h
+++ b/PhysicsAnalysis/AnalysisCommon/AssociationUtils/src/OverlapRemovalTestAlg.h
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
#ifndef ASSOCIATIONUTILS_OVERLAPREMOVALTESTALG_H
#define ASSOCIATIONUTILS_OVERLAPREMOVALTESTALG_H
diff --git a/PhysicsAnalysis/AnalysisCommon/AssociationUtils/test/gt_AnaToolHandle_test.cxx b/PhysicsAnalysis/AnalysisCommon/AssociationUtils/test/gt_AnaToolHandle_test.cxx
index 7147fde4bc302ca3f3390dc8c303ec73fcc92513..903e45ffe9c7c690786b6068d53c77de13ececc7 100644
--- a/PhysicsAnalysis/AnalysisCommon/AssociationUtils/test/gt_AnaToolHandle_test.cxx
+++ b/PhysicsAnalysis/AnalysisCommon/AssociationUtils/test/gt_AnaToolHandle_test.cxx
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
/** Unit tests for AssociationUtils tools in AnaToolHandle
*/
diff --git a/PhysicsAnalysis/AnalysisCommon/AssociationUtils/test/gt_OverlapRemovalInit_test.cxx b/PhysicsAnalysis/AnalysisCommon/AssociationUtils/test/gt_OverlapRemovalInit_test.cxx
index a9bf8ae9a50a1e5990c88fe527fd3dab10d91cbe..db11282930bcd590152184be0a20d5bd386c159b 100644
--- a/PhysicsAnalysis/AnalysisCommon/AssociationUtils/test/gt_OverlapRemovalInit_test.cxx
+++ b/PhysicsAnalysis/AnalysisCommon/AssociationUtils/test/gt_OverlapRemovalInit_test.cxx
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
/** @brief Unit tests for c++ config helper functions.
*
* @todo Test more features:
diff --git a/PhysicsAnalysis/AnalysisCommon/AssociationUtils/test/gt_toolbox_test.cxx b/PhysicsAnalysis/AnalysisCommon/AssociationUtils/test/gt_toolbox_test.cxx
index bc262e9805182fb2472aa58456d557dc98e9c531..19d96c9f22895ae083038f7d8a4bd5c3f253642d 100644
--- a/PhysicsAnalysis/AnalysisCommon/AssociationUtils/test/gt_toolbox_test.cxx
+++ b/PhysicsAnalysis/AnalysisCommon/AssociationUtils/test/gt_toolbox_test.cxx
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
/** Unit tests for the ORUtils::ToolBox
*/
diff --git a/PhysicsAnalysis/AnalysisCommon/AssociationUtils/util/OverlapRemovalTester.cxx b/PhysicsAnalysis/AnalysisCommon/AssociationUtils/util/OverlapRemovalTester.cxx
index eddbc155a4baa1a74cad314e48d1909b2058cc85..96720ed4d1d3472eb4e1750cdf7917f22bcb84d1 100644
--- a/PhysicsAnalysis/AnalysisCommon/AssociationUtils/util/OverlapRemovalTester.cxx
+++ b/PhysicsAnalysis/AnalysisCommon/AssociationUtils/util/OverlapRemovalTester.cxx
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
/// @file OverlapRemovalTester.cxx
/// @brief Contains RootCore testing code for the overlap removal tools.
///
diff --git a/PhysicsAnalysis/AnalysisCommon/AssociationUtils/util/OverlapRemovalTesterLegacy.cxx b/PhysicsAnalysis/AnalysisCommon/AssociationUtils/util/OverlapRemovalTesterLegacy.cxx
index 998e884b43b9bf09b67b37f92e6ae42b79f66ec3..05e42fd6dd671a39eff22feb8c65527b919aafcf 100644
--- a/PhysicsAnalysis/AnalysisCommon/AssociationUtils/util/OverlapRemovalTesterLegacy.cxx
+++ b/PhysicsAnalysis/AnalysisCommon/AssociationUtils/util/OverlapRemovalTesterLegacy.cxx
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
/// @file OverlapRemovalTesterLegacy.cxx
/// @brief Contains RootCore testing code for the legacy OverlapRemovalTool.
/// It is recommended to use instead the more advanced set of tools
diff --git a/PhysicsAnalysis/AnalysisCommon/IsolationSelection/Root/IsolationCondition.cxx b/PhysicsAnalysis/AnalysisCommon/IsolationSelection/Root/IsolationCondition.cxx
index e2c428b9ee59bbf9af4b4841ad7c23c134b292a0..5b8be3828a4ea6655132af35f056da89c404d3df 100644
--- a/PhysicsAnalysis/AnalysisCommon/IsolationSelection/Root/IsolationCondition.cxx
+++ b/PhysicsAnalysis/AnalysisCommon/IsolationSelection/Root/IsolationCondition.cxx
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
/*
* IsolationCondition.cxx
*
diff --git a/PhysicsAnalysis/AnalysisCommon/PATInterfaces/PATInterfaces/CorrectionCode.h b/PhysicsAnalysis/AnalysisCommon/PATInterfaces/PATInterfaces/CorrectionCode.h
index 6ad0f0ba1fca0432beaebcf5879ed06cf839a1ce..cc248b9c02d55cf5257e9c1140613d2d62469c35 100644
--- a/PhysicsAnalysis/AnalysisCommon/PATInterfaces/PATInterfaces/CorrectionCode.h
+++ b/PhysicsAnalysis/AnalysisCommon/PATInterfaces/PATInterfaces/CorrectionCode.h
@@ -3,7 +3,7 @@
#ifndef PATINTERFACES_CORRECTIONCODE_H
#define PATINTERFACES_CORRECTIONCODE_H
-// Copyright Nils Krumnack 2012.
+//
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
diff --git a/PhysicsAnalysis/AnalysisCommon/PATInterfaces/PATInterfaces/CorrectionTool.h b/PhysicsAnalysis/AnalysisCommon/PATInterfaces/PATInterfaces/CorrectionTool.h
index 1b1b0618c585f7e62fa28265118e5bb465f223b9..d3014e07c8e6c03f167a9a6ce7f5a5262f83aae3 100644
--- a/PhysicsAnalysis/AnalysisCommon/PATInterfaces/PATInterfaces/CorrectionTool.h
+++ b/PhysicsAnalysis/AnalysisCommon/PATInterfaces/PATInterfaces/CorrectionTool.h
@@ -3,7 +3,7 @@
#ifndef PATINTERFACES_CORRECTIONTOOL_H
#define PATINTERFACES_CORRECTIONTOOL_H
-// Copyright Iowa State University 2014.
+//
// Author: Nils Krumnack
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/PhysicsAnalysis/AnalysisCommon/PATInterfaces/PATInterfaces/CorrectionTool.icc b/PhysicsAnalysis/AnalysisCommon/PATInterfaces/PATInterfaces/CorrectionTool.icc
index 4daed6f4b4575dd518b88b5d6dede0c58bc9514d..4528e1909b09af051a9b086557956e6517541de0 100644
--- a/PhysicsAnalysis/AnalysisCommon/PATInterfaces/PATInterfaces/CorrectionTool.icc
+++ b/PhysicsAnalysis/AnalysisCommon/PATInterfaces/PATInterfaces/CorrectionTool.icc
@@ -3,7 +3,7 @@
#ifndef PATINTERFACES_CORRECTIONTOOL_ICC
#define PATINTERFACES_CORRECTIONTOOL_ICC
-// Copyright Iowa State University 2014.
+//
// Author: Nils Krumnack
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/PhysicsAnalysis/AnalysisCommon/PATInterfaces/PATInterfaces/Global.h b/PhysicsAnalysis/AnalysisCommon/PATInterfaces/PATInterfaces/Global.h
index d0537e1adf6e70c8d87f42d6071a86d17d9e669a..f2da3198f7da5fa921e648acce0558ecfc97da00 100644
--- a/PhysicsAnalysis/AnalysisCommon/PATInterfaces/PATInterfaces/Global.h
+++ b/PhysicsAnalysis/AnalysisCommon/PATInterfaces/PATInterfaces/Global.h
@@ -1,7 +1,7 @@
#ifndef PATINTERFACES_GLOBAL_H
#define PATINTERFACES_GLOBAL_H
-// Copyright Iowa State University 2014.
+//
// Author: Nils Krumnack
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/PhysicsAnalysis/AnalysisCommon/PATInterfaces/PATInterfaces/ISystematicsTool.h b/PhysicsAnalysis/AnalysisCommon/PATInterfaces/PATInterfaces/ISystematicsTool.h
index c705d92ed7cb1911e08f79c36896c80de8c3935a..d7dc414745d64dc3401ba8cee408ac0345bb2376 100644
--- a/PhysicsAnalysis/AnalysisCommon/PATInterfaces/PATInterfaces/ISystematicsTool.h
+++ b/PhysicsAnalysis/AnalysisCommon/PATInterfaces/PATInterfaces/ISystematicsTool.h
@@ -3,7 +3,7 @@
#ifndef PATINTERFACES_ISYSTEMATICSTOOL_H
#define PATINTERFACES_ISYSTEMATICSTOOL_H
-// Copyright Iowa State University 2014.
+//
// Author: Nils Krumnack
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/PhysicsAnalysis/AnalysisCommon/PATInterfaces/PATInterfaces/MakeSystematicsVector.h b/PhysicsAnalysis/AnalysisCommon/PATInterfaces/PATInterfaces/MakeSystematicsVector.h
index 9f52800be9cb54880b04f5f32daaa62849782172..b6387bd733a1f0b61d81e78f657ceadc83c87fcc 100644
--- a/PhysicsAnalysis/AnalysisCommon/PATInterfaces/PATInterfaces/MakeSystematicsVector.h
+++ b/PhysicsAnalysis/AnalysisCommon/PATInterfaces/PATInterfaces/MakeSystematicsVector.h
@@ -1,7 +1,7 @@
#ifndef PATINTERFACES_MAKE_SYSTEMATICS_VECTOR_H
#define PATINTERFACES_MAKE_SYSTEMATICS_VECTOR_H
-// Copyright Iowa State University 2015.
+//
// Author: Nils Krumnack
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/PhysicsAnalysis/AnalysisCommon/PATInterfaces/PATInterfaces/MessageCheck.h b/PhysicsAnalysis/AnalysisCommon/PATInterfaces/PATInterfaces/MessageCheck.h
index c7d514dc36abed864d5a2cf515cec405b74e9765..943d9204a41e229b5a11ca39a09634e7edd1aa21 100644
--- a/PhysicsAnalysis/AnalysisCommon/PATInterfaces/PATInterfaces/MessageCheck.h
+++ b/PhysicsAnalysis/AnalysisCommon/PATInterfaces/PATInterfaces/MessageCheck.h
@@ -1,7 +1,7 @@
#ifndef PAT_INTERFACES__MESSAGE_CHECK_H
#define PAT_INTERFACES__MESSAGE_CHECK_H
-// Copyright Iowa State University 2015.
+//
// Author: Nils Krumnack
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/PhysicsAnalysis/AnalysisCommon/PATInterfaces/PATInterfaces/SystematicCode.h b/PhysicsAnalysis/AnalysisCommon/PATInterfaces/PATInterfaces/SystematicCode.h
index 167c223288e91d9a3180091929f24941bd923f41..600ba6e1b953041b4b8d705b3a66278aea7052c5 100644
--- a/PhysicsAnalysis/AnalysisCommon/PATInterfaces/PATInterfaces/SystematicCode.h
+++ b/PhysicsAnalysis/AnalysisCommon/PATInterfaces/PATInterfaces/SystematicCode.h
@@ -3,7 +3,7 @@
#ifndef PATINTERFACES_SYSTEMATICCODE_H
#define PATINTERFACES_SYSTEMATICCODE_H
-// Copyright Nils Krumnack 2012.
+//
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
diff --git a/PhysicsAnalysis/AnalysisCommon/PATInterfaces/PATInterfaces/SystematicVariation.h b/PhysicsAnalysis/AnalysisCommon/PATInterfaces/PATInterfaces/SystematicVariation.h
index 24a9669f8c870f767a9b3848cc8b022c136df732..707ddb1383325a0ca904e04ea71ae148b247ca20 100644
--- a/PhysicsAnalysis/AnalysisCommon/PATInterfaces/PATInterfaces/SystematicVariation.h
+++ b/PhysicsAnalysis/AnalysisCommon/PATInterfaces/PATInterfaces/SystematicVariation.h
@@ -1,7 +1,7 @@
#ifndef PATINTERFACES_SYSTEMATIC_VARIATION_H
#define PATINTERFACES_SYSTEMATIC_VARIATION_H
-// Copyright Iowa State University 2014.
+//
// Author: Nils Krumnack
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/PhysicsAnalysis/AnalysisCommon/PATInterfaces/PATInterfaces/SystematicsTool.h b/PhysicsAnalysis/AnalysisCommon/PATInterfaces/PATInterfaces/SystematicsTool.h
index e6bd40e4169bdacf07c263a950651152ffc41cbe..24ddbecd977861b397d07f19c5bde7d2b1851fc8 100644
--- a/PhysicsAnalysis/AnalysisCommon/PATInterfaces/PATInterfaces/SystematicsTool.h
+++ b/PhysicsAnalysis/AnalysisCommon/PATInterfaces/PATInterfaces/SystematicsTool.h
@@ -3,7 +3,7 @@
#ifndef PATINTERFACES_SYSTEMATICS_TOOL_H
#define PATINTERFACES_SYSTEMATICS_TOOL_H
-// Copyright Iowa State University 2014.
+//
// Author: Nils Krumnack
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/PhysicsAnalysis/AnalysisCommon/PATInterfaces/PATInterfaces/SystematicsUtil.h b/PhysicsAnalysis/AnalysisCommon/PATInterfaces/PATInterfaces/SystematicsUtil.h
index 547fae2c1af6aeac13754f28c346aeedeaa603dc..426e6cd680deeb524cc98efaa2bcb3c037d19ff0 100644
--- a/PhysicsAnalysis/AnalysisCommon/PATInterfaces/PATInterfaces/SystematicsUtil.h
+++ b/PhysicsAnalysis/AnalysisCommon/PATInterfaces/PATInterfaces/SystematicsUtil.h
@@ -1,7 +1,7 @@
#ifndef PATINTERFACES_SYSTEMATICS_UTIL_H
#define PATINTERFACES_SYSTEMATICS_UTIL_H
-// Copyright Iowa State University 2014.
+//
// Author: Nils Krumnack
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/PhysicsAnalysis/AnalysisCommon/PATInterfaces/Root/MakeSystematicsVector.cxx b/PhysicsAnalysis/AnalysisCommon/PATInterfaces/Root/MakeSystematicsVector.cxx
index 21bb914c77439fc51ff915913a5af3eace9c8060..b3c9e25e733e2ecab885481e471c1fc9970bdfcb 100644
--- a/PhysicsAnalysis/AnalysisCommon/PATInterfaces/Root/MakeSystematicsVector.cxx
+++ b/PhysicsAnalysis/AnalysisCommon/PATInterfaces/Root/MakeSystematicsVector.cxx
@@ -1,4 +1,4 @@
-// Copyright Iowa State University 2015.
+//
// Author: Nils Krumnack
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/PhysicsAnalysis/AnalysisCommon/PATInterfaces/Root/MessageCheck.cxx b/PhysicsAnalysis/AnalysisCommon/PATInterfaces/Root/MessageCheck.cxx
index 2a82858ec1fe37f32fcf0fa64f57bce885899226..131c76c373108b6597c3cc20ce8865a8b9655f8f 100644
--- a/PhysicsAnalysis/AnalysisCommon/PATInterfaces/Root/MessageCheck.cxx
+++ b/PhysicsAnalysis/AnalysisCommon/PATInterfaces/Root/MessageCheck.cxx
@@ -1,4 +1,4 @@
-// Copyright Iowa State University 2015.
+//
// Author: Nils Krumnack
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/PhysicsAnalysis/AnalysisCommon/PATInterfaces/Root/SystematicVariation.cxx b/PhysicsAnalysis/AnalysisCommon/PATInterfaces/Root/SystematicVariation.cxx
index c6be4fd8fc6cf87a34e3a063415df514271d3893..d9448a82eb5223495849b6577f71ad5426d28d45 100644
--- a/PhysicsAnalysis/AnalysisCommon/PATInterfaces/Root/SystematicVariation.cxx
+++ b/PhysicsAnalysis/AnalysisCommon/PATInterfaces/Root/SystematicVariation.cxx
@@ -1,4 +1,4 @@
-// Copyright Iowa State University 2014.
+//
// Author: Nils Krumnack
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/PhysicsAnalysis/AnalysisCommon/PATInterfaces/Root/SystematicsTool.cxx b/PhysicsAnalysis/AnalysisCommon/PATInterfaces/Root/SystematicsTool.cxx
index dbd731d3d0ec43a48ae3975cfb7c57490507a715..95c8477161fb8c6b3470a93d7611d2d1f51f08e2 100644
--- a/PhysicsAnalysis/AnalysisCommon/PATInterfaces/Root/SystematicsTool.cxx
+++ b/PhysicsAnalysis/AnalysisCommon/PATInterfaces/Root/SystematicsTool.cxx
@@ -1,5 +1,5 @@
// $Id: SystematicsTool.cxx 768505 2016-08-17 18:13:04Z ssnyder $
-// Copyright Iowa State University 2014.
+//
// Author: Nils Krumnack
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/PhysicsAnalysis/AnalysisCommon/PATInterfaces/Root/SystematicsUtil.cxx b/PhysicsAnalysis/AnalysisCommon/PATInterfaces/Root/SystematicsUtil.cxx
index aa9340c49171da120e7d92cf88831b9aa97c27a2..14f2037152c967e95f86a88665d114b3c99925d3 100644
--- a/PhysicsAnalysis/AnalysisCommon/PATInterfaces/Root/SystematicsUtil.cxx
+++ b/PhysicsAnalysis/AnalysisCommon/PATInterfaces/Root/SystematicsUtil.cxx
@@ -1,4 +1,4 @@
-// Copyright Iowa State University 2014.
+//
// Author: Nils Krumnack
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/PhysicsAnalysis/AnalysisCommon/PATInterfaces/test/gt_SystematicSet.cxx b/PhysicsAnalysis/AnalysisCommon/PATInterfaces/test/gt_SystematicSet.cxx
index 637809b39da75f3ae0d94608bc7b6a51db108bb9..e98ae8a2ad42c8ad2d9c7783111cf3e7dd3f6f58 100644
--- a/PhysicsAnalysis/AnalysisCommon/PATInterfaces/test/gt_SystematicSet.cxx
+++ b/PhysicsAnalysis/AnalysisCommon/PATInterfaces/test/gt_SystematicSet.cxx
@@ -1,4 +1,4 @@
-// Copyright Iowa State University 2015.
+//
// Author: Nils Krumnack
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/PhysicsAnalysis/AnalysisCommon/PATInterfaces/test/inc_CorrectionCode.cxx b/PhysicsAnalysis/AnalysisCommon/PATInterfaces/test/inc_CorrectionCode.cxx
index a386b58a8e9158b15ba7165cfa1863d0adb70d9c..8a6e09faf19eb376e931ef019c5dd66d55a10f2d 100644
--- a/PhysicsAnalysis/AnalysisCommon/PATInterfaces/test/inc_CorrectionCode.cxx
+++ b/PhysicsAnalysis/AnalysisCommon/PATInterfaces/test/inc_CorrectionCode.cxx
@@ -1,4 +1,4 @@
-// Copyright Iowa State University 2014.
+//
// Author: Nils Krumnack
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/PhysicsAnalysis/AnalysisCommon/PATInterfaces/test/inc_SystematicCode.cxx b/PhysicsAnalysis/AnalysisCommon/PATInterfaces/test/inc_SystematicCode.cxx
index b8d5ee405f20e954746211adf77c002de5ff5baa..defd04a514e9658f68a6e974d253fe9be0c138cc 100644
--- a/PhysicsAnalysis/AnalysisCommon/PATInterfaces/test/inc_SystematicCode.cxx
+++ b/PhysicsAnalysis/AnalysisCommon/PATInterfaces/test/inc_SystematicCode.cxx
@@ -1,4 +1,4 @@
-// Copyright Iowa State University 2014.
+//
// Author: Nils Krumnack
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/PhysicsAnalysis/AnalysisCommon/PATInterfaces/test/ut_SystematicVariation.cxx b/PhysicsAnalysis/AnalysisCommon/PATInterfaces/test/ut_SystematicVariation.cxx
index 8471ca9503a3ca64dff9f42ae5e0285353310a9f..6ea1d7958e8c9af7d46e08ba40ec720b3fffaaf8 100644
--- a/PhysicsAnalysis/AnalysisCommon/PATInterfaces/test/ut_SystematicVariation.cxx
+++ b/PhysicsAnalysis/AnalysisCommon/PATInterfaces/test/ut_SystematicVariation.cxx
@@ -1,4 +1,4 @@
-// Copyright Iowa State University 2015.
+//
// Author: Nils Krumnack
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/PhysicsAnalysis/AnalysisCommon/PATInterfaces/test/ut_make_systematic_vector.cxx b/PhysicsAnalysis/AnalysisCommon/PATInterfaces/test/ut_make_systematic_vector.cxx
index 4b9f4a8b692df81b4e6f71705346af1b04675691..d515ca3f0e162516b46b43f97f8b7174774d0cee 100644
--- a/PhysicsAnalysis/AnalysisCommon/PATInterfaces/test/ut_make_systematic_vector.cxx
+++ b/PhysicsAnalysis/AnalysisCommon/PATInterfaces/test/ut_make_systematic_vector.cxx
@@ -1,4 +1,4 @@
-// Copyright Iowa State University 2015.
+//
// Author: Nils Krumnack
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/PhysicsAnalysis/AnalysisTrigger/AnalysisTriggerAlgs/src/RoIBResultToxAOD.cxx b/PhysicsAnalysis/AnalysisTrigger/AnalysisTriggerAlgs/src/RoIBResultToxAOD.cxx
index 531811e9bfba956738cf610cd98f700517c982b5..b840fc19287f06f7eb5872d2af1ef97ea8f89504 100644
--- a/PhysicsAnalysis/AnalysisTrigger/AnalysisTriggerAlgs/src/RoIBResultToxAOD.cxx
+++ b/PhysicsAnalysis/AnalysisTrigger/AnalysisTriggerAlgs/src/RoIBResultToxAOD.cxx
@@ -1,5 +1,7 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
//
-// Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
//
// STL include(s):
diff --git a/PhysicsAnalysis/AnalysisTrigger/AnalysisTriggerAlgs/src/RoIBResultToxAOD.h b/PhysicsAnalysis/AnalysisTrigger/AnalysisTriggerAlgs/src/RoIBResultToxAOD.h
index 45163e7771d84ed8cca1cfe5ff8d8391d2242651..d6cec4529f7aa2653e499c2992d2e7da13ae37e5 100644
--- a/PhysicsAnalysis/AnalysisTrigger/AnalysisTriggerAlgs/src/RoIBResultToxAOD.h
+++ b/PhysicsAnalysis/AnalysisTrigger/AnalysisTriggerAlgs/src/RoIBResultToxAOD.h
@@ -1,6 +1,8 @@
// Dear emacs, this is -*- c++ -*-
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
//
-// Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
//
#ifndef ANALYSISTRIGGERALGS_ROIBRESULTTOXAOD_H
#define ANALYSISTRIGGERALGS_ROIBRESULTTOXAOD_H
diff --git a/PhysicsAnalysis/D3PDMaker/InDetD3PDMaker/src/BeamSpotFillerTool.cxx b/PhysicsAnalysis/D3PDMaker/InDetD3PDMaker/src/BeamSpotFillerTool.cxx
index 8221c3b3a2fe07bf6ba48fe314b9129bc61df25c..66646e6c31edac1340ab421db232b98ef17d5f5c 100644
--- a/PhysicsAnalysis/D3PDMaker/InDetD3PDMaker/src/BeamSpotFillerTool.cxx
+++ b/PhysicsAnalysis/D3PDMaker/InDetD3PDMaker/src/BeamSpotFillerTool.cxx
@@ -1,5 +1,7 @@
/*
- * Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration.
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+/*
*/
/**
* @file InDetD3PDMaker/src/BeamSpotFillerTool.cxx
diff --git a/PhysicsAnalysis/D3PDMaker/InDetD3PDMaker/src/BeamSpotFillerTool.h b/PhysicsAnalysis/D3PDMaker/InDetD3PDMaker/src/BeamSpotFillerTool.h
index 63725d374f1b30781efe0542bfff45fac085be95..3f6f4454f914d30f5716d87f906c488d4131de9d 100644
--- a/PhysicsAnalysis/D3PDMaker/InDetD3PDMaker/src/BeamSpotFillerTool.h
+++ b/PhysicsAnalysis/D3PDMaker/InDetD3PDMaker/src/BeamSpotFillerTool.h
@@ -1,6 +1,8 @@
// This file's extension implies that it's C, but it's really -*- C++ -*-.
/*
- * Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration.
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+/*
*/
/**
* @file InDetD3PDMaker/src/BeamSpotFillerTool.h
diff --git a/PhysicsAnalysis/D3PDMaker/InDetD3PDMaker/src/BeamSpotGetterTool.cxx b/PhysicsAnalysis/D3PDMaker/InDetD3PDMaker/src/BeamSpotGetterTool.cxx
index c818fd7ee1a35335877aecf3687756bec2bcab90..d91e4d9dad3af84cd1666869cbb5448816ad9fc1 100644
--- a/PhysicsAnalysis/D3PDMaker/InDetD3PDMaker/src/BeamSpotGetterTool.cxx
+++ b/PhysicsAnalysis/D3PDMaker/InDetD3PDMaker/src/BeamSpotGetterTool.cxx
@@ -1,5 +1,7 @@
/*
- * Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration.
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+/*
*/
#include "BeamSpotGetterTool.h"
diff --git a/PhysicsAnalysis/D3PDMaker/InDetD3PDMaker/src/BeamSpotGetterTool.h b/PhysicsAnalysis/D3PDMaker/InDetD3PDMaker/src/BeamSpotGetterTool.h
index 649aaa7763f5ba759a45d73280a4284337150455..5c741b4aa1495d0df500a9d1e617279aeaf84796 100644
--- a/PhysicsAnalysis/D3PDMaker/InDetD3PDMaker/src/BeamSpotGetterTool.h
+++ b/PhysicsAnalysis/D3PDMaker/InDetD3PDMaker/src/BeamSpotGetterTool.h
@@ -1,5 +1,7 @@
/*
- * Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration.
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+/*
*/
#ifndef INDETD3PDMAKER_BEAMSPOTGETTERTOOL_H
diff --git a/PhysicsAnalysis/D3PDMaker/InDetD3PDMaker/src/TSOFitQualityAssociationTool.cxx b/PhysicsAnalysis/D3PDMaker/InDetD3PDMaker/src/TSOFitQualityAssociationTool.cxx
index 754c5ac83d02296b6fee25c4f818706b725cfbee..cc4d218d167ffca43ff84116c46395e74b6b27fb 100644
--- a/PhysicsAnalysis/D3PDMaker/InDetD3PDMaker/src/TSOFitQualityAssociationTool.cxx
+++ b/PhysicsAnalysis/D3PDMaker/InDetD3PDMaker/src/TSOFitQualityAssociationTool.cxx
@@ -1,5 +1,7 @@
/*
- * Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration.
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+/*
*/
/**
* @file InDetD3PDMaker/src/TSOFitQualityAssociationTool.cxx
diff --git a/PhysicsAnalysis/D3PDMaker/InDetD3PDMaker/src/TSOFitQualityAssociationTool.h b/PhysicsAnalysis/D3PDMaker/InDetD3PDMaker/src/TSOFitQualityAssociationTool.h
index 074d619a8369f711f3dea8d664185126c26a1ad8..5a1a8ad4603d3d3d48930bb9ad556f1088e61f21 100644
--- a/PhysicsAnalysis/D3PDMaker/InDetD3PDMaker/src/TSOFitQualityAssociationTool.h
+++ b/PhysicsAnalysis/D3PDMaker/InDetD3PDMaker/src/TSOFitQualityAssociationTool.h
@@ -1,6 +1,8 @@
// This file's extension implies that it's C, but it's really -*- C++ -*-.
/*
- * Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration.
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+/*
*/
/**
* @file InDetD3PDMaker/src/TSOFitQualityAssociationTool.h
diff --git a/PhysicsAnalysis/D3PDMaker/InDetD3PDMaker/src/TrackFitQualityFillerTool.cxx b/PhysicsAnalysis/D3PDMaker/InDetD3PDMaker/src/TrackFitQualityFillerTool.cxx
index 157cba8789ab643f50ea0c47083127f77a09361d..d0ec2dd15f4a5c0900cdce48924b319b502fae15 100644
--- a/PhysicsAnalysis/D3PDMaker/InDetD3PDMaker/src/TrackFitQualityFillerTool.cxx
+++ b/PhysicsAnalysis/D3PDMaker/InDetD3PDMaker/src/TrackFitQualityFillerTool.cxx
@@ -1,5 +1,7 @@
/*
- * Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration.
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+/*
*/
/**
* @file InDetD3PDMaker/src/TrackFitQualityFillerTool.cxx
diff --git a/PhysicsAnalysis/D3PDMaker/InDetD3PDMaker/src/TrackFitQualityFillerTool.h b/PhysicsAnalysis/D3PDMaker/InDetD3PDMaker/src/TrackFitQualityFillerTool.h
index 961a09b6d0667ca74e99f7e43fedc3cef5d6ac9c..946328c3b54cee3d88d1edad180e14864639f1d8 100644
--- a/PhysicsAnalysis/D3PDMaker/InDetD3PDMaker/src/TrackFitQualityFillerTool.h
+++ b/PhysicsAnalysis/D3PDMaker/InDetD3PDMaker/src/TrackFitQualityFillerTool.h
@@ -1,6 +1,8 @@
// This file's extension implies that it's C, but it's really -*- C++ -*-.
/*
- * Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration.
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+/*
*/
/**
* @file InDetD3PDMaker/src/TrackFitQualityFillerTool.h
diff --git a/PhysicsAnalysis/D3PDMaker/InDetD3PDMaker/src/TrackInfoFillerTool.cxx b/PhysicsAnalysis/D3PDMaker/InDetD3PDMaker/src/TrackInfoFillerTool.cxx
index 0a2a08ad7c837e852f2d746c5d9565febf8f5c9a..ccd6d0cb5828581f910cb9e73de6b7fd3ccb6d3b 100644
--- a/PhysicsAnalysis/D3PDMaker/InDetD3PDMaker/src/TrackInfoFillerTool.cxx
+++ b/PhysicsAnalysis/D3PDMaker/InDetD3PDMaker/src/TrackInfoFillerTool.cxx
@@ -1,5 +1,7 @@
/*
- * Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration.
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+/*
*/
#include "TrackInfoFillerTool.h"
diff --git a/PhysicsAnalysis/D3PDMaker/InDetD3PDMaker/src/TrackInfoFillerTool.h b/PhysicsAnalysis/D3PDMaker/InDetD3PDMaker/src/TrackInfoFillerTool.h
index f2f93cb99bfbec94fdfa2b82e1fb6c862bec866b..9461c4dd82d7380ac671b158c399b746fbeff351 100644
--- a/PhysicsAnalysis/D3PDMaker/InDetD3PDMaker/src/TrackInfoFillerTool.h
+++ b/PhysicsAnalysis/D3PDMaker/InDetD3PDMaker/src/TrackInfoFillerTool.h
@@ -1,5 +1,7 @@
/*
- * Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration.
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+/*
*/
#ifndef INDETD3PDMAKER_TRACKINFOFILLERTOOL_H
diff --git a/PhysicsAnalysis/D3PDMaker/InDetD3PDMaker/src/TrackParametersErrorMatrixAssociationTool.cxx b/PhysicsAnalysis/D3PDMaker/InDetD3PDMaker/src/TrackParametersErrorMatrixAssociationTool.cxx
index 80c84249ad5b7ff3d8aa1e026da7989355e50f28..79ec627bb1e91d7b4d06b614cf28c99bdf8420ef 100644
--- a/PhysicsAnalysis/D3PDMaker/InDetD3PDMaker/src/TrackParametersErrorMatrixAssociationTool.cxx
+++ b/PhysicsAnalysis/D3PDMaker/InDetD3PDMaker/src/TrackParametersErrorMatrixAssociationTool.cxx
@@ -1,5 +1,7 @@
/*
- * Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration.
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+/*
*/
/**
* @file InDetD3PDMaker/TrackParametersErrorMatrixAssociationTool.cxx
diff --git a/PhysicsAnalysis/D3PDMaker/InDetD3PDMaker/src/TrackParametersErrorMatrixAssociationTool.h b/PhysicsAnalysis/D3PDMaker/InDetD3PDMaker/src/TrackParametersErrorMatrixAssociationTool.h
index a04eacd82d285e7ef095597b82565f13bac655f0..69c7cb8fb7d56cca042b78e7684bbb18034859ea 100644
--- a/PhysicsAnalysis/D3PDMaker/InDetD3PDMaker/src/TrackParametersErrorMatrixAssociationTool.h
+++ b/PhysicsAnalysis/D3PDMaker/InDetD3PDMaker/src/TrackParametersErrorMatrixAssociationTool.h
@@ -1,6 +1,8 @@
// This file's extension implies that it's C, but it's really -*- C++ -*-.
/*
- * Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration.
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+/*
*/
/**
* @file InDetD3PDMaker/TrackParametersErrorMatrixAssociationTool.h
diff --git a/PhysicsAnalysis/D3PDMaker/InDetD3PDMaker/src/TrackParticleDetailedTruthAssociationTool.cxx b/PhysicsAnalysis/D3PDMaker/InDetD3PDMaker/src/TrackParticleDetailedTruthAssociationTool.cxx
index b68498ce8456295120f14f4495d2d6417a69a083..38c3dd5fcf52ce157c8d2cb82ce036b91130ad9b 100644
--- a/PhysicsAnalysis/D3PDMaker/InDetD3PDMaker/src/TrackParticleDetailedTruthAssociationTool.cxx
+++ b/PhysicsAnalysis/D3PDMaker/InDetD3PDMaker/src/TrackParticleDetailedTruthAssociationTool.cxx
@@ -1,5 +1,7 @@
/*
- * Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration.
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+/*
*/
#include "TrackParticleDetailedTruthAssociationTool.h"
diff --git a/PhysicsAnalysis/D3PDMaker/InDetD3PDMaker/src/TrackParticleDetailedTruthAssociationTool.h b/PhysicsAnalysis/D3PDMaker/InDetD3PDMaker/src/TrackParticleDetailedTruthAssociationTool.h
index d7e86b5c1d198e411741e0bd816a8baef4af9315..b6b307fbd23faf23ae669c8d0ffb53e33f2596b0 100644
--- a/PhysicsAnalysis/D3PDMaker/InDetD3PDMaker/src/TrackParticleDetailedTruthAssociationTool.h
+++ b/PhysicsAnalysis/D3PDMaker/InDetD3PDMaker/src/TrackParticleDetailedTruthAssociationTool.h
@@ -1,5 +1,7 @@
/*
- * Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration.
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+/*
*/
#ifndef INDETD3PDMAKER_TRACKPARTICLEDETAILEDTRUTHASSOCIATIONTOOL_H
diff --git a/PhysicsAnalysis/D3PDMaker/InDetD3PDMaker/src/TrackParticleFitQualityAssociationTool.cxx b/PhysicsAnalysis/D3PDMaker/InDetD3PDMaker/src/TrackParticleFitQualityAssociationTool.cxx
index 5800cba38039ec2bf698597f340542e38d50e34c..019ad7d12c8508581d9078544c35cf108e05c06a 100644
--- a/PhysicsAnalysis/D3PDMaker/InDetD3PDMaker/src/TrackParticleFitQualityAssociationTool.cxx
+++ b/PhysicsAnalysis/D3PDMaker/InDetD3PDMaker/src/TrackParticleFitQualityAssociationTool.cxx
@@ -1,5 +1,7 @@
/*
- * Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration.
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+/*
*/
/**
* @file InDetD3PDMaker/src/TrackParticleFitQualityAssociationTool.cxx
diff --git a/PhysicsAnalysis/D3PDMaker/InDetD3PDMaker/src/TrackParticleFitQualityAssociationTool.h b/PhysicsAnalysis/D3PDMaker/InDetD3PDMaker/src/TrackParticleFitQualityAssociationTool.h
index cd1369c85a35469fc707a7c7fbd5ae965e5ad69a..9ad9bbf604af6d125c637f68ab95a4678cfd8958 100644
--- a/PhysicsAnalysis/D3PDMaker/InDetD3PDMaker/src/TrackParticleFitQualityAssociationTool.h
+++ b/PhysicsAnalysis/D3PDMaker/InDetD3PDMaker/src/TrackParticleFitQualityAssociationTool.h
@@ -1,6 +1,8 @@
// This file's extension implies that it's C, but it's really -*- C++ -*-.
/*
- * Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration.
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+/*
*/
/**
* @file InDetD3PDMaker/src/TrackParticleFitQualityAssociationTool.h
diff --git a/PhysicsAnalysis/D3PDMaker/InDetD3PDMaker/src/TrackParticleGetterTool.cxx b/PhysicsAnalysis/D3PDMaker/InDetD3PDMaker/src/TrackParticleGetterTool.cxx
index 666bcda52292f0645f672e496f295ac1a0a77562..5487f7ab50c0cdc76cc9916f0497171d643f1006 100644
--- a/PhysicsAnalysis/D3PDMaker/InDetD3PDMaker/src/TrackParticleGetterTool.cxx
+++ b/PhysicsAnalysis/D3PDMaker/InDetD3PDMaker/src/TrackParticleGetterTool.cxx
@@ -1,5 +1,7 @@
/*
- * Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration.
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+/*
*/
#include "TrackParticleGetterTool.h"
diff --git a/PhysicsAnalysis/D3PDMaker/InDetD3PDMaker/src/TrackParticleGetterTool.h b/PhysicsAnalysis/D3PDMaker/InDetD3PDMaker/src/TrackParticleGetterTool.h
index 138172ffe56f69c67f5e4a8df90f4e079a152441..1f6abec02c4deb975ed62d2191fd91d109591c08 100644
--- a/PhysicsAnalysis/D3PDMaker/InDetD3PDMaker/src/TrackParticleGetterTool.h
+++ b/PhysicsAnalysis/D3PDMaker/InDetD3PDMaker/src/TrackParticleGetterTool.h
@@ -1,5 +1,7 @@
/*
- * Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration.
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+/*
*/
#ifndef INDETD3PDMAKER_TRACKPARTICLEGETTERTOOL_H
diff --git a/PhysicsAnalysis/D3PDMaker/InDetD3PDMaker/src/TrackParticleInfoAssociationTool.cxx b/PhysicsAnalysis/D3PDMaker/InDetD3PDMaker/src/TrackParticleInfoAssociationTool.cxx
index 95e6b722ba2ee0a6c3195fb6c38989aae92f0034..8e28b1d5d94a9160020b2748484082562c3e5529 100644
--- a/PhysicsAnalysis/D3PDMaker/InDetD3PDMaker/src/TrackParticleInfoAssociationTool.cxx
+++ b/PhysicsAnalysis/D3PDMaker/InDetD3PDMaker/src/TrackParticleInfoAssociationTool.cxx
@@ -1,5 +1,7 @@
/*
- * Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+/*
*/
/**
* @file InDetD3PDMaker/src/TrackParticleInfoAssociationTool.cxx
diff --git a/PhysicsAnalysis/D3PDMaker/InDetD3PDMaker/src/TrackParticleInfoAssociationTool.h b/PhysicsAnalysis/D3PDMaker/InDetD3PDMaker/src/TrackParticleInfoAssociationTool.h
index 38a25c66dd28e960c686474abdc6c0bd40b2fe57..d737ce282eb7c8769a075d5f924c50ea6231cb5f 100644
--- a/PhysicsAnalysis/D3PDMaker/InDetD3PDMaker/src/TrackParticleInfoAssociationTool.h
+++ b/PhysicsAnalysis/D3PDMaker/InDetD3PDMaker/src/TrackParticleInfoAssociationTool.h
@@ -1,6 +1,8 @@
// This file's extension implies that it's C, but it's really -*- C++ -*-.
/*
- * Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration.
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+/*
*/
/**
* @file InDetD3PDMaker/src/TrackParticleInfoAssociationTool.h
diff --git a/PhysicsAnalysis/D3PDMaker/InDetD3PDMaker/src/TrackParticleTSOAssociationTool.h b/PhysicsAnalysis/D3PDMaker/InDetD3PDMaker/src/TrackParticleTSOAssociationTool.h
index 9b07e351b5c5bca1b2654701118c9ac774561f6d..c89f3f252dc1b2a1ef5e6cc4f41c326138c2fd88 100644
--- a/PhysicsAnalysis/D3PDMaker/InDetD3PDMaker/src/TrackParticleTSOAssociationTool.h
+++ b/PhysicsAnalysis/D3PDMaker/InDetD3PDMaker/src/TrackParticleTSOAssociationTool.h
@@ -1,5 +1,7 @@
/*
- * Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration.
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+/*
*/
#ifndef INDETD3PD_TRACKPARTICLETSOASSOCIATIONTOOL_H
diff --git a/PhysicsAnalysis/D3PDMaker/InDetD3PDMaker/src/TrackParticleTrackSummaryAssociationTool.cxx b/PhysicsAnalysis/D3PDMaker/InDetD3PDMaker/src/TrackParticleTrackSummaryAssociationTool.cxx
index ebe97e29b139a59fa97dd31e929c34cba1b4c246..ddce7ef041c33d8d270f3bfee3fb3c125894eefb 100644
--- a/PhysicsAnalysis/D3PDMaker/InDetD3PDMaker/src/TrackParticleTrackSummaryAssociationTool.cxx
+++ b/PhysicsAnalysis/D3PDMaker/InDetD3PDMaker/src/TrackParticleTrackSummaryAssociationTool.cxx
@@ -1,5 +1,7 @@
/*
- * Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration.
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+/*
*/
/**
* @file InDetD3PDMaker/src/TrackParticleTrackSummaryAssociationTool.cxx
diff --git a/PhysicsAnalysis/D3PDMaker/InDetD3PDMaker/src/TrackParticleTrackSummaryAssociationTool.h b/PhysicsAnalysis/D3PDMaker/InDetD3PDMaker/src/TrackParticleTrackSummaryAssociationTool.h
index 13b457509a605ea8ec3ab993ac559a3a2ed9e24f..99d5eab74c1fd587458969eebae67970dd7e8af6 100644
--- a/PhysicsAnalysis/D3PDMaker/InDetD3PDMaker/src/TrackParticleTrackSummaryAssociationTool.h
+++ b/PhysicsAnalysis/D3PDMaker/InDetD3PDMaker/src/TrackParticleTrackSummaryAssociationTool.h
@@ -1,6 +1,8 @@
// This file's extension implies that it's C, but it's really -*- C++ -*-.
/*
- * Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration.
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+/*
*/
/**
* @file InDetD3PDMaker/src/TrackParticleTrackSummaryAssociationTool.h
diff --git a/PhysicsAnalysis/D3PDMaker/InDetD3PDMaker/src/TrackParticleTruthAssociationTool.h b/PhysicsAnalysis/D3PDMaker/InDetD3PDMaker/src/TrackParticleTruthAssociationTool.h
index f626db45c37a5728bacb7ed65ca180d6899419be..4de09047f3337871a1215b5adee727965c7420cc 100644
--- a/PhysicsAnalysis/D3PDMaker/InDetD3PDMaker/src/TrackParticleTruthAssociationTool.h
+++ b/PhysicsAnalysis/D3PDMaker/InDetD3PDMaker/src/TrackParticleTruthAssociationTool.h
@@ -1,5 +1,7 @@
/*
- * Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration.
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+/*
*/
#ifndef INDETD3PDMAKER_TRACKPARTICLETRUTHASSOCIATIONTOOL_H
diff --git a/PhysicsAnalysis/D3PDMaker/InDetD3PDMaker/src/TrackStateOnSurfaceFillerTool.cxx b/PhysicsAnalysis/D3PDMaker/InDetD3PDMaker/src/TrackStateOnSurfaceFillerTool.cxx
index 96ca94dd8f77e592087664d94af8bb089b77debb..359c82a10afbd431d247bcabbbf6530cf36562a9 100644
--- a/PhysicsAnalysis/D3PDMaker/InDetD3PDMaker/src/TrackStateOnSurfaceFillerTool.cxx
+++ b/PhysicsAnalysis/D3PDMaker/InDetD3PDMaker/src/TrackStateOnSurfaceFillerTool.cxx
@@ -1,5 +1,7 @@
/*
- * Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration.
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+/*
*/
#include "TrackStateOnSurfaceFillerTool.h"
diff --git a/PhysicsAnalysis/D3PDMaker/InDetD3PDMaker/src/TrackStateOnSurfaceFillerTool.h b/PhysicsAnalysis/D3PDMaker/InDetD3PDMaker/src/TrackStateOnSurfaceFillerTool.h
index ca32c80179500a945be9c72806a2df75cabba55e..532d20e14ed14d3746b2dfeabc997f3a733332db 100644
--- a/PhysicsAnalysis/D3PDMaker/InDetD3PDMaker/src/TrackStateOnSurfaceFillerTool.h
+++ b/PhysicsAnalysis/D3PDMaker/InDetD3PDMaker/src/TrackStateOnSurfaceFillerTool.h
@@ -1,5 +1,7 @@
/*
- * Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration.
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+/*
*/
#ifndef INDETD3PDMAKER_TRACKSTATEONSURFACEFILLERTOOL_H
diff --git a/PhysicsAnalysis/D3PDMaker/InDetD3PDMaker/src/TrackTrackSummaryFillerTool.cxx b/PhysicsAnalysis/D3PDMaker/InDetD3PDMaker/src/TrackTrackSummaryFillerTool.cxx
index ebcd7a3c0bab693fa8874eee16303e62e880c286..fb4f729ebfa5d92a8a0e8305987fd7945df4f09c 100644
--- a/PhysicsAnalysis/D3PDMaker/InDetD3PDMaker/src/TrackTrackSummaryFillerTool.cxx
+++ b/PhysicsAnalysis/D3PDMaker/InDetD3PDMaker/src/TrackTrackSummaryFillerTool.cxx
@@ -1,5 +1,7 @@
/*
- * Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration.
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+/*
*/
#include "TrackTrackSummaryFillerTool.h"
diff --git a/PhysicsAnalysis/D3PDMaker/InDetD3PDMaker/src/TrackTrackSummaryFillerTool.h b/PhysicsAnalysis/D3PDMaker/InDetD3PDMaker/src/TrackTrackSummaryFillerTool.h
index d0f58ea9749ea1e1aa030c26a99d8288bce4e795..08c3109e597b89b271989c15f034a080f13c3f16 100644
--- a/PhysicsAnalysis/D3PDMaker/InDetD3PDMaker/src/TrackTrackSummaryFillerTool.h
+++ b/PhysicsAnalysis/D3PDMaker/InDetD3PDMaker/src/TrackTrackSummaryFillerTool.h
@@ -1,5 +1,7 @@
/*
- * Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration.
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+/*
*/
#ifndef INDETD3PDMAKER_TRACKTRACKSUMMARYFILLERTOOL_H
diff --git a/PhysicsAnalysis/D3PDMaker/InDetD3PDMaker/src/TruthTrackFillerTool.cxx b/PhysicsAnalysis/D3PDMaker/InDetD3PDMaker/src/TruthTrackFillerTool.cxx
index ee99e5725da161418d9557637e2a53fd82101b64..5f594ad6637a82497b32c56aaab6ee934fc21352 100644
--- a/PhysicsAnalysis/D3PDMaker/InDetD3PDMaker/src/TruthTrackFillerTool.cxx
+++ b/PhysicsAnalysis/D3PDMaker/InDetD3PDMaker/src/TruthTrackFillerTool.cxx
@@ -1,5 +1,7 @@
/*
- * Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration.
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+/*
*/
#include "TruthTrackFillerTool.h"
diff --git a/PhysicsAnalysis/D3PDMaker/InDetD3PDMaker/src/TruthTrackFillerTool.h b/PhysicsAnalysis/D3PDMaker/InDetD3PDMaker/src/TruthTrackFillerTool.h
index a196ea1870da4def9bdb2897b2044629af01a532..afe5dd81e4b89246916b7ec5b49f9b645228a6eb 100644
--- a/PhysicsAnalysis/D3PDMaker/InDetD3PDMaker/src/TruthTrackFillerTool.h
+++ b/PhysicsAnalysis/D3PDMaker/InDetD3PDMaker/src/TruthTrackFillerTool.h
@@ -1,5 +1,7 @@
/*
- * Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration.
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+/*
*/
#ifndef INDETD3PDMAKER_TRUTHTRACKFILLERTOOL_H
diff --git a/PhysicsAnalysis/D3PDMaker/InDetD3PDMaker/src/TruthTrackGetterTool.cxx b/PhysicsAnalysis/D3PDMaker/InDetD3PDMaker/src/TruthTrackGetterTool.cxx
index 15ed8a507c93d10d5cd4f6732f8fd96f9d9885ed..a773a7734a31167b5a5dbbdd0ad3f68b08d3b3c3 100644
--- a/PhysicsAnalysis/D3PDMaker/InDetD3PDMaker/src/TruthTrackGetterTool.cxx
+++ b/PhysicsAnalysis/D3PDMaker/InDetD3PDMaker/src/TruthTrackGetterTool.cxx
@@ -1,5 +1,7 @@
/*
- * Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration.
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+/*
*/
#include "TruthTrackGetterTool.h"
diff --git a/PhysicsAnalysis/D3PDMaker/InDetD3PDMaker/src/TruthTrackGetterTool.h b/PhysicsAnalysis/D3PDMaker/InDetD3PDMaker/src/TruthTrackGetterTool.h
index eb4f382f729174cc45bb8092b17092d87264b4c0..6879f611857bc3ab10b2e6ea6414beb9ea588eec 100644
--- a/PhysicsAnalysis/D3PDMaker/InDetD3PDMaker/src/TruthTrackGetterTool.h
+++ b/PhysicsAnalysis/D3PDMaker/InDetD3PDMaker/src/TruthTrackGetterTool.h
@@ -1,5 +1,7 @@
/*
- * Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration.
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+/*
*/
#ifndef INDETD3PDMAKER_TRUTHTRACKGETTERTOOL_H
diff --git a/PhysicsAnalysis/D3PDMaker/InDetD3PDMaker/src/TruthVertexFillerTool.cxx b/PhysicsAnalysis/D3PDMaker/InDetD3PDMaker/src/TruthVertexFillerTool.cxx
index 554daf9f1e7e2028567f6d8c312ab5e3082f3144..341f146db25b5a863c7ad498298f96721a41c270 100644
--- a/PhysicsAnalysis/D3PDMaker/InDetD3PDMaker/src/TruthVertexFillerTool.cxx
+++ b/PhysicsAnalysis/D3PDMaker/InDetD3PDMaker/src/TruthVertexFillerTool.cxx
@@ -1,5 +1,7 @@
/*
- * Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration.
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+/*
*/
#include "TruthVertexFillerTool.h"
diff --git a/PhysicsAnalysis/D3PDMaker/InDetD3PDMaker/src/TruthVertexFillerTool.h b/PhysicsAnalysis/D3PDMaker/InDetD3PDMaker/src/TruthVertexFillerTool.h
index 7ccdae59bceb978c374e7887bd27c174be07f48b..fce9f6d53ff1d3fd5fda95cfaf2ad2ad8eb8bb50 100644
--- a/PhysicsAnalysis/D3PDMaker/InDetD3PDMaker/src/TruthVertexFillerTool.h
+++ b/PhysicsAnalysis/D3PDMaker/InDetD3PDMaker/src/TruthVertexFillerTool.h
@@ -1,5 +1,7 @@
/*
- * Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration.
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+/*
*/
#ifndef INDETD3PDMAKER_TRUTHVERTEXFILLERTOOL_H
diff --git a/PhysicsAnalysis/D3PDMaker/InDetD3PDMaker/src/TruthVertexGetterTool.cxx b/PhysicsAnalysis/D3PDMaker/InDetD3PDMaker/src/TruthVertexGetterTool.cxx
index f7849ff38fa13ad704d29836b975ab4e403deda1..25d2a0ad98e374125cca556acf1a1496cc31e31c 100644
--- a/PhysicsAnalysis/D3PDMaker/InDetD3PDMaker/src/TruthVertexGetterTool.cxx
+++ b/PhysicsAnalysis/D3PDMaker/InDetD3PDMaker/src/TruthVertexGetterTool.cxx
@@ -1,5 +1,7 @@
/*
- * Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration.
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+/*
*/
#include "TruthVertexGetterTool.h"
diff --git a/PhysicsAnalysis/D3PDMaker/InDetD3PDMaker/src/TruthVertexGetterTool.h b/PhysicsAnalysis/D3PDMaker/InDetD3PDMaker/src/TruthVertexGetterTool.h
index 6a2e86dd52f60907b167f6cedc6ec90e4a75e2d5..eb3b8740a408150d02859ed15ece8b74791c844a 100644
--- a/PhysicsAnalysis/D3PDMaker/InDetD3PDMaker/src/TruthVertexGetterTool.h
+++ b/PhysicsAnalysis/D3PDMaker/InDetD3PDMaker/src/TruthVertexGetterTool.h
@@ -1,5 +1,7 @@
/*
- * Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration.
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+/*
*/
#ifndef INDETD3PDMAKER_TRUTHVERTEXGETTERTOOL_H
diff --git a/PhysicsAnalysis/D3PDMaker/InDetD3PDMaker/src/indetInheritance.cxx b/PhysicsAnalysis/D3PDMaker/InDetD3PDMaker/src/indetInheritance.cxx
index ea79e86d436b1769b0ba43605fbfb5d80b616fd6..5f725520d16d286085f9434e667986c0f22d61b8 100644
--- a/PhysicsAnalysis/D3PDMaker/InDetD3PDMaker/src/indetInheritance.cxx
+++ b/PhysicsAnalysis/D3PDMaker/InDetD3PDMaker/src/indetInheritance.cxx
@@ -1,5 +1,7 @@
/*
- * Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+/*
*/
/**
* @file InDetD3PDMaker/src/indetInheritance.cxx
diff --git a/PhysicsAnalysis/D3PDTools/EventLoop/EventLoop/Algorithm.h b/PhysicsAnalysis/D3PDTools/EventLoop/EventLoop/Algorithm.h
index 9dfe182e3d2cdf5a50864777dd2f0ae6c47eb7fe..9725c4cb4ee5755e16a3ade84d0c1c2552a8dc8f 100644
--- a/PhysicsAnalysis/D3PDTools/EventLoop/EventLoop/Algorithm.h
+++ b/PhysicsAnalysis/D3PDTools/EventLoop/EventLoop/Algorithm.h
@@ -5,7 +5,7 @@
#ifndef EVENT_LOOP_ALGORITHM_HH
#define EVENT_LOOP_ALGORITHM_HH
-// Copyright Nils Krumnack 2011 - 2012.
+// - 2012.
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
diff --git a/PhysicsAnalysis/D3PDTools/EventLoop/EventLoop/BackgroundDriver.h b/PhysicsAnalysis/D3PDTools/EventLoop/EventLoop/BackgroundDriver.h
index 6dfa02571e053d8918051b11357f36f5437dcaf8..8e6d904ede3f4a6ca59c800493963c3d118943b6 100644
--- a/PhysicsAnalysis/D3PDTools/EventLoop/EventLoop/BackgroundDriver.h
+++ b/PhysicsAnalysis/D3PDTools/EventLoop/EventLoop/BackgroundDriver.h
@@ -5,7 +5,7 @@
#ifndef EVENT_LOOP_BACKGROUND_DRIVER_HH
#define EVENT_LOOP_BACKGROUND_DRIVER_HH
-// Copyright Nils Krumnack 2011.
+//
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
diff --git a/PhysicsAnalysis/D3PDTools/EventLoop/EventLoop/BackgroundJob.h b/PhysicsAnalysis/D3PDTools/EventLoop/EventLoop/BackgroundJob.h
index f16c1d853779fe5735ec814611939eb8ce373710..9183b20718d92a2428fe5ae8cbe9fb1765f3be9a 100644
--- a/PhysicsAnalysis/D3PDTools/EventLoop/EventLoop/BackgroundJob.h
+++ b/PhysicsAnalysis/D3PDTools/EventLoop/EventLoop/BackgroundJob.h
@@ -5,7 +5,7 @@
#ifndef EVENT_LOOP_BACKGROUND_JOB_HH
#define EVENT_LOOP_BACKGROUND_JOB_HH
-// Copyright Nils Krumnack 2012.
+//
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
diff --git a/PhysicsAnalysis/D3PDTools/EventLoop/EventLoop/BackgroundSocket.h b/PhysicsAnalysis/D3PDTools/EventLoop/EventLoop/BackgroundSocket.h
index 0c6ba5a6f3ee4eff15b14250656a0df6bf37eaeb..e2e7e02e184f60ee649eebf184535c5d9cc71b5e 100644
--- a/PhysicsAnalysis/D3PDTools/EventLoop/EventLoop/BackgroundSocket.h
+++ b/PhysicsAnalysis/D3PDTools/EventLoop/EventLoop/BackgroundSocket.h
@@ -5,7 +5,7 @@
#ifndef EVENT_LOOP__BACKGROUND_SOCKET_H
#define EVENT_LOOP__BACKGROUND_SOCKET_H
-// Copyright Iowa State University 2015.
+//
// Author: Nils Krumnack
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/PhysicsAnalysis/D3PDTools/EventLoop/EventLoop/BackgroundTSelector.h b/PhysicsAnalysis/D3PDTools/EventLoop/EventLoop/BackgroundTSelector.h
index daef8ac1fbf9b818098b33509813d8fd70204a19..a36dd2ed9c4fa67cf80ea4df49819f1f37793a14 100644
--- a/PhysicsAnalysis/D3PDTools/EventLoop/EventLoop/BackgroundTSelector.h
+++ b/PhysicsAnalysis/D3PDTools/EventLoop/EventLoop/BackgroundTSelector.h
@@ -5,7 +5,7 @@
#ifndef EVENT_LOOP_BACKGROUND_TSELECTOR_H
#define EVENT_LOOP_BACKGROUND_TSELECTOR_H
-// Copyright Nils Krumnack 2011.
+//
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
diff --git a/PhysicsAnalysis/D3PDTools/EventLoop/EventLoop/BackgroundWorker.h b/PhysicsAnalysis/D3PDTools/EventLoop/EventLoop/BackgroundWorker.h
index fa7d9f99e9a0e274ec58aab7ab6c2280a0d2d89f..b8a47e2401c7d73e16cdd2c17dcde19207ca89f5 100644
--- a/PhysicsAnalysis/D3PDTools/EventLoop/EventLoop/BackgroundWorker.h
+++ b/PhysicsAnalysis/D3PDTools/EventLoop/EventLoop/BackgroundWorker.h
@@ -5,7 +5,7 @@
#ifndef EVENT_LOOP_BACKGROUND_WORKER_HH
#define EVENT_LOOP_BACKGROUND_WORKER_HH
-// Copyright Nils Krumnack 2011.
+//
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
diff --git a/PhysicsAnalysis/D3PDTools/EventLoop/EventLoop/BatchDriver.h b/PhysicsAnalysis/D3PDTools/EventLoop/EventLoop/BatchDriver.h
index 666e807afeefd9432690d6c44c5d8ac7d7a5de2b..01bfb5f9483d5338da9c351bac623463c11e064d 100644
--- a/PhysicsAnalysis/D3PDTools/EventLoop/EventLoop/BatchDriver.h
+++ b/PhysicsAnalysis/D3PDTools/EventLoop/EventLoop/BatchDriver.h
@@ -5,7 +5,7 @@
#ifndef EVENT_LOOP_BATCH_DRIVER_HH
#define EVENT_LOOP_BATCH_DRIVER_HH
-// Copyright Nils Krumnack 2011.
+//
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
diff --git a/PhysicsAnalysis/D3PDTools/EventLoop/EventLoop/BatchJob.h b/PhysicsAnalysis/D3PDTools/EventLoop/EventLoop/BatchJob.h
index 67c2864f7d39e977e1ce00f70cb7dbfdf66f374b..850131b4b380509bdbb1d19a5e06090bae351079 100644
--- a/PhysicsAnalysis/D3PDTools/EventLoop/EventLoop/BatchJob.h
+++ b/PhysicsAnalysis/D3PDTools/EventLoop/EventLoop/BatchJob.h
@@ -5,7 +5,7 @@
#ifndef EVENT_LOOP_BATCH_JOB_HH
#define EVENT_LOOP_BATCH_JOB_HH
-// Copyright Nils Krumnack 2012.
+//
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
diff --git a/PhysicsAnalysis/D3PDTools/EventLoop/EventLoop/BatchSample.h b/PhysicsAnalysis/D3PDTools/EventLoop/EventLoop/BatchSample.h
index a9f6d12af6d6ba73bedd6ce1af1bbe98d8a7c403..7f7178bdbeb7ad5587114e3a298b2b47b91de8c9 100644
--- a/PhysicsAnalysis/D3PDTools/EventLoop/EventLoop/BatchSample.h
+++ b/PhysicsAnalysis/D3PDTools/EventLoop/EventLoop/BatchSample.h
@@ -5,7 +5,7 @@
#ifndef EVENT_LOOP_BATCH_SAMPLE_HH
#define EVENT_LOOP_BATCH_SAMPLE_HH
-// Copyright Nils Krumnack 2012.
+//
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
diff --git a/PhysicsAnalysis/D3PDTools/EventLoop/EventLoop/BatchSegment.h b/PhysicsAnalysis/D3PDTools/EventLoop/EventLoop/BatchSegment.h
index e9951c54230e28a429e9f90134e3edd6af87b218..8d8b73a47c995d3cc67e0f79a5cc843cc8abbb55 100644
--- a/PhysicsAnalysis/D3PDTools/EventLoop/EventLoop/BatchSegment.h
+++ b/PhysicsAnalysis/D3PDTools/EventLoop/EventLoop/BatchSegment.h
@@ -5,7 +5,7 @@
#ifndef EVENT_LOOP_BATCH_SEGMENT_H
#define EVENT_LOOP_BATCH_SEGMENT_H
-// Copyright Nils Krumnack 2012.
+//
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
diff --git a/PhysicsAnalysis/D3PDTools/EventLoop/EventLoop/BatchWorker.h b/PhysicsAnalysis/D3PDTools/EventLoop/EventLoop/BatchWorker.h
index 380dc9dd2d5d1b8e95594b4be443d27ee7f754e3..71b43dd45c6a33d543c2d16f2ef91bd87080265c 100644
--- a/PhysicsAnalysis/D3PDTools/EventLoop/EventLoop/BatchWorker.h
+++ b/PhysicsAnalysis/D3PDTools/EventLoop/EventLoop/BatchWorker.h
@@ -5,7 +5,7 @@
#ifndef EVENT_LOOP_BATCH_WORKER_HH
#define EVENT_LOOP_BATCH_WORKER_HH
-// Copyright Nils Krumnack 2011.
+//
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
diff --git a/PhysicsAnalysis/D3PDTools/EventLoop/EventLoop/CondorDriver.h b/PhysicsAnalysis/D3PDTools/EventLoop/EventLoop/CondorDriver.h
index 0f6a5f6019b32fe06a751a6d70c49e8a84c63675..615e42a06bfeb27b4b85b1b6c838ad263de76d9f 100644
--- a/PhysicsAnalysis/D3PDTools/EventLoop/EventLoop/CondorDriver.h
+++ b/PhysicsAnalysis/D3PDTools/EventLoop/EventLoop/CondorDriver.h
@@ -5,7 +5,7 @@
#ifndef EVENT_LOOP_CONDOR_DRIVER_HH
#define EVENT_LOOP_CONDOR_DRIVER_HH
-// Copyright Nils Krumnack 2012.
+//
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
diff --git a/PhysicsAnalysis/D3PDTools/EventLoop/EventLoop/D3PDReaderSvc.h b/PhysicsAnalysis/D3PDTools/EventLoop/EventLoop/D3PDReaderSvc.h
index 309f56b96a9a77ff6c51cac188e0e56591b88d5c..2f0a3a347d29d3ae217161b6b18fd0052c4f5e7a 100644
--- a/PhysicsAnalysis/D3PDTools/EventLoop/EventLoop/D3PDReaderSvc.h
+++ b/PhysicsAnalysis/D3PDTools/EventLoop/EventLoop/D3PDReaderSvc.h
@@ -5,7 +5,7 @@
#ifndef EVENT_LOOP_D3PDREADER_SVC_H
#define EVENT_LOOP_D3PDREADER_SVC_H
-// Copyright Nils Krumnack 2012.
+//
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
diff --git a/PhysicsAnalysis/D3PDTools/EventLoop/EventLoop/DirectDriver.h b/PhysicsAnalysis/D3PDTools/EventLoop/EventLoop/DirectDriver.h
index f561d50ec03ee352bd529cf0cbd9341e6edc60e9..981c5e6bf4228842c25750cd700117f1be100df6 100644
--- a/PhysicsAnalysis/D3PDTools/EventLoop/EventLoop/DirectDriver.h
+++ b/PhysicsAnalysis/D3PDTools/EventLoop/EventLoop/DirectDriver.h
@@ -5,7 +5,7 @@
#ifndef EVENT_LOOP_DIRECT_DRIVER_HH
#define EVENT_LOOP_DIRECT_DRIVER_HH
-// Copyright Nils Krumnack 2011.
+//
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
diff --git a/PhysicsAnalysis/D3PDTools/EventLoop/EventLoop/DirectWorker.h b/PhysicsAnalysis/D3PDTools/EventLoop/EventLoop/DirectWorker.h
index 320a2f68c2779c54dc41e3b2d0038dbd431d6707..e34a8246f6c74ae8e9fc1087713c41693368cd40 100644
--- a/PhysicsAnalysis/D3PDTools/EventLoop/EventLoop/DirectWorker.h
+++ b/PhysicsAnalysis/D3PDTools/EventLoop/EventLoop/DirectWorker.h
@@ -5,7 +5,7 @@
#ifndef EVENT_LOOP_DIRECT_WORKER_HH
#define EVENT_LOOP_DIRECT_WORKER_HH
-// Copyright Nils Krumnack 2011.
+//
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
diff --git a/PhysicsAnalysis/D3PDTools/EventLoop/EventLoop/Driver.h b/PhysicsAnalysis/D3PDTools/EventLoop/EventLoop/Driver.h
index e009251705d18d716f931bd2dd25d1738d31f6ce..60560afadbe4b18b3c844c5c2e46d622b3d0dca0 100644
--- a/PhysicsAnalysis/D3PDTools/EventLoop/EventLoop/Driver.h
+++ b/PhysicsAnalysis/D3PDTools/EventLoop/EventLoop/Driver.h
@@ -5,7 +5,7 @@
#ifndef EVENT_LOOP_DRIVER_HH
#define EVENT_LOOP_DRIVER_HH
-// Copyright Nils Krumnack 2011.
+//
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
diff --git a/PhysicsAnalysis/D3PDTools/EventLoop/EventLoop/EmptyFileHandler.h b/PhysicsAnalysis/D3PDTools/EventLoop/EventLoop/EmptyFileHandler.h
index 93e61390606d5805af59b857b3e73baf387e2d41..e8fe77b900a3b5f5ca6676e0cf4c3d5c9bccf518 100644
--- a/PhysicsAnalysis/D3PDTools/EventLoop/EventLoop/EmptyFileHandler.h
+++ b/PhysicsAnalysis/D3PDTools/EventLoop/EventLoop/EmptyFileHandler.h
@@ -5,7 +5,7 @@
#ifndef EVENT_LOOP__EMPTY_FILE_HANDLER_H
#define EVENT_LOOP__EMPTY_FILE_HANDLER_H
-// Copyright Iowa State University 2015.
+//
// Author: Nils Krumnack
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/PhysicsAnalysis/D3PDTools/EventLoop/EventLoop/GEDriver.h b/PhysicsAnalysis/D3PDTools/EventLoop/EventLoop/GEDriver.h
index 1ab09c43d6f6c1a655e20141d447a7193e542086..abb276f407d8443f0f084a6f60b5b7177b211ca6 100644
--- a/PhysicsAnalysis/D3PDTools/EventLoop/EventLoop/GEDriver.h
+++ b/PhysicsAnalysis/D3PDTools/EventLoop/EventLoop/GEDriver.h
@@ -5,7 +5,7 @@
#ifndef EVENT_LOOP_GE_DRIVER_HH
#define EVENT_LOOP_GE_DRIVER_HH
-// Copyright Nils Krumnack 2012.
+//
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
diff --git a/PhysicsAnalysis/D3PDTools/EventLoop/EventLoop/Global.h b/PhysicsAnalysis/D3PDTools/EventLoop/EventLoop/Global.h
index 4d3ba81aba42fabafef5866c0f424071d1bc0f6e..0887b759bea8e7b2da83489232268e091b65e6d0 100644
--- a/PhysicsAnalysis/D3PDTools/EventLoop/EventLoop/Global.h
+++ b/PhysicsAnalysis/D3PDTools/EventLoop/EventLoop/Global.h
@@ -5,7 +5,7 @@
#ifndef EVENT_LOOP_GLOBAL_HH
#define EVENT_LOOP_GLOBAL_HH
-// Copyright Nils Krumnack 2011.
+//
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
diff --git a/PhysicsAnalysis/D3PDTools/EventLoop/EventLoop/Job.h b/PhysicsAnalysis/D3PDTools/EventLoop/EventLoop/Job.h
index 24cdc21d4f8d538da07d75075ed2e4024843a29f..5dceaca2381ab943e697687e37b6bd6def3e4aca 100644
--- a/PhysicsAnalysis/D3PDTools/EventLoop/EventLoop/Job.h
+++ b/PhysicsAnalysis/D3PDTools/EventLoop/EventLoop/Job.h
@@ -5,7 +5,7 @@
#ifndef EVENT_LOOP_JOB_HH
#define EVENT_LOOP_JOB_HH
-// Copyright Nils Krumnack 2011.
+//
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
diff --git a/PhysicsAnalysis/D3PDTools/EventLoop/EventLoop/LLDriver.h b/PhysicsAnalysis/D3PDTools/EventLoop/EventLoop/LLDriver.h
index fe947603d506339d991102c0ca31b43f878577e7..e0fabd270315a6f35aad0c39cfed57427e3b9b7d 100644
--- a/PhysicsAnalysis/D3PDTools/EventLoop/EventLoop/LLDriver.h
+++ b/PhysicsAnalysis/D3PDTools/EventLoop/EventLoop/LLDriver.h
@@ -5,7 +5,7 @@
#ifndef EVENT_LOOP_LL_DRIVER_HH
#define EVENT_LOOP_LL_DRIVER_HH
-// Copyright Nils Krumnack 2012.
+//
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
diff --git a/PhysicsAnalysis/D3PDTools/EventLoop/EventLoop/LSFDriver.h b/PhysicsAnalysis/D3PDTools/EventLoop/EventLoop/LSFDriver.h
index 48f617b697df5c7c2078970663a76ce39376421d..d500f538719bfb76f2ebe01b6c9e9077ef914561 100644
--- a/PhysicsAnalysis/D3PDTools/EventLoop/EventLoop/LSFDriver.h
+++ b/PhysicsAnalysis/D3PDTools/EventLoop/EventLoop/LSFDriver.h
@@ -5,7 +5,7 @@
#ifndef EVENT_LOOP_LSF_DRIVER_HH
#define EVENT_LOOP_LSF_DRIVER_HH
-// Copyright Nils Krumnack 2012.
+//
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
diff --git a/PhysicsAnalysis/D3PDTools/EventLoop/EventLoop/LocalDriver.h b/PhysicsAnalysis/D3PDTools/EventLoop/EventLoop/LocalDriver.h
index c432ffdbf9d54a733619585610ef108d700b6a02..4aeb6a52d300c19d5556f2084cef77d89ae2f69c 100644
--- a/PhysicsAnalysis/D3PDTools/EventLoop/EventLoop/LocalDriver.h
+++ b/PhysicsAnalysis/D3PDTools/EventLoop/EventLoop/LocalDriver.h
@@ -5,7 +5,7 @@
#ifndef EVENT_LOOP_LOCAL_DRIVER_HH
#define EVENT_LOOP_LOCAL_DRIVER_HH
-// Copyright Nils Krumnack 2012.
+//
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
diff --git a/PhysicsAnalysis/D3PDTools/EventLoop/EventLoop/OutputStream.h b/PhysicsAnalysis/D3PDTools/EventLoop/EventLoop/OutputStream.h
index d7eea324b417da0719f5f1fb084b398ea8b36568..2076079d06646ae7ef8fca1095ae69a3622e4e92 100644
--- a/PhysicsAnalysis/D3PDTools/EventLoop/EventLoop/OutputStream.h
+++ b/PhysicsAnalysis/D3PDTools/EventLoop/EventLoop/OutputStream.h
@@ -5,7 +5,7 @@
#ifndef EVENT_LOOP_OUTPUT_STREAM_HH
#define EVENT_LOOP_OUTPUT_STREAM_HH
-// Copyright Nils Krumnack 2011.
+//
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
diff --git a/PhysicsAnalysis/D3PDTools/EventLoop/EventLoop/ProofArgs.h b/PhysicsAnalysis/D3PDTools/EventLoop/EventLoop/ProofArgs.h
index 7fb385b4582510452cbdce1e191a0a192e8d88b5..817882fa925943ec025eecfc70c3fa62dbda6378 100644
--- a/PhysicsAnalysis/D3PDTools/EventLoop/EventLoop/ProofArgs.h
+++ b/PhysicsAnalysis/D3PDTools/EventLoop/EventLoop/ProofArgs.h
@@ -5,7 +5,7 @@
#ifndef EVENT_LOOP_PROOF_ARGS_HH
#define EVENT_LOOP_PROOF_ARGS_HH
-// Copyright Nils Krumnack 2012.
+//
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
diff --git a/PhysicsAnalysis/D3PDTools/EventLoop/EventLoop/ProofDriver.h b/PhysicsAnalysis/D3PDTools/EventLoop/EventLoop/ProofDriver.h
index d747810bb8c9ddc2b56b312e906d343e5bb1fb25..6ad593e710f9c4864558903685cd64c6aed0b877 100644
--- a/PhysicsAnalysis/D3PDTools/EventLoop/EventLoop/ProofDriver.h
+++ b/PhysicsAnalysis/D3PDTools/EventLoop/EventLoop/ProofDriver.h
@@ -5,7 +5,7 @@
#ifndef EVENT_LOOP_PROOF_DRIVER_HH
#define EVENT_LOOP_PROOF_DRIVER_HH
-// Copyright Nils Krumnack 2011.
+//
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
diff --git a/PhysicsAnalysis/D3PDTools/EventLoop/EventLoop/ProofTSelector.h b/PhysicsAnalysis/D3PDTools/EventLoop/EventLoop/ProofTSelector.h
index 142b756b1363594740cd44c679738cb1678027f0..94a90b82e9da2af90be9063a6248c7baa5edb755 100644
--- a/PhysicsAnalysis/D3PDTools/EventLoop/EventLoop/ProofTSelector.h
+++ b/PhysicsAnalysis/D3PDTools/EventLoop/EventLoop/ProofTSelector.h
@@ -5,7 +5,7 @@
#ifndef EVENT_LOOP_PROOF_TSELECTOR_H
#define EVENT_LOOP_PROOF_TSELECTOR_H
-// Copyright Nils Krumnack 2011.
+//
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
diff --git a/PhysicsAnalysis/D3PDTools/EventLoop/EventLoop/ProofWorker.h b/PhysicsAnalysis/D3PDTools/EventLoop/EventLoop/ProofWorker.h
index a5e4d869dc2a5436ea0265c1432854627c07a554..cfbae69c1db21c34279dad1ff1ce6826c7722b11 100644
--- a/PhysicsAnalysis/D3PDTools/EventLoop/EventLoop/ProofWorker.h
+++ b/PhysicsAnalysis/D3PDTools/EventLoop/EventLoop/ProofWorker.h
@@ -5,7 +5,7 @@
#ifndef EVENT_LOOP_PROOF_WORKER_HH
#define EVENT_LOOP_PROOF_WORKER_HH
-// Copyright Nils Krumnack 2011.
+//
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
diff --git a/PhysicsAnalysis/D3PDTools/EventLoop/EventLoop/SlurmDriver.h b/PhysicsAnalysis/D3PDTools/EventLoop/EventLoop/SlurmDriver.h
index fb6fe4f9b5cccca14e7d955ca84bd6671830c59d..e95b97632ffecfe435b42558ebe5626ed0367fe3 100644
--- a/PhysicsAnalysis/D3PDTools/EventLoop/EventLoop/SlurmDriver.h
+++ b/PhysicsAnalysis/D3PDTools/EventLoop/EventLoop/SlurmDriver.h
@@ -5,7 +5,7 @@
#ifndef EVENT_LOOP_SLURM_DRIVER_HH
#define EVENT_LOOP_SLURM_DRIVER_HH
-// Copyright Nils Krumnack 2012.
+//
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
diff --git a/PhysicsAnalysis/D3PDTools/EventLoop/EventLoop/SoGEDriver.h b/PhysicsAnalysis/D3PDTools/EventLoop/EventLoop/SoGEDriver.h
index 84939e712a4e905b81663016b101bdca3e28a874..9de596fa64cdbbf840e7659d1654af050dce0386 100644
--- a/PhysicsAnalysis/D3PDTools/EventLoop/EventLoop/SoGEDriver.h
+++ b/PhysicsAnalysis/D3PDTools/EventLoop/EventLoop/SoGEDriver.h
@@ -5,7 +5,7 @@
#ifndef EVENT_LOOP_SOGE_DRIVER_HH
#define EVENT_LOOP_SOGE_DRIVER_HH
-// Copyright Nils Krumnack 2012.
+//
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
diff --git a/PhysicsAnalysis/D3PDTools/EventLoop/EventLoop/StatusCode.h b/PhysicsAnalysis/D3PDTools/EventLoop/EventLoop/StatusCode.h
index f60cce6501bea2300a9defb69032ecd7622d4853..f97cf9f96786da6cf21614a77b469c8815b0a66b 100644
--- a/PhysicsAnalysis/D3PDTools/EventLoop/EventLoop/StatusCode.h
+++ b/PhysicsAnalysis/D3PDTools/EventLoop/EventLoop/StatusCode.h
@@ -5,7 +5,7 @@
#ifndef EVENT_LOOP_STATUS_CODE_HH
#define EVENT_LOOP_STATUS_CODE_HH
-// Copyright Nils Krumnack 2012.
+//
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
diff --git a/PhysicsAnalysis/D3PDTools/EventLoop/EventLoop/TEventSvc.h b/PhysicsAnalysis/D3PDTools/EventLoop/EventLoop/TEventSvc.h
index 0e4e550ddd9f1251347513099ffed1c359f57b46..5489638c16b1f3cce9bcda8256a6ae0985256d6d 100644
--- a/PhysicsAnalysis/D3PDTools/EventLoop/EventLoop/TEventSvc.h
+++ b/PhysicsAnalysis/D3PDTools/EventLoop/EventLoop/TEventSvc.h
@@ -5,7 +5,7 @@
#ifndef EVENT_LOOP_TEVENT_SVC_H
#define EVENT_LOOP_TEVENT_SVC_H
-// Copyright Nils Krumnack 2012.
+//
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
diff --git a/PhysicsAnalysis/D3PDTools/EventLoop/EventLoop/TorqueDriver.h b/PhysicsAnalysis/D3PDTools/EventLoop/EventLoop/TorqueDriver.h
index 827fe1c00df33b419c7845b2a8c4699b44e278b9..4bcd5ced27a2a59a8bab8282f322b1fc3a8cbb1c 100644
--- a/PhysicsAnalysis/D3PDTools/EventLoop/EventLoop/TorqueDriver.h
+++ b/PhysicsAnalysis/D3PDTools/EventLoop/EventLoop/TorqueDriver.h
@@ -5,7 +5,7 @@
#ifndef EVENT_LOOP_TORQUE_DRIVER_HH
#define EVENT_LOOP_TORQUE_DRIVER_HH
-// Copyright Nils Krumnack 2012.
+//
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
diff --git a/PhysicsAnalysis/D3PDTools/EventLoop/EventLoop/UnitTest.h b/PhysicsAnalysis/D3PDTools/EventLoop/EventLoop/UnitTest.h
index eb454c68d888c1f6a7b283605ccd8553e9a05e12..288e5ea511923e3e322e7ca02f98e9b86e002da1 100644
--- a/PhysicsAnalysis/D3PDTools/EventLoop/EventLoop/UnitTest.h
+++ b/PhysicsAnalysis/D3PDTools/EventLoop/EventLoop/UnitTest.h
@@ -5,7 +5,7 @@
#ifndef EVENT_LOOP_UNIT_TEST_HH
#define EVENT_LOOP_UNIT_TEST_HH
-// Copyright Nils Krumnack 2011.
+//
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
diff --git a/PhysicsAnalysis/D3PDTools/EventLoop/EventLoop/UnitTestAlg.h b/PhysicsAnalysis/D3PDTools/EventLoop/EventLoop/UnitTestAlg.h
index f3101cdca0a47083da042f982beaf131efe439d7..ce1e4b0ccd781946a77fa9769f804762db766e17 100644
--- a/PhysicsAnalysis/D3PDTools/EventLoop/EventLoop/UnitTestAlg.h
+++ b/PhysicsAnalysis/D3PDTools/EventLoop/EventLoop/UnitTestAlg.h
@@ -5,7 +5,7 @@
#ifndef EVENT_LOOP_UNIT_TEST_ALG_H
#define EVENT_LOOP_UNIT_TEST_ALG_H
-// Copyright Nils Krumnack 2011.
+//
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
diff --git a/PhysicsAnalysis/D3PDTools/EventLoop/EventLoop/UnitTestAlg1.h b/PhysicsAnalysis/D3PDTools/EventLoop/EventLoop/UnitTestAlg1.h
index 7dc4a7b786bd070e670bbf73cbc2fa2565246324..04703e30c56c18610a8d717c6336f7b815caa355 100644
--- a/PhysicsAnalysis/D3PDTools/EventLoop/EventLoop/UnitTestAlg1.h
+++ b/PhysicsAnalysis/D3PDTools/EventLoop/EventLoop/UnitTestAlg1.h
@@ -5,7 +5,7 @@
#ifndef EVENT_LOOP_UNIT_TEST_ALG1_H
#define EVENT_LOOP_UNIT_TEST_ALG1_H
-// Copyright Nils Krumnack 2011.
+//
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
diff --git a/PhysicsAnalysis/D3PDTools/EventLoop/EventLoop/UnitTestConfig.h b/PhysicsAnalysis/D3PDTools/EventLoop/EventLoop/UnitTestConfig.h
index 9a6d9cdf1d161e86bca82b6ebf5c8121782fc677..7f0d62f0bad2c9079935f3d1fe67104a5f6f879c 100644
--- a/PhysicsAnalysis/D3PDTools/EventLoop/EventLoop/UnitTestConfig.h
+++ b/PhysicsAnalysis/D3PDTools/EventLoop/EventLoop/UnitTestConfig.h
@@ -5,7 +5,7 @@
#ifndef EVENT_LOOP__UNIT_TEST_CONFIG_H
#define EVENT_LOOP__UNIT_TEST_CONFIG_H
-// Copyright Iowa State University 2016.
+//
// Author: Nils Krumnack
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/PhysicsAnalysis/D3PDTools/EventLoop/EventLoop/UnitTestFixture.h b/PhysicsAnalysis/D3PDTools/EventLoop/EventLoop/UnitTestFixture.h
index d53544460dc9cc3a1e5ad42afc1323bfc8356074..639ed29d92c03f1c95f5fea8a1a3edf46dcebeae 100644
--- a/PhysicsAnalysis/D3PDTools/EventLoop/EventLoop/UnitTestFixture.h
+++ b/PhysicsAnalysis/D3PDTools/EventLoop/EventLoop/UnitTestFixture.h
@@ -5,7 +5,7 @@
#ifndef EVENT_LOOP__UNIT_TEST_FIXTURE_H
#define EVENT_LOOP__UNIT_TEST_FIXTURE_H
-// Copyright Iowa State University 2016.
+//
// Author: Nils Krumnack
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/PhysicsAnalysis/D3PDTools/EventLoop/EventLoop/UnitTestFixture.ihh b/PhysicsAnalysis/D3PDTools/EventLoop/EventLoop/UnitTestFixture.ihh
index 0116e818031e63d271ddda744ad0d2322f7bf48c..1ebca3c5d21292a9933cad8fb82cf4f460c8d918 100644
--- a/PhysicsAnalysis/D3PDTools/EventLoop/EventLoop/UnitTestFixture.ihh
+++ b/PhysicsAnalysis/D3PDTools/EventLoop/EventLoop/UnitTestFixture.ihh
@@ -1,4 +1,4 @@
-// Copyright Iowa State University 2016.
+//
// Author: Nils Krumnack
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/PhysicsAnalysis/D3PDTools/EventLoop/EventLoop/VomsProxySvc.h b/PhysicsAnalysis/D3PDTools/EventLoop/EventLoop/VomsProxySvc.h
index a736de50a1e915b49fc914c26379d0a746905ad6..310091c24557d9cbb9b2fdf68793c46ea26e9545 100644
--- a/PhysicsAnalysis/D3PDTools/EventLoop/EventLoop/VomsProxySvc.h
+++ b/PhysicsAnalysis/D3PDTools/EventLoop/EventLoop/VomsProxySvc.h
@@ -5,7 +5,7 @@
#ifndef EVENT_LOOP_VOMS_PROXY_SVC_H
#define EVENT_LOOP_VOMS_PROXY_SVC_H
-// Copyright Nils Krumnack 2016.
+//
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
diff --git a/PhysicsAnalysis/D3PDTools/EventLoop/EventLoop/Worker.h b/PhysicsAnalysis/D3PDTools/EventLoop/EventLoop/Worker.h
index 8bef7fe62b5438ceafc18f65f55315e0762009da..02f84bf78ea9290b3ddbd51f53bc5632fd1e3122 100644
--- a/PhysicsAnalysis/D3PDTools/EventLoop/EventLoop/Worker.h
+++ b/PhysicsAnalysis/D3PDTools/EventLoop/EventLoop/Worker.h
@@ -5,7 +5,7 @@
#ifndef EVENT_LOOP_WORKER_HH
#define EVENT_LOOP_WORKER_HH
-// Copyright Nils Krumnack 2011.
+//
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
diff --git a/PhysicsAnalysis/D3PDTools/EventLoop/Root/Algorithm.cxx b/PhysicsAnalysis/D3PDTools/EventLoop/Root/Algorithm.cxx
index bd14471057b8eca2164e50f20272b07e34db0ba7..b016fd53c815597186712cb6202caf55aef022fc 100644
--- a/PhysicsAnalysis/D3PDTools/EventLoop/Root/Algorithm.cxx
+++ b/PhysicsAnalysis/D3PDTools/EventLoop/Root/Algorithm.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-// Copyright Nils Krumnack 2011.
+//
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
diff --git a/PhysicsAnalysis/D3PDTools/EventLoop/Root/BackgroundDriver.cxx b/PhysicsAnalysis/D3PDTools/EventLoop/Root/BackgroundDriver.cxx
index 6a2153fec441f92b77ba6d69d753db41f3603ed8..b519113902c59dfb5821995f6c21eb8140c240ec 100644
--- a/PhysicsAnalysis/D3PDTools/EventLoop/Root/BackgroundDriver.cxx
+++ b/PhysicsAnalysis/D3PDTools/EventLoop/Root/BackgroundDriver.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-// Copyright Nils Krumnack 2011.
+//
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
diff --git a/PhysicsAnalysis/D3PDTools/EventLoop/Root/BackgroundJob.cxx b/PhysicsAnalysis/D3PDTools/EventLoop/Root/BackgroundJob.cxx
index 4b084e23579b159ae77d811f777390d51cff172d..90a61b16ced79375326adbc18429574728e4e596 100644
--- a/PhysicsAnalysis/D3PDTools/EventLoop/Root/BackgroundJob.cxx
+++ b/PhysicsAnalysis/D3PDTools/EventLoop/Root/BackgroundJob.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-// Copyright Nils Krumnack 2012.
+//
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
diff --git a/PhysicsAnalysis/D3PDTools/EventLoop/Root/BackgroundSocket.cxx b/PhysicsAnalysis/D3PDTools/EventLoop/Root/BackgroundSocket.cxx
index c7a82868e180421261fa13320cf4985801ac4f54..20f5c90d2855b963b80af5db089b748bfb5c9d3f 100644
--- a/PhysicsAnalysis/D3PDTools/EventLoop/Root/BackgroundSocket.cxx
+++ b/PhysicsAnalysis/D3PDTools/EventLoop/Root/BackgroundSocket.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-// Copyright Iowa State University 2015.
+//
// Author: Nils Krumnack
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/PhysicsAnalysis/D3PDTools/EventLoop/Root/BackgroundTSelector.cxx b/PhysicsAnalysis/D3PDTools/EventLoop/Root/BackgroundTSelector.cxx
index 4081a53342bbb208ade7145ee06e951354634c0b..9f04f3c5fd3ed510ba0e47875e61fefa8da844e7 100644
--- a/PhysicsAnalysis/D3PDTools/EventLoop/Root/BackgroundTSelector.cxx
+++ b/PhysicsAnalysis/D3PDTools/EventLoop/Root/BackgroundTSelector.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-// Copyright Nils Krumnack 2011.
+//
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
diff --git a/PhysicsAnalysis/D3PDTools/EventLoop/Root/BackgroundWorker.cxx b/PhysicsAnalysis/D3PDTools/EventLoop/Root/BackgroundWorker.cxx
index 2f5ed427a5316802d3f5a65dfbcd404a9463287b..d44be12029d7c0da4a9e4003617e448aa03ef635 100644
--- a/PhysicsAnalysis/D3PDTools/EventLoop/Root/BackgroundWorker.cxx
+++ b/PhysicsAnalysis/D3PDTools/EventLoop/Root/BackgroundWorker.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-// Copyright Nils Krumnack 2011.
+//
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
diff --git a/PhysicsAnalysis/D3PDTools/EventLoop/Root/BatchDriver.cxx b/PhysicsAnalysis/D3PDTools/EventLoop/Root/BatchDriver.cxx
index 2ceb9fd15c28b4d92d9d378bbf22f6daa1fb65b8..41ef77dbee8a82511cba95aed2f237a5f6be6981 100644
--- a/PhysicsAnalysis/D3PDTools/EventLoop/Root/BatchDriver.cxx
+++ b/PhysicsAnalysis/D3PDTools/EventLoop/Root/BatchDriver.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-// Copyright Nils Krumnack 2011.
+//
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
diff --git a/PhysicsAnalysis/D3PDTools/EventLoop/Root/BatchJob.cxx b/PhysicsAnalysis/D3PDTools/EventLoop/Root/BatchJob.cxx
index 807ffb1605f3995b4055f3eeb5505a4db6595928..7d82ac6d15b167cd8352b01af5a4bde972a7b309 100644
--- a/PhysicsAnalysis/D3PDTools/EventLoop/Root/BatchJob.cxx
+++ b/PhysicsAnalysis/D3PDTools/EventLoop/Root/BatchJob.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-// Copyright Nils Krumnack 2012.
+//
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
diff --git a/PhysicsAnalysis/D3PDTools/EventLoop/Root/BatchSample.cxx b/PhysicsAnalysis/D3PDTools/EventLoop/Root/BatchSample.cxx
index df7b69caa680092f0105e5a35d054d5b2f5a9bf7..f30f43491b329aef2b35647887dd5f9f71a74c93 100644
--- a/PhysicsAnalysis/D3PDTools/EventLoop/Root/BatchSample.cxx
+++ b/PhysicsAnalysis/D3PDTools/EventLoop/Root/BatchSample.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-// Copyright Nils Krumnack 2012.
+//
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
diff --git a/PhysicsAnalysis/D3PDTools/EventLoop/Root/BatchSegment.cxx b/PhysicsAnalysis/D3PDTools/EventLoop/Root/BatchSegment.cxx
index 82f0a7e6a3bb5fe11ae0260213ac76d384ebc1cc..8dd19e3a792590123c39c3cc1ce15e4e0f5e084c 100644
--- a/PhysicsAnalysis/D3PDTools/EventLoop/Root/BatchSegment.cxx
+++ b/PhysicsAnalysis/D3PDTools/EventLoop/Root/BatchSegment.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-// Copyright Nils Krumnack 2012.
+//
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
diff --git a/PhysicsAnalysis/D3PDTools/EventLoop/Root/BatchWorker.cxx b/PhysicsAnalysis/D3PDTools/EventLoop/Root/BatchWorker.cxx
index c4e5c818839dc3a89b0849820ff96b2cbd8ebaea..6d9695331c206732be1c6a3288e4a10772a01bf4 100644
--- a/PhysicsAnalysis/D3PDTools/EventLoop/Root/BatchWorker.cxx
+++ b/PhysicsAnalysis/D3PDTools/EventLoop/Root/BatchWorker.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-// Copyright Nils Krumnack 2011.
+//
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
diff --git a/PhysicsAnalysis/D3PDTools/EventLoop/Root/CondorDriver.cxx b/PhysicsAnalysis/D3PDTools/EventLoop/Root/CondorDriver.cxx
index bb59dd244776636086e54709b9857479dcd3c866..b6640383617795fead5a495deebdeb4897f3ed0f 100644
--- a/PhysicsAnalysis/D3PDTools/EventLoop/Root/CondorDriver.cxx
+++ b/PhysicsAnalysis/D3PDTools/EventLoop/Root/CondorDriver.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-// Copyright Nils Krumnack 2011.
+//
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
diff --git a/PhysicsAnalysis/D3PDTools/EventLoop/Root/D3PDReaderSvc.cxx b/PhysicsAnalysis/D3PDTools/EventLoop/Root/D3PDReaderSvc.cxx
index e9482a2148b00927b826ccf0b9e96c0cf4e88ada..ece842c92d56693ee4ec1454b3b585d2ae8c1723 100644
--- a/PhysicsAnalysis/D3PDTools/EventLoop/Root/D3PDReaderSvc.cxx
+++ b/PhysicsAnalysis/D3PDTools/EventLoop/Root/D3PDReaderSvc.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-// Copyright Nils Krumnack 2012.
+//
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
diff --git a/PhysicsAnalysis/D3PDTools/EventLoop/Root/DirectDriver.cxx b/PhysicsAnalysis/D3PDTools/EventLoop/Root/DirectDriver.cxx
index 5406220761333af8973efc20bf1b37386a1dc12e..e39ba0901d9601b378075c3877cb938db1564ec9 100644
--- a/PhysicsAnalysis/D3PDTools/EventLoop/Root/DirectDriver.cxx
+++ b/PhysicsAnalysis/D3PDTools/EventLoop/Root/DirectDriver.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-// Copyright Nils Krumnack 2011.
+//
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
diff --git a/PhysicsAnalysis/D3PDTools/EventLoop/Root/DirectWorker.cxx b/PhysicsAnalysis/D3PDTools/EventLoop/Root/DirectWorker.cxx
index b8f3a641a69fd7e5663389869b4e3034be04cc64..fce581ebe25f9ee2ae0282a1e44a860c62651cda 100644
--- a/PhysicsAnalysis/D3PDTools/EventLoop/Root/DirectWorker.cxx
+++ b/PhysicsAnalysis/D3PDTools/EventLoop/Root/DirectWorker.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-// Copyright Nils Krumnack 2011.
+//
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
diff --git a/PhysicsAnalysis/D3PDTools/EventLoop/Root/Driver.cxx b/PhysicsAnalysis/D3PDTools/EventLoop/Root/Driver.cxx
index 77d728f18c5267ae4c3e209473a256d24fd1ec6f..ce9fc21bdbb5adf8eac6ddcf3444f19bfeea702a 100644
--- a/PhysicsAnalysis/D3PDTools/EventLoop/Root/Driver.cxx
+++ b/PhysicsAnalysis/D3PDTools/EventLoop/Root/Driver.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-// Copyright Nils Krumnack 2011.
+//
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
diff --git a/PhysicsAnalysis/D3PDTools/EventLoop/Root/EmptyFileHandler.cxx b/PhysicsAnalysis/D3PDTools/EventLoop/Root/EmptyFileHandler.cxx
index 55f9d996049e13aa87f790e4e6607d348c8beba4..b28438bef1b1ef11d84125f0adaf5a162dbfd383 100644
--- a/PhysicsAnalysis/D3PDTools/EventLoop/Root/EmptyFileHandler.cxx
+++ b/PhysicsAnalysis/D3PDTools/EventLoop/Root/EmptyFileHandler.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-// Copyright Iowa State University 2015.
+//
// Author: Nils Krumnack
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/PhysicsAnalysis/D3PDTools/EventLoop/Root/GEDriver.cxx b/PhysicsAnalysis/D3PDTools/EventLoop/Root/GEDriver.cxx
index 2afd78d3df1e892dae79e640b79e6b6bcf88e28a..d67ecaa37e7e0dd4482c9cbb98e378879b0c48d1 100644
--- a/PhysicsAnalysis/D3PDTools/EventLoop/Root/GEDriver.cxx
+++ b/PhysicsAnalysis/D3PDTools/EventLoop/Root/GEDriver.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-// Copyright Nils Krumnack 2011.
+//
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
diff --git a/PhysicsAnalysis/D3PDTools/EventLoop/Root/Job.cxx b/PhysicsAnalysis/D3PDTools/EventLoop/Root/Job.cxx
index 79b8009b0fb54c37e9da718d5c74b47c8f9d91b3..4af3c4583f4f41d1b3140df41cd4e1ce56100a0a 100644
--- a/PhysicsAnalysis/D3PDTools/EventLoop/Root/Job.cxx
+++ b/PhysicsAnalysis/D3PDTools/EventLoop/Root/Job.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-// Copyright Nils Krumnack 2011.
+//
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
diff --git a/PhysicsAnalysis/D3PDTools/EventLoop/Root/LLDriver.cxx b/PhysicsAnalysis/D3PDTools/EventLoop/Root/LLDriver.cxx
index 1a5dc6de11f233ec16090d604b63285f87c22c1c..e239012adcd0f0794d8302d1710c5cec48ba5521 100644
--- a/PhysicsAnalysis/D3PDTools/EventLoop/Root/LLDriver.cxx
+++ b/PhysicsAnalysis/D3PDTools/EventLoop/Root/LLDriver.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-// Copyright Nils Krumnack 2011, Morten Dam Joergensen 2012.
+// Morten Dam Joergensen 2012.
//
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/PhysicsAnalysis/D3PDTools/EventLoop/Root/LSFDriver.cxx b/PhysicsAnalysis/D3PDTools/EventLoop/Root/LSFDriver.cxx
index 115207af4129d3b147c9da8061092bad8a4061d5..e519ad890a8383c0eb43b2f5bc463613048d75e2 100644
--- a/PhysicsAnalysis/D3PDTools/EventLoop/Root/LSFDriver.cxx
+++ b/PhysicsAnalysis/D3PDTools/EventLoop/Root/LSFDriver.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-// Copyright Nils Krumnack 2011.
+//
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
diff --git a/PhysicsAnalysis/D3PDTools/EventLoop/Root/LocalDriver.cxx b/PhysicsAnalysis/D3PDTools/EventLoop/Root/LocalDriver.cxx
index 37a993c13fd4870b2115b2ddb91e912d2ef03cda..853011bd9f9788772d8e812afd889280e98b95dc 100644
--- a/PhysicsAnalysis/D3PDTools/EventLoop/Root/LocalDriver.cxx
+++ b/PhysicsAnalysis/D3PDTools/EventLoop/Root/LocalDriver.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-// Copyright Nils Krumnack 2011.
+//
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
diff --git a/PhysicsAnalysis/D3PDTools/EventLoop/Root/OutputStream.cxx b/PhysicsAnalysis/D3PDTools/EventLoop/Root/OutputStream.cxx
index 2bd0da08ec6dc8bf709ba657fb801e67b17b6a91..ecc08d7c7ed52315396d22f2e6476e2bf75e8494 100644
--- a/PhysicsAnalysis/D3PDTools/EventLoop/Root/OutputStream.cxx
+++ b/PhysicsAnalysis/D3PDTools/EventLoop/Root/OutputStream.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-// Copyright Nils Krumnack 2011.
+//
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
diff --git a/PhysicsAnalysis/D3PDTools/EventLoop/Root/ProofArgs.cxx b/PhysicsAnalysis/D3PDTools/EventLoop/Root/ProofArgs.cxx
index f43c5e285a58fd0b13db815831bddf950cea001c..44513105c5a3727f56ebfef21775262fad6e7fe4 100644
--- a/PhysicsAnalysis/D3PDTools/EventLoop/Root/ProofArgs.cxx
+++ b/PhysicsAnalysis/D3PDTools/EventLoop/Root/ProofArgs.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-// Copyright Nils Krumnack 2012.
+//
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
diff --git a/PhysicsAnalysis/D3PDTools/EventLoop/Root/ProofDriver.cxx b/PhysicsAnalysis/D3PDTools/EventLoop/Root/ProofDriver.cxx
index 232be2baab30396fe501ef2c684a3cfc64f5b1a1..1fbade91332003ee4c0710f8c400e187a40b9532 100644
--- a/PhysicsAnalysis/D3PDTools/EventLoop/Root/ProofDriver.cxx
+++ b/PhysicsAnalysis/D3PDTools/EventLoop/Root/ProofDriver.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-// Copyright Nils Krumnack 2011.
+//
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
diff --git a/PhysicsAnalysis/D3PDTools/EventLoop/Root/ProofTSelector.cxx b/PhysicsAnalysis/D3PDTools/EventLoop/Root/ProofTSelector.cxx
index c1ef5531544fdd7dd8015903745068f49b160cf8..5866fc6b84712ebb2b0eb6dc7fa737c5f50cf53d 100644
--- a/PhysicsAnalysis/D3PDTools/EventLoop/Root/ProofTSelector.cxx
+++ b/PhysicsAnalysis/D3PDTools/EventLoop/Root/ProofTSelector.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-// Copyright Nils Krumnack 2011.
+//
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
diff --git a/PhysicsAnalysis/D3PDTools/EventLoop/Root/ProofWorker.cxx b/PhysicsAnalysis/D3PDTools/EventLoop/Root/ProofWorker.cxx
index f21fb392e8a66a3a727ae6a56ea3cfdf8a6c1beb..64febafb9d01c193520659c68a3c65ce0d8b0eb2 100644
--- a/PhysicsAnalysis/D3PDTools/EventLoop/Root/ProofWorker.cxx
+++ b/PhysicsAnalysis/D3PDTools/EventLoop/Root/ProofWorker.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-// Copyright Nils Krumnack 2011.
+//
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
diff --git a/PhysicsAnalysis/D3PDTools/EventLoop/Root/SlurmDriver.cxx b/PhysicsAnalysis/D3PDTools/EventLoop/Root/SlurmDriver.cxx
index 0d4e5b89a9fa3fca074857642741f729e166dec6..c79c6c7fbb839207ca9c19e867d03b193fb3b016 100644
--- a/PhysicsAnalysis/D3PDTools/EventLoop/Root/SlurmDriver.cxx
+++ b/PhysicsAnalysis/D3PDTools/EventLoop/Root/SlurmDriver.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-// Copyright Nils Krumnack 2011.
+//
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
diff --git a/PhysicsAnalysis/D3PDTools/EventLoop/Root/SoGEDriver.cxx b/PhysicsAnalysis/D3PDTools/EventLoop/Root/SoGEDriver.cxx
index 35c0b3ef0e7db70b09e3e53f00d1b26eca2d03f6..d559378340ddf6812b4291760dcdfbfb3c148414 100644
--- a/PhysicsAnalysis/D3PDTools/EventLoop/Root/SoGEDriver.cxx
+++ b/PhysicsAnalysis/D3PDTools/EventLoop/Root/SoGEDriver.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-// Copyright Nils Krumnack 2011
+//
// Dennis Sperlich 2015.
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/PhysicsAnalysis/D3PDTools/EventLoop/Root/TEventSvc.cxx b/PhysicsAnalysis/D3PDTools/EventLoop/Root/TEventSvc.cxx
index c034d956246d0d62cecfaaaeedf72d8bb3ed761f..17184310fa9fd74b42dea4ff4aba0499f1404a24 100644
--- a/PhysicsAnalysis/D3PDTools/EventLoop/Root/TEventSvc.cxx
+++ b/PhysicsAnalysis/D3PDTools/EventLoop/Root/TEventSvc.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-// Copyright Nils Krumnack 2012.
+//
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
diff --git a/PhysicsAnalysis/D3PDTools/EventLoop/Root/TorqueDriver.cxx b/PhysicsAnalysis/D3PDTools/EventLoop/Root/TorqueDriver.cxx
index a8d89e33cd72fd25dc4644ae78d3ed0cc149a9e0..fb440144a99488f75d25a962e4fb2540e512a2df 100644
--- a/PhysicsAnalysis/D3PDTools/EventLoop/Root/TorqueDriver.cxx
+++ b/PhysicsAnalysis/D3PDTools/EventLoop/Root/TorqueDriver.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-// Copyright Nils Krumnack 2011.
+//
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
diff --git a/PhysicsAnalysis/D3PDTools/EventLoop/Root/UnitTest.cxx b/PhysicsAnalysis/D3PDTools/EventLoop/Root/UnitTest.cxx
index fc189ea914c82aac2324e8d4f7a4d019d74a7cf4..20cfaf6ca6c2ad277d37b9dd67cc128869ea1c76 100644
--- a/PhysicsAnalysis/D3PDTools/EventLoop/Root/UnitTest.cxx
+++ b/PhysicsAnalysis/D3PDTools/EventLoop/Root/UnitTest.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-// Copyright Nils Krumnack 2011.
+//
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
diff --git a/PhysicsAnalysis/D3PDTools/EventLoop/Root/UnitTestAlg.cxx b/PhysicsAnalysis/D3PDTools/EventLoop/Root/UnitTestAlg.cxx
index 57758bbe0d75a53ddeea405d128afb8249c35e39..43551a6b5a699b31a1c675d640463f028c12605c 100644
--- a/PhysicsAnalysis/D3PDTools/EventLoop/Root/UnitTestAlg.cxx
+++ b/PhysicsAnalysis/D3PDTools/EventLoop/Root/UnitTestAlg.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-// Copyright Nils Krumnack 2011.
+//
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
diff --git a/PhysicsAnalysis/D3PDTools/EventLoop/Root/UnitTestAlg1.cxx b/PhysicsAnalysis/D3PDTools/EventLoop/Root/UnitTestAlg1.cxx
index 2c67fd217f5e540ad9e73fc5c14603eecb49917a..fc4e7803b63cca837fc6521268bd5df983cba79d 100644
--- a/PhysicsAnalysis/D3PDTools/EventLoop/Root/UnitTestAlg1.cxx
+++ b/PhysicsAnalysis/D3PDTools/EventLoop/Root/UnitTestAlg1.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-// Copyright Nils Krumnack 2011.
+//
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
diff --git a/PhysicsAnalysis/D3PDTools/EventLoop/Root/UnitTestConfig.cxx b/PhysicsAnalysis/D3PDTools/EventLoop/Root/UnitTestConfig.cxx
index 413e4103368fe18dbd518d529b11152b52dbc2fd..43113c6b6351eda4683ee9fd4bffb0999182a5fd 100644
--- a/PhysicsAnalysis/D3PDTools/EventLoop/Root/UnitTestConfig.cxx
+++ b/PhysicsAnalysis/D3PDTools/EventLoop/Root/UnitTestConfig.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-// Copyright Iowa State University 2016.
+//
// Author: Nils Krumnack
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/PhysicsAnalysis/D3PDTools/EventLoop/Root/UnitTestFixture.cxx b/PhysicsAnalysis/D3PDTools/EventLoop/Root/UnitTestFixture.cxx
index 618789a714126bcb0b4c96ff2fb8a759f06ad270..18f21038dabb21d87c11fba2e63070c1f63d76e1 100644
--- a/PhysicsAnalysis/D3PDTools/EventLoop/Root/UnitTestFixture.cxx
+++ b/PhysicsAnalysis/D3PDTools/EventLoop/Root/UnitTestFixture.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-// Copyright Iowa State University 2016.
+//
// Author: Nils Krumnack
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/PhysicsAnalysis/D3PDTools/EventLoop/Root/VomsProxySvc.cxx b/PhysicsAnalysis/D3PDTools/EventLoop/Root/VomsProxySvc.cxx
index afdd375f8341b082a4439e88d67bb0a1a54d6af1..51a8f19963573af0e39596c48ba3c6ef6d8b7ed3 100644
--- a/PhysicsAnalysis/D3PDTools/EventLoop/Root/VomsProxySvc.cxx
+++ b/PhysicsAnalysis/D3PDTools/EventLoop/Root/VomsProxySvc.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-// Copyright Nils Krumnack 2016.
+//
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
diff --git a/PhysicsAnalysis/D3PDTools/EventLoop/Root/Worker.cxx b/PhysicsAnalysis/D3PDTools/EventLoop/Root/Worker.cxx
index c76f57535d5687f47ea3f3e70fe5bcb32c84faef..08fe456c31a6062a06665d57189c1c88ef5d076f 100644
--- a/PhysicsAnalysis/D3PDTools/EventLoop/Root/Worker.cxx
+++ b/PhysicsAnalysis/D3PDTools/EventLoop/Root/Worker.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-// Copyright Nils Krumnack 2011.
+//
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
diff --git a/PhysicsAnalysis/D3PDTools/EventLoop/test/gt_DirectDriver.cxx b/PhysicsAnalysis/D3PDTools/EventLoop/test/gt_DirectDriver.cxx
index c99052346df64d5a0f409fe57f1588ff417a640d..b5b3b40e540e5acbb026a65b6c7984efafc652fd 100644
--- a/PhysicsAnalysis/D3PDTools/EventLoop/test/gt_DirectDriver.cxx
+++ b/PhysicsAnalysis/D3PDTools/EventLoop/test/gt_DirectDriver.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-// Copyright Iowa State University 2016.
+//
// Author: Nils Krumnack
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/PhysicsAnalysis/D3PDTools/EventLoop/test/gt_LSFDriver_EOS.cxx b/PhysicsAnalysis/D3PDTools/EventLoop/test/gt_LSFDriver_EOS.cxx
index db67291be4bdbe29a2a8f858dde5a79998a5f796..d3546716df10a76381814810268558514d70c201 100644
--- a/PhysicsAnalysis/D3PDTools/EventLoop/test/gt_LSFDriver_EOS.cxx
+++ b/PhysicsAnalysis/D3PDTools/EventLoop/test/gt_LSFDriver_EOS.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-// Copyright Iowa State University 2016.
+//
// Author: Nils Krumnack
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/PhysicsAnalysis/D3PDTools/EventLoop/test/gt_LocalDriver.cxx b/PhysicsAnalysis/D3PDTools/EventLoop/test/gt_LocalDriver.cxx
index d798f39ae850eb67c96f6fb6008c3937e68dbd0f..2b449a7643f98f944bfc4614231abf68c565c083 100644
--- a/PhysicsAnalysis/D3PDTools/EventLoop/test/gt_LocalDriver.cxx
+++ b/PhysicsAnalysis/D3PDTools/EventLoop/test/gt_LocalDriver.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-// Copyright Iowa State University 2016.
+//
// Author: Nils Krumnack
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/PhysicsAnalysis/D3PDTools/EventLoop/test/gt_ProofDriver.cxx b/PhysicsAnalysis/D3PDTools/EventLoop/test/gt_ProofDriver.cxx
index e911a70c5099d0497983e2ea42fa23dc2c12cbcb..43cda630d77e25973b4c6ab651e505cb29429eae 100644
--- a/PhysicsAnalysis/D3PDTools/EventLoop/test/gt_ProofDriver.cxx
+++ b/PhysicsAnalysis/D3PDTools/EventLoop/test/gt_ProofDriver.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-// Copyright Iowa State University 2016.
+//
// Author: Nils Krumnack
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/PhysicsAnalysis/D3PDTools/EventLoop/test/ut_background_driver.cxx b/PhysicsAnalysis/D3PDTools/EventLoop/test/ut_background_driver.cxx
index f8cb67e9bd4fe28c38e9f620afe593a12862e613..028d5d2a40edeb78f0d0c13dd93e9c92686be61a 100644
--- a/PhysicsAnalysis/D3PDTools/EventLoop/test/ut_background_driver.cxx
+++ b/PhysicsAnalysis/D3PDTools/EventLoop/test/ut_background_driver.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-// Copyright Nils Krumnack 2011.
+//
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
diff --git a/PhysicsAnalysis/D3PDTools/EventLoop/test/ut_background_socket.cxx b/PhysicsAnalysis/D3PDTools/EventLoop/test/ut_background_socket.cxx
index 6c501267411a4bfb3f0fb6470c0bc788d09ea487..98ed9854e9663c220b39b80e7d19a383e0fa1164 100644
--- a/PhysicsAnalysis/D3PDTools/EventLoop/test/ut_background_socket.cxx
+++ b/PhysicsAnalysis/D3PDTools/EventLoop/test/ut_background_socket.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-// Copyright Iowa State University 2015.
+//
// Author: Nils Krumnack
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/PhysicsAnalysis/D3PDTools/EventLoop/test/ut_driver_condor.cxx b/PhysicsAnalysis/D3PDTools/EventLoop/test/ut_driver_condor.cxx
index cebd3a522ddbcb5afbbf736491ceafd46706cfbe..6f842a8ded88a9f947415ed1fa44d8b4fa53d41a 100644
--- a/PhysicsAnalysis/D3PDTools/EventLoop/test/ut_driver_condor.cxx
+++ b/PhysicsAnalysis/D3PDTools/EventLoop/test/ut_driver_condor.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-// Copyright Nils Krumnack 2011.
+//
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
diff --git a/PhysicsAnalysis/D3PDTools/EventLoop/test/ut_driver_direct.cxx b/PhysicsAnalysis/D3PDTools/EventLoop/test/ut_driver_direct.cxx
index 0c77f0a777558be6b3465538c612cd4f8afe0e13..9e4e7d3548e02881b72dc53efe5e14d4c6eb3c45 100644
--- a/PhysicsAnalysis/D3PDTools/EventLoop/test/ut_driver_direct.cxx
+++ b/PhysicsAnalysis/D3PDTools/EventLoop/test/ut_driver_direct.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-// Copyright Nils Krumnack 2011.
+//
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
diff --git a/PhysicsAnalysis/D3PDTools/EventLoop/test/ut_driver_ll.cxx b/PhysicsAnalysis/D3PDTools/EventLoop/test/ut_driver_ll.cxx
index fbd4a4ced4d8947783d63deb1aa8ff49bc2a8e11..23f2a839768612941e511446fd660a4df049030e 100644
--- a/PhysicsAnalysis/D3PDTools/EventLoop/test/ut_driver_ll.cxx
+++ b/PhysicsAnalysis/D3PDTools/EventLoop/test/ut_driver_ll.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-// Copyright Nils Krumnack 2011.
+//
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
diff --git a/PhysicsAnalysis/D3PDTools/EventLoop/test/ut_driver_local.cxx b/PhysicsAnalysis/D3PDTools/EventLoop/test/ut_driver_local.cxx
index f750f79cd8a3a0bf2d13ef86c7c729a6180dff57..db1473bb81a4b682ffbddb9d89c0f2535a85065f 100644
--- a/PhysicsAnalysis/D3PDTools/EventLoop/test/ut_driver_local.cxx
+++ b/PhysicsAnalysis/D3PDTools/EventLoop/test/ut_driver_local.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-// Copyright Nils Krumnack 2011.
+//
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
diff --git a/PhysicsAnalysis/D3PDTools/EventLoop/test/ut_driver_local_no_unsetup.cxx b/PhysicsAnalysis/D3PDTools/EventLoop/test/ut_driver_local_no_unsetup.cxx
index adb650814ad5a2d10d444ede7ef63eb1f0604fe1..a4b3a429d2a9eebf64db6cdf3bede0cc8d7f7cfe 100644
--- a/PhysicsAnalysis/D3PDTools/EventLoop/test/ut_driver_local_no_unsetup.cxx
+++ b/PhysicsAnalysis/D3PDTools/EventLoop/test/ut_driver_local_no_unsetup.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-// Copyright Nils Krumnack 2011.
+//
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
diff --git a/PhysicsAnalysis/D3PDTools/EventLoop/test/ut_driver_local_nosharedfs.cxx b/PhysicsAnalysis/D3PDTools/EventLoop/test/ut_driver_local_nosharedfs.cxx
index 40ccb8b7b46f8b30ed3c850b75f3156fac0c9e25..2ee12506ed477569801c027fc2fdf9cee7e3f29b 100644
--- a/PhysicsAnalysis/D3PDTools/EventLoop/test/ut_driver_local_nosharedfs.cxx
+++ b/PhysicsAnalysis/D3PDTools/EventLoop/test/ut_driver_local_nosharedfs.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-// Copyright Nils Krumnack 2011.
+//
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
diff --git a/PhysicsAnalysis/D3PDTools/EventLoop/test/ut_driver_local_split.cxx b/PhysicsAnalysis/D3PDTools/EventLoop/test/ut_driver_local_split.cxx
index e96a748073414fa9eb82687d8d528fe1cc7bbf47..89f282f6e97b59e3542c73ba4f71ab7fbd4a8e58 100644
--- a/PhysicsAnalysis/D3PDTools/EventLoop/test/ut_driver_local_split.cxx
+++ b/PhysicsAnalysis/D3PDTools/EventLoop/test/ut_driver_local_split.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-// Copyright Nils Krumnack 2011.
+//
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
diff --git a/PhysicsAnalysis/D3PDTools/EventLoop/test/ut_driver_lsf.cxx b/PhysicsAnalysis/D3PDTools/EventLoop/test/ut_driver_lsf.cxx
index 57d5872e16bfa0784afc01a8d322fa7b12dcdc00..cd778dc94dd84123eeff5a3119e2644f4d60ca33 100644
--- a/PhysicsAnalysis/D3PDTools/EventLoop/test/ut_driver_lsf.cxx
+++ b/PhysicsAnalysis/D3PDTools/EventLoop/test/ut_driver_lsf.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-// Copyright Nils Krumnack 2011.
+//
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
diff --git a/PhysicsAnalysis/D3PDTools/EventLoop/test/ut_driver_proof_farm.cxx b/PhysicsAnalysis/D3PDTools/EventLoop/test/ut_driver_proof_farm.cxx
index ab645d418bc30ea24c9a6ff4142829f7332a23b3..a763914fc3babd85b346b6d31da61534b8dcb356 100644
--- a/PhysicsAnalysis/D3PDTools/EventLoop/test/ut_driver_proof_farm.cxx
+++ b/PhysicsAnalysis/D3PDTools/EventLoop/test/ut_driver_proof_farm.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-// Copyright Nils Krumnack 2011.
+//
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
diff --git a/PhysicsAnalysis/D3PDTools/EventLoop/test/ut_driver_proof_lite.cxx b/PhysicsAnalysis/D3PDTools/EventLoop/test/ut_driver_proof_lite.cxx
index e13c1e4b56e47a47ca7bea1a784df15ce141d902..38ef643aa487879ddf876d0151c9c4e8a4903f59 100644
--- a/PhysicsAnalysis/D3PDTools/EventLoop/test/ut_driver_proof_lite.cxx
+++ b/PhysicsAnalysis/D3PDTools/EventLoop/test/ut_driver_proof_lite.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-// Copyright Nils Krumnack 2011.
+//
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
diff --git a/PhysicsAnalysis/D3PDTools/EventLoop/test/ut_driver_proof_lite_bg.cxx b/PhysicsAnalysis/D3PDTools/EventLoop/test/ut_driver_proof_lite_bg.cxx
index 7121600e40e0c3dcccab64271d06785cd62b4c1a..660420aec5306f5d3bfad8e1a21fa635ef77a70b 100644
--- a/PhysicsAnalysis/D3PDTools/EventLoop/test/ut_driver_proof_lite_bg.cxx
+++ b/PhysicsAnalysis/D3PDTools/EventLoop/test/ut_driver_proof_lite_bg.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-// Copyright Nils Krumnack 2011.
+//
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
diff --git a/PhysicsAnalysis/D3PDTools/EventLoop/test/ut_driver_proof_lite_macro.C b/PhysicsAnalysis/D3PDTools/EventLoop/test/ut_driver_proof_lite_macro.C
index 9425cfdd3ad227bc6b6444d61c23646556d8456e..dc855b76bb7656104b4f9374d08512ff00387c8f 100644
--- a/PhysicsAnalysis/D3PDTools/EventLoop/test/ut_driver_proof_lite_macro.C
+++ b/PhysicsAnalysis/D3PDTools/EventLoop/test/ut_driver_proof_lite_macro.C
@@ -2,7 +2,7 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-// Copyright Nils Krumnack 2011.
+//
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
diff --git a/PhysicsAnalysis/D3PDTools/EventLoop/test/ut_driver_torque.cxx b/PhysicsAnalysis/D3PDTools/EventLoop/test/ut_driver_torque.cxx
index 591213cbd1495584dcbfdb1dc531f3804a36deab..5daf5719eb4ae24a775a9d3fdf91a636278efa3b 100644
--- a/PhysicsAnalysis/D3PDTools/EventLoop/test/ut_driver_torque.cxx
+++ b/PhysicsAnalysis/D3PDTools/EventLoop/test/ut_driver_torque.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-// Copyright Nils Krumnack 2011.
+//
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
diff --git a/PhysicsAnalysis/D3PDTools/EventLoop/test/ut_streamer.cxx b/PhysicsAnalysis/D3PDTools/EventLoop/test/ut_streamer.cxx
index dd53eed4e9a3fa0816bdb1f9a9a16954005f4657..f7a41e0f8dfd6b7ccdcaf9741389832772dd9a00 100644
--- a/PhysicsAnalysis/D3PDTools/EventLoop/test/ut_streamer.cxx
+++ b/PhysicsAnalysis/D3PDTools/EventLoop/test/ut_streamer.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-// Copyright Nils Krumnack 2011.
+//
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
diff --git a/PhysicsAnalysis/D3PDTools/EventLoop/test/ut_xrootd_input.cxx b/PhysicsAnalysis/D3PDTools/EventLoop/test/ut_xrootd_input.cxx
index b03f2d0f36ad9d4f9e6b050991b6f1f7068e1a35..039a74d2d547bee1aa4dc05a4f49cc2d1188528e 100644
--- a/PhysicsAnalysis/D3PDTools/EventLoop/test/ut_xrootd_input.cxx
+++ b/PhysicsAnalysis/D3PDTools/EventLoop/test/ut_xrootd_input.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-// Copyright Nils Krumnack 2011.
+//
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
diff --git a/PhysicsAnalysis/D3PDTools/EventLoop/test/ut_xrootd_output.cxx b/PhysicsAnalysis/D3PDTools/EventLoop/test/ut_xrootd_output.cxx
index 454ab3cf272d1fab06d9fcff0f6c5e580af75dc3..7bee4d1221b4fda3ef9b08aa4b0fa1cd4047a11c 100644
--- a/PhysicsAnalysis/D3PDTools/EventLoop/test/ut_xrootd_output.cxx
+++ b/PhysicsAnalysis/D3PDTools/EventLoop/test/ut_xrootd_output.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-// Copyright Nils Krumnack 2011.
+//
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
diff --git a/PhysicsAnalysis/D3PDTools/EventLoopAlgs/EventLoopAlgs/AlgSelect.h b/PhysicsAnalysis/D3PDTools/EventLoopAlgs/EventLoopAlgs/AlgSelect.h
index 3d35d5fc0529ac154a4e24a718594449fe7c23f6..3f7a96ccec07dfe5d144c3baa8deae79baa4fa1d 100644
--- a/PhysicsAnalysis/D3PDTools/EventLoopAlgs/EventLoopAlgs/AlgSelect.h
+++ b/PhysicsAnalysis/D3PDTools/EventLoopAlgs/EventLoopAlgs/AlgSelect.h
@@ -5,7 +5,7 @@
#ifndef EVENT_LOOP_ALGS__ALG_SELECT_H
#define EVENT_LOOP_ALGS__ALG_SELECT_H
-// Copyright Nils Krumnack 2011 - 2012.
+// - 2012.
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
diff --git a/PhysicsAnalysis/D3PDTools/EventLoopAlgs/EventLoopAlgs/DuplicateChecker.h b/PhysicsAnalysis/D3PDTools/EventLoopAlgs/EventLoopAlgs/DuplicateChecker.h
index e6bb060c13894f4883ee23ccf434b10a95e8837d..4714a30b66aeb0abab0f9a4266978bdfe59d3792 100644
--- a/PhysicsAnalysis/D3PDTools/EventLoopAlgs/EventLoopAlgs/DuplicateChecker.h
+++ b/PhysicsAnalysis/D3PDTools/EventLoopAlgs/EventLoopAlgs/DuplicateChecker.h
@@ -5,7 +5,7 @@
#ifndef EVENT_LOOP_ALGS__DUPLICATE_CHECKER_H
#define EVENT_LOOP_ALGS__DUPLICATE_CHECKER_H
-// Copyright Iowa State University 2015.
+//
// Author: Nils Krumnack
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/PhysicsAnalysis/D3PDTools/EventLoopAlgs/EventLoopAlgs/Global.h b/PhysicsAnalysis/D3PDTools/EventLoopAlgs/EventLoopAlgs/Global.h
index aedf346b610f4cc239676d63b65e46e693baf645..855221f221fb17ee902530716c8c854cac9e3d2d 100644
--- a/PhysicsAnalysis/D3PDTools/EventLoopAlgs/EventLoopAlgs/Global.h
+++ b/PhysicsAnalysis/D3PDTools/EventLoopAlgs/EventLoopAlgs/Global.h
@@ -5,7 +5,7 @@
#ifndef EVENT_LOOP_ALGS__GLOBAL_H
#define EVENT_LOOP_ALGS__GLOBAL_H
-// Copyright Nils Krumnack 2011 - 2012.
+// - 2012.
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
diff --git a/PhysicsAnalysis/D3PDTools/EventLoopAlgs/EventLoopAlgs/NTupleSvc.h b/PhysicsAnalysis/D3PDTools/EventLoopAlgs/EventLoopAlgs/NTupleSvc.h
index a5b7217b08d007a64921724b33c8199e9d0a75a3..f5ca9ed33b727a538c4631186bb3af13886da820 100644
--- a/PhysicsAnalysis/D3PDTools/EventLoopAlgs/EventLoopAlgs/NTupleSvc.h
+++ b/PhysicsAnalysis/D3PDTools/EventLoopAlgs/EventLoopAlgs/NTupleSvc.h
@@ -5,7 +5,7 @@
#ifndef EVENT_LOOP_ALGS__NTUPLE_SVC_H
#define EVENT_LOOP_ALGS__NTUPLE_SVC_H
-// Copyright Nils Krumnack 2012.
+//
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
diff --git a/PhysicsAnalysis/D3PDTools/EventLoopAlgs/EventLoopAlgs/UnitTestSkim.h b/PhysicsAnalysis/D3PDTools/EventLoopAlgs/EventLoopAlgs/UnitTestSkim.h
index 42b301afd664e9cd0a9765b223d4cd1df6198436..3c7e44f407b32d04a9157d2039c99202404dbc46 100644
--- a/PhysicsAnalysis/D3PDTools/EventLoopAlgs/EventLoopAlgs/UnitTestSkim.h
+++ b/PhysicsAnalysis/D3PDTools/EventLoopAlgs/EventLoopAlgs/UnitTestSkim.h
@@ -5,7 +5,7 @@
#ifndef EVENT_LOOP_ALGS_UNIT_TEST_SKIM_H
#define EVENT_LOOP_ALGS_UNIT_TEST_SKIM_H
-// Copyright Nils Krumnack 2012.
+//
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
diff --git a/PhysicsAnalysis/D3PDTools/EventLoopAlgs/EventLoopAlgs/WhiteBoardSvc.h b/PhysicsAnalysis/D3PDTools/EventLoopAlgs/EventLoopAlgs/WhiteBoardSvc.h
index 9969ab42ef6f074f4bc2f96ed36e077b346b1f72..923f678b85588e109fea749132aaf748fe7449d7 100644
--- a/PhysicsAnalysis/D3PDTools/EventLoopAlgs/EventLoopAlgs/WhiteBoardSvc.h
+++ b/PhysicsAnalysis/D3PDTools/EventLoopAlgs/EventLoopAlgs/WhiteBoardSvc.h
@@ -5,7 +5,7 @@
#ifndef EVENT_LOOP_ALGS__WHITE_BOARD_SVC_H
#define EVENT_LOOP_ALGS__WHITE_BOARD_SVC_H
-// Copyright Nils Krumnack 2012.
+//
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
diff --git a/PhysicsAnalysis/D3PDTools/EventLoopAlgs/Root/AlgSelect.cxx b/PhysicsAnalysis/D3PDTools/EventLoopAlgs/Root/AlgSelect.cxx
index d028f6a90f6079ea6e6c1382399a6b4b9853cf7b..4ba973fc6187dd5375a662282da7672514b0e203 100644
--- a/PhysicsAnalysis/D3PDTools/EventLoopAlgs/Root/AlgSelect.cxx
+++ b/PhysicsAnalysis/D3PDTools/EventLoopAlgs/Root/AlgSelect.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-// Copyright Nils Krumnack 2011.
+//
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
diff --git a/PhysicsAnalysis/D3PDTools/EventLoopAlgs/Root/DuplicateChecker.cxx b/PhysicsAnalysis/D3PDTools/EventLoopAlgs/Root/DuplicateChecker.cxx
index 6066cc8a9bd8634f2a54835b095f949d72f8418b..a38a837b15f69b6c78f083769686106d365a8cd5 100644
--- a/PhysicsAnalysis/D3PDTools/EventLoopAlgs/Root/DuplicateChecker.cxx
+++ b/PhysicsAnalysis/D3PDTools/EventLoopAlgs/Root/DuplicateChecker.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-// Copyright Iowa State University 2015.
+//
// Author: Nils Krumnack
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/PhysicsAnalysis/D3PDTools/EventLoopAlgs/Root/NTupleSvc.cxx b/PhysicsAnalysis/D3PDTools/EventLoopAlgs/Root/NTupleSvc.cxx
index f5df138d2bd3190e300b2f96ac8333639c5a6609..2c57236270bee197529e88b79f5c27081f4ae448 100644
--- a/PhysicsAnalysis/D3PDTools/EventLoopAlgs/Root/NTupleSvc.cxx
+++ b/PhysicsAnalysis/D3PDTools/EventLoopAlgs/Root/NTupleSvc.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-// Copyright Nils Krumnack 2012.
+//
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
diff --git a/PhysicsAnalysis/D3PDTools/EventLoopAlgs/Root/UnitTestSkim.cxx b/PhysicsAnalysis/D3PDTools/EventLoopAlgs/Root/UnitTestSkim.cxx
index 543cc35aba9bfb3c667f40228d1fee3834fdb098..1329567f0371f36c0c09f2557c809269759c08d6 100644
--- a/PhysicsAnalysis/D3PDTools/EventLoopAlgs/Root/UnitTestSkim.cxx
+++ b/PhysicsAnalysis/D3PDTools/EventLoopAlgs/Root/UnitTestSkim.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-// Copyright Nils Krumnack 2012.
+//
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
diff --git a/PhysicsAnalysis/D3PDTools/EventLoopAlgs/Root/WhiteBoardSvc.cxx b/PhysicsAnalysis/D3PDTools/EventLoopAlgs/Root/WhiteBoardSvc.cxx
index 1db4b0098da4e93472ff0d04966cd0e07840de07..190d0d859797dd36350b6b24f47db12693c361c2 100644
--- a/PhysicsAnalysis/D3PDTools/EventLoopAlgs/Root/WhiteBoardSvc.cxx
+++ b/PhysicsAnalysis/D3PDTools/EventLoopAlgs/Root/WhiteBoardSvc.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-// Copyright Nils Krumnack 2012.
+//
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
diff --git a/PhysicsAnalysis/D3PDTools/EventLoopAlgs/test/ut_DuplicateChecker.cxx b/PhysicsAnalysis/D3PDTools/EventLoopAlgs/test/ut_DuplicateChecker.cxx
index 628fdd2298618f33fc9738de5bb531b109abc0fd..06cc8e9009d19abd35d6d8d26b9b112029fc3f22 100644
--- a/PhysicsAnalysis/D3PDTools/EventLoopAlgs/test/ut_DuplicateChecker.cxx
+++ b/PhysicsAnalysis/D3PDTools/EventLoopAlgs/test/ut_DuplicateChecker.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-// Copyright Iowa State University 2015.
+//
// Author: Nils Krumnack
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/PhysicsAnalysis/D3PDTools/EventLoopAlgs/test/ut_alg_skim.cxx b/PhysicsAnalysis/D3PDTools/EventLoopAlgs/test/ut_alg_skim.cxx
index 59c5c01cfe51172df7b89391d0e72ff60a1fb628..6dd792f3185a8b407b22a18c671b819a384d35dd 100644
--- a/PhysicsAnalysis/D3PDTools/EventLoopAlgs/test/ut_alg_skim.cxx
+++ b/PhysicsAnalysis/D3PDTools/EventLoopAlgs/test/ut_alg_skim.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-// Copyright Nils Krumnack 2011.
+//
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
diff --git a/PhysicsAnalysis/D3PDTools/MultiDraw/MultiDraw/AlgCFlow.h b/PhysicsAnalysis/D3PDTools/MultiDraw/MultiDraw/AlgCFlow.h
index 20037e11a4da770fa60d06132c71b59da8134edf..e152f60083f70963b1b52ec9991217a9b153d3cf 100644
--- a/PhysicsAnalysis/D3PDTools/MultiDraw/MultiDraw/AlgCFlow.h
+++ b/PhysicsAnalysis/D3PDTools/MultiDraw/MultiDraw/AlgCFlow.h
@@ -5,7 +5,7 @@
#ifndef MULTI_DRAW_ALG_CFLOW_H
#define MULTI_DRAW_ALG_CFLOW_H
-// Copyright Nils Krumnack 2011.
+//
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
diff --git a/PhysicsAnalysis/D3PDTools/MultiDraw/MultiDraw/AlgHist.h b/PhysicsAnalysis/D3PDTools/MultiDraw/MultiDraw/AlgHist.h
index 3e3fce7b301050e6d25b3e73838b857e4de6dde9..bdb6de33eb8c61440951fd0bd42f2bbceab52812 100644
--- a/PhysicsAnalysis/D3PDTools/MultiDraw/MultiDraw/AlgHist.h
+++ b/PhysicsAnalysis/D3PDTools/MultiDraw/MultiDraw/AlgHist.h
@@ -5,7 +5,7 @@
#ifndef MULTI_DRAW_ALG_HIST_H
#define MULTI_DRAW_ALG_HIST_H
-// Copyright Nils Krumnack 2011.
+//
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
diff --git a/PhysicsAnalysis/D3PDTools/MultiDraw/MultiDraw/Formula.h b/PhysicsAnalysis/D3PDTools/MultiDraw/MultiDraw/Formula.h
index 6b4d38c208ba73f32ceec0be0edd7d51c55f3cba..f6f4cd3a78080bc887f72b4aacbba5753dbf5bce 100644
--- a/PhysicsAnalysis/D3PDTools/MultiDraw/MultiDraw/Formula.h
+++ b/PhysicsAnalysis/D3PDTools/MultiDraw/MultiDraw/Formula.h
@@ -5,7 +5,7 @@
#ifndef MULTI_DRAW_FORMULA_H
#define MULTI_DRAW_FORMULA_H
-// Copyright Nils Krumnack 2011 - 2012.
+// - 2012.
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
diff --git a/PhysicsAnalysis/D3PDTools/MultiDraw/MultiDraw/FormulaSvc.h b/PhysicsAnalysis/D3PDTools/MultiDraw/MultiDraw/FormulaSvc.h
index ab7934a394f3f6034583c78f8385dc54477ab8b7..bcc01b46114fe3eb5fd4aa93203ef533de2a1d60 100644
--- a/PhysicsAnalysis/D3PDTools/MultiDraw/MultiDraw/FormulaSvc.h
+++ b/PhysicsAnalysis/D3PDTools/MultiDraw/MultiDraw/FormulaSvc.h
@@ -5,7 +5,7 @@
#ifndef MULTI_DRAW_FORMULA_SVC_H
#define MULTI_DRAW_FORMULA_SVC_H
-// Copyright Nils Krumnack 2011.
+//
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
diff --git a/PhysicsAnalysis/D3PDTools/MultiDraw/MultiDraw/Global.h b/PhysicsAnalysis/D3PDTools/MultiDraw/MultiDraw/Global.h
index 3fb38e82976adb3d761fe42a846f6b034968476c..da474a66eb5e8eabccb1976e8046dadbbb98397d 100644
--- a/PhysicsAnalysis/D3PDTools/MultiDraw/MultiDraw/Global.h
+++ b/PhysicsAnalysis/D3PDTools/MultiDraw/MultiDraw/Global.h
@@ -5,7 +5,7 @@
#ifndef MULTI_DRAW_GLOBAL_H
#define MULTI_DRAW_GLOBAL_H
-// Copyright Nils Krumnack 2011.
+//
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
diff --git a/PhysicsAnalysis/D3PDTools/MultiDraw/Root/AlgCFlow.cxx b/PhysicsAnalysis/D3PDTools/MultiDraw/Root/AlgCFlow.cxx
index 81eb07709e9193524ca9a5ab9374b4281eb9b7a1..7cefd35c4bed267cea13e19e149269fefc2e67c0 100644
--- a/PhysicsAnalysis/D3PDTools/MultiDraw/Root/AlgCFlow.cxx
+++ b/PhysicsAnalysis/D3PDTools/MultiDraw/Root/AlgCFlow.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-// Copyright Nils Krumnack 2011.
+//
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
diff --git a/PhysicsAnalysis/D3PDTools/MultiDraw/Root/AlgHist.cxx b/PhysicsAnalysis/D3PDTools/MultiDraw/Root/AlgHist.cxx
index df9e5149015ab61b73de7a0062423352b9b3e51b..7d6949047a48c4a8a6d752cf9cb067166d9a1d09 100644
--- a/PhysicsAnalysis/D3PDTools/MultiDraw/Root/AlgHist.cxx
+++ b/PhysicsAnalysis/D3PDTools/MultiDraw/Root/AlgHist.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-// Copyright Nils Krumnack 2011.
+//
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
diff --git a/PhysicsAnalysis/D3PDTools/MultiDraw/Root/Formula.cxx b/PhysicsAnalysis/D3PDTools/MultiDraw/Root/Formula.cxx
index d52a096f80c8aad06b978a5023b9b303dfb3c3a0..1c1bd973606dd3bfa05bc4363f12eb1c11b17fe1 100644
--- a/PhysicsAnalysis/D3PDTools/MultiDraw/Root/Formula.cxx
+++ b/PhysicsAnalysis/D3PDTools/MultiDraw/Root/Formula.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-// Copyright Nils Krumnack 2011 - 2012.
+// - 2012.
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
diff --git a/PhysicsAnalysis/D3PDTools/MultiDraw/Root/FormulaSvc.cxx b/PhysicsAnalysis/D3PDTools/MultiDraw/Root/FormulaSvc.cxx
index b67c01d6ad415b6bc96695f592424aec3a196211..d784c25ee78420b1aca30063457a48632afcaf3e 100644
--- a/PhysicsAnalysis/D3PDTools/MultiDraw/Root/FormulaSvc.cxx
+++ b/PhysicsAnalysis/D3PDTools/MultiDraw/Root/FormulaSvc.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-// Copyright Nils Krumnack 2011.
+//
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
diff --git a/PhysicsAnalysis/D3PDTools/MultiDraw/test/ut_alg_cflow.cxx b/PhysicsAnalysis/D3PDTools/MultiDraw/test/ut_alg_cflow.cxx
index 8dc29f1687eb4dfd5f6abb051eb3ddb057650b4c..641993ffca2cd6a52ed3e9fbf4731ef61af40c33 100644
--- a/PhysicsAnalysis/D3PDTools/MultiDraw/test/ut_alg_cflow.cxx
+++ b/PhysicsAnalysis/D3PDTools/MultiDraw/test/ut_alg_cflow.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-// Copyright Nils Krumnack 2011.
+//
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
diff --git a/PhysicsAnalysis/D3PDTools/MultiDraw/test/ut_alg_hist.cxx b/PhysicsAnalysis/D3PDTools/MultiDraw/test/ut_alg_hist.cxx
index 376abbf3be6d149969b2ca0cefc5604094bca811..8dc073d60760b59605a3655f97f3dd004f12ac64 100644
--- a/PhysicsAnalysis/D3PDTools/MultiDraw/test/ut_alg_hist.cxx
+++ b/PhysicsAnalysis/D3PDTools/MultiDraw/test/ut_alg_hist.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-// Copyright Nils Krumnack 2011.
+//
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
diff --git a/PhysicsAnalysis/D3PDTools/MultiDraw/test/ut_condor_large.cxx b/PhysicsAnalysis/D3PDTools/MultiDraw/test/ut_condor_large.cxx
index 65a4cb4e0d98f2c7fe8d1b5ad45e8ca4bc7c021d..7d25522f133827e7b30cf0feb4331110703ecab5 100644
--- a/PhysicsAnalysis/D3PDTools/MultiDraw/test/ut_condor_large.cxx
+++ b/PhysicsAnalysis/D3PDTools/MultiDraw/test/ut_condor_large.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-// Copyright Nils Krumnack 2011.
+//
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
diff --git a/PhysicsAnalysis/D3PDTools/RootCoreUtils/Root/Assert.cxx b/PhysicsAnalysis/D3PDTools/RootCoreUtils/Root/Assert.cxx
index 5e4f62c0ec1b344a41a61061cc5349d8440a2cc6..a52edff4e3f1d7f81251339bf90c824e05a9a2f5 100644
--- a/PhysicsAnalysis/D3PDTools/RootCoreUtils/Root/Assert.cxx
+++ b/PhysicsAnalysis/D3PDTools/RootCoreUtils/Root/Assert.cxx
@@ -1,4 +1,4 @@
-// Copyright Nils Krumnack 2010 - 2012.
+// - 2012.
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
diff --git a/PhysicsAnalysis/D3PDTools/RootCoreUtils/Root/CheckRootVersion.cxx b/PhysicsAnalysis/D3PDTools/RootCoreUtils/Root/CheckRootVersion.cxx
index 4355327b4094b8581d0ce3639491c30b5c067547..bed9eef3a87b8f571194884cb1fbc98a3e694660 100644
--- a/PhysicsAnalysis/D3PDTools/RootCoreUtils/Root/CheckRootVersion.cxx
+++ b/PhysicsAnalysis/D3PDTools/RootCoreUtils/Root/CheckRootVersion.cxx
@@ -1,4 +1,4 @@
-// Copyright Iowa State University 2013.
+//
// Author: Nils Krumnack
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/PhysicsAnalysis/D3PDTools/RootCoreUtils/Root/ExceptionMsg.cxx b/PhysicsAnalysis/D3PDTools/RootCoreUtils/Root/ExceptionMsg.cxx
index 386206a7cc83ac03374d0d41a9accfbf3733b985..d4ada077bf01d01c29d2e24301b278bc0de0033a 100644
--- a/PhysicsAnalysis/D3PDTools/RootCoreUtils/Root/ExceptionMsg.cxx
+++ b/PhysicsAnalysis/D3PDTools/RootCoreUtils/Root/ExceptionMsg.cxx
@@ -1,4 +1,4 @@
-// Copyright Nils Krumnack 2008 - 2012.
+//
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
diff --git a/PhysicsAnalysis/D3PDTools/RootCoreUtils/Root/Locate.cxx b/PhysicsAnalysis/D3PDTools/RootCoreUtils/Root/Locate.cxx
index 8e02e0f4d8a81632d048f3d4ff6dcf1cb127afbc..91a2974808d5a56a53d48429649db7b7ea015b26 100644
--- a/PhysicsAnalysis/D3PDTools/RootCoreUtils/Root/Locate.cxx
+++ b/PhysicsAnalysis/D3PDTools/RootCoreUtils/Root/Locate.cxx
@@ -1,4 +1,4 @@
-// Copyright Nils Krumnack 2013.
+//
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
diff --git a/PhysicsAnalysis/D3PDTools/RootCoreUtils/Root/Message.cxx b/PhysicsAnalysis/D3PDTools/RootCoreUtils/Root/Message.cxx
index 6b84627837249d0a7d24424eb578a61004aa9f20..4c1c23167720994a366c63473f9646c607b443a7 100644
--- a/PhysicsAnalysis/D3PDTools/RootCoreUtils/Root/Message.cxx
+++ b/PhysicsAnalysis/D3PDTools/RootCoreUtils/Root/Message.cxx
@@ -1,4 +1,4 @@
-// Copyright Nils Krumnack 2013.
+//
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
diff --git a/PhysicsAnalysis/D3PDTools/RootCoreUtils/Root/PrintMsg.cxx b/PhysicsAnalysis/D3PDTools/RootCoreUtils/Root/PrintMsg.cxx
index 77d64e14bef31bcff5f40ebb01420a6d04c2c911..a38bca284788239787f7fa60590065654d885c51 100644
--- a/PhysicsAnalysis/D3PDTools/RootCoreUtils/Root/PrintMsg.cxx
+++ b/PhysicsAnalysis/D3PDTools/RootCoreUtils/Root/PrintMsg.cxx
@@ -1,4 +1,4 @@
-// Copyright Nils Krumnack 2011.
+//
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
diff --git a/PhysicsAnalysis/D3PDTools/RootCoreUtils/Root/RootUtils.cxx b/PhysicsAnalysis/D3PDTools/RootCoreUtils/Root/RootUtils.cxx
index 967473537b55e406426d405fd3af8852f4a4a979..7c1f3067b3c986a48fe5da0cbbbd4c88045e7c07 100644
--- a/PhysicsAnalysis/D3PDTools/RootCoreUtils/Root/RootUtils.cxx
+++ b/PhysicsAnalysis/D3PDTools/RootCoreUtils/Root/RootUtils.cxx
@@ -1,4 +1,4 @@
-// Copyright Nils Krumnack 2012.
+//
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
diff --git a/PhysicsAnalysis/D3PDTools/RootCoreUtils/Root/ShellExec.cxx b/PhysicsAnalysis/D3PDTools/RootCoreUtils/Root/ShellExec.cxx
index d487400d8ea920e92fdbd0200a155e3334d8b8b1..8c2b0063f735cbe6bcfb243559b201a4c32ffac7 100644
--- a/PhysicsAnalysis/D3PDTools/RootCoreUtils/Root/ShellExec.cxx
+++ b/PhysicsAnalysis/D3PDTools/RootCoreUtils/Root/ShellExec.cxx
@@ -1,4 +1,4 @@
-// Copyright Nils Krumnack 2012.
+//
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
diff --git a/PhysicsAnalysis/D3PDTools/RootCoreUtils/Root/StringUtil.cxx b/PhysicsAnalysis/D3PDTools/RootCoreUtils/Root/StringUtil.cxx
index 07c1ea8d0927aa54715a24335dd2c45806261098..84f3e25fd8374af380caf9976711ce7f26508a00 100644
--- a/PhysicsAnalysis/D3PDTools/RootCoreUtils/Root/StringUtil.cxx
+++ b/PhysicsAnalysis/D3PDTools/RootCoreUtils/Root/StringUtil.cxx
@@ -1,4 +1,4 @@
-// Copyright Nils Krumnack 2012.
+//
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
diff --git a/PhysicsAnalysis/D3PDTools/RootCoreUtils/Root/UnitTestDir.cxx b/PhysicsAnalysis/D3PDTools/RootCoreUtils/Root/UnitTestDir.cxx
index 7d0cacaf697e26208c689d1cca8a07a09cfd35c5..145e2d4661e3f989b2703e4d3ac5c60339d42c51 100644
--- a/PhysicsAnalysis/D3PDTools/RootCoreUtils/Root/UnitTestDir.cxx
+++ b/PhysicsAnalysis/D3PDTools/RootCoreUtils/Root/UnitTestDir.cxx
@@ -1,4 +1,4 @@
-// Copyright Nils Krumnack 2011 - 2012.
+// - 2012.
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
diff --git a/PhysicsAnalysis/D3PDTools/RootCoreUtils/Root/hadd.cxx b/PhysicsAnalysis/D3PDTools/RootCoreUtils/Root/hadd.cxx
index c5febb6ee047cc93b60c48940d7ffc4aa0ac0964..091f44c6f402cf616eeba8f838150acfad4df38c 100644
--- a/PhysicsAnalysis/D3PDTools/RootCoreUtils/Root/hadd.cxx
+++ b/PhysicsAnalysis/D3PDTools/RootCoreUtils/Root/hadd.cxx
@@ -1,4 +1,4 @@
-// Copyright Nils Krumnack 2013.
+//
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
diff --git a/PhysicsAnalysis/D3PDTools/RootCoreUtils/Root/ranLoadPackages.cxx b/PhysicsAnalysis/D3PDTools/RootCoreUtils/Root/ranLoadPackages.cxx
index 610613e83c4105ee0a3ab5bdf0758b3275ff51e8..17ef198e613f4a46dde8b647db7ecf4e1cfd1129 100644
--- a/PhysicsAnalysis/D3PDTools/RootCoreUtils/Root/ranLoadPackages.cxx
+++ b/PhysicsAnalysis/D3PDTools/RootCoreUtils/Root/ranLoadPackages.cxx
@@ -1,4 +1,4 @@
-// Copyright Iowa State University 2015.
+//
// Author: Nils Krumnack
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/PhysicsAnalysis/D3PDTools/RootCoreUtils/RootCoreUtils/Assert.h b/PhysicsAnalysis/D3PDTools/RootCoreUtils/RootCoreUtils/Assert.h
index 39595ec546dedeac41ab96bcc3b0c0ca4cf14f98..7c9609035faff5ad4cacffbb15fce945a0d5725f 100644
--- a/PhysicsAnalysis/D3PDTools/RootCoreUtils/RootCoreUtils/Assert.h
+++ b/PhysicsAnalysis/D3PDTools/RootCoreUtils/RootCoreUtils/Assert.h
@@ -1,7 +1,7 @@
#ifndef ROOT_CORE_UTILS__ASSERT_H
#define ROOT_CORE_UTILS__ASSERT_H
-// Copyright Nils Krumnack 2010 - 2012.
+// - 2012.
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
diff --git a/PhysicsAnalysis/D3PDTools/RootCoreUtils/RootCoreUtils/CheckRootVersion.h b/PhysicsAnalysis/D3PDTools/RootCoreUtils/RootCoreUtils/CheckRootVersion.h
index 30523d4e0703212bb5f2af3f725bbd7664f8c20b..1bd027ca3b9ef85d629761b760c387a8c80ea496 100644
--- a/PhysicsAnalysis/D3PDTools/RootCoreUtils/RootCoreUtils/CheckRootVersion.h
+++ b/PhysicsAnalysis/D3PDTools/RootCoreUtils/RootCoreUtils/CheckRootVersion.h
@@ -1,7 +1,7 @@
#ifndef ROOT_CORE_UTILS__CHECK_ROOT_VERSION_H
#define ROOT_CORE_UTILS__CHECK_ROOT_VERSION_H
-// Copyright Iowa State University 2013.
+//
// Author: Nils Krumnack
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/PhysicsAnalysis/D3PDTools/RootCoreUtils/RootCoreUtils/Deprecated.h b/PhysicsAnalysis/D3PDTools/RootCoreUtils/RootCoreUtils/Deprecated.h
index 3c366ca60dbff814c4a1dce1d5fec520987c6286..7706d525082ce6411617dd4c7574fb1ab13c2664 100644
--- a/PhysicsAnalysis/D3PDTools/RootCoreUtils/RootCoreUtils/Deprecated.h
+++ b/PhysicsAnalysis/D3PDTools/RootCoreUtils/RootCoreUtils/Deprecated.h
@@ -1,7 +1,7 @@
#ifndef ROOT_CORE_UTILS__DEPRECATED_H
#define ROOT_CORE_UTILS__DEPRECATED_H
-// Copyright Iowa State University 2015.
+//
// Author: Nils Krumnack
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/PhysicsAnalysis/D3PDTools/RootCoreUtils/RootCoreUtils/ExceptionMsg.h b/PhysicsAnalysis/D3PDTools/RootCoreUtils/RootCoreUtils/ExceptionMsg.h
index a0c7276cf5abf1e23f72b774c4989ede3e446ef5..bedce0906afa1721469dce60bc7a850f4349e6b8 100644
--- a/PhysicsAnalysis/D3PDTools/RootCoreUtils/RootCoreUtils/ExceptionMsg.h
+++ b/PhysicsAnalysis/D3PDTools/RootCoreUtils/RootCoreUtils/ExceptionMsg.h
@@ -1,7 +1,7 @@
#ifndef ROOT_CORE_UTILS__EXCEPTION_MSG_H
#define ROOT_CORE_UTILS__EXCEPTION_MSG_H
-// Copyright Nils Krumnack 2008 - 2012.
+//
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
diff --git a/PhysicsAnalysis/D3PDTools/RootCoreUtils/RootCoreUtils/Global.h b/PhysicsAnalysis/D3PDTools/RootCoreUtils/RootCoreUtils/Global.h
index 1136d3471f01b07dea21d6e9750956009a06eef7..c35c3a5f0b5cf54c5b6cba4e073ccb9eb76727b7 100644
--- a/PhysicsAnalysis/D3PDTools/RootCoreUtils/RootCoreUtils/Global.h
+++ b/PhysicsAnalysis/D3PDTools/RootCoreUtils/RootCoreUtils/Global.h
@@ -1,7 +1,7 @@
#ifndef ROOT_CORE_UTILS__GLOBAL_H
#define ROOT_CORE_UTILS__GLOBAL_H
-// Copyright Nils Krumnack 2012.
+//
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
diff --git a/PhysicsAnalysis/D3PDTools/RootCoreUtils/RootCoreUtils/Locate.h b/PhysicsAnalysis/D3PDTools/RootCoreUtils/RootCoreUtils/Locate.h
index 1519453f319e0b3d776d02cbf71b272806c6af77..91d90ed1a9854fe1a6387d2f740269fdb5f59151 100644
--- a/PhysicsAnalysis/D3PDTools/RootCoreUtils/RootCoreUtils/Locate.h
+++ b/PhysicsAnalysis/D3PDTools/RootCoreUtils/RootCoreUtils/Locate.h
@@ -1,7 +1,7 @@
#ifndef ROOT_CORE_UTILS__LOCATE_H
#define ROOT_CORE_UTILS__LOCATE_H
-// Copyright Nils Krumnack 2013.
+//
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
diff --git a/PhysicsAnalysis/D3PDTools/RootCoreUtils/RootCoreUtils/Message.h b/PhysicsAnalysis/D3PDTools/RootCoreUtils/RootCoreUtils/Message.h
index a3a1b643853706c3181b1f4a879a3442839d7e2f..ef3575ac5056f8b28a4dd19f734416b8acb1ffcb 100644
--- a/PhysicsAnalysis/D3PDTools/RootCoreUtils/RootCoreUtils/Message.h
+++ b/PhysicsAnalysis/D3PDTools/RootCoreUtils/RootCoreUtils/Message.h
@@ -1,7 +1,7 @@
#ifndef ROOT_CORE_UTILS__MESSAGE_H
#define ROOT_CORE_UTILS__MESSAGE_H
-// Copyright Nils Krumnack 2013.
+//
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
diff --git a/PhysicsAnalysis/D3PDTools/RootCoreUtils/RootCoreUtils/MessageType.h b/PhysicsAnalysis/D3PDTools/RootCoreUtils/RootCoreUtils/MessageType.h
index f528cbe64682d13716fc8a61f116c725106b60b9..b31fa0a1b6f8e7aa0fc6c6437fe167e56c1dbdc5 100644
--- a/PhysicsAnalysis/D3PDTools/RootCoreUtils/RootCoreUtils/MessageType.h
+++ b/PhysicsAnalysis/D3PDTools/RootCoreUtils/RootCoreUtils/MessageType.h
@@ -1,7 +1,7 @@
#ifndef ROOT_CORE_UTILS__MESSAGE_TYPE_H
#define ROOT_CORE_UTILS__MESSAGE_TYPE_H
-// Copyright Nils Krumnack 2013.
+//
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
diff --git a/PhysicsAnalysis/D3PDTools/RootCoreUtils/RootCoreUtils/Override.h b/PhysicsAnalysis/D3PDTools/RootCoreUtils/RootCoreUtils/Override.h
index d18e1a7112f42cc794745018d61f996e2c5fd7b0..570cc39b935b18c42c1269c99190a2360c266ae8 100644
--- a/PhysicsAnalysis/D3PDTools/RootCoreUtils/RootCoreUtils/Override.h
+++ b/PhysicsAnalysis/D3PDTools/RootCoreUtils/RootCoreUtils/Override.h
@@ -1,7 +1,7 @@
#ifndef ROOT_CORE_UTILS__OVERRIDE_H
#define ROOT_CORE_UTILS__OVERRIDE_H
-// Copyright Iowa State University 2015.
+//
// Author: Nils Krumnack
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/PhysicsAnalysis/D3PDTools/RootCoreUtils/RootCoreUtils/PrintMsg.h b/PhysicsAnalysis/D3PDTools/RootCoreUtils/RootCoreUtils/PrintMsg.h
index d4349a8552b6749b05839aa7711a89dd68d0eb0f..994fd5e83fb63482487def1783c457729407a8f0 100644
--- a/PhysicsAnalysis/D3PDTools/RootCoreUtils/RootCoreUtils/PrintMsg.h
+++ b/PhysicsAnalysis/D3PDTools/RootCoreUtils/RootCoreUtils/PrintMsg.h
@@ -1,7 +1,7 @@
#ifndef ROOT_CORE_UTILS__PRINT_MSG_H
#define ROOT_CORE_UTILS__PRINT_MSG_H
-// Copyright Nils Krumnack 2011 - 2012.
+// - 2012.
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
diff --git a/PhysicsAnalysis/D3PDTools/RootCoreUtils/RootCoreUtils/RootUtils.h b/PhysicsAnalysis/D3PDTools/RootCoreUtils/RootCoreUtils/RootUtils.h
index 5db132608aeefcc5104743cfd00fcaeebd0e5f79..5428c9ef9678d76bf7976446e1113fe6312371ac 100644
--- a/PhysicsAnalysis/D3PDTools/RootCoreUtils/RootCoreUtils/RootUtils.h
+++ b/PhysicsAnalysis/D3PDTools/RootCoreUtils/RootCoreUtils/RootUtils.h
@@ -1,7 +1,7 @@
#ifndef ROOT_CORE_UTILS__ROOT_UTILS_H
#define ROOT_CORE_UTILS__ROOT_UTILS_H
-// Copyright Nils Krumnack 2012.
+//
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
diff --git a/PhysicsAnalysis/D3PDTools/RootCoreUtils/RootCoreUtils/ShellExec.h b/PhysicsAnalysis/D3PDTools/RootCoreUtils/RootCoreUtils/ShellExec.h
index f40c72b9b0855000773f7c64f6e0391d11e00cf9..2483e0d629456a8beae131d2c7987c89bd3d404a 100644
--- a/PhysicsAnalysis/D3PDTools/RootCoreUtils/RootCoreUtils/ShellExec.h
+++ b/PhysicsAnalysis/D3PDTools/RootCoreUtils/RootCoreUtils/ShellExec.h
@@ -1,7 +1,7 @@
#ifndef ROOT_CORE_UTILS__SHELL_EXEC_H
#define ROOT_CORE_UTILS__SHELL_EXEC_H
-// Copyright Nils Krumnack 2012.
+//
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
diff --git a/PhysicsAnalysis/D3PDTools/RootCoreUtils/RootCoreUtils/StringUtil.h b/PhysicsAnalysis/D3PDTools/RootCoreUtils/RootCoreUtils/StringUtil.h
index a37a69f14e3419ad2340dfc8d04ca23d39481308..357c97a4a11340276117881946f366b67848b0a1 100644
--- a/PhysicsAnalysis/D3PDTools/RootCoreUtils/RootCoreUtils/StringUtil.h
+++ b/PhysicsAnalysis/D3PDTools/RootCoreUtils/RootCoreUtils/StringUtil.h
@@ -1,7 +1,7 @@
#ifndef ROOT_CORE_UTILS__STRING_UTIL_H
#define ROOT_CORE_UTILS__STRING_UTIL_H
-// Copyright Nils Krumnack 2012.
+//
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
diff --git a/PhysicsAnalysis/D3PDTools/RootCoreUtils/RootCoreUtils/ThrowMsg.h b/PhysicsAnalysis/D3PDTools/RootCoreUtils/RootCoreUtils/ThrowMsg.h
index bb28d74723af353b2f178ed933ede53fbd0810be..2a55e345c1bbed89891c157a2fa51679128ec76f 100644
--- a/PhysicsAnalysis/D3PDTools/RootCoreUtils/RootCoreUtils/ThrowMsg.h
+++ b/PhysicsAnalysis/D3PDTools/RootCoreUtils/RootCoreUtils/ThrowMsg.h
@@ -1,7 +1,7 @@
#ifndef ROOT_CORE_UTILS__THROW_MSG_H
#define ROOT_CORE_UTILS__THROW_MSG_H
-// Copyright Nils Krumnack 2011 - 2012.
+// - 2012.
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
diff --git a/PhysicsAnalysis/D3PDTools/RootCoreUtils/RootCoreUtils/UnitTestDir.h b/PhysicsAnalysis/D3PDTools/RootCoreUtils/RootCoreUtils/UnitTestDir.h
index d1aaf20045406e7b22fc4535fef3b4ef9070475c..a27f5b5b2593562d980cb1f6f94f0acb064bbf36 100644
--- a/PhysicsAnalysis/D3PDTools/RootCoreUtils/RootCoreUtils/UnitTestDir.h
+++ b/PhysicsAnalysis/D3PDTools/RootCoreUtils/RootCoreUtils/UnitTestDir.h
@@ -1,7 +1,7 @@
#ifndef ROOT_CORE_UTILS_UNIT_TEST_DIR_HH
#define ROOT_CORE_UTILS_UNIT_TEST_DIR_HH
-// Copyright Nils Krumnack 2011 - 2012.
+// - 2012.
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
diff --git a/PhysicsAnalysis/D3PDTools/RootCoreUtils/RootCoreUtils/hadd.h b/PhysicsAnalysis/D3PDTools/RootCoreUtils/RootCoreUtils/hadd.h
index 6c5b3d752fbcebeb2c632edba779fb961338e1f7..ae82860360849dbf91108b4ed343f20f47570af0 100644
--- a/PhysicsAnalysis/D3PDTools/RootCoreUtils/RootCoreUtils/hadd.h
+++ b/PhysicsAnalysis/D3PDTools/RootCoreUtils/RootCoreUtils/hadd.h
@@ -1,7 +1,7 @@
#ifndef ROOT_CORE_UTILS__HADD_H
#define ROOT_CORE_UTILS__HADD_H
-// Copyright Nils Krumnack 2013.
+//
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
diff --git a/PhysicsAnalysis/D3PDTools/RootCoreUtils/RootCoreUtils/ranLoadPackages.h b/PhysicsAnalysis/D3PDTools/RootCoreUtils/RootCoreUtils/ranLoadPackages.h
index 5da31acbb21e68e096f57e682f50b2dba96ed325..93f0edea806daa2b10a2f1895cc5c4c550ddaaf1 100644
--- a/PhysicsAnalysis/D3PDTools/RootCoreUtils/RootCoreUtils/ranLoadPackages.h
+++ b/PhysicsAnalysis/D3PDTools/RootCoreUtils/RootCoreUtils/ranLoadPackages.h
@@ -1,7 +1,7 @@
#ifndef ROOT_CORE_UTILS__RAN_LOAD_PACKAGES_H
#define ROOT_CORE_UTILS__RAN_LOAD_PACKAGES_H
-// Copyright Iowa State University 2015.
+//
// Author: Nils Krumnack
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/PhysicsAnalysis/D3PDTools/RootCoreUtils/test/inc_Deprecated.cxx b/PhysicsAnalysis/D3PDTools/RootCoreUtils/test/inc_Deprecated.cxx
index 744b759309a1aa681f9cb0cba513bfbc5c45bbce..d8becf472952c4019bac0de36b9ca13b249bcad0 100644
--- a/PhysicsAnalysis/D3PDTools/RootCoreUtils/test/inc_Deprecated.cxx
+++ b/PhysicsAnalysis/D3PDTools/RootCoreUtils/test/inc_Deprecated.cxx
@@ -1,4 +1,4 @@
-// Copyright Iowa State University 2015.
+//
// Author: Nils Krumnack
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/PhysicsAnalysis/D3PDTools/RootCoreUtils/test/inc_Override.cxx b/PhysicsAnalysis/D3PDTools/RootCoreUtils/test/inc_Override.cxx
index f329187a009e78c8cdb8ee1323dd289b6ea52fdc..e60606868827bf7fc7c43a8ad03ae619cff9b05b 100644
--- a/PhysicsAnalysis/D3PDTools/RootCoreUtils/test/inc_Override.cxx
+++ b/PhysicsAnalysis/D3PDTools/RootCoreUtils/test/inc_Override.cxx
@@ -1,4 +1,4 @@
-// Copyright Iowa State University 2015.
+//
// Author: Nils Krumnack
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/PhysicsAnalysis/D3PDTools/RootCoreUtils/test/test_message_svc.cxx b/PhysicsAnalysis/D3PDTools/RootCoreUtils/test/test_message_svc.cxx
index 48a04eb7a83e1cdf30242052390b92f03b78f40c..6fed56f20780af0782140eb859529abff40409d9 100644
--- a/PhysicsAnalysis/D3PDTools/RootCoreUtils/test/test_message_svc.cxx
+++ b/PhysicsAnalysis/D3PDTools/RootCoreUtils/test/test_message_svc.cxx
@@ -1,4 +1,4 @@
-// Copyright Nils Krumnack 2013.
+//
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
diff --git a/PhysicsAnalysis/D3PDTools/RootCoreUtils/test/ut_expression.cxx b/PhysicsAnalysis/D3PDTools/RootCoreUtils/test/ut_expression.cxx
index e92adbfbb6d938238d331bb9196bebe872cbd252..ce208b0a0aa7819cf17705a0ba237af227c354c4 100644
--- a/PhysicsAnalysis/D3PDTools/RootCoreUtils/test/ut_expression.cxx
+++ b/PhysicsAnalysis/D3PDTools/RootCoreUtils/test/ut_expression.cxx
@@ -1,4 +1,4 @@
-// Copyright Nils Krumnack 2013.
+//
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
diff --git a/PhysicsAnalysis/D3PDTools/RootCoreUtils/test/ut_ran_packages_false.cxx b/PhysicsAnalysis/D3PDTools/RootCoreUtils/test/ut_ran_packages_false.cxx
index 7386b9157a83211a38beba33c167f508d1af4b15..36e28c1424444c129420939700618224c7f23819 100644
--- a/PhysicsAnalysis/D3PDTools/RootCoreUtils/test/ut_ran_packages_false.cxx
+++ b/PhysicsAnalysis/D3PDTools/RootCoreUtils/test/ut_ran_packages_false.cxx
@@ -1,4 +1,4 @@
-// Copyright Nils Krumnack 2013.
+//
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
diff --git a/PhysicsAnalysis/D3PDTools/RootCoreUtils/test/ut_ran_packages_true.C b/PhysicsAnalysis/D3PDTools/RootCoreUtils/test/ut_ran_packages_true.C
index fd9c738af6c06e58279c3e2d4d876c8073714ee8..667ec815408d34dfe204807dbf4a5e690a818641 100644
--- a/PhysicsAnalysis/D3PDTools/RootCoreUtils/test/ut_ran_packages_true.C
+++ b/PhysicsAnalysis/D3PDTools/RootCoreUtils/test/ut_ran_packages_true.C
@@ -1,4 +1,4 @@
-// Copyright Nils Krumnack 2013.
+//
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
diff --git a/PhysicsAnalysis/D3PDTools/RootCoreUtils/util/rcu_locate.cxx b/PhysicsAnalysis/D3PDTools/RootCoreUtils/util/rcu_locate.cxx
index d42ca90cc5c20385cbd1eb23cbfb08ca953ef481..16376dc1f865f8284761292b58b94d2d58b066cb 100644
--- a/PhysicsAnalysis/D3PDTools/RootCoreUtils/util/rcu_locate.cxx
+++ b/PhysicsAnalysis/D3PDTools/RootCoreUtils/util/rcu_locate.cxx
@@ -1,4 +1,4 @@
-// Copyright Nils Krumnack 2013.
+//
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
diff --git a/PhysicsAnalysis/D3PDTools/SampleHandler/Root/DiskList.cxx b/PhysicsAnalysis/D3PDTools/SampleHandler/Root/DiskList.cxx
index 63fe6593936c48e69de46e4df3c37c62cd647f38..d12588c3bdb1c739b6eb0ab403abfe7c8963764f 100644
--- a/PhysicsAnalysis/D3PDTools/SampleHandler/Root/DiskList.cxx
+++ b/PhysicsAnalysis/D3PDTools/SampleHandler/Root/DiskList.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-// Copyright Nils Krumnack 2012.
+//
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
diff --git a/PhysicsAnalysis/D3PDTools/SampleHandler/Root/DiskListEOS.cxx b/PhysicsAnalysis/D3PDTools/SampleHandler/Root/DiskListEOS.cxx
index b7c6e8ebaba6a93248f10a36cc7dd39acbde8139..415846e1945e1e245a1a2fe932079b9f668140f8 100644
--- a/PhysicsAnalysis/D3PDTools/SampleHandler/Root/DiskListEOS.cxx
+++ b/PhysicsAnalysis/D3PDTools/SampleHandler/Root/DiskListEOS.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-// Copyright Nils Krumnack 2012.
+//
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
diff --git a/PhysicsAnalysis/D3PDTools/SampleHandler/Root/DiskListLocal.cxx b/PhysicsAnalysis/D3PDTools/SampleHandler/Root/DiskListLocal.cxx
index e70fd136338bd345bb2965302bd9538de18cfca7..f4cd8ad965afce288091b0587b737f77d86f2468 100644
--- a/PhysicsAnalysis/D3PDTools/SampleHandler/Root/DiskListLocal.cxx
+++ b/PhysicsAnalysis/D3PDTools/SampleHandler/Root/DiskListLocal.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-// Copyright Nils Krumnack 2012.
+//
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
diff --git a/PhysicsAnalysis/D3PDTools/SampleHandler/Root/DiskListSRM.cxx b/PhysicsAnalysis/D3PDTools/SampleHandler/Root/DiskListSRM.cxx
index 5a8f0843ef5885c5775f653b374c80b961a7eaba..79e485f417b674995b4a9e1de281ccb8eb0ea41b 100644
--- a/PhysicsAnalysis/D3PDTools/SampleHandler/Root/DiskListSRM.cxx
+++ b/PhysicsAnalysis/D3PDTools/SampleHandler/Root/DiskListSRM.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-// Copyright Nils Krumnack 2012.
+//
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
diff --git a/PhysicsAnalysis/D3PDTools/SampleHandler/Root/DiskListXRD.cxx b/PhysicsAnalysis/D3PDTools/SampleHandler/Root/DiskListXRD.cxx
index 19e037d24df262877cea5a9a23baaed2cad8bdee..6a8758a0395242448a78a282cb10229ce6dc1ad9 100644
--- a/PhysicsAnalysis/D3PDTools/SampleHandler/Root/DiskListXRD.cxx
+++ b/PhysicsAnalysis/D3PDTools/SampleHandler/Root/DiskListXRD.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-// Copyright Nils Krumnack 2012.
+//
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
diff --git a/PhysicsAnalysis/D3PDTools/SampleHandler/Root/DiskOutput.cxx b/PhysicsAnalysis/D3PDTools/SampleHandler/Root/DiskOutput.cxx
index 3f65d21895812d17c887fd065834876fcecf3f26..5e4cb3bd8a8da938571c7c5a62edae2b37b4e5ea 100644
--- a/PhysicsAnalysis/D3PDTools/SampleHandler/Root/DiskOutput.cxx
+++ b/PhysicsAnalysis/D3PDTools/SampleHandler/Root/DiskOutput.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-// Copyright Iowa State University 2013.
+//
// Author: Nils Krumnack
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/PhysicsAnalysis/D3PDTools/SampleHandler/Root/DiskOutputLocal.cxx b/PhysicsAnalysis/D3PDTools/SampleHandler/Root/DiskOutputLocal.cxx
index fa0e62b08b28ce3c9eb625289d8a27f68df3b38e..879bfeff9e38a5c8a7888effe7c4e346f2ca731f 100644
--- a/PhysicsAnalysis/D3PDTools/SampleHandler/Root/DiskOutputLocal.cxx
+++ b/PhysicsAnalysis/D3PDTools/SampleHandler/Root/DiskOutputLocal.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-// Copyright Iowa State University 2013.
+//
// Author: Nils Krumnack
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/PhysicsAnalysis/D3PDTools/SampleHandler/Root/DiskOutputXRD.cxx b/PhysicsAnalysis/D3PDTools/SampleHandler/Root/DiskOutputXRD.cxx
index 473078b6fe603c672d73e0102c669b970b1c0991..6295879bcea9188eab95e544e526aef37f414c58 100644
--- a/PhysicsAnalysis/D3PDTools/SampleHandler/Root/DiskOutputXRD.cxx
+++ b/PhysicsAnalysis/D3PDTools/SampleHandler/Root/DiskOutputXRD.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-// Copyright Iowa State University 2013.
+//
// Author: Nils Krumnack
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/PhysicsAnalysis/D3PDTools/SampleHandler/Root/DiskWriter.cxx b/PhysicsAnalysis/D3PDTools/SampleHandler/Root/DiskWriter.cxx
index 9f55143cdb5d0ebf262734d5c172712f67c9c430..4859fa525548a97c08617a470c95d4f802ddfc40 100644
--- a/PhysicsAnalysis/D3PDTools/SampleHandler/Root/DiskWriter.cxx
+++ b/PhysicsAnalysis/D3PDTools/SampleHandler/Root/DiskWriter.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-// Copyright Iowa State University 2013.
+//
// Author: Nils Krumnack
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/PhysicsAnalysis/D3PDTools/SampleHandler/Root/DiskWriterLocal.cxx b/PhysicsAnalysis/D3PDTools/SampleHandler/Root/DiskWriterLocal.cxx
index 438fb5c685cf2fea412335437697277fb41843c1..3fa4b4b3030d6472eadb4373d668876f72392afc 100644
--- a/PhysicsAnalysis/D3PDTools/SampleHandler/Root/DiskWriterLocal.cxx
+++ b/PhysicsAnalysis/D3PDTools/SampleHandler/Root/DiskWriterLocal.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-// Copyright Iowa State University 2013.
+//
// Author: Nils Krumnack
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/PhysicsAnalysis/D3PDTools/SampleHandler/Root/DiskWriterXRD.cxx b/PhysicsAnalysis/D3PDTools/SampleHandler/Root/DiskWriterXRD.cxx
index de14c0752216fbec2b8f707170ae3873483b3038..e68be9a7bec49aa6039f9470744468b13612ea98 100644
--- a/PhysicsAnalysis/D3PDTools/SampleHandler/Root/DiskWriterXRD.cxx
+++ b/PhysicsAnalysis/D3PDTools/SampleHandler/Root/DiskWriterXRD.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-// Copyright Iowa State University 2013.
+//
// Author: Nils Krumnack
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/PhysicsAnalysis/D3PDTools/SampleHandler/Root/GridTools.cxx b/PhysicsAnalysis/D3PDTools/SampleHandler/Root/GridTools.cxx
index 1f8b46709e1d60b1d1eb0c34504e1f0a6a0ce402..661d7523a2efe1249a92189e434bbb1ad25d5602 100644
--- a/PhysicsAnalysis/D3PDTools/SampleHandler/Root/GridTools.cxx
+++ b/PhysicsAnalysis/D3PDTools/SampleHandler/Root/GridTools.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-// Copyright Nils Krumnack 2016.
+//
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
diff --git a/PhysicsAnalysis/D3PDTools/SampleHandler/Root/Meta.cxx b/PhysicsAnalysis/D3PDTools/SampleHandler/Root/Meta.cxx
index aa7bd2a46e57d377dadb0adeea9b02e005b8cba9..299b9ea5fe7a3e02d6d3eb33b2b57b3b1adfcf7d 100644
--- a/PhysicsAnalysis/D3PDTools/SampleHandler/Root/Meta.cxx
+++ b/PhysicsAnalysis/D3PDTools/SampleHandler/Root/Meta.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-// Copyright Nils Krumnack 2011.
+//
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
diff --git a/PhysicsAnalysis/D3PDTools/SampleHandler/Root/MetaFields.cxx b/PhysicsAnalysis/D3PDTools/SampleHandler/Root/MetaFields.cxx
index f729d7275bbd8cc8a8f0b7d39cc54b1ae5c35ef9..5e93f30102f75ebefdf1b1272216a0bc743588c7 100644
--- a/PhysicsAnalysis/D3PDTools/SampleHandler/Root/MetaFields.cxx
+++ b/PhysicsAnalysis/D3PDTools/SampleHandler/Root/MetaFields.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-// Copyright Nils Krumnack 2012.
+//
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
diff --git a/PhysicsAnalysis/D3PDTools/SampleHandler/Root/MetaNames.cxx b/PhysicsAnalysis/D3PDTools/SampleHandler/Root/MetaNames.cxx
index 71e1c306ace4d15aa704d39dee24d4564bc9f0b8..f0c787918562014e8e3f24ec14f7d8262f47ef44 100644
--- a/PhysicsAnalysis/D3PDTools/SampleHandler/Root/MetaNames.cxx
+++ b/PhysicsAnalysis/D3PDTools/SampleHandler/Root/MetaNames.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-// Copyright Iowa State University 2015.
+//
// Author: Nils Krumnack
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/PhysicsAnalysis/D3PDTools/SampleHandler/Root/MetaObject.cxx b/PhysicsAnalysis/D3PDTools/SampleHandler/Root/MetaObject.cxx
index 270239f067e2019f1df23f9cfb205ea1fb460eac..58a58dbdf08ddcd2acb0eb657d3213ee419019b7 100644
--- a/PhysicsAnalysis/D3PDTools/SampleHandler/Root/MetaObject.cxx
+++ b/PhysicsAnalysis/D3PDTools/SampleHandler/Root/MetaObject.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-// Copyright Nils Krumnack 2011 - 2012.
+// - 2012.
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
diff --git a/PhysicsAnalysis/D3PDTools/SampleHandler/Root/Sample.cxx b/PhysicsAnalysis/D3PDTools/SampleHandler/Root/Sample.cxx
index f3231684dcc6e69d83240a6115a54822eb932740..5f23e4ec954de39d780974a95a4e73698c153750 100644
--- a/PhysicsAnalysis/D3PDTools/SampleHandler/Root/Sample.cxx
+++ b/PhysicsAnalysis/D3PDTools/SampleHandler/Root/Sample.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-// Copyright Nils Krumnack 2011.
+//
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
diff --git a/PhysicsAnalysis/D3PDTools/SampleHandler/Root/SampleComposite.cxx b/PhysicsAnalysis/D3PDTools/SampleHandler/Root/SampleComposite.cxx
index 4e7cda5535fc8e1f3ae6d65e4c8630ea197478b9..1db56cf57806f0ce6d12c83fd191e94f5d21033a 100644
--- a/PhysicsAnalysis/D3PDTools/SampleHandler/Root/SampleComposite.cxx
+++ b/PhysicsAnalysis/D3PDTools/SampleHandler/Root/SampleComposite.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-// Copyright Nils Krumnack 2011.
+//
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
diff --git a/PhysicsAnalysis/D3PDTools/SampleHandler/Root/SampleGrid.cxx b/PhysicsAnalysis/D3PDTools/SampleHandler/Root/SampleGrid.cxx
index cba235b54a9f993273d7bc8e1767dfd323cf5d5f..70fcd8d30680d0f1305643669c852a16bab3845f 100644
--- a/PhysicsAnalysis/D3PDTools/SampleHandler/Root/SampleGrid.cxx
+++ b/PhysicsAnalysis/D3PDTools/SampleHandler/Root/SampleGrid.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-// Copyright Nils Krumnack 2011.
+//
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
diff --git a/PhysicsAnalysis/D3PDTools/SampleHandler/Root/SampleHandler.cxx b/PhysicsAnalysis/D3PDTools/SampleHandler/Root/SampleHandler.cxx
index 62728944935cbc4bedc74176e4b625f8a5e99b68..c995e80c9cfe36fcbbd9e2428be2acf2ecbc817c 100644
--- a/PhysicsAnalysis/D3PDTools/SampleHandler/Root/SampleHandler.cxx
+++ b/PhysicsAnalysis/D3PDTools/SampleHandler/Root/SampleHandler.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-// Copyright Nils Krumnack 2011.
+//
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
diff --git a/PhysicsAnalysis/D3PDTools/SampleHandler/Root/SampleHist.cxx b/PhysicsAnalysis/D3PDTools/SampleHandler/Root/SampleHist.cxx
index 69e9cdcbd114cba3f872c13c4c5c0dfa0018fb83..d30820800d0b7c0f51bc602ed368713c5d66a7f4 100644
--- a/PhysicsAnalysis/D3PDTools/SampleHandler/Root/SampleHist.cxx
+++ b/PhysicsAnalysis/D3PDTools/SampleHandler/Root/SampleHist.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-// Copyright Nils Krumnack 2011.
+//
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
diff --git a/PhysicsAnalysis/D3PDTools/SampleHandler/Root/SampleLocal.cxx b/PhysicsAnalysis/D3PDTools/SampleHandler/Root/SampleLocal.cxx
index bb2f7f326f88cbe24e60e0ec036d0b68cd6110ab..bb0fe6df6a758364468451a1453421a20a6e1acc 100644
--- a/PhysicsAnalysis/D3PDTools/SampleHandler/Root/SampleLocal.cxx
+++ b/PhysicsAnalysis/D3PDTools/SampleHandler/Root/SampleLocal.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-// Copyright Nils Krumnack 2011.
+//
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
diff --git a/PhysicsAnalysis/D3PDTools/SampleHandler/Root/SampleMeta.cxx b/PhysicsAnalysis/D3PDTools/SampleHandler/Root/SampleMeta.cxx
index 1a71f58ee7b86673d48d5893894c32b5dfa09bd4..f060612b9dcbd487fbd0a2335ca5c5a52972d54c 100644
--- a/PhysicsAnalysis/D3PDTools/SampleHandler/Root/SampleMeta.cxx
+++ b/PhysicsAnalysis/D3PDTools/SampleHandler/Root/SampleMeta.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-// Copyright Nils Krumnack 2012.
+//
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
diff --git a/PhysicsAnalysis/D3PDTools/SampleHandler/Root/SamplePtr.cxx b/PhysicsAnalysis/D3PDTools/SampleHandler/Root/SamplePtr.cxx
index 0af49dfb772b913d947f52dbfd0ba6c69bc1e213..f5f6c54469e32082fa2f807c1e7355e66f00a7dd 100644
--- a/PhysicsAnalysis/D3PDTools/SampleHandler/Root/SamplePtr.cxx
+++ b/PhysicsAnalysis/D3PDTools/SampleHandler/Root/SamplePtr.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-// Copyright Nils Krumnack 2011.
+//
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
diff --git a/PhysicsAnalysis/D3PDTools/SampleHandler/Root/ScanDir.cxx b/PhysicsAnalysis/D3PDTools/SampleHandler/Root/ScanDir.cxx
index 2eff463a0318a3ba0364872f0aecd5a4c83d7f8d..8e444519b6c9d80c379b07f82494ca052fb94389 100644
--- a/PhysicsAnalysis/D3PDTools/SampleHandler/Root/ScanDir.cxx
+++ b/PhysicsAnalysis/D3PDTools/SampleHandler/Root/ScanDir.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-// Copyright Iowa State University 2015.
+//
// Author: Nils Krumnack
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/PhysicsAnalysis/D3PDTools/SampleHandler/Root/TagList.cxx b/PhysicsAnalysis/D3PDTools/SampleHandler/Root/TagList.cxx
index b211d6abe88f25595dfa8b13b1961568b9f635a0..8230beca85a899f338f46186ac6dc68bcaa71483 100644
--- a/PhysicsAnalysis/D3PDTools/SampleHandler/Root/TagList.cxx
+++ b/PhysicsAnalysis/D3PDTools/SampleHandler/Root/TagList.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-// Copyright Nils Krumnack 2011.
+//
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
diff --git a/PhysicsAnalysis/D3PDTools/SampleHandler/Root/ToolsDiscovery.cxx b/PhysicsAnalysis/D3PDTools/SampleHandler/Root/ToolsDiscovery.cxx
index a1c73b41b5737574f76f99dcbac7cdc266c681e2..216b5443f12bfd048ad6966768e7c4c20ad5a1e9 100644
--- a/PhysicsAnalysis/D3PDTools/SampleHandler/Root/ToolsDiscovery.cxx
+++ b/PhysicsAnalysis/D3PDTools/SampleHandler/Root/ToolsDiscovery.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-// Copyright Nils Krumnack 2011.
+//
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
diff --git a/PhysicsAnalysis/D3PDTools/SampleHandler/Root/ToolsDuplicates.cxx b/PhysicsAnalysis/D3PDTools/SampleHandler/Root/ToolsDuplicates.cxx
index b29f78519b99e8d65e090f7a693e3ea74a8e92dc..ad28180c8085fa96d415b2ea2072184b550d56d9 100644
--- a/PhysicsAnalysis/D3PDTools/SampleHandler/Root/ToolsDuplicates.cxx
+++ b/PhysicsAnalysis/D3PDTools/SampleHandler/Root/ToolsDuplicates.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-// Copyright Nils Krumnack 2013.
+//
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
diff --git a/PhysicsAnalysis/D3PDTools/SampleHandler/Root/ToolsJoin.cxx b/PhysicsAnalysis/D3PDTools/SampleHandler/Root/ToolsJoin.cxx
index 0ba72d3d42b69569a10d3ee98230aeebe18efcc2..747498cc447573d6c607a52861a54626186da368 100644
--- a/PhysicsAnalysis/D3PDTools/SampleHandler/Root/ToolsJoin.cxx
+++ b/PhysicsAnalysis/D3PDTools/SampleHandler/Root/ToolsJoin.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-// Copyright Nils Krumnack 2013.
+//
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
diff --git a/PhysicsAnalysis/D3PDTools/SampleHandler/Root/ToolsMeta.cxx b/PhysicsAnalysis/D3PDTools/SampleHandler/Root/ToolsMeta.cxx
index 9ee0054664208cb7b07b9cd8f6c70802776144d7..829cdd43eb6c7a61519965f34227b98a928eebad 100644
--- a/PhysicsAnalysis/D3PDTools/SampleHandler/Root/ToolsMeta.cxx
+++ b/PhysicsAnalysis/D3PDTools/SampleHandler/Root/ToolsMeta.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-// Copyright Iowa State University 2014.
+//
// Author: Nils Krumnack
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/PhysicsAnalysis/D3PDTools/SampleHandler/Root/ToolsOther.cxx b/PhysicsAnalysis/D3PDTools/SampleHandler/Root/ToolsOther.cxx
index 6a7cd930f913b1b9fd6bd91e145f4b1d47923f70..edb518711564e130dd3dfff14a5330d50581a25a 100644
--- a/PhysicsAnalysis/D3PDTools/SampleHandler/Root/ToolsOther.cxx
+++ b/PhysicsAnalysis/D3PDTools/SampleHandler/Root/ToolsOther.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-// Copyright Iowa State University 2015.
+//
// Author: Nils Krumnack
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/PhysicsAnalysis/D3PDTools/SampleHandler/Root/ToolsSplit.cxx b/PhysicsAnalysis/D3PDTools/SampleHandler/Root/ToolsSplit.cxx
index e6b493e8c4aa50abf30dc3adec764935d97ccc91..8b6993eb03946ddb82dd6c115eda51d9daaf9189 100644
--- a/PhysicsAnalysis/D3PDTools/SampleHandler/Root/ToolsSplit.cxx
+++ b/PhysicsAnalysis/D3PDTools/SampleHandler/Root/ToolsSplit.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-// Copyright Nils Krumnack 2011.
+//
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
diff --git a/PhysicsAnalysis/D3PDTools/SampleHandler/SampleHandler/DiskList.h b/PhysicsAnalysis/D3PDTools/SampleHandler/SampleHandler/DiskList.h
index bac275e9f28ce90c826ba67527b9d74c392812c4..5c9a68c02825d2ff56691e7c905d9e26dd402763 100644
--- a/PhysicsAnalysis/D3PDTools/SampleHandler/SampleHandler/DiskList.h
+++ b/PhysicsAnalysis/D3PDTools/SampleHandler/SampleHandler/DiskList.h
@@ -5,7 +5,7 @@
#ifndef SAMPLE_HANDLER__DISK_LIST_H
#define SAMPLE_HANDLER__DISK_LIST_H
-// Copyright Nils Krumnack 2012.
+//
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
diff --git a/PhysicsAnalysis/D3PDTools/SampleHandler/SampleHandler/DiskListEOS.h b/PhysicsAnalysis/D3PDTools/SampleHandler/SampleHandler/DiskListEOS.h
index db085c69e9f263a65540b0c1b9fa53853292b24d..c9462875f1fd08ca3147a9ad6a25d30f02c19340 100644
--- a/PhysicsAnalysis/D3PDTools/SampleHandler/SampleHandler/DiskListEOS.h
+++ b/PhysicsAnalysis/D3PDTools/SampleHandler/SampleHandler/DiskListEOS.h
@@ -5,7 +5,7 @@
#ifndef SAMPLE_HANDLER__DISK_LIST_EOS_H
#define SAMPLE_HANDLER__DISK_LIST_EOS_H
-// Copyright Nils Krumnack 2012.
+//
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
diff --git a/PhysicsAnalysis/D3PDTools/SampleHandler/SampleHandler/DiskListLocal.h b/PhysicsAnalysis/D3PDTools/SampleHandler/SampleHandler/DiskListLocal.h
index 2afbd03d579a59c6adbfd6c0a0da666abcc92249..848bcb6e57b9465b6180312fbae9bdc5da54cc5c 100644
--- a/PhysicsAnalysis/D3PDTools/SampleHandler/SampleHandler/DiskListLocal.h
+++ b/PhysicsAnalysis/D3PDTools/SampleHandler/SampleHandler/DiskListLocal.h
@@ -5,7 +5,7 @@
#ifndef SAMPLE_HANDLER__DISK_LIST_LOCAL_H
#define SAMPLE_HANDLER__DISK_LIST_LOCAL_H
-// Copyright Nils Krumnack 2012.
+//
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
diff --git a/PhysicsAnalysis/D3PDTools/SampleHandler/SampleHandler/DiskListSRM.h b/PhysicsAnalysis/D3PDTools/SampleHandler/SampleHandler/DiskListSRM.h
index 5476d8bc8b3a52695b9c04945aaa8acd00191bc4..522c766caa2493082aa016389b4180af319f9b77 100644
--- a/PhysicsAnalysis/D3PDTools/SampleHandler/SampleHandler/DiskListSRM.h
+++ b/PhysicsAnalysis/D3PDTools/SampleHandler/SampleHandler/DiskListSRM.h
@@ -5,7 +5,7 @@
#ifndef SAMPLE_HANDLER__DISK_LIST_SRM_H
#define SAMPLE_HANDLER__DISK_LIST_SRM_H
-// Copyright Nils Krumnack 2012.
+//
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
diff --git a/PhysicsAnalysis/D3PDTools/SampleHandler/SampleHandler/DiskListXRD.h b/PhysicsAnalysis/D3PDTools/SampleHandler/SampleHandler/DiskListXRD.h
index d9a706ba0b36e47b6c72afe5f2210ab5d6ad6020..03aa7fae7d12939171045b743346e29e54d60de3 100644
--- a/PhysicsAnalysis/D3PDTools/SampleHandler/SampleHandler/DiskListXRD.h
+++ b/PhysicsAnalysis/D3PDTools/SampleHandler/SampleHandler/DiskListXRD.h
@@ -5,7 +5,7 @@
#ifndef SAMPLE_HANDLER__DISK_LIST_XRD_H
#define SAMPLE_HANDLER__DISK_LIST_XRD_H
-// Copyright Nils Krumnack 2012.
+//
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
diff --git a/PhysicsAnalysis/D3PDTools/SampleHandler/SampleHandler/DiskOutput.h b/PhysicsAnalysis/D3PDTools/SampleHandler/SampleHandler/DiskOutput.h
index 1a59c8959f239e18f1818264703df3aff8338b74..6be1709c05b2e6039878d7bad2f263fe3849c67b 100644
--- a/PhysicsAnalysis/D3PDTools/SampleHandler/SampleHandler/DiskOutput.h
+++ b/PhysicsAnalysis/D3PDTools/SampleHandler/SampleHandler/DiskOutput.h
@@ -5,7 +5,7 @@
#ifndef SAMPLE_HANDLER__DISK_OUTPUT_H
#define SAMPLE_HANDLER__DISK_OUTPUT_H
-// Copyright Iowa State University 2013.
+//
// Author: Nils Krumnack
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/PhysicsAnalysis/D3PDTools/SampleHandler/SampleHandler/DiskOutputLocal.h b/PhysicsAnalysis/D3PDTools/SampleHandler/SampleHandler/DiskOutputLocal.h
index f1c7fbeb3c7f2c3074e3a68981870bde43622b84..353bb6ced1d2b06adcef2a931fd55cd94af4ba17 100644
--- a/PhysicsAnalysis/D3PDTools/SampleHandler/SampleHandler/DiskOutputLocal.h
+++ b/PhysicsAnalysis/D3PDTools/SampleHandler/SampleHandler/DiskOutputLocal.h
@@ -5,7 +5,7 @@
#ifndef SAMPLE_HANDLER__DISK_OUTPUT_LOCAL_H
#define SAMPLE_HANDLER__DISK_OUTPUT_LOCAL_H
-// Copyright Iowa State University 2013.
+//
// Author: Nils Krumnack
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/PhysicsAnalysis/D3PDTools/SampleHandler/SampleHandler/DiskOutputXRD.h b/PhysicsAnalysis/D3PDTools/SampleHandler/SampleHandler/DiskOutputXRD.h
index 114615311229074bd2ad45c38d24fc924d568f7d..be10f354839ffcb98335da4dee5287f914bf1aa6 100644
--- a/PhysicsAnalysis/D3PDTools/SampleHandler/SampleHandler/DiskOutputXRD.h
+++ b/PhysicsAnalysis/D3PDTools/SampleHandler/SampleHandler/DiskOutputXRD.h
@@ -5,7 +5,7 @@
#ifndef SAMPLE_HANDLER__DISK_OUTPUT_XRD_H
#define SAMPLE_HANDLER__DISK_OUTPUT_XRD_H
-// Copyright Iowa State University 2013.
+//
// Author: Nils Krumnack
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/PhysicsAnalysis/D3PDTools/SampleHandler/SampleHandler/DiskWriter.h b/PhysicsAnalysis/D3PDTools/SampleHandler/SampleHandler/DiskWriter.h
index 908ca5249352da42a12d612c73f91e20a0a92d48..4c93b2f9486b50ba36515ef20671d370f8a7d8f3 100644
--- a/PhysicsAnalysis/D3PDTools/SampleHandler/SampleHandler/DiskWriter.h
+++ b/PhysicsAnalysis/D3PDTools/SampleHandler/SampleHandler/DiskWriter.h
@@ -5,7 +5,7 @@
#ifndef SAMPLE_HANDLER__DISK_WRITER_H
#define SAMPLE_HANDLER__DISK_WRITER_H
-// Copyright Iowa State University 2013.
+//
// Author: Nils Krumnack
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/PhysicsAnalysis/D3PDTools/SampleHandler/SampleHandler/DiskWriterLocal.h b/PhysicsAnalysis/D3PDTools/SampleHandler/SampleHandler/DiskWriterLocal.h
index cea683fafc1a61d430dacea20282bf56c049e507..88e2584e6c81f5353949cf9484bcd24c44158ff5 100644
--- a/PhysicsAnalysis/D3PDTools/SampleHandler/SampleHandler/DiskWriterLocal.h
+++ b/PhysicsAnalysis/D3PDTools/SampleHandler/SampleHandler/DiskWriterLocal.h
@@ -5,7 +5,7 @@
#ifndef SAMPLE_HANDLER__DISK_WRITER_LOCAL_H
#define SAMPLE_HANDLER__DISK_WRITER_LOCAL_H
-// Copyright Iowa State University 2013.
+//
// Author: Nils Krumnack
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/PhysicsAnalysis/D3PDTools/SampleHandler/SampleHandler/DiskWriterXRD.h b/PhysicsAnalysis/D3PDTools/SampleHandler/SampleHandler/DiskWriterXRD.h
index 5db30f72ad924086fd2cba3c7402a3dc8cb0e6c2..2d8d35c1b3b36cb4d25e64f8ae5d57de8ac565d1 100644
--- a/PhysicsAnalysis/D3PDTools/SampleHandler/SampleHandler/DiskWriterXRD.h
+++ b/PhysicsAnalysis/D3PDTools/SampleHandler/SampleHandler/DiskWriterXRD.h
@@ -5,7 +5,7 @@
#ifndef SAMPLE_HANDLER__DISK_WRITER_XRD_H
#define SAMPLE_HANDLER__DISK_WRITER_XRD_H
-// Copyright Iowa State University 2013.
+//
// Author: Nils Krumnack
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/PhysicsAnalysis/D3PDTools/SampleHandler/SampleHandler/Global.h b/PhysicsAnalysis/D3PDTools/SampleHandler/SampleHandler/Global.h
index 6d0330347de88157676e21cf2eef1fde012110f7..c959645be3774d7c1556f9d2407aba9b74ac9ce9 100644
--- a/PhysicsAnalysis/D3PDTools/SampleHandler/SampleHandler/Global.h
+++ b/PhysicsAnalysis/D3PDTools/SampleHandler/SampleHandler/Global.h
@@ -5,7 +5,7 @@
#ifndef SAMPLE_HANDLER_GLOBAL_HH
#define SAMPLE_HANDLER_GLOBAL_HH
-// Copyright Nils Krumnack 2011.
+//
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
diff --git a/PhysicsAnalysis/D3PDTools/SampleHandler/SampleHandler/GridTools.h b/PhysicsAnalysis/D3PDTools/SampleHandler/SampleHandler/GridTools.h
index 210bff2ab6d5a1a39959f68dd7ac5002f19b3b0f..ecd9dad0bebe886559e7125274705bb638e7818a 100644
--- a/PhysicsAnalysis/D3PDTools/SampleHandler/SampleHandler/GridTools.h
+++ b/PhysicsAnalysis/D3PDTools/SampleHandler/SampleHandler/GridTools.h
@@ -5,7 +5,7 @@
#ifndef SAMPLE_HANDLER__GRID_TOOLS_H
#define SAMPLE_HANDLER__GRID_TOOLS_H
-// Copyright Nils Krumnack 2016.
+//
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
diff --git a/PhysicsAnalysis/D3PDTools/SampleHandler/SampleHandler/Meta.h b/PhysicsAnalysis/D3PDTools/SampleHandler/SampleHandler/Meta.h
index cbc73f9b03743c6bd1385fa5b59f54c6ab9382db..dbb5137cede55019d6e8fa3e40c23f107682f9f9 100644
--- a/PhysicsAnalysis/D3PDTools/SampleHandler/SampleHandler/Meta.h
+++ b/PhysicsAnalysis/D3PDTools/SampleHandler/SampleHandler/Meta.h
@@ -5,7 +5,7 @@
#ifndef SAMPLE_HANDLER_META_HH
#define SAMPLE_HANDLER_META_HH
-// Copyright Nils Krumnack 2011.
+//
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
diff --git a/PhysicsAnalysis/D3PDTools/SampleHandler/SampleHandler/MetaData.h b/PhysicsAnalysis/D3PDTools/SampleHandler/SampleHandler/MetaData.h
index 01852e806281a8d495c2020207bcdd1d56412057..b03e7e8a13a6a53bdca7681107395f94a6f6bb9c 100644
--- a/PhysicsAnalysis/D3PDTools/SampleHandler/SampleHandler/MetaData.h
+++ b/PhysicsAnalysis/D3PDTools/SampleHandler/SampleHandler/MetaData.h
@@ -5,7 +5,7 @@
#ifndef SAMPLE_HANDLER_META_DATA_HH
#define SAMPLE_HANDLER_META_DATA_HH
-// Copyright Nils Krumnack 2011.
+//
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
diff --git a/PhysicsAnalysis/D3PDTools/SampleHandler/SampleHandler/MetaFields.h b/PhysicsAnalysis/D3PDTools/SampleHandler/SampleHandler/MetaFields.h
index dfcb51e33bea33f1b083a319f738261eae07fad1..e0ceda445997d57c2bf7b2e660fd934b931fceeb 100644
--- a/PhysicsAnalysis/D3PDTools/SampleHandler/SampleHandler/MetaFields.h
+++ b/PhysicsAnalysis/D3PDTools/SampleHandler/SampleHandler/MetaFields.h
@@ -5,7 +5,7 @@
#ifndef SAMPLE_HANDLER__META_FIELDS_H
#define SAMPLE_HANDLER__META_FIELDS_H
-// Copyright Nils Krumnack 2012.
+//
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
diff --git a/PhysicsAnalysis/D3PDTools/SampleHandler/SampleHandler/MetaNames.h b/PhysicsAnalysis/D3PDTools/SampleHandler/SampleHandler/MetaNames.h
index 894bb442affb19c9314d5c4f84bf0a9a75bff954..e8c0595a026f1c5949c9874175b6bd9ebe7a27a3 100644
--- a/PhysicsAnalysis/D3PDTools/SampleHandler/SampleHandler/MetaNames.h
+++ b/PhysicsAnalysis/D3PDTools/SampleHandler/SampleHandler/MetaNames.h
@@ -5,7 +5,7 @@
#ifndef SAMPLE_HANDLER__META_NAMES_H
#define SAMPLE_HANDLER__META_NAMES_H
-// Copyright Iowa State University 2015.
+//
// Author: Nils Krumnack
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/PhysicsAnalysis/D3PDTools/SampleHandler/SampleHandler/MetaObject.h b/PhysicsAnalysis/D3PDTools/SampleHandler/SampleHandler/MetaObject.h
index 8d96b3d6b30d5d73872b4a51d48100c5c606bd90..18c48fb28e9842fc53fde8e674c12c45c803ae24 100644
--- a/PhysicsAnalysis/D3PDTools/SampleHandler/SampleHandler/MetaObject.h
+++ b/PhysicsAnalysis/D3PDTools/SampleHandler/SampleHandler/MetaObject.h
@@ -5,7 +5,7 @@
#ifndef SAMPLE_HANDLER_META_OBJECT_HH
#define SAMPLE_HANDLER_META_OBJECT_HH
-// Copyright Nils Krumnack 2011 - 2012.
+// - 2012.
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
diff --git a/PhysicsAnalysis/D3PDTools/SampleHandler/SampleHandler/MetaVector.h b/PhysicsAnalysis/D3PDTools/SampleHandler/SampleHandler/MetaVector.h
index 120652626dcbe16683386e4aeea4902225f9f042..b7b86c958bfc3e59a4b491528e33e9e45cfcb1e1 100644
--- a/PhysicsAnalysis/D3PDTools/SampleHandler/SampleHandler/MetaVector.h
+++ b/PhysicsAnalysis/D3PDTools/SampleHandler/SampleHandler/MetaVector.h
@@ -5,7 +5,7 @@
#ifndef SAMPLE_HANDLER_META_VECTOR_HH
#define SAMPLE_HANDLER_META_VECTOR_HH
-// Copyright Nils Krumnack 2011.
+//
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
diff --git a/PhysicsAnalysis/D3PDTools/SampleHandler/SampleHandler/Sample.h b/PhysicsAnalysis/D3PDTools/SampleHandler/SampleHandler/Sample.h
index 7941a15bf0d57a77304f1dfe62837a12c15d2571..721b5f2d0e33516a1c75faf1219f9c96c35f0c23 100644
--- a/PhysicsAnalysis/D3PDTools/SampleHandler/SampleHandler/Sample.h
+++ b/PhysicsAnalysis/D3PDTools/SampleHandler/SampleHandler/Sample.h
@@ -5,7 +5,7 @@
#ifndef SAMPLE_HANDLER_SAMPLE_HH
#define SAMPLE_HANDLER_SAMPLE_HH
-// Copyright Nils Krumnack 2011.
+//
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
diff --git a/PhysicsAnalysis/D3PDTools/SampleHandler/SampleHandler/SampleComposite.h b/PhysicsAnalysis/D3PDTools/SampleHandler/SampleHandler/SampleComposite.h
index 89d73c5f6f82732a255dab7e8544def7b225fa35..be10c403432fee6aa64b8528c86922ce75cb5f99 100644
--- a/PhysicsAnalysis/D3PDTools/SampleHandler/SampleHandler/SampleComposite.h
+++ b/PhysicsAnalysis/D3PDTools/SampleHandler/SampleHandler/SampleComposite.h
@@ -5,7 +5,7 @@
#ifndef SAMPLE_HANDLER_SAMPLE_COMPOSITE_HH
#define SAMPLE_HANDLER_SAMPLE_COMPOSITE_HH
-// Copyright Nils Krumnack 2011.
+//
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
diff --git a/PhysicsAnalysis/D3PDTools/SampleHandler/SampleHandler/SampleGrid.h b/PhysicsAnalysis/D3PDTools/SampleHandler/SampleHandler/SampleGrid.h
index 3199dd0a349a7a85c1ed1d7f700b7185a8af9090..3005e3e191176dcdc0f34142625e1542792d6211 100644
--- a/PhysicsAnalysis/D3PDTools/SampleHandler/SampleHandler/SampleGrid.h
+++ b/PhysicsAnalysis/D3PDTools/SampleHandler/SampleHandler/SampleGrid.h
@@ -5,7 +5,7 @@
#ifndef SAMPLE_HANDLER_SAMPLE_GRID_HH
#define SAMPLE_HANDLER_SAMPLE_GRID_HH
-// Copyright Nils Krumnack 2011.
+//
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
diff --git a/PhysicsAnalysis/D3PDTools/SampleHandler/SampleHandler/SampleHandler.h b/PhysicsAnalysis/D3PDTools/SampleHandler/SampleHandler/SampleHandler.h
index f6d3c490c9fdf23a28711db04d78808dc7f5dd11..d51586f58434fa81301278fb7df91b2a8f786dd9 100644
--- a/PhysicsAnalysis/D3PDTools/SampleHandler/SampleHandler/SampleHandler.h
+++ b/PhysicsAnalysis/D3PDTools/SampleHandler/SampleHandler/SampleHandler.h
@@ -5,7 +5,7 @@
#ifndef SAMPLE_HANDLER_SAMPLE_HANDLER_HH
#define SAMPLE_HANDLER_SAMPLE_HANDLER_HH
-// Copyright Nils Krumnack 2011.
+//
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
diff --git a/PhysicsAnalysis/D3PDTools/SampleHandler/SampleHandler/SampleHist.h b/PhysicsAnalysis/D3PDTools/SampleHandler/SampleHandler/SampleHist.h
index f5ce6477807c2a10dfebdab937a45cf4ad972a57..a36c18878c88117513e960d7ecd5004675651eda 100644
--- a/PhysicsAnalysis/D3PDTools/SampleHandler/SampleHandler/SampleHist.h
+++ b/PhysicsAnalysis/D3PDTools/SampleHandler/SampleHandler/SampleHist.h
@@ -5,7 +5,7 @@
#ifndef SAMPLE_HANDLER_SAMPLE_HIST_HH
#define SAMPLE_HANDLER_SAMPLE_HIST_HH
-// Copyright Nils Krumnack 2011.
+//
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
diff --git a/PhysicsAnalysis/D3PDTools/SampleHandler/SampleHandler/SampleLocal.h b/PhysicsAnalysis/D3PDTools/SampleHandler/SampleHandler/SampleLocal.h
index f4e4df193cb96fdc681e474784fd37bd12805feb..3fc2d89b83f04cf3964b19df150cf4e680d06b78 100644
--- a/PhysicsAnalysis/D3PDTools/SampleHandler/SampleHandler/SampleLocal.h
+++ b/PhysicsAnalysis/D3PDTools/SampleHandler/SampleHandler/SampleLocal.h
@@ -5,7 +5,7 @@
#ifndef SAMPLE_HANDLER_SAMPLE_LOCAL_HH
#define SAMPLE_HANDLER_SAMPLE_LOCAL_HH
-// Copyright Nils Krumnack 2011.
+//
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
diff --git a/PhysicsAnalysis/D3PDTools/SampleHandler/SampleHandler/SampleMeta.h b/PhysicsAnalysis/D3PDTools/SampleHandler/SampleHandler/SampleMeta.h
index 21d45e8bc399a5238fab8089125d9f71695a95a6..ce9928bf53c026621a81fdaed549cf8dffee7ff6 100644
--- a/PhysicsAnalysis/D3PDTools/SampleHandler/SampleHandler/SampleMeta.h
+++ b/PhysicsAnalysis/D3PDTools/SampleHandler/SampleHandler/SampleMeta.h
@@ -5,7 +5,7 @@
#ifndef SAMPLE_HANDLER__SAMPLE_META_H
#define SAMPLE_HANDLER__SAMPLE_META_H
-// Copyright Nils Krumnack 2012.
+//
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
diff --git a/PhysicsAnalysis/D3PDTools/SampleHandler/SampleHandler/SamplePtr.h b/PhysicsAnalysis/D3PDTools/SampleHandler/SampleHandler/SamplePtr.h
index 59dd17b66ed7e96fb9ba46f2dbe5e617942ed76f..495852e024101845607bfbf1fbf3f4fd94a42760 100644
--- a/PhysicsAnalysis/D3PDTools/SampleHandler/SampleHandler/SamplePtr.h
+++ b/PhysicsAnalysis/D3PDTools/SampleHandler/SampleHandler/SamplePtr.h
@@ -5,7 +5,7 @@
#ifndef SAMPLE_HANDLER_SAMPLE_PTR_HH
#define SAMPLE_HANDLER_SAMPLE_PTR_HH
-// Copyright Nils Krumnack 2011.
+//
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
diff --git a/PhysicsAnalysis/D3PDTools/SampleHandler/SampleHandler/ScanDir.h b/PhysicsAnalysis/D3PDTools/SampleHandler/SampleHandler/ScanDir.h
index 8c89900f1878da8653c0e21faa48eeeb11f4b33e..7c909fb78e96a28dc531a132b72befda7e9ce256 100644
--- a/PhysicsAnalysis/D3PDTools/SampleHandler/SampleHandler/ScanDir.h
+++ b/PhysicsAnalysis/D3PDTools/SampleHandler/SampleHandler/ScanDir.h
@@ -5,7 +5,7 @@
#ifndef SAMPLE_HANDLER__SCAN_DIR_H
#define SAMPLE_HANDLER__SCAN_DIR_H
-// Copyright Iowa State University 2015.
+//
// Author: Nils Krumnack
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/PhysicsAnalysis/D3PDTools/SampleHandler/SampleHandler/TagList.h b/PhysicsAnalysis/D3PDTools/SampleHandler/SampleHandler/TagList.h
index 223e80b92532fece6ee94a77b2a9b9c6a007fb79..295413378a32d5d6f289210aa098040b0aa9cfd0 100644
--- a/PhysicsAnalysis/D3PDTools/SampleHandler/SampleHandler/TagList.h
+++ b/PhysicsAnalysis/D3PDTools/SampleHandler/SampleHandler/TagList.h
@@ -5,7 +5,7 @@
#ifndef SAMPLE_HANDLER_TAG_LIST_HH
#define SAMPLE_HANDLER_TAG_LIST_HH
-// Copyright Nils Krumnack 2011.
+//
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
diff --git a/PhysicsAnalysis/D3PDTools/SampleHandler/SampleHandler/ToolsDiscovery.h b/PhysicsAnalysis/D3PDTools/SampleHandler/SampleHandler/ToolsDiscovery.h
index 513f335b2af34922adcdde46e2934aded2f076ac..c1a80263acdfd5dec4247c49bab24dd93d37e58e 100644
--- a/PhysicsAnalysis/D3PDTools/SampleHandler/SampleHandler/ToolsDiscovery.h
+++ b/PhysicsAnalysis/D3PDTools/SampleHandler/SampleHandler/ToolsDiscovery.h
@@ -5,7 +5,7 @@
#ifndef SAMPLE_HANDLER_TOOLS_DISCOVERY_H
#define SAMPLE_HANDLER_TOOLS_DISCOVERY_H
-// Copyright Nils Krumnack 2011.
+//
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
diff --git a/PhysicsAnalysis/D3PDTools/SampleHandler/SampleHandler/ToolsDuplicates.h b/PhysicsAnalysis/D3PDTools/SampleHandler/SampleHandler/ToolsDuplicates.h
index c78f99718d83aab7062f9256f30223c7ae4cb924..113ae12fccaecde37dfb02fe3469b4a4a9f0b816 100644
--- a/PhysicsAnalysis/D3PDTools/SampleHandler/SampleHandler/ToolsDuplicates.h
+++ b/PhysicsAnalysis/D3PDTools/SampleHandler/SampleHandler/ToolsDuplicates.h
@@ -5,7 +5,7 @@
#ifndef SAMPLE_HANDLER__TOOLS_DUPLICATES_H
#define SAMPLE_HANDLER__TOOLS_DUPLICATES_H
-// Copyright Nils Krumnack 2013.
+//
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
diff --git a/PhysicsAnalysis/D3PDTools/SampleHandler/SampleHandler/ToolsJoin.h b/PhysicsAnalysis/D3PDTools/SampleHandler/SampleHandler/ToolsJoin.h
index 438189455db02f8ae2562d9d403641cafa4623bc..56fcca67b168ed5d1ab08eecc5ec057c5a90ac52 100644
--- a/PhysicsAnalysis/D3PDTools/SampleHandler/SampleHandler/ToolsJoin.h
+++ b/PhysicsAnalysis/D3PDTools/SampleHandler/SampleHandler/ToolsJoin.h
@@ -5,7 +5,7 @@
#ifndef SAMPLE_HANDLER_TOOLS_JOIN_H
#define SAMPLE_HANDLER_TOOLS_JOIN_H
-// Copyright Nils Krumnack 2013.
+//
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
diff --git a/PhysicsAnalysis/D3PDTools/SampleHandler/SampleHandler/ToolsMeta.h b/PhysicsAnalysis/D3PDTools/SampleHandler/SampleHandler/ToolsMeta.h
index 32f2ce6b74a317e1bf2ae626fcc3e1351aa823ea..4450cdafc460dd04c8213a9cae5337e57bfd68e8 100644
--- a/PhysicsAnalysis/D3PDTools/SampleHandler/SampleHandler/ToolsMeta.h
+++ b/PhysicsAnalysis/D3PDTools/SampleHandler/SampleHandler/ToolsMeta.h
@@ -5,7 +5,7 @@
#ifndef SAMPLE_HANDLER__TOOLS_META_H
#define SAMPLE_HANDLER__TOOLS_META_H
-// Copyright Iowa State University 2014.
+//
// Author: Nils Krumnack
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/PhysicsAnalysis/D3PDTools/SampleHandler/SampleHandler/ToolsOther.h b/PhysicsAnalysis/D3PDTools/SampleHandler/SampleHandler/ToolsOther.h
index 952ce382dc92fc3778459cc6afe69129adf8b8b2..6264b82b0df5c916a95d2fb14466294d299b0eec 100644
--- a/PhysicsAnalysis/D3PDTools/SampleHandler/SampleHandler/ToolsOther.h
+++ b/PhysicsAnalysis/D3PDTools/SampleHandler/SampleHandler/ToolsOther.h
@@ -5,7 +5,7 @@
#ifndef SAMPLE_HANDLER__TOOLS_OTHER_H
#define SAMPLE_HANDLER__TOOLS_OTHER_H
-// Copyright Iowa State University 2015.
+//
// Author: Nils Krumnack
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/PhysicsAnalysis/D3PDTools/SampleHandler/SampleHandler/ToolsSplit.h b/PhysicsAnalysis/D3PDTools/SampleHandler/SampleHandler/ToolsSplit.h
index 531811053d672261caafe7f1b60368e208f90604..d39f4d7cf3b4bce08277ec9b9e879ff25e25e76e 100644
--- a/PhysicsAnalysis/D3PDTools/SampleHandler/SampleHandler/ToolsSplit.h
+++ b/PhysicsAnalysis/D3PDTools/SampleHandler/SampleHandler/ToolsSplit.h
@@ -5,7 +5,7 @@
#ifndef SAMPLE_HANDLER_TOOLS_SPLIT_H
#define SAMPLE_HANDLER_TOOLS_SPLIT_H
-// Copyright Nils Krumnack 2011.
+//
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
diff --git a/PhysicsAnalysis/D3PDTools/SampleHandler/scripts/print_duplicate_events.C b/PhysicsAnalysis/D3PDTools/SampleHandler/scripts/print_duplicate_events.C
index 62d364a7e524c189847533a3e5392711351ea3e3..32128a170b107749baec141beff7259c71b44857 100644
--- a/PhysicsAnalysis/D3PDTools/SampleHandler/scripts/print_duplicate_events.C
+++ b/PhysicsAnalysis/D3PDTools/SampleHandler/scripts/print_duplicate_events.C
@@ -2,7 +2,7 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-// Copyright Nils Krumnack 2013.
+//
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
diff --git a/PhysicsAnalysis/D3PDTools/SampleHandler/test/gt_SampleHandler.cxx b/PhysicsAnalysis/D3PDTools/SampleHandler/test/gt_SampleHandler.cxx
index 4d14b7b805f6e1728c7ed200ab59ce562cd601b6..b90528c228d1621bf5340afe40814e1eeeeca129 100644
--- a/PhysicsAnalysis/D3PDTools/SampleHandler/test/gt_SampleHandler.cxx
+++ b/PhysicsAnalysis/D3PDTools/SampleHandler/test/gt_SampleHandler.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-// Copyright Nils Krumnack 2015.
+//
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
diff --git a/PhysicsAnalysis/D3PDTools/SampleHandler/test/gt_disk_list_eos.cxx b/PhysicsAnalysis/D3PDTools/SampleHandler/test/gt_disk_list_eos.cxx
index ee708ff66e7c7c43baa2a0540607ff4be76f0c94..f80fb5ec020bbf79cd56520cc97af00a6e12e04f 100644
--- a/PhysicsAnalysis/D3PDTools/SampleHandler/test/gt_disk_list_eos.cxx
+++ b/PhysicsAnalysis/D3PDTools/SampleHandler/test/gt_disk_list_eos.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-// Copyright Nils Krumnack 2011.
+//
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
diff --git a/PhysicsAnalysis/D3PDTools/SampleHandler/test/gt_hadd.cxx b/PhysicsAnalysis/D3PDTools/SampleHandler/test/gt_hadd.cxx
index 15b7eeb6de3bcd7cf85095269abfd2eaaec7e291..b427efc6f4e24957d7b8db7a75478972705ca102 100644
--- a/PhysicsAnalysis/D3PDTools/SampleHandler/test/gt_hadd.cxx
+++ b/PhysicsAnalysis/D3PDTools/SampleHandler/test/gt_hadd.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-// Copyright Iowa State University 2016.
+//
// Author: Nils Krumnack
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/PhysicsAnalysis/D3PDTools/SampleHandler/test/gt_scan_dir.cxx b/PhysicsAnalysis/D3PDTools/SampleHandler/test/gt_scan_dir.cxx
index 3f1ded6ab425cb310b540f7cf0f4d4f4cdfd3f26..3099b95848ae6cc80cfd8d4203ec9bbc426a7ace 100644
--- a/PhysicsAnalysis/D3PDTools/SampleHandler/test/gt_scan_dir.cxx
+++ b/PhysicsAnalysis/D3PDTools/SampleHandler/test/gt_scan_dir.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-// Copyright Nils Krumnack 2015.
+//
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
diff --git a/PhysicsAnalysis/D3PDTools/SampleHandler/test/it_GridTools.cxx b/PhysicsAnalysis/D3PDTools/SampleHandler/test/it_GridTools.cxx
index 9011df9725fc2be3ae504f4c595e71159dbf9ecc..fd78827a6c9b36e5e550bddcba8e3520edcfad59 100644
--- a/PhysicsAnalysis/D3PDTools/SampleHandler/test/it_GridTools.cxx
+++ b/PhysicsAnalysis/D3PDTools/SampleHandler/test/it_GridTools.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-// Copyright Nils Krumnack 2016.
+//
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
diff --git a/PhysicsAnalysis/D3PDTools/SampleHandler/test/lnk_sample.cxx b/PhysicsAnalysis/D3PDTools/SampleHandler/test/lnk_sample.cxx
index 4f7d7d9f0b7af19695502f865eef5013e08f8943..e252940e1ba34a9e9a5cd216ea6ff164eaaede95 100644
--- a/PhysicsAnalysis/D3PDTools/SampleHandler/test/lnk_sample.cxx
+++ b/PhysicsAnalysis/D3PDTools/SampleHandler/test/lnk_sample.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-// Copyright Nils Krumnack 2014.
+//
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
diff --git a/PhysicsAnalysis/D3PDTools/SampleHandler/test/ut_disk_list_xrd.cxx b/PhysicsAnalysis/D3PDTools/SampleHandler/test/ut_disk_list_xrd.cxx
index 4b8fa4601b8c7191a6b3721e6d50b03642a267ee..1ec07ddc0b1046bffd84bf2c4c620e992bfd7b56 100644
--- a/PhysicsAnalysis/D3PDTools/SampleHandler/test/ut_disk_list_xrd.cxx
+++ b/PhysicsAnalysis/D3PDTools/SampleHandler/test/ut_disk_list_xrd.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-// Copyright Nils Krumnack 2011.
+//
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
diff --git a/PhysicsAnalysis/D3PDTools/SampleHandler/test/ut_meta_object.cxx b/PhysicsAnalysis/D3PDTools/SampleHandler/test/ut_meta_object.cxx
index e73266737ea93972225c6b3eaf6aaed9b03c9eb7..23f5ce6f6490249563a4f88f7f569a26ebd8de3c 100644
--- a/PhysicsAnalysis/D3PDTools/SampleHandler/test/ut_meta_object.cxx
+++ b/PhysicsAnalysis/D3PDTools/SampleHandler/test/ut_meta_object.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-// Copyright Nils Krumnack 2012.
+//
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
diff --git a/PhysicsAnalysis/D3PDTools/SampleHandler/test/ut_meta_persist.cxx b/PhysicsAnalysis/D3PDTools/SampleHandler/test/ut_meta_persist.cxx
index 06f6da0dc8840800acf2a9902395d2b32eac566b..467bcc03537446c02742d1ccfadbd7e82ec83f2a 100644
--- a/PhysicsAnalysis/D3PDTools/SampleHandler/test/ut_meta_persist.cxx
+++ b/PhysicsAnalysis/D3PDTools/SampleHandler/test/ut_meta_persist.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-// Copyright Nils Krumnack 2012.
+//
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
diff --git a/PhysicsAnalysis/D3PDTools/SampleHandler/test/ut_test_fetch.cxx b/PhysicsAnalysis/D3PDTools/SampleHandler/test/ut_test_fetch.cxx
index d01483cb25a8178b6a633a6618da331159ccca6a..d39c81e3dff3097c48f244b1a5c1c7646140c541 100644
--- a/PhysicsAnalysis/D3PDTools/SampleHandler/test/ut_test_fetch.cxx
+++ b/PhysicsAnalysis/D3PDTools/SampleHandler/test/ut_test_fetch.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-// Copyright Nils Krumnack 2011.
+//
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
diff --git a/PhysicsAnalysis/D3PDTools/SampleHandler/test/ut_test_fetch2.cxx b/PhysicsAnalysis/D3PDTools/SampleHandler/test/ut_test_fetch2.cxx
index 383d8f4be20028f68eae3fcecffeffcfd01ca794..25b9127ce96525c4e3de640e3db68655cf31f9d7 100644
--- a/PhysicsAnalysis/D3PDTools/SampleHandler/test/ut_test_fetch2.cxx
+++ b/PhysicsAnalysis/D3PDTools/SampleHandler/test/ut_test_fetch2.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-// Copyright Nils Krumnack 2011.
+//
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkMuons/DerivationFrameworkMuons/IDTrackCaloDepositsDecoratorTool.h b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkMuons/DerivationFrameworkMuons/IDTrackCaloDepositsDecoratorTool.h
index 0e19207edef5d45d21edc2d953a43951efbc9c3f..0210574464311ab7d4898070445bf60b8acf2262 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkMuons/DerivationFrameworkMuons/IDTrackCaloDepositsDecoratorTool.h
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkMuons/DerivationFrameworkMuons/IDTrackCaloDepositsDecoratorTool.h
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
/*
* IDTrackCaloDepositsDecoratorTool.h
*
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkMuons/DerivationFrameworkMuons/IIDTrackCaloDepositsDecoratorTool.h b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkMuons/DerivationFrameworkMuons/IIDTrackCaloDepositsDecoratorTool.h
index d1979a0c1ed1fadc93ca031e4c3864a0c6b8ba74..579cb9060fa96d675ccae19464f9767ea957dafa 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkMuons/DerivationFrameworkMuons/IIDTrackCaloDepositsDecoratorTool.h
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkMuons/DerivationFrameworkMuons/IIDTrackCaloDepositsDecoratorTool.h
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
/*
* IIDTrackCaloDepositsDecoratorTool.h
*
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkMuons/DerivationFrameworkMuons/IMuonTPExtrapolationTool.h b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkMuons/DerivationFrameworkMuons/IMuonTPExtrapolationTool.h
index d41694358e557095c56a97f6b2fdfe3023827e45..fe34019d0da74f82bf8a125524928d02a4c033ed 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkMuons/DerivationFrameworkMuons/IMuonTPExtrapolationTool.h
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkMuons/DerivationFrameworkMuons/IMuonTPExtrapolationTool.h
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
// IMuonTPExtrapolationTool.h
#ifndef IMuonTPExtrapolationTool_H
#define IMuonTPExtrapolationTool_H
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkMuons/DerivationFrameworkMuons/MuonTPExtrapolationTool.h b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkMuons/DerivationFrameworkMuons/MuonTPExtrapolationTool.h
index 4e685ad76f3c2e48f430121e93397da14f4b2170..64ee1c3e55d49db1b7aec320cc64b18443bdb741 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkMuons/DerivationFrameworkMuons/MuonTPExtrapolationTool.h
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkMuons/DerivationFrameworkMuons/MuonTPExtrapolationTool.h
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
//////////////////////////////////////////////////////////////////////////////
// MuonTPExtrapolationTool
// ASG Tool performing extrapolations
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkMuons/src/IDTrackCaloDepositsDecoratorTool.cxx b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkMuons/src/IDTrackCaloDepositsDecoratorTool.cxx
index 6182cabb8c7f6018ee6bb17d7822a74a7dc24a83..c2a004608904c32fcce288bee844eb001f33bf6d 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkMuons/src/IDTrackCaloDepositsDecoratorTool.cxx
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkMuons/src/IDTrackCaloDepositsDecoratorTool.cxx
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
/*
* IDTrackCaloDepositsDecoratorTool.cxx
*
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkMuons/src/MuonTPExtrapolationTool.cxx b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkMuons/src/MuonTPExtrapolationTool.cxx
index 29177bfb8cac3bc6ddb649f2e624bfe8dc02548f..4b13a9ce9f59cd1a0494099aa193744bd33f5e65 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkMuons/src/MuonTPExtrapolationTool.cxx
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkMuons/src/MuonTPExtrapolationTool.cxx
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
// MuonTPExtrapolationTool.cxx
#include "DerivationFrameworkMuons/MuonTPExtrapolationTool.h"
#include "xAODTruth/TruthParticleContainer.h"
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkMuons/src/MuonTPJpsiVertexFittingAlg.cxx b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkMuons/src/MuonTPJpsiVertexFittingAlg.cxx
index 7b598be6ee74ab386a8cd951aa3a4b9a8f8bd364..0d0881b5bb314e01c732e562608927a2b8fdea60 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkMuons/src/MuonTPJpsiVertexFittingAlg.cxx
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkMuons/src/MuonTPJpsiVertexFittingAlg.cxx
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
#include "MuonTPJpsiVertexFittingAlg.h"
#include "GaudiKernel/Property.h"
#include "GaudiKernel/ITHistSvc.h"
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkMuons/src/MuonTPJpsiVertexFittingAlg.h b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkMuons/src/MuonTPJpsiVertexFittingAlg.h
index 4cc7518fb56ea926f9092f358b5bfe0c49d9caa4..96ec4e4809383ef8f32f248236f6569cad4138d1 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkMuons/src/MuonTPJpsiVertexFittingAlg.h
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkMuons/src/MuonTPJpsiVertexFittingAlg.h
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
// MuonTPAlg.h
#ifndef MuonTPJpsiVertexFittingAlg__H
diff --git a/PhysicsAnalysis/ElectronPhotonID/PhotonEfficiencyCorrection/util/PrintPhotonSF.cxx b/PhysicsAnalysis/ElectronPhotonID/PhotonEfficiencyCorrection/util/PrintPhotonSF.cxx
index 4d11decf5596be45999568ce47acb66a4f2de2ae..f0f5e1f12d45a9f92dff5b66cf515ce35be71dc2 100644
--- a/PhysicsAnalysis/ElectronPhotonID/PhotonEfficiencyCorrection/util/PrintPhotonSF.cxx
+++ b/PhysicsAnalysis/ElectronPhotonID/PhotonEfficiencyCorrection/util/PrintPhotonSF.cxx
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
//PrintPhotonSF.cxx - print SF for a given input
//michael.pitt@cern.ch
diff --git a/PhysicsAnalysis/JetTagging/JetTagCalibration/src/JetTagCalibCondAlg.cxx b/PhysicsAnalysis/JetTagging/JetTagCalibration/src/JetTagCalibCondAlg.cxx
index fffbaa1bbab91bdd9dcfce9a7a90ad52cee70f28..06d140171aa687c341e86c84adffa0bcdccada66 100644
--- a/PhysicsAnalysis/JetTagging/JetTagCalibration/src/JetTagCalibCondAlg.cxx
+++ b/PhysicsAnalysis/JetTagging/JetTagCalibration/src/JetTagCalibCondAlg.cxx
@@ -1,5 +1,7 @@
/*
- * Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+/*
* */
#include "JetTagCalibration/JetTagCalibCondAlg.h"
diff --git a/PhysicsAnalysis/JetTagging/JetTagInfoTPCnv/test/AtlfInfoCnv_p1_test.cxx b/PhysicsAnalysis/JetTagging/JetTagInfoTPCnv/test/AtlfInfoCnv_p1_test.cxx
index 2ba94b1ca25ed6eb2aa844f0789ecd9989ce9492..29d1b32e07dd2bbc1176da309d0e8f69f6de1402 100644
--- a/PhysicsAnalysis/JetTagging/JetTagInfoTPCnv/test/AtlfInfoCnv_p1_test.cxx
+++ b/PhysicsAnalysis/JetTagging/JetTagInfoTPCnv/test/AtlfInfoCnv_p1_test.cxx
@@ -1,5 +1,7 @@
/*
- * Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration.
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+/*
*/
/**
* @file JetTagInfoTPCnv/test/AtlfInfoCnv_p1_test.cxx
diff --git a/PhysicsAnalysis/JetTagging/JetTagInfoTPCnv/test/BaseTagInfoCnv_p1_test.cxx b/PhysicsAnalysis/JetTagging/JetTagInfoTPCnv/test/BaseTagInfoCnv_p1_test.cxx
index 677185530eb15c960d2d843d28a765dfd2e3d7ca..b021443c51f4df4ade485d31743ecf5ad8ba23cc 100644
--- a/PhysicsAnalysis/JetTagging/JetTagInfoTPCnv/test/BaseTagInfoCnv_p1_test.cxx
+++ b/PhysicsAnalysis/JetTagging/JetTagInfoTPCnv/test/BaseTagInfoCnv_p1_test.cxx
@@ -1,5 +1,7 @@
/*
- * Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration.
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+/*
*/
/**
* @file JetTagInfoTPCnv/test/BaseTagInfoCnv_p1_test.cxx
diff --git a/PhysicsAnalysis/JetTagging/JetTagInfoTPCnv/test/ElectronAssociationCnv_p1_test.cxx b/PhysicsAnalysis/JetTagging/JetTagInfoTPCnv/test/ElectronAssociationCnv_p1_test.cxx
index c7f0a38ee9fc5b8c170afebbda1402b96cd44d95..d93c013c2076d40bd5d6563baad2e32b385616ef 100644
--- a/PhysicsAnalysis/JetTagging/JetTagInfoTPCnv/test/ElectronAssociationCnv_p1_test.cxx
+++ b/PhysicsAnalysis/JetTagging/JetTagInfoTPCnv/test/ElectronAssociationCnv_p1_test.cxx
@@ -1,5 +1,7 @@
/*
- * Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration.
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+/*
*/
/**
* @file JetTagInfoTPCnv/test/ElectronAssociationCnv_p1_test.cxx
diff --git a/PhysicsAnalysis/JetTagging/JetTagInfoTPCnv/test/GbbNNTagInfoCnv_p1_test.cxx b/PhysicsAnalysis/JetTagging/JetTagInfoTPCnv/test/GbbNNTagInfoCnv_p1_test.cxx
index 15f2a2f597dba650715c66cbb3d4c9ec0229669c..02f4c43123618505c7417648a9a4010b9827434e 100644
--- a/PhysicsAnalysis/JetTagging/JetTagInfoTPCnv/test/GbbNNTagInfoCnv_p1_test.cxx
+++ b/PhysicsAnalysis/JetTagging/JetTagInfoTPCnv/test/GbbNNTagInfoCnv_p1_test.cxx
@@ -1,5 +1,7 @@
/*
- * Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration.
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+/*
*/
/**
* @file JetTagInfoTPCnv/test/GbbNNTagInfoCnv_p1_test.cxx
diff --git a/PhysicsAnalysis/JetTagging/JetTagInfoTPCnv/test/IPInfoBaseCnv_p1_test.cxx b/PhysicsAnalysis/JetTagging/JetTagInfoTPCnv/test/IPInfoBaseCnv_p1_test.cxx
index cf9e1a4d16b34321ea50b65245ec9b204d5cbe99..7e3a44be1f5a833ca8ae0d2d3ae615d98c188f66 100644
--- a/PhysicsAnalysis/JetTagging/JetTagInfoTPCnv/test/IPInfoBaseCnv_p1_test.cxx
+++ b/PhysicsAnalysis/JetTagging/JetTagInfoTPCnv/test/IPInfoBaseCnv_p1_test.cxx
@@ -1,5 +1,7 @@
/*
- * Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration.
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+/*
*/
/**
* @file JetTagInfoTPCnv/test/IPInfoBaseCnv_p1_test.cxx
diff --git a/PhysicsAnalysis/JetTagging/JetTagInfoTPCnv/test/IPInfoPlusCnv_p1_test.cxx b/PhysicsAnalysis/JetTagging/JetTagInfoTPCnv/test/IPInfoPlusCnv_p1_test.cxx
index 52bd57aeb242d9b4aa04606caf7f4a4080d1cc56..4e2712af7b70075ca7e05220390d0f8d8ab36fd9 100644
--- a/PhysicsAnalysis/JetTagging/JetTagInfoTPCnv/test/IPInfoPlusCnv_p1_test.cxx
+++ b/PhysicsAnalysis/JetTagging/JetTagInfoTPCnv/test/IPInfoPlusCnv_p1_test.cxx
@@ -1,5 +1,7 @@
/*
- * Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration.
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+/*
*/
/**
* @file JetTagInfoTPCnv/test/IPInfoPlusCnv_p1_test.cxx
diff --git a/PhysicsAnalysis/JetTagging/JetTagInfoTPCnv/test/IPTrackInfoCnv_p1_test.cxx b/PhysicsAnalysis/JetTagging/JetTagInfoTPCnv/test/IPTrackInfoCnv_p1_test.cxx
index 58be62bd9348ff9b513a39b9a30aab7271c3566f..04bda015ffbc06c3e9dfb155585b8ad7f2265abb 100644
--- a/PhysicsAnalysis/JetTagging/JetTagInfoTPCnv/test/IPTrackInfoCnv_p1_test.cxx
+++ b/PhysicsAnalysis/JetTagging/JetTagInfoTPCnv/test/IPTrackInfoCnv_p1_test.cxx
@@ -1,5 +1,7 @@
/*
- * Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration.
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+/*
*/
/**
* @file JetTagInfoTPCnv/test/IPTrackInfoCnv_p1_test.cxx
diff --git a/PhysicsAnalysis/JetTagging/JetTagInfoTPCnv/test/ISvxAssociationCnv_p1_test.cxx b/PhysicsAnalysis/JetTagging/JetTagInfoTPCnv/test/ISvxAssociationCnv_p1_test.cxx
index 5309a6bc92810681410e50cde525334baa0d597e..8b2a0f65f9a4e72c2142e822038a578dd6c404b5 100644
--- a/PhysicsAnalysis/JetTagging/JetTagInfoTPCnv/test/ISvxAssociationCnv_p1_test.cxx
+++ b/PhysicsAnalysis/JetTagging/JetTagInfoTPCnv/test/ISvxAssociationCnv_p1_test.cxx
@@ -1,5 +1,7 @@
/*
- * Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration.
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+/*
*/
/**
* @file JetTagInfoTPCnv/test/ISvxAssociationCnv_p1_test.cxx
diff --git a/PhysicsAnalysis/JetTagging/JetTagInfoTPCnv/test/JetFitterTagInfoCnv_p1_test.cxx b/PhysicsAnalysis/JetTagging/JetTagInfoTPCnv/test/JetFitterTagInfoCnv_p1_test.cxx
index f6ecba71db62bd177d17ece1290ac5776d34256c..289388b378cd63d80ca7f46fc83272944b4ec250 100644
--- a/PhysicsAnalysis/JetTagging/JetTagInfoTPCnv/test/JetFitterTagInfoCnv_p1_test.cxx
+++ b/PhysicsAnalysis/JetTagging/JetTagInfoTPCnv/test/JetFitterTagInfoCnv_p1_test.cxx
@@ -1,5 +1,7 @@
/*
- * Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration.
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+/*
*/
/**
* @file JetTagInfoTPCnv/test/JetFitterTagInfoCnv_p1_test.cxx
diff --git a/PhysicsAnalysis/JetTagging/JetTagInfoTPCnv/test/JetProbInfoBaseCnv_p1_test.cxx b/PhysicsAnalysis/JetTagging/JetTagInfoTPCnv/test/JetProbInfoBaseCnv_p1_test.cxx
index 58c12889d4d49bbc305b65fecc018eb5c8cdabc4..49cd31294c959a0be15b8d31514aac599611de79 100644
--- a/PhysicsAnalysis/JetTagging/JetTagInfoTPCnv/test/JetProbInfoBaseCnv_p1_test.cxx
+++ b/PhysicsAnalysis/JetTagging/JetTagInfoTPCnv/test/JetProbInfoBaseCnv_p1_test.cxx
@@ -1,5 +1,7 @@
/*
- * Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration.
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+/*
*/
/**
* @file JetTagInfoTPCnv/test/JetProbInfoBaseCnv_p1_test.cxx
diff --git a/PhysicsAnalysis/JetTagging/JetTagInfoTPCnv/test/LifetimeInfoCnv_p1_test.cxx b/PhysicsAnalysis/JetTagging/JetTagInfoTPCnv/test/LifetimeInfoCnv_p1_test.cxx
index 5c3b41851fc700d86a5a191c451ae61e929806f5..6ae025a60bfa53754daf48ac67727f8266560c7e 100644
--- a/PhysicsAnalysis/JetTagging/JetTagInfoTPCnv/test/LifetimeInfoCnv_p1_test.cxx
+++ b/PhysicsAnalysis/JetTagging/JetTagInfoTPCnv/test/LifetimeInfoCnv_p1_test.cxx
@@ -1,5 +1,7 @@
/*
- * Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration.
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+/*
*/
/**
* @file JetTagInfoTPCnv/test/LifetimeInfoCnv_p1_test.cxx
diff --git a/PhysicsAnalysis/JetTagging/JetTagInfoTPCnv/test/MSVVtxInfoCnv_p1_test.cxx b/PhysicsAnalysis/JetTagging/JetTagInfoTPCnv/test/MSVVtxInfoCnv_p1_test.cxx
index 56b2ed16dda6ab8c8fdaebdaaa8bc4cf6d44d5aa..24c3b62f407d6713d0efac57d18b9c39a1d9f5fd 100644
--- a/PhysicsAnalysis/JetTagging/JetTagInfoTPCnv/test/MSVVtxInfoCnv_p1_test.cxx
+++ b/PhysicsAnalysis/JetTagging/JetTagInfoTPCnv/test/MSVVtxInfoCnv_p1_test.cxx
@@ -1,5 +1,7 @@
/*
- * Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration.
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+/*
*/
/**
* @file JetTagInfoTPCnv/test/MSVVtxInfoCnv_p1_test.cxx
diff --git a/PhysicsAnalysis/JetTagging/JetTagInfoTPCnv/test/MSVVtxInfoCnv_p2_test.cxx b/PhysicsAnalysis/JetTagging/JetTagInfoTPCnv/test/MSVVtxInfoCnv_p2_test.cxx
index 6c44fb39e7c05f8af4cb4a357a5ec2221b557104..9b7be8c40233798331936d4502e57e7fc5b9dd14 100644
--- a/PhysicsAnalysis/JetTagging/JetTagInfoTPCnv/test/MSVVtxInfoCnv_p2_test.cxx
+++ b/PhysicsAnalysis/JetTagging/JetTagInfoTPCnv/test/MSVVtxInfoCnv_p2_test.cxx
@@ -1,5 +1,7 @@
/*
- * Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration.
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+/*
*/
/**
* @file JetTagInfoTPCnv/test/MSVVtxInfoCnv_p2_test.cxx
diff --git a/PhysicsAnalysis/JetTagging/JetTagInfoTPCnv/test/MultiSVInfoPlusCnv_p1_test.cxx b/PhysicsAnalysis/JetTagging/JetTagInfoTPCnv/test/MultiSVInfoPlusCnv_p1_test.cxx
index 38d7bac4b57e40056b33b8fb7cc1970cb9313906..8db839e0e4da77a2ea971492fd04b1711b318c85 100644
--- a/PhysicsAnalysis/JetTagging/JetTagInfoTPCnv/test/MultiSVInfoPlusCnv_p1_test.cxx
+++ b/PhysicsAnalysis/JetTagging/JetTagInfoTPCnv/test/MultiSVInfoPlusCnv_p1_test.cxx
@@ -1,5 +1,7 @@
/*
- * Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration.
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+/*
*/
/**
* @file JetTagInfoTPCnv/test/MultiSVInfoPlusCnv_p1_test.cxx
diff --git a/PhysicsAnalysis/JetTagging/JetTagInfoTPCnv/test/MuonAssociationCnv_p1_test.cxx b/PhysicsAnalysis/JetTagging/JetTagInfoTPCnv/test/MuonAssociationCnv_p1_test.cxx
index 1f1be6a06da3d5b73f08134e8ea3c35761ab5083..bf073790239f6114d014c1f52ba59b4bdb92e0d2 100644
--- a/PhysicsAnalysis/JetTagging/JetTagInfoTPCnv/test/MuonAssociationCnv_p1_test.cxx
+++ b/PhysicsAnalysis/JetTagging/JetTagInfoTPCnv/test/MuonAssociationCnv_p1_test.cxx
@@ -1,5 +1,7 @@
/*
- * Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration.
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+/*
*/
/**
* @file JetTagInfoTPCnv/test/MuonAssociationCnv_p1_test.cxx
diff --git a/PhysicsAnalysis/JetTagging/JetTagInfoTPCnv/test/PhotonAssociationCnv_p1_test.cxx b/PhysicsAnalysis/JetTagging/JetTagInfoTPCnv/test/PhotonAssociationCnv_p1_test.cxx
index b37cf790c72047c9a91c98cf0fafd5dde5d2bc63..482b4411991a3462178d535c7cd1679b95da345f 100644
--- a/PhysicsAnalysis/JetTagging/JetTagInfoTPCnv/test/PhotonAssociationCnv_p1_test.cxx
+++ b/PhysicsAnalysis/JetTagging/JetTagInfoTPCnv/test/PhotonAssociationCnv_p1_test.cxx
@@ -1,5 +1,7 @@
/*
- * Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration.
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+/*
*/
/**
* @file JetTagInfoTPCnv/test/PhotonAssociationCnv_p1_test.cxx
diff --git a/PhysicsAnalysis/JetTagging/JetTagInfoTPCnv/test/SETrackInfoCnv_p1_test.cxx b/PhysicsAnalysis/JetTagging/JetTagInfoTPCnv/test/SETrackInfoCnv_p1_test.cxx
index 76c98d91e160a2a2fb1f9c2d245b1de5a36ca715..c8f4ae843eb6caba5eaa639dd95839b6a4b6ec1b 100644
--- a/PhysicsAnalysis/JetTagging/JetTagInfoTPCnv/test/SETrackInfoCnv_p1_test.cxx
+++ b/PhysicsAnalysis/JetTagging/JetTagInfoTPCnv/test/SETrackInfoCnv_p1_test.cxx
@@ -1,5 +1,7 @@
/*
- * Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration.
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+/*
*/
/**
* @file JetTagInfoTPCnv/test/SETrackInfoCnv_p1_test.cxx
diff --git a/PhysicsAnalysis/JetTagging/JetTagInfoTPCnv/test/SLTrueInfoCnv_p1_test.cxx b/PhysicsAnalysis/JetTagging/JetTagInfoTPCnv/test/SLTrueInfoCnv_p1_test.cxx
index ba32eacffe3839d49790fa602bd3a00f3c7d2c1d..6970abf3ac016cd62af164baacfb34bd580345d4 100644
--- a/PhysicsAnalysis/JetTagging/JetTagInfoTPCnv/test/SLTrueInfoCnv_p1_test.cxx
+++ b/PhysicsAnalysis/JetTagging/JetTagInfoTPCnv/test/SLTrueInfoCnv_p1_test.cxx
@@ -1,5 +1,7 @@
/*
- * Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration.
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+/*
*/
/**
* @file JetTagInfoTPCnv/test/SLTrueInfoCnv_p1_test.cxx
diff --git a/PhysicsAnalysis/JetTagging/JetTagInfoTPCnv/test/SMTrackInfoCnv_p1_test.cxx b/PhysicsAnalysis/JetTagging/JetTagInfoTPCnv/test/SMTrackInfoCnv_p1_test.cxx
index 11035cb6b02f13ced2716c43049920781a732378..579547ddecdbaffb643b1127379250882d571651 100644
--- a/PhysicsAnalysis/JetTagging/JetTagInfoTPCnv/test/SMTrackInfoCnv_p1_test.cxx
+++ b/PhysicsAnalysis/JetTagging/JetTagInfoTPCnv/test/SMTrackInfoCnv_p1_test.cxx
@@ -1,5 +1,7 @@
/*
- * Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration.
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+/*
*/
/**
* @file JetTagInfoTPCnv/test/SMTrackInfoCnv_p1_test.cxx
diff --git a/PhysicsAnalysis/JetTagging/JetTagInfoTPCnv/test/SVInfoBaseCnv_p1_test.cxx b/PhysicsAnalysis/JetTagging/JetTagInfoTPCnv/test/SVInfoBaseCnv_p1_test.cxx
index e5edf9c06e5feeee12c03dc21b630733c7106cd4..31c6822286d184e00692930bf84ef59b2eddf8a8 100644
--- a/PhysicsAnalysis/JetTagging/JetTagInfoTPCnv/test/SVInfoBaseCnv_p1_test.cxx
+++ b/PhysicsAnalysis/JetTagging/JetTagInfoTPCnv/test/SVInfoBaseCnv_p1_test.cxx
@@ -1,5 +1,7 @@
/*
- * Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration.
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+/*
*/
/**
* @file JetTagInfoTPCnv/test/SVInfoBaseCnv_p1_test.cxx
diff --git a/PhysicsAnalysis/JetTagging/JetTagInfoTPCnv/test/SVInfoPlusCnv_p1_test.cxx b/PhysicsAnalysis/JetTagging/JetTagInfoTPCnv/test/SVInfoPlusCnv_p1_test.cxx
index 6f76f03c3664e3da8f4efbb369cb1722eee70549..e7ae8c2c64926fc5f02b20913e201a845f23bbc4 100644
--- a/PhysicsAnalysis/JetTagging/JetTagInfoTPCnv/test/SVInfoPlusCnv_p1_test.cxx
+++ b/PhysicsAnalysis/JetTagging/JetTagInfoTPCnv/test/SVInfoPlusCnv_p1_test.cxx
@@ -1,5 +1,7 @@
/*
- * Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration.
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+/*
*/
/**
* @file JetTagInfoTPCnv/test/SVInfoPlusCnv_p1_test.cxx
diff --git a/PhysicsAnalysis/JetTagging/JetTagInfoTPCnv/test/SecVtxInfoCnv_p1_test.cxx b/PhysicsAnalysis/JetTagging/JetTagInfoTPCnv/test/SecVtxInfoCnv_p1_test.cxx
index 550ee6d57c7a98c7a1615bb853cea2104494cda2..0dd44dc8a2e143dd18e726a426f632343a294a5f 100644
--- a/PhysicsAnalysis/JetTagging/JetTagInfoTPCnv/test/SecVtxInfoCnv_p1_test.cxx
+++ b/PhysicsAnalysis/JetTagging/JetTagInfoTPCnv/test/SecVtxInfoCnv_p1_test.cxx
@@ -1,5 +1,7 @@
/*
- * Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration.
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+/*
*/
/**
* @file JetTagInfoTPCnv/test/SecVtxInfoCnv_p1_test.cxx
diff --git a/PhysicsAnalysis/JetTagging/JetTagInfoTPCnv/test/SoftElectronInfoCnv_p1_test.cxx b/PhysicsAnalysis/JetTagging/JetTagInfoTPCnv/test/SoftElectronInfoCnv_p1_test.cxx
index 5197e3c31505b62e27ee83db923a0769f530d844..31e6840bf149bad6bf6d855f08d81d27e53cbb6b 100644
--- a/PhysicsAnalysis/JetTagging/JetTagInfoTPCnv/test/SoftElectronInfoCnv_p1_test.cxx
+++ b/PhysicsAnalysis/JetTagging/JetTagInfoTPCnv/test/SoftElectronInfoCnv_p1_test.cxx
@@ -1,5 +1,7 @@
/*
- * Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration.
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+/*
*/
/**
* @file JetTagInfoTPCnv/test/SoftElectronInfoCnv_p1_test.cxx
diff --git a/PhysicsAnalysis/JetTagging/JetTagInfoTPCnv/test/SoftLeptonTruthInfoCnv_p1_test.cxx b/PhysicsAnalysis/JetTagging/JetTagInfoTPCnv/test/SoftLeptonTruthInfoCnv_p1_test.cxx
index 9eba3e7b2b796ba0023198b752dcbce2a157f286..5f679fd51b9c61119035c0623e225c2e6db699b2 100644
--- a/PhysicsAnalysis/JetTagging/JetTagInfoTPCnv/test/SoftLeptonTruthInfoCnv_p1_test.cxx
+++ b/PhysicsAnalysis/JetTagging/JetTagInfoTPCnv/test/SoftLeptonTruthInfoCnv_p1_test.cxx
@@ -1,5 +1,7 @@
/*
- * Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration.
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+/*
*/
/**
* @file JetTagInfoTPCnv/test/SoftLeptonTruthInfoCnv_p1_test.cxx
diff --git a/PhysicsAnalysis/JetTagging/JetTagInfoTPCnv/test/SoftMuonInfoCnv_p1_test.cxx b/PhysicsAnalysis/JetTagging/JetTagInfoTPCnv/test/SoftMuonInfoCnv_p1_test.cxx
index 03af68ee9c9e61d187339894230dfff830b03d63..ba83e5d65840daa237d5faac51441a90b7967bcf 100644
--- a/PhysicsAnalysis/JetTagging/JetTagInfoTPCnv/test/SoftMuonInfoCnv_p1_test.cxx
+++ b/PhysicsAnalysis/JetTagging/JetTagInfoTPCnv/test/SoftMuonInfoCnv_p1_test.cxx
@@ -1,5 +1,7 @@
/*
- * Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration.
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+/*
*/
/**
* @file JetTagInfoTPCnv/test/SoftMuonInfoCnv_p1_test.cxx
diff --git a/PhysicsAnalysis/JetTagging/JetTagInfoTPCnv/test/SvxSummaryCnv_p1_test.cxx b/PhysicsAnalysis/JetTagging/JetTagInfoTPCnv/test/SvxSummaryCnv_p1_test.cxx
index 3a58020a3e8fb5c78ac25b19fc1285528acf1e2d..56b5333622e97143628c6292ea508b47f570edcc 100644
--- a/PhysicsAnalysis/JetTagging/JetTagInfoTPCnv/test/SvxSummaryCnv_p1_test.cxx
+++ b/PhysicsAnalysis/JetTagging/JetTagInfoTPCnv/test/SvxSummaryCnv_p1_test.cxx
@@ -1,5 +1,7 @@
/*
- * Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration.
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+/*
*/
/**
* @file JetTagInfoTPCnv/test/SvxSummaryCnv_p1_test.cxx
diff --git a/PhysicsAnalysis/JetTagging/JetTagInfoTPCnv/test/TrackAssociationCnv_p1_test.cxx b/PhysicsAnalysis/JetTagging/JetTagInfoTPCnv/test/TrackAssociationCnv_p1_test.cxx
index 1df31c769be571f2adc0487c2d3565f67eb56ad4..bd42915e119e85b9e3e63c50716ae9b27b660055 100644
--- a/PhysicsAnalysis/JetTagging/JetTagInfoTPCnv/test/TrackAssociationCnv_p1_test.cxx
+++ b/PhysicsAnalysis/JetTagging/JetTagInfoTPCnv/test/TrackAssociationCnv_p1_test.cxx
@@ -1,5 +1,7 @@
/*
- * Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration.
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+/*
*/
/**
* @file JetTagInfoTPCnv/test/TrackAssociationCnv_p1_test.cxx
diff --git a/PhysicsAnalysis/JetTagging/JetTagInfoTPCnv/test/TrackCountingInfoCnv_p1_test.cxx b/PhysicsAnalysis/JetTagging/JetTagInfoTPCnv/test/TrackCountingInfoCnv_p1_test.cxx
index b228b730cb593cdc4d484cd747e9f53488054486..2e35d1f1d5ebc4bc24919d8ac6b8d7736eadf40c 100644
--- a/PhysicsAnalysis/JetTagging/JetTagInfoTPCnv/test/TrackCountingInfoCnv_p1_test.cxx
+++ b/PhysicsAnalysis/JetTagging/JetTagInfoTPCnv/test/TrackCountingInfoCnv_p1_test.cxx
@@ -1,5 +1,7 @@
/*
- * Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration.
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+/*
*/
/**
* @file JetTagInfoTPCnv/test/TrackCountingInfoCnv_p1_test.cxx
diff --git a/PhysicsAnalysis/JetTagging/JetTagInfoTPCnv/test/TruthInfoCnv_p1_test.cxx b/PhysicsAnalysis/JetTagging/JetTagInfoTPCnv/test/TruthInfoCnv_p1_test.cxx
index e83d28d90a1b6ab052290909c1659a1de073230f..ba113bec9a404703a66aa69914fa18187d6da578 100644
--- a/PhysicsAnalysis/JetTagging/JetTagInfoTPCnv/test/TruthInfoCnv_p1_test.cxx
+++ b/PhysicsAnalysis/JetTagging/JetTagInfoTPCnv/test/TruthInfoCnv_p1_test.cxx
@@ -1,5 +1,7 @@
/*
- * Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration.
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+/*
*/
/**
* @file JetTagInfoTPCnv/test/TruthInfoCnv_p1_test.cxx
diff --git a/PhysicsAnalysis/RingerSelectorTools/Root/ExtraDescriptionPatterns.cxx b/PhysicsAnalysis/RingerSelectorTools/Root/ExtraDescriptionPatterns.cxx
index 376549fcc2952a4d2fa8416d4828e8c826ca163f..d437e6cc52cf701e5e54f79a8de84e37835e0043 100644
--- a/PhysicsAnalysis/RingerSelectorTools/Root/ExtraDescriptionPatterns.cxx
+++ b/PhysicsAnalysis/RingerSelectorTools/Root/ExtraDescriptionPatterns.cxx
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
// $Id$
#include "RingerSelectorTools/ExtraDescriptionPatterns.h"
diff --git a/PhysicsAnalysis/TileID/TileTripReader/TileTripReader/TileTripReaderDict.h b/PhysicsAnalysis/TileID/TileTripReader/TileTripReader/TileTripReaderDict.h
index 5be604e7225adef5c046c3643acf899f79d6abb2..03283caa49a38d5ed8a3a6e3fc9a33883bdfedfe 100644
--- a/PhysicsAnalysis/TileID/TileTripReader/TileTripReader/TileTripReaderDict.h
+++ b/PhysicsAnalysis/TileID/TileTripReader/TileTripReader/TileTripReaderDict.h
@@ -1 +1,4 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
#include "TileTripReader/TTileTripReader.h"
diff --git a/PhysicsAnalysis/TopPhys/QuickAna/QuickAna/AnaTool.h b/PhysicsAnalysis/TopPhys/QuickAna/QuickAna/AnaTool.h
index 43113ee750b29f7deef5e726bdbc1dc03b72fc71..cb381b8eaba3f3fe42e259bd2c91972f6fd947c8 100644
--- a/PhysicsAnalysis/TopPhys/QuickAna/QuickAna/AnaTool.h
+++ b/PhysicsAnalysis/TopPhys/QuickAna/QuickAna/AnaTool.h
@@ -5,7 +5,7 @@
#ifndef QUICK_ANA__ANA_TOOL_H
#define QUICK_ANA__ANA_TOOL_H
-// Copyright Iowa State University 2014.
+//
// Author: Nils Krumnack
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/PhysicsAnalysis/TopPhys/QuickAna/QuickAna/AnaToolCorrect.h b/PhysicsAnalysis/TopPhys/QuickAna/QuickAna/AnaToolCorrect.h
index 8e8f9bc63bef829b217823ee6ddb277e11b5c720..48851179e97759994d9ed212535503ddff4e6258 100644
--- a/PhysicsAnalysis/TopPhys/QuickAna/QuickAna/AnaToolCorrect.h
+++ b/PhysicsAnalysis/TopPhys/QuickAna/QuickAna/AnaToolCorrect.h
@@ -5,7 +5,7 @@
#ifndef QUICK_ANA__ANA_TOOL_CORRECT_H
#define QUICK_ANA__ANA_TOOL_CORRECT_H
-// Copyright Iowa State University 2014.
+//
// Author: Nils Krumnack
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/PhysicsAnalysis/TopPhys/QuickAna/QuickAna/AnaToolRetrieve.h b/PhysicsAnalysis/TopPhys/QuickAna/QuickAna/AnaToolRetrieve.h
index 44ffeb5d498980be7501b74a85dd522b427ca7a2..d46d81c1d726056386564819b14179a955773e34 100644
--- a/PhysicsAnalysis/TopPhys/QuickAna/QuickAna/AnaToolRetrieve.h
+++ b/PhysicsAnalysis/TopPhys/QuickAna/QuickAna/AnaToolRetrieve.h
@@ -5,7 +5,7 @@
#ifndef QUICK_ANA__ANA_TOOL_RETRIEVE_H
#define QUICK_ANA__ANA_TOOL_RETRIEVE_H
-// Copyright Iowa State University 2014.
+//
// Author: Nils Krumnack
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/PhysicsAnalysis/TopPhys/QuickAna/QuickAna/AnaToolSelect.h b/PhysicsAnalysis/TopPhys/QuickAna/QuickAna/AnaToolSelect.h
index f6fdd790fc0c2f5d98dafd043bd8b813446741dc..0a48d4287f80015746dbd2a57802c7e2d2444dfb 100644
--- a/PhysicsAnalysis/TopPhys/QuickAna/QuickAna/AnaToolSelect.h
+++ b/PhysicsAnalysis/TopPhys/QuickAna/QuickAna/AnaToolSelect.h
@@ -5,7 +5,7 @@
#ifndef QUICK_ANA__ANA_TOOL_SELECT_H
#define QUICK_ANA__ANA_TOOL_SELECT_H
-// Copyright Iowa State University 2014.
+//
// Author: Nils Krumnack
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/PhysicsAnalysis/TopPhys/QuickAna/QuickAna/AnaToolSelectCombine.h b/PhysicsAnalysis/TopPhys/QuickAna/QuickAna/AnaToolSelectCombine.h
index 7f5c4a7a2031d5102d9226f430c4ffd3a14c1509..b2c387b6170561ce2ea6ff813841f6f637217fe0 100644
--- a/PhysicsAnalysis/TopPhys/QuickAna/QuickAna/AnaToolSelectCombine.h
+++ b/PhysicsAnalysis/TopPhys/QuickAna/QuickAna/AnaToolSelectCombine.h
@@ -5,7 +5,7 @@
#ifndef QUICK_ANA__ANA_TOOL_SELECT_COMBINE_H
#define QUICK_ANA__ANA_TOOL_SELECT_COMBINE_H
-// Copyright Iowa State University 2014.
+//
// Author: Nils Krumnack
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/PhysicsAnalysis/TopPhys/QuickAna/QuickAna/AnaToolSelectInit.h b/PhysicsAnalysis/TopPhys/QuickAna/QuickAna/AnaToolSelectInit.h
index 55ff3daa8d385816df46f085edc84fb0bca4d272..5c100b96cad661156a346dccae45234be152f181 100644
--- a/PhysicsAnalysis/TopPhys/QuickAna/QuickAna/AnaToolSelectInit.h
+++ b/PhysicsAnalysis/TopPhys/QuickAna/QuickAna/AnaToolSelectInit.h
@@ -5,7 +5,7 @@
#ifndef QUICK_ANA__ANA_TOOL_SELECT_INIT_H
#define QUICK_ANA__ANA_TOOL_SELECT_INIT_H
-// Copyright Iowa State University 2014.
+//
// Author: Nils Krumnack
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/PhysicsAnalysis/TopPhys/QuickAna/QuickAna/AnaToolSelectSpread.h b/PhysicsAnalysis/TopPhys/QuickAna/QuickAna/AnaToolSelectSpread.h
index eae69217759b120c67cf2a7a4c5cde0966b68914..4abf80d6bb1653a4a62d0499932ddde06e46cadf 100644
--- a/PhysicsAnalysis/TopPhys/QuickAna/QuickAna/AnaToolSelectSpread.h
+++ b/PhysicsAnalysis/TopPhys/QuickAna/QuickAna/AnaToolSelectSpread.h
@@ -5,7 +5,7 @@
#ifndef QUICK_ANA__ANA_TOOL_SELECT_SPREAD_H
#define QUICK_ANA__ANA_TOOL_SELECT_SPREAD_H
-// Copyright Iowa State University 2014.
+//
// Author: Nils Krumnack
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/PhysicsAnalysis/TopPhys/QuickAna/QuickAna/AnaToolSequence.h b/PhysicsAnalysis/TopPhys/QuickAna/QuickAna/AnaToolSequence.h
index 55cd351cfa58c6856ced4f74e2afe67e215558b6..bbc1274c8b7f376ecc59d18cf06c911a483935fe 100644
--- a/PhysicsAnalysis/TopPhys/QuickAna/QuickAna/AnaToolSequence.h
+++ b/PhysicsAnalysis/TopPhys/QuickAna/QuickAna/AnaToolSequence.h
@@ -5,7 +5,7 @@
#ifndef QUICK_ANA__ANA_TOOL_SEQUENCE_H
#define QUICK_ANA__ANA_TOOL_SEQUENCE_H
-// Copyright Iowa State University 2015.
+//
// Author: Nils Krumnack
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/PhysicsAnalysis/TopPhys/QuickAna/QuickAna/AnaToolWeight.h b/PhysicsAnalysis/TopPhys/QuickAna/QuickAna/AnaToolWeight.h
index f7159994bdd6ae96fb2baabf20729b7d20f365bb..a3572aa9183b11f89b7b6b71ac0475524b2d7360 100644
--- a/PhysicsAnalysis/TopPhys/QuickAna/QuickAna/AnaToolWeight.h
+++ b/PhysicsAnalysis/TopPhys/QuickAna/QuickAna/AnaToolWeight.h
@@ -5,7 +5,7 @@
#ifndef QUICK_ANA__ANA_TOOL_WEIGHT_H
#define QUICK_ANA__ANA_TOOL_WEIGHT_H
-// Copyright Iowa State University 2014.
+//
// Author: Nils Krumnack
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/PhysicsAnalysis/TopPhys/QuickAna/QuickAna/Configuration.h b/PhysicsAnalysis/TopPhys/QuickAna/QuickAna/Configuration.h
index ea175907e8c87f6ef54256cdc3f2927a0c266979..3ff91ea073be142c4f93dcc6511da54b5793d1b6 100644
--- a/PhysicsAnalysis/TopPhys/QuickAna/QuickAna/Configuration.h
+++ b/PhysicsAnalysis/TopPhys/QuickAna/QuickAna/Configuration.h
@@ -5,7 +5,7 @@
#ifndef QUICK_ANA__CONFIGURATION_H
#define QUICK_ANA__CONFIGURATION_H
-// Copyright Iowa State University 2014.
+//
// Author: Nils Krumnack
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/PhysicsAnalysis/TopPhys/QuickAna/QuickAna/DefinitionArgs.h b/PhysicsAnalysis/TopPhys/QuickAna/QuickAna/DefinitionArgs.h
index e4602a6ef7ca241efc71da7cbb8f539168317131..a21f8e97034fc31f18a5d5ab8b029f9eed323d00 100644
--- a/PhysicsAnalysis/TopPhys/QuickAna/QuickAna/DefinitionArgs.h
+++ b/PhysicsAnalysis/TopPhys/QuickAna/QuickAna/DefinitionArgs.h
@@ -5,7 +5,7 @@
#ifndef QUICK_ANA__DEFINITION_ARGS_H
#define QUICK_ANA__DEFINITION_ARGS_H
-// Copyright Iowa State University 2014.
+//
// Author: Nils Krumnack
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/PhysicsAnalysis/TopPhys/QuickAna/QuickAna/DefinitionConf.h b/PhysicsAnalysis/TopPhys/QuickAna/QuickAna/DefinitionConf.h
index 6da49a3b0703450781c9c3d157bd72f6c6bd5d96..a9f70e1151e274c993579b596678625cee0fbb45 100644
--- a/PhysicsAnalysis/TopPhys/QuickAna/QuickAna/DefinitionConf.h
+++ b/PhysicsAnalysis/TopPhys/QuickAna/QuickAna/DefinitionConf.h
@@ -5,7 +5,7 @@
#ifndef QUICK_ANA__DEFINITION_CONF_H
#define QUICK_ANA__DEFINITION_CONF_H
-// Copyright Iowa State University 2015.
+//
// Author: Nils Krumnack
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/PhysicsAnalysis/TopPhys/QuickAna/QuickAna/DefinitionMaker.h b/PhysicsAnalysis/TopPhys/QuickAna/QuickAna/DefinitionMaker.h
index 77ea3aae21b714d826de1a2bbd6ffbf9cdce0d3a..1d8f26311c69ad7dd27daf7000906f2ab4aeba1e 100644
--- a/PhysicsAnalysis/TopPhys/QuickAna/QuickAna/DefinitionMaker.h
+++ b/PhysicsAnalysis/TopPhys/QuickAna/QuickAna/DefinitionMaker.h
@@ -5,7 +5,7 @@
#ifndef QUICK_ANA__DEFINITION_MAKER_H
#define QUICK_ANA__DEFINITION_MAKER_H
-// Copyright Iowa State University 2014.
+//
// Author: Nils Krumnack
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/PhysicsAnalysis/TopPhys/QuickAna/QuickAna/ELExample.h b/PhysicsAnalysis/TopPhys/QuickAna/QuickAna/ELExample.h
index c2ffe54dc113591df8bb53fd4f147c1208216036..b773801281ed8dc49b301e24e1b1268bcd981303 100644
--- a/PhysicsAnalysis/TopPhys/QuickAna/QuickAna/ELExample.h
+++ b/PhysicsAnalysis/TopPhys/QuickAna/QuickAna/ELExample.h
@@ -5,7 +5,7 @@
#ifndef QuickAna_ELExample_H
#define QuickAna_ELExample_H
-// Copyright Iowa State University 2014.
+//
// Author: Nils Krumnack
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/PhysicsAnalysis/TopPhys/QuickAna/QuickAna/EventData.h b/PhysicsAnalysis/TopPhys/QuickAna/QuickAna/EventData.h
index bb592630219ed36419b330bd9c8538d0033b4281..1e608c2447eef68ede79bfb8dcb3bb9f2d21324d 100644
--- a/PhysicsAnalysis/TopPhys/QuickAna/QuickAna/EventData.h
+++ b/PhysicsAnalysis/TopPhys/QuickAna/QuickAna/EventData.h
@@ -5,7 +5,7 @@
#ifndef QUICK_ANA__EVENT_DATA_H
#define QUICK_ANA__EVENT_DATA_H
-// Copyright Iowa State University 2015.
+//
// Author: Nils Krumnack
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/PhysicsAnalysis/TopPhys/QuickAna/QuickAna/EventInfoIsData.h b/PhysicsAnalysis/TopPhys/QuickAna/QuickAna/EventInfoIsData.h
index aa1276e502107a7240f8160e7b35896dcc2f7780..1cfa1f3c08501f942ad638d587ec27c18b644725 100644
--- a/PhysicsAnalysis/TopPhys/QuickAna/QuickAna/EventInfoIsData.h
+++ b/PhysicsAnalysis/TopPhys/QuickAna/QuickAna/EventInfoIsData.h
@@ -5,7 +5,7 @@
#ifndef QUICK_ANA__EVENT_INFO_IS_DATA_H
#define QUICK_ANA__EVENT_INFO_IS_DATA_H
-// Copyright Iowa State University 2015.
+//
// Author: Nils Krumnack
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/PhysicsAnalysis/TopPhys/QuickAna/QuickAna/EventObjects.h b/PhysicsAnalysis/TopPhys/QuickAna/QuickAna/EventObjects.h
index be07fc5bdf474eeb6eb3d8cd989d854d0b347b39..dcdb3f7e6948e2dc8ef82026731610c261b56fa4 100644
--- a/PhysicsAnalysis/TopPhys/QuickAna/QuickAna/EventObjects.h
+++ b/PhysicsAnalysis/TopPhys/QuickAna/QuickAna/EventObjects.h
@@ -5,7 +5,7 @@
#ifndef QUICK_ANA__EVENT_OBJECTS_H
#define QUICK_ANA__EVENT_OBJECTS_H
-// Copyright Iowa State University 2014.
+//
// Author: Nils Krumnack
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/PhysicsAnalysis/TopPhys/QuickAna/QuickAna/EventSelectBaseTool.h b/PhysicsAnalysis/TopPhys/QuickAna/QuickAna/EventSelectBaseTool.h
index 7f829d8bd11c74577bb32048414eda7bdaa8e4ff..8573e1fc65d8459fd27b5324cffaa282636752fa 100644
--- a/PhysicsAnalysis/TopPhys/QuickAna/QuickAna/EventSelectBaseTool.h
+++ b/PhysicsAnalysis/TopPhys/QuickAna/QuickAna/EventSelectBaseTool.h
@@ -5,7 +5,7 @@
#ifndef QUICK_ANA__EVENT_SELECT_BASE_TOOL_H
#define QUICK_ANA__EVENT_SELECT_BASE_TOOL_H
-// Copyright Iowa State University 2016.
+//
// Author: Nils Krumnack
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/PhysicsAnalysis/TopPhys/QuickAna/QuickAna/EventSelectHasVertex.h b/PhysicsAnalysis/TopPhys/QuickAna/QuickAna/EventSelectHasVertex.h
index c92746290130dcf8f58ff650eff668ead92de382..aa357d59491d00b49637514eba3cc930c41613c6 100644
--- a/PhysicsAnalysis/TopPhys/QuickAna/QuickAna/EventSelectHasVertex.h
+++ b/PhysicsAnalysis/TopPhys/QuickAna/QuickAna/EventSelectHasVertex.h
@@ -5,7 +5,7 @@
#ifndef QUICK_ANA__EVENT_SELECT_HAS_VERTEX_H
#define QUICK_ANA__EVENT_SELECT_HAS_VERTEX_H
-// Copyright Iowa State University 2016.
+//
// Author: Nils Krumnack
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/PhysicsAnalysis/TopPhys/QuickAna/QuickAna/FatJetTool.h b/PhysicsAnalysis/TopPhys/QuickAna/QuickAna/FatJetTool.h
index f4b6e33f97c612977441daf9798ec011edd66ddf..8f9c30045000caa528cfcd0a788733c06b90ce87 100644
--- a/PhysicsAnalysis/TopPhys/QuickAna/QuickAna/FatJetTool.h
+++ b/PhysicsAnalysis/TopPhys/QuickAna/QuickAna/FatJetTool.h
@@ -5,7 +5,7 @@
#ifndef QUICK_ANA__FAT_JET_TOOL_H
#define QUICK_ANA__FAT_JET_TOOL_H
-// Copyright Iowa State University 2014.
+//
// Author: Nils Krumnack
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/PhysicsAnalysis/TopPhys/QuickAna/QuickAna/Global.h b/PhysicsAnalysis/TopPhys/QuickAna/QuickAna/Global.h
index 3c8bf8125fba560049c3621a175596d3dd251379..b6405835c826d8a5285c19a710e89cf214f5cee9 100644
--- a/PhysicsAnalysis/TopPhys/QuickAna/QuickAna/Global.h
+++ b/PhysicsAnalysis/TopPhys/QuickAna/QuickAna/Global.h
@@ -5,7 +5,7 @@
#ifndef QUICK_ANA__GLOBAL_H
#define QUICK_ANA__GLOBAL_H
-// Copyright Iowa State University 2014.
+//
// Author: Nils Krumnack
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/PhysicsAnalysis/TopPhys/QuickAna/QuickAna/HZZElectronTool.h b/PhysicsAnalysis/TopPhys/QuickAna/QuickAna/HZZElectronTool.h
index 43ab25b105e5203dee40bf575eadfdd980b9de7c..9c020d211db594530c176c2d276f0077d5afa147 100644
--- a/PhysicsAnalysis/TopPhys/QuickAna/QuickAna/HZZElectronTool.h
+++ b/PhysicsAnalysis/TopPhys/QuickAna/QuickAna/HZZElectronTool.h
@@ -5,7 +5,7 @@
#ifndef QUICK_ANA__ZZ4l_MUON_TOOL_H
#define QUICK_ANA__ZZ4l_MUON_TOOL_H
-// Copyright Iowa State University 2014.
+//
// Author: Nils Krumnack
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/PhysicsAnalysis/TopPhys/QuickAna/QuickAna/HZZMuonTool.h b/PhysicsAnalysis/TopPhys/QuickAna/QuickAna/HZZMuonTool.h
index 7076282e445984900410f02abbbdf009e558c715..978962d32cfeae96bf996eb3d759d0432d4e7139 100644
--- a/PhysicsAnalysis/TopPhys/QuickAna/QuickAna/HZZMuonTool.h
+++ b/PhysicsAnalysis/TopPhys/QuickAna/QuickAna/HZZMuonTool.h
@@ -5,7 +5,7 @@
#ifndef QUICK_ANA__ZZ4l_MUON_TOOL_H
#define QUICK_ANA__ZZ4l_MUON_TOOL_H
-// Copyright Iowa State University 2014.
+//
// Author: Nils Krumnack
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/PhysicsAnalysis/TopPhys/QuickAna/QuickAna/IAnaTool.h b/PhysicsAnalysis/TopPhys/QuickAna/QuickAna/IAnaTool.h
index ae8058aaf6201a884e55bb0ecc25c12dcb34768e..de7671c3a8d5044c51e8ee6d373b6978a35b272d 100644
--- a/PhysicsAnalysis/TopPhys/QuickAna/QuickAna/IAnaTool.h
+++ b/PhysicsAnalysis/TopPhys/QuickAna/QuickAna/IAnaTool.h
@@ -5,7 +5,7 @@
#ifndef QUICK_ANA__I_ANA_TOOL_H
#define QUICK_ANA__I_ANA_TOOL_H
-// Copyright Iowa State University 2014.
+//
// Author: Nils Krumnack
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/PhysicsAnalysis/TopPhys/QuickAna/QuickAna/IEventObjects.h b/PhysicsAnalysis/TopPhys/QuickAna/QuickAna/IEventObjects.h
index 335af4ef0cdcbba2ba033613e3d3b33e837f0bab..00e171867daefb789417cea6f2b78aca47224c3f 100644
--- a/PhysicsAnalysis/TopPhys/QuickAna/QuickAna/IEventObjects.h
+++ b/PhysicsAnalysis/TopPhys/QuickAna/QuickAna/IEventObjects.h
@@ -5,7 +5,7 @@
#ifndef QUICK_ANA__I_EVENT_OBJECTS_H
#define QUICK_ANA__I_EVENT_OBJECTS_H
-// Copyright Iowa State University 2014.
+//
// Author: Nils Krumnack
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/PhysicsAnalysis/TopPhys/QuickAna/QuickAna/IQuickAna.h b/PhysicsAnalysis/TopPhys/QuickAna/QuickAna/IQuickAna.h
index 3ccf76e32fb2f3ff30ec41e90d48cf35f4c0ba82..4f490a9ffeec7aef1f248d9709707185c3f9d6b8 100644
--- a/PhysicsAnalysis/TopPhys/QuickAna/QuickAna/IQuickAna.h
+++ b/PhysicsAnalysis/TopPhys/QuickAna/QuickAna/IQuickAna.h
@@ -5,7 +5,7 @@
#ifndef QUICK_ANA__I_QUICK_ANA_H
#define QUICK_ANA__I_QUICK_ANA_H
-// Copyright Iowa State University 2014.
+//
// Author: Nils Krumnack
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/PhysicsAnalysis/TopPhys/QuickAna/QuickAna/IToolScheduler.h b/PhysicsAnalysis/TopPhys/QuickAna/QuickAna/IToolScheduler.h
index 65df255b9266d2c71ca5b6ce2ebfa44c745a995f..c3486019c18cfa7e1f3e703c0c678db3340f4f7a 100644
--- a/PhysicsAnalysis/TopPhys/QuickAna/QuickAna/IToolScheduler.h
+++ b/PhysicsAnalysis/TopPhys/QuickAna/QuickAna/IToolScheduler.h
@@ -5,7 +5,7 @@
#ifndef QUICK_ANA__I_TOOL_SCHEDULER_H
#define QUICK_ANA__I_TOOL_SCHEDULER_H
-// Copyright Iowa State University 2014.
+//
// Author: Nils Krumnack
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/PhysicsAnalysis/TopPhys/QuickAna/QuickAna/InternalConfiguration.h b/PhysicsAnalysis/TopPhys/QuickAna/QuickAna/InternalConfiguration.h
index f4cd872ea151e07f9de1e5d01b3e30c4213ccc7d..ec42b2c9ffe4ce9583f220af2b28dee23834913b 100644
--- a/PhysicsAnalysis/TopPhys/QuickAna/QuickAna/InternalConfiguration.h
+++ b/PhysicsAnalysis/TopPhys/QuickAna/QuickAna/InternalConfiguration.h
@@ -5,7 +5,7 @@
#ifndef QUICK_ANA__INTERNAL_CONFIGURATION_H
#define QUICK_ANA__INTERNAL_CONFIGURATION_H
-// Copyright Iowa State University 2015.
+//
// Author: Nils Krumnack
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/PhysicsAnalysis/TopPhys/QuickAna/QuickAna/JetTool.h b/PhysicsAnalysis/TopPhys/QuickAna/QuickAna/JetTool.h
index 0931441809d22903cec4e250984a5cfb5e535fc2..70a5fb429477b2f29104c1b5cab59a5c3e0af7d7 100644
--- a/PhysicsAnalysis/TopPhys/QuickAna/QuickAna/JetTool.h
+++ b/PhysicsAnalysis/TopPhys/QuickAna/QuickAna/JetTool.h
@@ -5,7 +5,7 @@
#ifndef QUICK_ANA__JET_TOOL_H
#define QUICK_ANA__JET_TOOL_H
-// Copyright Iowa State University 2014.
+//
// Author: Nils Krumnack
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/PhysicsAnalysis/TopPhys/QuickAna/QuickAna/KinObjectSelect.h b/PhysicsAnalysis/TopPhys/QuickAna/QuickAna/KinObjectSelect.h
index c0ba63f59bbb5003b06930e256480a6064e0ef35..0d43fadb0fb63f1e3f9b5605e576f64ec2990001 100644
--- a/PhysicsAnalysis/TopPhys/QuickAna/QuickAna/KinObjectSelect.h
+++ b/PhysicsAnalysis/TopPhys/QuickAna/QuickAna/KinObjectSelect.h
@@ -5,7 +5,7 @@
#ifndef QUICK_ANA__KIN_OBJECT_SELECT_H
#define QUICK_ANA__KIN_OBJECT_SELECT_H
-// Copyright Iowa State University 2014.
+//
// Author: Nils Krumnack
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/PhysicsAnalysis/TopPhys/QuickAna/QuickAna/KinSelectTool.h b/PhysicsAnalysis/TopPhys/QuickAna/QuickAna/KinSelectTool.h
index 6f24784ea5c33aa65cffd693f1aea2d14888de02..dc686467c742e8356f799dc3a5c50965e4231283 100644
--- a/PhysicsAnalysis/TopPhys/QuickAna/QuickAna/KinSelectTool.h
+++ b/PhysicsAnalysis/TopPhys/QuickAna/QuickAna/KinSelectTool.h
@@ -5,7 +5,7 @@
#ifndef QUICK_ANA__KIN_SELECT_TOOL_H
#define QUICK_ANA__KIN_SELECT_TOOL_H
-// Copyright Iowa State University 2014.
+//
// Author: Nils Krumnack
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/PhysicsAnalysis/TopPhys/QuickAna/QuickAna/MessageCheck.h b/PhysicsAnalysis/TopPhys/QuickAna/QuickAna/MessageCheck.h
index e11b2dce7c7c49166c49125b2ebce5eda79ddc3c..743c9ea4758685f8198ead94f996483d2ebf2adb 100644
--- a/PhysicsAnalysis/TopPhys/QuickAna/QuickAna/MessageCheck.h
+++ b/PhysicsAnalysis/TopPhys/QuickAna/QuickAna/MessageCheck.h
@@ -5,7 +5,7 @@
#ifndef QUICK_ANA__MESSAGE_CHECK_H
#define QUICK_ANA__MESSAGE_CHECK_H
-// Copyright Iowa State University 2014.
+//
// Author: Nils Krumnack
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/PhysicsAnalysis/TopPhys/QuickAna/QuickAna/MetTool.h b/PhysicsAnalysis/TopPhys/QuickAna/QuickAna/MetTool.h
index a6499c3872b987bc4b9e190e90bb72c525b34d49..98aeca787c3b95e7a6f2d832cf8bc7edab9a7131 100644
--- a/PhysicsAnalysis/TopPhys/QuickAna/QuickAna/MetTool.h
+++ b/PhysicsAnalysis/TopPhys/QuickAna/QuickAna/MetTool.h
@@ -5,7 +5,7 @@
#ifndef QUICK_ANA__MET_TOOL_H
#define QUICK_ANA__MET_TOOL_H
-// Copyright Iowa State University 2014.
+//
// Author: Nils Krumnack
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/PhysicsAnalysis/TopPhys/QuickAna/QuickAna/MuonTool.h b/PhysicsAnalysis/TopPhys/QuickAna/QuickAna/MuonTool.h
index 78af666d7ce315ae5e5f3c0f646b7d90fdeb5354..fc28be8d20ff17d00afeaa07a649c36d06ee0b3b 100644
--- a/PhysicsAnalysis/TopPhys/QuickAna/QuickAna/MuonTool.h
+++ b/PhysicsAnalysis/TopPhys/QuickAna/QuickAna/MuonTool.h
@@ -5,7 +5,7 @@
#ifndef QUICK_ANA__MUON_TOOL_H
#define QUICK_ANA__MUON_TOOL_H
-// Copyright Iowa State University 2014.
+//
// Author: Nils Krumnack
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/PhysicsAnalysis/TopPhys/QuickAna/QuickAna/ObjectTypeInfo.h b/PhysicsAnalysis/TopPhys/QuickAna/QuickAna/ObjectTypeInfo.h
index 77ff7f7be50c34bbbf2487e9332eab1d8f6114dd..aab79c2a24d423bc43a2ffc3374a6a3c4a6eae97 100644
--- a/PhysicsAnalysis/TopPhys/QuickAna/QuickAna/ObjectTypeInfo.h
+++ b/PhysicsAnalysis/TopPhys/QuickAna/QuickAna/ObjectTypeInfo.h
@@ -5,7 +5,7 @@
#ifndef QUICK_ANA__OBJECT_TYPE_INFO_H
#define QUICK_ANA__OBJECT_TYPE_INFO_H
-// Copyright Iowa State University 2015.
+//
// Author: Nils Krumnack
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/PhysicsAnalysis/TopPhys/QuickAna/QuickAna/ObjectTypeInfo.icc b/PhysicsAnalysis/TopPhys/QuickAna/QuickAna/ObjectTypeInfo.icc
index a922172094e36ebd2d7dbd142d896692b51693ea..839c1901f87f333e6f67a4d0c0b3221c415299c3 100644
--- a/PhysicsAnalysis/TopPhys/QuickAna/QuickAna/ObjectTypeInfo.icc
+++ b/PhysicsAnalysis/TopPhys/QuickAna/QuickAna/ObjectTypeInfo.icc
@@ -5,7 +5,7 @@
#ifndef QUICK_ANA__OBJECT_TYPE_INFO_ICC
#define QUICK_ANA__OBJECT_TYPE_INFO_ICC
-// Copyright Iowa State University 2015.
+//
// Author: Nils Krumnack
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/PhysicsAnalysis/TopPhys/QuickAna/QuickAna/OptimizedObjects.h b/PhysicsAnalysis/TopPhys/QuickAna/QuickAna/OptimizedObjects.h
index 4948c53ed3743f73ca7da57ea1e7ede3987adaf8..9a5f98bb2d62604e502fedcbd79eb305cfd85c89 100644
--- a/PhysicsAnalysis/TopPhys/QuickAna/QuickAna/OptimizedObjects.h
+++ b/PhysicsAnalysis/TopPhys/QuickAna/QuickAna/OptimizedObjects.h
@@ -5,7 +5,7 @@
#ifndef QUICK_ANA__OPTIMIZER_OBJECTS_H
#define QUICK_ANA__OPTIMIZER_OBJECTS_H
-// Copyright Iowa State University 2015.
+//
// Author: Nils Krumnack
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/PhysicsAnalysis/TopPhys/QuickAna/QuickAna/OptimizedScheduler.h b/PhysicsAnalysis/TopPhys/QuickAna/QuickAna/OptimizedScheduler.h
index f09a3a0b00ca37a18b538f60184d872da7a50dec..9e619538d6f8a52ec4929073cb04d37a01792b7f 100644
--- a/PhysicsAnalysis/TopPhys/QuickAna/QuickAna/OptimizedScheduler.h
+++ b/PhysicsAnalysis/TopPhys/QuickAna/QuickAna/OptimizedScheduler.h
@@ -5,7 +5,7 @@
#ifndef QUICK_ANA__OPTIMIZER_SCHEDULER_H
#define QUICK_ANA__OPTIMIZER_SCHEDULER_H
-// Copyright Iowa State University 2014.
+//
// Author: Nils Krumnack
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/PhysicsAnalysis/TopPhys/QuickAna/QuickAna/OptimizedStore.h b/PhysicsAnalysis/TopPhys/QuickAna/QuickAna/OptimizedStore.h
index b6262a12edae34839d33900a31f90a04ce856f5b..4dfb9a2329a5fe454423490904434568f64aa2fa 100644
--- a/PhysicsAnalysis/TopPhys/QuickAna/QuickAna/OptimizedStore.h
+++ b/PhysicsAnalysis/TopPhys/QuickAna/QuickAna/OptimizedStore.h
@@ -5,7 +5,7 @@
#ifndef QUICK_ANA__OPTIMIZER_STORE_H
#define QUICK_ANA__OPTIMIZER_STORE_H
-// Copyright Iowa State University 2015.
+//
// Author: Nils Krumnack
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/PhysicsAnalysis/TopPhys/QuickAna/QuickAna/OptimizedTool.h b/PhysicsAnalysis/TopPhys/QuickAna/QuickAna/OptimizedTool.h
index eb75634c210b7230f3b7426fb4d04810af6dd077..e76703b190c986d640784ed261c16e47e372a353 100644
--- a/PhysicsAnalysis/TopPhys/QuickAna/QuickAna/OptimizedTool.h
+++ b/PhysicsAnalysis/TopPhys/QuickAna/QuickAna/OptimizedTool.h
@@ -5,7 +5,7 @@
#ifndef QUICK_ANA__TOOL_WRAPPER_H
#define QUICK_ANA__TOOL_WRAPPER_H
-// Copyright Iowa State University 2015.
+//
// Author: Nils Krumnack
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/PhysicsAnalysis/TopPhys/QuickAna/QuickAna/PileupTool.h b/PhysicsAnalysis/TopPhys/QuickAna/QuickAna/PileupTool.h
index 23ee415f47b416f057726787fd13345ea3b160d2..7a0bdfa65c9b00dc96abd6333c7fd9720547f199 100644
--- a/PhysicsAnalysis/TopPhys/QuickAna/QuickAna/PileupTool.h
+++ b/PhysicsAnalysis/TopPhys/QuickAna/QuickAna/PileupTool.h
@@ -5,7 +5,7 @@
#ifndef QUICK_ANA__PILEUP_TOOL_H
#define QUICK_ANA__PILEUP_TOOL_H
-// Copyright Iowa State University 2014.
+//
// Author: Nils Krumnack
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/PhysicsAnalysis/TopPhys/QuickAna/QuickAna/QuickAna.h b/PhysicsAnalysis/TopPhys/QuickAna/QuickAna/QuickAna.h
index c49a7a3506e1cd758b53a1bf69f02a0dab75bf7d..d2be0aa0befae7304dfc0b5aae5632e5a33868ee 100644
--- a/PhysicsAnalysis/TopPhys/QuickAna/QuickAna/QuickAna.h
+++ b/PhysicsAnalysis/TopPhys/QuickAna/QuickAna/QuickAna.h
@@ -5,7 +5,7 @@
#ifndef QUICK_ANA__EVENT_TOOL_H
#define QUICK_ANA__EVENT_TOOL_H
-// Copyright Iowa State University 2014.
+//
// Author: Nils Krumnack
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/PhysicsAnalysis/TopPhys/QuickAna/QuickAna/SelectionChoice.h b/PhysicsAnalysis/TopPhys/QuickAna/QuickAna/SelectionChoice.h
index 26957ee7a232951b10fee9ae012d11e3eccf5599..d9a443adfc1c97ca6def187a383815db141824d9 100644
--- a/PhysicsAnalysis/TopPhys/QuickAna/QuickAna/SelectionChoice.h
+++ b/PhysicsAnalysis/TopPhys/QuickAna/QuickAna/SelectionChoice.h
@@ -5,7 +5,7 @@
#ifndef QUICK_ANA__SELECTION_CHOICE_H
#define QUICK_ANA__SELECTION_CHOICE_H
-// Copyright Iowa State University 2015.
+//
// Author: Nils Krumnack
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/PhysicsAnalysis/TopPhys/QuickAna/QuickAna/SelectionCut.h b/PhysicsAnalysis/TopPhys/QuickAna/QuickAna/SelectionCut.h
index 982a100e399741ddf6e9b997f9cf8ec71a17e38c..497d54e8bb00e045b71bd9f633b4fa7b55fa187f 100644
--- a/PhysicsAnalysis/TopPhys/QuickAna/QuickAna/SelectionCut.h
+++ b/PhysicsAnalysis/TopPhys/QuickAna/QuickAna/SelectionCut.h
@@ -5,7 +5,7 @@
#ifndef QUICK_ANA__SELECTION_CUT_H
#define QUICK_ANA__SELECTION_CUT_H
-// Copyright Iowa State University 2015.
+//
// Author: Nils Krumnack
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/PhysicsAnalysis/TopPhys/QuickAna/QuickAna/SelectionData.h b/PhysicsAnalysis/TopPhys/QuickAna/QuickAna/SelectionData.h
index 37750bff6e7e1d89b83802685ba4afc668ed98f5..e3717ca9df485a54e29a5c5890beb6b6a1b9df19 100644
--- a/PhysicsAnalysis/TopPhys/QuickAna/QuickAna/SelectionData.h
+++ b/PhysicsAnalysis/TopPhys/QuickAna/QuickAna/SelectionData.h
@@ -5,7 +5,7 @@
#ifndef QUICK_ANA__SELECTION_DATA_H
#define QUICK_ANA__SELECTION_DATA_H
-// Copyright Iowa State University 2015.
+//
// Author: Nils Krumnack
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/PhysicsAnalysis/TopPhys/QuickAna/QuickAna/SelectionStep.h b/PhysicsAnalysis/TopPhys/QuickAna/QuickAna/SelectionStep.h
index 95d8484b1c662e037cc09291b4ed5f24ac8a8016..d99cef37aca12f5a70e2f57cd460ed559b181655 100644
--- a/PhysicsAnalysis/TopPhys/QuickAna/QuickAna/SelectionStep.h
+++ b/PhysicsAnalysis/TopPhys/QuickAna/QuickAna/SelectionStep.h
@@ -5,7 +5,7 @@
#ifndef QUICK_ANA__SELECTION_STEP_H
#define QUICK_ANA__SELECTION_STEP_H
-// Copyright Iowa State University 2015.
+//
// Author: Nils Krumnack
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/PhysicsAnalysis/TopPhys/QuickAna/QuickAna/TauTool.h b/PhysicsAnalysis/TopPhys/QuickAna/QuickAna/TauTool.h
index 1c95bcb3da94f53c6764beea78c3aa3d9c88fb02..3892e93d8028091eecdd76ddc859f472d4728b4c 100644
--- a/PhysicsAnalysis/TopPhys/QuickAna/QuickAna/TauTool.h
+++ b/PhysicsAnalysis/TopPhys/QuickAna/QuickAna/TauTool.h
@@ -5,7 +5,7 @@
#ifndef QUICK_ANA__TAU_TOOL_H
#define QUICK_ANA__TAU_TOOL_H
-// Copyright Iowa State University 2014.
+//
// Author: Nils Krumnack
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/PhysicsAnalysis/TopPhys/QuickAna/QuickAna/ToolScheduler.h b/PhysicsAnalysis/TopPhys/QuickAna/QuickAna/ToolScheduler.h
index a5bbbb532de2dbf3e4cf36ec5623db88f609fbbd..f0778fb5d26f246520cae03b09113f4404c742e7 100644
--- a/PhysicsAnalysis/TopPhys/QuickAna/QuickAna/ToolScheduler.h
+++ b/PhysicsAnalysis/TopPhys/QuickAna/QuickAna/ToolScheduler.h
@@ -5,7 +5,7 @@
#ifndef QUICK_ANA__TOOL_SCHEDULER_H
#define QUICK_ANA__TOOL_SCHEDULER_H
-// Copyright Iowa State University 2014.
+//
// Author: Nils Krumnack
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/PhysicsAnalysis/TopPhys/QuickAna/QuickAna/ValidationEL.h b/PhysicsAnalysis/TopPhys/QuickAna/QuickAna/ValidationEL.h
index 972c2a88bedcba7220d4165b6179e240b0637464..7662965c27175558733a460eb2e02f4758022e02 100644
--- a/PhysicsAnalysis/TopPhys/QuickAna/QuickAna/ValidationEL.h
+++ b/PhysicsAnalysis/TopPhys/QuickAna/QuickAna/ValidationEL.h
@@ -5,7 +5,7 @@
#ifndef QUICK_ANA__VALIDATION_EL_H
#define QUICK_ANA__VALIDATION_EL_H
-// Copyright Iowa State University 2014.
+//
// Author: Nils Krumnack
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/PhysicsAnalysis/TopPhys/QuickAna/QuickAna/ValidationHists.h b/PhysicsAnalysis/TopPhys/QuickAna/QuickAna/ValidationHists.h
index 9b2312240e425353d1e46d548b6eafa4b8df6a55..a830306921616c0bb6f12d6ad30da99f87c5b374 100644
--- a/PhysicsAnalysis/TopPhys/QuickAna/QuickAna/ValidationHists.h
+++ b/PhysicsAnalysis/TopPhys/QuickAna/QuickAna/ValidationHists.h
@@ -5,7 +5,7 @@
#ifndef QUICK_ANA__VALIDATION_HISTS_H
#define QUICK_ANA__VALIDATION_HISTS_H
-// Copyright Iowa State University 2014.
+//
// Author: Nils Krumnack
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/PhysicsAnalysis/TopPhys/QuickAna/QuickAna/xAODEventSelect.h b/PhysicsAnalysis/TopPhys/QuickAna/QuickAna/xAODEventSelect.h
index 06e3622a2a4951b06c38fc2b1d0c255e83bff983..b51676cf770cf8c3365acff441d2bb8607135b6c 100644
--- a/PhysicsAnalysis/TopPhys/QuickAna/QuickAna/xAODEventSelect.h
+++ b/PhysicsAnalysis/TopPhys/QuickAna/QuickAna/xAODEventSelect.h
@@ -5,7 +5,7 @@
#ifndef QUICK_ANA__X_AOD_EVENT_INFO_H
#define QUICK_ANA__X_AOD_EVENT_INFO_H
-// Copyright Iowa State University 2016.
+//
// Author: Nils Krumnack
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/PhysicsAnalysis/TopPhys/QuickAna/QuickAna/xAODHelpers.h b/PhysicsAnalysis/TopPhys/QuickAna/QuickAna/xAODHelpers.h
index 3cd91c45a13b1274dc14590f4cf189158e3ebbb3..22c32e13abd0a146f307598536786ae7d1e968d1 100644
--- a/PhysicsAnalysis/TopPhys/QuickAna/QuickAna/xAODHelpers.h
+++ b/PhysicsAnalysis/TopPhys/QuickAna/QuickAna/xAODHelpers.h
@@ -5,7 +5,7 @@
#ifndef QUICK_ANA__X_AOD_HELPERS_H
#define QUICK_ANA__X_AOD_HELPERS_H
-// Copyright Iowa State University 2015.
+//
// Author: Nils Krumnack
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/PhysicsAnalysis/TopPhys/QuickAna/QuickAna/xAODInclude.h b/PhysicsAnalysis/TopPhys/QuickAna/QuickAna/xAODInclude.h
index 852c788a082f4d944e5b9d5c97e075d74ef4de9a..135386d7c59d59caf7b05f6ada2a8a7a82793e28 100644
--- a/PhysicsAnalysis/TopPhys/QuickAna/QuickAna/xAODInclude.h
+++ b/PhysicsAnalysis/TopPhys/QuickAna/QuickAna/xAODInclude.h
@@ -5,7 +5,7 @@
#ifndef QUICK_ANA__X_AOD_INCLUDE_H
#define QUICK_ANA__X_AOD_INCLUDE_H
-// Copyright Iowa State University 2014.
+//
// Author: Nils Krumnack
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/PhysicsAnalysis/TopPhys/QuickAna/QuickAna/xAODTruth.h b/PhysicsAnalysis/TopPhys/QuickAna/QuickAna/xAODTruth.h
index d671a09b8b67b3070ddf9c50f93c552233ba0537..0c93604d30a123bfe9badb744b34c48034832cc0 100644
--- a/PhysicsAnalysis/TopPhys/QuickAna/QuickAna/xAODTruth.h
+++ b/PhysicsAnalysis/TopPhys/QuickAna/QuickAna/xAODTruth.h
@@ -5,7 +5,7 @@
#ifndef QUICK_ANA__X_AOD_TRUTH_H
#define QUICK_ANA__X_AOD_TRUTH_H
-// Copyright Iowa State University 2015.
+//
// Author: Nils Krumnack
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/PhysicsAnalysis/TopPhys/QuickAna/Root/AnaTool.cxx b/PhysicsAnalysis/TopPhys/QuickAna/Root/AnaTool.cxx
index 5e41393b9021dd96027e63e5c5c240c6aca74857..a010208e1e9846da3bc994c899f715409b5c0cbe 100644
--- a/PhysicsAnalysis/TopPhys/QuickAna/Root/AnaTool.cxx
+++ b/PhysicsAnalysis/TopPhys/QuickAna/Root/AnaTool.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-// Copyright Iowa State University 2014.
+//
// Author: Nils Krumnack
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/PhysicsAnalysis/TopPhys/QuickAna/Root/AnaToolRetrieve.cxx b/PhysicsAnalysis/TopPhys/QuickAna/Root/AnaToolRetrieve.cxx
index 026c1c26cf32e0a9d970e45f9189472fd634909f..316a2368feeb309a2f2b830a257dd612804b302b 100644
--- a/PhysicsAnalysis/TopPhys/QuickAna/Root/AnaToolRetrieve.cxx
+++ b/PhysicsAnalysis/TopPhys/QuickAna/Root/AnaToolRetrieve.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-// Copyright Iowa State University 2014.
+//
// Author: Nils Krumnack
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/PhysicsAnalysis/TopPhys/QuickAna/Root/AnaToolSelectCombine.cxx b/PhysicsAnalysis/TopPhys/QuickAna/Root/AnaToolSelectCombine.cxx
index 247c761153287817c16113273622a34895e4ce7d..10d59a405fcb6dd7c959fe014b7e275b8a067c36 100644
--- a/PhysicsAnalysis/TopPhys/QuickAna/Root/AnaToolSelectCombine.cxx
+++ b/PhysicsAnalysis/TopPhys/QuickAna/Root/AnaToolSelectCombine.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-// Copyright Iowa State University 2014.
+//
// Author: Nils Krumnack
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/PhysicsAnalysis/TopPhys/QuickAna/Root/AnaToolSelectInit.cxx b/PhysicsAnalysis/TopPhys/QuickAna/Root/AnaToolSelectInit.cxx
index 95dd4d2c234b6a573dc80e9248a22bd59e3b82b4..3f5529c5a83663717a25a2aa067e3399ba7b0aea 100644
--- a/PhysicsAnalysis/TopPhys/QuickAna/Root/AnaToolSelectInit.cxx
+++ b/PhysicsAnalysis/TopPhys/QuickAna/Root/AnaToolSelectInit.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-// Copyright Iowa State University 2014.
+//
// Author: Nils Krumnack
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/PhysicsAnalysis/TopPhys/QuickAna/Root/AnaToolSelectSpread.cxx b/PhysicsAnalysis/TopPhys/QuickAna/Root/AnaToolSelectSpread.cxx
index 294bd3bb417144bc644fa81459ea32f8d719fc4a..ffba2ac9bfea18e3502c4a094f829bb0b1c14d42 100644
--- a/PhysicsAnalysis/TopPhys/QuickAna/Root/AnaToolSelectSpread.cxx
+++ b/PhysicsAnalysis/TopPhys/QuickAna/Root/AnaToolSelectSpread.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-// Copyright Iowa State University 2014.
+//
// Author: Nils Krumnack
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/PhysicsAnalysis/TopPhys/QuickAna/Root/AnaToolSequence.cxx b/PhysicsAnalysis/TopPhys/QuickAna/Root/AnaToolSequence.cxx
index 03353614b43e2750be92d48119e4222338a94eed..47423db209b10f7df8f592f258fe6c38290bfd3f 100644
--- a/PhysicsAnalysis/TopPhys/QuickAna/Root/AnaToolSequence.cxx
+++ b/PhysicsAnalysis/TopPhys/QuickAna/Root/AnaToolSequence.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-// Copyright Iowa State University 2015.
+//
// Author: Nils Krumnack
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/PhysicsAnalysis/TopPhys/QuickAna/Root/Configuration.cxx b/PhysicsAnalysis/TopPhys/QuickAna/Root/Configuration.cxx
index f828dfd0067a92c9f3fe75ec2314274a1b04b742..62bd3eaaec2bdc4a272a60d4c83aa28e77e0db89 100644
--- a/PhysicsAnalysis/TopPhys/QuickAna/Root/Configuration.cxx
+++ b/PhysicsAnalysis/TopPhys/QuickAna/Root/Configuration.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-// Copyright Iowa State University 2014.
+//
// Author: Nils Krumnack
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/PhysicsAnalysis/TopPhys/QuickAna/Root/DefinitionArgs.cxx b/PhysicsAnalysis/TopPhys/QuickAna/Root/DefinitionArgs.cxx
index 9eab8ad7e502d40b101afdb8112900d887090833..0be34a26b6543a31102aac37c52f7a5f0651d5aa 100644
--- a/PhysicsAnalysis/TopPhys/QuickAna/Root/DefinitionArgs.cxx
+++ b/PhysicsAnalysis/TopPhys/QuickAna/Root/DefinitionArgs.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-// Copyright Iowa State University 2014.
+//
// Author: Nils Krumnack
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/PhysicsAnalysis/TopPhys/QuickAna/Root/DefinitionConf.cxx b/PhysicsAnalysis/TopPhys/QuickAna/Root/DefinitionConf.cxx
index 91a8936827a90ae0e83f61e1a7b9325aadecbf89..160bfc96d4a69762d0eca6e13a8bf493ef8ed33c 100644
--- a/PhysicsAnalysis/TopPhys/QuickAna/Root/DefinitionConf.cxx
+++ b/PhysicsAnalysis/TopPhys/QuickAna/Root/DefinitionConf.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-// Copyright Iowa State University 2015.
+//
// Author: Nils Krumnack
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/PhysicsAnalysis/TopPhys/QuickAna/Root/DefinitionMaker.cxx b/PhysicsAnalysis/TopPhys/QuickAna/Root/DefinitionMaker.cxx
index 611ff09e301f170581795ddac3e492beabf19963..50dde089ec7134ef6b92ee0d209b37a5fa000350 100644
--- a/PhysicsAnalysis/TopPhys/QuickAna/Root/DefinitionMaker.cxx
+++ b/PhysicsAnalysis/TopPhys/QuickAna/Root/DefinitionMaker.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-// Copyright Iowa State University 2014.
+//
// Author: Nils Krumnack
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/PhysicsAnalysis/TopPhys/QuickAna/Root/ELExample.cxx b/PhysicsAnalysis/TopPhys/QuickAna/Root/ELExample.cxx
index 18b60e6e1703ec94bd719ce876f7c462a62743f4..561e83712085a4e52dfe77d04a839a7e60390201 100644
--- a/PhysicsAnalysis/TopPhys/QuickAna/Root/ELExample.cxx
+++ b/PhysicsAnalysis/TopPhys/QuickAna/Root/ELExample.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-// Copyright Iowa State University 2014.
+//
// Author: Nils Krumnack
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/PhysicsAnalysis/TopPhys/QuickAna/Root/EventData.cxx b/PhysicsAnalysis/TopPhys/QuickAna/Root/EventData.cxx
index cbbbd7c8a3b7d3f88b05c6773d173e0948e7cdd9..e3c59c57abe9866c2052a61b22a261dab1c704e4 100644
--- a/PhysicsAnalysis/TopPhys/QuickAna/Root/EventData.cxx
+++ b/PhysicsAnalysis/TopPhys/QuickAna/Root/EventData.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-// Copyright Iowa State University 2015.
+//
// Author: Nils Krumnack
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/PhysicsAnalysis/TopPhys/QuickAna/Root/EventInfoIsData.cxx b/PhysicsAnalysis/TopPhys/QuickAna/Root/EventInfoIsData.cxx
index 14b456e7ee130c66ef454dcb26fe47980aa05bcb..f2b18fafc7ee3ef94223b72fc7ce06be3525f5ca 100644
--- a/PhysicsAnalysis/TopPhys/QuickAna/Root/EventInfoIsData.cxx
+++ b/PhysicsAnalysis/TopPhys/QuickAna/Root/EventInfoIsData.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-// Copyright Iowa State University 2015.
+//
// Author: Nils Krumnack
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/PhysicsAnalysis/TopPhys/QuickAna/Root/EventObjects.cxx b/PhysicsAnalysis/TopPhys/QuickAna/Root/EventObjects.cxx
index ba50901b094868ae014d62e743d7ed9b77e215d2..545f17afe0a939de8ebabc2783432383cd1133ba 100644
--- a/PhysicsAnalysis/TopPhys/QuickAna/Root/EventObjects.cxx
+++ b/PhysicsAnalysis/TopPhys/QuickAna/Root/EventObjects.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-// Copyright Iowa State University 2014.
+//
// Author: Nils Krumnack
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/PhysicsAnalysis/TopPhys/QuickAna/Root/EventSelectBaseTool.cxx b/PhysicsAnalysis/TopPhys/QuickAna/Root/EventSelectBaseTool.cxx
index 0cbf45cfe71c2e3ea9a10369382ee7824b0a92eb..0f680584f1d86ae025b581df7ce18d641ca4c396 100644
--- a/PhysicsAnalysis/TopPhys/QuickAna/Root/EventSelectBaseTool.cxx
+++ b/PhysicsAnalysis/TopPhys/QuickAna/Root/EventSelectBaseTool.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-// Copyright Iowa State University 2016.
+//
// Author: Nils Krumnack
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/PhysicsAnalysis/TopPhys/QuickAna/Root/EventSelectHasVertex.cxx b/PhysicsAnalysis/TopPhys/QuickAna/Root/EventSelectHasVertex.cxx
index de8fbb269ee1bf23ca8db4acec025e680eeecc59..c731c142f4f0ecebcb5b6442195831b5af887984 100644
--- a/PhysicsAnalysis/TopPhys/QuickAna/Root/EventSelectHasVertex.cxx
+++ b/PhysicsAnalysis/TopPhys/QuickAna/Root/EventSelectHasVertex.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-// Copyright Iowa State University 2016.
+//
// Author: Nils Krumnack
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/PhysicsAnalysis/TopPhys/QuickAna/Root/FatJetTool.cxx b/PhysicsAnalysis/TopPhys/QuickAna/Root/FatJetTool.cxx
index cfd7e8de03f05258c8ecb289f93411965da91445..df3b4d603356013fdc9d8ba75d4030587c711d30 100644
--- a/PhysicsAnalysis/TopPhys/QuickAna/Root/FatJetTool.cxx
+++ b/PhysicsAnalysis/TopPhys/QuickAna/Root/FatJetTool.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-// Copyright Iowa State University 2014.
+//
// Author: Nils Krumnack
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/PhysicsAnalysis/TopPhys/QuickAna/Root/HZZElectronTool.cxx b/PhysicsAnalysis/TopPhys/QuickAna/Root/HZZElectronTool.cxx
index c5d6dd637327a625486d7011258b3075e2ba528b..7f040143fb1d5e3c52b67bc6c5f4dab29c64d8e8 100644
--- a/PhysicsAnalysis/TopPhys/QuickAna/Root/HZZElectronTool.cxx
+++ b/PhysicsAnalysis/TopPhys/QuickAna/Root/HZZElectronTool.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-// Copyright Iowa State University 2014.
+//
// Author: Nils Krumnack
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/PhysicsAnalysis/TopPhys/QuickAna/Root/HZZMuonTool.cxx b/PhysicsAnalysis/TopPhys/QuickAna/Root/HZZMuonTool.cxx
index e42a6607a10a27ee05f3dc4c50aa9b13e22c0da4..be588352138d4b49079516acab38374e99782836 100644
--- a/PhysicsAnalysis/TopPhys/QuickAna/Root/HZZMuonTool.cxx
+++ b/PhysicsAnalysis/TopPhys/QuickAna/Root/HZZMuonTool.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-// Copyright Iowa State University 2014.
+//
// Author: Nils Krumnack
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/PhysicsAnalysis/TopPhys/QuickAna/Root/IEventObjects.cxx b/PhysicsAnalysis/TopPhys/QuickAna/Root/IEventObjects.cxx
index 9976ed2862c28d5f0d75c6aac0f4ecb4d46cd320..dc5da06fd815bf07bdac022f629c54b401ab9a7b 100644
--- a/PhysicsAnalysis/TopPhys/QuickAna/Root/IEventObjects.cxx
+++ b/PhysicsAnalysis/TopPhys/QuickAna/Root/IEventObjects.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-// Copyright Iowa State University 2014.
+//
// Author: Nils Krumnack
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/PhysicsAnalysis/TopPhys/QuickAna/Root/IToolScheduler.cxx b/PhysicsAnalysis/TopPhys/QuickAna/Root/IToolScheduler.cxx
index b74cab059ac5ce16942335cb0548d8d163771acd..8c86fa649e58a68893ed309d17f086340e684cbb 100644
--- a/PhysicsAnalysis/TopPhys/QuickAna/Root/IToolScheduler.cxx
+++ b/PhysicsAnalysis/TopPhys/QuickAna/Root/IToolScheduler.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-// Copyright Iowa State University 2014.
+//
// Author: Nils Krumnack
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/PhysicsAnalysis/TopPhys/QuickAna/Root/InternalConfiguration.cxx b/PhysicsAnalysis/TopPhys/QuickAna/Root/InternalConfiguration.cxx
index 33e6f0f8a138d73c6d43b847a45f25b6525bd5f0..c21c579a53aaa394ec4080513cc91b8f5d5092c4 100644
--- a/PhysicsAnalysis/TopPhys/QuickAna/Root/InternalConfiguration.cxx
+++ b/PhysicsAnalysis/TopPhys/QuickAna/Root/InternalConfiguration.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-// Copyright Iowa State University 2015.
+//
// Author: Nils Krumnack
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/PhysicsAnalysis/TopPhys/QuickAna/Root/JetTool.cxx b/PhysicsAnalysis/TopPhys/QuickAna/Root/JetTool.cxx
index 1bfc24bab4cb9a29a07f4968fdbb5b9c160c9bfb..ab79e61eb34959f14ed60c43402b2d853a817ed8 100644
--- a/PhysicsAnalysis/TopPhys/QuickAna/Root/JetTool.cxx
+++ b/PhysicsAnalysis/TopPhys/QuickAna/Root/JetTool.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-// Copyright Iowa State University 2014.
+//
// Author: Nils Krumnack
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/PhysicsAnalysis/TopPhys/QuickAna/Root/KinObjectSelect.cxx b/PhysicsAnalysis/TopPhys/QuickAna/Root/KinObjectSelect.cxx
index e4341e9157edc2815456afabcc73341834aa08b8..5fc0f0b4b17df7fc9166564242f9c11e1a11ceae 100644
--- a/PhysicsAnalysis/TopPhys/QuickAna/Root/KinObjectSelect.cxx
+++ b/PhysicsAnalysis/TopPhys/QuickAna/Root/KinObjectSelect.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-// Copyright Iowa State University 2014.
+//
// Author: Nils Krumnack
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/PhysicsAnalysis/TopPhys/QuickAna/Root/KinSelectTool.cxx b/PhysicsAnalysis/TopPhys/QuickAna/Root/KinSelectTool.cxx
index 8f4b4ace7465c506e0b367bc0108c5e0b047baac..64c8be5f8bef411f30639bbb96d2a998c57580de 100644
--- a/PhysicsAnalysis/TopPhys/QuickAna/Root/KinSelectTool.cxx
+++ b/PhysicsAnalysis/TopPhys/QuickAna/Root/KinSelectTool.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-// Copyright Iowa State University 2014.
+//
// Author: Nils Krumnack
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/PhysicsAnalysis/TopPhys/QuickAna/Root/MessageCheck.cxx b/PhysicsAnalysis/TopPhys/QuickAna/Root/MessageCheck.cxx
index e4eb3fab5dea58f86fa379c79131f995e204d692..64d489a6b2fb61b3048e531c1e431dd35eb05654 100644
--- a/PhysicsAnalysis/TopPhys/QuickAna/Root/MessageCheck.cxx
+++ b/PhysicsAnalysis/TopPhys/QuickAna/Root/MessageCheck.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-// Copyright Iowa State University 2014.
+//
// Author: Nils Krumnack
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/PhysicsAnalysis/TopPhys/QuickAna/Root/MetTool.cxx b/PhysicsAnalysis/TopPhys/QuickAna/Root/MetTool.cxx
index 0a1f6fbcc5b335ee9fbcfc9cb9839e5369402fc2..7c775f94a508c9974a9553ff43ff1ce2554d28c5 100644
--- a/PhysicsAnalysis/TopPhys/QuickAna/Root/MetTool.cxx
+++ b/PhysicsAnalysis/TopPhys/QuickAna/Root/MetTool.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-// Copyright Iowa State University 2014.
+//
// Author: Nils Krumnack
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/PhysicsAnalysis/TopPhys/QuickAna/Root/MuonTool.cxx b/PhysicsAnalysis/TopPhys/QuickAna/Root/MuonTool.cxx
index 2573f763a053f717c1a188054c983bf0f0632316..2ab2f4bcfc49cba43bffa1f0ca2d01e39cd001e9 100644
--- a/PhysicsAnalysis/TopPhys/QuickAna/Root/MuonTool.cxx
+++ b/PhysicsAnalysis/TopPhys/QuickAna/Root/MuonTool.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-// Copyright Iowa State University 2014.
+//
// Author: Nils Krumnack
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/PhysicsAnalysis/TopPhys/QuickAna/Root/ObjectTypeInfo.cxx b/PhysicsAnalysis/TopPhys/QuickAna/Root/ObjectTypeInfo.cxx
index 58fa0d2ffebdb2a8d14b7df2d7ee4990c83cbe5c..b211ba528bcbfad319b113bdc113e04fe9fdb5f8 100644
--- a/PhysicsAnalysis/TopPhys/QuickAna/Root/ObjectTypeInfo.cxx
+++ b/PhysicsAnalysis/TopPhys/QuickAna/Root/ObjectTypeInfo.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-// Copyright Iowa State University 2015.
+//
// Author: Nils Krumnack
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/PhysicsAnalysis/TopPhys/QuickAna/Root/OptimizedObjects.cxx b/PhysicsAnalysis/TopPhys/QuickAna/Root/OptimizedObjects.cxx
index 5212c82d9ac2ef621e6f072fb29d1a46037b40e6..147efe9927b07fd47a4530dea2535cf9d1a61778 100644
--- a/PhysicsAnalysis/TopPhys/QuickAna/Root/OptimizedObjects.cxx
+++ b/PhysicsAnalysis/TopPhys/QuickAna/Root/OptimizedObjects.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-// Copyright Iowa State University 2015.
+//
// Author: Nils Krumnack
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/PhysicsAnalysis/TopPhys/QuickAna/Root/OptimizedScheduler.cxx b/PhysicsAnalysis/TopPhys/QuickAna/Root/OptimizedScheduler.cxx
index d2058b239c6c56c321dcba8aec26cd9e6c74ec9a..4410c591aeceb286b81ab5a44593d2e7a9baf39c 100644
--- a/PhysicsAnalysis/TopPhys/QuickAna/Root/OptimizedScheduler.cxx
+++ b/PhysicsAnalysis/TopPhys/QuickAna/Root/OptimizedScheduler.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-// Copyright Iowa State University 2014.
+//
// Author: Nils Krumnack
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/PhysicsAnalysis/TopPhys/QuickAna/Root/OptimizedStore.cxx b/PhysicsAnalysis/TopPhys/QuickAna/Root/OptimizedStore.cxx
index 705663af015292f59de7e85a06a71fc8e19fb3b6..f452ac5043266ad21369367636ee6efbb6d9738a 100644
--- a/PhysicsAnalysis/TopPhys/QuickAna/Root/OptimizedStore.cxx
+++ b/PhysicsAnalysis/TopPhys/QuickAna/Root/OptimizedStore.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-// Copyright Iowa State University 2015.
+//
// Author: Nils Krumnack
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/PhysicsAnalysis/TopPhys/QuickAna/Root/OptimizedTool.cxx b/PhysicsAnalysis/TopPhys/QuickAna/Root/OptimizedTool.cxx
index 65f30769973d137b6fca246ad596769e3f24f551..2a1a77dee41781dca0bd4e82f4e89ea177fe6383 100644
--- a/PhysicsAnalysis/TopPhys/QuickAna/Root/OptimizedTool.cxx
+++ b/PhysicsAnalysis/TopPhys/QuickAna/Root/OptimizedTool.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-// Copyright Iowa State University 2015.
+//
// Author: Nils Krumnack
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/PhysicsAnalysis/TopPhys/QuickAna/Root/PileupTool.cxx b/PhysicsAnalysis/TopPhys/QuickAna/Root/PileupTool.cxx
index 1bd73776540faa608e3d1cf6b80e7f21fbc80d34..0e4b9ccc712e004ecc55bcf3db6a05241fc190bf 100644
--- a/PhysicsAnalysis/TopPhys/QuickAna/Root/PileupTool.cxx
+++ b/PhysicsAnalysis/TopPhys/QuickAna/Root/PileupTool.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-// Copyright Iowa State University 2014.
+//
// Author: Nils Krumnack
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/PhysicsAnalysis/TopPhys/QuickAna/Root/QuickAna.cxx b/PhysicsAnalysis/TopPhys/QuickAna/Root/QuickAna.cxx
index ea74c821882aa894989d920562a181025666753b..b003aaf2248880f125158516d1cf41d0eace2e96 100644
--- a/PhysicsAnalysis/TopPhys/QuickAna/Root/QuickAna.cxx
+++ b/PhysicsAnalysis/TopPhys/QuickAna/Root/QuickAna.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-// Copyright Iowa State University 2014.
+//
// Author: Nils Krumnack
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/PhysicsAnalysis/TopPhys/QuickAna/Root/SelectionChoice.cxx b/PhysicsAnalysis/TopPhys/QuickAna/Root/SelectionChoice.cxx
index 757f0b32a06492ddc00d90d92f0df8fd2ab2f9df..9a095e93ee61971e94ce126277651efe025fe78d 100644
--- a/PhysicsAnalysis/TopPhys/QuickAna/Root/SelectionChoice.cxx
+++ b/PhysicsAnalysis/TopPhys/QuickAna/Root/SelectionChoice.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-// Copyright Iowa State University 2015.
+//
// Author: Nils Krumnack
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/PhysicsAnalysis/TopPhys/QuickAna/Root/SelectionCut.cxx b/PhysicsAnalysis/TopPhys/QuickAna/Root/SelectionCut.cxx
index 9b8716f0c07b4624abfb8a91b76908c37095e3d9..ce6e763ebd21513319e88e452a3003c0cae93018 100644
--- a/PhysicsAnalysis/TopPhys/QuickAna/Root/SelectionCut.cxx
+++ b/PhysicsAnalysis/TopPhys/QuickAna/Root/SelectionCut.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-// Copyright Iowa State University 2015.
+//
// Author: Nils Krumnack
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/PhysicsAnalysis/TopPhys/QuickAna/Root/SelectionData.cxx b/PhysicsAnalysis/TopPhys/QuickAna/Root/SelectionData.cxx
index 2ed94d3f07a3edc0fabe973d2b2c62f01af4fe11..67d11d3b03aec8af67e3900174ec85cbf82b91de 100644
--- a/PhysicsAnalysis/TopPhys/QuickAna/Root/SelectionData.cxx
+++ b/PhysicsAnalysis/TopPhys/QuickAna/Root/SelectionData.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-// Copyright Iowa State University 2015.
+//
// Author: Nils Krumnack
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/PhysicsAnalysis/TopPhys/QuickAna/Root/SelectionStep.cxx b/PhysicsAnalysis/TopPhys/QuickAna/Root/SelectionStep.cxx
index b70adb74b2c5d6c1a9b1b3cf255bbd3fc062a28a..00a63cde1a07fb634129caf3c35cdb3b604aa7c5 100644
--- a/PhysicsAnalysis/TopPhys/QuickAna/Root/SelectionStep.cxx
+++ b/PhysicsAnalysis/TopPhys/QuickAna/Root/SelectionStep.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-// Copyright Iowa State University 2015.
+//
// Author: Nils Krumnack
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/PhysicsAnalysis/TopPhys/QuickAna/Root/TauTool.cxx b/PhysicsAnalysis/TopPhys/QuickAna/Root/TauTool.cxx
index 1fb96df38cb5002979c3586a0ba387d11a9d46d6..100f4cde2112d5580ecbbc529447fbad5219a115 100644
--- a/PhysicsAnalysis/TopPhys/QuickAna/Root/TauTool.cxx
+++ b/PhysicsAnalysis/TopPhys/QuickAna/Root/TauTool.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-// Copyright Iowa State University 2014.
+//
// Author: Nils Krumnack
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/PhysicsAnalysis/TopPhys/QuickAna/Root/ToolScheduler.cxx b/PhysicsAnalysis/TopPhys/QuickAna/Root/ToolScheduler.cxx
index 632f50e3087c862640f962a5353464783fa74c2f..e55592abc8e6b128cb21ea873c41b659f8ffa3ea 100644
--- a/PhysicsAnalysis/TopPhys/QuickAna/Root/ToolScheduler.cxx
+++ b/PhysicsAnalysis/TopPhys/QuickAna/Root/ToolScheduler.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-// Copyright Iowa State University 2014.
+//
// Author: Nils Krumnack
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/PhysicsAnalysis/TopPhys/QuickAna/Root/ValidationEL.cxx b/PhysicsAnalysis/TopPhys/QuickAna/Root/ValidationEL.cxx
index 44cb68e4569b8b548b6f896e3483fb09bdf07c95..24863d32ff082931b2e69885b92a3b4c4c8081d0 100644
--- a/PhysicsAnalysis/TopPhys/QuickAna/Root/ValidationEL.cxx
+++ b/PhysicsAnalysis/TopPhys/QuickAna/Root/ValidationEL.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-// Copyright Iowa State University 2014.
+//
// Author: Nils Krumnack
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/PhysicsAnalysis/TopPhys/QuickAna/Root/ValidationHists.cxx b/PhysicsAnalysis/TopPhys/QuickAna/Root/ValidationHists.cxx
index 24e5a922d081e18110ea690711db7ae9f96b37e5..e217a004989b8c4a8f4248fde8cd116cffb73f75 100644
--- a/PhysicsAnalysis/TopPhys/QuickAna/Root/ValidationHists.cxx
+++ b/PhysicsAnalysis/TopPhys/QuickAna/Root/ValidationHists.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-// Copyright Iowa State University 2014.
+//
// Author: Nils Krumnack
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/PhysicsAnalysis/TopPhys/QuickAna/Root/xAODEventSelect.cxx b/PhysicsAnalysis/TopPhys/QuickAna/Root/xAODEventSelect.cxx
index a92f3875caedcb4882cd857e3ef24b1e53f4879a..8849f9bc2019700c5e5d7e0ffa2068179d9b85cb 100644
--- a/PhysicsAnalysis/TopPhys/QuickAna/Root/xAODEventSelect.cxx
+++ b/PhysicsAnalysis/TopPhys/QuickAna/Root/xAODEventSelect.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-// Copyright Iowa State University 2016.
+//
// Author: Nils Krumnack
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/PhysicsAnalysis/TopPhys/QuickAna/Root/xAODHelpers.cxx b/PhysicsAnalysis/TopPhys/QuickAna/Root/xAODHelpers.cxx
index fc3f8bca9e5f90f5cecab75df2510cddc4dace81..509636a237e0a5d686c31147f22c71845d0b19e2 100644
--- a/PhysicsAnalysis/TopPhys/QuickAna/Root/xAODHelpers.cxx
+++ b/PhysicsAnalysis/TopPhys/QuickAna/Root/xAODHelpers.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-// Copyright Iowa State University 2015.
+//
// Author: Nils Krumnack
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/PhysicsAnalysis/TopPhys/QuickAna/Root/xAODTruth.cxx b/PhysicsAnalysis/TopPhys/QuickAna/Root/xAODTruth.cxx
index edd4dca4c8c86d5639e5d66ffd7944ce7182cc4b..e6d568b86ea528679381048992837569f782d923 100644
--- a/PhysicsAnalysis/TopPhys/QuickAna/Root/xAODTruth.cxx
+++ b/PhysicsAnalysis/TopPhys/QuickAna/Root/xAODTruth.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-// Copyright Iowa State University 2015.
+//
// Author: Nils Krumnack
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/PhysicsAnalysis/TopPhys/QuickAna/test/gt_KinSelect.cxx b/PhysicsAnalysis/TopPhys/QuickAna/test/gt_KinSelect.cxx
index 9ef1dbbc0b2adcefe2be3c66408d1d2058b624d7..afa97cb947a236abccd5f1dba0483fb54d631b8d 100644
--- a/PhysicsAnalysis/TopPhys/QuickAna/test/gt_KinSelect.cxx
+++ b/PhysicsAnalysis/TopPhys/QuickAna/test/gt_KinSelect.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-// Copyright Iowa State University 2016.
+//
// Author: Nils Krumnack
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/PhysicsAnalysis/TopPhys/QuickAna/test/inc_AnaToolCorrect.cxx b/PhysicsAnalysis/TopPhys/QuickAna/test/inc_AnaToolCorrect.cxx
index e7aa2e866b1fe74b4896aa393d35d19a5c6c91e7..9980d5cf46ec944c874da45802093d9ed23c1774 100644
--- a/PhysicsAnalysis/TopPhys/QuickAna/test/inc_AnaToolCorrect.cxx
+++ b/PhysicsAnalysis/TopPhys/QuickAna/test/inc_AnaToolCorrect.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-// Copyright Iowa State University 2014.
+//
// Author: Nils Krumnack
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/PhysicsAnalysis/TopPhys/QuickAna/test/inc_AnaToolSelect.cxx b/PhysicsAnalysis/TopPhys/QuickAna/test/inc_AnaToolSelect.cxx
index e879438e3dcd2936021eecc8c67a11bce5886a30..7b7a903a9d5d5480fa120851b8794ec8ab147b79 100644
--- a/PhysicsAnalysis/TopPhys/QuickAna/test/inc_AnaToolSelect.cxx
+++ b/PhysicsAnalysis/TopPhys/QuickAna/test/inc_AnaToolSelect.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-// Copyright Iowa State University 2014.
+//
// Author: Nils Krumnack
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/PhysicsAnalysis/TopPhys/QuickAna/test/inc_AnaToolWeight.cxx b/PhysicsAnalysis/TopPhys/QuickAna/test/inc_AnaToolWeight.cxx
index 698b91be5222d66d4e46ae3d3058041cb2081286..72c46072f38b960203ae6fa77b9de70ed1f9cc9d 100644
--- a/PhysicsAnalysis/TopPhys/QuickAna/test/inc_AnaToolWeight.cxx
+++ b/PhysicsAnalysis/TopPhys/QuickAna/test/inc_AnaToolWeight.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-// Copyright Iowa State University 2014.
+//
// Author: Nils Krumnack
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/PhysicsAnalysis/TopPhys/QuickAna/test/inc_IAnaTool.cxx b/PhysicsAnalysis/TopPhys/QuickAna/test/inc_IAnaTool.cxx
index 9949b8e865bd2e7596c233a9e9e63414dc31fd09..b7ec32b04dfc188cbd7c04ac6f49c164c1f40cf4 100644
--- a/PhysicsAnalysis/TopPhys/QuickAna/test/inc_IAnaTool.cxx
+++ b/PhysicsAnalysis/TopPhys/QuickAna/test/inc_IAnaTool.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-// Copyright Iowa State University 2014.
+//
// Author: Nils Krumnack
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/PhysicsAnalysis/TopPhys/QuickAna/test/inc_IEventObjects.cxx b/PhysicsAnalysis/TopPhys/QuickAna/test/inc_IEventObjects.cxx
index f4603ce09815d7f8f93b6c1bb599c04b6e504c75..0114a9487c9aa64991e30f916fa5e1f0b7a0daa9 100644
--- a/PhysicsAnalysis/TopPhys/QuickAna/test/inc_IEventObjects.cxx
+++ b/PhysicsAnalysis/TopPhys/QuickAna/test/inc_IEventObjects.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-// Copyright Iowa State University 2014.
+//
// Author: Nils Krumnack
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/PhysicsAnalysis/TopPhys/QuickAna/test/inc_IQuickAna.cxx b/PhysicsAnalysis/TopPhys/QuickAna/test/inc_IQuickAna.cxx
index cf1e35ed7bcc0e18db18cd29320fe4e8eb327bf5..70c7124c36516ff1f1ed25cdf14d544611237159 100644
--- a/PhysicsAnalysis/TopPhys/QuickAna/test/inc_IQuickAna.cxx
+++ b/PhysicsAnalysis/TopPhys/QuickAna/test/inc_IQuickAna.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-// Copyright Iowa State University 2014.
+//
// Author: Nils Krumnack
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/PhysicsAnalysis/TopPhys/QuickAna/test/inc_MessageCheck.cxx b/PhysicsAnalysis/TopPhys/QuickAna/test/inc_MessageCheck.cxx
index 92f514d75ca5b19c3cb69169ff79149454ba6fb6..dbff717427b99aa820fae38dbb24919da29a9069 100644
--- a/PhysicsAnalysis/TopPhys/QuickAna/test/inc_MessageCheck.cxx
+++ b/PhysicsAnalysis/TopPhys/QuickAna/test/inc_MessageCheck.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-// Copyright Iowa State University 2014.
+//
// Author: Nils Krumnack
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/PhysicsAnalysis/TopPhys/QuickAna/test/inc_xAODInclude.cxx b/PhysicsAnalysis/TopPhys/QuickAna/test/inc_xAODInclude.cxx
index e9f14ae0e8782661c8b64c093f10bf497a018aca..6941141522ba1245bf20a967fdc4b2b4084cec9a 100644
--- a/PhysicsAnalysis/TopPhys/QuickAna/test/inc_xAODInclude.cxx
+++ b/PhysicsAnalysis/TopPhys/QuickAna/test/inc_xAODInclude.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-// Copyright Iowa State University 2014.
+//
// Author: Nils Krumnack
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/PhysicsAnalysis/TopPhys/QuickAna/test/it_BaseTools_test.cxx b/PhysicsAnalysis/TopPhys/QuickAna/test/it_BaseTools_test.cxx
index 992d1a0dacae6fe7b42b703accb4f1fc723027e8..9315d7481c49ce853097857dccc664e7d6510030 100644
--- a/PhysicsAnalysis/TopPhys/QuickAna/test/it_BaseTools_test.cxx
+++ b/PhysicsAnalysis/TopPhys/QuickAna/test/it_BaseTools_test.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-// Copyright Iowa State University 2016.
+//
// Author: Nils Krumnack
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/PhysicsAnalysis/TopPhys/QuickAna/test/ut_MessageCheck.cxx b/PhysicsAnalysis/TopPhys/QuickAna/test/ut_MessageCheck.cxx
index e0bb81f57cb2143767dceade224732e03b350d16..c8599aca31ac0ece9413f7652e03b9897d34018b 100644
--- a/PhysicsAnalysis/TopPhys/QuickAna/test/ut_MessageCheck.cxx
+++ b/PhysicsAnalysis/TopPhys/QuickAna/test/ut_MessageCheck.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-// Copyright Iowa State University 2015.
+//
// Author: Nils Krumnack
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/PhysicsAnalysis/TopPhys/QuickAna/test/ut_xaod_truth.cxx b/PhysicsAnalysis/TopPhys/QuickAna/test/ut_xaod_truth.cxx
index b9d2359623a8af7c3bfb8a3ad3365a4995ac932c..9e47140bb6f36773c854c1b353a898e4dbab163e 100644
--- a/PhysicsAnalysis/TopPhys/QuickAna/test/ut_xaod_truth.cxx
+++ b/PhysicsAnalysis/TopPhys/QuickAna/test/ut_xaod_truth.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-// Copyright Iowa State University 2015.
+//
// Author: Nils Krumnack
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/PhysicsAnalysis/TopPhys/QuickAna/util/quickana_basic.cxx b/PhysicsAnalysis/TopPhys/QuickAna/util/quickana_basic.cxx
index 1b35c61cbf320137b48ff76e71af8a8e41359a3e..eafac270242bb106702561a8fb1011ef460f724e 100644
--- a/PhysicsAnalysis/TopPhys/QuickAna/util/quickana_basic.cxx
+++ b/PhysicsAnalysis/TopPhys/QuickAna/util/quickana_basic.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-// Copyright Iowa State University 2014.
+//
// Author: Nils Krumnack
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/PhysicsAnalysis/TopPhys/QuickAna/util/quickana_event_data_filler.cxx b/PhysicsAnalysis/TopPhys/QuickAna/util/quickana_event_data_filler.cxx
index f369957382db9e6602a16b4d3d89688c0c18696d..4cb9e5330ea12b7e3e308b55ba85253332754e20 100644
--- a/PhysicsAnalysis/TopPhys/QuickAna/util/quickana_event_data_filler.cxx
+++ b/PhysicsAnalysis/TopPhys/QuickAna/util/quickana_event_data_filler.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-// Copyright Iowa State University 2014.
+//
// Author: Nils Krumnack
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/PhysicsAnalysis/TopPhys/QuickAna/util/quickana_multi_wp.cxx b/PhysicsAnalysis/TopPhys/QuickAna/util/quickana_multi_wp.cxx
index 9c0f372397dfdd877b6848ce2ab63824fb29d1b2..ffcd5e3ae7bbf1a70701f88234886008d72388d9 100644
--- a/PhysicsAnalysis/TopPhys/QuickAna/util/quickana_multi_wp.cxx
+++ b/PhysicsAnalysis/TopPhys/QuickAna/util/quickana_multi_wp.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-// Copyright Iowa State University 2014.
+//
// Author: Nils Krumnack
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/PhysicsAnalysis/TopPhys/QuickAna/util/quickana_output.cxx b/PhysicsAnalysis/TopPhys/QuickAna/util/quickana_output.cxx
index 001b0c359c1a4310d767179bd4c29180cb3a94c0..46732f606f612fc96dc614713a14adb5f0d0cf11 100644
--- a/PhysicsAnalysis/TopPhys/QuickAna/util/quickana_output.cxx
+++ b/PhysicsAnalysis/TopPhys/QuickAna/util/quickana_output.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-// Copyright Iowa State University 2014.
+//
// Author: Nils Krumnack
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/PhysicsAnalysis/TopPhys/QuickAna/util/quickana_systematics.cxx b/PhysicsAnalysis/TopPhys/QuickAna/util/quickana_systematics.cxx
index 568c84ee2d39bb5ceb21afa9b032f9ee3e776589..91af0a144aa7dad4ca0d5f0f2e14a35ca40ecf09 100644
--- a/PhysicsAnalysis/TopPhys/QuickAna/util/quickana_systematics.cxx
+++ b/PhysicsAnalysis/TopPhys/QuickAna/util/quickana_systematics.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-// Copyright Iowa State University 2014.
+//
// Author: Nils Krumnack
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/PhysicsAnalysis/TopPhys/QuickAna/util/quickana_validate.cxx b/PhysicsAnalysis/TopPhys/QuickAna/util/quickana_validate.cxx
index 7d56c6694c54c7f449f7a1151e631b6a39923b1e..998e148b487039cff78177baaa7e6bb839498e8a 100644
--- a/PhysicsAnalysis/TopPhys/QuickAna/util/quickana_validate.cxx
+++ b/PhysicsAnalysis/TopPhys/QuickAna/util/quickana_validate.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-// Copyright Iowa State University 2014.
+//
// Author: Nils Krumnack
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/PhysicsAnalysis/TopPhys/xAOD/TopFakes/macros/AtlasLabels.h b/PhysicsAnalysis/TopPhys/xAOD/TopFakes/macros/AtlasLabels.h
index 8ad0f8dd394fb30285a1db195a3c70e0c7451806..82b33cdbd0327c46dfe335c10e5fc3ed0a430d36 100644
--- a/PhysicsAnalysis/TopPhys/xAOD/TopFakes/macros/AtlasLabels.h
+++ b/PhysicsAnalysis/TopPhys/xAOD/TopFakes/macros/AtlasLabels.h
@@ -7,7 +7,6 @@
//
// @author M.Sutton
//
-// Copyright (C) 2010 Atlas Collaboration
//
// $Id: AtlasLabels.h 726730 2016-02-29 08:41:06Z derue $
diff --git a/PhysicsAnalysis/TopPhys/xAOD/TopFakes/macros/AtlasStyle.h b/PhysicsAnalysis/TopPhys/xAOD/TopFakes/macros/AtlasStyle.h
index de616b5f1a37e70c2cd8af6d0b04f4635674ee44..259bed79a7e100ef82a36182cce5d1a1511409ae 100644
--- a/PhysicsAnalysis/TopPhys/xAOD/TopFakes/macros/AtlasStyle.h
+++ b/PhysicsAnalysis/TopPhys/xAOD/TopFakes/macros/AtlasStyle.h
@@ -10,7 +10,6 @@
//
// @author M.Sutton
//
-// Copyright (C) 2010 Atlas Collaboration
//
// $Id: AtlasStyle.h 726730 2016-02-29 08:41:06Z derue $
diff --git a/PhysicsAnalysis/TopPhys/xAOD/TopFakes/macros/AtlasUtils.h b/PhysicsAnalysis/TopPhys/xAOD/TopFakes/macros/AtlasUtils.h
index d66c59a9937e5033663d54aac7f24eb0ef73dbec..be71ac787fb65e47d4a661b7bd08cd47c896df63 100644
--- a/PhysicsAnalysis/TopPhys/xAOD/TopFakes/macros/AtlasUtils.h
+++ b/PhysicsAnalysis/TopPhys/xAOD/TopFakes/macros/AtlasUtils.h
@@ -8,7 +8,6 @@
//
// @author M.Sutton
//
-// Copyright (C) 2010 Atlas Collaboration
//
// $Id: AtlasUtils.h 726730 2016-02-29 08:41:06Z derue $
diff --git a/Reconstruction/Jet/JetRec/JetRec/LineFormatter.h b/Reconstruction/Jet/JetRec/JetRec/LineFormatter.h
index 0dc9de228e5b333fec8a16d183e5630a4788afbf..9e87ee2ed9ceeb116ee30ce912cf25ab9a09278c 100644
--- a/Reconstruction/Jet/JetRec/JetRec/LineFormatter.h
+++ b/Reconstruction/Jet/JetRec/JetRec/LineFormatter.h
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
// Class to create a string of elements, n perline
// where n is settable.
diff --git a/Reconstruction/Jet/JetRec/JetRec/setAssocObjectsSummary.h b/Reconstruction/Jet/JetRec/JetRec/setAssocObjectsSummary.h
index 60761facf82912b06dd35797a9832afc17e5b0b2..d5c6f6608e967d4c374a6609313b1564b4334a9e 100644
--- a/Reconstruction/Jet/JetRec/JetRec/setAssocObjectsSummary.h
+++ b/Reconstruction/Jet/JetRec/JetRec/setAssocObjectsSummary.h
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
#ifndef JetRecTool_setAssocObjectsSummary_H
#define JetRecTool_setAssocObjectsSummary_H
#include "xAODBase/IParticle.h"
diff --git a/Reconstruction/Jet/JetRec/Root/IConstituentExtractor.cxx b/Reconstruction/Jet/JetRec/Root/IConstituentExtractor.cxx
index 69af79909352e4de28375c5ec823abd6db60ea6a..139dc22020d887cf01c35309939a29cf79e062fd 100644
--- a/Reconstruction/Jet/JetRec/Root/IConstituentExtractor.cxx
+++ b/Reconstruction/Jet/JetRec/Root/IConstituentExtractor.cxx
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
#include "JetRec/IConstituentExtractor.h"
IConstituentExtractor::~IConstituentExtractor(){}
diff --git a/Reconstruction/Jet/JetRec/Root/setAssocObjectsSummary.cxx b/Reconstruction/Jet/JetRec/Root/setAssocObjectsSummary.cxx
index e476f3b9f0e679b675a0b65dab02821e63401259..e5640afaadcb16247dbaf38477de2936c78396a0 100644
--- a/Reconstruction/Jet/JetRec/Root/setAssocObjectsSummary.cxx
+++ b/Reconstruction/Jet/JetRec/Root/setAssocObjectsSummary.cxx
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
#include "JetRec/setAssocObjectsSummary.h"
void
diff --git a/Reconstruction/Jet/JetRecTools/JetRecTools/Puppi.h b/Reconstruction/Jet/JetRecTools/JetRecTools/Puppi.h
index a73c5120c48f404b9e0a4eeb572be350efb2f76b..d4e9e91ba1b4bb232960b8020c9d4c85dfd2cb0a 100644
--- a/Reconstruction/Jet/JetRecTools/JetRecTools/Puppi.h
+++ b/Reconstruction/Jet/JetRecTools/JetRecTools/Puppi.h
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
#include "fastjet/internal/base.hh"
#include "fastjet/PseudoJet.hh"
diff --git a/Reconstruction/Jet/JetRecTools/JetRecTools/PuppiWeightTool.h b/Reconstruction/Jet/JetRecTools/JetRecTools/PuppiWeightTool.h
index 085006ac10f2896e0ebc4bc3ff0503a558dc6852..55a740965bf2e7e541dfcdc084245109147372d7 100644
--- a/Reconstruction/Jet/JetRecTools/JetRecTools/PuppiWeightTool.h
+++ b/Reconstruction/Jet/JetRecTools/JetRecTools/PuppiWeightTool.h
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
#ifndef PUPPIWeightTool_h
#define PUPPIWeightTool_h
diff --git a/Reconstruction/Jet/JetRecTools/Root/ChargedHadronSubtractionTool.cxx b/Reconstruction/Jet/JetRecTools/Root/ChargedHadronSubtractionTool.cxx
index a0d35e39af2eab04d080f97454aa4960f41c328c..ca226604232013e7f3173cc5bd246580e4395393 100644
--- a/Reconstruction/Jet/JetRecTools/Root/ChargedHadronSubtractionTool.cxx
+++ b/Reconstruction/Jet/JetRecTools/Root/ChargedHadronSubtractionTool.cxx
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
#include "JetRecTools/ChargedHadronSubtractionTool.h"
using namespace std;
diff --git a/Reconstruction/Jet/JetRecTools/Root/Puppi.cxx b/Reconstruction/Jet/JetRecTools/Root/Puppi.cxx
index 64785dfc593b8bd12db4b0ac119842ade0a13e22..e4fae962537cc09a69aa74c49e60dabeead6f6db 100644
--- a/Reconstruction/Jet/JetRecTools/Root/Puppi.cxx
+++ b/Reconstruction/Jet/JetRecTools/Root/Puppi.cxx
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
#include "Math/ProbFunc.h"
#include "TMath.h"
#include "fastjet/Selector.hh"
diff --git a/Reconstruction/Jet/JetRecTools/Root/PuppiWeightTool.cxx b/Reconstruction/Jet/JetRecTools/Root/PuppiWeightTool.cxx
index 85d7e687621b47ef65486f0a59d2d587f1666d56..6f3e37700426e7832ab6b371b891f4d62cab2ea9 100644
--- a/Reconstruction/Jet/JetRecTools/Root/PuppiWeightTool.cxx
+++ b/Reconstruction/Jet/JetRecTools/Root/PuppiWeightTool.cxx
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
#include "JetRecTools/PuppiWeightTool.h"
#include "fastjet/PseudoJet.hh"
diff --git a/Reconstruction/Jet/JetReclustering/LICENSE b/Reconstruction/Jet/JetReclustering/LICENSE
index d6a93266f748d606b884f9434ff662fe80b9dc21..31e3dab5aff39ea8fc201dd908d1deacbfd6f9d6 100644
--- a/Reconstruction/Jet/JetReclustering/LICENSE
+++ b/Reconstruction/Jet/JetReclustering/LICENSE
@@ -293,10 +293,6 @@ the "copyright" line and a pointer to where the full notice is found.
{description}
Copyright (C) {year} {fullname}
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/Reconstruction/Jet/JetSimTools/Root/TruthPseudoJetGetter.cxx b/Reconstruction/Jet/JetSimTools/Root/TruthPseudoJetGetter.cxx
index 0fbc6d853db3425cf65a8c2f5a9aeb57b854f7e7..24a1fd7404334c63f8852cc304394c3f1fe87df9 100644
--- a/Reconstruction/Jet/JetSimTools/Root/TruthPseudoJetGetter.cxx
+++ b/Reconstruction/Jet/JetSimTools/Root/TruthPseudoJetGetter.cxx
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
// TruthPseudoJetGetter.cxx
#include "JetSimTools/TruthPseudoJetGetter.h"
diff --git a/Reconstruction/Jet/JetUncertainties/testingMacros/atlasstyle/AtlasLabels.h b/Reconstruction/Jet/JetUncertainties/testingMacros/atlasstyle/AtlasLabels.h
index 9a8f403d26376f6cf78014e5638923d89b180093..8a58fa2113943e3054d60efae25bdc2ad8af8386 100644
--- a/Reconstruction/Jet/JetUncertainties/testingMacros/atlasstyle/AtlasLabels.h
+++ b/Reconstruction/Jet/JetUncertainties/testingMacros/atlasstyle/AtlasLabels.h
@@ -7,7 +7,6 @@
//
// @author M.Sutton
//
-// Copyright (C) 2010 Atlas Collaboration
//
// $Id: AtlasLabels.h, v0.0 Thu 25 Mar 2010 10:34:20 CET $
diff --git a/Reconstruction/Jet/JetUncertainties/testingMacros/atlasstyle/AtlasStyle.h b/Reconstruction/Jet/JetUncertainties/testingMacros/atlasstyle/AtlasStyle.h
index 52eca17ce554c8a93f91dd5404bbf45879d70365..3735bc5c80b107d784589252fa9b15ee9ec550e6 100644
--- a/Reconstruction/Jet/JetUncertainties/testingMacros/atlasstyle/AtlasStyle.h
+++ b/Reconstruction/Jet/JetUncertainties/testingMacros/atlasstyle/AtlasStyle.h
@@ -10,7 +10,6 @@
//
// @author M.Sutton
//
-// Copyright (C) 2010 Atlas Collaboration
//
// $Id: AtlasStyle.h, v0.0 Thu 25 Mar 2010 10:34:20 CET $
diff --git a/Reconstruction/MET/METInterface/METInterface/IMETSignificance.h b/Reconstruction/MET/METInterface/METInterface/IMETSignificance.h
index 8ceeac16037f5254e9f21453e364cf250effad9a..d48121f03cfdf6584c4cfd1c4458fb0b57ce9d7c 100644
--- a/Reconstruction/MET/METInterface/METInterface/IMETSignificance.h
+++ b/Reconstruction/MET/METInterface/METInterface/IMETSignificance.h
@@ -1,4 +1,7 @@
///////////////////////// -*- C++ -*- /////////////////////////////
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
// IMETSignificance.h
// Header file for interface IMETSignificance
//
diff --git a/Reconstruction/MET/METUtilities/METUtilities/METSignificance.h b/Reconstruction/MET/METUtilities/METUtilities/METSignificance.h
index 09db5df745a0500e04baef3afc33a8040877e723..e4f1560d591e8f7f14138d60e0c2f92820d83d95 100644
--- a/Reconstruction/MET/METUtilities/METUtilities/METSignificance.h
+++ b/Reconstruction/MET/METUtilities/METUtilities/METSignificance.h
@@ -1,4 +1,7 @@
///////////////////////// -*- C++ -*- /////////////////////////////
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
// METSignificance.h
// Header file for class METSignificance
// Author: P. Francavilla<francav@cern.ch>
diff --git a/Reconstruction/MET/METUtilities/Root/METSignificance.cxx b/Reconstruction/MET/METUtilities/Root/METSignificance.cxx
index c0befde542e3ff5aa312e33d195cd45c027d9f2a..548d39233c55123367ff1e173ceb19091da199f2 100644
--- a/Reconstruction/MET/METUtilities/Root/METSignificance.cxx
+++ b/Reconstruction/MET/METUtilities/Root/METSignificance.cxx
@@ -1,4 +1,7 @@
///////////////////////// -*- C++ -*- /////////////////////////////
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
// METSignificance.cxx
// Implementation file for class METSignificance
// Author: P.Francavilla<francav@cern.ch>
diff --git a/Reconstruction/RecAlgs/src/AppStopAlg.cxx b/Reconstruction/RecAlgs/src/AppStopAlg.cxx
index 27b7ff2f1c582389bb7fc8a1d456a59d54e918bf..7d7587b9fcc3cea67462b853f8489602ee57343c 100644
--- a/Reconstruction/RecAlgs/src/AppStopAlg.cxx
+++ b/Reconstruction/RecAlgs/src/AppStopAlg.cxx
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
#include "AppStopAlg.h"
#include "GaudiKernel/IEventProcessor.h"
#include "csignal"
diff --git a/Reconstruction/TrackCaloClusterRec/TrackCaloClusterRecAlgs/TrackCaloClusterRecAlgs/TrackCaloClusterRecAlg.h b/Reconstruction/TrackCaloClusterRec/TrackCaloClusterRecAlgs/TrackCaloClusterRecAlgs/TrackCaloClusterRecAlg.h
index a641a28a0d257a0a844433fc41a894addaf335cc..b1a19fc3145abca0e90e79f26c1d54ceab6d1717 100644
--- a/Reconstruction/TrackCaloClusterRec/TrackCaloClusterRecAlgs/TrackCaloClusterRecAlgs/TrackCaloClusterRecAlg.h
+++ b/Reconstruction/TrackCaloClusterRec/TrackCaloClusterRecAlgs/TrackCaloClusterRecAlgs/TrackCaloClusterRecAlg.h
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
#ifndef TRACKCALOCLUSTERREC_TRACKCALOCLUSTERRECALGS_TRACKCALOCLUSTERRECALG_H
#define TRACKCALOCLUSTERREC_TRACKCALOCLUSTERRECALGS_TRACKCALOCLUSTERRECALG_H
diff --git a/Reconstruction/TrackCaloClusterRec/TrackCaloClusterRecAlgs/src/TrackCaloClusterRecAlg.cxx b/Reconstruction/TrackCaloClusterRec/TrackCaloClusterRecAlgs/src/TrackCaloClusterRecAlg.cxx
index e84e4c68d88f683cd702b3983fec95d10a6515af..10b6be51ea13adb6fdaf8c0caf508a366c67ec0c 100644
--- a/Reconstruction/TrackCaloClusterRec/TrackCaloClusterRecAlgs/src/TrackCaloClusterRecAlg.cxx
+++ b/Reconstruction/TrackCaloClusterRec/TrackCaloClusterRecAlgs/src/TrackCaloClusterRecAlg.cxx
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
// TrackCaloClusterRecAlgs includes
#include "TrackCaloClusterRecAlgs/TrackCaloClusterRecAlg.h"
diff --git a/Reconstruction/TrackCaloClusterRec/TrackCaloClusterRecInterfaces/TrackCaloClusterRecInterfaces/IClusterFilterTool.h b/Reconstruction/TrackCaloClusterRec/TrackCaloClusterRecInterfaces/TrackCaloClusterRecInterfaces/IClusterFilterTool.h
index 58c009deb15cda26d2d53550cdc9bf3851664927..9b7af3924e5774d4439a021e438ff627eae77ff1 100644
--- a/Reconstruction/TrackCaloClusterRec/TrackCaloClusterRecInterfaces/TrackCaloClusterRecInterfaces/IClusterFilterTool.h
+++ b/Reconstruction/TrackCaloClusterRec/TrackCaloClusterRecInterfaces/TrackCaloClusterRecInterfaces/IClusterFilterTool.h
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
///////////////////////////////////////////////////////////////////
// IClusterFilterTool.h, (c) ATLAS Detector software
///////////////////////////////////////////////////////////////////
diff --git a/Reconstruction/TrackCaloClusterRec/TrackCaloClusterRecInterfaces/TrackCaloClusterRecInterfaces/IParticleExtrapolationTool.h b/Reconstruction/TrackCaloClusterRec/TrackCaloClusterRecInterfaces/TrackCaloClusterRecInterfaces/IParticleExtrapolationTool.h
index b06791128835c9b83fa3d01c6c772f85d7764a92..ba363f8e26d93dff300a6585e6eda7e5bda62615 100644
--- a/Reconstruction/TrackCaloClusterRec/TrackCaloClusterRecInterfaces/TrackCaloClusterRecInterfaces/IParticleExtrapolationTool.h
+++ b/Reconstruction/TrackCaloClusterRec/TrackCaloClusterRecInterfaces/TrackCaloClusterRecInterfaces/IParticleExtrapolationTool.h
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
///////////////////////////////////////////////////////////////////
// IParticleExtrapolationTool.h, (c) ATLAS Detector software
///////////////////////////////////////////////////////////////////
diff --git a/Reconstruction/TrackCaloClusterRec/TrackCaloClusterRecTools/TrackCaloClusterRecTools/ClusterFilterTool.h b/Reconstruction/TrackCaloClusterRec/TrackCaloClusterRecTools/TrackCaloClusterRecTools/ClusterFilterTool.h
index 80dd3f7bb31ca045d837897430316c15933cc8b6..ca93d4c58fc076e20a786421e35dcfeace193975 100644
--- a/Reconstruction/TrackCaloClusterRec/TrackCaloClusterRecTools/TrackCaloClusterRecTools/ClusterFilterTool.h
+++ b/Reconstruction/TrackCaloClusterRec/TrackCaloClusterRecTools/TrackCaloClusterRecTools/ClusterFilterTool.h
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
/***************************************************************************
ClusterFilterTool.h - Description
-------------------
diff --git a/Reconstruction/TrackCaloClusterRec/TrackCaloClusterRecTools/TrackCaloClusterRecTools/ParticleToCaloExtrapolationTool.h b/Reconstruction/TrackCaloClusterRec/TrackCaloClusterRecTools/TrackCaloClusterRecTools/ParticleToCaloExtrapolationTool.h
index e36b3d4020da6a0267140bbd0ada601043a1d82a..a10f0d43e2868000622d07f79ad52dfdbcf94488 100644
--- a/Reconstruction/TrackCaloClusterRec/TrackCaloClusterRecTools/TrackCaloClusterRecTools/ParticleToCaloExtrapolationTool.h
+++ b/Reconstruction/TrackCaloClusterRec/TrackCaloClusterRecTools/TrackCaloClusterRecTools/ParticleToCaloExtrapolationTool.h
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
/***************************************************************************
ParticleToCaloExtrapolationTool.h - Description
-------------------
diff --git a/Reconstruction/TrackCaloClusterRec/TrackCaloClusterRecTools/TrackCaloClusterRecTools/TrackCaloClusterCreatorTool.h b/Reconstruction/TrackCaloClusterRec/TrackCaloClusterRecTools/TrackCaloClusterRecTools/TrackCaloClusterCreatorTool.h
index 474f1119e309bad3b470dcdd089de8bce2f519e0..70b994bcf160a422d8006fdd6c66be9e71bd7746 100644
--- a/Reconstruction/TrackCaloClusterRec/TrackCaloClusterRecTools/TrackCaloClusterRecTools/TrackCaloClusterCreatorTool.h
+++ b/Reconstruction/TrackCaloClusterRec/TrackCaloClusterRecTools/TrackCaloClusterRecTools/TrackCaloClusterCreatorTool.h
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
/***************************************************************************
TrackCaloClusterCreatorTool.h - Description
-------------------
diff --git a/Reconstruction/TrackCaloClusterRec/TrackCaloClusterRecTools/TrackCaloClusterRecTools/TrackCaloClusterWeightsTool.h b/Reconstruction/TrackCaloClusterRec/TrackCaloClusterRecTools/TrackCaloClusterRecTools/TrackCaloClusterWeightsTool.h
index 0f64364ce43dd21f9279a095ed98749dd7f592e6..e3c137971e24edde97d08d067b668e27f740c42c 100644
--- a/Reconstruction/TrackCaloClusterRec/TrackCaloClusterRecTools/TrackCaloClusterRecTools/TrackCaloClusterWeightsTool.h
+++ b/Reconstruction/TrackCaloClusterRec/TrackCaloClusterRecTools/TrackCaloClusterRecTools/TrackCaloClusterWeightsTool.h
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
/***************************************************************************
TrackCaloClusterWeightsTool.h - Description
-------------------
diff --git a/Reconstruction/TrackCaloClusterRec/TrackCaloClusterRecTools/src/ClusterFilterTool.cxx b/Reconstruction/TrackCaloClusterRec/TrackCaloClusterRecTools/src/ClusterFilterTool.cxx
index ad63165acdfcc8ef816dbfdde82989ac989ed72b..276449c2ada0f68c66d03a4023342d2b1fca7e23 100644
--- a/Reconstruction/TrackCaloClusterRec/TrackCaloClusterRecTools/src/ClusterFilterTool.cxx
+++ b/Reconstruction/TrackCaloClusterRec/TrackCaloClusterRecTools/src/ClusterFilterTool.cxx
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
#include "TrackCaloClusterRecTools/ClusterFilterTool.h"
#include "TrackCaloClusterRecTools/IParticleToCaloExtensionMap.h"
diff --git a/Reconstruction/TrackCaloClusterRec/TrackCaloClusterRecTools/src/IParticleToCaloExtensionMap.cxx b/Reconstruction/TrackCaloClusterRec/TrackCaloClusterRecTools/src/IParticleToCaloExtensionMap.cxx
index a9d06729c9d374cbccc61a7b90738222d5475630..ef0873ddc7563b3fc8b07b79d5e8b409964d3bd9 100644
--- a/Reconstruction/TrackCaloClusterRec/TrackCaloClusterRecTools/src/IParticleToCaloExtensionMap.cxx
+++ b/Reconstruction/TrackCaloClusterRec/TrackCaloClusterRecTools/src/IParticleToCaloExtensionMap.cxx
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
#include "TrackCaloClusterRecTools/IParticleToCaloExtensionMap.h"
IParticleToCaloExtensionMap::IParticleToCaloExtensionMap() {
diff --git a/Reconstruction/TrackCaloClusterRec/TrackCaloClusterRecTools/src/ParticleToCaloExtrapolationTool.cxx b/Reconstruction/TrackCaloClusterRec/TrackCaloClusterRecTools/src/ParticleToCaloExtrapolationTool.cxx
index b62d3b9205074e2e0bbdd3461acd03cb5a481c26..b64a0089bf6768987adb01051a2020dabd09c76a 100644
--- a/Reconstruction/TrackCaloClusterRec/TrackCaloClusterRecTools/src/ParticleToCaloExtrapolationTool.cxx
+++ b/Reconstruction/TrackCaloClusterRec/TrackCaloClusterRecTools/src/ParticleToCaloExtrapolationTool.cxx
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
#include "TrackCaloClusterRecTools/ParticleToCaloExtrapolationTool.h"
// forward declares
#include "TrkSurfaces/PerigeeSurface.h"
diff --git a/Reconstruction/TrackCaloClusterRec/TrackCaloClusterRecTools/src/TrackCaloClusterCreatorTool.cxx b/Reconstruction/TrackCaloClusterRec/TrackCaloClusterRecTools/src/TrackCaloClusterCreatorTool.cxx
index 6a91aeea830e5655d066af9f9e8f1d8f6e4a48ba..1bd6f56061c24ef8fe79e7c723c8dda5b6873924 100644
--- a/Reconstruction/TrackCaloClusterRec/TrackCaloClusterRecTools/src/TrackCaloClusterCreatorTool.cxx
+++ b/Reconstruction/TrackCaloClusterRec/TrackCaloClusterRecTools/src/TrackCaloClusterCreatorTool.cxx
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
#include "TrackCaloClusterRecTools/TrackCaloClusterCreatorTool.h"
#include "TrackCaloClusterRecTools/IParticleToCaloExtensionMap.h"
#include "TrkCaloExtension/CaloExtension.h"
diff --git a/Reconstruction/TrackCaloClusterRec/TrackCaloClusterRecTools/src/TrackCaloClusterWeightsTool.cxx b/Reconstruction/TrackCaloClusterRec/TrackCaloClusterRecTools/src/TrackCaloClusterWeightsTool.cxx
index 488d9ff3ae8e3793a1aecc06745a972c94db1353..cc266823f703ebd145dc9fdf2231d37fc78d48a6 100644
--- a/Reconstruction/TrackCaloClusterRec/TrackCaloClusterRecTools/src/TrackCaloClusterWeightsTool.cxx
+++ b/Reconstruction/TrackCaloClusterRec/TrackCaloClusterRecTools/src/TrackCaloClusterWeightsTool.cxx
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
#include "TrackCaloClusterRecTools/TrackCaloClusterWeightsTool.h"
diff --git a/Reconstruction/TrackCaloClusterRec/TrackCaloClusterRecValidation/TrackCaloClusterRecValidation/CalibrationNtupleMakerTool.h b/Reconstruction/TrackCaloClusterRec/TrackCaloClusterRecValidation/TrackCaloClusterRecValidation/CalibrationNtupleMakerTool.h
index 45f6eb557b601d5285397385f641b7b88d733fbb..60418e47ef7903393e537ee3424e751050847988 100644
--- a/Reconstruction/TrackCaloClusterRec/TrackCaloClusterRecValidation/TrackCaloClusterRecValidation/CalibrationNtupleMakerTool.h
+++ b/Reconstruction/TrackCaloClusterRec/TrackCaloClusterRecValidation/TrackCaloClusterRecValidation/CalibrationNtupleMakerTool.h
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
#ifndef TRACKCALOCLUSTERREC_TRACKCALOCLUSTERRECVALIDATION_CALIBRATIONNTUPLEMAKERTOOL_H
#define TRACKCALOCLUSTERREC_TRACKCALOCLUSTERRECVALIDATION_CALIBRATIONNTUPLEMAKERTOOL_H
diff --git a/Reconstruction/TrackCaloClusterRec/TrackCaloClusterRecValidation/TrackCaloClusterRecValidation/TrackCaloClusterRecValidationTool.h b/Reconstruction/TrackCaloClusterRec/TrackCaloClusterRecValidation/TrackCaloClusterRecValidation/TrackCaloClusterRecValidationTool.h
index 236a3ddfd73c702875c6dc216a1de9cd480f42b9..f74b647bebd45974ad6726cdbcfa93dbd6de4721 100644
--- a/Reconstruction/TrackCaloClusterRec/TrackCaloClusterRecValidation/TrackCaloClusterRecValidation/TrackCaloClusterRecValidationTool.h
+++ b/Reconstruction/TrackCaloClusterRec/TrackCaloClusterRecValidation/TrackCaloClusterRecValidation/TrackCaloClusterRecValidationTool.h
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
#ifndef TRACKCALOCLUSTERREC_TRACKCALOCLUSTERRECVALIDATION_TRACKCALOCLUSTERRECVALIDATIONTOOL_H
#define TRACKCALOCLUSTERREC_TRACKCALOCLUSTERRECVALIDATION_TRACKCALOCLUSTERRECVALIDATIONTOOL_H
/**
diff --git a/Reconstruction/TrackCaloClusterRec/TrackCaloClusterRecValidation/src/TrackCaloClusterRecValidationTool.cxx b/Reconstruction/TrackCaloClusterRec/TrackCaloClusterRecValidation/src/TrackCaloClusterRecValidationTool.cxx
index cfc2931610e4d93f220d6ffe55ecdbd629c93ff2..482ead05926f67f819865811143a7457fda4cba9 100644
--- a/Reconstruction/TrackCaloClusterRec/TrackCaloClusterRecValidation/src/TrackCaloClusterRecValidationTool.cxx
+++ b/Reconstruction/TrackCaloClusterRec/TrackCaloClusterRecValidation/src/TrackCaloClusterRecValidationTool.cxx
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
#include "TrackCaloClusterRecValidation/TrackCaloClusterRecValidationTool.h"
//
#include "xAODTruth/TruthParticle.h"
diff --git a/Reconstruction/eflowRec/doc/packagedoc.h b/Reconstruction/eflowRec/doc/packagedoc.h
index f37c737e974a1cad8c651bf0936daf8e1abe6153..e7096ada2c8299ec2a91c61c07f40e04712a0760 100644
--- a/Reconstruction/eflowRec/doc/packagedoc.h
+++ b/Reconstruction/eflowRec/doc/packagedoc.h
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
/**
@page eflowRec_page eflowRec package
diff --git a/Reconstruction/eflowRec/eflowRec/PFAlgorithm.h b/Reconstruction/eflowRec/eflowRec/PFAlgorithm.h
index 2ad11e53671a293eec61dd862c6cab394309c8a1..44619047eb9a4235f857b952c2a756e90b4ad4d0 100644
--- a/Reconstruction/eflowRec/eflowRec/PFAlgorithm.h
+++ b/Reconstruction/eflowRec/eflowRec/PFAlgorithm.h
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
#ifndef PFALGORITHM_H
#define PFALGORITHM_H
diff --git a/Reconstruction/eflowRec/eflowRec/PFClusterSelectorTool.h b/Reconstruction/eflowRec/eflowRec/PFClusterSelectorTool.h
index 6be8c71946af743c7f7685d13820d2987edf27ad..edb2a8fa9f57f63c0490a6bc4112c47bf1d2540f 100644
--- a/Reconstruction/eflowRec/eflowRec/PFClusterSelectorTool.h
+++ b/Reconstruction/eflowRec/eflowRec/PFClusterSelectorTool.h
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
#ifndef PFCLUSTERSELECTORTOOL_H
#define PFCLUSTERSELECTORTOOL_H
diff --git a/Reconstruction/eflowRec/eflowRec/PFLeptonSelector.h b/Reconstruction/eflowRec/eflowRec/PFLeptonSelector.h
index 2955b75b179f1ba741aa171f5bd529e0c702cfac..381e9b6ff5120648eac6b5d1e03e1877ce0346c9 100644
--- a/Reconstruction/eflowRec/eflowRec/PFLeptonSelector.h
+++ b/Reconstruction/eflowRec/eflowRec/PFLeptonSelector.h
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
#ifndef PFLEPTONSELECTOR_H
#define PFLEPTONSELECTOR_H
diff --git a/Reconstruction/eflowRec/eflowRec/PFOChargedCreatorAlgorithm.h b/Reconstruction/eflowRec/eflowRec/PFOChargedCreatorAlgorithm.h
index 04b8c515966216b4f83e8a0d9ba8aba2df222ff9..a97a52392c333f41b65407dfd0c1b598da8c5286 100644
--- a/Reconstruction/eflowRec/eflowRec/PFOChargedCreatorAlgorithm.h
+++ b/Reconstruction/eflowRec/eflowRec/PFOChargedCreatorAlgorithm.h
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
#ifndef PFOCHARGEDCREATORALGORITHM_H
#define PFOCHARGEDCREATORALGORITHM_H
diff --git a/Reconstruction/eflowRec/eflowRec/PFONeutralCreatorAlgorithm.h b/Reconstruction/eflowRec/eflowRec/PFONeutralCreatorAlgorithm.h
index c242cafb43e00ed6f1ba72b16e7822d358fcb369..d5787f3318a7cde9dc2c6f9bcdc0ebaeced16e5b 100644
--- a/Reconstruction/eflowRec/eflowRec/PFONeutralCreatorAlgorithm.h
+++ b/Reconstruction/eflowRec/eflowRec/PFONeutralCreatorAlgorithm.h
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
#ifndef PFONEUTRALCREATORALGORITHM_H
#define PFONEUTRALCREATORALGORITHM_H
diff --git a/Reconstruction/eflowRec/eflowRec/PFTrackSelector.h b/Reconstruction/eflowRec/eflowRec/PFTrackSelector.h
index bb16387a823ef4e034e700bb36286f83ca3c8912..c2fb483290c3b54dc8413ecacd00288fbd1c5134 100644
--- a/Reconstruction/eflowRec/eflowRec/PFTrackSelector.h
+++ b/Reconstruction/eflowRec/eflowRec/PFTrackSelector.h
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
#ifndef PFTRACKSELECTOR_H
#define PFTRACKSELECTOR_H
diff --git a/Reconstruction/eflowRec/eflowRec/eflowTrackCaloDummyExtensionTool.h b/Reconstruction/eflowRec/eflowRec/eflowTrackCaloDummyExtensionTool.h
index 1235537a1f477c6ca7658b5657642419266fa669..bcec656c2da44f9c7946f410451094cb4bd16882 100644
--- a/Reconstruction/eflowRec/eflowRec/eflowTrackCaloDummyExtensionTool.h
+++ b/Reconstruction/eflowRec/eflowRec/eflowTrackCaloDummyExtensionTool.h
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
#ifndef EFLOWTRACKCALODUMMYEXTENSIONTOOL_H_
#define EFLOWTRACKCALODUMMYEXTENSIONTOOL_H_
diff --git a/Reconstruction/eflowRec/src/PFAlgorithm.cxx b/Reconstruction/eflowRec/src/PFAlgorithm.cxx
index 5a7a1c013fb8755a6c6e20998abb5c25d3d2c0e2..222e2f82eec3e39db02b049510ed038935d5a13e 100644
--- a/Reconstruction/eflowRec/src/PFAlgorithm.cxx
+++ b/Reconstruction/eflowRec/src/PFAlgorithm.cxx
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
#include "eflowRec/PFAlgorithm.h"
#include "xAODCaloEvent/CaloClusterAuxContainer.h"
diff --git a/Reconstruction/eflowRec/src/PFClusterSelectorTool.cxx b/Reconstruction/eflowRec/src/PFClusterSelectorTool.cxx
index 208eec61221e08e7f7bda041801e7c74c633c346..43ca5956000a66078c41e9d7db9f2d3ef5fbad88 100644
--- a/Reconstruction/eflowRec/src/PFClusterSelectorTool.cxx
+++ b/Reconstruction/eflowRec/src/PFClusterSelectorTool.cxx
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
#include "CaloDetDescr/CaloDetDescrManager.h"
#include "CaloIdentifier/CaloCell_ID.h"
#include "eflowRec/eflowRecCluster.h"
diff --git a/Reconstruction/eflowRec/src/PFLeptonSelector.cxx b/Reconstruction/eflowRec/src/PFLeptonSelector.cxx
index be8135287e4386b856e0050844ee22408df14053..c76334c2c880513dde64c1efcbd2011faa2d88ae 100644
--- a/Reconstruction/eflowRec/src/PFLeptonSelector.cxx
+++ b/Reconstruction/eflowRec/src/PFLeptonSelector.cxx
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
#include "eflowRec/PFLeptonSelector.h"
PFLeptonSelector::PFLeptonSelector(const std::string& name, ISvcLocator* pSvcLocator):
diff --git a/Reconstruction/eflowRec/src/PFTrackSelector.cxx b/Reconstruction/eflowRec/src/PFTrackSelector.cxx
index de1b5595b35f3fba5ffabc83a60a684a93bed9f4..ac7999c93e9c26e9717d339aceb14b801d272a0a 100644
--- a/Reconstruction/eflowRec/src/PFTrackSelector.cxx
+++ b/Reconstruction/eflowRec/src/PFTrackSelector.cxx
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
#include "eflowRec/eflowTrackExtrapolatorBaseAlgTool.h"
#include "eflowRec/PFTrackSelector.h"
#include "xAODEgamma/ElectronxAODHelpers.h"
diff --git a/Reconstruction/eflowRec/src/eflowTrackCaloDummyExtensionTool.cxx b/Reconstruction/eflowRec/src/eflowTrackCaloDummyExtensionTool.cxx
index 244bebd5cfbb798e54f2b94c6d8965db48ad3251..b3ac5ece77eab2e326f8c0b75f576d8c5d4c18d3 100644
--- a/Reconstruction/eflowRec/src/eflowTrackCaloDummyExtensionTool.cxx
+++ b/Reconstruction/eflowRec/src/eflowTrackCaloDummyExtensionTool.cxx
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
/********************************************************************
NAME: eflowTrackCaloDummyExtensionTool.cxx
diff --git a/Reconstruction/egamma/egammaValidation/src/EgammaMonitoring.cxx b/Reconstruction/egamma/egammaValidation/src/EgammaMonitoring.cxx
index b9f3a2f0010b83856c464e30891086a46b5e14d8..455db0fd9bee60f20bea78d3b3681f907654e5ae 100644
--- a/Reconstruction/egamma/egammaValidation/src/EgammaMonitoring.cxx
+++ b/Reconstruction/egamma/egammaValidation/src/EgammaMonitoring.cxx
@@ -1,5 +1,7 @@
/*
- * Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration.
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+/*
*/
#include "EgammaMonitoring.h"
diff --git a/Reconstruction/egamma/egammaValidation/src/EgammaMonitoring.h b/Reconstruction/egamma/egammaValidation/src/EgammaMonitoring.h
index f1aa95a246a1e33fd1e4f2699e6084d9dc021c57..6cf1c1cf6c67b4ad4ca387e471af415f8706c417 100644
--- a/Reconstruction/egamma/egammaValidation/src/EgammaMonitoring.h
+++ b/Reconstruction/egamma/egammaValidation/src/EgammaMonitoring.h
@@ -1,5 +1,7 @@
/*
- * Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration.
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+/*
*/
#ifndef egammaValidation_EgammaMonitoring_H
diff --git a/Reconstruction/egamma/egammaValidation/src/RecoElectronHistograms.h b/Reconstruction/egamma/egammaValidation/src/RecoElectronHistograms.h
index 293a62c2a3b5d74cd477aec43d9cfefda1baf79e..62a38a52e278c33e065515427e47bd701e064460 100644
--- a/Reconstruction/egamma/egammaValidation/src/RecoElectronHistograms.h
+++ b/Reconstruction/egamma/egammaValidation/src/RecoElectronHistograms.h
@@ -1,5 +1,7 @@
/*
- Copyright- (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+/*
*/
#ifndef EGAMMAVALIDATION_RECOELECTRONHISTOGRAMS_H
diff --git a/Reconstruction/egamma/egammaValidation/src/TruthElectronHistograms.h b/Reconstruction/egamma/egammaValidation/src/TruthElectronHistograms.h
index 1869f8dbdbc1c7e661a65fdf1fc4a982e04658fc..dd0c29c71f44c34ef41fdca9661ed209af19534c 100644
--- a/Reconstruction/egamma/egammaValidation/src/TruthElectronHistograms.h
+++ b/Reconstruction/egamma/egammaValidation/src/TruthElectronHistograms.h
@@ -1,5 +1,7 @@
/*
- Copyright- (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+/*
*/
#ifndef EGAMMAVALIDATION_TRUTHELECTRONHISTOGRAMS_H
diff --git a/Simulation/G4Atlas/G4AtlasTests/src/G4AtlasTests_entries.cxx b/Simulation/G4Atlas/G4AtlasTests/src/G4AtlasTests_entries.cxx
index 5ba9c884ebaae43785d6a0f0dd4a5ee5d5742679..7e56677743a98cb1129073fbb50a2bcec9baff94 100644
--- a/Simulation/G4Atlas/G4AtlasTests/src/G4AtlasTests_entries.cxx
+++ b/Simulation/G4Atlas/G4AtlasTests/src/G4AtlasTests_entries.cxx
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
#include "G4AtlasTests/G4TestAlg.h"
#include "SiHitsTestTool.h"
#include "TrtHitsTestTool.h"
diff --git a/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimParametrization/tools/AtlasStyle.h b/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimParametrization/tools/AtlasStyle.h
index 52eca17ce554c8a93f91dd5404bbf45879d70365..3735bc5c80b107d784589252fa9b15ee9ec550e6 100644
--- a/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimParametrization/tools/AtlasStyle.h
+++ b/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimParametrization/tools/AtlasStyle.h
@@ -10,7 +10,6 @@
//
// @author M.Sutton
//
-// Copyright (C) 2010 Atlas Collaboration
//
// $Id: AtlasStyle.h, v0.0 Thu 25 Mar 2010 10:34:20 CET $
diff --git a/TestBeam/TBDetDescrCnv/src/TBDetDescrCnv_entries.cxx b/TestBeam/TBDetDescrCnv/src/TBDetDescrCnv_entries.cxx
index 4c117cc89157593c8eda03bf954194ea0aafd3a0..a104ffd43473eb37e54205e0f8ce536185817f77 100644
--- a/TestBeam/TBDetDescrCnv/src/TBDetDescrCnv_entries.cxx
+++ b/TestBeam/TBDetDescrCnv/src/TBDetDescrCnv_entries.cxx
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
#include "TBDetDescrCnv/TBDetDescrCnv.h"
DECLARE_CONVERTER( TBDetDescrCnv )
diff --git a/TileCalorimeter/TileEvent/TileEvent/TileDQstatus.h b/TileCalorimeter/TileEvent/TileEvent/TileDQstatus.h
index bb086fbaa24ea600f4310ff3b793faae82f9a203..8862f597cb0e3a4bbd533a16521f21bf5e6aefc7 100644
--- a/TileCalorimeter/TileEvent/TileEvent/TileDQstatus.h
+++ b/TileCalorimeter/TileEvent/TileEvent/TileDQstatus.h
@@ -1,6 +1,8 @@
// This file's extension implies that it's C, but it's really -*- C++ -*-.
/*
- * Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration.
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+/*
*/
/**
* @file TileEvent/TileDQstatus.h
diff --git a/TileCalorimeter/TileEvent/TileEvent/TileMutableBeamElemContainer.h b/TileCalorimeter/TileEvent/TileEvent/TileMutableBeamElemContainer.h
index 79818c4992fed159615e046593cfa667932cf77f..1374fdd9d43f459303bd5411bacf32c2774d6ebb 100644
--- a/TileCalorimeter/TileEvent/TileEvent/TileMutableBeamElemContainer.h
+++ b/TileCalorimeter/TileEvent/TileEvent/TileMutableBeamElemContainer.h
@@ -1,6 +1,8 @@
// This file's extension implies that it's C, but it's really -*- C++ -*-.
/*
- * Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration.
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+/*
*/
/**
* @file TileEvent/TileMutableBeamElemContainer.h
diff --git a/TileCalorimeter/TileEvent/TileEvent/TileMutableDataContainer.h b/TileCalorimeter/TileEvent/TileEvent/TileMutableDataContainer.h
index 2e2adae3cde3347f674d80fdc72cb06c3b52da08..dbef1cd5c46a1c5447d98fb00d842aa8949f70ca 100644
--- a/TileCalorimeter/TileEvent/TileEvent/TileMutableDataContainer.h
+++ b/TileCalorimeter/TileEvent/TileEvent/TileMutableDataContainer.h
@@ -1,6 +1,8 @@
// This file's extension implies that it's C, but it's really -*- C++ -*-.
/*
- * Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration.
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+/*
*/
/**
* @file TileEvent/TileMutableDataContainer.h
diff --git a/TileCalorimeter/TileEvent/TileEvent/TileMutableDataContainer.icc b/TileCalorimeter/TileEvent/TileEvent/TileMutableDataContainer.icc
index 991b2baa97ba678aa0ae7ce38d4bfcb2a2e9dd8a..a62359aac07526fe4b3dfb9e8c3b1783644057c0 100644
--- a/TileCalorimeter/TileEvent/TileEvent/TileMutableDataContainer.icc
+++ b/TileCalorimeter/TileEvent/TileEvent/TileMutableDataContainer.icc
@@ -1,5 +1,7 @@
/*
- * Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration.
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+/*
*/
/**
* @file TileEvent/TileMutableDataContainer.icc
diff --git a/TileCalorimeter/TileEvent/TileEvent/TileMutableDigitsContainer.h b/TileCalorimeter/TileEvent/TileEvent/TileMutableDigitsContainer.h
index b92aef5c89bf5baa04e51e47fd3ae7eb70b3bc52..a2b2d8b60d2db501e69e59f81ea077f8a18ae54e 100644
--- a/TileCalorimeter/TileEvent/TileEvent/TileMutableDigitsContainer.h
+++ b/TileCalorimeter/TileEvent/TileEvent/TileMutableDigitsContainer.h
@@ -1,6 +1,8 @@
// This file's extension implies that it's C, but it's really -*- C++ -*-.
/*
- * Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration.
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+/*
*/
/**
* @file TileEvent/TileMutableDigitsContainer.h
diff --git a/TileCalorimeter/TileEvent/TileEvent/TileMutableHitContainer.h b/TileCalorimeter/TileEvent/TileEvent/TileMutableHitContainer.h
index ce0e8c2fc1db5a9dd8a43d8480c5211618839002..49088f5d25f6079d0bf23071bd3e1d341328cbf6 100644
--- a/TileCalorimeter/TileEvent/TileEvent/TileMutableHitContainer.h
+++ b/TileCalorimeter/TileEvent/TileEvent/TileMutableHitContainer.h
@@ -1,6 +1,8 @@
// This file's extension implies that it's C, but it's really -*- C++ -*-.
/*
- * Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration.
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+/*
*/
/**
* @file TileEvent/TileMutableHitContainer.h
diff --git a/TileCalorimeter/TileEvent/TileEvent/TileMutableRawChannelContainer.h b/TileCalorimeter/TileEvent/TileEvent/TileMutableRawChannelContainer.h
index 20b914bcde8b6cfd991ca2c8435e122731e3bf0b..b31453d12aa2b01d7182ed8069b9cd7aa7591488 100644
--- a/TileCalorimeter/TileEvent/TileEvent/TileMutableRawChannelContainer.h
+++ b/TileCalorimeter/TileEvent/TileEvent/TileMutableRawChannelContainer.h
@@ -1,6 +1,8 @@
// This file's extension implies that it's C, but it's really -*- C++ -*-.
/*
- * Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration.
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+/*
*/
/**
* @file TileEvent/TileMutableRawChannelContainer.h
diff --git a/TileCalorimeter/TileEvent/TileEvent/TileRawDataNonConstContainer.h b/TileCalorimeter/TileEvent/TileEvent/TileRawDataNonConstContainer.h
index 29568f9103c76b788f526ec12e575a9891563ebe..d7be3117ac2983cccc471cd497360f408ecea649 100644
--- a/TileCalorimeter/TileEvent/TileEvent/TileRawDataNonConstContainer.h
+++ b/TileCalorimeter/TileEvent/TileEvent/TileRawDataNonConstContainer.h
@@ -1,6 +1,8 @@
// This file's extension implies that it's C, but it's really -*- C++ -*-.
/*
- * Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration.
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+/*
*/
// $Id$
/**
diff --git a/TileCalorimeter/TileEvent/src/TileBeamElemCollection.cxx b/TileCalorimeter/TileEvent/src/TileBeamElemCollection.cxx
index a8a360dc5661504e2ca17228b9d08370e3a8024e..ebee3b929fe8a8cdd50d38ff191e8db0015ccfaf 100644
--- a/TileCalorimeter/TileEvent/src/TileBeamElemCollection.cxx
+++ b/TileCalorimeter/TileEvent/src/TileBeamElemCollection.cxx
@@ -1,5 +1,7 @@
/*
- * Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration.
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+/*
*/
/**
* @file TileEvent/src/TileBeamElemCollection.cxx
diff --git a/TileCalorimeter/TileEvent/src/TileDQstatus.cxx b/TileCalorimeter/TileEvent/src/TileDQstatus.cxx
index 012e084a3a9fe360d5e59bbd43b024f930a29363..68b32f1d547c013cd1f76ed7ab1c8add328eb37b 100644
--- a/TileCalorimeter/TileEvent/src/TileDQstatus.cxx
+++ b/TileCalorimeter/TileEvent/src/TileDQstatus.cxx
@@ -1,5 +1,7 @@
/*
- * Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration.
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+/*
*/
/**
* @file TileEvent/src/TileDQstatus.cxx
diff --git a/TileCalorimeter/TileEvent/src/TileDigitsCollection.cxx b/TileCalorimeter/TileEvent/src/TileDigitsCollection.cxx
index 10b0f531cc3fbdaa550964b3d57b73b18f8c0b96..5a767c20c451f338fd3921667fc2b31e979b9341 100644
--- a/TileCalorimeter/TileEvent/src/TileDigitsCollection.cxx
+++ b/TileCalorimeter/TileEvent/src/TileDigitsCollection.cxx
@@ -1,5 +1,7 @@
/*
- * Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration.
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+/*
*/
/**
* @file TileEvent/src/TileDigitsCollection.cxx
diff --git a/TileCalorimeter/TileEvent/src/TileHitCollection.cxx b/TileCalorimeter/TileEvent/src/TileHitCollection.cxx
index 230d29c04877f9e9be30e23a1ae901230988de70..9029de60ce10f6ec8d7e7c4a709966648fb3653e 100644
--- a/TileCalorimeter/TileEvent/src/TileHitCollection.cxx
+++ b/TileCalorimeter/TileEvent/src/TileHitCollection.cxx
@@ -1,5 +1,7 @@
/*
- * Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration.
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+/*
*/
/**
* @file TileEvent/src/TileHitCollection.cxx
diff --git a/TileCalorimeter/TileEvent/src/TileLasCalib.cxx b/TileCalorimeter/TileEvent/src/TileLasCalib.cxx
index 27caad9180661befbd0a79ac4ff3ab8f11d59a3d..64408de7bbba98b54d5cd6620bf491c79d00c604 100644
--- a/TileCalorimeter/TileEvent/src/TileLasCalib.cxx
+++ b/TileCalorimeter/TileEvent/src/TileLasCalib.cxx
@@ -1,5 +1,7 @@
/*
- * Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration.
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+/*
*/
/**
* @file TileEvent/src/TileLasCalib.cxx
diff --git a/TileCalorimeter/TileEvent/src/TileLaser.cxx b/TileCalorimeter/TileEvent/src/TileLaser.cxx
index 374e2208bca91321cc0d0c0286941f0eafc8575c..6b1056eda7b7edb9d266ec3f412c52b30f1df04a 100644
--- a/TileCalorimeter/TileEvent/src/TileLaser.cxx
+++ b/TileCalorimeter/TileEvent/src/TileLaser.cxx
@@ -1,5 +1,7 @@
/*
- * Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration.
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+/*
*/
/**
* @file TileEvent/src/TileLaser.cxx
diff --git a/TileCalorimeter/TileEvent/src/TileLaserControl.cxx b/TileCalorimeter/TileEvent/src/TileLaserControl.cxx
index d9a01445a06dea3e9049a6fec3cb511b95397c3c..126869d1064dd1642bbb5c056f03fbf8fde1680c 100644
--- a/TileCalorimeter/TileEvent/src/TileLaserControl.cxx
+++ b/TileCalorimeter/TileEvent/src/TileLaserControl.cxx
@@ -1,5 +1,7 @@
/*
- * Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration.
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+/*
*/
/**
* @file TileEvent/src/TileLaserControl.cxx
diff --git a/TileCalorimeter/TileEvent/src/TileLaserDiode.cxx b/TileCalorimeter/TileEvent/src/TileLaserDiode.cxx
index e4acf291e341d5f313cde0b7d7f3907490b4b7b8..15af62d72768a7ff247e2196aa7e0880e5b050dc 100644
--- a/TileCalorimeter/TileEvent/src/TileLaserDiode.cxx
+++ b/TileCalorimeter/TileEvent/src/TileLaserDiode.cxx
@@ -1,5 +1,7 @@
/*
- * Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration.
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+/*
*/
/**
* @file TileEvent/src/TileLaserDiode.cxx
diff --git a/TileCalorimeter/TileEvent/src/TileLaserPLC.cxx b/TileCalorimeter/TileEvent/src/TileLaserPLC.cxx
index 7d402e65a2d9c054bdc04265d8c4f61f763118c8..43a74f4b41bb9d22956168e5ad4c985615488c0c 100644
--- a/TileCalorimeter/TileEvent/src/TileLaserPLC.cxx
+++ b/TileCalorimeter/TileEvent/src/TileLaserPLC.cxx
@@ -1,5 +1,7 @@
/*
- * Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration.
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+/*
*/
/**
* @file TileEvent/src/TileLaserPLC.cxx
diff --git a/TileCalorimeter/TileEvent/src/TileLaserPmt.cxx b/TileCalorimeter/TileEvent/src/TileLaserPmt.cxx
index 10818ad44f35fa3e1d66f163d8c86ff1ecadf09e..471dce47f5b6f553cb08f2b64365e8ffe4226521 100644
--- a/TileCalorimeter/TileEvent/src/TileLaserPmt.cxx
+++ b/TileCalorimeter/TileEvent/src/TileLaserPmt.cxx
@@ -1,5 +1,7 @@
/*
- * Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration.
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+/*
*/
/**
* @file TileEvent/src/TileLaserPmt.cxx
diff --git a/TileCalorimeter/TileEvent/src/TileRawChannelCollection.cxx b/TileCalorimeter/TileEvent/src/TileRawChannelCollection.cxx
index 428bd16e35e6bfcddcf6330d9871f0e28ca5bb97..822556e4aa0322dc6766cf7eea95616e459e108a 100644
--- a/TileCalorimeter/TileEvent/src/TileRawChannelCollection.cxx
+++ b/TileCalorimeter/TileEvent/src/TileRawChannelCollection.cxx
@@ -1,5 +1,7 @@
/*
- * Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration.
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+/*
*/
/**
* @file TileEvent/src/TileRawChannelCollection.cxx
diff --git a/TileCalorimeter/TileEvent/test/TileBeamElemCollection_test.cxx b/TileCalorimeter/TileEvent/test/TileBeamElemCollection_test.cxx
index 6c5fe2cea38d7ede879bc328e530b4b8afa19f5c..2ac18464801ee43840bcda7cf89aec7509f42da9 100644
--- a/TileCalorimeter/TileEvent/test/TileBeamElemCollection_test.cxx
+++ b/TileCalorimeter/TileEvent/test/TileBeamElemCollection_test.cxx
@@ -1,5 +1,7 @@
/*
- * Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration.
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+/*
*/
/**
* @file TileEvent/test/TileBeamElemCollection_test.cxx
diff --git a/TileCalorimeter/TileEvent/test/TileDigitsCollection_test.cxx b/TileCalorimeter/TileEvent/test/TileDigitsCollection_test.cxx
index 53a169c2e2249deb7cf21d621555e1c123ec24d7..ffa549258c6d7046851ff72aca20aa161cc417f9 100644
--- a/TileCalorimeter/TileEvent/test/TileDigitsCollection_test.cxx
+++ b/TileCalorimeter/TileEvent/test/TileDigitsCollection_test.cxx
@@ -1,5 +1,7 @@
/*
- * Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration.
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+/*
*/
/**
* @file TileEvent/test/TileDigitsCollection_test.cxx
diff --git a/TileCalorimeter/TileEvent/test/TileHitCollection_test.cxx b/TileCalorimeter/TileEvent/test/TileHitCollection_test.cxx
index 043212e638ef9b0e07bebd1f364314113ed74c5b..647324e32d4221c9bac6ecdaf52553fb906eaf79 100644
--- a/TileCalorimeter/TileEvent/test/TileHitCollection_test.cxx
+++ b/TileCalorimeter/TileEvent/test/TileHitCollection_test.cxx
@@ -1,5 +1,7 @@
/*
- * Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration.
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+/*
*/
/**
* @file TileEvent/test/TileHitCollection_test.cxx
diff --git a/TileCalorimeter/TileEvent/test/TileMutableBeamElemContainer_test.cxx b/TileCalorimeter/TileEvent/test/TileMutableBeamElemContainer_test.cxx
index b10d5e7f9bd4577ea4f3ef37bfe187c678891106..8e063f7f7e23390bc83505a78717424c28b3476f 100644
--- a/TileCalorimeter/TileEvent/test/TileMutableBeamElemContainer_test.cxx
+++ b/TileCalorimeter/TileEvent/test/TileMutableBeamElemContainer_test.cxx
@@ -1,5 +1,7 @@
/*
- * Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration.
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+/*
*/
/**
* @file TileEvent/test/TileMutableBeamElemContainer_test.cxx
diff --git a/TileCalorimeter/TileEvent/test/TileMutableDataContainer_test.cxx b/TileCalorimeter/TileEvent/test/TileMutableDataContainer_test.cxx
index 03e136274e38f2cffb50c3b25549a437ed2592c7..56e58dece28c2ecc0ade3b4e0392b3351d634922 100644
--- a/TileCalorimeter/TileEvent/test/TileMutableDataContainer_test.cxx
+++ b/TileCalorimeter/TileEvent/test/TileMutableDataContainer_test.cxx
@@ -1,5 +1,7 @@
/*
- * Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration.
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+/*
*/
/**
* @file TileEvent/testTileMutableDataContainer_test.cxx
diff --git a/TileCalorimeter/TileEvent/test/TileMutableDigitsContainer_test.cxx b/TileCalorimeter/TileEvent/test/TileMutableDigitsContainer_test.cxx
index dfab668a0bfcbf7baacc87d00caa4080f3828172..426215257e0b31fe23e113ae632f6903e0d9567b 100644
--- a/TileCalorimeter/TileEvent/test/TileMutableDigitsContainer_test.cxx
+++ b/TileCalorimeter/TileEvent/test/TileMutableDigitsContainer_test.cxx
@@ -1,5 +1,7 @@
/*
- * Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration.
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+/*
*/
/**
* @file TileEvent/test/TileMutableDigitsContainer_test.cxx
diff --git a/TileCalorimeter/TileEvent/test/TileMutableHitContainer_test.cxx b/TileCalorimeter/TileEvent/test/TileMutableHitContainer_test.cxx
index 3db5c877553a816b0a066f5d68aeda5b9e7c06c8..7932cf21060feb4ac95df023ec18aa1327ef7081 100644
--- a/TileCalorimeter/TileEvent/test/TileMutableHitContainer_test.cxx
+++ b/TileCalorimeter/TileEvent/test/TileMutableHitContainer_test.cxx
@@ -1,5 +1,7 @@
/*
- * Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration.
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+/*
*/
/**
* @file TileEvent/test/TileMutableHitContainer_test.cxx
diff --git a/TileCalorimeter/TileEvent/test/TileMutableRawChannelContainer_test.cxx b/TileCalorimeter/TileEvent/test/TileMutableRawChannelContainer_test.cxx
index 7fae32048eaaa8b4ec958619e1c93450ec9272f8..10c14c6f0c76b1e75b986450be75cae5e2eef59b 100644
--- a/TileCalorimeter/TileEvent/test/TileMutableRawChannelContainer_test.cxx
+++ b/TileCalorimeter/TileEvent/test/TileMutableRawChannelContainer_test.cxx
@@ -1,5 +1,7 @@
/*
- * Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration.
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+/*
*/
/**
* @file TileEvent/test/TileMutableRawChannelContainer_test.cxx
diff --git a/TileCalorimeter/TileEvent/test/TileRawChannelCollection_test.cxx b/TileCalorimeter/TileEvent/test/TileRawChannelCollection_test.cxx
index 17115c66b4262fa1142125a7b58fccf38ff61f7c..a7615c7d6c33c6ddb90b6f639050628ffdfadc9a 100644
--- a/TileCalorimeter/TileEvent/test/TileRawChannelCollection_test.cxx
+++ b/TileCalorimeter/TileEvent/test/TileRawChannelCollection_test.cxx
@@ -1,5 +1,7 @@
/*
- * Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration.
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+/*
*/
/**
* @file TileEvent/test/TileRawChannelCollection_test.cxx
diff --git a/TileCalorimeter/TileIdentifier/src/TileRawChannelUnit.cxx b/TileCalorimeter/TileIdentifier/src/TileRawChannelUnit.cxx
index 02fe205e4e753acf42c2a2aa91089931502bf347..8e7ce345ce9f9c865ef89b805bb4a9941895a3b2 100644
--- a/TileCalorimeter/TileIdentifier/src/TileRawChannelUnit.cxx
+++ b/TileCalorimeter/TileIdentifier/src/TileRawChannelUnit.cxx
@@ -1,5 +1,7 @@
/*
- * Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration.
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+/*
*/
diff --git a/TileCalorimeter/TileRecUtils/TileRecUtils/ITileDQstatusTool.h b/TileCalorimeter/TileRecUtils/TileRecUtils/ITileDQstatusTool.h
index df85ae0b74aa820845dba7015c9234227680380d..91468a9a51033425d9685089852722bf2dc83110 100644
--- a/TileCalorimeter/TileRecUtils/TileRecUtils/ITileDQstatusTool.h
+++ b/TileCalorimeter/TileRecUtils/TileRecUtils/ITileDQstatusTool.h
@@ -1,6 +1,8 @@
// This file's extension implies that it's C, but it's really -*- C++ -*-.
/*
- * Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration.
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+/*
*/
/**
* @file TileRecUtils/ITileDQstatusTool.h
diff --git a/TileCalorimeter/TileRecUtils/TileRecUtils/ITileRawChannelTool.h b/TileCalorimeter/TileRecUtils/TileRecUtils/ITileRawChannelTool.h
index 7e656f3c5329d8f87abb8ddce0611f6434c8bb7e..d6650091700f29a67f778f376ba017e848ec4e6c 100644
--- a/TileCalorimeter/TileRecUtils/TileRecUtils/ITileRawChannelTool.h
+++ b/TileCalorimeter/TileRecUtils/TileRecUtils/ITileRawChannelTool.h
@@ -1,5 +1,7 @@
/*
- * Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration.
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+/*
*/
#ifndef TILERECUTILS_ITILERAWCHANNELTOOL_H
diff --git a/TileCalorimeter/TileRecUtils/TileRecUtils/TileRawChannelBuilderTest.h b/TileCalorimeter/TileRecUtils/TileRecUtils/TileRawChannelBuilderTest.h
index a9ff2c95dba311e60fb147948cf3151bf0bc0a6d..e794ce8fd622ed2cd7851d4507091a4061ca4bd9 100644
--- a/TileCalorimeter/TileRecUtils/TileRecUtils/TileRawChannelBuilderTest.h
+++ b/TileCalorimeter/TileRecUtils/TileRecUtils/TileRawChannelBuilderTest.h
@@ -1,6 +1,8 @@
// This file's extension implies that it's C, but it's really -*- C++ -*-.
/*
- * Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration.
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+/*
*/
/**
* @file TileRecUtils/TileRawChannelBuilderTest.h
diff --git a/TileCalorimeter/TileRecUtils/TileRecUtils/TileRawChannelNoiseFilter.h b/TileCalorimeter/TileRecUtils/TileRecUtils/TileRawChannelNoiseFilter.h
index ce0cae35b92ad4c53aa554a0749a0e1c8778bde5..b7865feb8afefb10b43e5e7fb518289b29d26620 100644
--- a/TileCalorimeter/TileRecUtils/TileRecUtils/TileRawChannelNoiseFilter.h
+++ b/TileCalorimeter/TileRecUtils/TileRecUtils/TileRawChannelNoiseFilter.h
@@ -1,5 +1,7 @@
/*
- * Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration.
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+/*
*/
//////////////////////////////////////////////////////////////////////
diff --git a/TileCalorimeter/TileRecUtils/TileRecUtils/TileRecUtilsDict.h b/TileCalorimeter/TileRecUtils/TileRecUtils/TileRecUtilsDict.h
index 03f25f8874f976e88148bd585f88fbaa468bc5c2..4796beda8c9fa933eb51d0d259dd96314296bdfd 100644
--- a/TileCalorimeter/TileRecUtils/TileRecUtils/TileRecUtilsDict.h
+++ b/TileCalorimeter/TileRecUtils/TileRecUtils/TileRecUtilsDict.h
@@ -1,6 +1,8 @@
// This file's extension implies that it's C, but it's really -*- C++ -*-.
/*
- * Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration.
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+/*
*/
/**
* @file TileRecUtils/TileRecUtilsDict.h
diff --git a/TileCalorimeter/TileRecUtils/src/TileBeamElemDumper.cxx b/TileCalorimeter/TileRecUtils/src/TileBeamElemDumper.cxx
index f65eabf31d87a8a4c44d68571590897a6b565c4c..b499f0469013e9a40f3b94912f81599daf24c649 100644
--- a/TileCalorimeter/TileRecUtils/src/TileBeamElemDumper.cxx
+++ b/TileCalorimeter/TileRecUtils/src/TileBeamElemDumper.cxx
@@ -1,5 +1,7 @@
/*
- * Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration.
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+/*
*/
/**
* @file TileRecUtils/src/TileBeamElemDumper.cxx
diff --git a/TileCalorimeter/TileRecUtils/src/TileBeamElemDumper.h b/TileCalorimeter/TileRecUtils/src/TileBeamElemDumper.h
index 2cc0c353cd1d524a107b9d848d0057e880040ec9..dd73cc9476dfd110e77873357eefdeb9682c778f 100644
--- a/TileCalorimeter/TileRecUtils/src/TileBeamElemDumper.h
+++ b/TileCalorimeter/TileRecUtils/src/TileBeamElemDumper.h
@@ -1,6 +1,8 @@
// This file's extension implies that it's C, but it's really -*- C++ -*-.
/*
- * Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration.
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+/*
*/
/**
* @file TileRecUtils/TileBeamElemDumper.h
diff --git a/TileCalorimeter/TileRecUtils/src/TileCellBuilder.cxx b/TileCalorimeter/TileRecUtils/src/TileCellBuilder.cxx
index fc80db7a7251f288442a0095e2e70dd5328afd2b..74333df6512bc76dadfc5bdd25b5e6f59750d63f 100644
--- a/TileCalorimeter/TileRecUtils/src/TileCellBuilder.cxx
+++ b/TileCalorimeter/TileRecUtils/src/TileCellBuilder.cxx
@@ -1,5 +1,7 @@
/*
- * Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration.
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+/*
*/
// Tile includes
diff --git a/TileCalorimeter/TileRecUtils/src/TileDQstatusAlg.cxx b/TileCalorimeter/TileRecUtils/src/TileDQstatusAlg.cxx
index 3b259a007585ccbdedd00360e534629feb267c0d..a3cc35625f781a2850020bc7dd92a6733cdafe8e 100644
--- a/TileCalorimeter/TileRecUtils/src/TileDQstatusAlg.cxx
+++ b/TileCalorimeter/TileRecUtils/src/TileDQstatusAlg.cxx
@@ -1,5 +1,7 @@
/*
- * Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration.
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+/*
*/
/**
* @file TileRecUtils/src/TileDQstatusAlg.cxx
diff --git a/TileCalorimeter/TileRecUtils/src/TileDQstatusAlg.h b/TileCalorimeter/TileRecUtils/src/TileDQstatusAlg.h
index 59d669ff21a49ec0ea5773f263bcbf13dabb2299..a1879d8174bae422cee7b42edfcef4742829d620 100644
--- a/TileCalorimeter/TileRecUtils/src/TileDQstatusAlg.h
+++ b/TileCalorimeter/TileRecUtils/src/TileDQstatusAlg.h
@@ -1,6 +1,8 @@
// This file's extension implies that it's C, but it's really -*- C++ -*-.
/*
- * Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration.
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+/*
*/
/**
* @file TileRecUtils/src/TileDQstatusAlg.h
diff --git a/TileCalorimeter/TileRecUtils/src/TileDQstatusTool.cxx b/TileCalorimeter/TileRecUtils/src/TileDQstatusTool.cxx
index c471902ad3e856867becd3af0146a562f38c2d51..6685bece912678b8a96dae733d99bc61e8ac38d3 100644
--- a/TileCalorimeter/TileRecUtils/src/TileDQstatusTool.cxx
+++ b/TileCalorimeter/TileRecUtils/src/TileDQstatusTool.cxx
@@ -1,5 +1,7 @@
/*
- * Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration.
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+/*
*/
/**
* @file TileRecUtils/src/TileDQstatusTool.cxx
diff --git a/TileCalorimeter/TileRecUtils/src/TileDQstatusTool.h b/TileCalorimeter/TileRecUtils/src/TileDQstatusTool.h
index 7ed6dbd81ea02a1d0c40f7d9325cea1b15a73b3c..d489d370bcccf9e17f25b126209aaa83c1182e86 100644
--- a/TileCalorimeter/TileRecUtils/src/TileDQstatusTool.h
+++ b/TileCalorimeter/TileRecUtils/src/TileDQstatusTool.h
@@ -1,6 +1,8 @@
// This file's extension implies that it's C, but it's really -*- C++ -*-.
/*
- * Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration.
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+/*
*/
/**
* @file TileRecUtils/src/TileDQstatusTool.h
diff --git a/TileCalorimeter/TileRecUtils/src/TileDigitsDumper.cxx b/TileCalorimeter/TileRecUtils/src/TileDigitsDumper.cxx
index 6c5e1cb20238e4f01c0606a79776f11f3a152661..cd07abe81bbbb7316dcda558b8ead6f03f68e3a0 100644
--- a/TileCalorimeter/TileRecUtils/src/TileDigitsDumper.cxx
+++ b/TileCalorimeter/TileRecUtils/src/TileDigitsDumper.cxx
@@ -1,5 +1,7 @@
/*
- * Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration.
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+/*
*/
/**
* @file TileRecUtils/src/TileDigitsDumper.cxx
diff --git a/TileCalorimeter/TileRecUtils/src/TileDigitsDumper.h b/TileCalorimeter/TileRecUtils/src/TileDigitsDumper.h
index 6a21a149ae025319b0adb2863a530459f1b89b20..585096122c515a13b61a6d000ccc10f038d289e8 100644
--- a/TileCalorimeter/TileRecUtils/src/TileDigitsDumper.h
+++ b/TileCalorimeter/TileRecUtils/src/TileDigitsDumper.h
@@ -1,6 +1,8 @@
// This file's extension implies that it's C, but it's really -*- C++ -*-.
/*
- * Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration.
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+/*
*/
/**
* @file TileRecUtils/TileDigitsDumper.h
diff --git a/TileCalorimeter/TileRecUtils/src/TileL2Dumper.cxx b/TileCalorimeter/TileRecUtils/src/TileL2Dumper.cxx
index e3f84153fd5cd46297ef3a9cab3f13178e1c56ae..f24bbed53892bbf293a96531cab23675d8dfa97c 100644
--- a/TileCalorimeter/TileRecUtils/src/TileL2Dumper.cxx
+++ b/TileCalorimeter/TileRecUtils/src/TileL2Dumper.cxx
@@ -1,5 +1,7 @@
/*
- * Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration.
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+/*
*/
/**
* @file TileRecUtils/src/TileL2Dumper.cxx
diff --git a/TileCalorimeter/TileRecUtils/src/TileL2Dumper.h b/TileCalorimeter/TileRecUtils/src/TileL2Dumper.h
index d5c5a310a528b64aafe2b01d84b15c1d01b02e1c..bf8be17f28fa5e1ccccfbe34240399219e63018e 100644
--- a/TileCalorimeter/TileRecUtils/src/TileL2Dumper.h
+++ b/TileCalorimeter/TileRecUtils/src/TileL2Dumper.h
@@ -1,6 +1,8 @@
// This file's extension implies that it's C, but it's really -*- C++ -*-.
/*
- * Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration.
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+/*
*/
/**
* @file TileRecUtils/TileL2Dumper.h
diff --git a/TileCalorimeter/TileRecUtils/src/TileLaserObjectDumper.cxx b/TileCalorimeter/TileRecUtils/src/TileLaserObjectDumper.cxx
index da2754dc514eab0dd8ecacfe5bff018ea21dcc8b..49311f391fdd1ef88dbf8ff9b111f1fd37d82d22 100644
--- a/TileCalorimeter/TileRecUtils/src/TileLaserObjectDumper.cxx
+++ b/TileCalorimeter/TileRecUtils/src/TileLaserObjectDumper.cxx
@@ -1,5 +1,7 @@
/*
- * Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration.
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+/*
*/
/**
* @file TileRecUtils/src/TileLaserObjectDumper.cxx
diff --git a/TileCalorimeter/TileRecUtils/src/TileLaserObjectDumper.h b/TileCalorimeter/TileRecUtils/src/TileLaserObjectDumper.h
index ad458a8eda303683f856d85fac7d34258b5335ad..4b71de2e870679a3af5bff7e267ebab9d319b59f 100644
--- a/TileCalorimeter/TileRecUtils/src/TileLaserObjectDumper.h
+++ b/TileCalorimeter/TileRecUtils/src/TileLaserObjectDumper.h
@@ -1,6 +1,8 @@
// This file's extension implies that it's C, but it's really -*- C++ -*-.
/*
- * Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration.
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+/*
*/
/**
* @file TileRecUtils/TileLaserObjectDumper.h
diff --git a/TileCalorimeter/TileRecUtils/src/TileMuonReceiverDumper.cxx b/TileCalorimeter/TileRecUtils/src/TileMuonReceiverDumper.cxx
index faf244c0cb9c1c5ab7c79cae06657cec3ec1fe03..4e31afd1df7b80d8f0149114bf3016a0c5586468 100644
--- a/TileCalorimeter/TileRecUtils/src/TileMuonReceiverDumper.cxx
+++ b/TileCalorimeter/TileRecUtils/src/TileMuonReceiverDumper.cxx
@@ -1,5 +1,7 @@
/*
- * Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration.
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+/*
*/
/**
* @file TileRecUtils/src/TileMuonReceiverDumper.cxx
diff --git a/TileCalorimeter/TileRecUtils/src/TileMuonReceiverDumper.h b/TileCalorimeter/TileRecUtils/src/TileMuonReceiverDumper.h
index ad56a6e270a16dd67a9866d3cddd4c4ec58a0610..1ea929d7ba3cb6df2077c1126976ac3f25b513ae 100644
--- a/TileCalorimeter/TileRecUtils/src/TileMuonReceiverDumper.h
+++ b/TileCalorimeter/TileRecUtils/src/TileMuonReceiverDumper.h
@@ -1,6 +1,8 @@
// This file's extension implies that it's C, but it's really -*- C++ -*-.
/*
- * Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration.
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+/*
*/
/**
* @file TileRecUtils/TileMuonReceiverDumper.h
diff --git a/TileCalorimeter/TileRecUtils/src/TileRawChannelBuilder.cxx b/TileCalorimeter/TileRecUtils/src/TileRawChannelBuilder.cxx
index 5b386385faa92a65a367b019627678d83f544f9b..186ae050e9f2edd2d082fe5d0e09d6b5063c77c1 100644
--- a/TileCalorimeter/TileRecUtils/src/TileRawChannelBuilder.cxx
+++ b/TileCalorimeter/TileRecUtils/src/TileRawChannelBuilder.cxx
@@ -1,5 +1,7 @@
/*
- * Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration.
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+/*
*/
// Tile includes
diff --git a/TileCalorimeter/TileRecUtils/src/TileRawChannelBuilderTest.cxx b/TileCalorimeter/TileRecUtils/src/TileRawChannelBuilderTest.cxx
index 5d2259850ff6e5208f4957980e7f2ceb53ce77c6..06060bc4de6d4b334b2416e8bbae90632d5222bc 100644
--- a/TileCalorimeter/TileRecUtils/src/TileRawChannelBuilderTest.cxx
+++ b/TileCalorimeter/TileRecUtils/src/TileRawChannelBuilderTest.cxx
@@ -1,5 +1,7 @@
/*
- * Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration.
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+/*
*/
/**
* @file TileRecUtils/src/TileRawChannelBuilderTest.cxx
diff --git a/TileCalorimeter/TileRecUtils/src/TileRawChannelBuilderTest.h b/TileCalorimeter/TileRecUtils/src/TileRawChannelBuilderTest.h
index 3605aadebaaba890141bc5270ef82b833723a5dc..f3095894000478f288d7af5941dea950fd347940 100644
--- a/TileCalorimeter/TileRecUtils/src/TileRawChannelBuilderTest.h
+++ b/TileCalorimeter/TileRecUtils/src/TileRawChannelBuilderTest.h
@@ -1,6 +1,8 @@
// This file's extension implies that it's C, but it's really -*- C++ -*-.
/*
- * Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration.
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+/*
*/
/**
* @file TileRecUtils/src/TileRawChannelBuilderTest.h
diff --git a/TileCalorimeter/TileRecUtils/src/TileRawChannelDumper.cxx b/TileCalorimeter/TileRecUtils/src/TileRawChannelDumper.cxx
index 0995c768dde11a3fcc4db3b7a2f94f3277ffc2b4..368de8a6a7b8fc43ba64e2c94520047023edc3f6 100644
--- a/TileCalorimeter/TileRecUtils/src/TileRawChannelDumper.cxx
+++ b/TileCalorimeter/TileRecUtils/src/TileRawChannelDumper.cxx
@@ -1,5 +1,7 @@
/*
- * Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration.
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+/*
*/
/**
* @file TileRecUtils/src/TileRawChannelDumper.cxx
diff --git a/TileCalorimeter/TileRecUtils/src/TileRawChannelDumper.h b/TileCalorimeter/TileRecUtils/src/TileRawChannelDumper.h
index 0d27cd0b598d923bb887c0f904bce77f015851ba..419327a2c9adfb41140d8db4779c66323d849bb1 100644
--- a/TileCalorimeter/TileRecUtils/src/TileRawChannelDumper.h
+++ b/TileCalorimeter/TileRecUtils/src/TileRawChannelDumper.h
@@ -1,6 +1,8 @@
// This file's extension implies that it's C, but it's really -*- C++ -*-.
/*
- * Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration.
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+/*
*/
/**
* @file TileRecUtils/TileRawChannelDumper.h
diff --git a/TileCalorimeter/TileRecUtils/src/TileRawChannelOF1Corrector.cxx b/TileCalorimeter/TileRecUtils/src/TileRawChannelOF1Corrector.cxx
index a17fcbb35e7e3faadbd78383a807c3bf67d0c911..5afdf902fe2a9031514b46fd0855eae3ad5ff5c1 100644
--- a/TileCalorimeter/TileRecUtils/src/TileRawChannelOF1Corrector.cxx
+++ b/TileCalorimeter/TileRecUtils/src/TileRawChannelOF1Corrector.cxx
@@ -1,5 +1,7 @@
/*
- * Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration.
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+/*
*/
// Tile includes
diff --git a/TileCalorimeter/TileSvc/TileByteStream/test/TileROD_Decoder_test.cxx b/TileCalorimeter/TileSvc/TileByteStream/test/TileROD_Decoder_test.cxx
index 3f928b283108b30861e25632d2140d60d39a9907..c658d10886b993b8a149d556872ad2cd6d8d732f 100644
--- a/TileCalorimeter/TileSvc/TileByteStream/test/TileROD_Decoder_test.cxx
+++ b/TileCalorimeter/TileSvc/TileByteStream/test/TileROD_Decoder_test.cxx
@@ -1,5 +1,7 @@
/*
- * Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration.
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+/*
*/
/**
* @file TileByteStream/test/TileROD_Decoder_test.cxx
diff --git a/TileCalorimeter/TileSvc/TileByteStream/test/TileRawChannel2Bytes4_test.cxx b/TileCalorimeter/TileSvc/TileByteStream/test/TileRawChannel2Bytes4_test.cxx
index 10990ad3302e62ac4f21ed727dfa354b55948f7b..20fc675b39f7eb3e3d4aed224df57d0a66bac68a 100644
--- a/TileCalorimeter/TileSvc/TileByteStream/test/TileRawChannel2Bytes4_test.cxx
+++ b/TileCalorimeter/TileSvc/TileByteStream/test/TileRawChannel2Bytes4_test.cxx
@@ -1,5 +1,7 @@
/*
- * Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration.
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+/*
*/
/**
* @file TileByteStream/test/TileRawChannel2Bytes4_test.cxx
diff --git a/TileCalorimeter/TileSvc/TileIdCnv/src/TileIdCnv_entries.cxx b/TileCalorimeter/TileSvc/TileIdCnv/src/TileIdCnv_entries.cxx
index 389bb34a9420039255356b5e855879e7f6adc97d..3f9b871d91b2a37e7066f0944eabc8d7d2542255 100644
--- a/TileCalorimeter/TileSvc/TileIdCnv/src/TileIdCnv_entries.cxx
+++ b/TileCalorimeter/TileSvc/TileIdCnv/src/TileIdCnv_entries.cxx
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
#include "TileIdCnv/TileHWIDDetDescrCnv.h"
DECLARE_CONVERTER( TileHWIDDetDescrCnv )
diff --git a/Tools/PyJobTransformsCore/python/extraMetadata.py b/Tools/PyJobTransformsCore/python/extraMetadata.py
index 3c9603d9c77c76d82b5d460ac74d485a813fccb0..982760cce3f2894b169869c1dcda495293ee6f70 100644
--- a/Tools/PyJobTransformsCore/python/extraMetadata.py
+++ b/Tools/PyJobTransformsCore/python/extraMetadata.py
@@ -3,7 +3,7 @@
#
#
# Created by Alvin on 01/09/2009.
-# Copyright (c) 2009 University of Birmingham. All rights reserved.
+#
#
import re
diff --git a/Tools/PyJobTransformsCore/test/testErrorPattern.py b/Tools/PyJobTransformsCore/test/testErrorPattern.py
index a3d1961646962296a69fe045fff4da830676dc9f..eb2158e033bd5b26da06cd38bda15fd3ea1841f5 100755
--- a/Tools/PyJobTransformsCore/test/testErrorPattern.py
+++ b/Tools/PyJobTransformsCore/test/testErrorPattern.py
@@ -4,7 +4,7 @@
#
#
# Created by Alvin on 16/04/2009.
-# Copyright (c) 2009 University of Birmingham. All rights reserved.
+#
#
import sys, os
from PyJobTransformsCore.trferr import AthenaLogChecker
diff --git a/Tracking/Acts/ActsGeometry/scripts/geo_id.C b/Tracking/Acts/ActsGeometry/scripts/geo_id.C
index 05d9a62a2a517afcdf1029ba29b99879c29e9a81..35a974ff504a7756397aec7c2349e3626b98b9b0 100644
--- a/Tracking/Acts/ActsGeometry/scripts/geo_id.C
+++ b/Tracking/Acts/ActsGeometry/scripts/geo_id.C
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
#include <iostream>
#include <string>
diff --git a/Tracking/Acts/ActsGeometry/scripts/plot_geometry.C b/Tracking/Acts/ActsGeometry/scripts/plot_geometry.C
index 643f897d9f2409c349d1364cf2c19a5d0af61524..87ce22e92a3e690ee097aa128f7544f3ac0b7fd1 100644
--- a/Tracking/Acts/ActsGeometry/scripts/plot_geometry.C
+++ b/Tracking/Acts/ActsGeometry/scripts/plot_geometry.C
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
#include <iostream>
#include "TFile.h"
#include "TCanvas.h"
diff --git a/Tracking/Acts/ActsGeometry/scripts/plot_helper.C b/Tracking/Acts/ActsGeometry/scripts/plot_helper.C
index 8b46416e02023d6b312912f9b58d8a8b03013fb6..70b70a2ee9585c02d11ee0dbacd4c36bcea460ad 100644
--- a/Tracking/Acts/ActsGeometry/scripts/plot_helper.C
+++ b/Tracking/Acts/ActsGeometry/scripts/plot_helper.C
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
#include <iostream>
#include <string>
#include <tuple>
diff --git a/Tracking/Acts/ActsGeometry/scripts/plot_zshift.C b/Tracking/Acts/ActsGeometry/scripts/plot_zshift.C
index 6b1c192c7451dbfe083b89e32f47dbff37c05690..be0d5c296f91e98ed9fe97dd6ab42e68d6c5384d 100644
--- a/Tracking/Acts/ActsGeometry/scripts/plot_zshift.C
+++ b/Tracking/Acts/ActsGeometry/scripts/plot_zshift.C
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
#include "TFile.h"
#include "TTree.h"
#include "TCanvas.h"
diff --git a/Tracking/TrkDetDescr/TrkDetDescrExample/root/python/TTreeHelper.py b/Tracking/TrkDetDescr/TrkDetDescrExample/root/python/TTreeHelper.py
index e2551eec08bd6a0b325b3c5c75c4a3108145ba63..b4022863d3b2cf518eb42fb5d57b3c768a0906c8 100644
--- a/Tracking/TrkDetDescr/TrkDetDescrExample/root/python/TTreeHelper.py
+++ b/Tracking/TrkDetDescr/TrkDetDescrExample/root/python/TTreeHelper.py
@@ -2,7 +2,7 @@
TreePlotter.py
Created by Andreas Salzburger on 2009-04-16.
-Copyright (c) 2009 __MyCompanyName__. All rights reserved.
+
"""
import sys
diff --git a/Tracking/TrkDetDescr/TrkDetDescrUtils/TrkDetDescrUtils/ObjectAccessor.h b/Tracking/TrkDetDescr/TrkDetDescrUtils/TrkDetDescrUtils/ObjectAccessor.h
index 65c5cdacbfa782c37f221a0240aacdc1f739e446..7a1a2b5f0166634f625a832065c1cf5a0a55b26a 100755
--- a/Tracking/TrkDetDescr/TrkDetDescrUtils/TrkDetDescrUtils/ObjectAccessor.h
+++ b/Tracking/TrkDetDescr/TrkDetDescrUtils/TrkDetDescrUtils/ObjectAccessor.h
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
/* Dear emacs, this is -*-c++-*- */
#ifndef _ObjectAccessor_H_
#define _ObjectAccessor_H_
diff --git a/Tracking/TrkDetDescr/TrkDetDescrUtils/TrkDetDescrUtils/ObjectsAccessor.h b/Tracking/TrkDetDescr/TrkDetDescrUtils/TrkDetDescrUtils/ObjectsAccessor.h
index 660770d0ed952a470e5822c9d41f18280cfd18af..50d392fa6403b24b5c078291f219b4fae5c3981a 100644
--- a/Tracking/TrkDetDescr/TrkDetDescrUtils/TrkDetDescrUtils/ObjectsAccessor.h
+++ b/Tracking/TrkDetDescr/TrkDetDescrUtils/TrkDetDescrUtils/ObjectsAccessor.h
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
/* Dear emacs, this is -*-c++-*- */
#ifndef _ObjectsAccessor_H_
#define _ObjectsAccessor_H_
diff --git a/Tracking/TrkEvent/TrkRIO_OnTrack/TrkRIO_OnTrack/RIO_OnTrackErrorScaling.h b/Tracking/TrkEvent/TrkRIO_OnTrack/TrkRIO_OnTrack/RIO_OnTrackErrorScaling.h
index a4fb6c5347c45fffdd4f8319c7f28f00a57752f3..911f87f0e13f85bd7fa070cf369e03393b2949f9 100644
--- a/Tracking/TrkEvent/TrkRIO_OnTrack/TrkRIO_OnTrack/RIO_OnTrackErrorScaling.h
+++ b/Tracking/TrkEvent/TrkRIO_OnTrack/TrkRIO_OnTrack/RIO_OnTrackErrorScaling.h
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
/* Dear emacs, this is -*-c++-*- */
#ifndef _RIO_OnTrackErrorScaling_H_
#define _RIO_OnTrackErrorScaling_H_
diff --git a/Tracking/TrkEvent/TrkRIO_OnTrack/TrkRIO_OnTrack/check_cast.h b/Tracking/TrkEvent/TrkRIO_OnTrack/TrkRIO_OnTrack/check_cast.h
index 405c1799e3a58c5686feb28b1311b0581713e156..bf61e18a928832c61d6d85f071faf73500a4fb8f 100644
--- a/Tracking/TrkEvent/TrkRIO_OnTrack/TrkRIO_OnTrack/check_cast.h
+++ b/Tracking/TrkEvent/TrkRIO_OnTrack/TrkRIO_OnTrack/check_cast.h
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
#ifndef _CHECK_CAST_H_
#define _CHECK_CAST_H_
diff --git a/Tracking/TrkEvent/TrkRIO_OnTrack/src/RIO_OnTrackErrorScaling.cxx b/Tracking/TrkEvent/TrkRIO_OnTrack/src/RIO_OnTrackErrorScaling.cxx
index f5574b6d931da67954ad385a3ea97ef87137d0e4..4042a8554fd4bbb12ad470a873229e5c628274e5 100644
--- a/Tracking/TrkEvent/TrkRIO_OnTrack/src/RIO_OnTrackErrorScaling.cxx
+++ b/Tracking/TrkEvent/TrkRIO_OnTrack/src/RIO_OnTrackErrorScaling.cxx
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
#include "TrkRIO_OnTrack/RIO_OnTrackErrorScaling.h"
RIO_OnTrackErrorScaling::RIO_OnTrackErrorScaling() {}
diff --git a/Tracking/TrkEvent/TrkTrack/TrkTrack/TrackStateOnSurface.h b/Tracking/TrkEvent/TrkTrack/TrkTrack/TrackStateOnSurface.h
index 4e379e0b6db61a590cd431c571057a3a170d3e5c..eb5335bd172954a2d70853a7c4507bffa9312fe1 100755
--- a/Tracking/TrkEvent/TrkTrack/TrkTrack/TrackStateOnSurface.h
+++ b/Tracking/TrkEvent/TrkTrack/TrkTrack/TrackStateOnSurface.h
@@ -1,8 +1,10 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
/***************************************************************************
TrackStateOnSurface.h - description
-------------------
begin : Wed Jan 21 2004
-copyright : (C) 2004 by emoyse
email : edward.moyse@cern.ch
***************************************************************************/
diff --git a/Tracking/TrkEvent/TrkTrackSummary/TrkTrackSummary/TrackSummary.h b/Tracking/TrkEvent/TrkTrackSummary/TrkTrackSummary/TrackSummary.h
index 66807a2956324e9f9ffce63ba6302c43edbc6924..02c652ec12b20dfc20112f81af39454b3984ae70 100755
--- a/Tracking/TrkEvent/TrkTrackSummary/TrkTrackSummary/TrackSummary.h
+++ b/Tracking/TrkEvent/TrkTrackSummary/TrkTrackSummary/TrackSummary.h
@@ -1,8 +1,10 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
/***************************************************************************
Summary.h - description
-------------------
begin : Tue Feb 17 2004
-copyright : (C) 2004 by emoyse
email : edward.moyse@cern.ch
***************************************************************************/
diff --git a/Tracking/TrkEvent/TrkTrackSummary/src/TrackSummary.cxx b/Tracking/TrkEvent/TrkTrackSummary/src/TrackSummary.cxx
index 31bcc7b773ae67c54dd3d3a055d149b387dd01e9..67b6efac6b1f322bf651f6709a305af9a0fdcd23 100755
--- a/Tracking/TrkEvent/TrkTrackSummary/src/TrackSummary.cxx
+++ b/Tracking/TrkEvent/TrkTrackSummary/src/TrackSummary.cxx
@@ -1,8 +1,10 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
/***************************************************************************
Summary.cxx - description
-------------------
begin : Tue Feb 17 2004
- copyright : (C) 2004 by emoyse
email : edward.moyse@cern.ch
***************************************************************************/
diff --git a/Tracking/TrkTools/TrkRIO_OnTrackCreator/src/RIO_OnTrackErrorScalingIDKits.cxx b/Tracking/TrkTools/TrkRIO_OnTrackCreator/src/RIO_OnTrackErrorScalingIDKits.cxx
index c1586ace88a7adb02ff87e708e0acefde240b6b2..2559917acee3457c206a537e12126d8261be37a9 100644
--- a/Tracking/TrkTools/TrkRIO_OnTrackCreator/src/RIO_OnTrackErrorScalingIDKits.cxx
+++ b/Tracking/TrkTools/TrkRIO_OnTrackCreator/src/RIO_OnTrackErrorScalingIDKits.cxx
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
#include "RIO_OnTrackErrorScalingKit.h"
#include "InDetRIO_OnTrack/PixelRIO_OnTrackErrorScaling.h"
#include "InDetRIO_OnTrack/SCTRIO_OnTrackErrorScaling.h"
diff --git a/Tracking/TrkTools/TrkRIO_OnTrackCreator/src/RIO_OnTrackErrorScalingKit.cxx b/Tracking/TrkTools/TrkRIO_OnTrackCreator/src/RIO_OnTrackErrorScalingKit.cxx
index 9b995f0effb699257ecd3d46c0174771ff6fbfdc..6b3be9d4d1057c9edaac2e321ea79b19653e7fdd 100644
--- a/Tracking/TrkTools/TrkRIO_OnTrackCreator/src/RIO_OnTrackErrorScalingKit.cxx
+++ b/Tracking/TrkTools/TrkRIO_OnTrackCreator/src/RIO_OnTrackErrorScalingKit.cxx
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
#include "RIO_OnTrackErrorScalingKit.h"
size_t RIO_OnTrackErrorScalingKit::getParamIndex(const std::string &name) const {
diff --git a/Tracking/TrkTools/TrkRIO_OnTrackCreator/src/RIO_OnTrackErrorScalingMuonKits.cxx b/Tracking/TrkTools/TrkRIO_OnTrackCreator/src/RIO_OnTrackErrorScalingMuonKits.cxx
index 7096d21d4796aade9c3ed028213268db6494a72d..935535ad4ec435efec4ef450c8a8196c8eeb21f4 100644
--- a/Tracking/TrkTools/TrkRIO_OnTrackCreator/src/RIO_OnTrackErrorScalingMuonKits.cxx
+++ b/Tracking/TrkTools/TrkRIO_OnTrackCreator/src/RIO_OnTrackErrorScalingMuonKits.cxx
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
#include "RIO_OnTrackErrorScalingKit.h"
#include "MuonRIO_OnTrack/MuonEtaPhiRIO_OnTrackErrorScaling.h"
diff --git a/Tracking/TrkUtilityPackages/TrkNeuralNetworkUtils/test/test_TargetBuffer_t.cxx b/Tracking/TrkUtilityPackages/TrkNeuralNetworkUtils/test/test_TargetBuffer_t.cxx
index b51e548ac613146aa327b32c553e2f98a10d0cdc..74608beda709a1610e1dfe2d6a2fe0cfe2895024 100644
--- a/Tracking/TrkUtilityPackages/TrkNeuralNetworkUtils/test/test_TargetBuffer_t.cxx
+++ b/Tracking/TrkUtilityPackages/TrkNeuralNetworkUtils/test/test_TargetBuffer_t.cxx
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
#undef NDEBUG
#include "../src/TargetBuffer_t.h"
#include <vector>
diff --git a/Tracking/TrkValidation/TrkValTools/root/TrackProperties/TH1TrkProp.cxx b/Tracking/TrkValidation/TrkValTools/root/TrackProperties/TH1TrkProp.cxx
index 98214edfde21335cfe2e15f2220bc7b772748a4e..b17be65108fe6befdd9dfa235e45f41eda08693a 100755
--- a/Tracking/TrkValidation/TrkValTools/root/TrackProperties/TH1TrkProp.cxx
+++ b/Tracking/TrkValidation/TrkValTools/root/TrackProperties/TH1TrkProp.cxx
@@ -1,9 +1,11 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
// $:$Id: TH1TrkProp.cxx, v 1.0 04/17/2006 12:07:07
// Author: Miguel Angel Olivo Gomez 04/17/06
/*************************************************************************
* *
- * Copyright (C) 2006 . *
* All rights reserved. *
* *
*************************************************************************/
diff --git a/Tracking/TrkValidation/TrkValTools/root/TrackProperties/TH1TrkProp.h b/Tracking/TrkValidation/TrkValTools/root/TrackProperties/TH1TrkProp.h
index 8579845a24f488a260ae5d320ace8ce4ee467be3..b07eccd459d4084bc61b790ca4b65b5593f74821 100755
--- a/Tracking/TrkValidation/TrkValTools/root/TrackProperties/TH1TrkProp.h
+++ b/Tracking/TrkValidation/TrkValTools/root/TrackProperties/TH1TrkProp.h
@@ -1,9 +1,11 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
// $:$Id: TH1TrkProp.h, v 1.0 04/17/2006 12:07:07
// Author: Miguel Angel Olivo Gomez 04/17/06
/*************************************************************************
* *
- * Copyright (C) 2006 . *
* All rights reserved. *
* *
*************************************************************************/
diff --git a/Tracking/TrkValidation/TrkValTools/root/TrackProperties/TH2TrkProp.cxx b/Tracking/TrkValidation/TrkValTools/root/TrackProperties/TH2TrkProp.cxx
index a50cf1fdb53a842a486a353b6b3e9cc7540d5078..a8e684d1bff6c81f6142bbec76fa2af16403844d 100755
--- a/Tracking/TrkValidation/TrkValTools/root/TrackProperties/TH2TrkProp.cxx
+++ b/Tracking/TrkValidation/TrkValTools/root/TrackProperties/TH2TrkProp.cxx
@@ -1,9 +1,11 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
// $:$Id: TH2TrkProp.cxx, v 1.0 04/17/2006 17:07:07
// Author: Miguel Angel Olivo Gomez 04/17/06
/*************************************************************************
* *
- * Copyright (C) 2006 . *
* All rights reserved. *
* *
*************************************************************************/
diff --git a/Tracking/TrkValidation/TrkValTools/root/TrackProperties/TH2TrkProp.h b/Tracking/TrkValidation/TrkValTools/root/TrackProperties/TH2TrkProp.h
index ac20e0220f31ff91eeb7d9f539f426ee440c0797..e98880d84a2871988934a0cfcc049dd0ff155524 100755
--- a/Tracking/TrkValidation/TrkValTools/root/TrackProperties/TH2TrkProp.h
+++ b/Tracking/TrkValidation/TrkValTools/root/TrackProperties/TH2TrkProp.h
@@ -1,9 +1,11 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
// $:$Id: TH2TrkProp.h, v 1.0 04/17/2006 17:07:07
// Author: Miguel Angel Olivo Gomez 04/17/06
/*************************************************************************
* *
- * Copyright (C) 2006 . *
* All rights reserved. *
* *
*************************************************************************/
diff --git a/Tracking/TrkValidation/TrkValTools/root/TrackProperties/createTrkProp.cxx b/Tracking/TrkValidation/TrkValTools/root/TrackProperties/createTrkProp.cxx
index 159ccf77b49f03d609dd12dcbdca0ed4650750b1..940a044d6456d72d7e4098242ebe4613dd0a93d1 100755
--- a/Tracking/TrkValidation/TrkValTools/root/TrackProperties/createTrkProp.cxx
+++ b/Tracking/TrkValidation/TrkValTools/root/TrackProperties/createTrkProp.cxx
@@ -1,9 +1,11 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
// $:$Id: createTrkProp.cxx, v 1.0 04/17/2006 12:07:07
// Author: Miguel Angel Olivo Gomez 04/17/06
/*************************************************************************
* *
- * Copyright (C) 2006 . *
* All rights reserved. *
* *
*************************************************************************/
diff --git a/Trigger/TrigAlgorithms/TrigCaloRec/src/HLTCaloCellMaker.cxx b/Trigger/TrigAlgorithms/TrigCaloRec/src/HLTCaloCellMaker.cxx
index 66e7c47f03ac14810961ed1bf9e375fd7c45eb6e..1be6d9bca701b8f605a02cabb398b1128fc7c5b4 100644
--- a/Trigger/TrigAlgorithms/TrigCaloRec/src/HLTCaloCellMaker.cxx
+++ b/Trigger/TrigAlgorithms/TrigCaloRec/src/HLTCaloCellMaker.cxx
@@ -1,5 +1,7 @@
/*
- * Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+/*
* */
/*
diff --git a/Trigger/TrigAlgorithms/TrigCaloRec/src/HLTCaloCellMaker.h b/Trigger/TrigAlgorithms/TrigCaloRec/src/HLTCaloCellMaker.h
index db57c58b91c267161d379c23618545f4bed6b2d4..963106c53d75722b9b43f48d3758c2b84a9fac26 100644
--- a/Trigger/TrigAlgorithms/TrigCaloRec/src/HLTCaloCellMaker.h
+++ b/Trigger/TrigAlgorithms/TrigCaloRec/src/HLTCaloCellMaker.h
@@ -1,5 +1,7 @@
/*
- * Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+/*
* */
/**
diff --git a/Trigger/TrigAlgorithms/TrigHLTJetRec/src/EMTopoRejectionTool.cxx b/Trigger/TrigAlgorithms/TrigHLTJetRec/src/EMTopoRejectionTool.cxx
index 971e505d867806774a72fc2ebd77a6d51f4d99c8..d64f7b8a226d2ef01c0aa95f25189876093347cc 100644
--- a/Trigger/TrigAlgorithms/TrigHLTJetRec/src/EMTopoRejectionTool.cxx
+++ b/Trigger/TrigAlgorithms/TrigHLTJetRec/src/EMTopoRejectionTool.cxx
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
#include "TrigHLTJetRec/EMTopoRejectionTool.h"
#include "xAODCaloEvent/CaloCluster.h"
diff --git a/Trigger/TrigAlgorithms/TrigHLTJetRec/src/NegativeEnergyRejectionTool.cxx b/Trigger/TrigAlgorithms/TrigHLTJetRec/src/NegativeEnergyRejectionTool.cxx
index c1965d5050a4b36446ff85724a0d3ceebc152a6c..40d1c344acb0ffa8b382ecca2ea13669c962a075 100644
--- a/Trigger/TrigAlgorithms/TrigHLTJetRec/src/NegativeEnergyRejectionTool.cxx
+++ b/Trigger/TrigAlgorithms/TrigHLTJetRec/src/NegativeEnergyRejectionTool.cxx
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
#include "TrigHLTJetRec/NegativeEnergyRejectionTool.h"
diff --git a/Trigger/TrigAlgorithms/TrigHLTJetRec/src/PFlowRejectionTool.cxx b/Trigger/TrigAlgorithms/TrigHLTJetRec/src/PFlowRejectionTool.cxx
index 87669db997460a9b4b56c7974f070136c82e4bb2..d07913e071f9c86131f90b39625a659d7b63d1f9 100644
--- a/Trigger/TrigAlgorithms/TrigHLTJetRec/src/PFlowRejectionTool.cxx
+++ b/Trigger/TrigAlgorithms/TrigHLTJetRec/src/PFlowRejectionTool.cxx
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
#include "TrigHLTJetRec/PFlowRejectionTool.h"
#include "xAODPFlow/PFO.h"
diff --git a/Trigger/TrigAlgorithms/TrigHLTJetRec/src/PseudoJetCreatorFunctions.cxx b/Trigger/TrigAlgorithms/TrigHLTJetRec/src/PseudoJetCreatorFunctions.cxx
index 3512be2702069e100d465a695fe0c0fa1609e235..070d35ac21b4c815aec040aacb44d5245b4fa70c 100644
--- a/Trigger/TrigAlgorithms/TrigHLTJetRec/src/PseudoJetCreatorFunctions.cxx
+++ b/Trigger/TrigAlgorithms/TrigHLTJetRec/src/PseudoJetCreatorFunctions.cxx
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
#include "TrigHLTJetRec/PseudoJetCreatorFunctions.h"
#include "TrigHLTJetRec/IIParticleRejectionTool.h"
#include "xAODCaloEvent/CaloClusterContainer.h"
diff --git a/Trigger/TrigAlgorithms/TrigMuonEF/src/TrigMuonEFIDTrackRoiMaker.cxx b/Trigger/TrigAlgorithms/TrigMuonEF/src/TrigMuonEFIDTrackRoiMaker.cxx
index 26be541b20c1995fc4e09a986ccbf54bfba7d852..eca3f964457a54e8aa6199ab76047508d55454e6 100644
--- a/Trigger/TrigAlgorithms/TrigMuonEF/src/TrigMuonEFIDTrackRoiMaker.cxx
+++ b/Trigger/TrigAlgorithms/TrigMuonEF/src/TrigMuonEFIDTrackRoiMaker.cxx
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
#include "TrigMuonEFIDTrackRoiMaker.h"
// RoI include
diff --git a/Trigger/TrigAlgorithms/TrigMuonEF/src/TrigMuonEFIDTrackRoiMaker.h b/Trigger/TrigAlgorithms/TrigMuonEF/src/TrigMuonEFIDTrackRoiMaker.h
index f8c3e6d6eb7ea9c1ee56ed7edd599acd0d5c4df5..801efeab73b3c11a98c3fd7f8c5926d6d9d7fff9 100644
--- a/Trigger/TrigAlgorithms/TrigMuonEF/src/TrigMuonEFIDTrackRoiMaker.h
+++ b/Trigger/TrigAlgorithms/TrigMuonEF/src/TrigMuonEFIDTrackRoiMaker.h
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
#ifndef TRIGMUONEF_TRIGMUONIDTRACKROIMAKER_H__
#define TRIGMUONEF_TRIGMUONIDTRACKROIMAKER_H__
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisExample/TrigInDetAnalysisExample/Analysis_Tier0.h b/Trigger/TrigAnalysis/TrigInDetAnalysisExample/TrigInDetAnalysisExample/Analysis_Tier0.h
index 88c52c2286b22c1e930fbb55f61b8c95af892824..6ae9ac334dfbd965f4762fcf7f9ccdd12668aada 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisExample/TrigInDetAnalysisExample/Analysis_Tier0.h
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisExample/TrigInDetAnalysisExample/Analysis_Tier0.h
@@ -1,10 +1,12 @@
// emacs: this is -*- c++ -*-
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
//
// @file Analysis_Tier0.h
//
// $Id: Analysis_Tier0.h Thu 18 May 2017 15:29:53 CEST sutt $
//
-// Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
#ifndef TrigInDetAnalysisExample_Analysis_Tier0_H
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisExample/TrigInDetAnalysisExample/T_AnalysisConfig_Tier0.h b/Trigger/TrigAnalysis/TrigInDetAnalysisExample/TrigInDetAnalysisExample/T_AnalysisConfig_Tier0.h
index 2bd13e4ca024a1df19252f22051ddc7f752868f2..fd74565371bde4c5aca46f53be13c81c602b0c9d 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisExample/TrigInDetAnalysisExample/T_AnalysisConfig_Tier0.h
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisExample/TrigInDetAnalysisExample/T_AnalysisConfig_Tier0.h
@@ -1,4 +1,7 @@
// emacs: this is -*- c++ -*-
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
//
// @file T_AnalysisConfig_Tier0.h
//
@@ -15,7 +18,6 @@
// filter
//
//
-// Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
//
// $Id: T_AnalysisConfig_Tier0.h Tue 16 May 2017 09:28:55 CEST sutt $
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisExample/src/Analysis_Tier0.cxx b/Trigger/TrigAnalysis/TrigInDetAnalysisExample/src/Analysis_Tier0.cxx
index ab929abf20d7cb7b1291ffa5c862993deefae373..f9e0850274ee143147c2aff6394c8bf5384ecf37 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisExample/src/Analysis_Tier0.cxx
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisExample/src/Analysis_Tier0.cxx
@@ -1,9 +1,11 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
//
// @file Analysis_Tier0.cxx
//
// $Id: Analysis_Tier0.cxx Thu 18 May 2017 15:35:34 CEST sutt $
//
-// Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
#include <cmath>
diff --git a/Trigger/TrigCost/TrigCostRootAnalysis/TrigCostRootAnalysis/TrigCostAtlasStyle.h b/Trigger/TrigCost/TrigCostRootAnalysis/TrigCostRootAnalysis/TrigCostAtlasStyle.h
index 452cbd2dba7f136229ae17c4188f530c11a88a2b..7f18f9f2d9f9aef3c1f8d6eab065d24f68c0d547 100644
--- a/Trigger/TrigCost/TrigCostRootAnalysis/TrigCostRootAnalysis/TrigCostAtlasStyle.h
+++ b/Trigger/TrigCost/TrigCostRootAnalysis/TrigCostRootAnalysis/TrigCostAtlasStyle.h
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
//
// @file TrigCostAtlasStyle.h
//
@@ -6,7 +9,6 @@
//
// @author M.Sutton
//
-// Copyright (C) 2010 Atlas Collaboration
//
// $Id: TrigCostAtlasStyle.h, v0.0 Thu 25 Mar 2010 10:34:20 CET $
diff --git a/Trigger/TrigEvent/TrigNavigation/src/test.cxx b/Trigger/TrigEvent/TrigNavigation/src/test.cxx
index f0c323b5cdaf3706f209fa60103fea3825645108..0a9ff7272bb981924d96a78e694b27c1fd583897 100644
--- a/Trigger/TrigEvent/TrigNavigation/src/test.cxx
+++ b/Trigger/TrigEvent/TrigNavigation/src/test.cxx
@@ -1,5 +1,7 @@
/*
- * Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration.
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+/*
*/
/**
* @file TrigNavigation/src/test.cxx
diff --git a/Trigger/TrigEvent/TrigRoiConversion/src/RoiWriter.h b/Trigger/TrigEvent/TrigRoiConversion/src/RoiWriter.h
index 2af9b7d2c32f2bf31388274354195513743baa02..310a4d9eef1b6012c61b3973e5638722026fda1a 100644
--- a/Trigger/TrigEvent/TrigRoiConversion/src/RoiWriter.h
+++ b/Trigger/TrigEvent/TrigRoiConversion/src/RoiWriter.h
@@ -9,7 +9,6 @@
//
//
//
-// Copyright (C) 2015 M.Sutton (sutt@cern.ch)
//
// $Id: RoiWriter.h 781778 2016-11-01 23:42:26Z sutt $
//
diff --git a/Trigger/TrigFTK/FTK_RecToolInterfaces/FTK_RecToolInterfaces/IFTK_DuplicateTrackRemovalTool.h b/Trigger/TrigFTK/FTK_RecToolInterfaces/FTK_RecToolInterfaces/IFTK_DuplicateTrackRemovalTool.h
index dc4fbffa813afd924436d23d9d18e2cd873c901f..841d17b2915849cb64957e8044d73fd72284a7b0 100644
--- a/Trigger/TrigFTK/FTK_RecToolInterfaces/FTK_RecToolInterfaces/IFTK_DuplicateTrackRemovalTool.h
+++ b/Trigger/TrigFTK/FTK_RecToolInterfaces/FTK_RecToolInterfaces/IFTK_DuplicateTrackRemovalTool.h
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
//abstract interface
diff --git a/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigL2CaloHypoToolMult.cxx b/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigL2CaloHypoToolMult.cxx
index 30080dd49fd5c03131fbe841ce66e6b44708a6f0..81aaa567314ed257420b7cb611cf8c1c37352431 100644
--- a/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigL2CaloHypoToolMult.cxx
+++ b/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigL2CaloHypoToolMult.cxx
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
#include "DecisionHandling/Combinators.h"
#include "DecisionHandling/TrigCompositeUtils.h"
#include "TrigL2CaloHypoToolMult.h"
diff --git a/Trigger/TrigHypothesis/TrigFTKHypo/src/TrigFTKAvailableHypo.cxx b/Trigger/TrigHypothesis/TrigFTKHypo/src/TrigFTKAvailableHypo.cxx
index 1152eb3a47a1142e7d4173164f4a8a102ef42485..0a6ab8985dee8d4acee9446727b19740c23d7c3b 100644
--- a/Trigger/TrigHypothesis/TrigFTKHypo/src/TrigFTKAvailableHypo.cxx
+++ b/Trigger/TrigHypothesis/TrigFTKHypo/src/TrigFTKAvailableHypo.cxx
@@ -1,5 +1,7 @@
/*
- Copyright (C) 1995-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+/*
*/
#include "TrigFTKAvailableHypo.h"
diff --git a/Trigger/TrigHypothesis/TrigFTKHypo/src/TrigFTKAvailableHypo.h b/Trigger/TrigHypothesis/TrigFTKHypo/src/TrigFTKAvailableHypo.h
index e0f75798fda53b9378aa42c635c8ca579bb54205..e380310617c2694aecf10ac87a6b3516664b8050 100644
--- a/Trigger/TrigHypothesis/TrigFTKHypo/src/TrigFTKAvailableHypo.h
+++ b/Trigger/TrigHypothesis/TrigFTKHypo/src/TrigFTKAvailableHypo.h
@@ -1,5 +1,7 @@
/*
- Copyright (C) 1995-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+/*
*/
/** @class TrigFTKAvailableHypo
diff --git a/Trigger/TrigHypothesis/TrigHLTJetHypo/TrigHLTJetHypo/TrigHLTJetHypoUtils/xAODJetAsIJetFactory.h b/Trigger/TrigHypothesis/TrigHLTJetHypo/TrigHLTJetHypo/TrigHLTJetHypoUtils/xAODJetAsIJetFactory.h
index 6a20edfcca1554b3a32cb7541f4295ec6fa95d83..4a291967b40f48a27e41925db1ac1b5c1f371e99 100644
--- a/Trigger/TrigHypothesis/TrigHLTJetHypo/TrigHLTJetHypo/TrigHLTJetHypoUtils/xAODJetAsIJetFactory.h
+++ b/Trigger/TrigHypothesis/TrigHLTJetHypo/TrigHLTJetHypo/TrigHLTJetHypoUtils/xAODJetAsIJetFactory.h
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
#include "TrigHLTJetHypo/TrigHLTJetHypoUtils/xAODJetAsIJet.h"
class xAODJetAsIJetFactory{
diff --git a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/ITrigJetHypoToolConfig.h b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/ITrigJetHypoToolConfig.h
index e2b94371427f27c9aa21f686fa3419552760549c..4a0a65fb6ec97383c1c1f64d9bbda301904ebef6 100644
--- a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/ITrigJetHypoToolConfig.h
+++ b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/ITrigJetHypoToolConfig.h
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
#ifndef TRIGHLTJETHYPO_ITRIGJETHYPOTOOLCONFIG_H
#define TRIGHLTJETHYPO_ITRIGJETHYPOTOOLCONFIG_H
diff --git a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/xAODJetAsIJetFactory.cxx b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/xAODJetAsIJetFactory.cxx
index 9fd0565b6dc1ae5314d1202f2994fb342c156343..3a79530f272977f62af0b21a689b3d48041e72ce 100644
--- a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/xAODJetAsIJetFactory.cxx
+++ b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/xAODJetAsIJetFactory.cxx
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
#include "TrigHLTJetHypo/TrigHLTJetHypoUtils/xAODJetAsIJetFactory.h"
xAODJetAsIJetFactory::xAODJetAsIJetFactory(): m_ind(-1){}
diff --git a/Trigger/TrigMonitoring/TrigCostMonitorMT/TrigCostMonitorMT/ITrigCostMTSvc.h b/Trigger/TrigMonitoring/TrigCostMonitorMT/TrigCostMonitorMT/ITrigCostMTSvc.h
index 02f5fa0196fcea446700b610d86817c64363a004..613212ca86ab7de9bc9aa8d567cbddeee0f89911 100644
--- a/Trigger/TrigMonitoring/TrigCostMonitorMT/TrigCostMonitorMT/ITrigCostMTSvc.h
+++ b/Trigger/TrigMonitoring/TrigCostMonitorMT/TrigCostMonitorMT/ITrigCostMTSvc.h
@@ -1,5 +1,7 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
/*
- * Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration.
*/
#ifndef TRIGCOSTMONITORMT_ITRIGCOSTMTSVC_H
diff --git a/Trigger/TrigSteer/DecisionHandling/DecisionHandling/TrigCompositeUtils.icc b/Trigger/TrigSteer/DecisionHandling/DecisionHandling/TrigCompositeUtils.icc
index 93edfe6534b6e3d21ea276e02ca6c463b14204ae..4f47a25430580aa651fe7c37ec81ea204ddb3015 100644
--- a/Trigger/TrigSteer/DecisionHandling/DecisionHandling/TrigCompositeUtils.icc
+++ b/Trigger/TrigSteer/DecisionHandling/DecisionHandling/TrigCompositeUtils.icc
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
/*
*
*/
diff --git a/Trigger/TrigSteer/L1Decoder/src/IPrescalingTool.h b/Trigger/TrigSteer/L1Decoder/src/IPrescalingTool.h
index 6a8b03b6c2fd96ae3e553434c6769c08f1f0e205..5cdba3882f2005a4c150a4e9dd529ef8755af67b 100644
--- a/Trigger/TrigSteer/L1Decoder/src/IPrescalingTool.h
+++ b/Trigger/TrigSteer/L1Decoder/src/IPrescalingTool.h
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
#ifndef L1DEcoder_IPrescalingTool_h
#define L1DEcoder_IPrescalingTool_h
diff --git a/Trigger/TrigSteer/TrigOutputHandling/test/void_record_test.cxx b/Trigger/TrigSteer/TrigOutputHandling/test/void_record_test.cxx
index 2402ee059decec0a7dd1297316890a14dea96fb9..8f78b891fda1d6cf4695111af0fd48957a89179a 100644
--- a/Trigger/TrigSteer/TrigOutputHandling/test/void_record_test.cxx
+++ b/Trigger/TrigSteer/TrigOutputHandling/test/void_record_test.cxx
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
#include <iostream>
#include "TestTools/expect.h"
#include "TestTools/initGaudi.h"
diff --git a/Trigger/TrigSteer/ViewAlgsTest/src/TestViewDriver.cxx b/Trigger/TrigSteer/ViewAlgsTest/src/TestViewDriver.cxx
index 63434d9a4cc346cf7a67269ee74c2fc5dc149b29..1efe88f309675d3fdccb1887f7a6aa8e07f79d3d 100644
--- a/Trigger/TrigSteer/ViewAlgsTest/src/TestViewDriver.cxx
+++ b/Trigger/TrigSteer/ViewAlgsTest/src/TestViewDriver.cxx
@@ -1,5 +1,7 @@
/*
- Copyright ( C ) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+/*
*/
#include <sstream>
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 a35a8146f328fadb3e40f7ae1d34723581ef6ce0..afb2ee01192bf84819e1d9598daf60fff9121373 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 3316d1a62892975858051182222fcf53274ddcda..010ae7a049840e0f485b81609dae480ae680b5f4 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 7c0d94853d8dd6ef99efb1195340c0b43f4e6e59..c72241341179a0af83f6080100639365dc2e8bb9 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 1b584c5a5d146f85009def77b1780db0482df74d..dde7d942bfd6001cd1dbe13638ce49b594e2307d 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 c965e8222795fca8c65c36f346894d540bc88e2b..e6335a4a21bc17fe7a49401d72796342c38fb0d9 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/TrigT1CaloByteStream/test/TrigT1CaloByteStream_entries.cxx b/Trigger/TrigT1/TrigT1CaloByteStream/test/TrigT1CaloByteStream_entries.cxx
index 499e22108b3d4cb825af4a0d8fe57ecdb3869583..9096a5979ed1467d6edb5e96d9af541abcfc31da 100644
--- a/Trigger/TrigT1/TrigT1CaloByteStream/test/TrigT1CaloByteStream_entries.cxx
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/test/TrigT1CaloByteStream_entries.cxx
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
#include "AthContainers/DataVector.h"
// Post-LS1
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 bd4682b57141143a0aa4409ed6845290fec1d39c..a76318d839b0f6a34aa272f6af20c694d1d4448d 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 cf2b508dd1a69acdad018774a5ed545795ab7eee..e9ace946d9332da1a2a8428ae00f3abf55cbc28a 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 9f2ac7b6b2f0b6ca526662ffcbd4c414ed5f2a73..d80ce3140a368c86b812354087084dc210c402a9 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 4e4274d7bd1019dc027d159b6f10a56fd0614dbf..650560033b6d93d367b6ecc4a7ac1afdbff6beaf 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 fb7404c3802833b284ec8bfdcf36a031b18db809..6555e1f9f6abb5c0c8e070540e64171a14eff432 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 a3cdcbb360c9381420bb17850feeb3dd339a0b2e..204e7548f4deb35fa8b4650c47d577c2fce405cc 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 51b99c0a14f824f1ad8e53f7132032472e0cc358..549d196194a179820e590732e266bcc4a57f5199 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 8b9353f0e9fbd65fa81ba364a2e16720e381656b..bcef4b5c212ca907d48590f27c905df9214f4e47 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 cc627b4a4c9f732ce1923ccc9ad21de6f4c06c19..419a4d51f05a2c14cf672b334f2394034280f559 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 c45f8f38c1239d3bbc49b36e71c4b474a1efe2cf..cac6153184eaa523f1412735a22879622abd3a74 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 c579b5bdedc2ec03ba1c0d88f0ffd86203169373..13c3c11a37f48658ede03916ad6b9a9d1becc195 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 419d75a611d234c3464af3ab4fb0a4f716c68758..8ea8d2cfec63c34ba519c05cc7f742d91b735b54 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 35cf133d28823f05da77e548651a7c00de9d345f..cb24eb4a0acb4f03c15a559b02f44c42803de79a 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 7a9532e70f6f1570d6e7ab6cbee73ee5d4b82e6b..849fa722d2cecfdaffbc97146c1fd57ae321449d 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 3aacb42213710903cc2849e1d31bcd091084ed00..e0b1725cf27256b104970dab95341a8d36d41f35 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 34155a648564dff75a2ddc1f46abd59d359f552b..f028d797d510b2ddf664962fa717d98e2863ed87 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 88a5404c8aa9f373e05c15cf0b4a0d6f8f9fe1f1..55fb4a6c6fb61709c7ed1ac4d07d6e905db833fa 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 be6f22d65335b980793da3e13ded25dcd7f9c1fd..b6ac92e3cb6d61953a70d6b7d14a63ad22cc8cc1 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 13b7d19e9f64d140d6d233181d407a0f8cf25291..eb10f2c8a76a4a71476fefd23e6dabc71e5229ff 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 96829b86480ad378b4898adeacd8eec7b5236478..aa28b5ab58ea9d7765c276d128f08a9995ac3409 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 fdadf4c13197bde90bc3293676a1174a7f76d562..01dc45ac3ec9f19b24846b0fddd244391343725a 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 a7d3a69b371121af8d589f9cef9ebe2457f27e61..c0ea6fa225bcdf1697ad2c8a6b5a6987add90c5e 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 04208d3f3029a190f50c8de5b68da57507e7d1e6..364625d1e4e285619675ed564a8a7340a1a2acdb 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 9e774f3a623d76ce86a30343a400dc8bcb8e3bfc..c5756c85f4ece6471d7a3779d6289a8a1f81c594 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 dd0a1b9a2c5d46bc22289dadaf2abe42f4e2bf92..81e4b9272f9c40ccbe812044911c13365b73ba40 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 b6f2e7f1468b3ad3c58687de4df47dff5c151806..5f5cf4be714e4ad6ffa9e8f195d3d6e0756ea6d6 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 b6f850407dec73ae67913f93a477c597001cd3cd..dd0ba14d75211e63c13e141f38a84a0df1473c76 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 092ce0ed6c6edc4939b6609a6738bf62cb3e9212..6888ded9676c0c6e1c15a094b99c166a598dd89d 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 68120998a720d65dda6879addbdc23078da0784f..0f9856dbc49c825ee61ff9ce55f039231efca110 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 99681aaad62af663ba02c92f397b9b8b5352e98d..f919c35f0d9614def48f02ee3b33af19d1c29cad 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 509cd383d28196358d5e63a7efe2796242f3e68d..a07ba5e005906efabbc30ef3a29bceca7c789bbd 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 048fa5f61a3f762794600d87c17e15e513d4a82c..4346797ccca48edbf612ffb68cbc38a47fe2bf6f 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 3b5b70f6dee3e3170f78ebe1110c568d18c81503..dedb14230ac104444c3bac4b1ba0e17f58496ab5 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 e918fc9953fd14c7675b5845221a3b934726f3e6..f6aa7fccafa708757b96489257d189534baeb1fe 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 b737520d1a9a7c0d792ec8da0dabf8ad3499193b..6357111d5ca16f96fb1298b48329f709e05c341a 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 fcdc8604abedffed18ec36b6e4cd914bee97c4aa..01126dd57c6acbf299f329f9a0b7ae289d7f988e 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 377e338ad9aa4457f8820c543fe54aee0bc2f54e..21499e701e6657307f329483fea1668e4664fe11 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 08de9965488d316ded445476d2a304995ecb85e6..7346ffab65d7b2460f9879c09879e8cf9445e99d 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 1ebc7afcba2eec19dde8d9eac5796d999e0536cb..dbbd902a9beca82a096c5be021ec25bc9bca76d3 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 cebf59ce69491fee04e3bd807f4e39ef2131f6a3..571b560f38922c0f4966597fb5002705bc8a663f 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 f3b2daaf5e67735230c8ee9d90b5c928d75c5ab7..b047ed3271c2d63a7e9b100c5e09354f502b97a9 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 9f62ac6955d3226d98e86abe4a8aabe33fbf85c5..3ef4fe6297a845ec765f0f4352a4354a7a8201cc 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 876397447b46aa9b9ffff6b54f7e890c78c390f8..66eb3decc7946d5729ecc932cf63e2cd6c2b00b5 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 11929f0b2199fead0c3a23ea93af2d7a276816af..2bf12031e4cceb97172c530ecc615cf89da96e85 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 bb8fd567905090d8801680bde4112106c87cd95b..3c4ee9024113660c118e658380dfadd034360510 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 5382fd329085efb160233152e997ef01a21aabc6..80672f78a66a10bd1c5eda12af6e7d1afcf3f7a6 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 41ec60e45c1bf534847182b72905f3c191c45fd5..9b05b7f9fc4a2f7ea85be0d8a87ab7866a4ec9e6 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 4f54f3226d85efd58e5c75f9f9f8466123265203..967435e34c3ab7b4fb33b0d0ff4735ea7617fbbe 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 efc28a1b94a222bb26ea5902a8ce34e54aa7c8e9..e46a1196fe50c65c3787a8636b47e2b997712b89 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 b73aaf9d8ce58ad0d3238ba03f50bed129d7b936..072cef6810b9bf0116a2aec37f30222ebcc804a4 100755
--- a/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/EmTauROI.h
+++ b/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/EmTauROI.h
@@ -1,17 +1,15 @@
+/*
+ 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. *
* *
***************************************************************************/
diff --git a/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/EmTauROI_ClassDEF.h b/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/EmTauROI_ClassDEF.h
index 2ef5d6f28a81fe53876f8992902eaa962eeb9eac..9a4691a60a7963c741239811756ac59e9a71878f 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 dd1a300b27d239fe12b4b6cadec1ea7b06ecf08b..0f375ca642d4a1c2e8cd944a7380567a52073345 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 8d94c8a579e957e350287b232609ae38b3a56a64..88132b8ed4d3a19e1881f113cd927b510a4f50d3 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..e66eebadbdecea0f7ad2ab63929c3b1ce7d827b3 100755
--- a/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/EnergyRoI.h
+++ b/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/EnergyRoI.h
@@ -1,17 +1,15 @@
+/*
+ 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. *
* *
***************************************************************************/
diff --git a/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/EnergyRoI_ClassDEF.h b/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/EnergyRoI_ClassDEF.h
index 2fcbba01580f07fbd260336c82e3cf2005f7374a..17e7eba209fc99cf221b07510c129218963c8445 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..0c23602a585fa2e29ffb576114052c512ce100a7 100755
--- a/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/EnergyTopoData.h
+++ b/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/EnergyTopoData.h
@@ -1,17 +1,15 @@
+/*
+ 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. *
* *
***************************************************************************/
diff --git a/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/EnergyTopoData_ClassDEF.h b/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/EnergyTopoData_ClassDEF.h
index 714b3264b38f21866148d45676d04ddfd3e3f31c..e2709fce1b53d4718af09ae6ae16ea869d7755ba 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 8366a549d7efc517cbbcb1934a9094c2744e1352..ba789cee49c89e01a1f0034005b0c63e6afbf543 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 6b9efc15a29ea9ed984ff2d572082e183c379073..26e206ddf08ddba26a31b672b343a798ffc3b167 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 3eaebb370fe04ae60320e720c1e39be0aa8a03f5..80a328cce96004dd7e0953f0ed7d003bb4ac0ec8 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 9dfb26ce13d814d6cd61fa5a6d5aeee934d25e9e..22d372709396abce7333796755a837dde92ec5c4 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 384dd425b7ecf27d11efe5e3f6eb217561beb4c0..61d537485c144f965376a208744f465cbfcd5863 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 8b83694596479a4cc1cbce4fdd8579bd7493aa54..373eaa2a788b7519bc89d6e8dc01c4183fe8d5c3 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 63daef44445f200483035e7a6534e8bd6fceb143..d24129dde9ca2d06640ee29a8c5921c4840f2322 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 3ee2516fbca68bed5d819483ec341ad43b01a93b..a93a5219f0c6d311fef7dd6e492bcee4444c9f41 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 f25ca34321d26a8408f5e1d53f8fbf127af88d65..b9d529747ecef0b42d1de8f4fffe617a17010929 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 49ebc24e1dcb217177550da836b4dc4e0e8696bd..6c60873332ac257c47573e72e006c75124374c34 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 9e6e4400cce9135954c21c4bdc774819896bfa5b..54c9027407e5768f7a516bca3b7d033a55837430 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 580d621ab88f4e346fe041a6e24a35d1c9554d1e..615de622f48380f5de23cea994348793071012ad 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 f3a372e8155943e374d5eada30653441c3e42548..ab47398bf410fea5f6cefb194fb68879045a1f77 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 099db87ad7fa274f53973fc399030ebd10eedb67..f06b25cc826bc87e4bc43d5e8a5cfb774d3f7c9c 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 463900bcbee38c139b6b692f62d2070a33824440..e0afa6c5add9b95b14bfc2b8633bcbfa0f670a3e 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 4e790e8b5b411f8f8401f33a2c3baaab1f3898ff..6ef922e170b70e0579007a2a4868f5dd286fef20 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 92d6caa3f85447aed74671dfadad572e7719f7c5..b23126e58fc1033fc75ccad0050462a8a8122442 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 c7ebea4e4321c34372b4b09b023aebea78d00755..054c259199d80de36a79f2970283b41e024334bf 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 dc9d5abdbe9f0e815399d5a0cbf02ab5d2eab727..3e2514ace5d0c2243e5f8d5cc938bb250fcffccf 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 cac8813193a14eff762c5daa012cea91c0c499db..76e0e34a18eefa164825e42496179ad7dae8a3c5 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 47235c94388083591e6587646a47e5a09ab3b809..a59d5f2111f2d9ed1ca7d535abe8c10c8c9d4f5b 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 0b50daf66fd27ba7399b1c54856289b73a8ec965..c33a30a6afe694a14def52156ab026da1982ace4 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 d9c69d99c348f1d0db85a50fa015c14b0811f06f..b2d124e1356a6a452d91233d4cd8190a291901db 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 7c32d50a1e4d78b659d052d289b5b2049f93de37..1ff934c94bac179b7def4fb92170c66132eeaa5c 100755
--- a/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/JetEtRoI.h
+++ b/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/JetEtRoI.h
@@ -1,17 +1,15 @@
+/*
+ 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. *
* *
***************************************************************************/
diff --git a/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/JetEtRoI_ClassDEF.h b/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/JetEtRoI_ClassDEF.h
index 39674bae62e42f43e75dda7c90480148990b5761..a73a40408b3a0ba39e17c98d57a42c340399e82a 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 c90f282932d769761a06c0d485e657ec1b261ad5..9790bd511055128dc62a06e7501ace1c6c398a77 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 adef2ed2d5249667af50e6b177e3bfb9858d2bee..49c63ecc2159d33b814b62ff57339578170a0a46 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..1f74548703cbff565daae6ea80b1a39e7263556e 100755
--- a/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/JetROI.h
+++ b/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/JetROI.h
@@ -1,17 +1,15 @@
+/*
+ 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. *
* *
***************************************************************************/
diff --git a/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/JetROI_ClassDEF.h b/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/JetROI_ClassDEF.h
index dc8c2f8c0d80738d85fe1699c07e3efd3d6eea5b..526f6d9dd7a52c39c20975bc817e58d7305cbb5d 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 df0944915f2f9752c1a4cc12be7185daffca459d..49e6d6666e9cdf96ff58e009999e083b56650119 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 031f6b0b476d60366b861122da40542b7cb2e123..3906eb4f1e8f2d4a13e9a780beca2340798d4e60 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 68d6ee49bade49175819d4fdac2c8a8d95f7ddb3..f8ad5f0e78e3000cfbe13f6b31d2796eba730cc5 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 945e2123f123482711a7f9d26d68eaab25836c9c..a226bf2938377c2f006bbe6ab3233fc356f899bd 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 0a131405f7f87880b11ad2dc356cc7826a7bcfb0..c9f6bf335a668bfab1090df26d14c2faf314353b 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 f5f92627ea10a7066e9d2181abdc553ca0dff8e4..978e90711ef323fb36bf6d7b55b82719dc4bf6fb 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..d67b9fdff06535633a12707117ea3718c9ea46b6 100755
--- a/Trigger/TrigT1/TrigT1CaloEvent/src/CMMCPHits.cxx
+++ b/Trigger/TrigT1/TrigT1CaloEvent/src/CMMCPHits.cxx
@@ -1,17 +1,15 @@
+/*
+ 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..db978a3a41d8b542961bc360c1507fd48e7eeee0 100755
--- a/Trigger/TrigT1/TrigT1CaloEvent/src/CMMEtSums.cxx
+++ b/Trigger/TrigT1/TrigT1CaloEvent/src/CMMEtSums.cxx
@@ -1,17 +1,15 @@
+/*
+ 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..4b9ca8f2fceb0fd7ce85d5447633cc0d66f4a4cc 100755
--- a/Trigger/TrigT1/TrigT1CaloEvent/src/CMMJetHits.cxx
+++ b/Trigger/TrigT1/TrigT1CaloEvent/src/CMMJetHits.cxx
@@ -1,17 +1,15 @@
+/*
+ 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..2d04027934983ab3935cefe7e6cbb7ae35ef0151 100755
--- a/Trigger/TrigT1/TrigT1CaloEvent/src/CMXCPHits.cxx
+++ b/Trigger/TrigT1/TrigT1CaloEvent/src/CMXCPHits.cxx
@@ -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/TrigT1CaloEvent/src/CMXCPTob.cxx b/Trigger/TrigT1/TrigT1CaloEvent/src/CMXCPTob.cxx
index e6bcecaac5038b8b6e1fec46ccac67a782ac22a1..86dc79f7afa75ae4e27329b1d9a5a27ca71c1ee0 100755
--- a/Trigger/TrigT1/TrigT1CaloEvent/src/CMXCPTob.cxx
+++ b/Trigger/TrigT1/TrigT1CaloEvent/src/CMXCPTob.cxx
@@ -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/TrigT1CaloEvent/src/CMXEtSums.cxx b/Trigger/TrigT1/TrigT1CaloEvent/src/CMXEtSums.cxx
index e7897e42ce1020c885f4ca54eeb8786cc4fbed02..52e02fb0420248fdc354605f1f33e1fdf3760c62 100755
--- a/Trigger/TrigT1/TrigT1CaloEvent/src/CMXEtSums.cxx
+++ b/Trigger/TrigT1/TrigT1CaloEvent/src/CMXEtSums.cxx
@@ -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/TrigT1CaloEvent/src/CMXJetHits.cxx b/Trigger/TrigT1/TrigT1CaloEvent/src/CMXJetHits.cxx
index 8a567e1929f1e6453ca5058ce21a3765341ba27b..79b7a57c846afc647707d9f34673a91ff480f67e 100755
--- a/Trigger/TrigT1/TrigT1CaloEvent/src/CMXJetHits.cxx
+++ b/Trigger/TrigT1/TrigT1CaloEvent/src/CMXJetHits.cxx
@@ -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/TrigT1CaloEvent/src/CMXJetTob.cxx b/Trigger/TrigT1/TrigT1CaloEvent/src/CMXJetTob.cxx
index ecc60f3b38eed1f3109c0ae01bebfaee0b1d116e..0f675694748eea808716e4813a3f4e91c24d5da6 100755
--- a/Trigger/TrigT1/TrigT1CaloEvent/src/CMXJetTob.cxx
+++ b/Trigger/TrigT1/TrigT1CaloEvent/src/CMXJetTob.cxx
@@ -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/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..7629e94a32650c07596edf347e1c6f97906de03e 100755
--- a/Trigger/TrigT1/TrigT1CaloEvent/src/CPMHits.cxx
+++ b/Trigger/TrigT1/TrigT1CaloEvent/src/CPMHits.cxx
@@ -1,17 +1,15 @@
+/*
+ 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..56a639b45a2a7d1ff560d87a89ef079e8da92423 100755
--- a/Trigger/TrigT1/TrigT1CaloEvent/src/CPMTower.cxx
+++ b/Trigger/TrigT1/TrigT1CaloEvent/src/CPMTower.cxx
@@ -1,17 +1,15 @@
+/*
+ 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. *
* *
***************************************************************************/
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..8b47e2c8f7a636796a03bcbb06282c47036fa5f7 100755
--- a/Trigger/TrigT1/TrigT1CaloEvent/src/EmTauROI.cxx
+++ b/Trigger/TrigT1/TrigT1CaloEvent/src/EmTauROI.cxx
@@ -1,17 +1,15 @@
+/*
+ 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. *
* *
***************************************************************************/
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..96577d76cdcbe72a7884c670aa51ceb5c1e2fcae 100755
--- a/Trigger/TrigT1/TrigT1CaloEvent/src/JEMEtSums.cxx
+++ b/Trigger/TrigT1/TrigT1CaloEvent/src/JEMEtSums.cxx
@@ -1,17 +1,15 @@
+/*
+ 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..c011351eea24270a580d7c41ffece27671e0bb43 100755
--- a/Trigger/TrigT1/TrigT1CaloEvent/src/JEMHits.cxx
+++ b/Trigger/TrigT1/TrigT1CaloEvent/src/JEMHits.cxx
@@ -1,17 +1,15 @@
+/*
+ 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..fae3804eb13d65cbd938316178bd38df388d4db6 100755
--- a/Trigger/TrigT1/TrigT1CaloEvent/src/JetElement.cxx
+++ b/Trigger/TrigT1/TrigT1CaloEvent/src/JetElement.cxx
@@ -1,17 +1,15 @@
+/*
+ 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..c31aff9743cd7e580fa95cf017de9c09635fb5a7 100755
--- a/Trigger/TrigT1/TrigT1CaloEvent/src/JetInput.cxx
+++ b/Trigger/TrigT1/TrigT1CaloEvent/src/JetInput.cxx
@@ -1,17 +1,15 @@
+/*
+ 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..493378aa1c5b2a3e6890d91bd8bb40d3264099ae 100755
--- a/Trigger/TrigT1/TrigT1CaloEvent/src/JetROI.cxx
+++ b/Trigger/TrigT1/TrigT1CaloEvent/src/JetROI.cxx
@@ -1,17 +1,15 @@
+/*
+ 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. *
* *
***************************************************************************/
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..acf3379fd6b6d40f3917a1354118c5d0eb4ddb70 100755
--- a/Trigger/TrigT1/TrigT1CaloEvent/src/TriggerTower.cxx
+++ b/Trigger/TrigT1/TrigT1CaloEvent/src/TriggerTower.cxx
@@ -1,17 +1,15 @@
+/*
+ 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. *
* *
***************************************************************************/
diff --git a/Trigger/TrigT1/TrigT1CaloSim/TrigT1CaloSim/CPCMX.h b/Trigger/TrigT1/TrigT1CaloSim/TrigT1CaloSim/CPCMX.h
index 4af33f58969e1c08fa9d37d9ab88f2ad9566e086..bdc1398b5d225dd0c60e4a57bcc5e5b81fb18c72 100644
--- a/Trigger/TrigT1/TrigT1CaloSim/TrigT1CaloSim/CPCMX.h
+++ b/Trigger/TrigT1/TrigT1CaloSim/TrigT1CaloSim/CPCMX.h
@@ -11,10 +11,6 @@
/***************************************************************************
* *
- * This program is free software; you can redistribute it and/or modify *
- * it under the terms of the 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 0c1e0c3fe594f2a220dd23380b070673dfd27c51..9dc6af85bd67c5294167f2081cdb23961652b0bf 100644
--- a/Trigger/TrigT1/TrigT1CaloSim/TrigT1CaloSim/CPMSim.h
+++ b/Trigger/TrigT1/TrigT1CaloSim/TrigT1CaloSim/CPMSim.h
@@ -11,10 +11,6 @@
/***************************************************************************
* *
- * This program is free software; you can redistribute it and/or modify *
- * it under the terms of the 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/JEMJetSim.h b/Trigger/TrigT1/TrigT1CaloSim/TrigT1CaloSim/JEMJetSim.h
index 056608337fbabd733b3fdbc3f1e35a28d22621b6..7b19841d867d80a9afe6e00f2d82710646338257 100644
--- a/Trigger/TrigT1/TrigT1CaloSim/TrigT1CaloSim/JEMJetSim.h
+++ b/Trigger/TrigT1/TrigT1CaloSim/TrigT1CaloSim/JEMJetSim.h
@@ -11,10 +11,6 @@
/***************************************************************************
* *
- * This program is free software; you can redistribute it and/or modify *
- * it under the terms of the 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 0949fec2b343d3fe86a750ae54d6e3c54525fc6e..f0e840c8473d1b49e57ceb504fc985bbc8b1ecbb 100644
--- a/Trigger/TrigT1/TrigT1CaloSim/TrigT1CaloSim/JetCMX.h
+++ b/Trigger/TrigT1/TrigT1CaloSim/TrigT1CaloSim/JetCMX.h
@@ -11,10 +11,6 @@
/***************************************************************************
* *
- * This program is free software; you can redistribute it and/or modify *
- * it under the terms of the 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/ReprocessTriggerTowers.h b/Trigger/TrigT1/TrigT1CaloSim/TrigT1CaloSim/ReprocessTriggerTowers.h
index e63a1ed9ab54308d1b7b2b50a7112145a4b1964c..03f20555b5d54295aad3e37e99eed76ea7e2832c 100644
--- a/Trigger/TrigT1/TrigT1CaloSim/TrigT1CaloSim/ReprocessTriggerTowers.h
+++ b/Trigger/TrigT1/TrigT1CaloSim/TrigT1CaloSim/ReprocessTriggerTowers.h
@@ -11,10 +11,6 @@
/***************************************************************************
* *
- * This program is free software; you can redistribute it and/or modify *
- * it under the terms of the 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 bca24b9013ed7a798dbcf8ef83412e74cc87bd51..066ae7189599fb54d5f431a173eb47c1e9203eb4 100644
--- a/Trigger/TrigT1/TrigT1CaloSim/TrigT1CaloSim/RoIROD.h
+++ b/Trigger/TrigT1/TrigT1CaloSim/TrigT1CaloSim/RoIROD.h
@@ -10,10 +10,6 @@
/***************************************************************************
* *
- * This program is free software; you can redistribute it and/or modify *
- * it under the terms of the 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/TrigT1CaloSim/Tester.h b/Trigger/TrigT1/TrigT1CaloSim/TrigT1CaloSim/Tester.h
index 79ead730f2b9761396f329f24b447cc17fc6ab1c..a1206d3d000ff9baa1f928e7ad824efbf0992b4f 100644
--- a/Trigger/TrigT1/TrigT1CaloSim/TrigT1CaloSim/Tester.h
+++ b/Trigger/TrigT1/TrigT1CaloSim/TrigT1CaloSim/Tester.h
@@ -10,10 +10,6 @@
/***************************************************************************
* *
- * This program is free software; you can redistribute it and/or modify *
- * it under the terms of the 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_
diff --git a/Trigger/TrigT1/TrigT1CaloSim/src/EnergyCMX.cxx b/Trigger/TrigT1/TrigT1CaloSim/src/EnergyCMX.cxx
index 848072c1b003ae7f90015f4bf2e9454daf95c250..9af99d65445062456ce50d298520f6ecad401bbf 100644
--- a/Trigger/TrigT1/TrigT1CaloSim/src/EnergyCMX.cxx
+++ b/Trigger/TrigT1/TrigT1CaloSim/src/EnergyCMX.cxx
@@ -15,10 +15,6 @@
//
/***************************************************************************
* *
- * This program is free software; you can redistribute it and/or modify *
- * it under the terms of the 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/Tester.cxx b/Trigger/TrigT1/TrigT1CaloSim/src/Tester.cxx
index 7be7bce15ade898fa42b9344e4b8a40cd44982af..1d06e6ce8d937b1c4eb52cf8dad298dbba5cceaa 100644
--- a/Trigger/TrigT1/TrigT1CaloSim/src/Tester.cxx
+++ b/Trigger/TrigT1/TrigT1CaloSim/src/Tester.cxx
@@ -13,10 +13,6 @@
//
/***************************************************************************
* *
- * This program is free software; you can redistribute it and/or modify *
- * it under the terms of the 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/TrigT1CaloToolInterfaces/TrigT1CaloToolInterfaces/IL1CPMTools.h b/Trigger/TrigT1/TrigT1CaloToolInterfaces/TrigT1CaloToolInterfaces/IL1CPMTools.h
index a7ca51559a93aa19d60b50a6498d16bb9ce60fb8..0e85114667ed480ea07c5856e28d1caee9036f14 100644
--- a/Trigger/TrigT1/TrigT1CaloToolInterfaces/TrigT1CaloToolInterfaces/IL1CPMTools.h
+++ b/Trigger/TrigT1/TrigT1CaloToolInterfaces/TrigT1CaloToolInterfaces/IL1CPMTools.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/TrigT1CaloToolInterfaces/TrigT1CaloToolInterfaces/IL1DynamicPedestalProvider.h b/Trigger/TrigT1/TrigT1CaloToolInterfaces/TrigT1CaloToolInterfaces/IL1DynamicPedestalProvider.h
index d3e1def7715595ff2e1cba23892aeccad020d246..e7bd4ec339ca33458d523dd108e1b6fe6a81defc 100644
--- a/Trigger/TrigT1/TrigT1CaloToolInterfaces/TrigT1CaloToolInterfaces/IL1DynamicPedestalProvider.h
+++ b/Trigger/TrigT1/TrigT1CaloToolInterfaces/TrigT1CaloToolInterfaces/IL1DynamicPedestalProvider.h
@@ -1,14 +1,13 @@
// -*- C++ -*-
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
///////////////////////////////////////////////////////////////////
// IL1DynamicPedestalProvider.h, (c) Veit Scharf
///////////////////////////////////////////////////////////////////
/***************************************************************************
* *
- * This program is free software; you can redistribute it and/or modify *
- * it under the terms of the 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/TrigT1CaloToolInterfaces/TrigT1CaloToolInterfaces/IL1TriggerTowerTool.h b/Trigger/TrigT1/TrigT1CaloToolInterfaces/TrigT1CaloToolInterfaces/IL1TriggerTowerTool.h
index 2b14f11f914712e0b3bfd915d86f8081e90e3cca..3e7d05d649cb76d0d32edb43ab11a64b21603b29 100644
--- a/Trigger/TrigT1/TrigT1CaloToolInterfaces/TrigT1CaloToolInterfaces/IL1TriggerTowerTool.h
+++ b/Trigger/TrigT1/TrigT1CaloToolInterfaces/TrigT1CaloToolInterfaces/IL1TriggerTowerTool.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/TrigT1CaloTools/L1CPCMXTools.h b/Trigger/TrigT1/TrigT1CaloTools/TrigT1CaloTools/L1CPCMXTools.h
index 7d5bf6c39eeb3fbc0f226a0bbc70fcfc9adb445d..04dad37d3fa25b1f184751460b261313f0659ca0 100644
--- a/Trigger/TrigT1/TrigT1CaloTools/TrigT1CaloTools/L1CPCMXTools.h
+++ b/Trigger/TrigT1/TrigT1CaloTools/TrigT1CaloTools/L1CPCMXTools.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/L1CPHitsTools.h b/Trigger/TrigT1/TrigT1CaloTools/TrigT1CaloTools/L1CPHitsTools.h
index 9779ad63e5f5ff2af1be850bf4ff7d8511787714..ad0c255c6fcf72a37816815f0e35ecb907f1764c 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 17f033ede65d83583230e01527153bce9bd3aa56..5e01291f091613fb8eca850c46de435bdaa2c7c3 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..421c5030896369462e768cc6fdf249c5c2232e0b 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 eedfd56017dbde2376d6d383d7a6ed721c999897..ebc47fa4e309e05f87e2f07a3d6a0529e07bfd2b 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 f2ba91d74232eb2cf0e2aa3158ff82e2f92354d1..b71ac237cb0e7be642f4150388c80a6221f0d548 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 b82ce89a00fc91b07ca78b8057e6ebbe96b2aaef..afa99d1aa65a551bbe2b8d2a3ea15ae8b99c48b2 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 81e6dadf05eb4d3eeb1daf9820ffd2605a2cfcf3..996408cedb7bd47832ab54e90ea764bc1cbdfe04 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 a493d999df801d2551795bd67bc4b0b3589dcd5d..91737b3621e06b630c3c828fdd265df1d7cbcddc 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 12980013b6b868e8f266c9a44b0a403cbaf3a118..a83ea22d8195ad04af2e52a7a52dfc3caab0c23c 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 404c17dbdec4362019160d5249874cbd9cc65cac..6c6e685896fff798193920c9b90c177bd9aae2a3 100644
--- a/Trigger/TrigT1/TrigT1CaloTools/TrigT1CaloTools/L1JetCMXTools.h
+++ b/Trigger/TrigT1/TrigT1CaloTools/TrigT1CaloTools/L1JetCMXTools.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/L1JetElementTools.h b/Trigger/TrigT1/TrigT1CaloTools/TrigT1CaloTools/L1JetElementTools.h
index 02ff1db19d462b24e73c5bf7cb3fd6c929f3f8b5..dbdebf15129ea4417331660a6544be8d38950df4 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 59a5c1ed034c7956a0b80652801aea15ba24ae59..8d98a000472f5b791b47c9958640601f09159863 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 1864703889e6f3cbb9a964c643d5951bd49fb0dc..c9aefd048fae3a813e7ebf72fefda77570eb1992 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 b4f75df625ab65bca80dae6aa87ca382872eb490..bba5d192b8563b6fe474d19faeeab7e9094686d8 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 20913c711bc4d442b99938b84249fff612618e2f..39dfb3e0f8d8816622102e59428ae1d9aaf9d07b 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 f7a469b7c7c5f9e89c1fe850fe205443e0af4fdd..21aa2860aec0d1de113990df7347726d736f0310 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..d2aef15831c67edd16914b4455aabc3353c63da3 100644
--- a/Trigger/TrigT1/TrigT1CaloTools/src/L1DynamicPedestalProviderRoot.cxx
+++ b/Trigger/TrigT1/TrigT1CaloTools/src/L1DynamicPedestalProviderRoot.cxx
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
//////////////////////////////////////////////////////////////////////
// L1DynamicPedestalProviderRoot.cxx (c) Veit Scjarf
///////////////////////////////////////////////////////////////////////
diff --git a/Trigger/TrigT1/TrigT1CaloTools/src/L1DynamicPedestalProviderTxt.cxx b/Trigger/TrigT1/TrigT1CaloTools/src/L1DynamicPedestalProviderTxt.cxx
index 39e884292a589897be0edb9825caa4d0f83a11f6..fdbaf7eb0014b6cc4f78c18cf796bc22c82e443d 100644
--- a/Trigger/TrigT1/TrigT1CaloTools/src/L1DynamicPedestalProviderTxt.cxx
+++ b/Trigger/TrigT1/TrigT1CaloTools/src/L1DynamicPedestalProviderTxt.cxx
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
//////////////////////////////////////////////////////////////////////
// L1DynamicPedestalProviderTxt.cxx (c) Veit Scjarf
///////////////////////////////////////////////////////////////////////
diff --git a/Trigger/TrigT1/TrigT1CaloTools/src/L1EmTauTools.cxx b/Trigger/TrigT1/TrigT1CaloTools/src/L1EmTauTools.cxx
index 24d8e12d25e752bdffa0b7c67b7761618d1f4a75..4366d30c083ab597f8c948e2cecda41fe3e7143a 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 3f01facc531baf0b43c96c0fc08b337668a6f156..d609d07f5980c5173cd0d38d9f73ff6e11188cb8 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 cfc569108fb568a46b612c187d1f81af205f1a8a..f454db34235a9ab3b7a841d2dd6aa8320ce16475 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 6eb1ec3ef154dc7948894cf8938ef789f1f2161d..5fd5080ad5fb7808bebb7420f8a418f064920326 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 83df4796547534cfeb4ee8b8705b1cf10dd574de..d5900ebb343c2e65bec3ad98fbd7397f735dbe11 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 0c5fef63837449ccbc09fd6cceb4b92f4c113d01..c1c39cd1ac37efcc9c9875b988983f01de861210 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 14d7023d5fa72bb9e46d94f3838d7b4e180296b0..4583741d54ba1f78c77c7333894bea0162b6fbaa 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 e5087f95a631c0f63e0e70ff04097f262be3f0fa..681279bbdc151b482bcd35f6f3915aa3f4e82597 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 932bd09e4d8e2637c6ca23171bc8070ff5a01a69..4d7ab0fab4af74b07fc3973d014adc74cabb4728 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..0d0a0a27261e84a85fb70c9381adf66caa783d5c 100755
--- a/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/BinAndCoord.h
+++ b/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/BinAndCoord.h
@@ -1,17 +1,15 @@
+/*
+ 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 56a1d9e707b87dc9fe363f1861d587f5f7eb30f4..68be2af72fd72c5dc79ab5579bca1fda11e02ea6 100755
--- a/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/CPAlgorithm.h
+++ b/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/CPAlgorithm.h
@@ -1,18 +1,16 @@
+/*
+ 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. *
* *
***************************************************************************/
diff --git a/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/CPMTobAlgorithm.h b/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/CPMTobAlgorithm.h
index a83afb02baf7634933c45d1e37fee4e3bdfa744f..8724f92552e9494de6583db3d2cb2d50e668bfd9 100644
--- a/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/CPMTobAlgorithm.h
+++ b/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/CPMTobAlgorithm.h
@@ -1,17 +1,15 @@
+/*
+ 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. *
* *
***************************************************************************/
diff --git a/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/ClusterProcessorModuleKey.h b/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/ClusterProcessorModuleKey.h
index a1da24dd2d94f74e9a625e5609e7a1c710c59b98..c9dd0d9f97a0cf3efc7758065d833a180c08ee45 100755
--- a/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/ClusterProcessorModuleKey.h
+++ b/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/ClusterProcessorModuleKey.h
@@ -1,17 +1,15 @@
+/*
+ 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. *
* *
***************************************************************************/
diff --git a/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/CoordToHardware.h b/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/CoordToHardware.h
index 79ae6160c0695d5fb7977d4edfb45ac6c6129a45..df577af88aaa6f82bd6efcbb4225c46430bf971f 100755
--- a/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/CoordToHardware.h
+++ b/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/CoordToHardware.h
@@ -1,17 +1,15 @@
+/*
+ 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. *
* *
***************************************************************************/
diff --git a/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/CrateEnergy.h b/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/CrateEnergy.h
index 80e4cdbcb874b705bfb6d2b65e5a31131c9287be..8929c88694aea9e38a5c59de57ad3cce8037c6c8 100755
--- a/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/CrateEnergy.h
+++ b/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/CrateEnergy.h
@@ -1,17 +1,15 @@
+/*
+ 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..eb40a8f7375a0f7e15abd137591f0167f0735157 100755
--- a/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/ICoordinate.h
+++ b/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/ICoordinate.h
@@ -1,17 +1,15 @@
+/*
+ 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 0e6776af7abf4ae93c1641ba83f0b3ba33d655ee..61dfc7a84815f729dbc2fa2df87ad0a0e287ff4c 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 c14f4c65feac23a9cea147bba531924799206cad..63b7e39aaa885bf7c912b73d75de7696f922fb68 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 2026c906ccecb4875783f9eda79fb68e29fc37f5..b07c840b242358c45d03a4655f0b64fab998081d 100755
--- a/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/JEMJetAlgorithm.h
+++ b/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/JEMJetAlgorithm.h
@@ -1,17 +1,15 @@
+/*
+ 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. *
* *
***************************************************************************/
diff --git a/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/JetAlgorithm.h b/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/JetAlgorithm.h
index 8ba79c818f447e6441dfeb6c4897041fe59820ac..3fef9fc3c091ff665bebfe09bef0741f9dc7825b 100755
--- a/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/JetAlgorithm.h
+++ b/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/JetAlgorithm.h
@@ -1,17 +1,15 @@
+/*
+ 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. *
* *
***************************************************************************/
diff --git a/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/JetElementKey.h b/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/JetElementKey.h
index 94aef96b549c9a83a920c1eac42d3c52361aaa3a..5397d38e0622732ec119d064f6a1a68cf4b50e2a 100755
--- a/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/JetElementKey.h
+++ b/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/JetElementKey.h
@@ -1,17 +1,15 @@
+/*
+ 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. *
* *
***************************************************************************/
diff --git a/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/JetElementKeyBase.h b/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/JetElementKeyBase.h
index d9b09b33ac91ac4d69ceb5c12bcc4f5c71bd3908..f390e044b45bb9c94c0c9d5657d3306a8fa365de 100755
--- a/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/JetElementKeyBase.h
+++ b/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/JetElementKeyBase.h
@@ -1,8 +1,10 @@
+/*
+ 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
@@ -10,10 +12,6 @@
/***************************************************************************
* *
- * This program is free software; you can redistribute it and/or modify *
- * it under the terms of the 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/JetEnergyModuleKey.h b/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/JetEnergyModuleKey.h
index 5f5d0d4bfd96dd84822b6e6ab13c8764a8be026a..89fd2f4291b4b4d9d6cd81453f1bdd01fb37700e 100755
--- a/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/JetEnergyModuleKey.h
+++ b/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/JetEnergyModuleKey.h
@@ -1,17 +1,15 @@
+/*
+ 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. *
* *
***************************************************************************/
diff --git a/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/JetInputKey.h b/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/JetInputKey.h
index 948ed5c6722e7280c07110f62062fafdb1a566c9..67a9a84951e11ff8c00e37763e96f2dbe161b561 100755
--- a/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/JetInputKey.h
+++ b/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/JetInputKey.h
@@ -1,17 +1,15 @@
+/*
+ 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. *
* *
***************************************************************************/
diff --git a/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/KeyUtilities.h b/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/KeyUtilities.h
index 28e5121a5cd16469fdfdf5ccb8545523de1b3b67..cea7f5d90d1851c4fc92e3e1747e7e4383b74a66 100755
--- a/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/KeyUtilities.h
+++ b/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/KeyUtilities.h
@@ -1,17 +1,15 @@
+/*
+ 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. *
* *
***************************************************************************/
diff --git a/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/L1TopoDataMaker.h b/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/L1TopoDataMaker.h
index 09cc54f84a1ab30e7e9ede879df7c9c836712aa0..51b11ff760cfaac294358f3c058c7a87e6e399b3 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 0f9392c9aa0ecb2dcd6fe01bee8dae17937db599..0389606147ed9796ee9c4c2b5e54d3783d697915 100755
--- a/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/ModuleEnergy.h
+++ b/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/ModuleEnergy.h
@@ -1,17 +1,15 @@
+/*
+ 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. *
* *
***************************************************************************/
diff --git a/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/Parity.h b/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/Parity.h
index a9383aca89239596a4b11db7ba80b9508aa13a63..f0168724f9a8cfcd30c342722c9452376621ed8a 100755
--- a/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/Parity.h
+++ b/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/Parity.h
@@ -1,17 +1,15 @@
+/*
+ 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. *
* *
***************************************************************************/
diff --git a/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/QuadLinear.h b/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/QuadLinear.h
index 66804fe6597e2161b0a9c406b6df184e5b08f0fc..93e6d9e932732d11c145ce26a4d7d145f327a002 100755
--- a/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/QuadLinear.h
+++ b/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/QuadLinear.h
@@ -1,17 +1,15 @@
+/*
+ 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. *
* *
***************************************************************************/
diff --git a/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/SystemEnergy.h b/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/SystemEnergy.h
index b600bc19438a5ec9172fd7d0c173c36b1181af81..3e4ed2fc2155ab9c7b3b1d0fad0f63c2991d370f 100755
--- a/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/SystemEnergy.h
+++ b/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/SystemEnergy.h
@@ -1,17 +1,15 @@
+/*
+ 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..afb0b43d7ca998e5b32c10ec359fb34d7dabc5e3 100755
--- a/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/TriggerTowerKey.h
+++ b/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/TriggerTowerKey.h
@@ -1,17 +1,15 @@
+/*
+ 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. *
* *
***************************************************************************/
diff --git a/Trigger/TrigT1/TrigT1CaloUtils/src/CPAlgorithm.cxx b/Trigger/TrigT1/TrigT1CaloUtils/src/CPAlgorithm.cxx
index 4eeb5c4a74cbe67a1e6eb922ca7cb2da8e596ba1..9ad110f47f5c4cae41f337e389e65808e12ef0ec 100755
--- a/Trigger/TrigT1/TrigT1CaloUtils/src/CPAlgorithm.cxx
+++ b/Trigger/TrigT1/TrigT1CaloUtils/src/CPAlgorithm.cxx
@@ -1,18 +1,16 @@
+/*
+ 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"
diff --git a/Trigger/TrigT1/TrigT1CaloUtils/src/CPMTobAlgorithm.cxx b/Trigger/TrigT1/TrigT1CaloUtils/src/CPMTobAlgorithm.cxx
index 474d4eba7c2e746ff6375070fd37f4f598082837..2548d96da8e67f89b2af2cd139b07453d78b39f3 100644
--- a/Trigger/TrigT1/TrigT1CaloUtils/src/CPMTobAlgorithm.cxx
+++ b/Trigger/TrigT1/TrigT1CaloUtils/src/CPMTobAlgorithm.cxx
@@ -1,18 +1,16 @@
+/*
+ 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"
diff --git a/Trigger/TrigT1/TrigT1CaloUtils/src/ClusterProcessorModuleKey.cxx b/Trigger/TrigT1/TrigT1CaloUtils/src/ClusterProcessorModuleKey.cxx
index 4255632f9d6a09e844cb1a75366e2669286e5947..469ddef72396d1ad55b8155ef9b3b40bf7205d10 100755
--- a/Trigger/TrigT1/TrigT1CaloUtils/src/ClusterProcessorModuleKey.cxx
+++ b/Trigger/TrigT1/TrigT1CaloUtils/src/ClusterProcessorModuleKey.cxx
@@ -1,17 +1,15 @@
+/*
+ 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
diff --git a/Trigger/TrigT1/TrigT1CaloUtils/src/CoordToHardware.cxx b/Trigger/TrigT1/TrigT1CaloUtils/src/CoordToHardware.cxx
index 320b699a7586bfd413a9bab8e465d2e9b5a79326..924b72b23bea770111f0d13ddc7daaac0fc796bd 100755
--- a/Trigger/TrigT1/TrigT1CaloUtils/src/CoordToHardware.cxx
+++ b/Trigger/TrigT1/TrigT1CaloUtils/src/CoordToHardware.cxx
@@ -1,17 +1,15 @@
+/*
+ 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
diff --git a/Trigger/TrigT1/TrigT1CaloUtils/src/CrateEnergy.cxx b/Trigger/TrigT1/TrigT1CaloUtils/src/CrateEnergy.cxx
index c19fb0a7aafb35ef4fd54de9fc4e6633d6d33b96..9bc9078ca8fbe4043a5e90827538ba5e8ee8d374 100755
--- a/Trigger/TrigT1/TrigT1CaloUtils/src/CrateEnergy.cxx
+++ b/Trigger/TrigT1/TrigT1CaloUtils/src/CrateEnergy.cxx
@@ -1,17 +1,15 @@
+/*
+ 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. *
* *
***************************************************************************/
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..72359afe6f9affe269749b9f0ddbc89855f0ba1a 100755
--- a/Trigger/TrigT1/TrigT1CaloUtils/src/InternalTriggerTower.cxx
+++ b/Trigger/TrigT1/TrigT1CaloUtils/src/InternalTriggerTower.cxx
@@ -1,17 +1,15 @@
+/*
+ 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. *
* *
***************************************************************************/
diff --git a/Trigger/TrigT1/TrigT1CaloUtils/src/JEMJetAlgorithm.cxx b/Trigger/TrigT1/TrigT1CaloUtils/src/JEMJetAlgorithm.cxx
index 945ee4b4e2ddafffc97e2959e6cc5e38196094ba..abdf133a9d38409b6c31123a089cde5e6c185ea2 100755
--- a/Trigger/TrigT1/TrigT1CaloUtils/src/JEMJetAlgorithm.cxx
+++ b/Trigger/TrigT1/TrigT1CaloUtils/src/JEMJetAlgorithm.cxx
@@ -1,17 +1,15 @@
+/*
+ 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"
diff --git a/Trigger/TrigT1/TrigT1CaloUtils/src/JetAlgorithm.cxx b/Trigger/TrigT1/TrigT1CaloUtils/src/JetAlgorithm.cxx
index 227c963a0aebf7b958901fe8cfbb4824ddbd2e89..438f338f461518fe33b0b7c9ca96884e91644f84 100755
--- a/Trigger/TrigT1/TrigT1CaloUtils/src/JetAlgorithm.cxx
+++ b/Trigger/TrigT1/TrigT1CaloUtils/src/JetAlgorithm.cxx
@@ -1,17 +1,15 @@
+/*
+ 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"
diff --git a/Trigger/TrigT1/TrigT1CaloUtils/src/JetElementKey.cxx b/Trigger/TrigT1/TrigT1CaloUtils/src/JetElementKey.cxx
index ca3054e161c9f972c7c19c12b373393bd583b6aa..72f0902d3212b2d1e5de06a47c0225a3120278e9 100755
--- a/Trigger/TrigT1/TrigT1CaloUtils/src/JetElementKey.cxx
+++ b/Trigger/TrigT1/TrigT1CaloUtils/src/JetElementKey.cxx
@@ -1,17 +1,15 @@
+/*
+ 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
diff --git a/Trigger/TrigT1/TrigT1CaloUtils/src/JetElementKeyBase.cxx b/Trigger/TrigT1/TrigT1CaloUtils/src/JetElementKeyBase.cxx
index b557839f0865054b9a697393ff91e0214de374cf..0af624dd2412cacb61413210ae98689e6b8b4c9f 100755
--- a/Trigger/TrigT1/TrigT1CaloUtils/src/JetElementKeyBase.cxx
+++ b/Trigger/TrigT1/TrigT1CaloUtils/src/JetElementKeyBase.cxx
@@ -1,8 +1,10 @@
+/*
+ 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
@@ -10,10 +12,6 @@
/***************************************************************************
* *
- * This program is free software; you can redistribute it and/or modify *
- * it under the terms of the 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
diff --git a/Trigger/TrigT1/TrigT1CaloUtils/src/JetEnergyModuleKey.cxx b/Trigger/TrigT1/TrigT1CaloUtils/src/JetEnergyModuleKey.cxx
index 86a40a0309bc20c0d87677e157c2a605fe307f81..e5af5cb0538a7496321af5b4c48a6c8449116db8 100755
--- a/Trigger/TrigT1/TrigT1CaloUtils/src/JetEnergyModuleKey.cxx
+++ b/Trigger/TrigT1/TrigT1CaloUtils/src/JetEnergyModuleKey.cxx
@@ -1,17 +1,15 @@
+/*
+ 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
diff --git a/Trigger/TrigT1/TrigT1CaloUtils/src/JetInputKey.cxx b/Trigger/TrigT1/TrigT1CaloUtils/src/JetInputKey.cxx
index 9ec344e39055b160f55180831d8fc08e9278b94b..e2383f28956f016bd579ad8dbe6b2c6b2837af0b 100755
--- a/Trigger/TrigT1/TrigT1CaloUtils/src/JetInputKey.cxx
+++ b/Trigger/TrigT1/TrigT1CaloUtils/src/JetInputKey.cxx
@@ -1,17 +1,15 @@
+/*
+ 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
diff --git a/Trigger/TrigT1/TrigT1CaloUtils/src/KeyUtilities.cxx b/Trigger/TrigT1/TrigT1CaloUtils/src/KeyUtilities.cxx
index 2e99972d309b4cb110143a50d4be4c325da970b0..91a8ce2568494c804e537c8bf266d1f1909eb0f1 100755
--- a/Trigger/TrigT1/TrigT1CaloUtils/src/KeyUtilities.cxx
+++ b/Trigger/TrigT1/TrigT1CaloUtils/src/KeyUtilities.cxx
@@ -1,17 +1,15 @@
+/*
+ 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. *
* *
***************************************************************************/
diff --git a/Trigger/TrigT1/TrigT1CaloUtils/src/L1TopoDataMaker.cxx b/Trigger/TrigT1/TrigT1CaloUtils/src/L1TopoDataMaker.cxx
index efb49752dd9f742c2db1d8c43119f396e2f98c8b..cf10e2b470779e5e50feda9f92d2a1a95ff4c9b2 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 74e87563f646a9bb7119251b6bd78146711f3f3a..0ed5b9752812db7fa25a5d62dd6973c16ce165e5 100755
--- a/Trigger/TrigT1/TrigT1CaloUtils/src/ModuleEnergy.cxx
+++ b/Trigger/TrigT1/TrigT1CaloUtils/src/ModuleEnergy.cxx
@@ -1,18 +1,16 @@
+/*
+ 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"
diff --git a/Trigger/TrigT1/TrigT1CaloUtils/src/Parity.cxx b/Trigger/TrigT1/TrigT1CaloUtils/src/Parity.cxx
index cca836cdce2f0bd9160297b14d13563ec96a2ca6..ec9fbb50ee16a0dbb2fc0ec4ff75981e957d2926 100755
--- a/Trigger/TrigT1/TrigT1CaloUtils/src/Parity.cxx
+++ b/Trigger/TrigT1/TrigT1CaloUtils/src/Parity.cxx
@@ -1,17 +1,15 @@
+/*
+ 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. *
* *
***************************************************************************/
diff --git a/Trigger/TrigT1/TrigT1CaloUtils/src/QuadLinear.cxx b/Trigger/TrigT1/TrigT1CaloUtils/src/QuadLinear.cxx
index baba18093d172cbc2176070d6da9947ebcbcca2e..424671f825254ecab1a23f7212b35de9b64f4956 100755
--- a/Trigger/TrigT1/TrigT1CaloUtils/src/QuadLinear.cxx
+++ b/Trigger/TrigT1/TrigT1CaloUtils/src/QuadLinear.cxx
@@ -1,17 +1,15 @@
+/*
+ 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"
diff --git a/Trigger/TrigT1/TrigT1CaloUtils/src/SystemEnergy.cxx b/Trigger/TrigT1/TrigT1CaloUtils/src/SystemEnergy.cxx
index 822fae0b5cfaadd1ae65f383a36da01583f23145..59164952a9d68129cca113ba1577553b9c4e6931 100755
--- a/Trigger/TrigT1/TrigT1CaloUtils/src/SystemEnergy.cxx
+++ b/Trigger/TrigT1/TrigT1CaloUtils/src/SystemEnergy.cxx
@@ -1,17 +1,15 @@
+/*
+ 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/src/TriggerTowerKey.cxx b/Trigger/TrigT1/TrigT1CaloUtils/src/TriggerTowerKey.cxx
index 0f05ff57448b4f342709c14b92b86ebb60cd2905..31ed055932ac11afd08170acff8bd498d7af3a3b 100755
--- a/Trigger/TrigT1/TrigT1CaloUtils/src/TriggerTowerKey.cxx
+++ b/Trigger/TrigT1/TrigT1CaloUtils/src/TriggerTowerKey.cxx
@@ -1,17 +1,15 @@
+/*
+ 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. *
* *
***************************************************************************/
diff --git a/Trigger/TrigT1/TrigT1Interfaces/doc/packagedoc.h b/Trigger/TrigT1/TrigT1Interfaces/doc/packagedoc.h
index 28253da4fb7e90197b32bdc0276d893c87706ae4..e706f50d7b4425f41c6a64a50cb662ea807ae8d9 100644
--- a/Trigger/TrigT1/TrigT1Interfaces/doc/packagedoc.h
+++ b/Trigger/TrigT1/TrigT1Interfaces/doc/packagedoc.h
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
/**
@page TrigT1Interfaces_page TrigT1Interfaces package
diff --git a/Trigger/TrigT1/TrigT1MBTS/doc/packagedoc.h b/Trigger/TrigT1/TrigT1MBTS/doc/packagedoc.h
index 167b5c79aa992a539532d8b72f9a937c600e34b2..f0bc0508a13834356c6557c05dfedc1018813fee 100644
--- a/Trigger/TrigT1/TrigT1MBTS/doc/packagedoc.h
+++ b/Trigger/TrigT1/TrigT1MBTS/doc/packagedoc.h
@@ -1,6 +1,9 @@
/*
Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
*/
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
/**
diff --git a/Trigger/TrigT1/TrigT1Monitoring/doc/packagedoc.h b/Trigger/TrigT1/TrigT1Monitoring/doc/packagedoc.h
index 5be2b651d5e6100d96ab1f57a4b8dc857193a9f9..08d167adcbde723194cc0be9e2c1f962f2af3d3a 100644
--- a/Trigger/TrigT1/TrigT1Monitoring/doc/packagedoc.h
+++ b/Trigger/TrigT1/TrigT1Monitoring/doc/packagedoc.h
@@ -1,6 +1,9 @@
/*
Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
*/
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
/**
diff --git a/Trigger/TrigT1/TrigT1Muctpi/doc/packagedoc.h b/Trigger/TrigT1/TrigT1Muctpi/doc/packagedoc.h
index c4a7fe4f532ddefe063c7ad409ae787b57a415cf..ffc167cfba3483bfc0ddd3e2eefc76293e50d76b 100644
--- a/Trigger/TrigT1/TrigT1Muctpi/doc/packagedoc.h
+++ b/Trigger/TrigT1/TrigT1Muctpi/doc/packagedoc.h
@@ -1,6 +1,9 @@
/*
Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
*/
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
/**
@page TrigT1Muctpi_page TrigT1Muctpi Package
diff --git a/Trigger/TrigT1/TrigT1Result/doc/packagedoc.h b/Trigger/TrigT1/TrigT1Result/doc/packagedoc.h
index 5c2f44df92982a51d819f6300edba321b600225c..a1eb411ee3361580cd2b4944fb32b14fae798f3d 100644
--- a/Trigger/TrigT1/TrigT1Result/doc/packagedoc.h
+++ b/Trigger/TrigT1/TrigT1Result/doc/packagedoc.h
@@ -1,6 +1,9 @@
/*
Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
*/
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
/**
@page TrigT1Result_page TrigT1Result Package
diff --git a/Trigger/TrigT1/TrigT1RoIB/doc/packagedoc.h b/Trigger/TrigT1/TrigT1RoIB/doc/packagedoc.h
index fdfbc5b95f2bc342ddc272edf6e9aa17043ddf27..6c09ece6f34181f23f623d9407d5ef455a8371e0 100644
--- a/Trigger/TrigT1/TrigT1RoIB/doc/packagedoc.h
+++ b/Trigger/TrigT1/TrigT1RoIB/doc/packagedoc.h
@@ -1,6 +1,9 @@
/*
Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
*/
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
/**
@page TrigT1RoIB_page TrigT1RoIB Package
diff --git a/Trigger/TrigT1/TrigT1TGC/doc/packagedoc.h b/Trigger/TrigT1/TrigT1TGC/doc/packagedoc.h
index fa8b72c28b21cae6670cf917dbfdae9958082141..ff873797c0faa120c127604ac4c2f7227ffcd55c 100644
--- a/Trigger/TrigT1/TrigT1TGC/doc/packagedoc.h
+++ b/Trigger/TrigT1/TrigT1TGC/doc/packagedoc.h
@@ -1,6 +1,9 @@
/*
Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
*/
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
/**
@page TrigT1TGC_page TrigT1TGC Package
diff --git a/Trigger/TrigT1/TrigT1TGCRecRoiSvc/doc/packagedoc.h b/Trigger/TrigT1/TrigT1TGCRecRoiSvc/doc/packagedoc.h
index 2d300dd43fb283e941beaada9bf460e97be8610c..4f7bec0c88380944bae23c14ae736bdaae9908e3 100644
--- a/Trigger/TrigT1/TrigT1TGCRecRoiSvc/doc/packagedoc.h
+++ b/Trigger/TrigT1/TrigT1TGCRecRoiSvc/doc/packagedoc.h
@@ -1,6 +1,9 @@
/*
Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
*/
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
/**
@page TrigT1TGCRecRoiSvc_page TrigT1TGCRecRoiSvc Package
diff --git a/Trigger/TrigT1/TrigT1ZDC/doc/packagedoc.h b/Trigger/TrigT1/TrigT1ZDC/doc/packagedoc.h
index 7b0e1d1cb02fdff451d6d0da62e46c4f3b57b4c0..33aeb3d4e2017c638e747aaaf9c623e4b2b1df84 100644
--- a/Trigger/TrigT1/TrigT1ZDC/doc/packagedoc.h
+++ b/Trigger/TrigT1/TrigT1ZDC/doc/packagedoc.h
@@ -1,6 +1,9 @@
/*
Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
*/
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
/**
diff --git a/Trigger/TrigTools/IDScanHitFilter/doc/packagedoc.h b/Trigger/TrigTools/IDScanHitFilter/doc/packagedoc.h
index 47d02054bf05aeca23ed196b13661e9779427290..d4bcebb285441a06d5f9055407b436fa24511540 100644
--- a/Trigger/TrigTools/IDScanHitFilter/doc/packagedoc.h
+++ b/Trigger/TrigTools/IDScanHitFilter/doc/packagedoc.h
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
/*
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
diff --git a/Trigger/TrigTools/IDScanZFinder/doc/packagedoc.h b/Trigger/TrigTools/IDScanZFinder/doc/packagedoc.h
index d5de7d8c46440c42f5ae4c4510bacb1a462a1aed..6a4dffc8d2733a54135609960c53995c6632afdb 100644
--- a/Trigger/TrigTools/IDScanZFinder/doc/packagedoc.h
+++ b/Trigger/TrigTools/IDScanZFinder/doc/packagedoc.h
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
/*
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
diff --git a/Trigger/TrigTools/TrigByteStreamTools/doc/packagedoc.h b/Trigger/TrigTools/TrigByteStreamTools/doc/packagedoc.h
index de3b781fa19ac36a485e63b2c265bc7a873c92b4..4ac9577aae31c0e3252b132e38a5014ebcb419c6 100644
--- a/Trigger/TrigTools/TrigByteStreamTools/doc/packagedoc.h
+++ b/Trigger/TrigTools/TrigByteStreamTools/doc/packagedoc.h
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
/*
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
diff --git a/Trigger/TrigTools/TrigInDetToolInterfaces/doc/packagedoc.h b/Trigger/TrigTools/TrigInDetToolInterfaces/doc/packagedoc.h
index 2cecbe16fee2977a5af792847d09e11cecc2a1dc..412cabdc03874e3b8283ca9981f38b1177b45723 100644
--- a/Trigger/TrigTools/TrigInDetToolInterfaces/doc/packagedoc.h
+++ b/Trigger/TrigTools/TrigInDetToolInterfaces/doc/packagedoc.h
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
/*
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
diff --git a/Trigger/TrigTools/TrigInDetTrackExtrapolator/doc/packagedoc.h b/Trigger/TrigTools/TrigInDetTrackExtrapolator/doc/packagedoc.h
index 61ab6fe8ff1f96d918ad2525bdf22ca424ad419e..e684bc3d80a75489bb349c5928639c805332c88f 100644
--- a/Trigger/TrigTools/TrigInDetTrackExtrapolator/doc/packagedoc.h
+++ b/Trigger/TrigTools/TrigInDetTrackExtrapolator/doc/packagedoc.h
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
/*
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
diff --git a/Trigger/TrigTools/TrigInDetTrackFitter/doc/packagedoc.h b/Trigger/TrigTools/TrigInDetTrackFitter/doc/packagedoc.h
index 83e8503b171f737aa7135cec1a184a34541ec9d1..c2fefbff0d64b10321a7387558cc61d468f5fb66 100644
--- a/Trigger/TrigTools/TrigInDetTrackFitter/doc/packagedoc.h
+++ b/Trigger/TrigTools/TrigInDetTrackFitter/doc/packagedoc.h
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
/*
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
diff --git a/Trigger/TrigTools/TrigOnlineSpacePointTool/doc/packagedoc.h b/Trigger/TrigTools/TrigOnlineSpacePointTool/doc/packagedoc.h
index ff61a632e771af52a94d0c364466eec00e22968f..0b7277618d9cd308cf43b46d9a6cec411cd815f6 100644
--- a/Trigger/TrigTools/TrigOnlineSpacePointTool/doc/packagedoc.h
+++ b/Trigger/TrigTools/TrigOnlineSpacePointTool/doc/packagedoc.h
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
/*
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
diff --git a/Trigger/TrigTools/TrigSiSpacePointTool/doc/packagedoc.h b/Trigger/TrigTools/TrigSiSpacePointTool/doc/packagedoc.h
index 5a1f4f247729096dc7f4af68328afeb18ff6e5ef..6636b86885a53170411dc196f6767539e3f17149 100644
--- a/Trigger/TrigTools/TrigSiSpacePointTool/doc/packagedoc.h
+++ b/Trigger/TrigTools/TrigSiSpacePointTool/doc/packagedoc.h
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
/*
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
diff --git a/Trigger/TrigTools/TrigT2CaloCalibration/doc/packagedoc.h b/Trigger/TrigTools/TrigT2CaloCalibration/doc/packagedoc.h
index a08da906805b114df5301eb699f2cfc72dc88098..eec65109c20b9bdb53244115eccd49749a2db8ca 100644
--- a/Trigger/TrigTools/TrigT2CaloCalibration/doc/packagedoc.h
+++ b/Trigger/TrigTools/TrigT2CaloCalibration/doc/packagedoc.h
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
/*
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
diff --git a/Trigger/TrigTools/TrigTRT_TrackExtensionTool/doc/packagedoc.h b/Trigger/TrigTools/TrigTRT_TrackExtensionTool/doc/packagedoc.h
index 7900cce3e64d3fe67d70bbf6f0edda798923ff1b..8c96edf173c22f946e82ef93e5290f9f90abac25 100644
--- a/Trigger/TrigTools/TrigTRT_TrackExtensionTool/doc/packagedoc.h
+++ b/Trigger/TrigTools/TrigTRT_TrackExtensionTool/doc/packagedoc.h
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
/*
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
diff --git a/Trigger/TrigTools/TrigTimeAlgs/doc/packagedoc.h b/Trigger/TrigTools/TrigTimeAlgs/doc/packagedoc.h
index d8e6fa253613832aa2c5bc4e5d6692dce211c6fa..59125bcd2c1ecd8ef881297f1ca2e541a6e6a864 100644
--- a/Trigger/TrigTools/TrigTimeAlgs/doc/packagedoc.h
+++ b/Trigger/TrigTools/TrigTimeAlgs/doc/packagedoc.h
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
/*
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
diff --git a/Trigger/TrigTools/TrigVKalFitter/doc/packagedoc.h b/Trigger/TrigTools/TrigVKalFitter/doc/packagedoc.h
index dd4ae1c00198673939213e26b2d882fc2e6b6f79..6eaf0b6266a3ceade9f5401c0ac2b8c40a943080 100644
--- a/Trigger/TrigTools/TrigVKalFitter/doc/packagedoc.h
+++ b/Trigger/TrigTools/TrigVKalFitter/doc/packagedoc.h
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
/*
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
diff --git a/Trigger/TrigTools/TrigVertexFitter/doc/packagedoc.h b/Trigger/TrigTools/TrigVertexFitter/doc/packagedoc.h
index f5f16f39bf9aef40a47bb6a2cec1a9994d8905db..79f0126e50d210c265b1f4ad6567685260592fdd 100644
--- a/Trigger/TrigTools/TrigVertexFitter/doc/packagedoc.h
+++ b/Trigger/TrigTools/TrigVertexFitter/doc/packagedoc.h
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
/*
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
diff --git a/Trigger/TrigValidation/TrigInDetValidationWeb/share/TIDAWeb/style.css b/Trigger/TrigValidation/TrigInDetValidationWeb/share/TIDAWeb/style.css
index e375756388f3ae6158e687d431b114ff8162095f..ceca32fc2df6fffac80ef6d42c47930c90069df2 100755
--- a/Trigger/TrigValidation/TrigInDetValidationWeb/share/TIDAWeb/style.css
+++ b/Trigger/TrigValidation/TrigInDetValidationWeb/share/TIDAWeb/style.css
@@ -8,7 +8,7 @@
**
** @author M.Sutton
**
- ** Copyright (C) 2014 M.Sutton (sutt@cern.ch)
+ **
**
** $Id: style.cxx, v0.0 Mon 1 Sep 2014 07:34:00 CEST sutt $
**/
diff --git a/Trigger/TriggerCommon/TriggerJobOpts/doc/packagedoc.h b/Trigger/TriggerCommon/TriggerJobOpts/doc/packagedoc.h
index 8d73731736b136f757baa3e8b8a4a371cc91f310..569698eaf36bab192befa7e0719441bb449e960f 100644
--- a/Trigger/TriggerCommon/TriggerJobOpts/doc/packagedoc.h
+++ b/Trigger/TriggerCommon/TriggerJobOpts/doc/packagedoc.h
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
/*
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
diff --git a/Trigger/TriggerCommon/TriggerMenu/doc/packagedoc.h b/Trigger/TriggerCommon/TriggerMenu/doc/packagedoc.h
index a43f38b63bdbc9535a87daeaa4f1755f0a7876a4..5c309292343b2249197a2e2d070ffecb40a4b439 100644
--- a/Trigger/TriggerCommon/TriggerMenu/doc/packagedoc.h
+++ b/Trigger/TriggerCommon/TriggerMenu/doc/packagedoc.h
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
/*
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
diff --git a/Trigger/TriggerCommon/TriggerMenuXML/doc/packagedoc.h b/Trigger/TriggerCommon/TriggerMenuXML/doc/packagedoc.h
index 7fa5a9b141995eabd47635cd7666643e2f5e0346..3741b88a03be08cf404bca7f8ce19476f8f0d503 100644
--- a/Trigger/TriggerCommon/TriggerMenuXML/doc/packagedoc.h
+++ b/Trigger/TriggerCommon/TriggerMenuXML/doc/packagedoc.h
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
/*
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
diff --git a/Trigger/TriggerSimulation/L1TopoCoreSimulation/L1TopoCoreSimulation/AlgFactory.h b/Trigger/TriggerSimulation/L1TopoCoreSimulation/L1TopoCoreSimulation/AlgFactory.h
index 01185200f552c8026294dfaf09a4a58faa160967..74bcefbb0e8938e5ec5f43d071e12c33b5a2f75d 100644
--- a/Trigger/TriggerSimulation/L1TopoCoreSimulation/L1TopoCoreSimulation/AlgFactory.h
+++ b/Trigger/TriggerSimulation/L1TopoCoreSimulation/L1TopoCoreSimulation/AlgFactory.h
@@ -1,9 +1,11 @@
+/*
+ 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__
diff --git a/Trigger/TriggerSimulation/L1TopoCoreSimulation/L1TopoCoreSimulation/BaseTOB.h b/Trigger/TriggerSimulation/L1TopoCoreSimulation/L1TopoCoreSimulation/BaseTOB.h
index 0c47c799bfe8c91680ae5e855562aa9d0dc119e0..55c05266cc41a2a5a30639ae3fc46d35fbbed0bc 100644
--- a/Trigger/TriggerSimulation/L1TopoCoreSimulation/L1TopoCoreSimulation/BaseTOB.h
+++ b/Trigger/TriggerSimulation/L1TopoCoreSimulation/L1TopoCoreSimulation/BaseTOB.h
@@ -1,9 +1,11 @@
+/*
+ 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__
diff --git a/Trigger/TriggerSimulation/L1TopoCoreSimulation/L1TopoCoreSimulation/ClusterSortingAlg.h b/Trigger/TriggerSimulation/L1TopoCoreSimulation/L1TopoCoreSimulation/ClusterSortingAlg.h
index df56aa28e5832877969481b5adce4b313af70116..aee62bfea8fcc19bc98eeafb9e4ba4587ad41609 100644
--- a/Trigger/TriggerSimulation/L1TopoCoreSimulation/L1TopoCoreSimulation/ClusterSortingAlg.h
+++ b/Trigger/TriggerSimulation/L1TopoCoreSimulation/L1TopoCoreSimulation/ClusterSortingAlg.h
@@ -1,9 +1,11 @@
+/*
+ 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 __TopoCore__ClusterSortingAlg__
diff --git a/Trigger/TriggerSimulation/L1TopoCoreSimulation/L1TopoCoreSimulation/ClusterTOB.h b/Trigger/TriggerSimulation/L1TopoCoreSimulation/L1TopoCoreSimulation/ClusterTOB.h
index 0341b2d517890cbcf1fa1a7f238ab4604f236759..2184d9bc4e38a082538404ee634cbd01f060573a 100644
--- a/Trigger/TriggerSimulation/L1TopoCoreSimulation/L1TopoCoreSimulation/ClusterTOB.h
+++ b/Trigger/TriggerSimulation/L1TopoCoreSimulation/L1TopoCoreSimulation/ClusterTOB.h
@@ -1,9 +1,11 @@
+/*
+ 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__
diff --git a/Trigger/TriggerSimulation/L1TopoCoreSimulation/L1TopoCoreSimulation/ClusterTOBArray.h b/Trigger/TriggerSimulation/L1TopoCoreSimulation/L1TopoCoreSimulation/ClusterTOBArray.h
index 1337ea3df81d52b2d9ef31aeb7a93ca5db92d759..1d30b1674767af4b5f7f89e64688edc7203ebe6c 100644
--- a/Trigger/TriggerSimulation/L1TopoCoreSimulation/L1TopoCoreSimulation/ClusterTOBArray.h
+++ b/Trigger/TriggerSimulation/L1TopoCoreSimulation/L1TopoCoreSimulation/ClusterTOBArray.h
@@ -1,9 +1,11 @@
+/*
+ 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__
diff --git a/Trigger/TriggerSimulation/L1TopoCoreSimulation/L1TopoCoreSimulation/CompositeTOB.h b/Trigger/TriggerSimulation/L1TopoCoreSimulation/L1TopoCoreSimulation/CompositeTOB.h
index 107fc3e18bb9766e0a417e6d3fa819194dc9fed2..4ab74863f6eeedf0abf88b0ffc7b08dba16b9ebd 100644
--- a/Trigger/TriggerSimulation/L1TopoCoreSimulation/L1TopoCoreSimulation/CompositeTOB.h
+++ b/Trigger/TriggerSimulation/L1TopoCoreSimulation/L1TopoCoreSimulation/CompositeTOB.h
@@ -1,9 +1,11 @@
+/*
+ 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__
diff --git a/Trigger/TriggerSimulation/L1TopoCoreSimulation/L1TopoCoreSimulation/ConfigurableAlg.h b/Trigger/TriggerSimulation/L1TopoCoreSimulation/L1TopoCoreSimulation/ConfigurableAlg.h
index 93914f471cec4837ee350ec065efb1c44fda9b0e..f8b6c1312d95d69bc0f171ed9841975d8ff8bb58 100644
--- a/Trigger/TriggerSimulation/L1TopoCoreSimulation/L1TopoCoreSimulation/ConfigurableAlg.h
+++ b/Trigger/TriggerSimulation/L1TopoCoreSimulation/L1TopoCoreSimulation/ConfigurableAlg.h
@@ -1,9 +1,11 @@
+/*
+ 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 __TopoCore__ConfigurableAlg__
diff --git a/Trigger/TriggerSimulation/L1TopoCoreSimulation/L1TopoCoreSimulation/Connector.h b/Trigger/TriggerSimulation/L1TopoCoreSimulation/L1TopoCoreSimulation/Connector.h
index ae190d6756acc3a17cc6fe0428151f76a69e0219..0a41f68796f611daf6cc6293d76fd1e305c1e2a9 100644
--- a/Trigger/TriggerSimulation/L1TopoCoreSimulation/L1TopoCoreSimulation/Connector.h
+++ b/Trigger/TriggerSimulation/L1TopoCoreSimulation/L1TopoCoreSimulation/Connector.h
@@ -1,9 +1,11 @@
+/*
+ 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__
diff --git a/Trigger/TriggerSimulation/L1TopoCoreSimulation/L1TopoCoreSimulation/DataArray.h b/Trigger/TriggerSimulation/L1TopoCoreSimulation/L1TopoCoreSimulation/DataArray.h
index b0f5ed63195f9d464bbe9424ecde1076b693ff05..78fdad8bbf6a3820d99cad615f3c2a4bfca9bc52 100644
--- a/Trigger/TriggerSimulation/L1TopoCoreSimulation/L1TopoCoreSimulation/DataArray.h
+++ b/Trigger/TriggerSimulation/L1TopoCoreSimulation/L1TopoCoreSimulation/DataArray.h
@@ -1,9 +1,11 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
//
// DataArray.h
// L1TopoCoreSimulation
//
// Created by Joerg Stelzer on 11/22/12.
-// Copyright (c) 2012 Joerg Stelzer. All rights reserved.
//
#ifndef __L1TopoCoreSimulation__DataArray__
diff --git a/Trigger/TriggerSimulation/L1TopoCoreSimulation/L1TopoCoreSimulation/Decision.h b/Trigger/TriggerSimulation/L1TopoCoreSimulation/L1TopoCoreSimulation/Decision.h
index f810c1b48929d94879e2e5eff05ed3e1206c0a54..66e766c15a864bf6083b03501f3e032af65c2eab 100644
--- a/Trigger/TriggerSimulation/L1TopoCoreSimulation/L1TopoCoreSimulation/Decision.h
+++ b/Trigger/TriggerSimulation/L1TopoCoreSimulation/L1TopoCoreSimulation/Decision.h
@@ -1,9 +1,11 @@
+/*
+ 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__
diff --git a/Trigger/TriggerSimulation/L1TopoCoreSimulation/L1TopoCoreSimulation/DecisionAlg.h b/Trigger/TriggerSimulation/L1TopoCoreSimulation/L1TopoCoreSimulation/DecisionAlg.h
index 6528ce33c4e978618950549870a2892cf5afa2ac..04bf7b874ab4ccf3d3a6e6bb1f2715c998b0700f 100644
--- a/Trigger/TriggerSimulation/L1TopoCoreSimulation/L1TopoCoreSimulation/DecisionAlg.h
+++ b/Trigger/TriggerSimulation/L1TopoCoreSimulation/L1TopoCoreSimulation/DecisionAlg.h
@@ -1,9 +1,11 @@
+/*
+ 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 __TopoCore__DecisionAlg__
diff --git a/Trigger/TriggerSimulation/L1TopoCoreSimulation/L1TopoCoreSimulation/DeltaPhiLeading.h b/Trigger/TriggerSimulation/L1TopoCoreSimulation/L1TopoCoreSimulation/DeltaPhiLeading.h
index dd9c52e3c67a08231c353ca2658696e7193e768a..20fb8fe6c7fea12226c46ed41052033172ee0da3 100644
--- a/Trigger/TriggerSimulation/L1TopoCoreSimulation/L1TopoCoreSimulation/DeltaPhiLeading.h
+++ b/Trigger/TriggerSimulation/L1TopoCoreSimulation/L1TopoCoreSimulation/DeltaPhiLeading.h
@@ -1,9 +1,11 @@
+/*
+ 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__
diff --git a/Trigger/TriggerSimulation/L1TopoCoreSimulation/L1TopoCoreSimulation/Exception.h b/Trigger/TriggerSimulation/L1TopoCoreSimulation/L1TopoCoreSimulation/Exception.h
index 77a8a7750ea74c367181c1f8709cee12962806e6..4610718f9d111d46bf0dd28fc251d1800af33c48 100644
--- a/Trigger/TriggerSimulation/L1TopoCoreSimulation/L1TopoCoreSimulation/Exception.h
+++ b/Trigger/TriggerSimulation/L1TopoCoreSimulation/L1TopoCoreSimulation/Exception.h
@@ -1,9 +1,11 @@
+/*
+ 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__
diff --git a/Trigger/TriggerSimulation/L1TopoCoreSimulation/L1TopoCoreSimulation/GenericTOB.h b/Trigger/TriggerSimulation/L1TopoCoreSimulation/L1TopoCoreSimulation/GenericTOB.h
index f7509db746ca89d97db6425b14361c7bf7df4564..f781778b32b1e74dbbabc2a9dcc20caed1df9e8c 100644
--- a/Trigger/TriggerSimulation/L1TopoCoreSimulation/L1TopoCoreSimulation/GenericTOB.h
+++ b/Trigger/TriggerSimulation/L1TopoCoreSimulation/L1TopoCoreSimulation/GenericTOB.h
@@ -1,9 +1,11 @@
+/*
+ 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__
diff --git a/Trigger/TriggerSimulation/L1TopoCoreSimulation/L1TopoCoreSimulation/GlobalDecision.h b/Trigger/TriggerSimulation/L1TopoCoreSimulation/L1TopoCoreSimulation/GlobalDecision.h
index ea528b87e914435c5f44609d5fc4716202f281ea..0be1c511f9eea4ce07940252aea222ed4a0a18a1 100644
--- a/Trigger/TriggerSimulation/L1TopoCoreSimulation/L1TopoCoreSimulation/GlobalDecision.h
+++ b/Trigger/TriggerSimulation/L1TopoCoreSimulation/L1TopoCoreSimulation/GlobalDecision.h
@@ -1,9 +1,11 @@
+/*
+ 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__
diff --git a/Trigger/TriggerSimulation/L1TopoCoreSimulation/L1TopoCoreSimulation/Heap.h b/Trigger/TriggerSimulation/L1TopoCoreSimulation/L1TopoCoreSimulation/Heap.h
index 6ca7c593df66007101c12d314e03692d69c922e0..221c82ffecbd669f35e5fc17b8ce6e90cb1f8b4d 100644
--- a/Trigger/TriggerSimulation/L1TopoCoreSimulation/L1TopoCoreSimulation/Heap.h
+++ b/Trigger/TriggerSimulation/L1TopoCoreSimulation/L1TopoCoreSimulation/Heap.h
@@ -1,9 +1,11 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
//
// Heap.h
// L1TopoCoreSimulation
//
// Created by Joerg Stelzer on 11/23/12.
-// Copyright (c) 2012 Joerg Stelzer. All rights reserved.
//
#ifndef __L1TopoCoreSimulation__Heap__
diff --git a/Trigger/TriggerSimulation/L1TopoCoreSimulation/L1TopoCoreSimulation/InputTOBArray.h b/Trigger/TriggerSimulation/L1TopoCoreSimulation/L1TopoCoreSimulation/InputTOBArray.h
index a31b38eeb69df387ad15fdb5f803152377d589af..32b1528a70f5fc47a4dbc3395bca0c409be0f778 100644
--- a/Trigger/TriggerSimulation/L1TopoCoreSimulation/L1TopoCoreSimulation/InputTOBArray.h
+++ b/Trigger/TriggerSimulation/L1TopoCoreSimulation/L1TopoCoreSimulation/InputTOBArray.h
@@ -1,9 +1,11 @@
+/*
+ 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__
diff --git a/Trigger/TriggerSimulation/L1TopoCoreSimulation/L1TopoCoreSimulation/JetTOB.h b/Trigger/TriggerSimulation/L1TopoCoreSimulation/L1TopoCoreSimulation/JetTOB.h
index ba4816358dfc39c36872ec4e7ba3ffbd153f6c78..ae22c5bc3c80ff71585c60d85cfd176a41f1a874 100644
--- a/Trigger/TriggerSimulation/L1TopoCoreSimulation/L1TopoCoreSimulation/JetTOB.h
+++ b/Trigger/TriggerSimulation/L1TopoCoreSimulation/L1TopoCoreSimulation/JetTOB.h
@@ -1,9 +1,11 @@
+/*
+ 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__
diff --git a/Trigger/TriggerSimulation/L1TopoCoreSimulation/L1TopoCoreSimulation/JetTOBArray.h b/Trigger/TriggerSimulation/L1TopoCoreSimulation/L1TopoCoreSimulation/JetTOBArray.h
index cfb919a52f1223f3bd111c0f94d0313fff862522..72edd13a2c32f29fea083378d7263c9c5f406bdc 100644
--- a/Trigger/TriggerSimulation/L1TopoCoreSimulation/L1TopoCoreSimulation/JetTOBArray.h
+++ b/Trigger/TriggerSimulation/L1TopoCoreSimulation/L1TopoCoreSimulation/JetTOBArray.h
@@ -1,9 +1,11 @@
+/*
+ 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__
diff --git a/Trigger/TriggerSimulation/L1TopoCoreSimulation/L1TopoCoreSimulation/LayoutConstraints.h b/Trigger/TriggerSimulation/L1TopoCoreSimulation/L1TopoCoreSimulation/LayoutConstraints.h
index 08edafc51132c72312619df8c269e30adfbaed1f..def97faca7f2f9152610a23337812b7582df93dd 100644
--- a/Trigger/TriggerSimulation/L1TopoCoreSimulation/L1TopoCoreSimulation/LayoutConstraints.h
+++ b/Trigger/TriggerSimulation/L1TopoCoreSimulation/L1TopoCoreSimulation/LayoutConstraints.h
@@ -1,9 +1,11 @@
+/*
+ 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
diff --git a/Trigger/TriggerSimulation/L1TopoCoreSimulation/L1TopoCoreSimulation/Parameter.h b/Trigger/TriggerSimulation/L1TopoCoreSimulation/L1TopoCoreSimulation/Parameter.h
index 9f47624a8fc0b359546bcbf6918e7ba779836be5..612f977f83bb4182cdc45bc481b49d21bdf89590 100644
--- a/Trigger/TriggerSimulation/L1TopoCoreSimulation/L1TopoCoreSimulation/Parameter.h
+++ b/Trigger/TriggerSimulation/L1TopoCoreSimulation/L1TopoCoreSimulation/Parameter.h
@@ -1,9 +1,11 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
//
// Parameter.h
// TopoCore
//
// Created by Joerg Stelzer on 11/18/12.
-// Copyright (c) 2012 Joerg Stelzer. All rights reserved.
//
#ifndef __TopoCore__Parameter__
diff --git a/Trigger/TriggerSimulation/L1TopoCoreSimulation/L1TopoCoreSimulation/ParameterArray.h b/Trigger/TriggerSimulation/L1TopoCoreSimulation/L1TopoCoreSimulation/ParameterArray.h
index 76969e3b24b94a8b4c5757ed157589706e122eda..b4718e7b2903ae56d63b14a0a4133615dbdc247e 100644
--- a/Trigger/TriggerSimulation/L1TopoCoreSimulation/L1TopoCoreSimulation/ParameterArray.h
+++ b/Trigger/TriggerSimulation/L1TopoCoreSimulation/L1TopoCoreSimulation/ParameterArray.h
@@ -1,9 +1,11 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
//
// ParameterArray.h
// TopoCore
//
// Created by Joerg Stelzer on 11/18/12.
-// Copyright (c) 2012 Joerg Stelzer. All rights reserved.
//
// Container for the list of parameters that are used by a single topological algorithms
diff --git a/Trigger/TriggerSimulation/L1TopoCoreSimulation/L1TopoCoreSimulation/ParameterSpace.h b/Trigger/TriggerSimulation/L1TopoCoreSimulation/L1TopoCoreSimulation/ParameterSpace.h
index ee557fbea5b0cd97c3c7c0fc639f2ca9678c770d..fea89f118874c0d9920889bf4ef8b3f44a45d538 100644
--- a/Trigger/TriggerSimulation/L1TopoCoreSimulation/L1TopoCoreSimulation/ParameterSpace.h
+++ b/Trigger/TriggerSimulation/L1TopoCoreSimulation/L1TopoCoreSimulation/ParameterSpace.h
@@ -1,9 +1,11 @@
+/*
+ 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__
diff --git a/Trigger/TriggerSimulation/L1TopoCoreSimulation/L1TopoCoreSimulation/SortingAlg.h b/Trigger/TriggerSimulation/L1TopoCoreSimulation/L1TopoCoreSimulation/SortingAlg.h
index e5d39128b049ef3dc3df725e52c9d774044581ec..72afb414bd0ff7dd1848bf549fa466c9a715cfca 100644
--- a/Trigger/TriggerSimulation/L1TopoCoreSimulation/L1TopoCoreSimulation/SortingAlg.h
+++ b/Trigger/TriggerSimulation/L1TopoCoreSimulation/L1TopoCoreSimulation/SortingAlg.h
@@ -1,9 +1,11 @@
+/*
+ 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 __TopoCore__BaseSortingAlg__
diff --git a/Trigger/TriggerSimulation/L1TopoCoreSimulation/L1TopoCoreSimulation/StatusCode.h b/Trigger/TriggerSimulation/L1TopoCoreSimulation/L1TopoCoreSimulation/StatusCode.h
index 7ca9d3dc9c37111898f4bc6251797d0b861b1b77..878e5a70d6984382d9c3f2d205b72ef67375dbeb 100644
--- a/Trigger/TriggerSimulation/L1TopoCoreSimulation/L1TopoCoreSimulation/StatusCode.h
+++ b/Trigger/TriggerSimulation/L1TopoCoreSimulation/L1TopoCoreSimulation/StatusCode.h
@@ -1,9 +1,11 @@
+/*
+ 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__
diff --git a/Trigger/TriggerSimulation/L1TopoCoreSimulation/L1TopoCoreSimulation/TOBArray.h b/Trigger/TriggerSimulation/L1TopoCoreSimulation/L1TopoCoreSimulation/TOBArray.h
index dc2fa695104d84bb9d478e7ed13e2c0aab07f796..cd6cfad2f3233f2caeabfbc052332cd993f1e9f7 100644
--- a/Trigger/TriggerSimulation/L1TopoCoreSimulation/L1TopoCoreSimulation/TOBArray.h
+++ b/Trigger/TriggerSimulation/L1TopoCoreSimulation/L1TopoCoreSimulation/TOBArray.h
@@ -1,9 +1,11 @@
+/*
+ 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__
diff --git a/Trigger/TriggerSimulation/L1TopoCoreSimulation/L1TopoCoreSimulation/TestClass.h b/Trigger/TriggerSimulation/L1TopoCoreSimulation/L1TopoCoreSimulation/TestClass.h
index 827e1b97291048031ea95a33cfcd6445eaf64853..ed397826ff5d39aaf3439c060ff40ffad7fa39a9 100644
--- a/Trigger/TriggerSimulation/L1TopoCoreSimulation/L1TopoCoreSimulation/TestClass.h
+++ b/Trigger/TriggerSimulation/L1TopoCoreSimulation/L1TopoCoreSimulation/TestClass.h
@@ -1,9 +1,11 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
//
// TestClass.h
// TopoCore
//
// Created by Joerg Stelzer on 11/15/12.
-// Copyright (c) 2012 Joerg Stelzer. All rights reserved.
//
#ifndef __TopoCore__TestClass__
diff --git a/Trigger/TriggerSimulation/L1TopoCoreSimulation/L1TopoCoreSimulation/TopoCoreSimResult.h b/Trigger/TriggerSimulation/L1TopoCoreSimulation/L1TopoCoreSimulation/TopoCoreSimResult.h
index eb12ccbbe745df94929f47233eb38bc48fa429d9..1129605ec4f69f1009ff357a3397a848b9738a68 100644
--- a/Trigger/TriggerSimulation/L1TopoCoreSimulation/L1TopoCoreSimulation/TopoCoreSimResult.h
+++ b/Trigger/TriggerSimulation/L1TopoCoreSimulation/L1TopoCoreSimulation/TopoCoreSimResult.h
@@ -1,9 +1,11 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
//
// TopoCoreSimResult.h
// L1TopoCoreSimulation
//
// Created by Joerg Stelzer on 11/29/12.
-// Copyright (c) 2012 Joerg Stelzer. All rights reserved.
//
#ifndef __L1TopoCoreSimulation__TopoCoreSimResult__
diff --git a/Trigger/TriggerSimulation/L1TopoCoreSimulation/L1TopoCoreSimulation/TopoInputEvent.h b/Trigger/TriggerSimulation/L1TopoCoreSimulation/L1TopoCoreSimulation/TopoInputEvent.h
index aeafdc6490368b11adcaa0acd240e198ffc5acbd..a1ece2dce6a284eb997d054b54b856344f39b1b7 100644
--- a/Trigger/TriggerSimulation/L1TopoCoreSimulation/L1TopoCoreSimulation/TopoInputEvent.h
+++ b/Trigger/TriggerSimulation/L1TopoCoreSimulation/L1TopoCoreSimulation/TopoInputEvent.h
@@ -1,9 +1,11 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
//
// TopoInputEvent.h
// L1TopoCoreSimulation
//
// Created by Joerg Stelzer on 11/21/12.
-// Copyright (c) 2012 Joerg Stelzer. All rights reserved.
//
#ifndef __L1TopoCoreSimulation__TopoInputEvent__
diff --git a/Trigger/TriggerSimulation/L1TopoCoreSimulation/L1TopoCoreSimulation/TopoSteering.h b/Trigger/TriggerSimulation/L1TopoCoreSimulation/L1TopoCoreSimulation/TopoSteering.h
index a280fb535ed01e083e8426078c167f065c77cf7d..87428f94d967442f76205260c7b2aca40b864f04 100644
--- a/Trigger/TriggerSimulation/L1TopoCoreSimulation/L1TopoCoreSimulation/TopoSteering.h
+++ b/Trigger/TriggerSimulation/L1TopoCoreSimulation/L1TopoCoreSimulation/TopoSteering.h
@@ -1,9 +1,11 @@
+/*
+ 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__
diff --git a/Trigger/TriggerSimulation/L1TopoCoreSimulation/L1TopoCoreSimulation/Types.h b/Trigger/TriggerSimulation/L1TopoCoreSimulation/L1TopoCoreSimulation/Types.h
index f15e0f5dd0bdaed9b33ca24876398b188985ace8..14eeb82404c21629d7ae37828275724c8c5d5911 100644
--- a/Trigger/TriggerSimulation/L1TopoCoreSimulation/L1TopoCoreSimulation/Types.h
+++ b/Trigger/TriggerSimulation/L1TopoCoreSimulation/L1TopoCoreSimulation/Types.h
@@ -1,9 +1,11 @@
+/*
+ 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__
diff --git a/Trigger/TriggerSimulation/L1TopoCoreSimulation/src/AlgFactory.cxx b/Trigger/TriggerSimulation/L1TopoCoreSimulation/src/AlgFactory.cxx
index bb10d7e536477a2cab6d3cc1c7b9c01a7873e7bf..e4cdd85fdd97d17d0299d374564b8e874b11af34 100644
--- a/Trigger/TriggerSimulation/L1TopoCoreSimulation/src/AlgFactory.cxx
+++ b/Trigger/TriggerSimulation/L1TopoCoreSimulation/src/AlgFactory.cxx
@@ -1,9 +1,11 @@
+/*
+ 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 "L1TopoCoreSimulation/AlgFactory.h"
diff --git a/Trigger/TriggerSimulation/L1TopoCoreSimulation/src/BaseTOB.cxx b/Trigger/TriggerSimulation/L1TopoCoreSimulation/src/BaseTOB.cxx
index 546f53d4a460a99d230a841e15449874631dd5a6..87d1547d18f9ef74762a08362463ce2b25f55fc3 100644
--- a/Trigger/TriggerSimulation/L1TopoCoreSimulation/src/BaseTOB.cxx
+++ b/Trigger/TriggerSimulation/L1TopoCoreSimulation/src/BaseTOB.cxx
@@ -1,9 +1,11 @@
+/*
+ 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 "L1TopoCoreSimulation/BaseTOB.h"
diff --git a/Trigger/TriggerSimulation/L1TopoCoreSimulation/src/ClusterSortingAlg.cxx b/Trigger/TriggerSimulation/L1TopoCoreSimulation/src/ClusterSortingAlg.cxx
index 6e268280aba44f2016b8803be5bb3093eaa651e5..b98a9a9131355d4a152287eab5a2e49b062edaac 100644
--- a/Trigger/TriggerSimulation/L1TopoCoreSimulation/src/ClusterSortingAlg.cxx
+++ b/Trigger/TriggerSimulation/L1TopoCoreSimulation/src/ClusterSortingAlg.cxx
@@ -1,9 +1,11 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
//
// ClusterSortingAlg.cxx
// TopoCore
//
// Created by Joerg Stelzer on 11/10/12.
-// Copyright (c) 2012 Joerg Stelzer. All rights reserved.
//
#include "L1TopoCoreSimulation/ClusterSortingAlg.h"
diff --git a/Trigger/TriggerSimulation/L1TopoCoreSimulation/src/ClusterTOB.cxx b/Trigger/TriggerSimulation/L1TopoCoreSimulation/src/ClusterTOB.cxx
index 88b1c88f907c059f7898dd3b9827096b0198d89b..90fc28e770da37348b0d9b861995b6302d357554 100644
--- a/Trigger/TriggerSimulation/L1TopoCoreSimulation/src/ClusterTOB.cxx
+++ b/Trigger/TriggerSimulation/L1TopoCoreSimulation/src/ClusterTOB.cxx
@@ -1,9 +1,11 @@
+/*
+ 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 "L1TopoCoreSimulation/ClusterTOB.h"
diff --git a/Trigger/TriggerSimulation/L1TopoCoreSimulation/src/ClusterTOBArray.cxx b/Trigger/TriggerSimulation/L1TopoCoreSimulation/src/ClusterTOBArray.cxx
index 6059aabb8d46ec27b7366d50a0dc17e0f6b4fe7a..a6364ebc91f9d2347a21ba6b8ba94740c45bb422 100644
--- a/Trigger/TriggerSimulation/L1TopoCoreSimulation/src/ClusterTOBArray.cxx
+++ b/Trigger/TriggerSimulation/L1TopoCoreSimulation/src/ClusterTOBArray.cxx
@@ -1,9 +1,11 @@
+/*
+ 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 "L1TopoCoreSimulation/ClusterTOBArray.h"
diff --git a/Trigger/TriggerSimulation/L1TopoCoreSimulation/src/CompositeTOB.cxx b/Trigger/TriggerSimulation/L1TopoCoreSimulation/src/CompositeTOB.cxx
index 6b901764c4d47734854e372d172d612acd601501..dd8c5f4f19881663615ccb2b287ca4e0fd0a68fe 100644
--- a/Trigger/TriggerSimulation/L1TopoCoreSimulation/src/CompositeTOB.cxx
+++ b/Trigger/TriggerSimulation/L1TopoCoreSimulation/src/CompositeTOB.cxx
@@ -1,9 +1,11 @@
+/*
+ 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 "L1TopoCoreSimulation/CompositeTOB.h"
diff --git a/Trigger/TriggerSimulation/L1TopoCoreSimulation/src/ConfigurableAlg.cxx b/Trigger/TriggerSimulation/L1TopoCoreSimulation/src/ConfigurableAlg.cxx
index 3ce4fafd4c3b29e096dd3c69393cd5c4cfb6b9d1..eebf7b29ad98d91fe8a9fe3fe82ef322051c6c81 100644
--- a/Trigger/TriggerSimulation/L1TopoCoreSimulation/src/ConfigurableAlg.cxx
+++ b/Trigger/TriggerSimulation/L1TopoCoreSimulation/src/ConfigurableAlg.cxx
@@ -1,9 +1,11 @@
+/*
+ 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 "L1TopoCoreSimulation/ConfigurableAlg.h"
diff --git a/Trigger/TriggerSimulation/L1TopoCoreSimulation/src/Connector.cxx b/Trigger/TriggerSimulation/L1TopoCoreSimulation/src/Connector.cxx
index 203f54886fa2d434d8c9b50d14988a233d46ef49..ab5f1d6169cbbab49f575d8418675b8c44d2faf7 100644
--- a/Trigger/TriggerSimulation/L1TopoCoreSimulation/src/Connector.cxx
+++ b/Trigger/TriggerSimulation/L1TopoCoreSimulation/src/Connector.cxx
@@ -1,9 +1,11 @@
+/*
+ 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 "L1TopoCoreSimulation/Connector.h"
diff --git a/Trigger/TriggerSimulation/L1TopoCoreSimulation/src/DataArray.cxx b/Trigger/TriggerSimulation/L1TopoCoreSimulation/src/DataArray.cxx
index f2117e74bef607c768e3835d64c2ba5dc6a30cf1..77561a79a8bc04b7da73dd567d57e4907a4dcb9c 100644
--- a/Trigger/TriggerSimulation/L1TopoCoreSimulation/src/DataArray.cxx
+++ b/Trigger/TriggerSimulation/L1TopoCoreSimulation/src/DataArray.cxx
@@ -1,9 +1,11 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
//
// DataArray.cxx
// L1TopoCoreSimulation
//
// Created by Joerg Stelzer on 11/22/12.
-// Copyright (c) 2012 Joerg Stelzer. All rights reserved.
//
#include "L1TopoCoreSimulation/DataArray.h"
diff --git a/Trigger/TriggerSimulation/L1TopoCoreSimulation/src/Decision.cxx b/Trigger/TriggerSimulation/L1TopoCoreSimulation/src/Decision.cxx
index 678b82819534246a71b4b657d55a205df7b188f3..f4b7ff5e9314e240f0bf3b66b6c997cdeac4caef 100644
--- a/Trigger/TriggerSimulation/L1TopoCoreSimulation/src/Decision.cxx
+++ b/Trigger/TriggerSimulation/L1TopoCoreSimulation/src/Decision.cxx
@@ -1,9 +1,11 @@
+/*
+ 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 "L1TopoCoreSimulation/Decision.h"
diff --git a/Trigger/TriggerSimulation/L1TopoCoreSimulation/src/DecisionAlg.cxx b/Trigger/TriggerSimulation/L1TopoCoreSimulation/src/DecisionAlg.cxx
index 938491cda09c3f69e9a0c75c4029958faf389c5e..3a48dea4a509534982c61f5f6832674ca1022026 100644
--- a/Trigger/TriggerSimulation/L1TopoCoreSimulation/src/DecisionAlg.cxx
+++ b/Trigger/TriggerSimulation/L1TopoCoreSimulation/src/DecisionAlg.cxx
@@ -1,9 +1,11 @@
+/*
+ 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 "L1TopoCoreSimulation/DecisionAlg.h"
diff --git a/Trigger/TriggerSimulation/L1TopoCoreSimulation/src/DeltaPhiLeading.cxx b/Trigger/TriggerSimulation/L1TopoCoreSimulation/src/DeltaPhiLeading.cxx
index c4f2f9c3f35f48e18fb92b99415822c5a92cd0dc..8c56e3f0ccb5631383b2833a2f620dc6d11a8fac 100644
--- a/Trigger/TriggerSimulation/L1TopoCoreSimulation/src/DeltaPhiLeading.cxx
+++ b/Trigger/TriggerSimulation/L1TopoCoreSimulation/src/DeltaPhiLeading.cxx
@@ -1,9 +1,11 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
//
// DeltaPhiLeading.cpp
// TopoCore
//
// Created by Joerg Stelzer on 11/16/12.
-// Copyright (c) 2012 Joerg Stelzer. All rights reserved.
//
#include "L1TopoCoreSimulation/DeltaPhiLeading.h"
diff --git a/Trigger/TriggerSimulation/L1TopoCoreSimulation/src/Exception.cxx b/Trigger/TriggerSimulation/L1TopoCoreSimulation/src/Exception.cxx
index 544a017d402ca49f3a1fbf76f15491d919e5698a..912bcc7b6411b0174fb448d5594e778edd7f5c0f 100644
--- a/Trigger/TriggerSimulation/L1TopoCoreSimulation/src/Exception.cxx
+++ b/Trigger/TriggerSimulation/L1TopoCoreSimulation/src/Exception.cxx
@@ -1,9 +1,11 @@
+/*
+ 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 "L1TopoCoreSimulation/Exception.h"
diff --git a/Trigger/TriggerSimulation/L1TopoCoreSimulation/src/GenericTOB.cxx b/Trigger/TriggerSimulation/L1TopoCoreSimulation/src/GenericTOB.cxx
index 9a52edba35df21c9abe1132fe7b832c5e452b083..a04ad8e083ee86c16599ffb0d5373c88aa1c5a5c 100644
--- a/Trigger/TriggerSimulation/L1TopoCoreSimulation/src/GenericTOB.cxx
+++ b/Trigger/TriggerSimulation/L1TopoCoreSimulation/src/GenericTOB.cxx
@@ -1,9 +1,11 @@
+/*
+ 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 "L1TopoCoreSimulation/GenericTOB.h"
diff --git a/Trigger/TriggerSimulation/L1TopoCoreSimulation/src/GlobalDecision.cxx b/Trigger/TriggerSimulation/L1TopoCoreSimulation/src/GlobalDecision.cxx
index 2067e7daaeb20fd07b7261b487a27eb614f4e778..430348f6b4fca28c90bb01766f3f3e0bfd5d07f0 100644
--- a/Trigger/TriggerSimulation/L1TopoCoreSimulation/src/GlobalDecision.cxx
+++ b/Trigger/TriggerSimulation/L1TopoCoreSimulation/src/GlobalDecision.cxx
@@ -1,9 +1,11 @@
+/*
+ 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/TriggerSimulation/L1TopoCoreSimulation/src/Heap.cxx b/Trigger/TriggerSimulation/L1TopoCoreSimulation/src/Heap.cxx
index 8f4d4f20bc7e2ef1cdb9ec1518628c546a57d719..29ba108d728168b1bd0e6b6741c361f3e17c34b1 100644
--- a/Trigger/TriggerSimulation/L1TopoCoreSimulation/src/Heap.cxx
+++ b/Trigger/TriggerSimulation/L1TopoCoreSimulation/src/Heap.cxx
@@ -1,9 +1,11 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
//
// Heap.cxx
// L1TopoCoreSimulation
//
// Created by Joerg Stelzer on 11/23/12.
-// Copyright (c) 2012 Joerg Stelzer. All rights reserved.
//
#include "L1TopoCoreSimulation/Heap.h"
diff --git a/Trigger/TriggerSimulation/L1TopoCoreSimulation/src/InputTOBArray.cxx b/Trigger/TriggerSimulation/L1TopoCoreSimulation/src/InputTOBArray.cxx
index cfd659a035cc0fac9c88522c845ce415140fb990..cc5077c903241cb8de90340062e192cb2fcc3526 100644
--- a/Trigger/TriggerSimulation/L1TopoCoreSimulation/src/InputTOBArray.cxx
+++ b/Trigger/TriggerSimulation/L1TopoCoreSimulation/src/InputTOBArray.cxx
@@ -1,9 +1,11 @@
+/*
+ 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 "L1TopoCoreSimulation/InputTOBArray.h"
diff --git a/Trigger/TriggerSimulation/L1TopoCoreSimulation/src/JetTOB.cxx b/Trigger/TriggerSimulation/L1TopoCoreSimulation/src/JetTOB.cxx
index f27536f50c567de98caf63de7cb4bfebfec96727..493d5337b8c9e46fc92c3832b0786cba4add3a05 100644
--- a/Trigger/TriggerSimulation/L1TopoCoreSimulation/src/JetTOB.cxx
+++ b/Trigger/TriggerSimulation/L1TopoCoreSimulation/src/JetTOB.cxx
@@ -1,9 +1,11 @@
+/*
+ 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 "L1TopoCoreSimulation/JetTOB.h"
diff --git a/Trigger/TriggerSimulation/L1TopoCoreSimulation/src/JetTOBArray.cxx b/Trigger/TriggerSimulation/L1TopoCoreSimulation/src/JetTOBArray.cxx
index 1031e23fadc42e3016ab83a16d98b9409d6dac22..fd70085c780334b416cf7368d863b7a4336eac19 100644
--- a/Trigger/TriggerSimulation/L1TopoCoreSimulation/src/JetTOBArray.cxx
+++ b/Trigger/TriggerSimulation/L1TopoCoreSimulation/src/JetTOBArray.cxx
@@ -1,9 +1,11 @@
+/*
+ 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 "L1TopoCoreSimulation/JetTOBArray.h"
diff --git a/Trigger/TriggerSimulation/L1TopoCoreSimulation/src/LayoutConstraints.cxx b/Trigger/TriggerSimulation/L1TopoCoreSimulation/src/LayoutConstraints.cxx
index 166bffa788a44bdb7bf2af61193d9252dd543e60..955a2bfbd7ff3d211decf2b837869c5d7a6301fc 100644
--- a/Trigger/TriggerSimulation/L1TopoCoreSimulation/src/LayoutConstraints.cxx
+++ b/Trigger/TriggerSimulation/L1TopoCoreSimulation/src/LayoutConstraints.cxx
@@ -1,9 +1,11 @@
+/*
+ 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 "L1TopoCoreSimulation/LayoutConstraints.h"
diff --git a/Trigger/TriggerSimulation/L1TopoCoreSimulation/src/Parameter.cxx b/Trigger/TriggerSimulation/L1TopoCoreSimulation/src/Parameter.cxx
index a3418e758b31bfa748f4b9ad3e93b356e62561f2..973eac5d1c67a83db8e654774a102f20930c75b1 100644
--- a/Trigger/TriggerSimulation/L1TopoCoreSimulation/src/Parameter.cxx
+++ b/Trigger/TriggerSimulation/L1TopoCoreSimulation/src/Parameter.cxx
@@ -1,9 +1,11 @@
+/*
+ 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 "L1TopoCoreSimulation/Parameter.h"
diff --git a/Trigger/TriggerSimulation/L1TopoCoreSimulation/src/ParameterArray.cxx b/Trigger/TriggerSimulation/L1TopoCoreSimulation/src/ParameterArray.cxx
index a218390724bbbcb0761c92b061c81cc5814dd4d5..68ddeca49a76bf0a77b16ce780e9bb2c100ee54a 100644
--- a/Trigger/TriggerSimulation/L1TopoCoreSimulation/src/ParameterArray.cxx
+++ b/Trigger/TriggerSimulation/L1TopoCoreSimulation/src/ParameterArray.cxx
@@ -1,9 +1,11 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
//
// ParameterArray.cxx
// TopoCore
//
// Created by Joerg Stelzer on 11/18/12.
-// Copyright (c) 2012 Joerg Stelzer. All rights reserved.
//
#include "L1TopoCoreSimulation/ParameterArray.h"
diff --git a/Trigger/TriggerSimulation/L1TopoCoreSimulation/src/ParameterSpace.cxx b/Trigger/TriggerSimulation/L1TopoCoreSimulation/src/ParameterSpace.cxx
index 85aa2af72182355f3e969f031051bb1cb09ece7a..1458c1ad9bb6730763fc222f3f347170951c6b76 100644
--- a/Trigger/TriggerSimulation/L1TopoCoreSimulation/src/ParameterSpace.cxx
+++ b/Trigger/TriggerSimulation/L1TopoCoreSimulation/src/ParameterSpace.cxx
@@ -1,9 +1,11 @@
+/*
+ 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 "L1TopoCoreSimulation/ParameterSpace.h"
diff --git a/Trigger/TriggerSimulation/L1TopoCoreSimulation/src/SortingAlg.cxx b/Trigger/TriggerSimulation/L1TopoCoreSimulation/src/SortingAlg.cxx
index 08dad851ae7b5234d441d714590079b38b21ba29..e8b35b69b53df38cbc5703258f2040960616dab5 100644
--- a/Trigger/TriggerSimulation/L1TopoCoreSimulation/src/SortingAlg.cxx
+++ b/Trigger/TriggerSimulation/L1TopoCoreSimulation/src/SortingAlg.cxx
@@ -1,9 +1,11 @@
+/*
+ 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 "L1TopoCoreSimulation/SortingAlg.h"
diff --git a/Trigger/TriggerSimulation/L1TopoCoreSimulation/src/StatusCode.cxx b/Trigger/TriggerSimulation/L1TopoCoreSimulation/src/StatusCode.cxx
index e50c550e9150ca7f5ca393dc9c6bacc0ef88b0a9..e15d845e0263f62084049401c805dcad9bfae7a9 100644
--- a/Trigger/TriggerSimulation/L1TopoCoreSimulation/src/StatusCode.cxx
+++ b/Trigger/TriggerSimulation/L1TopoCoreSimulation/src/StatusCode.cxx
@@ -1,9 +1,11 @@
+/*
+ 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 "L1TopoCoreSimulation/StatusCode.h"
diff --git a/Trigger/TriggerSimulation/L1TopoCoreSimulation/src/TOBArray.cxx b/Trigger/TriggerSimulation/L1TopoCoreSimulation/src/TOBArray.cxx
index 741f1e79e90bbad3876faeeb832c6b95f0a23bef..680229dfd90da5c049e5ef413e0835147239d66b 100644
--- a/Trigger/TriggerSimulation/L1TopoCoreSimulation/src/TOBArray.cxx
+++ b/Trigger/TriggerSimulation/L1TopoCoreSimulation/src/TOBArray.cxx
@@ -1,9 +1,11 @@
+/*
+ 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 "L1TopoCoreSimulation/TOBArray.h"
diff --git a/Trigger/TriggerSimulation/L1TopoCoreSimulation/src/TopoCoreSimResult.cxx b/Trigger/TriggerSimulation/L1TopoCoreSimulation/src/TopoCoreSimResult.cxx
index 130ee852b393bd256a24ef188be977f2e796e168..8a874f19a68d0ddcc9600edea43a682739e8bf9a 100644
--- a/Trigger/TriggerSimulation/L1TopoCoreSimulation/src/TopoCoreSimResult.cxx
+++ b/Trigger/TriggerSimulation/L1TopoCoreSimulation/src/TopoCoreSimResult.cxx
@@ -1,9 +1,11 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
//
// TopoCoreSimResult.cxx
// L1TopoCoreSimulation
//
// Created by Joerg Stelzer on 11/29/12.
-// Copyright (c) 2012 Joerg Stelzer. All rights reserved.
//
#include "L1TopoCoreSimulation/TopoCoreSimResult.h"
diff --git a/Trigger/TriggerSimulation/L1TopoCoreSimulation/src/TopoInputEvent.cxx b/Trigger/TriggerSimulation/L1TopoCoreSimulation/src/TopoInputEvent.cxx
index 0526e07dfca0ad4aad20060e1576c4aa28e501d7..af8590f69ba616d1511250c1f5f3d58f84d21022 100644
--- a/Trigger/TriggerSimulation/L1TopoCoreSimulation/src/TopoInputEvent.cxx
+++ b/Trigger/TriggerSimulation/L1TopoCoreSimulation/src/TopoInputEvent.cxx
@@ -1,9 +1,11 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
//
// TopoInputEvent.cxx
// L1TopoCoreSimulation
//
// Created by Joerg Stelzer on 11/21/12.
-// Copyright (c) 2012 Joerg Stelzer. All rights reserved.
//
#include "L1TopoCoreSimulation/TopoInputEvent.h"
diff --git a/Trigger/TriggerSimulation/L1TopoCoreSimulation/src/TopoSteering.cxx b/Trigger/TriggerSimulation/L1TopoCoreSimulation/src/TopoSteering.cxx
index 3ab0e35890f9abf932300ab527267a1efae79c17..0363f457ae2da8a1363689ac87044792cc883f8a 100644
--- a/Trigger/TriggerSimulation/L1TopoCoreSimulation/src/TopoSteering.cxx
+++ b/Trigger/TriggerSimulation/L1TopoCoreSimulation/src/TopoSteering.cxx
@@ -1,9 +1,11 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
//
// TopoSteering.cxx
// L1TopoCoreSimulation
//
// Created by Joerg Stelzer on 11/20/12.
-// Copyright (c) 2012 Joerg Stelzer. All rights reserved.
//
#include "L1TopoCoreSimulation/TopoSteering.h"
diff --git a/Trigger/TriggerSimulation/L1TopoCoreSimulation/src/Types.cxx b/Trigger/TriggerSimulation/L1TopoCoreSimulation/src/Types.cxx
index 70c42f64f7e475332f7a6050e107ca77c062790b..741138e9d5b4fb05e121944c3375f1d5ecc0c43b 100644
--- a/Trigger/TriggerSimulation/L1TopoCoreSimulation/src/Types.cxx
+++ b/Trigger/TriggerSimulation/L1TopoCoreSimulation/src/Types.cxx
@@ -1,9 +1,11 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
//
// Types.cxx
// L1TopoCoreSimulation
//
// Created by Joerg Stelzer on 11/22/12.
-// Copyright (c) 2012 Joerg Stelzer. All rights reserved.
//
#include "L1TopoCoreSimulation/Types.h"
diff --git a/Trigger/TriggerSimulation/L1TopoCoreSimulation/src/test/TopoTest.cxx b/Trigger/TriggerSimulation/L1TopoCoreSimulation/src/test/TopoTest.cxx
index 18e8897ba70e9cfbc2c04c32e26b6964936d4664..4b498906364f2ca081897e41253634268607a170 100644
--- a/Trigger/TriggerSimulation/L1TopoCoreSimulation/src/test/TopoTest.cxx
+++ b/Trigger/TriggerSimulation/L1TopoCoreSimulation/src/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/graphics/VP1/VP1Plugins/VP13DCocktailPlugin/VP13DCocktailPlugin/VP13DCocktailPlugin_VP1AutoFactory.h b/graphics/VP1/VP1Plugins/VP13DCocktailPlugin/VP13DCocktailPlugin/VP13DCocktailPlugin_VP1AutoFactory.h
index 0949573db046d029d2c93162172433889b467773..352cf1775f22e3b6e9944b05c02ffa492c5b9ee5 100644
--- a/graphics/VP1/VP1Plugins/VP13DCocktailPlugin/VP13DCocktailPlugin/VP13DCocktailPlugin_VP1AutoFactory.h
+++ b/graphics/VP1/VP1Plugins/VP13DCocktailPlugin/VP13DCocktailPlugin/VP13DCocktailPlugin_VP1AutoFactory.h
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
// Originally autogenerated by CMT with VP1 Factory Code Header File (Fri Aug 19 13:36:52 CEST 2016)
// Now we add this file to plugins by hand, to simplify the CMake compilation
diff --git a/graphics/VP1/VP1Plugins/VP13DCocktailPlugin/VP13DCocktailPlugin/VP1TrackCaloPlugin_VP1AutoFactory.h b/graphics/VP1/VP1Plugins/VP13DCocktailPlugin/VP13DCocktailPlugin/VP1TrackCaloPlugin_VP1AutoFactory.h
index b317e56342650e86e4506ba1a708e3beb0ce807d..dda7244890db6a52473fec2480bb23bec1f86f10 100644
--- a/graphics/VP1/VP1Plugins/VP13DCocktailPlugin/VP13DCocktailPlugin/VP1TrackCaloPlugin_VP1AutoFactory.h
+++ b/graphics/VP1/VP1Plugins/VP13DCocktailPlugin/VP13DCocktailPlugin/VP1TrackCaloPlugin_VP1AutoFactory.h
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
// Originally autogenerated by CMT with VP1 Factory Code Header File (Fri Aug 19 13:36:52 CEST 2016)
// Now we add this file to plugins by hand, to simplify the CMake compilation
diff --git a/graphics/VP1/VP1Plugins/VP1AODPlugin/VP1AODPlugin/VP1AODPlugin_VP1AutoFactory.h b/graphics/VP1/VP1Plugins/VP1AODPlugin/VP1AODPlugin/VP1AODPlugin_VP1AutoFactory.h
index 0c22e42cee9181fb24a60a2918a4bdaca15f1600..453e4cb53fee44186cba56eeaf76e450bf9dd15e 100644
--- a/graphics/VP1/VP1Plugins/VP1AODPlugin/VP1AODPlugin/VP1AODPlugin_VP1AutoFactory.h
+++ b/graphics/VP1/VP1Plugins/VP1AODPlugin/VP1AODPlugin/VP1AODPlugin_VP1AutoFactory.h
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
// Originally autogenerated by CMT with VP1 Factory Code Header File (Fri Aug 19 13:36:52 CEST 2016)
// Now we add this file to plugins by hand, to simplify the CMake compilation
diff --git a/graphics/VP1/VP1Plugins/VP1AODPlugin/src/VP1AODPlugin_VP1AutoFactory.cxx b/graphics/VP1/VP1Plugins/VP1AODPlugin/src/VP1AODPlugin_VP1AutoFactory.cxx
index eb03753bc2ccc2a31ba5e9eba2622fcb684ec935..e0e625420dc9430fdf2c4197b53d1bb050f7be57 100644
--- a/graphics/VP1/VP1Plugins/VP1AODPlugin/src/VP1AODPlugin_VP1AutoFactory.cxx
+++ b/graphics/VP1/VP1Plugins/VP1AODPlugin/src/VP1AODPlugin_VP1AutoFactory.cxx
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
// Originally autogenerated by CMT with VP1 Factory Code Header File (Fri Aug 19 13:36:52 CEST 2016)
// Now we add this file to plugins by hand, to simplify the CMake compilation
diff --git a/graphics/VP1/VP1Plugins/VP1GeometryPlugin/VP1GeometryPlugin/VP1GeometryPlugin_VP1AutoFactory.h b/graphics/VP1/VP1Plugins/VP1GeometryPlugin/VP1GeometryPlugin/VP1GeometryPlugin_VP1AutoFactory.h
index acf53538f4349e44b59a313a02a08c532e03327b..bde4db6482cbd4132ed25b6d3ee78a427c56477f 100644
--- a/graphics/VP1/VP1Plugins/VP1GeometryPlugin/VP1GeometryPlugin/VP1GeometryPlugin_VP1AutoFactory.h
+++ b/graphics/VP1/VP1Plugins/VP1GeometryPlugin/VP1GeometryPlugin/VP1GeometryPlugin_VP1AutoFactory.h
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
//Autogenerated VP1 Factory Code Header File (Fri Aug 19 13:36:52 CEST 2016)
#ifndef VP1GeometryPlugin_VP1AutoFactory_H
diff --git a/graphics/VP1/VP1Plugins/VP1GeometryPlugin/src/VP1GeometryPlugin_VP1AutoFactory.cxx b/graphics/VP1/VP1Plugins/VP1GeometryPlugin/src/VP1GeometryPlugin_VP1AutoFactory.cxx
index 767327a778bbd894bb69267c0bd79651db7ce761..2c6338cb222b82d655de6e47a38f3ddce014060a 100644
--- a/graphics/VP1/VP1Plugins/VP1GeometryPlugin/src/VP1GeometryPlugin_VP1AutoFactory.cxx
+++ b/graphics/VP1/VP1Plugins/VP1GeometryPlugin/src/VP1GeometryPlugin_VP1AutoFactory.cxx
@@ -1,3 +1,6 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
//Autogenerated VP1 Factory Code Implementation File (Fri Aug 19 13:36:52 CEST 2016)
#include <QtPlugin>