From 5b57914e5addadf26af5dfafb780232fbac6794f Mon Sep 17 00:00:00 2001
From: Edward Moyse <edward.moyse@cern.ch>
Date: Tue, 18 Dec 2018 08:09:16 +0100
Subject: [PATCH 1/8] Updating copyright and private licences
---
.../IOVDbTestAlg/src/IOVDbTestAlg_entries.cxx | 3 +++
.../GoogleTestTools/InitGaudiGoogleTest.h | 3 +++
.../GoogleTestTools/src/InitGaudiGoogleTest.cxx | 3 +++
.../GoogleTestTools/test/gt_GoogleTestTools.cxx | 3 +++
.../src/CaloDetMgrDetDescrCnv_entries.cxx | 3 +++
.../CaloCnv/CaloIdCnv/src/CaloIdCnv_entries.cxx | 3 +++
.../src/CaloTTDetDescrCnv_entries.cxx | 3 +++
Calorimeter/CaloEvent/CaloEvent/CaloBCIDAverage.h | 3 +++
Calorimeter/CaloEvent/CaloEvent/CaloTester.h | 4 +++-
Calorimeter/CaloEvent/src/CaloBCIDAverage.cxx | 3 +++
.../CaloEvent/src/CaloCellContainerVector.cxx | 3 +++
Calorimeter/CaloEvent/src/CaloTester.cxx | 4 +++-
Calorimeter/CaloEvent/test/CaloTester_test.cxx | 4 +++-
.../CaloIdentifier/CaloIdentifier/CaloHelpersTest.h | 4 +++-
Calorimeter/CaloIdentifier/src/CaloHelpersTest.cxx | 4 +++-
.../CaloIdentifier/test/CaloHelpersTest_test.cxx | 4 +++-
.../src/CaloClusterMomentsMaker_DigiHSTruth.cxx | 3 +++
.../src/CaloClusterMomentsMaker_DigiHSTruth.h | 3 +++
.../test/CaloCellContainerFromClusterTool_test.cxx | 4 +++-
.../AthContainers/tools/AtomicConstAccessor.h | 3 +++
.../AthContainers/tools/AtomicConstAccessor.icc | 3 +++
.../AthContainers/tools/AtomicDecorator.h | 3 +++
.../AthContainers/tools/AtomicDecorator.icc | 3 +++
.../AthContainers/test/AtomicConstAccessor_test.cxx | 4 +++-
Control/AthContainers/test/AtomicDecorator_test.cxx | 4 +++-
.../AthContainersRoot/AthContainersRoot/test/Foo.h | 4 +++-
.../AsgExampleTools/AsgExampleTools/IUnitTestTool1.h | 2 +-
.../AsgExampleTools/AsgExampleTools/IUnitTestTool2.h | 2 +-
.../AsgExampleTools/AsgExampleTools/IUnitTestTool3.h | 2 +-
.../AsgExampleTools/AsgExampleTools/UnitTestTool1.h | 2 +-
.../AsgExampleTools/AsgExampleTools/UnitTestTool1A.h | 2 +-
.../AsgExampleTools/AsgExampleTools/UnitTestTool2.h | 2 +-
.../AsgExampleTools/AsgExampleTools/UnitTestTool3.h | 2 +-
.../AsgExampleTools/Root/UnitTestTool1.cxx | 2 +-
.../AsgExampleTools/Root/UnitTestTool1A.cxx | 2 +-
.../AsgExampleTools/Root/UnitTestTool2.cxx | 2 +-
.../AsgExampleTools/Root/UnitTestTool3.cxx | 2 +-
.../AsgExampleTools/test/gt_AnaToolHandle_test.cxx | 2 +-
.../AsgExampleTools/test/gt_ToolHandle_test.cxx | 2 +-
.../AsgExampleTools/test/inc_IUnitTestTool1.cxx | 2 +-
.../AsgExampleTools/test/inc_IUnitTestTool2.cxx | 2 +-
.../AthToolSupport/AsgTools/AsgTools/AnaToolHandle.h | 2 +-
.../AthToolSupport/AsgTools/AsgTools/Deprecated.h | 2 +-
.../AsgTools/AsgTools/IMessagePrinter.h | 2 +-
.../AsgTools/AsgTools/INamedInterface.h | 2 +-
.../AthToolSupport/AsgTools/AsgTools/MessageCheck.h | 2 +-
.../AsgTools/AsgTools/MessagePrinter.h | 2 +-
.../AsgTools/AsgTools/MessagePrinterErrorCollect.h | 2 +-
.../AsgTools/AsgTools/MessagePrinterMock.h | 2 +-
.../AsgTools/AsgTools/MessagePrinterOverlay.h | 2 +-
Control/AthToolSupport/AsgTools/AsgTools/UnitTest.h | 2 +-
.../AthToolSupport/AsgTools/Root/AnaToolHandle.cxx | 2 +-
.../AthToolSupport/AsgTools/Root/INamedInterface.cxx | 2 +-
.../AthToolSupport/AsgTools/Root/MessageCheck.cxx | 2 +-
.../AthToolSupport/AsgTools/Root/MessagePrinter.cxx | 2 +-
.../AsgTools/Root/MessagePrinterErrorCollect.cxx | 2 +-
.../AsgTools/Root/MessagePrinterOverlay.cxx | 2 +-
Control/AthToolSupport/AsgTools/Root/UnitTest.cxx | 2 +-
Control/AthToolSupport/AsgTools/test/gt_AsgTool.cxx | 2 +-
.../AthToolSupport/AsgTools/test/gt_MessageCheck.cxx | 2 +-
.../AthToolSupport/AsgTools/test/gt_TProperty.cxx | 2 +-
.../AsgTools/test/gt_UnitTest_test.cxx | 2 +-
.../AthToolSupport/AsgTools/test/inc_Deprecated.cxx | 2 +-
.../AsgTools/test/inc_MessageCheck.cxx | 2 +-
.../AthToolSupport/AsgTools/test/ut_MessageCheck.cxx | 2 +-
Control/AthViews/AthViews/IViewsMergerTool.h | 3 +++
.../AthenaBaseComps/AthAlgStartVisitor.h | 4 +++-
.../AthenaBaseComps/AthenaBaseComps/AthProperties.h | 4 +++-
Control/AthenaBaseComps/src/AthAlgStartVisitor.cxx | 4 +++-
.../AthenaBaseComps/test/AthAlgStartVisitor_test.cxx | 4 +++-
.../AthAsgExUnittest/MyPackageDict.h | 3 +++
.../AthAsgExUnittest/test/gt_AthAsgExUnittest.cxx | 4 +++-
.../AthExUnittest/AthExUnittest/AthExUnittestDict.h | 3 +++
Control/AthenaKernel/AthenaKernel/CondCont.h | 4 +++-
Control/AthenaKernel/AthenaKernel/CondCont.icc | 4 +++-
.../AthenaKernel/IConditionsCleanerSvc.h | 4 +++-
.../AthenaKernel/AthenaKernel/MetaContDataBucket.h | 4 +++-
.../AthenaKernel/AthenaKernel/MetaContDataBucket.icc | 4 +++-
.../AthenaKernel/AthenaKernel/RecyclableDataObject.h | 4 +++-
.../AthenaKernel/RecyclableDataObject.icc | 4 +++-
Control/AthenaKernel/src/CondCont.cxx | 3 +++
Control/AthenaKernel/src/IAthRNGSvc.cxx | 3 +++
Control/AthenaKernel/src/StoreID.cxx | 3 +++
Control/AthenaKernel/test/CondCont_test.cxx | 4 +++-
.../AthenaKernel/test/MetaContDataBucket_test.cxx | 4 +++-
.../AthenaKernel/test/RecyclableDataObject_test.cxx | 4 +++-
Control/AthenaKernel/test/TopBase_test.cxx | 4 +++-
Control/AthenaMonitoring/doc/Monitored_page.h | 3 +++
Control/AthenaServices/src/AthIncFirerAlg.cxx | 3 +++
Control/AthenaServices/src/AthIncFirerAlg.h | 3 +++
Control/AthenaServices/src/ConditionsCleanerSvc.cxx | 4 +++-
Control/AthenaServices/src/ConditionsCleanerSvc.h | 4 +++-
.../src/DelayedConditionsCleanerSvc.cxx | 4 +++-
.../AthenaServices/src/DelayedConditionsCleanerSvc.h | 4 +++-
.../test/ConditionsCleanerSvc_test.cxx | 4 +++-
.../test/DelayedConditionsCleanerSvc_test.cxx | 4 +++-
Control/CxxUtils/CxxUtils/CachedPointer.icc | 3 +++
Control/CxxUtils/CxxUtils/CachedValue.h | 4 +++-
Control/CxxUtils/CxxUtils/CachedValue.icc | 4 +++-
Control/CxxUtils/CxxUtils/ConcurrentBitset.h | 4 +++-
Control/CxxUtils/CxxUtils/ConcurrentBitset.icc | 3 +++
Control/CxxUtils/CxxUtils/ConcurrentRangeMap.h | 4 +++-
Control/CxxUtils/CxxUtils/ConcurrentRangeMap.icc | 4 +++-
Control/CxxUtils/CxxUtils/MurmurHash2.h | 4 +++-
Control/CxxUtils/CxxUtils/Ring.h | 4 +++-
Control/CxxUtils/CxxUtils/Ring.icc | 4 +++-
Control/CxxUtils/CxxUtils/bitmask.h | 4 +++-
Control/CxxUtils/CxxUtils/crc64.h | 4 +++-
Control/CxxUtils/CxxUtils/features.h | 4 +++-
Control/CxxUtils/CxxUtils/ubsan_suppress.h | 3 +++
Control/CxxUtils/Root/ConcurrentBitset.cxx | 3 +++
Control/CxxUtils/Root/MurmurHash2.cxx | 4 +++-
Control/CxxUtils/Root/crc64.cxx | 4 +++-
Control/CxxUtils/Root/ubsan_suppress.cxx | 3 +++
Control/CxxUtils/test/ConcurrentBitset_test.cxx | 4 +++-
Control/CxxUtils/test/ConcurrentRangeMap_test.cxx | 4 +++-
Control/CxxUtils/test/MurmurHash2_test.cxx | 4 +++-
Control/CxxUtils/test/Ring_test.cxx | 4 +++-
Control/CxxUtils/test/crc64_test.cxx | 4 +++-
.../DataModelTestDataCommon/S3.h | 4 +++-
.../DataModelTestDataCommon/S3Cond.h | 4 +++-
.../DataModelTestDataCommon/src/CondAlg1.cxx | 4 +++-
.../DataModelTestDataCommon/src/CondAlg2.cxx | 4 +++-
.../DataModelTestDataCommon/src/CondAlg2.h | 4 +++-
.../DataModelTestDataCommon/src/CondReaderAlg.cxx | 4 +++-
.../DataModelTestDataCommon/src/CondReaderAlg.h | 4 +++-
.../DataModelTestDataCommon/src/CondWriterAlg.cxx | 4 +++-
.../DataModelTestDataCommon/src/CondWriterAlg.h | 4 +++-
Control/IOVSvc/test/IOVSvc_test.cxx | 4 +++-
Control/RngComps/test/RNGWrapper_test.cxx | 3 +++
Control/StoreGate/StoreGate/ReadDecorHandleKey.icc | 4 +++-
Control/StoreGate/StoreGate/SGIterator.h | 4 +++-
Control/StoreGate/StoreGate/SGIterator.icc | 4 +++-
Control/StoreGate/StoreGate/VarHandleKey.icc | 3 +++
Control/StoreGate/src/SGIterator.cxx | 4 +++-
.../StoreGate/test/ReadDecorHandleKeyArray_test.cxx | 4 +++-
Control/StoreGate/test/ReadDecorHandle_test.cxx | 4 +++-
.../StoreGate/test/WriteDecorHandleKeyArray_test.cxx | 4 +++-
Control/StoreGate/test/WriteDecorHandle_test.cxx | 4 +++-
DataQuality/HanConfigGenerator/src/addnode.cxx | 2 +-
DataQuality/HanConfigGenerator/src/addnode.h | 2 +-
DataQuality/HanConfigGenerator/src/hcg.cxx | 2 +-
DataQuality/HanConfigGenerator/src/node.h | 2 +-
.../OnlineLumiCalibrationCondData.h | 4 +++-
.../src/OnlineLumiCalibrationCondAlg.cxx | 4 +++-
.../src/OnlineLumiCalibrationCondAlg.h | 4 +++-
.../test/OnlineLumiCalibrationCondAlg_test.cxx | 4 +++-
.../test/OnlineLumiCalibrationCondData_test.cxx | 4 +++-
Database/IOVDbSvc/src/FolderTypes.cxx | 3 +++
Database/IOVDbSvc/test/IOVDbSvc_test.cxx | 4 +++-
.../IRegionSelector/IRegionSelector/IRegSelSvc.h | 4 +++-
.../IRegionSelector/IRegionSelector/IRoiDescriptor.h | 4 +++-
.../IRegionSelector/IRegionSelector/RoiUtil.h | 4 +++-
.../src/IdDictDetDescrCnv_entries.cxx | 3 +++
.../RegSelLUT/RegSelLUT/RegSelEtaPhiLUT.h | 4 +++-
.../RegSelLUT/RegSelLUT/RegSelEtaPhiModule.h | 4 +++-
DetectorDescription/RegSelLUT/RegSelLUT/RegSelROB.h | 4 +++-
.../RegSelLUT/src/RegSelEtaPhiLUT.cxx | 4 +++-
DetectorDescription/RegSelLUT/src/RegSelROB.cxx | 4 +++-
.../RoiDescriptor/RoiDescriptor/RoiDescriptor.h | 4 +++-
DetectorDescription/RoiDescriptor/Root/RoiUtil.cxx | 4 +++-
.../test/HepLorentzVectorCnv_p1_test.cxx | 4 +++-
.../test/INav4MomAssocsCnv_p1_test.cxx | 4 +++-
.../test/INav4MomAssocsCnv_p2_test.cxx | 4 +++-
.../test/INav4MomAssocsCnv_p3_test.cxx | 4 +++-
.../EventCommonTPCnv/test/P4EEtaPhiMCnv_p1_test.cxx | 4 +++-
.../EventCommonTPCnv/test/P4EEtaPhiMCnv_p2_test.cxx | 4 +++-
.../test/P4IPtCotThPhiMCnv_p1_test.cxx | 4 +++-
.../test/P4ImplEEtaPhiMCnv_p1_test.cxx | 4 +++-
.../test/P4ImplEEtaPhiMCnv_p2_test.cxx | 4 +++-
.../test/P4ImplPtEtaPhiMCnv_p1_test.cxx | 4 +++-
.../test/P4ImplPtEtaPhiMCnv_p2_test.cxx | 4 +++-
.../EventCommonTPCnv/test/P4PtEtaPhiMCnv_p1_test.cxx | 4 +++-
.../EventCommonTPCnv/test/P4PtEtaPhiMCnv_p2_test.cxx | 4 +++-
Event/EventCommonTPCnv/test/P4PxPyPzECnv_p1_test.cxx | 4 +++-
.../src/IdentifiableContainerBase.cxx | 3 +++
Event/EventInfoMgt/src/EventInfoMgt_entries.cxx | 3 +++
.../xAODCore/test/ut_xaodcore_auxinfobase_test.cxx | 4 +++-
.../test/ut_xaodeventinfo_eventauxinfo_v1_test.cxx | 4 +++-
.../test/ut_xaodeventinfo_eventinfo_v1_test.cxx | 4 +++-
...t_xaodeventinfo_eventinfoauxcontainer_v1_test.cxx | 4 +++-
.../Root/TrackCaloClusterAuxContainer_v1.cxx | 3 +++
Event/xAOD/xAODPFlow/Root/TrackCaloCluster_v1.cxx | 3 +++
Event/xAOD/xAODPFlow/xAODPFlow/TrackCaloCluster.h | 3 +++
.../xAODPFlow/TrackCaloClusterAuxContainer.h | 3 +++
.../xAODPFlow/xAODPFlow/TrackCaloClusterContainer.h | 3 +++
.../versions/TrackCaloClusterAuxContainer_v1.h | 3 +++
.../versions/TrackCaloClusterContainer_v1.h | 3 +++
.../xAODPFlow/versions/TrackCaloCluster_v1.h | 3 +++
.../src/xAODTrackCaloClusterAuxContainerCnv.cxx | 3 +++
.../src/xAODTrackCaloClusterAuxContainerCnv.h | 3 +++
.../src/xAODTrackCaloClusterAuxContainerCnv_v1.cxx | 3 +++
.../src/xAODTrackCaloClusterAuxContainerCnv_v1.h | 3 +++
.../src/xAODTrackCaloClusterContainerCnv.cxx | 3 +++
.../src/xAODTrackCaloClusterContainerCnv.h | 3 +++
Event/xAOD/xAODTrigMuon/Root/TrigMuonDefs.cxx | 3 +++
.../Root/RoiDescriptorStoreAuxInfo_v1.cxx | 4 +++-
.../xAOD/xAODTrigger/Root/RoiDescriptorStore_v1.cxx | 4 +++-
.../xAODTrigger/xAODTrigger/RoiDescriptorStore.h | 4 +++-
.../xAODTrigger/RoiDescriptorStoreAuxInfo.h | 4 +++-
.../versions/RoiDescriptorStoreAuxInfo_v1.h | 4 +++-
.../xAODTrigger/versions/RoiDescriptorStore_v1.h | 4 +++-
.../ALFA/ALFA_Geometry/ALFA_Geometry/ALFA_SvdCalc.h | 5 +++--
.../ForwardIdCnv/src/ForwardIdCnv_entries.cxx | 3 +++
.../src/initMcEventCollection.cxx | 3 +++
.../src/componentsRpv/HerwigRpv_i_entries.cxx | 3 +++
.../McEventSelector/src/McEventSelector_entries.cxx | 3 +++
Generators/Pythia8_i/src/UserHooks/PowhegBB4L.cxx | 4 +++-
.../src/UserHooks/SettableColourReconnection.cxx | 3 +++
.../Pythia8_i/src/UserHooks/SingleTopWideEta.cxx | 3 +++
Generators/PythiaExo_i/src/PythiaGS_i_entries.cxx | 3 +++
Generators/PythiaExo_i/src/PythiaLLP_i_entries.cxx | 3 +++
Generators/PythiaExo_i/src/PythiaMono_i_entries.cxx | 3 +++
.../PythiaExo_i/src/PythiaResMod_i_entries.cxx | 3 +++
.../PythiaExo_i/src/PythiaTau3Mu_i_entries.cxx | 3 +++
.../PythiaExo_i/src/PythiaTopMdiff_i_entries.cxx | 3 +++
.../TrigControl/TrigServices/src/THistSvcHLT.cxx | 3 +++
.../TrigControl/TrigServices/src/THistSvcHLT.h | 3 +++
.../TrigControl/TrigServices/src/THistSvcHLT.icc | 3 +++
.../rootScripts/BeamspotCutEvaluation/AtlasStyle.h | 4 +++-
.../rootScripts/BeamspotCutEvaluation/AtlasUtils.h | 4 +++-
.../SCT_CalibAlgs/src/IElementStreamer.cxx | 4 +++-
.../SCT_CalibAlgs/src/IElementStreamer.h | 4 +++-
.../InDetCalibAlgs/SCT_CalibAlgs/src/XmlStreamer.cxx | 4 +++-
.../InDetCalibAlgs/SCT_CalibAlgs/src/XmlStreamer.h | 4 +++-
.../src/SpecialPixelMapCondAlg.cxx | 3 +++
.../SCT_ConditionsAlgorithms/src/SCT_SimpleHisto.h | 1 -
.../TRT_ConditionsAlgs/src/TRTStrawStatusWrite.cxx | 3 +++
.../SCT_Cabling/src/SCT_CablingUtilities.cxx | 4 +++-
.../InDetDetDescr/SCT_Cabling/src/SCT_OnlineId.cxx | 4 +++-
.../SCT_Cabling/src/SCT_SerialNumber.cxx | 4 +++-
.../InDetIdCnv/src/InDetIdCnv_entries.cxx | 3 +++
.../src/CreateTransientTemplate.cxx | 3 +++
.../src/CreateTransientTemplate.h | 3 +++
.../utils/include/AtlasLabels.h | 1 -
.../utils/include/AtlasStyle.h | 1 -
.../utils/include/AtlasUtils.h | 1 -
.../PixelMonitoring/src/Components.cxx | 3 +++
.../SCT_Monitoring/SCT_ClusterStruct.h | 4 +++-
.../src/TTrainedNetworkCondAlg.cxx | 4 +++-
.../InDetTrigPrepRawDataFormat/FTK_TrackMaker.h | 4 +++-
.../src/FTK_TrackMaker.cxx | 4 +++-
.../InDetPhysValMonitoring/src/ErrorHandler.h | 4 +++-
.../InDetPhysValMonitoring/src/IReadHistoDef.h | 4 +++-
.../InDetPhysValMonitoring/src/ReadFromText.h | 4 +++-
.../InDetPhysValMonitoring/src/ReadFromXml.cxx | 4 +++-
.../InDetPhysValMonitoring/src/ReadFromXml.h | 4 +++-
.../InDetPhysValMonitoring/src/ReadFromXmlDom.cxx | 4 +++-
.../InDetPhysValMonitoring/src/ReadFromXmlDom.h | 4 +++-
.../src/SingleHistogramDefinition.cxx | 4 +++-
.../InDetPhysValMonitoring/src/XmlContentHandlers.h | 4 +++-
.../InDetPhysValMonitoring/src/xmlUtilities.h | 4 +++-
LArCalorimeter/LArCabling/src/LArOnOffIdMapping.cxx | 3 +++
.../LArCnv/LArIdCnv/src/LArIdCnv_entries.cxx | 3 +++
.../LArG4FastSimSvc/ILArG4FastSimSvc.h | 3 +++
.../LArG4FastSimSvc/LArG4FastSimSvc.h | 3 +++
.../LArG4/LArG4FastSimSvc/src/LArG4FastSimSvc.cxx | 3 +++
.../LArMonTools/src/LArNoiseCorrelationMon.cxx | 4 +++-
LArCalorimeter/LArRawConditions/src/LArADC2MeV.cxx | 3 +++
.../LArRawConditions/src/LArAutoCorrTotal.cxx | 3 +++
.../src/LArConditionsTest_entries.cxx | 3 +++
.../MuonEventAthenaPool/CreateTransientTemplates.h | 3 +++
.../src/CreateTransientTemplates.cxx | 3 +++
.../MuonEventTPCnv/CreateTransientTemplates.h | 3 +++
.../MuonEventTPCnv/src/CreateTransientTemplates.cxx | 3 +++
.../MuonCnv/MuonIdCnv/src/MuonIdCnv_entries.cxx | 3 +++
.../MuonCondTest/src/MuonCondTest_entries.cxx | 3 +++
.../MuonRegionSelector/CSC_RegionSelectorTable.h | 4 +++-
.../MuonRegionSelector/MDT_RegionSelectorTable.h | 4 +++-
.../MuonRegionSelector/RPC_RegSelLUT.h | 3 +++
.../MuonRegionSelector/RPC_RegionSelectorTable.h | 4 +++-
.../MuonRegionSelector/TGC_RegionSelectorTable.h | 4 +++-
.../src/CSC_RegionSelectorTable.cxx | 4 +++-
.../src/MDT_RegionSelectorTable.cxx | 4 +++-
.../MuonRegionSelector/src/RPC_RegSelLUT.cxx | 3 +++
.../src/RPC_RegionSelectorTable.cxx | 4 +++-
.../src/TGC_RegionSelectorTable.cxx | 4 +++-
.../MuonPatternSegmentMaker/MuonPatternCalibration.h | 3 +++
.../MuonPatternSegmentMaker.h | 3 +++
.../src/MuonPatternCalibration.cxx | 3 +++
.../src/MuonPatternSegmentMaker.cxx | 3 +++
.../MuonValidation/MuonPRDTest/macros/NSWHitsTree.c | 4 +++-
.../MuonValidation/MuonPRDTest/test/NSWHitsTree.c | 3 +++
.../MuonSimValUtils/MuonChamberNameConverter.h | 3 +++
.../MuonSimValUtils/MuonChambersRange.h | 3 +++
.../MuonSimValUtils/MuonIntToStrName.h | 3 +++
.../MuonSimValUtils/MuonStrToIntName.h | 3 +++
.../MuonSimValUtils/src/MuonChamberNameConverter.cxx | 3 +++
.../MuonSimValUtils/src/MuonChambersRange.cxx | 3 +++
.../MuonSimValUtils/src/MuonIntToStrName.cxx | 3 +++
.../MuonSimValUtils/src/MuonStrToIntName.cxx | 3 +++
.../AssociationUtils/AltMuJetOverlapTool.h | 3 +++
.../AssociationUtils/AssociationUtils/BJetHelper.h | 3 +++
.../AssociationUtils/BaseOverlapTool.h | 3 +++
.../AssociationUtils/DeltaRMatcher.h | 3 +++
.../AssociationUtils/DeltaROverlapTool.h | 3 +++
.../AssociationUtils/EleEleOverlapTool.h | 3 +++
.../AssociationUtils/EleJetOverlapTool.h | 3 +++
.../AssociationUtils/EleMuSharedTrkOverlapTool.h | 3 +++
.../AssociationUtils/IObjectAssociator.h | 3 +++
.../AssociationUtils/IOverlapRemovalTool.h | 3 +++
.../AssociationUtils/IOverlapRemovalToolLegacy.h | 3 +++
.../AssociationUtils/AssociationUtils/IOverlapTool.h | 3 +++
.../AssociationUtils/AssociationUtils/MacroChecks.h | 3 +++
.../AssociationUtils/MuJetGhostDRMatcher.h | 3 +++
.../AssociationUtils/MuJetOverlapTool.h | 3 +++
.../AssociationUtils/AssociationUtils/ORToolBox.h | 3 +++
.../AssociationUtils/ObjLinkOverlapTool.h | 3 +++
.../AssociationUtils/OverlapDecorationHelper.h | 3 +++
.../AssociationUtils/OverlapLinkHelper.h | 3 +++
.../AssociationUtils/OverlapRemovalDefs.h | 3 +++
.../AssociationUtils/OverlapRemovalInit.h | 3 +++
.../AssociationUtils/OverlapRemovalTool.h | 3 +++
.../AssociationUtils/OverlapRemovalToolLegacy.h | 3 +++
.../AssociationUtils/TauAntiTauJetOverlapTool.h | 3 +++
.../AssociationUtils/TauJetOverlapTool.h | 3 +++
.../AssociationUtils/TauLooseEleOverlapTool.h | 3 +++
.../AssociationUtils/TauLooseMuOverlapTool.h | 3 +++
.../AssociationUtils/AssociationUtils/ToolBox.h | 3 +++
.../AssociationUtils/Root/AltMuJetOverlapTool.cxx | 3 +++
.../AssociationUtils/Root/BJetHelper.cxx | 3 +++
.../AssociationUtils/Root/BaseOverlapTool.cxx | 3 +++
.../AssociationUtils/Root/DeltaRMatcher.cxx | 3 +++
.../AssociationUtils/Root/DeltaROverlapTool.cxx | 3 +++
.../AssociationUtils/Root/EleEleOverlapTool.cxx | 3 +++
.../AssociationUtils/Root/EleJetOverlapTool.cxx | 3 +++
.../Root/EleMuSharedTrkOverlapTool.cxx | 3 +++
.../AnalysisCommon/AssociationUtils/Root/LinkDef.h | 3 +++
.../AssociationUtils/Root/MuJetGhostDRMatcher.cxx | 3 +++
.../AssociationUtils/Root/MuJetOverlapTool.cxx | 3 +++
.../AssociationUtils/Root/ORToolBox.cxx | 3 +++
.../AssociationUtils/Root/ObjLinkOverlapTool.cxx | 3 +++
.../Root/OverlapDecorationHelper.cxx | 3 +++
.../AssociationUtils/Root/OverlapLinkHelper.cxx | 3 +++
.../AssociationUtils/Root/OverlapRemovalInit.cxx | 3 +++
.../AssociationUtils/Root/OverlapRemovalTool.cxx | 3 +++
.../Root/OverlapRemovalToolLegacy.cxx | 3 +++
.../Root/TauAntiTauJetOverlapTool.cxx | 3 +++
.../AssociationUtils/Root/TauJetOverlapTool.cxx | 3 +++
.../AssociationUtils/Root/TauLooseEleOverlapTool.cxx | 3 +++
.../AssociationUtils/Root/TauLooseMuOverlapTool.cxx | 3 +++
.../AnalysisCommon/AssociationUtils/Root/ToolBox.cxx | 3 +++
.../AssociationUtils/src/ORToolBoxTestAlg.cxx | 3 +++
.../AssociationUtils/src/ORToolBoxTestAlg.h | 3 +++
.../AssociationUtils/src/OverlapRemovalTestAlg.cxx | 3 +++
.../AssociationUtils/src/OverlapRemovalTestAlg.h | 3 +++
.../AssociationUtils/test/gt_AnaToolHandle_test.cxx | 3 +++
.../test/gt_OverlapRemovalInit_test.cxx | 3 +++
.../AssociationUtils/test/gt_toolbox_test.cxx | 3 +++
.../AssociationUtils/util/OverlapRemovalTester.cxx | 3 +++
.../util/OverlapRemovalTesterLegacy.cxx | 3 +++
.../IsolationSelection/Root/IsolationCondition.cxx | 3 +++
.../PATInterfaces/PATInterfaces/CorrectionCode.h | 2 +-
.../PATInterfaces/PATInterfaces/CorrectionTool.h | 2 +-
.../PATInterfaces/PATInterfaces/CorrectionTool.icc | 2 +-
.../PATInterfaces/PATInterfaces/Global.h | 2 +-
.../PATInterfaces/PATInterfaces/ISystematicsTool.h | 2 +-
.../PATInterfaces/MakeSystematicsVector.h | 2 +-
.../PATInterfaces/PATInterfaces/MessageCheck.h | 2 +-
.../PATInterfaces/PATInterfaces/SystematicCode.h | 2 +-
.../PATInterfaces/SystematicVariation.h | 2 +-
.../PATInterfaces/PATInterfaces/SystematicsTool.h | 2 +-
.../PATInterfaces/PATInterfaces/SystematicsUtil.h | 2 +-
.../PATInterfaces/Root/MakeSystematicsVector.cxx | 2 +-
.../PATInterfaces/Root/MessageCheck.cxx | 2 +-
.../PATInterfaces/Root/SystematicVariation.cxx | 2 +-
.../PATInterfaces/Root/SystematicsTool.cxx | 2 +-
.../PATInterfaces/Root/SystematicsUtil.cxx | 2 +-
.../PATInterfaces/test/gt_SystematicSet.cxx | 2 +-
.../PATInterfaces/test/inc_CorrectionCode.cxx | 2 +-
.../PATInterfaces/test/inc_SystematicCode.cxx | 2 +-
.../PATInterfaces/test/ut_SystematicVariation.cxx | 2 +-
.../PATInterfaces/test/ut_make_systematic_vector.cxx | 2 +-
.../AnalysisTriggerAlgs/src/RoIBResultToxAOD.cxx | 4 +++-
.../AnalysisTriggerAlgs/src/RoIBResultToxAOD.h | 4 +++-
.../InDetD3PDMaker/src/BeamSpotFillerTool.cxx | 4 +++-
.../InDetD3PDMaker/src/BeamSpotFillerTool.h | 4 +++-
.../InDetD3PDMaker/src/BeamSpotGetterTool.cxx | 4 +++-
.../InDetD3PDMaker/src/BeamSpotGetterTool.h | 4 +++-
.../src/TSOFitQualityAssociationTool.cxx | 4 +++-
.../src/TSOFitQualityAssociationTool.h | 4 +++-
.../InDetD3PDMaker/src/TrackFitQualityFillerTool.cxx | 4 +++-
.../InDetD3PDMaker/src/TrackFitQualityFillerTool.h | 4 +++-
.../InDetD3PDMaker/src/TrackInfoFillerTool.cxx | 4 +++-
.../InDetD3PDMaker/src/TrackInfoFillerTool.h | 4 +++-
.../TrackParametersErrorMatrixAssociationTool.cxx | 4 +++-
.../src/TrackParametersErrorMatrixAssociationTool.h | 4 +++-
.../TrackParticleDetailedTruthAssociationTool.cxx | 4 +++-
.../src/TrackParticleDetailedTruthAssociationTool.h | 4 +++-
.../src/TrackParticleFitQualityAssociationTool.cxx | 4 +++-
.../src/TrackParticleFitQualityAssociationTool.h | 4 +++-
.../InDetD3PDMaker/src/TrackParticleGetterTool.cxx | 4 +++-
.../InDetD3PDMaker/src/TrackParticleGetterTool.h | 4 +++-
.../src/TrackParticleInfoAssociationTool.cxx | 4 +++-
.../src/TrackParticleInfoAssociationTool.h | 4 +++-
.../src/TrackParticleTSOAssociationTool.h | 4 +++-
.../src/TrackParticleTrackSummaryAssociationTool.cxx | 4 +++-
.../src/TrackParticleTrackSummaryAssociationTool.h | 4 +++-
.../src/TrackParticleTruthAssociationTool.h | 4 +++-
.../src/TrackStateOnSurfaceFillerTool.cxx | 4 +++-
.../src/TrackStateOnSurfaceFillerTool.h | 4 +++-
.../src/TrackTrackSummaryFillerTool.cxx | 4 +++-
.../InDetD3PDMaker/src/TrackTrackSummaryFillerTool.h | 4 +++-
.../InDetD3PDMaker/src/TruthTrackFillerTool.cxx | 4 +++-
.../InDetD3PDMaker/src/TruthTrackFillerTool.h | 4 +++-
.../InDetD3PDMaker/src/TruthTrackGetterTool.cxx | 4 +++-
.../InDetD3PDMaker/src/TruthTrackGetterTool.h | 4 +++-
.../InDetD3PDMaker/src/TruthVertexFillerTool.cxx | 4 +++-
.../InDetD3PDMaker/src/TruthVertexFillerTool.h | 4 +++-
.../InDetD3PDMaker/src/TruthVertexGetterTool.cxx | 4 +++-
.../InDetD3PDMaker/src/TruthVertexGetterTool.h | 4 +++-
.../InDetD3PDMaker/src/indetInheritance.cxx | 4 +++-
.../D3PDTools/EventLoop/EventLoop/Algorithm.h | 2 +-
.../D3PDTools/EventLoop/EventLoop/BackgroundDriver.h | 2 +-
.../D3PDTools/EventLoop/EventLoop/BackgroundJob.h | 2 +-
.../D3PDTools/EventLoop/EventLoop/BackgroundSocket.h | 2 +-
.../EventLoop/EventLoop/BackgroundTSelector.h | 2 +-
.../D3PDTools/EventLoop/EventLoop/BackgroundWorker.h | 2 +-
.../D3PDTools/EventLoop/EventLoop/BatchDriver.h | 2 +-
.../D3PDTools/EventLoop/EventLoop/BatchJob.h | 2 +-
.../D3PDTools/EventLoop/EventLoop/BatchSample.h | 2 +-
.../D3PDTools/EventLoop/EventLoop/BatchSegment.h | 2 +-
.../D3PDTools/EventLoop/EventLoop/BatchWorker.h | 2 +-
.../D3PDTools/EventLoop/EventLoop/CondorDriver.h | 2 +-
.../D3PDTools/EventLoop/EventLoop/D3PDReaderSvc.h | 2 +-
.../D3PDTools/EventLoop/EventLoop/DirectDriver.h | 2 +-
.../D3PDTools/EventLoop/EventLoop/DirectWorker.h | 2 +-
.../D3PDTools/EventLoop/EventLoop/Driver.h | 2 +-
.../D3PDTools/EventLoop/EventLoop/EmptyFileHandler.h | 2 +-
.../D3PDTools/EventLoop/EventLoop/GEDriver.h | 2 +-
.../D3PDTools/EventLoop/EventLoop/Global.h | 2 +-
PhysicsAnalysis/D3PDTools/EventLoop/EventLoop/Job.h | 2 +-
.../D3PDTools/EventLoop/EventLoop/LLDriver.h | 2 +-
.../D3PDTools/EventLoop/EventLoop/LSFDriver.h | 2 +-
.../D3PDTools/EventLoop/EventLoop/LocalDriver.h | 2 +-
.../D3PDTools/EventLoop/EventLoop/OutputStream.h | 2 +-
.../D3PDTools/EventLoop/EventLoop/ProofArgs.h | 2 +-
.../D3PDTools/EventLoop/EventLoop/ProofDriver.h | 2 +-
.../D3PDTools/EventLoop/EventLoop/ProofTSelector.h | 2 +-
.../D3PDTools/EventLoop/EventLoop/ProofWorker.h | 2 +-
.../D3PDTools/EventLoop/EventLoop/SlurmDriver.h | 2 +-
.../D3PDTools/EventLoop/EventLoop/SoGEDriver.h | 2 +-
.../D3PDTools/EventLoop/EventLoop/StatusCode.h | 2 +-
.../D3PDTools/EventLoop/EventLoop/TEventSvc.h | 2 +-
.../D3PDTools/EventLoop/EventLoop/TorqueDriver.h | 2 +-
.../D3PDTools/EventLoop/EventLoop/UnitTest.h | 2 +-
.../D3PDTools/EventLoop/EventLoop/UnitTestAlg.h | 2 +-
.../D3PDTools/EventLoop/EventLoop/UnitTestAlg1.h | 2 +-
.../D3PDTools/EventLoop/EventLoop/UnitTestConfig.h | 2 +-
.../D3PDTools/EventLoop/EventLoop/UnitTestFixture.h | 2 +-
.../EventLoop/EventLoop/UnitTestFixture.ihh | 2 +-
.../D3PDTools/EventLoop/EventLoop/VomsProxySvc.h | 2 +-
.../D3PDTools/EventLoop/EventLoop/Worker.h | 2 +-
.../D3PDTools/EventLoop/Root/Algorithm.cxx | 2 +-
.../D3PDTools/EventLoop/Root/BackgroundDriver.cxx | 2 +-
.../D3PDTools/EventLoop/Root/BackgroundJob.cxx | 2 +-
.../D3PDTools/EventLoop/Root/BackgroundSocket.cxx | 2 +-
.../D3PDTools/EventLoop/Root/BackgroundTSelector.cxx | 2 +-
.../D3PDTools/EventLoop/Root/BackgroundWorker.cxx | 2 +-
.../D3PDTools/EventLoop/Root/BatchDriver.cxx | 2 +-
.../D3PDTools/EventLoop/Root/BatchJob.cxx | 2 +-
.../D3PDTools/EventLoop/Root/BatchSample.cxx | 2 +-
.../D3PDTools/EventLoop/Root/BatchSegment.cxx | 2 +-
.../D3PDTools/EventLoop/Root/BatchWorker.cxx | 2 +-
.../D3PDTools/EventLoop/Root/CondorDriver.cxx | 2 +-
.../D3PDTools/EventLoop/Root/D3PDReaderSvc.cxx | 2 +-
.../D3PDTools/EventLoop/Root/DirectDriver.cxx | 2 +-
.../D3PDTools/EventLoop/Root/DirectWorker.cxx | 2 +-
PhysicsAnalysis/D3PDTools/EventLoop/Root/Driver.cxx | 2 +-
.../D3PDTools/EventLoop/Root/EmptyFileHandler.cxx | 2 +-
.../D3PDTools/EventLoop/Root/GEDriver.cxx | 2 +-
PhysicsAnalysis/D3PDTools/EventLoop/Root/Job.cxx | 2 +-
.../D3PDTools/EventLoop/Root/LLDriver.cxx | 2 +-
.../D3PDTools/EventLoop/Root/LSFDriver.cxx | 2 +-
.../D3PDTools/EventLoop/Root/LocalDriver.cxx | 2 +-
.../D3PDTools/EventLoop/Root/OutputStream.cxx | 2 +-
.../D3PDTools/EventLoop/Root/ProofArgs.cxx | 2 +-
.../D3PDTools/EventLoop/Root/ProofDriver.cxx | 2 +-
.../D3PDTools/EventLoop/Root/ProofTSelector.cxx | 2 +-
.../D3PDTools/EventLoop/Root/ProofWorker.cxx | 2 +-
.../D3PDTools/EventLoop/Root/SlurmDriver.cxx | 2 +-
.../D3PDTools/EventLoop/Root/SoGEDriver.cxx | 2 +-
.../D3PDTools/EventLoop/Root/TEventSvc.cxx | 2 +-
.../D3PDTools/EventLoop/Root/TorqueDriver.cxx | 2 +-
.../D3PDTools/EventLoop/Root/UnitTest.cxx | 2 +-
.../D3PDTools/EventLoop/Root/UnitTestAlg.cxx | 2 +-
.../D3PDTools/EventLoop/Root/UnitTestAlg1.cxx | 2 +-
.../D3PDTools/EventLoop/Root/UnitTestConfig.cxx | 2 +-
.../D3PDTools/EventLoop/Root/UnitTestFixture.cxx | 2 +-
.../D3PDTools/EventLoop/Root/VomsProxySvc.cxx | 2 +-
PhysicsAnalysis/D3PDTools/EventLoop/Root/Worker.cxx | 2 +-
.../D3PDTools/EventLoop/test/gt_DirectDriver.cxx | 2 +-
.../D3PDTools/EventLoop/test/gt_LSFDriver_EOS.cxx | 2 +-
.../D3PDTools/EventLoop/test/gt_LocalDriver.cxx | 2 +-
.../D3PDTools/EventLoop/test/gt_ProofDriver.cxx | 2 +-
.../EventLoop/test/ut_background_driver.cxx | 2 +-
.../EventLoop/test/ut_background_socket.cxx | 2 +-
.../D3PDTools/EventLoop/test/ut_driver_condor.cxx | 2 +-
.../D3PDTools/EventLoop/test/ut_driver_direct.cxx | 2 +-
.../D3PDTools/EventLoop/test/ut_driver_ll.cxx | 2 +-
.../D3PDTools/EventLoop/test/ut_driver_local.cxx | 2 +-
.../EventLoop/test/ut_driver_local_no_unsetup.cxx | 2 +-
.../EventLoop/test/ut_driver_local_nosharedfs.cxx | 2 +-
.../EventLoop/test/ut_driver_local_split.cxx | 2 +-
.../D3PDTools/EventLoop/test/ut_driver_lsf.cxx | 2 +-
.../EventLoop/test/ut_driver_proof_farm.cxx | 2 +-
.../EventLoop/test/ut_driver_proof_lite.cxx | 2 +-
.../EventLoop/test/ut_driver_proof_lite_bg.cxx | 2 +-
.../EventLoop/test/ut_driver_proof_lite_macro.C | 2 +-
.../D3PDTools/EventLoop/test/ut_driver_torque.cxx | 2 +-
.../D3PDTools/EventLoop/test/ut_streamer.cxx | 2 +-
.../D3PDTools/EventLoop/test/ut_xrootd_input.cxx | 2 +-
.../D3PDTools/EventLoop/test/ut_xrootd_output.cxx | 2 +-
.../EventLoopAlgs/EventLoopAlgs/AlgSelect.h | 2 +-
.../EventLoopAlgs/EventLoopAlgs/DuplicateChecker.h | 2 +-
.../D3PDTools/EventLoopAlgs/EventLoopAlgs/Global.h | 2 +-
.../EventLoopAlgs/EventLoopAlgs/NTupleSvc.h | 2 +-
.../EventLoopAlgs/EventLoopAlgs/UnitTestSkim.h | 2 +-
.../EventLoopAlgs/EventLoopAlgs/WhiteBoardSvc.h | 2 +-
.../D3PDTools/EventLoopAlgs/Root/AlgSelect.cxx | 2 +-
.../EventLoopAlgs/Root/DuplicateChecker.cxx | 2 +-
.../D3PDTools/EventLoopAlgs/Root/NTupleSvc.cxx | 2 +-
.../D3PDTools/EventLoopAlgs/Root/UnitTestSkim.cxx | 2 +-
.../D3PDTools/EventLoopAlgs/Root/WhiteBoardSvc.cxx | 2 +-
.../EventLoopAlgs/test/ut_DuplicateChecker.cxx | 2 +-
.../D3PDTools/EventLoopAlgs/test/ut_alg_skim.cxx | 2 +-
.../D3PDTools/MultiDraw/MultiDraw/AlgCFlow.h | 2 +-
.../D3PDTools/MultiDraw/MultiDraw/AlgHist.h | 2 +-
.../D3PDTools/MultiDraw/MultiDraw/Formula.h | 2 +-
.../D3PDTools/MultiDraw/MultiDraw/FormulaSvc.h | 2 +-
.../D3PDTools/MultiDraw/MultiDraw/Global.h | 2 +-
.../D3PDTools/MultiDraw/Root/AlgCFlow.cxx | 2 +-
PhysicsAnalysis/D3PDTools/MultiDraw/Root/AlgHist.cxx | 2 +-
PhysicsAnalysis/D3PDTools/MultiDraw/Root/Formula.cxx | 2 +-
.../D3PDTools/MultiDraw/Root/FormulaSvc.cxx | 2 +-
.../D3PDTools/MultiDraw/test/ut_alg_cflow.cxx | 2 +-
.../D3PDTools/MultiDraw/test/ut_alg_hist.cxx | 2 +-
.../D3PDTools/MultiDraw/test/ut_condor_large.cxx | 2 +-
.../D3PDTools/RootCoreUtils/Root/Assert.cxx | 2 +-
.../RootCoreUtils/Root/CheckRootVersion.cxx | 2 +-
.../D3PDTools/RootCoreUtils/Root/ExceptionMsg.cxx | 2 +-
.../D3PDTools/RootCoreUtils/Root/Locate.cxx | 2 +-
.../D3PDTools/RootCoreUtils/Root/Message.cxx | 2 +-
.../D3PDTools/RootCoreUtils/Root/PrintMsg.cxx | 2 +-
.../D3PDTools/RootCoreUtils/Root/RootUtils.cxx | 2 +-
.../D3PDTools/RootCoreUtils/Root/ShellExec.cxx | 2 +-
.../D3PDTools/RootCoreUtils/Root/StringUtil.cxx | 2 +-
.../D3PDTools/RootCoreUtils/Root/UnitTestDir.cxx | 2 +-
.../D3PDTools/RootCoreUtils/Root/hadd.cxx | 2 +-
.../D3PDTools/RootCoreUtils/Root/ranLoadPackages.cxx | 2 +-
.../D3PDTools/RootCoreUtils/RootCoreUtils/Assert.h | 2 +-
.../RootCoreUtils/RootCoreUtils/CheckRootVersion.h | 2 +-
.../RootCoreUtils/RootCoreUtils/Deprecated.h | 2 +-
.../RootCoreUtils/RootCoreUtils/ExceptionMsg.h | 2 +-
.../D3PDTools/RootCoreUtils/RootCoreUtils/Global.h | 2 +-
.../D3PDTools/RootCoreUtils/RootCoreUtils/Locate.h | 2 +-
.../D3PDTools/RootCoreUtils/RootCoreUtils/Message.h | 2 +-
.../RootCoreUtils/RootCoreUtils/MessageType.h | 2 +-
.../D3PDTools/RootCoreUtils/RootCoreUtils/Override.h | 2 +-
.../D3PDTools/RootCoreUtils/RootCoreUtils/PrintMsg.h | 2 +-
.../RootCoreUtils/RootCoreUtils/RootUtils.h | 2 +-
.../RootCoreUtils/RootCoreUtils/ShellExec.h | 2 +-
.../RootCoreUtils/RootCoreUtils/StringUtil.h | 2 +-
.../D3PDTools/RootCoreUtils/RootCoreUtils/ThrowMsg.h | 2 +-
.../RootCoreUtils/RootCoreUtils/UnitTestDir.h | 2 +-
.../D3PDTools/RootCoreUtils/RootCoreUtils/hadd.h | 2 +-
.../RootCoreUtils/RootCoreUtils/ranLoadPackages.h | 2 +-
.../D3PDTools/RootCoreUtils/test/inc_Deprecated.cxx | 2 +-
.../D3PDTools/RootCoreUtils/test/inc_Override.cxx | 2 +-
.../RootCoreUtils/test/test_message_svc.cxx | 2 +-
.../D3PDTools/RootCoreUtils/test/ut_expression.cxx | 2 +-
.../RootCoreUtils/test/ut_ran_packages_false.cxx | 2 +-
.../RootCoreUtils/test/ut_ran_packages_true.C | 2 +-
.../D3PDTools/RootCoreUtils/util/rcu_locate.cxx | 2 +-
.../D3PDTools/SampleHandler/Root/DiskList.cxx | 2 +-
.../D3PDTools/SampleHandler/Root/DiskListEOS.cxx | 2 +-
.../D3PDTools/SampleHandler/Root/DiskListLocal.cxx | 2 +-
.../D3PDTools/SampleHandler/Root/DiskListSRM.cxx | 2 +-
.../D3PDTools/SampleHandler/Root/DiskListXRD.cxx | 2 +-
.../D3PDTools/SampleHandler/Root/DiskOutput.cxx | 2 +-
.../D3PDTools/SampleHandler/Root/DiskOutputLocal.cxx | 2 +-
.../D3PDTools/SampleHandler/Root/DiskOutputXRD.cxx | 2 +-
.../D3PDTools/SampleHandler/Root/DiskWriter.cxx | 2 +-
.../D3PDTools/SampleHandler/Root/DiskWriterLocal.cxx | 2 +-
.../D3PDTools/SampleHandler/Root/DiskWriterXRD.cxx | 2 +-
.../D3PDTools/SampleHandler/Root/GridTools.cxx | 2 +-
.../D3PDTools/SampleHandler/Root/Meta.cxx | 2 +-
.../D3PDTools/SampleHandler/Root/MetaFields.cxx | 2 +-
.../D3PDTools/SampleHandler/Root/MetaNames.cxx | 2 +-
.../D3PDTools/SampleHandler/Root/MetaObject.cxx | 2 +-
.../D3PDTools/SampleHandler/Root/Sample.cxx | 2 +-
.../D3PDTools/SampleHandler/Root/SampleComposite.cxx | 2 +-
.../D3PDTools/SampleHandler/Root/SampleGrid.cxx | 2 +-
.../D3PDTools/SampleHandler/Root/SampleHandler.cxx | 2 +-
.../D3PDTools/SampleHandler/Root/SampleHist.cxx | 2 +-
.../D3PDTools/SampleHandler/Root/SampleLocal.cxx | 2 +-
.../D3PDTools/SampleHandler/Root/SampleMeta.cxx | 2 +-
.../D3PDTools/SampleHandler/Root/SamplePtr.cxx | 2 +-
.../D3PDTools/SampleHandler/Root/ScanDir.cxx | 2 +-
.../D3PDTools/SampleHandler/Root/TagList.cxx | 2 +-
.../D3PDTools/SampleHandler/Root/ToolsDiscovery.cxx | 2 +-
.../D3PDTools/SampleHandler/Root/ToolsDuplicates.cxx | 2 +-
.../D3PDTools/SampleHandler/Root/ToolsJoin.cxx | 2 +-
.../D3PDTools/SampleHandler/Root/ToolsMeta.cxx | 2 +-
.../D3PDTools/SampleHandler/Root/ToolsOther.cxx | 2 +-
.../D3PDTools/SampleHandler/Root/ToolsSplit.cxx | 2 +-
.../D3PDTools/SampleHandler/SampleHandler/DiskList.h | 2 +-
.../SampleHandler/SampleHandler/DiskListEOS.h | 2 +-
.../SampleHandler/SampleHandler/DiskListLocal.h | 2 +-
.../SampleHandler/SampleHandler/DiskListSRM.h | 2 +-
.../SampleHandler/SampleHandler/DiskListXRD.h | 2 +-
.../SampleHandler/SampleHandler/DiskOutput.h | 2 +-
.../SampleHandler/SampleHandler/DiskOutputLocal.h | 2 +-
.../SampleHandler/SampleHandler/DiskOutputXRD.h | 2 +-
.../SampleHandler/SampleHandler/DiskWriter.h | 2 +-
.../SampleHandler/SampleHandler/DiskWriterLocal.h | 2 +-
.../SampleHandler/SampleHandler/DiskWriterXRD.h | 2 +-
.../D3PDTools/SampleHandler/SampleHandler/Global.h | 2 +-
.../SampleHandler/SampleHandler/GridTools.h | 2 +-
.../D3PDTools/SampleHandler/SampleHandler/Meta.h | 2 +-
.../D3PDTools/SampleHandler/SampleHandler/MetaData.h | 2 +-
.../SampleHandler/SampleHandler/MetaFields.h | 2 +-
.../SampleHandler/SampleHandler/MetaNames.h | 2 +-
.../SampleHandler/SampleHandler/MetaObject.h | 2 +-
.../SampleHandler/SampleHandler/MetaVector.h | 2 +-
.../D3PDTools/SampleHandler/SampleHandler/Sample.h | 2 +-
.../SampleHandler/SampleHandler/SampleComposite.h | 2 +-
.../SampleHandler/SampleHandler/SampleGrid.h | 2 +-
.../SampleHandler/SampleHandler/SampleHandler.h | 2 +-
.../SampleHandler/SampleHandler/SampleHist.h | 2 +-
.../SampleHandler/SampleHandler/SampleLocal.h | 2 +-
.../SampleHandler/SampleHandler/SampleMeta.h | 2 +-
.../SampleHandler/SampleHandler/SamplePtr.h | 2 +-
.../D3PDTools/SampleHandler/SampleHandler/ScanDir.h | 2 +-
.../D3PDTools/SampleHandler/SampleHandler/TagList.h | 2 +-
.../SampleHandler/SampleHandler/ToolsDiscovery.h | 2 +-
.../SampleHandler/SampleHandler/ToolsDuplicates.h | 2 +-
.../SampleHandler/SampleHandler/ToolsJoin.h | 2 +-
.../SampleHandler/SampleHandler/ToolsMeta.h | 2 +-
.../SampleHandler/SampleHandler/ToolsOther.h | 2 +-
.../SampleHandler/SampleHandler/ToolsSplit.h | 2 +-
.../SampleHandler/scripts/print_duplicate_events.C | 2 +-
.../SampleHandler/test/gt_SampleHandler.cxx | 2 +-
.../SampleHandler/test/gt_disk_list_eos.cxx | 2 +-
.../D3PDTools/SampleHandler/test/gt_hadd.cxx | 2 +-
.../D3PDTools/SampleHandler/test/gt_scan_dir.cxx | 2 +-
.../D3PDTools/SampleHandler/test/it_GridTools.cxx | 2 +-
.../D3PDTools/SampleHandler/test/lnk_sample.cxx | 2 +-
.../SampleHandler/test/ut_disk_list_xrd.cxx | 2 +-
.../D3PDTools/SampleHandler/test/ut_meta_object.cxx | 2 +-
.../D3PDTools/SampleHandler/test/ut_meta_persist.cxx | 2 +-
.../D3PDTools/SampleHandler/test/ut_test_fetch.cxx | 2 +-
.../D3PDTools/SampleHandler/test/ut_test_fetch2.cxx | 2 +-
.../IDTrackCaloDepositsDecoratorTool.h | 3 +++
.../IIDTrackCaloDepositsDecoratorTool.h | 3 +++
.../IMuonTPExtrapolationTool.h | 3 +++
.../MuonTPExtrapolationTool.h | 3 +++
.../src/IDTrackCaloDepositsDecoratorTool.cxx | 3 +++
.../src/MuonTPExtrapolationTool.cxx | 3 +++
.../src/MuonTPJpsiVertexFittingAlg.cxx | 3 +++
.../src/MuonTPJpsiVertexFittingAlg.h | 3 +++
.../util/PrintPhotonSF.cxx | 3 +++
.../JetTagCalibration/src/JetTagCalibCondAlg.cxx | 4 +++-
.../JetTagInfoTPCnv/test/AtlfInfoCnv_p1_test.cxx | 4 +++-
.../JetTagInfoTPCnv/test/BaseTagInfoCnv_p1_test.cxx | 4 +++-
.../test/ElectronAssociationCnv_p1_test.cxx | 4 +++-
.../JetTagInfoTPCnv/test/GbbNNTagInfoCnv_p1_test.cxx | 4 +++-
.../JetTagInfoTPCnv/test/IPInfoBaseCnv_p1_test.cxx | 4 +++-
.../JetTagInfoTPCnv/test/IPInfoPlusCnv_p1_test.cxx | 4 +++-
.../JetTagInfoTPCnv/test/IPTrackInfoCnv_p1_test.cxx | 4 +++-
.../test/ISvxAssociationCnv_p1_test.cxx | 4 +++-
.../test/JetFitterTagInfoCnv_p1_test.cxx | 4 +++-
.../test/JetProbInfoBaseCnv_p1_test.cxx | 4 +++-
.../JetTagInfoTPCnv/test/LifetimeInfoCnv_p1_test.cxx | 4 +++-
.../JetTagInfoTPCnv/test/MSVVtxInfoCnv_p1_test.cxx | 4 +++-
.../JetTagInfoTPCnv/test/MSVVtxInfoCnv_p2_test.cxx | 4 +++-
.../test/MultiSVInfoPlusCnv_p1_test.cxx | 4 +++-
.../test/MuonAssociationCnv_p1_test.cxx | 4 +++-
.../test/PhotonAssociationCnv_p1_test.cxx | 4 +++-
.../JetTagInfoTPCnv/test/SETrackInfoCnv_p1_test.cxx | 4 +++-
.../JetTagInfoTPCnv/test/SLTrueInfoCnv_p1_test.cxx | 4 +++-
.../JetTagInfoTPCnv/test/SMTrackInfoCnv_p1_test.cxx | 4 +++-
.../JetTagInfoTPCnv/test/SVInfoBaseCnv_p1_test.cxx | 4 +++-
.../JetTagInfoTPCnv/test/SVInfoPlusCnv_p1_test.cxx | 4 +++-
.../JetTagInfoTPCnv/test/SecVtxInfoCnv_p1_test.cxx | 4 +++-
.../test/SoftElectronInfoCnv_p1_test.cxx | 4 +++-
.../test/SoftLeptonTruthInfoCnv_p1_test.cxx | 4 +++-
.../JetTagInfoTPCnv/test/SoftMuonInfoCnv_p1_test.cxx | 4 +++-
.../JetTagInfoTPCnv/test/SvxSummaryCnv_p1_test.cxx | 4 +++-
.../test/TrackAssociationCnv_p1_test.cxx | 4 +++-
.../test/TrackCountingInfoCnv_p1_test.cxx | 4 +++-
.../JetTagInfoTPCnv/test/TruthInfoCnv_p1_test.cxx | 4 +++-
.../Root/ExtraDescriptionPatterns.cxx | 3 +++
.../TileTripReader/TileTripReaderDict.h | 3 +++
PhysicsAnalysis/TopPhys/QuickAna/QuickAna/AnaTool.h | 2 +-
.../TopPhys/QuickAna/QuickAna/AnaToolCorrect.h | 2 +-
.../TopPhys/QuickAna/QuickAna/AnaToolRetrieve.h | 2 +-
.../TopPhys/QuickAna/QuickAna/AnaToolSelect.h | 2 +-
.../TopPhys/QuickAna/QuickAna/AnaToolSelectCombine.h | 2 +-
.../TopPhys/QuickAna/QuickAna/AnaToolSelectInit.h | 2 +-
.../TopPhys/QuickAna/QuickAna/AnaToolSelectSpread.h | 2 +-
.../TopPhys/QuickAna/QuickAna/AnaToolSequence.h | 2 +-
.../TopPhys/QuickAna/QuickAna/AnaToolWeight.h | 2 +-
.../TopPhys/QuickAna/QuickAna/Configuration.h | 2 +-
.../TopPhys/QuickAna/QuickAna/DefinitionArgs.h | 2 +-
.../TopPhys/QuickAna/QuickAna/DefinitionConf.h | 2 +-
.../TopPhys/QuickAna/QuickAna/DefinitionMaker.h | 2 +-
.../TopPhys/QuickAna/QuickAna/ELExample.h | 2 +-
.../TopPhys/QuickAna/QuickAna/EventData.h | 2 +-
.../TopPhys/QuickAna/QuickAna/EventInfoIsData.h | 2 +-
.../TopPhys/QuickAna/QuickAna/EventObjects.h | 2 +-
.../TopPhys/QuickAna/QuickAna/EventSelectBaseTool.h | 2 +-
.../TopPhys/QuickAna/QuickAna/EventSelectHasVertex.h | 2 +-
.../TopPhys/QuickAna/QuickAna/FatJetTool.h | 2 +-
PhysicsAnalysis/TopPhys/QuickAna/QuickAna/Global.h | 2 +-
.../TopPhys/QuickAna/QuickAna/HZZElectronTool.h | 2 +-
.../TopPhys/QuickAna/QuickAna/HZZMuonTool.h | 2 +-
PhysicsAnalysis/TopPhys/QuickAna/QuickAna/IAnaTool.h | 2 +-
.../TopPhys/QuickAna/QuickAna/IEventObjects.h | 2 +-
.../TopPhys/QuickAna/QuickAna/IQuickAna.h | 2 +-
.../TopPhys/QuickAna/QuickAna/IToolScheduler.h | 2 +-
.../QuickAna/QuickAna/InternalConfiguration.h | 2 +-
PhysicsAnalysis/TopPhys/QuickAna/QuickAna/JetTool.h | 2 +-
.../TopPhys/QuickAna/QuickAna/KinObjectSelect.h | 2 +-
.../TopPhys/QuickAna/QuickAna/KinSelectTool.h | 2 +-
.../TopPhys/QuickAna/QuickAna/MessageCheck.h | 2 +-
PhysicsAnalysis/TopPhys/QuickAna/QuickAna/MetTool.h | 2 +-
PhysicsAnalysis/TopPhys/QuickAna/QuickAna/MuonTool.h | 2 +-
.../TopPhys/QuickAna/QuickAna/ObjectTypeInfo.h | 2 +-
.../TopPhys/QuickAna/QuickAna/ObjectTypeInfo.icc | 2 +-
.../TopPhys/QuickAna/QuickAna/OptimizedObjects.h | 2 +-
.../TopPhys/QuickAna/QuickAna/OptimizedScheduler.h | 2 +-
.../TopPhys/QuickAna/QuickAna/OptimizedStore.h | 2 +-
.../TopPhys/QuickAna/QuickAna/OptimizedTool.h | 2 +-
.../TopPhys/QuickAna/QuickAna/PileupTool.h | 2 +-
PhysicsAnalysis/TopPhys/QuickAna/QuickAna/QuickAna.h | 2 +-
.../TopPhys/QuickAna/QuickAna/SelectionChoice.h | 2 +-
.../TopPhys/QuickAna/QuickAna/SelectionCut.h | 2 +-
.../TopPhys/QuickAna/QuickAna/SelectionData.h | 2 +-
.../TopPhys/QuickAna/QuickAna/SelectionStep.h | 2 +-
PhysicsAnalysis/TopPhys/QuickAna/QuickAna/TauTool.h | 2 +-
.../TopPhys/QuickAna/QuickAna/ToolScheduler.h | 2 +-
.../TopPhys/QuickAna/QuickAna/ValidationEL.h | 2 +-
.../TopPhys/QuickAna/QuickAna/ValidationHists.h | 2 +-
.../TopPhys/QuickAna/QuickAna/xAODEventSelect.h | 2 +-
.../TopPhys/QuickAna/QuickAna/xAODHelpers.h | 2 +-
.../TopPhys/QuickAna/QuickAna/xAODInclude.h | 2 +-
.../TopPhys/QuickAna/QuickAna/xAODTruth.h | 2 +-
PhysicsAnalysis/TopPhys/QuickAna/Root/AnaTool.cxx | 2 +-
.../TopPhys/QuickAna/Root/AnaToolRetrieve.cxx | 2 +-
.../TopPhys/QuickAna/Root/AnaToolSelectCombine.cxx | 2 +-
.../TopPhys/QuickAna/Root/AnaToolSelectInit.cxx | 2 +-
.../TopPhys/QuickAna/Root/AnaToolSelectSpread.cxx | 2 +-
.../TopPhys/QuickAna/Root/AnaToolSequence.cxx | 2 +-
.../TopPhys/QuickAna/Root/Configuration.cxx | 2 +-
.../TopPhys/QuickAna/Root/DefinitionArgs.cxx | 2 +-
.../TopPhys/QuickAna/Root/DefinitionConf.cxx | 2 +-
.../TopPhys/QuickAna/Root/DefinitionMaker.cxx | 2 +-
PhysicsAnalysis/TopPhys/QuickAna/Root/ELExample.cxx | 2 +-
PhysicsAnalysis/TopPhys/QuickAna/Root/EventData.cxx | 2 +-
.../TopPhys/QuickAna/Root/EventInfoIsData.cxx | 2 +-
.../TopPhys/QuickAna/Root/EventObjects.cxx | 2 +-
.../TopPhys/QuickAna/Root/EventSelectBaseTool.cxx | 2 +-
.../TopPhys/QuickAna/Root/EventSelectHasVertex.cxx | 2 +-
PhysicsAnalysis/TopPhys/QuickAna/Root/FatJetTool.cxx | 2 +-
.../TopPhys/QuickAna/Root/HZZElectronTool.cxx | 2 +-
.../TopPhys/QuickAna/Root/HZZMuonTool.cxx | 2 +-
.../TopPhys/QuickAna/Root/IEventObjects.cxx | 2 +-
.../TopPhys/QuickAna/Root/IToolScheduler.cxx | 2 +-
.../TopPhys/QuickAna/Root/InternalConfiguration.cxx | 2 +-
PhysicsAnalysis/TopPhys/QuickAna/Root/JetTool.cxx | 2 +-
.../TopPhys/QuickAna/Root/KinObjectSelect.cxx | 2 +-
.../TopPhys/QuickAna/Root/KinSelectTool.cxx | 2 +-
.../TopPhys/QuickAna/Root/MessageCheck.cxx | 2 +-
PhysicsAnalysis/TopPhys/QuickAna/Root/MetTool.cxx | 2 +-
PhysicsAnalysis/TopPhys/QuickAna/Root/MuonTool.cxx | 2 +-
.../TopPhys/QuickAna/Root/ObjectTypeInfo.cxx | 2 +-
.../TopPhys/QuickAna/Root/OptimizedObjects.cxx | 2 +-
.../TopPhys/QuickAna/Root/OptimizedScheduler.cxx | 2 +-
.../TopPhys/QuickAna/Root/OptimizedStore.cxx | 2 +-
.../TopPhys/QuickAna/Root/OptimizedTool.cxx | 2 +-
PhysicsAnalysis/TopPhys/QuickAna/Root/PileupTool.cxx | 2 +-
PhysicsAnalysis/TopPhys/QuickAna/Root/QuickAna.cxx | 2 +-
.../TopPhys/QuickAna/Root/SelectionChoice.cxx | 2 +-
.../TopPhys/QuickAna/Root/SelectionCut.cxx | 2 +-
.../TopPhys/QuickAna/Root/SelectionData.cxx | 2 +-
.../TopPhys/QuickAna/Root/SelectionStep.cxx | 2 +-
PhysicsAnalysis/TopPhys/QuickAna/Root/TauTool.cxx | 2 +-
.../TopPhys/QuickAna/Root/ToolScheduler.cxx | 2 +-
.../TopPhys/QuickAna/Root/ValidationEL.cxx | 2 +-
.../TopPhys/QuickAna/Root/ValidationHists.cxx | 2 +-
.../TopPhys/QuickAna/Root/xAODEventSelect.cxx | 2 +-
.../TopPhys/QuickAna/Root/xAODHelpers.cxx | 2 +-
PhysicsAnalysis/TopPhys/QuickAna/Root/xAODTruth.cxx | 2 +-
.../TopPhys/QuickAna/test/gt_KinSelect.cxx | 2 +-
.../TopPhys/QuickAna/test/inc_AnaToolCorrect.cxx | 2 +-
.../TopPhys/QuickAna/test/inc_AnaToolSelect.cxx | 2 +-
.../TopPhys/QuickAna/test/inc_AnaToolWeight.cxx | 2 +-
.../TopPhys/QuickAna/test/inc_IAnaTool.cxx | 2 +-
.../TopPhys/QuickAna/test/inc_IEventObjects.cxx | 2 +-
.../TopPhys/QuickAna/test/inc_IQuickAna.cxx | 2 +-
.../TopPhys/QuickAna/test/inc_MessageCheck.cxx | 2 +-
.../TopPhys/QuickAna/test/inc_xAODInclude.cxx | 2 +-
.../TopPhys/QuickAna/test/it_BaseTools_test.cxx | 2 +-
.../TopPhys/QuickAna/test/ut_MessageCheck.cxx | 2 +-
.../TopPhys/QuickAna/test/ut_xaod_truth.cxx | 2 +-
.../TopPhys/QuickAna/util/quickana_basic.cxx | 2 +-
.../QuickAna/util/quickana_event_data_filler.cxx | 2 +-
.../TopPhys/QuickAna/util/quickana_multi_wp.cxx | 2 +-
.../TopPhys/QuickAna/util/quickana_output.cxx | 2 +-
.../TopPhys/QuickAna/util/quickana_systematics.cxx | 2 +-
.../TopPhys/QuickAna/util/quickana_validate.cxx | 2 +-
.../TopPhys/xAOD/TopFakes/macros/AtlasLabels.h | 1 -
.../TopPhys/xAOD/TopFakes/macros/AtlasStyle.h | 1 -
.../TopPhys/xAOD/TopFakes/macros/AtlasUtils.h | 1 -
Reconstruction/Jet/JetRec/JetRec/LineFormatter.h | 3 +++
.../Jet/JetRec/JetRec/setAssocObjectsSummary.h | 3 +++
.../Jet/JetRec/Root/IConstituentExtractor.cxx | 3 +++
.../Jet/JetRec/Root/setAssocObjectsSummary.cxx | 3 +++
Reconstruction/Jet/JetRecTools/JetRecTools/Puppi.h | 3 +++
.../Jet/JetRecTools/JetRecTools/PuppiWeightTool.h | 3 +++
.../Root/ChargedHadronSubtractionTool.cxx | 3 +++
Reconstruction/Jet/JetRecTools/Root/Puppi.cxx | 3 +++
.../Jet/JetRecTools/Root/PuppiWeightTool.cxx | 3 +++
Reconstruction/Jet/JetReclustering/LICENSE | 4 ----
.../Jet/JetSimTools/Root/TruthPseudoJetGetter.cxx | 3 +++
.../testingMacros/atlasstyle/AtlasLabels.h | 1 -
.../testingMacros/atlasstyle/AtlasStyle.h | 1 -
.../MET/METInterface/METInterface/IMETSignificance.h | 3 +++
.../MET/METUtilities/METUtilities/METSignificance.h | 3 +++
.../MET/METUtilities/Root/METSignificance.cxx | 3 +++
Reconstruction/RecAlgs/src/AppStopAlg.cxx | 3 +++
.../TrackCaloClusterRecAlgs/TrackCaloClusterRecAlg.h | 3 +++
.../src/TrackCaloClusterRecAlg.cxx | 3 +++
.../IClusterFilterTool.h | 3 +++
.../IParticleExtrapolationTool.h | 3 +++
.../TrackCaloClusterRecTools/ClusterFilterTool.h | 3 +++
.../ParticleToCaloExtrapolationTool.h | 3 +++
.../TrackCaloClusterCreatorTool.h | 3 +++
.../TrackCaloClusterWeightsTool.h | 3 +++
.../src/ClusterFilterTool.cxx | 3 +++
.../src/IParticleToCaloExtensionMap.cxx | 3 +++
.../src/ParticleToCaloExtrapolationTool.cxx | 3 +++
.../src/TrackCaloClusterCreatorTool.cxx | 3 +++
.../src/TrackCaloClusterWeightsTool.cxx | 3 +++
.../CalibrationNtupleMakerTool.h | 3 +++
.../TrackCaloClusterRecValidationTool.h | 3 +++
.../src/TrackCaloClusterRecValidationTool.cxx | 3 +++
Reconstruction/eflowRec/doc/packagedoc.h | 3 +++
Reconstruction/eflowRec/eflowRec/PFAlgorithm.h | 3 +++
.../eflowRec/eflowRec/PFClusterSelectorTool.h | 3 +++
Reconstruction/eflowRec/eflowRec/PFLeptonSelector.h | 3 +++
.../eflowRec/eflowRec/PFOChargedCreatorAlgorithm.h | 3 +++
.../eflowRec/eflowRec/PFONeutralCreatorAlgorithm.h | 3 +++
Reconstruction/eflowRec/eflowRec/PFTrackSelector.h | 3 +++
.../eflowRec/eflowTrackCaloDummyExtensionTool.h | 3 +++
Reconstruction/eflowRec/src/PFAlgorithm.cxx | 3 +++
.../eflowRec/src/PFClusterSelectorTool.cxx | 3 +++
Reconstruction/eflowRec/src/PFLeptonSelector.cxx | 3 +++
Reconstruction/eflowRec/src/PFTrackSelector.cxx | 3 +++
.../src/eflowTrackCaloDummyExtensionTool.cxx | 3 +++
.../egamma/egammaValidation/src/EgammaMonitoring.cxx | 4 +++-
.../egamma/egammaValidation/src/EgammaMonitoring.h | 4 +++-
.../egammaValidation/src/RecoElectronHistograms.h | 4 +++-
.../egammaValidation/src/TruthElectronHistograms.h | 4 +++-
.../G4AtlasTests/src/G4AtlasTests_entries.cxx | 3 +++
.../tools/AtlasStyle.h | 1 -
TestBeam/TBDetDescrCnv/src/TBDetDescrCnv_entries.cxx | 3 +++
TileCalorimeter/TileEvent/TileEvent/TileDQstatus.h | 4 +++-
.../TileEvent/TileMutableBeamElemContainer.h | 4 +++-
.../TileEvent/TileEvent/TileMutableDataContainer.h | 4 +++-
.../TileEvent/TileEvent/TileMutableDataContainer.icc | 4 +++-
.../TileEvent/TileEvent/TileMutableDigitsContainer.h | 4 +++-
.../TileEvent/TileEvent/TileMutableHitContainer.h | 4 +++-
.../TileEvent/TileMutableRawChannelContainer.h | 4 +++-
.../TileEvent/TileRawDataNonConstContainer.h | 4 +++-
.../TileEvent/src/TileBeamElemCollection.cxx | 4 +++-
TileCalorimeter/TileEvent/src/TileDQstatus.cxx | 4 +++-
.../TileEvent/src/TileDigitsCollection.cxx | 4 +++-
TileCalorimeter/TileEvent/src/TileHitCollection.cxx | 4 +++-
TileCalorimeter/TileEvent/src/TileLasCalib.cxx | 4 +++-
TileCalorimeter/TileEvent/src/TileLaser.cxx | 4 +++-
TileCalorimeter/TileEvent/src/TileLaserControl.cxx | 4 +++-
TileCalorimeter/TileEvent/src/TileLaserDiode.cxx | 4 +++-
TileCalorimeter/TileEvent/src/TileLaserPLC.cxx | 4 +++-
TileCalorimeter/TileEvent/src/TileLaserPmt.cxx | 4 +++-
.../TileEvent/src/TileRawChannelCollection.cxx | 4 +++-
.../TileEvent/test/TileBeamElemCollection_test.cxx | 4 +++-
.../TileEvent/test/TileDigitsCollection_test.cxx | 4 +++-
.../TileEvent/test/TileHitCollection_test.cxx | 4 +++-
.../test/TileMutableBeamElemContainer_test.cxx | 4 +++-
.../TileEvent/test/TileMutableDataContainer_test.cxx | 4 +++-
.../test/TileMutableDigitsContainer_test.cxx | 4 +++-
.../TileEvent/test/TileMutableHitContainer_test.cxx | 4 +++-
.../test/TileMutableRawChannelContainer_test.cxx | 4 +++-
.../TileEvent/test/TileRawChannelCollection_test.cxx | 4 +++-
.../TileIdentifier/src/TileRawChannelUnit.cxx | 4 +++-
.../TileRecUtils/TileRecUtils/ITileDQstatusTool.h | 4 +++-
.../TileRecUtils/TileRecUtils/ITileRawChannelTool.h | 4 +++-
.../TileRecUtils/TileRawChannelBuilderTest.h | 4 +++-
.../TileRecUtils/TileRawChannelNoiseFilter.h | 4 +++-
.../TileRecUtils/TileRecUtils/TileRecUtilsDict.h | 4 +++-
.../TileRecUtils/src/TileBeamElemDumper.cxx | 4 +++-
.../TileRecUtils/src/TileBeamElemDumper.h | 4 +++-
TileCalorimeter/TileRecUtils/src/TileCellBuilder.cxx | 4 +++-
TileCalorimeter/TileRecUtils/src/TileDQstatusAlg.cxx | 4 +++-
TileCalorimeter/TileRecUtils/src/TileDQstatusAlg.h | 4 +++-
.../TileRecUtils/src/TileDQstatusTool.cxx | 4 +++-
TileCalorimeter/TileRecUtils/src/TileDQstatusTool.h | 4 +++-
.../TileRecUtils/src/TileDigitsDumper.cxx | 4 +++-
TileCalorimeter/TileRecUtils/src/TileDigitsDumper.h | 4 +++-
TileCalorimeter/TileRecUtils/src/TileL2Dumper.cxx | 4 +++-
TileCalorimeter/TileRecUtils/src/TileL2Dumper.h | 4 +++-
.../TileRecUtils/src/TileLaserObjectDumper.cxx | 4 +++-
.../TileRecUtils/src/TileLaserObjectDumper.h | 4 +++-
.../TileRecUtils/src/TileMuonReceiverDumper.cxx | 4 +++-
.../TileRecUtils/src/TileMuonReceiverDumper.h | 4 +++-
.../TileRecUtils/src/TileRawChannelBuilder.cxx | 4 +++-
.../TileRecUtils/src/TileRawChannelBuilderTest.cxx | 4 +++-
.../TileRecUtils/src/TileRawChannelBuilderTest.h | 4 +++-
.../TileRecUtils/src/TileRawChannelDumper.cxx | 4 +++-
.../TileRecUtils/src/TileRawChannelDumper.h | 4 +++-
.../TileRecUtils/src/TileRawChannelOF1Corrector.cxx | 4 +++-
.../TileByteStream/test/TileROD_Decoder_test.cxx | 4 +++-
.../test/TileRawChannel2Bytes4_test.cxx | 4 +++-
.../TileSvc/TileIdCnv/src/TileIdCnv_entries.cxx | 3 +++
Tools/PyJobTransformsCore/python/extraMetadata.py | 2 +-
Tools/PyJobTransformsCore/test/testErrorPattern.py | 2 +-
Tracking/Acts/ActsGeometry/scripts/geo_id.C | 3 +++
Tracking/Acts/ActsGeometry/scripts/plot_geometry.C | 3 +++
Tracking/Acts/ActsGeometry/scripts/plot_helper.C | 3 +++
Tracking/Acts/ActsGeometry/scripts/plot_zshift.C | 3 +++
.../TrkDetDescrExample/root/python/TTreeHelper.py | 2 +-
.../TrkDetDescrUtils/ObjectAccessor.h | 3 +++
.../TrkDetDescrUtils/ObjectsAccessor.h | 3 +++
.../TrkRIO_OnTrack/RIO_OnTrackErrorScaling.h | 3 +++
.../TrkRIO_OnTrack/TrkRIO_OnTrack/check_cast.h | 3 +++
.../TrkRIO_OnTrack/src/RIO_OnTrackErrorScaling.cxx | 3 +++
.../TrkEvent/TrkTrack/TrkTrack/TrackStateOnSurface.h | 4 +++-
.../TrkTrackSummary/TrkTrackSummary/TrackSummary.h | 4 +++-
.../TrkEvent/TrkTrackSummary/src/TrackSummary.cxx | 4 +++-
.../src/RIO_OnTrackErrorScalingIDKits.cxx | 3 +++
.../src/RIO_OnTrackErrorScalingKit.cxx | 3 +++
.../src/RIO_OnTrackErrorScalingMuonKits.cxx | 3 +++
.../test/test_TargetBuffer_t.cxx | 3 +++
.../TrkValTools/root/TrackProperties/TH1TrkProp.cxx | 4 +++-
.../TrkValTools/root/TrackProperties/TH1TrkProp.h | 4 +++-
.../TrkValTools/root/TrackProperties/TH2TrkProp.cxx | 4 +++-
.../TrkValTools/root/TrackProperties/TH2TrkProp.h | 4 +++-
.../root/TrackProperties/createTrkProp.cxx | 4 +++-
.../TrigCaloRec/src/HLTCaloCellMaker.cxx | 4 +++-
.../TrigCaloRec/src/HLTCaloCellMaker.h | 4 +++-
.../TrigHLTJetRec/src/EMTopoRejectionTool.cxx | 3 +++
.../src/NegativeEnergyRejectionTool.cxx | 3 +++
.../TrigHLTJetRec/src/PFlowRejectionTool.cxx | 3 +++
.../TrigHLTJetRec/src/PseudoJetCreatorFunctions.cxx | 3 +++
.../TrigMuonEF/src/TrigMuonEFIDTrackRoiMaker.cxx | 3 +++
.../TrigMuonEF/src/TrigMuonEFIDTrackRoiMaker.h | 3 +++
.../TrigInDetAnalysisExample/Analysis_Tier0.h | 4 +++-
.../T_AnalysisConfig_Tier0.h | 4 +++-
.../TrigInDetAnalysisExample/src/Analysis_Tier0.cxx | 4 +++-
.../TrigCostRootAnalysis/TrigCostAtlasStyle.h | 4 +++-
Trigger/TrigEvent/TrigNavigation/src/test.cxx | 4 +++-
Trigger/TrigEvent/TrigRoiConversion/src/RoiWriter.h | 1 -
.../IFTK_DuplicateTrackRemovalTool.h | 3 +++
.../TrigEgammaHypo/src/TrigL2CaloHypoToolMult.cxx | 3 +++
.../TrigFTKHypo/src/TrigFTKAvailableHypo.cxx | 4 +++-
.../TrigFTKHypo/src/TrigFTKAvailableHypo.h | 4 +++-
.../TrigHLTJetHypoUtils/xAODJetAsIJetFactory.h | 3 +++
.../TrigHLTJetHypo/src/ITrigJetHypoToolConfig.h | 3 +++
.../TrigHLTJetHypo/src/xAODJetAsIJetFactory.cxx | 3 +++
.../TrigCostMonitorMT/ITrigCostMTSvc.h | 4 +++-
.../DecisionHandling/TrigCompositeUtils.icc | 3 +++
Trigger/TrigSteer/L1Decoder/src/IPrescalingTool.h | 3 +++
.../TrigOutputHandling/test/void_record_test.cxx | 3 +++
.../TrigSteer/ViewAlgsTest/src/TestViewDriver.cxx | 4 +++-
.../L1TopoAlgorithms/ClusterAbbreviated.h | 4 +++-
.../L1TopoAlgorithms/ClusterNoSort.h | 4 +++-
.../L1TopoAlgorithms/ClusterSelect.h | 4 +++-
.../L1TopoAlgorithms/L1TopoAlgorithms/ClusterSort.h | 4 +++-
.../L1TopoAlgorithms/ClusterSortingAlg.h | 4 +++-
.../L1TopoAlgorithms/DeltaEtaIncl1.h | 4 +++-
.../L1TopoAlgorithms/DeltaEtaIncl2.h | 4 +++-
.../L1TopoAlgorithms/DeltaEtaLeading.h | 4 +++-
.../L1TopoAlgorithms/DeltaEtaPhiIncl1.h | 4 +++-
.../L1TopoAlgorithms/DeltaEtaPhiIncl2.h | 4 +++-
.../L1TopoAlgorithms/DeltaEtaTestIncl1.h | 4 +++-
.../L1TopoAlgorithms/DeltaPhiIncl1.h | 4 +++-
.../L1TopoAlgorithms/DeltaPhiIncl2.h | 4 +++-
.../L1TopoAlgorithms/DeltaPhiLeading.h | 4 +++-
.../L1TopoAlgorithms/DeltaRApproxBoxCutIncl1.h | 4 +++-
.../L1TopoAlgorithms/DeltaRApproxBoxCutIncl2.h | 4 +++-
.../L1TopoAlgorithms/DeltaRLeading.h | 4 +++-
.../L1TopoAlgorithms/DeltaRSqrIncl1.h | 4 +++-
.../L1TopoAlgorithms/DeltaRSqrIncl2.h | 4 +++-
.../L1TopoAlgorithms/DisambiguationDRIncl2.h | 4 +++-
.../L1TopoAlgorithms/DisambiguationDRIncl3.h | 4 +++-
.../L1TopoAlgorithms/DisambiguationDetaDPhiIncl3.h | 4 +++-
.../L1TopoAlgorithms/DisambiguationIncl2.h | 4 +++-
.../L1TopoAlgorithms/DisambiguationIncl3.h | 4 +++-
.../L1TopoAlgorithms/DisambiguationInvmIncl2.h | 4 +++-
.../L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/EtCut.h | 4 +++-
.../L1TopoAlgorithms/GenericArrayCreator.h | 4 +++-
.../L1TopoAlgorithms/GenericListGenerator.h | 4 +++-
.../L1TopoAlgorithms/InvariantMassInclusive1.h | 4 +++-
.../L1TopoAlgorithms/InvariantMassInclusive2.h | 4 +++-
.../L1TopoAlgorithms/JetAbbreviated.h | 3 +++
.../L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/JetHT.h | 4 +++-
.../L1TopoAlgorithms/L1TopoAlgorithms/JetMatch.h | 4 +++-
.../L1TopoAlgorithms/L1TopoAlgorithms/JetNoSort.h | 3 +++
.../L1TopoAlgorithms/JetNoSortMatch.h | 3 +++
.../L1TopoAlgorithms/L1TopoAlgorithms/JetSelect.h | 3 +++
.../L1TopoAlgorithms/L1TopoAlgorithms/JetSort.h | 3 +++
.../L1TopoAlgorithms/JetSortingAlg.h | 3 +++
.../L1TopoAlgorithms/JetSortingAlgSize1.h | 3 +++
.../L1TopoAlgorithms/JetSortingAlgSize2.h | 3 +++
.../L1TopoAlgorithms/KalmanMETCorrection.h | 4 +++-
.../L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/LAr.h | 4 +++-
.../L1TopoAlgorithms/L1TopoAlgorithms/METCut.h | 4 +++-
.../L1TopoAlgorithms/L1TopoAlgorithms/METNoSort.h | 4 +++-
.../L1TopoAlgorithms/METSortingAlg.h | 4 +++-
.../L1TopoAlgorithms/L1TopoAlgorithms/MetSort.h | 4 +++-
.../L1TopoAlgorithms/L1TopoAlgorithms/MinDPhiIncl1.h | 3 +++
.../L1TopoAlgorithms/L1TopoAlgorithms/MinDPhiIncl2.h | 3 +++
.../L1TopoAlgorithms/MinDeltaPhiIncl2.h | 3 +++
.../L1TopoAlgorithms/L1TopoAlgorithms/Multiplicity.h | 4 +++-
.../L1TopoAlgorithms/MultiplicityCustom.h | 4 +++-
.../L1TopoAlgorithms/MuonAbbreviated.h | 4 +++-
.../L1TopoAlgorithms/L1TopoAlgorithms/MuonNoSort.h | 4 +++-
.../L1TopoAlgorithms/L1TopoAlgorithms/MuonSelect.h | 4 +++-
.../L1TopoAlgorithms/L1TopoAlgorithms/MuonSort.h | 4 +++-
.../L1TopoAlgorithms/L1TopoAlgorithms/MuonSort_1BC.h | 3 +++
.../L1TopoAlgorithms/L1TopoAlgorithms/NoMatch.h | 4 +++-
.../L1TopoAlgorithms/L1TopoAlgorithms/NotMatch.h | 4 +++-
.../L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/Ratio.h | 4 +++-
.../L1TopoAlgorithms/L1TopoAlgorithms/Ratio2.h | 4 +++-
.../L1TopoAlgorithms/L1TopoAlgorithms/RatioMatch.h | 4 +++-
.../L1TopoAlgorithms/L1TopoAlgorithms/RatioSum.h | 4 +++-
.../L1TopoAlgorithms/L1TopoAlgorithms/SimpleCone.h | 3 +++
.../L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/Sum.h | 4 +++-
.../L1TopoAlgorithms/L1TopoAlgorithms/SumEtLeading.h | 3 +++
.../L1TopoAlgorithms/TransverseMassInclusive1.h | 4 +++-
.../L1TopoAlgorithms/Root/ClusterAbbreviated.cxx | 4 +++-
.../L1Topo/L1TopoAlgorithms/Root/ClusterNoSort.cxx | 4 +++-
.../L1Topo/L1TopoAlgorithms/Root/ClusterSelect.cxx | 4 +++-
.../L1Topo/L1TopoAlgorithms/Root/ClusterSort.cxx | 4 +++-
.../L1TopoAlgorithms/Root/ClusterSortingAlg.cxx | 4 +++-
.../L1Topo/L1TopoAlgorithms/Root/DeltaEtaIncl1.cxx | 4 +++-
.../L1Topo/L1TopoAlgorithms/Root/DeltaEtaIncl2.cxx | 4 +++-
.../L1TopoAlgorithms/Root/DeltaEtaPhiIncl1.cxx | 4 +++-
.../L1TopoAlgorithms/Root/DeltaEtaPhiIncl2.cxx | 4 +++-
.../L1Topo/L1TopoAlgorithms/Root/DeltaPhiIncl1.cxx | 4 +++-
.../L1Topo/L1TopoAlgorithms/Root/DeltaPhiIncl2.cxx | 4 +++-
.../Root/DeltaRApproxBoxCutIncl1.cxx | 4 +++-
.../Root/DeltaRApproxBoxCutIncl2.cxx | 4 +++-
.../L1Topo/L1TopoAlgorithms/Root/DeltaRSqrIncl1.cxx | 4 +++-
.../L1Topo/L1TopoAlgorithms/Root/DeltaRSqrIncl2.cxx | 4 +++-
.../L1TopoAlgorithms/Root/DisambiguationDRIncl2.cxx | 4 +++-
.../L1TopoAlgorithms/Root/DisambiguationDRIncl3.cxx | 4 +++-
.../Root/DisambiguationDetaDPhiIncl3.cxx | 4 +++-
.../L1TopoAlgorithms/Root/DisambiguationIncl2.cxx | 4 +++-
.../L1TopoAlgorithms/Root/DisambiguationIncl3.cxx | 4 +++-
.../Root/DisambiguationInvmIncl2.cxx | 4 +++-
.../TrigT1/L1Topo/L1TopoAlgorithms/Root/EtCut.cxx | 4 +++-
.../L1TopoAlgorithms/Root/GenericArrayCreator.cxx | 4 +++-
.../L1TopoAlgorithms/Root/GenericListGenerator.cxx | 4 +++-
.../Root/InvariantMassInclusive1.cxx | 4 +++-
.../Root/InvariantMassInclusive2.cxx | 4 +++-
.../L1Topo/L1TopoAlgorithms/Root/JetAbbreviated.cxx | 3 +++
.../TrigT1/L1Topo/L1TopoAlgorithms/Root/JetHT.cxx | 4 +++-
.../TrigT1/L1Topo/L1TopoAlgorithms/Root/JetMatch.cxx | 4 +++-
.../L1Topo/L1TopoAlgorithms/Root/JetNoSort.cxx | 3 +++
.../L1Topo/L1TopoAlgorithms/Root/JetNoSortMatch.cxx | 3 +++
.../L1Topo/L1TopoAlgorithms/Root/JetSelect.cxx | 3 +++
.../TrigT1/L1Topo/L1TopoAlgorithms/Root/JetSort.cxx | 4 +++-
.../L1Topo/L1TopoAlgorithms/Root/JetSortingAlg.cxx | 4 +++-
.../L1TopoAlgorithms/Root/JetSortingAlgSize1.cxx | 4 +++-
.../L1TopoAlgorithms/Root/JetSortingAlgSize2.cxx | 4 +++-
.../L1TopoAlgorithms/Root/KalmanMETCorrection.cxx | 4 +++-
Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/LAr.cxx | 4 +++-
.../TrigT1/L1Topo/L1TopoAlgorithms/Root/METCut.cxx | 4 +++-
.../L1Topo/L1TopoAlgorithms/Root/METNoSort.cxx | 3 +++
.../L1Topo/L1TopoAlgorithms/Root/METSortingAlg.cxx | 3 +++
.../TrigT1/L1Topo/L1TopoAlgorithms/Root/MetSort.cxx | 3 +++
.../L1TopoAlgorithms/Root/MinDeltaPhiIncl2.cxx | 3 +++
.../L1Topo/L1TopoAlgorithms/Root/Multiplicity.cxx | 4 +++-
.../L1TopoAlgorithms/Root/MultiplicityCustom.cxx | 4 +++-
.../L1Topo/L1TopoAlgorithms/Root/MuonAbbreviated.cxx | 4 +++-
.../L1Topo/L1TopoAlgorithms/Root/MuonNoSort.cxx | 4 +++-
.../L1Topo/L1TopoAlgorithms/Root/MuonSelect.cxx | 4 +++-
.../TrigT1/L1Topo/L1TopoAlgorithms/Root/MuonSort.cxx | 4 +++-
.../L1Topo/L1TopoAlgorithms/Root/MuonSort_1BC.cxx | 4 +++-
.../TrigT1/L1Topo/L1TopoAlgorithms/Root/NotMatch.cxx | 4 +++-
.../TrigT1/L1Topo/L1TopoAlgorithms/Root/Ratio.cxx | 4 +++-
.../TrigT1/L1Topo/L1TopoAlgorithms/Root/Ratio2.cxx | 4 +++-
.../L1Topo/L1TopoAlgorithms/Root/RatioMatch.cxx | 4 +++-
.../TrigT1/L1Topo/L1TopoAlgorithms/Root/RatioSum.cxx | 4 +++-
.../L1Topo/L1TopoAlgorithms/Root/SimpleCone.cxx | 3 +++
.../Root/TransverseMassInclusive1.cxx | 4 +++-
.../L1TopoAlgorithms/src/test/L1TopoGenPyAlg.cxx | 3 +++
.../L1Topo/L1TopoCommon/L1TopoCommon/Exception.h | 4 +++-
.../L1Topo/L1TopoCommon/L1TopoCommon/StatusCode.h | 4 +++-
.../TrigT1/L1Topo/L1TopoCommon/L1TopoCommon/Types.h | 4 +++-
.../TrigT1/L1Topo/L1TopoCommon/Root/Exception.cxx | 4 +++-
.../TrigT1/L1Topo/L1TopoCommon/Root/StatusCode.cxx | 4 +++-
.../L1TopoConfig/L1TopoConfig/LayoutConstraints.h | 4 +++-
.../L1Topo/L1TopoConfig/Root/LayoutConstraints.cxx | 4 +++-
.../L1Topo/L1TopoCoreSim/L1TopoCoreSim/Connector.h | 4 +++-
.../L1TopoCoreSim/L1TopoCoreSim/DecisionConnector.h | 4 +++-
.../L1TopoCoreSim/L1TopoCoreSim/GlobalDecision.h | 4 +++-
.../L1TopoCoreSim/L1TopoCoreSim/InputConnector.h | 4 +++-
.../L1TopoCoreSim/L1TopoCoreSim/SortingConnector.h | 4 +++-
.../L1TopoCoreSim/StandaloneL1TopoHistSvc.h | 3 +++
.../L1TopoCoreSim/L1TopoCoreSim/TopoASCIIReader.h | 3 +++
.../L1TopoCoreSim/L1TopoCoreSim/TopoCoreSimResult.h | 4 +++-
.../L1TopoCoreSim/L1TopoCoreSim/TopoSteering.h | 4 +++-
.../L1TopoCoreSim/TopoSteeringStructure.h | 3 +++
.../TrigT1/L1Topo/L1TopoCoreSim/Root/Connector.cxx | 4 +++-
.../L1Topo/L1TopoCoreSim/Root/DecisionConnector.cxx | 3 +++
.../L1Topo/L1TopoCoreSim/Root/GlobalDecision.cxx | 4 +++-
.../L1Topo/L1TopoCoreSim/Root/InputConnector.cxx | 3 +++
.../L1Topo/L1TopoCoreSim/Root/SortingConnector.cxx | 3 +++
.../L1TopoCoreSim/Root/StandaloneL1TopoHistSvc.cxx | 3 +++
.../L1Topo/L1TopoCoreSim/Root/TopoASCIIReader.cxx | 3 +++
.../L1Topo/L1TopoCoreSim/Root/TopoCoreSimResult.cxx | 3 +++
.../L1Topo/L1TopoCoreSim/Root/TopoSteering.cxx | 3 +++
.../L1TopoCoreSim/Root/TopoSteeringStructure.cxx | 3 +++
.../L1TopoCoreSim/Root/test/TopoStandAlone.cxx | 4 +++-
.../L1Topo/L1TopoCoreSim/Root/test/TopoTest.cxx | 4 +++-
.../L1Topo/L1TopoCoreSim/src/test/TopoStandAlone.cxx | 3 +++
.../L1TopoCoreSim/src/test/TopoSteeringTest.cxx | 4 +++-
.../src/test/TopoTestSteeringConfig.cxx | 3 +++
.../TrigT1/L1Topo/L1TopoEvent/L1TopoEvent/BaseTOB.h | 4 +++-
.../L1Topo/L1TopoEvent/L1TopoEvent/ClusterTOB.h | 4 +++-
.../L1Topo/L1TopoEvent/L1TopoEvent/ClusterTOBArray.h | 4 +++-
.../L1Topo/L1TopoEvent/L1TopoEvent/CompositeTOB.h | 4 +++-
.../L1Topo/L1TopoEvent/L1TopoEvent/DataArray.h | 4 +++-
.../L1Topo/L1TopoEvent/L1TopoEvent/DataArrayImpl.h | 4 +++-
.../L1Topo/L1TopoEvent/L1TopoEvent/GenericTOB.h | 4 +++-
Trigger/TrigT1/L1Topo/L1TopoEvent/L1TopoEvent/Heap.h | 4 +++-
.../L1Topo/L1TopoEvent/L1TopoEvent/InputTOBArray.h | 4 +++-
.../TrigT1/L1Topo/L1TopoEvent/L1TopoEvent/JetTOB.h | 4 +++-
.../L1Topo/L1TopoEvent/L1TopoEvent/JetTOBArray.h | 4 +++-
.../L1Topo/L1TopoEvent/L1TopoEvent/LateMuonTOB.h | 4 +++-
.../L1TopoEvent/L1TopoEvent/LateMuonTOBArray.h | 4 +++-
.../TrigT1/L1Topo/L1TopoEvent/L1TopoEvent/MetTOB.h | 4 +++-
.../L1Topo/L1TopoEvent/L1TopoEvent/MetTOBArray.h | 4 +++-
.../L1Topo/L1TopoEvent/L1TopoEvent/MuonNextBCTOB.h | 4 +++-
.../L1TopoEvent/L1TopoEvent/MuonNextBCTOBArray.h | 4 +++-
.../TrigT1/L1Topo/L1TopoEvent/L1TopoEvent/MuonTOB.h | 4 +++-
.../L1Topo/L1TopoEvent/L1TopoEvent/MuonTOBArray.h | 4 +++-
.../TrigT1/L1Topo/L1TopoEvent/L1TopoEvent/TOBArray.h | 4 +++-
.../L1Topo/L1TopoEvent/L1TopoEvent/TopoInputEvent.h | 4 +++-
Trigger/TrigT1/L1Topo/L1TopoEvent/Root/BaseTOB.cxx | 4 +++-
.../TrigT1/L1Topo/L1TopoEvent/Root/ClusterTOB.cxx | 4 +++-
.../L1Topo/L1TopoEvent/Root/ClusterTOBArray.cxx | 4 +++-
.../TrigT1/L1Topo/L1TopoEvent/Root/CompositeTOB.cxx | 4 +++-
Trigger/TrigT1/L1Topo/L1TopoEvent/Root/DataArray.cxx | 4 +++-
.../TrigT1/L1Topo/L1TopoEvent/Root/DataArrayImpl.cxx | 4 +++-
.../TrigT1/L1Topo/L1TopoEvent/Root/GenericTOB.cxx | 4 +++-
Trigger/TrigT1/L1Topo/L1TopoEvent/Root/Heap.cxx | 4 +++-
.../TrigT1/L1Topo/L1TopoEvent/Root/InputTOBArray.cxx | 4 +++-
Trigger/TrigT1/L1Topo/L1TopoEvent/Root/JetTOB.cxx | 4 +++-
.../TrigT1/L1Topo/L1TopoEvent/Root/JetTOBArray.cxx | 4 +++-
.../TrigT1/L1Topo/L1TopoEvent/Root/LateMuonTOB.cxx | 4 +++-
.../L1Topo/L1TopoEvent/Root/LateMuonTOBArray.cxx | 4 +++-
Trigger/TrigT1/L1Topo/L1TopoEvent/Root/MetTOB.cxx | 4 +++-
.../TrigT1/L1Topo/L1TopoEvent/Root/MetTOBArray.cxx | 4 +++-
.../TrigT1/L1Topo/L1TopoEvent/Root/MuonNextBCTOB.cxx | 4 +++-
.../L1Topo/L1TopoEvent/Root/MuonNextBCTOBArray.cxx | 4 +++-
Trigger/TrigT1/L1Topo/L1TopoEvent/Root/MuonTOB.cxx | 4 +++-
.../TrigT1/L1Topo/L1TopoEvent/Root/MuonTOBArray.cxx | 4 +++-
Trigger/TrigT1/L1Topo/L1TopoEvent/Root/TOBArray.cxx | 4 +++-
.../L1Topo/L1TopoEvent/Root/TopoInputEvent.cxx | 4 +++-
.../L1TopoInterfaces/L1TopoInterfaces/AlgFactory.h | 4 +++-
.../L1TopoInterfaces/ConfigurableAlg.h | 4 +++-
.../L1TopoInterfaces/L1TopoInterfaces/Decision.h | 4 +++-
.../L1TopoInterfaces/L1TopoInterfaces/DecisionAlg.h | 4 +++-
.../L1TopoInterfaces/IL1TopoHistSvc.h | 3 +++
.../L1TopoInterfaces/L1TopoInterfaces/Parameter.h | 3 +++
.../L1TopoInterfaces/ParameterSpace.h | 4 +++-
.../L1TopoInterfaces/L1TopoInterfaces/SortingAlg.h | 4 +++-
.../L1Topo/L1TopoInterfaces/Root/AlgFactory.cxx | 4 +++-
.../L1Topo/L1TopoInterfaces/Root/ConfigurableAlg.cxx | 4 +++-
.../TrigT1/L1Topo/L1TopoInterfaces/Root/Decision.cxx | 4 +++-
.../L1Topo/L1TopoInterfaces/Root/DecisionAlg.cxx | 4 +++-
.../L1Topo/L1TopoInterfaces/Root/Parameter.cxx | 4 +++-
.../L1Topo/L1TopoInterfaces/Root/ParameterSpace.cxx | 4 +++-
.../L1Topo/L1TopoInterfaces/Root/SortingAlg.cxx | 4 +++-
.../L1TopoSimulationUtils/Hyperbolic.h | 4 +++-
.../L1TopoSimulationUtils/L1TopoDataTypes.h | 4 +++-
.../L1TopoSimulationUtils/Trigo.h | 4 +++-
.../L1Topo/L1TopoSimulationUtils/Root/Hyperbolic.cxx | 4 +++-
.../L1TopoSimulationUtils/Root/L1TopoDataTypes.cxx | 4 +++-
.../L1Topo/L1TopoSimulationUtils/Root/Trigo.cxx | 4 +++-
.../test/TrigT1CaloByteStream_entries.cxx | 3 +++
.../IL1CaloCells2TriggerTowers.h | 10 +++-------
.../IL1CaloFcal23Cells2RxMappingTool.h | 10 +++-------
.../IL1CaloLArTowerEnergy.h | 10 +++-------
.../IL1CaloMonitoringCaloTool.h | 10 +++-------
.../IL1CaloOfflineTriggerTowerTools.h | 10 +++-------
.../TrigT1CaloCalibToolInterfaces/IL1CaloTTIdTools.h | 10 +++-------
.../IL1CaloxAODOfflineTriggerTowerTools.h | 10 +++-------
.../L1CaloFcal23Cells2RxMappingTool.h | 10 +++-------
.../L1CaloOfflineTriggerTowerTools.h | 10 +++-------
.../L1CaloxAODOfflineTriggerTowerTools.h | 10 +++-------
.../TrigT1CaloCalibTools/TriggerTowerThinningAlg.h | 10 +++-------
.../src/L1CaloFcal23Cells2RxMappingTool.cxx | 10 +++-------
.../src/L1CaloOfflineTriggerTowerTools.cxx | 10 +++-------
.../src/L1CaloxAODOfflineTriggerTowerTools.cxx | 10 +++-------
.../src/TriggerTowerThinningAlg.cxx | 10 +++-------
.../TrigT1CaloEvent/TrigT1CaloEvent/CMMCPHits.h | 12 +++---------
.../TrigT1CaloEvent/CMMCPHitsCollection.h | 3 +++
.../TrigT1CaloEvent/CMMCPHits_ClassDEF.h | 3 +++
.../TrigT1CaloEvent/TrigT1CaloEvent/CMMEtSums.h | 9 +++------
.../TrigT1CaloEvent/CMMEtSumsCollection.h | 3 +++
.../TrigT1CaloEvent/CMMEtSums_ClassDEF.h | 3 +++
.../TrigT1CaloEvent/TrigT1CaloEvent/CMMJetHits.h | 12 +++---------
.../TrigT1CaloEvent/CMMJetHitsCollection.h | 3 +++
.../TrigT1CaloEvent/CMMJetHits_ClassDEF.h | 3 +++
.../TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/CMMRoI.h | 3 +++
.../TrigT1CaloEvent/TrigT1CaloEvent/CMXCPHits.h | 10 +++-------
.../TrigT1CaloEvent/CMXCPHitsCollection.h | 3 +++
.../TrigT1CaloEvent/CMXCPHits_ClassDEF.h | 3 +++
.../TrigT1CaloEvent/TrigT1CaloEvent/CMXCPTob.h | 10 +++-------
.../TrigT1CaloEvent/CMXCPTobCollection.h | 3 +++
.../TrigT1CaloEvent/CMXCPTob_ClassDEF.h | 3 +++
.../TrigT1CaloEvent/TrigT1CaloEvent/CMXEtSums.h | 8 +++-----
.../TrigT1CaloEvent/CMXEtSumsCollection.h | 3 +++
.../TrigT1CaloEvent/CMXEtSums_ClassDEF.h | 3 +++
.../TrigT1CaloEvent/TrigT1CaloEvent/CMXJetHits.h | 10 +++-------
.../TrigT1CaloEvent/CMXJetHitsCollection.h | 3 +++
.../TrigT1CaloEvent/CMXJetHits_ClassDEF.h | 3 +++
.../TrigT1CaloEvent/TrigT1CaloEvent/CMXJetTob.h | 10 +++-------
.../TrigT1CaloEvent/CMXJetTobCollection.h | 3 +++
.../TrigT1CaloEvent/CMXJetTob_ClassDEF.h | 3 +++
.../TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/CMXRoI.h | 3 +++
.../TrigT1CaloEvent/TrigT1CaloEvent/CPBSCollection.h | 3 +++
.../TrigT1CaloEvent/CPBSCollectionV1.h | 3 +++
.../TrigT1CaloEvent/CPBSCollectionV2.h | 3 +++
.../TrigT1CaloEvent/TrigT1CaloEvent/CPCMXTopoData.h | 3 +++
.../TrigT1CaloEvent/CPCMXTopoDataCollection.h | 3 +++
.../TrigT1CaloEvent/CPCMXTopoData_ClassDEF.h | 3 +++
.../TrigT1CaloEvent/TrigT1CaloEvent/CPMCMXData.h | 12 +++---------
.../TrigT1CaloEvent/CPMCMXData_ClassDEF.h | 3 +++
.../TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/CPMHits.h | 12 +++---------
.../TrigT1CaloEvent/CPMHitsCollection.h | 3 +++
.../TrigT1CaloEvent/CPMHits_ClassDEF.h | 3 +++
.../TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/CPMRoI.h | 3 +++
.../TrigT1CaloEvent/CPMRoICollection.h | 3 +++
.../TrigT1CaloEvent/CPMRoI_ClassDEF.h | 3 +++
.../TrigT1CaloEvent/TrigT1CaloEvent/CPMTobRoI.h | 3 +++
.../TrigT1CaloEvent/CPMTobRoICollection.h | 3 +++
.../TrigT1CaloEvent/CPMTobRoI_ClassDEF.h | 3 +++
.../TrigT1CaloEvent/TrigT1CaloEvent/CPMTower.h | 12 +++---------
.../TrigT1CaloEvent/CPMTowerCollection.h | 3 +++
.../TrigT1CaloEvent/CPMTower_ClassDEF.h | 3 +++
.../TrigT1CaloEvent/TrigT1CaloEvent/CPTopoTOB.h | 3 +++
.../TrigT1CaloEvent/TrigT1CaloEvent/EmTauROI.h | 8 +++-----
.../TrigT1CaloEvent/EmTauROI_ClassDEF.h | 3 +++
.../TrigT1CaloEvent/TrigT1CaloEvent/EnergyCMXData.h | 12 +++---------
.../TrigT1CaloEvent/EnergyCMXData_ClassDEF.h | 3 +++
.../TrigT1CaloEvent/TrigT1CaloEvent/EnergyRoI.h | 8 +++-----
.../TrigT1CaloEvent/EnergyRoI_ClassDEF.h | 3 +++
.../TrigT1CaloEvent/TrigT1CaloEvent/EnergyTopoData.h | 8 +++-----
.../TrigT1CaloEvent/EnergyTopoData_ClassDEF.h | 3 +++
.../TrigT1CaloEvent/TrigT1CaloEvent/JEMEtSums.h | 12 +++---------
.../TrigT1CaloEvent/JEMEtSumsCollection.h | 3 +++
.../TrigT1CaloEvent/JEMEtSums_ClassDEF.h | 3 +++
.../TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/JEMHits.h | 12 +++---------
.../TrigT1CaloEvent/JEMHitsCollection.h | 3 +++
.../TrigT1CaloEvent/JEMHits_ClassDEF.h | 3 +++
.../TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/JEMRoI.h | 3 +++
.../TrigT1CaloEvent/JEMRoICollection.h | 3 +++
.../TrigT1CaloEvent/JEMRoI_ClassDEF.h | 3 +++
.../TrigT1CaloEvent/TrigT1CaloEvent/JEMTobRoI.h | 3 +++
.../TrigT1CaloEvent/JEMTobRoICollection.h | 3 +++
.../TrigT1CaloEvent/JEMTobRoI_ClassDEF.h | 3 +++
.../TrigT1CaloEvent/JEPBSCollection.h | 3 +++
.../TrigT1CaloEvent/JEPBSCollectionV1.h | 3 +++
.../TrigT1CaloEvent/JEPBSCollectionV2.h | 3 +++
.../TrigT1CaloEvent/JEPRoIBSCollection.h | 3 +++
.../TrigT1CaloEvent/JEPRoIBSCollectionV1.h | 3 +++
.../TrigT1CaloEvent/JEPRoIBSCollectionV2.h | 3 +++
.../TrigT1CaloEvent/TrigT1CaloEvent/JetCMXData.h | 12 +++---------
.../TrigT1CaloEvent/JetCMXData_ClassDEF.h | 3 +++
.../TrigT1CaloEvent/TrigT1CaloEvent/JetCMXTopoData.h | 3 +++
.../TrigT1CaloEvent/JetCMXTopoDataCollection.h | 3 +++
.../TrigT1CaloEvent/JetCMXTopoData_ClassDEF.h | 3 +++
.../TrigT1CaloEvent/TrigT1CaloEvent/JetElement.h | 12 +++---------
.../TrigT1CaloEvent/JetElementCollection.h | 3 +++
.../TrigT1CaloEvent/JetElement_ClassDEF.h | 3 +++
.../TrigT1CaloEvent/TrigT1CaloEvent/JetEtRoI.h | 8 +++-----
.../TrigT1CaloEvent/JetEtRoI_ClassDEF.h | 3 +++
.../TrigT1CaloEvent/TrigT1CaloEvent/JetInput.h | 12 +++---------
.../TrigT1CaloEvent/JetInput_ClassDEF.h | 3 +++
.../TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/JetROI.h | 8 +++-----
.../TrigT1CaloEvent/JetROI_ClassDEF.h | 3 +++
.../TrigT1CaloEvent/TrigT1CaloEvent/JetTopoTOB.h | 3 +++
.../TrigT1CaloEvent/TrigT1CaloEvent/RODHeader.h | 3 +++
.../TrigT1CaloEvent/RODHeaderCollection.h | 3 +++
.../TrigT1CaloEvent/RODHeader_ClassDEF.h | 3 +++
.../TrigT1CaloEvent/TrigT1CaloEventDict.h | 3 +++
.../TrigT1CaloEvent/TrigT1CaloEvent/TriggerTower.h | 12 +++---------
.../TrigT1CaloEvent/TriggerTowerCollection.h | 3 +++
.../TrigT1CaloEvent/TriggerTower_ClassDEF.h | 3 +++
Trigger/TrigT1/TrigT1CaloEvent/src/CMMCPHits.cxx | 8 +++-----
Trigger/TrigT1/TrigT1CaloEvent/src/CMMEtSums.cxx | 8 +++-----
Trigger/TrigT1/TrigT1CaloEvent/src/CMMJetHits.cxx | 8 +++-----
Trigger/TrigT1/TrigT1CaloEvent/src/CMMRoI.cxx | 3 +++
Trigger/TrigT1/TrigT1CaloEvent/src/CMXCPHits.cxx | 7 +++----
Trigger/TrigT1/TrigT1CaloEvent/src/CMXCPTob.cxx | 7 +++----
Trigger/TrigT1/TrigT1CaloEvent/src/CMXEtSums.cxx | 7 +++----
Trigger/TrigT1/TrigT1CaloEvent/src/CMXJetHits.cxx | 7 +++----
Trigger/TrigT1/TrigT1CaloEvent/src/CMXJetTob.cxx | 7 +++----
Trigger/TrigT1/TrigT1CaloEvent/src/CMXRoI.cxx | 3 +++
.../TrigT1/TrigT1CaloEvent/src/CPBSCollection.cxx | 3 +++
.../TrigT1/TrigT1CaloEvent/src/CPBSCollectionV1.cxx | 3 +++
.../TrigT1/TrigT1CaloEvent/src/CPBSCollectionV2.cxx | 3 +++
Trigger/TrigT1/TrigT1CaloEvent/src/CPCMXTopoData.cxx | 3 +++
Trigger/TrigT1/TrigT1CaloEvent/src/CPMCMXData.cxx | 3 +++
Trigger/TrigT1/TrigT1CaloEvent/src/CPMHits.cxx | 8 +++-----
Trigger/TrigT1/TrigT1CaloEvent/src/CPMRoI.cxx | 3 +++
Trigger/TrigT1/TrigT1CaloEvent/src/CPMTobRoI.cxx | 3 +++
Trigger/TrigT1/TrigT1CaloEvent/src/CPMTower.cxx | 8 +++-----
Trigger/TrigT1/TrigT1CaloEvent/src/CPTopoTOB.cxx | 3 +++
Trigger/TrigT1/TrigT1CaloEvent/src/EmTauROI.cxx | 8 +++-----
Trigger/TrigT1/TrigT1CaloEvent/src/EnergyCMXData.cxx | 3 +++
.../TrigT1/TrigT1CaloEvent/src/EnergyTopoData.cxx | 3 +++
Trigger/TrigT1/TrigT1CaloEvent/src/JEMEtSums.cxx | 8 +++-----
Trigger/TrigT1/TrigT1CaloEvent/src/JEMHits.cxx | 8 +++-----
Trigger/TrigT1/TrigT1CaloEvent/src/JEMRoI.cxx | 3 +++
Trigger/TrigT1/TrigT1CaloEvent/src/JEMTobRoI.cxx | 3 +++
.../TrigT1/TrigT1CaloEvent/src/JEPBSCollection.cxx | 3 +++
.../TrigT1/TrigT1CaloEvent/src/JEPBSCollectionV1.cxx | 3 +++
.../TrigT1/TrigT1CaloEvent/src/JEPBSCollectionV2.cxx | 3 +++
.../TrigT1CaloEvent/src/JEPRoIBSCollection.cxx | 3 +++
.../TrigT1CaloEvent/src/JEPRoIBSCollectionV1.cxx | 3 +++
.../TrigT1CaloEvent/src/JEPRoIBSCollectionV2.cxx | 3 +++
Trigger/TrigT1/TrigT1CaloEvent/src/JetCMXData.cxx | 3 +++
.../TrigT1/TrigT1CaloEvent/src/JetCMXTopoData.cxx | 3 +++
Trigger/TrigT1/TrigT1CaloEvent/src/JetElement.cxx | 8 +++-----
Trigger/TrigT1/TrigT1CaloEvent/src/JetInput.cxx | 8 +++-----
Trigger/TrigT1/TrigT1CaloEvent/src/JetROI.cxx | 8 +++-----
Trigger/TrigT1/TrigT1CaloEvent/src/JetTopoTOB.cxx | 3 +++
Trigger/TrigT1/TrigT1CaloEvent/src/RODHeader.cxx | 3 +++
Trigger/TrigT1/TrigT1CaloEvent/src/TriggerTower.cxx | 8 +++-----
Trigger/TrigT1/TrigT1CaloSim/TrigT1CaloSim/CPCMX.h | 4 ----
Trigger/TrigT1/TrigT1CaloSim/TrigT1CaloSim/CPMSim.h | 4 ----
.../TrigT1/TrigT1CaloSim/TrigT1CaloSim/JEMJetSim.h | 4 ----
Trigger/TrigT1/TrigT1CaloSim/TrigT1CaloSim/JetCMX.h | 4 ----
.../TrigT1CaloSim/ReprocessTriggerTowers.h | 4 ----
Trigger/TrigT1/TrigT1CaloSim/TrigT1CaloSim/RoIROD.h | 4 ----
Trigger/TrigT1/TrigT1CaloSim/TrigT1CaloSim/Tester.h | 4 ----
Trigger/TrigT1/TrigT1CaloSim/src/EnergyCMX.cxx | 4 ----
Trigger/TrigT1/TrigT1CaloSim/src/Tester.cxx | 4 ----
.../TrigT1CaloToolInterfaces/IL1CPMTools.h | 9 ++++-----
.../IL1DynamicPedestalProvider.h | 7 +++----
.../TrigT1CaloToolInterfaces/IL1TriggerTowerTool.h | 9 ++++-----
.../TrigT1CaloTools/TrigT1CaloTools/L1CPCMXTools.h | 7 +++----
.../TrigT1CaloTools/TrigT1CaloTools/L1CPHitsTools.h | 9 ++++-----
.../TrigT1CaloTools/TrigT1CaloTools/L1CPMTools.h | 9 ++++-----
.../TrigT1CaloTools/L1CPMTowerTools.h | 9 ++++-----
.../TrigT1CaloTools/L1DatabaseOverrideForDataTool.h | 3 +++
.../TrigT1CaloTools/L1DynamicPedestalProviderRoot.h | 6 +++++-
.../TrigT1CaloTools/L1DynamicPedestalProviderTxt.h | 6 +++++-
.../TrigT1CaloTools/TrigT1CaloTools/L1EmTauTools.h | 9 ++++-----
.../TrigT1CaloTools/L1EnergyCMXTools.h | 7 +++----
.../TrigT1CaloTools/TrigT1CaloTools/L1EtTools.h | 9 ++++-----
.../TrigT1CaloTools/TrigT1CaloTools/L1JEMJetTools.h | 9 ++++-----
.../TrigT1CaloTools/L1JEPEtSumsTools.h | 9 ++++-----
.../TrigT1CaloTools/TrigT1CaloTools/L1JEPHitsTools.h | 9 ++++-----
.../TrigT1CaloTools/TrigT1CaloTools/L1JetCMXTools.h | 7 +++----
.../TrigT1CaloTools/L1JetElementTools.h | 9 ++++-----
.../TrigT1CaloTools/TrigT1CaloTools/L1JetEtTools.h | 9 ++++-----
.../TrigT1CaloTools/TrigT1CaloTools/L1JetTools.h | 9 ++++-----
.../L1NonlinearLutDatabaseOverrideTool.h | 3 +++
.../TrigT1CaloTools/TrigT1CaloTools/L1RoITools.h.old | 6 +-----
.../TrigT1CaloTools/L1TriggerTowerTool.h | 9 ++++-----
Trigger/TrigT1/TrigT1CaloTools/src/L1CPCMXTools.cxx | 3 +++
Trigger/TrigT1/TrigT1CaloTools/src/L1CPHitsTools.cxx | 5 ++++-
Trigger/TrigT1/TrigT1CaloTools/src/L1CPMTools.cxx | 5 ++++-
.../TrigT1/TrigT1CaloTools/src/L1CPMTowerTools.cxx | 5 ++++-
.../src/L1DatabaseOverrideForDataTool.cxx | 3 +++
.../src/L1DynamicPedestalProviderRoot.cxx | 3 +++
.../src/L1DynamicPedestalProviderTxt.cxx | 3 +++
Trigger/TrigT1/TrigT1CaloTools/src/L1EmTauTools.cxx | 5 ++++-
.../TrigT1/TrigT1CaloTools/src/L1EnergyCMXTools.cxx | 3 +++
Trigger/TrigT1/TrigT1CaloTools/src/L1EtTools.cxx | 5 ++++-
Trigger/TrigT1/TrigT1CaloTools/src/L1JEMJetTools.cxx | 5 ++++-
.../TrigT1/TrigT1CaloTools/src/L1JEPEtSumsTools.cxx | 5 ++++-
.../TrigT1/TrigT1CaloTools/src/L1JEPHitsTools.cxx | 5 ++++-
Trigger/TrigT1/TrigT1CaloTools/src/L1JetCMXTools.cxx | 3 +++
.../TrigT1/TrigT1CaloTools/src/L1JetElementTools.cxx | 5 ++++-
Trigger/TrigT1/TrigT1CaloTools/src/L1JetEtTools.cxx | 5 ++++-
Trigger/TrigT1/TrigT1CaloTools/src/L1JetTools.cxx | 5 ++++-
.../src/L1NonlinearLutDatabaseOverrideTool.cxx | 3 +++
.../TrigT1/TrigT1CaloTools/src/L1RoITools.cxx.old | 2 +-
.../TrigT1CaloTools/src/L1TriggerTowerTool.cxx | 5 ++++-
.../TrigT1CaloUtils/TrigT1CaloUtils/BinAndCoord.h | 8 +++-----
.../TrigT1CaloUtils/TrigT1CaloUtils/CPAlgorithm.h | 8 +++-----
.../TrigT1CaloUtils/CPMTobAlgorithm.h | 8 +++-----
.../TrigT1CaloUtils/ClusterProcessorModuleKey.h | 8 +++-----
.../TrigT1CaloUtils/CoordToHardware.h | 8 +++-----
.../TrigT1CaloUtils/TrigT1CaloUtils/CrateEnergy.h | 8 +++-----
.../TrigT1CaloUtils/TrigT1CaloUtils/DataError.h | 3 +++
.../TrigT1CaloUtils/TrigT1CaloUtils/ICoordinate.h | 8 +++-----
.../TrigT1CaloUtils/InternalTriggerTower.h | 12 +++---------
.../TrigT1CaloUtils/InternalTriggerTower_ClassDEF.h | 3 +++
.../TrigT1CaloUtils/JEMJetAlgorithm.h | 8 +++-----
.../TrigT1CaloUtils/TrigT1CaloUtils/JetAlgorithm.h | 8 +++-----
.../TrigT1CaloUtils/TrigT1CaloUtils/JetElementKey.h | 8 +++-----
.../TrigT1CaloUtils/JetElementKeyBase.h | 8 +++-----
.../TrigT1CaloUtils/JetEnergyModuleKey.h | 8 +++-----
.../TrigT1CaloUtils/TrigT1CaloUtils/JetInputKey.h | 8 +++-----
.../TrigT1CaloUtils/TrigT1CaloUtils/KeyUtilities.h | 8 +++-----
.../TrigT1CaloUtils/L1TopoDataMaker.h | 9 ++++-----
.../TrigT1CaloUtils/TrigT1CaloUtils/ModuleEnergy.h | 8 +++-----
.../TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/Parity.h | 8 +++-----
.../TrigT1CaloUtils/TrigT1CaloUtils/QuadLinear.h | 8 +++-----
.../TrigT1CaloUtils/TrigT1CaloUtils/SystemEnergy.h | 8 +++-----
.../TrigT1CaloUtils/TriggerTowerKey.h | 8 +++-----
Trigger/TrigT1/TrigT1CaloUtils/src/CPAlgorithm.cxx | 8 +++-----
.../TrigT1/TrigT1CaloUtils/src/CPMTobAlgorithm.cxx | 8 +++-----
.../src/ClusterProcessorModuleKey.cxx | 8 +++-----
.../TrigT1/TrigT1CaloUtils/src/CoordToHardware.cxx | 8 +++-----
Trigger/TrigT1/TrigT1CaloUtils/src/CrateEnergy.cxx | 8 +++-----
Trigger/TrigT1/TrigT1CaloUtils/src/DataError.cxx | 3 +++
Trigger/TrigT1/TrigT1CaloUtils/src/ICoordinate.cxx | 4 +++-
.../TrigT1CaloUtils/src/InternalTriggerTower.cxx | 8 +++-----
.../TrigT1/TrigT1CaloUtils/src/JEMJetAlgorithm.cxx | 8 +++-----
Trigger/TrigT1/TrigT1CaloUtils/src/JetAlgorithm.cxx | 8 +++-----
Trigger/TrigT1/TrigT1CaloUtils/src/JetElementKey.cxx | 8 +++-----
.../TrigT1/TrigT1CaloUtils/src/JetElementKeyBase.cxx | 8 +++-----
.../TrigT1CaloUtils/src/JetEnergyModuleKey.cxx | 8 +++-----
Trigger/TrigT1/TrigT1CaloUtils/src/JetInputKey.cxx | 8 +++-----
Trigger/TrigT1/TrigT1CaloUtils/src/KeyUtilities.cxx | 8 +++-----
.../TrigT1/TrigT1CaloUtils/src/L1TopoDataMaker.cxx | 5 ++++-
Trigger/TrigT1/TrigT1CaloUtils/src/ModuleEnergy.cxx | 8 +++-----
Trigger/TrigT1/TrigT1CaloUtils/src/Parity.cxx | 8 +++-----
Trigger/TrigT1/TrigT1CaloUtils/src/QuadLinear.cxx | 8 +++-----
Trigger/TrigT1/TrigT1CaloUtils/src/SystemEnergy.cxx | 8 +++-----
.../TrigT1/TrigT1CaloUtils/src/TriggerTowerKey.cxx | 8 +++-----
Trigger/TrigT1/TrigT1Interfaces/doc/packagedoc.h | 3 +++
Trigger/TrigT1/TrigT1MBTS/doc/packagedoc.h | 3 +++
Trigger/TrigT1/TrigT1Monitoring/doc/packagedoc.h | 3 +++
Trigger/TrigT1/TrigT1Muctpi/doc/packagedoc.h | 3 +++
Trigger/TrigT1/TrigT1Result/doc/packagedoc.h | 3 +++
Trigger/TrigT1/TrigT1RoIB/doc/packagedoc.h | 3 +++
Trigger/TrigT1/TrigT1TGC/doc/packagedoc.h | 3 +++
Trigger/TrigT1/TrigT1TGCRecRoiSvc/doc/packagedoc.h | 3 +++
Trigger/TrigT1/TrigT1ZDC/doc/packagedoc.h | 3 +++
Trigger/TrigTools/IDScanHitFilter/doc/packagedoc.h | 3 +++
Trigger/TrigTools/IDScanZFinder/doc/packagedoc.h | 3 +++
.../TrigTools/TrigByteStreamTools/doc/packagedoc.h | 3 +++
.../TrigInDetToolInterfaces/doc/packagedoc.h | 3 +++
.../TrigInDetTrackExtrapolator/doc/packagedoc.h | 3 +++
.../TrigTools/TrigInDetTrackFitter/doc/packagedoc.h | 3 +++
.../TrigOnlineSpacePointTool/doc/packagedoc.h | 3 +++
.../TrigTools/TrigSiSpacePointTool/doc/packagedoc.h | 3 +++
.../TrigTools/TrigT2CaloCalibration/doc/packagedoc.h | 3 +++
.../TrigTRT_TrackExtensionTool/doc/packagedoc.h | 3 +++
Trigger/TrigTools/TrigTimeAlgs/doc/packagedoc.h | 3 +++
Trigger/TrigTools/TrigVKalFitter/doc/packagedoc.h | 3 +++
Trigger/TrigTools/TrigVertexFitter/doc/packagedoc.h | 3 +++
.../TrigInDetValidationWeb/share/TIDAWeb/style.css | 2 +-
.../TriggerCommon/TriggerJobOpts/doc/packagedoc.h | 3 +++
Trigger/TriggerCommon/TriggerMenu/doc/packagedoc.h | 3 +++
.../TriggerCommon/TriggerMenuXML/doc/packagedoc.h | 3 +++
.../L1TopoCoreSimulation/AlgFactory.h | 4 +++-
.../L1TopoCoreSimulation/BaseTOB.h | 4 +++-
.../L1TopoCoreSimulation/ClusterSortingAlg.h | 4 +++-
.../L1TopoCoreSimulation/ClusterTOB.h | 4 +++-
.../L1TopoCoreSimulation/ClusterTOBArray.h | 4 +++-
.../L1TopoCoreSimulation/CompositeTOB.h | 4 +++-
.../L1TopoCoreSimulation/ConfigurableAlg.h | 4 +++-
.../L1TopoCoreSimulation/Connector.h | 4 +++-
.../L1TopoCoreSimulation/DataArray.h | 4 +++-
.../L1TopoCoreSimulation/Decision.h | 4 +++-
.../L1TopoCoreSimulation/DecisionAlg.h | 4 +++-
.../L1TopoCoreSimulation/DeltaPhiLeading.h | 4 +++-
.../L1TopoCoreSimulation/Exception.h | 4 +++-
.../L1TopoCoreSimulation/GenericTOB.h | 4 +++-
.../L1TopoCoreSimulation/GlobalDecision.h | 4 +++-
.../L1TopoCoreSimulation/L1TopoCoreSimulation/Heap.h | 4 +++-
.../L1TopoCoreSimulation/InputTOBArray.h | 4 +++-
.../L1TopoCoreSimulation/JetTOB.h | 4 +++-
.../L1TopoCoreSimulation/JetTOBArray.h | 4 +++-
.../L1TopoCoreSimulation/LayoutConstraints.h | 4 +++-
.../L1TopoCoreSimulation/Parameter.h | 4 +++-
.../L1TopoCoreSimulation/ParameterArray.h | 4 +++-
.../L1TopoCoreSimulation/ParameterSpace.h | 4 +++-
.../L1TopoCoreSimulation/SortingAlg.h | 4 +++-
.../L1TopoCoreSimulation/StatusCode.h | 4 +++-
.../L1TopoCoreSimulation/TOBArray.h | 4 +++-
.../L1TopoCoreSimulation/TestClass.h | 4 +++-
.../L1TopoCoreSimulation/TopoCoreSimResult.h | 4 +++-
.../L1TopoCoreSimulation/TopoInputEvent.h | 4 +++-
.../L1TopoCoreSimulation/TopoSteering.h | 4 +++-
.../L1TopoCoreSimulation/Types.h | 4 +++-
.../L1TopoCoreSimulation/src/AlgFactory.cxx | 4 +++-
.../L1TopoCoreSimulation/src/BaseTOB.cxx | 4 +++-
.../L1TopoCoreSimulation/src/ClusterSortingAlg.cxx | 4 +++-
.../L1TopoCoreSimulation/src/ClusterTOB.cxx | 4 +++-
.../L1TopoCoreSimulation/src/ClusterTOBArray.cxx | 4 +++-
.../L1TopoCoreSimulation/src/CompositeTOB.cxx | 4 +++-
.../L1TopoCoreSimulation/src/ConfigurableAlg.cxx | 4 +++-
.../L1TopoCoreSimulation/src/Connector.cxx | 4 +++-
.../L1TopoCoreSimulation/src/DataArray.cxx | 4 +++-
.../L1TopoCoreSimulation/src/Decision.cxx | 4 +++-
.../L1TopoCoreSimulation/src/DecisionAlg.cxx | 4 +++-
.../L1TopoCoreSimulation/src/DeltaPhiLeading.cxx | 4 +++-
.../L1TopoCoreSimulation/src/Exception.cxx | 4 +++-
.../L1TopoCoreSimulation/src/GenericTOB.cxx | 4 +++-
.../L1TopoCoreSimulation/src/GlobalDecision.cxx | 4 +++-
.../L1TopoCoreSimulation/src/Heap.cxx | 4 +++-
.../L1TopoCoreSimulation/src/InputTOBArray.cxx | 4 +++-
.../L1TopoCoreSimulation/src/JetTOB.cxx | 4 +++-
.../L1TopoCoreSimulation/src/JetTOBArray.cxx | 4 +++-
.../L1TopoCoreSimulation/src/LayoutConstraints.cxx | 4 +++-
.../L1TopoCoreSimulation/src/Parameter.cxx | 4 +++-
.../L1TopoCoreSimulation/src/ParameterArray.cxx | 4 +++-
.../L1TopoCoreSimulation/src/ParameterSpace.cxx | 4 +++-
.../L1TopoCoreSimulation/src/SortingAlg.cxx | 4 +++-
.../L1TopoCoreSimulation/src/StatusCode.cxx | 4 +++-
.../L1TopoCoreSimulation/src/TOBArray.cxx | 4 +++-
.../L1TopoCoreSimulation/src/TopoCoreSimResult.cxx | 4 +++-
.../L1TopoCoreSimulation/src/TopoInputEvent.cxx | 4 +++-
.../L1TopoCoreSimulation/src/TopoSteering.cxx | 4 +++-
.../L1TopoCoreSimulation/src/Types.cxx | 4 +++-
.../L1TopoCoreSimulation/src/test/TopoTest.cxx | 4 +++-
.../VP13DCocktailPlugin_VP1AutoFactory.h | 3 +++
.../VP1TrackCaloPlugin_VP1AutoFactory.h | 3 +++
.../VP1AODPlugin/VP1AODPlugin_VP1AutoFactory.h | 3 +++
.../VP1AODPlugin/src/VP1AODPlugin_VP1AutoFactory.cxx | 3 +++
.../VP1GeometryPlugin_VP1AutoFactory.h | 3 +++
.../src/VP1GeometryPlugin_VP1AutoFactory.cxx | 3 +++
1537 files changed, 3722 insertions(+), 1677 deletions(-)
diff --git a/AtlasTest/DatabaseTest/IOVDbTestAlg/src/IOVDbTestAlg_entries.cxx b/AtlasTest/DatabaseTest/IOVDbTestAlg/src/IOVDbTestAlg_entries.cxx
index 4cb36bb1e077..784dc4d5b305 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 d4d3f097f58f..61b89a17cbe2 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 eb92fb39eb3b..28ee5909916d 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 bd246906cd68..216a1850a7b2 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 e77254dd942b..e30f411dfa43 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 d11249193162..821081148570 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 bc8dffb13d38..0186997eaed3 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 2bb8e7192451..3cfff422b07e 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 582885b7e1a0..41697334992b 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 19f98b741e27..90261097cb8b 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 4fe862c5b9e3..e622e11c0f1e 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 2e9065102c45..4fab261a27b1 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 d96672424483..f1d49525bc55 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 bd74a57965ee..60576e0b2b66 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 7d9fbe28ea0d..3f1180950f7b 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 1503e3f02e72..ac561ccbea06 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 f3b032fb7fb3..6e08483aa382 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 d10ec87db5b6..4d9b2523a4f7 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 b5150c7c79d3..0324f8a0fd31 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 59e9e4a5b86f..91c23d9e8751 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 33d04a18c858..ea6d90640da4 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 9c6aa135dbeb..d70ac9039978 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 40a8c0701200..6dbb7d6bae7e 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 0a5d3052a3a1..d92b2955cf92 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 5fa99b5ff232..71a8261fb28c 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 5e889daeb785..ee717c56b48b 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 09b1ed4b54e8..efe6146a60bb 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 b8b3abec6374..42671f14e7a1 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 1feccafca179..70a6c39f49ac 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 c7d12afa318f..42a35fbf7e10 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 abf91ea88033..2ee55922c495 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 8819f94b5541..80131f0b0251 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 f6c89ba3c3ab..ae9fa3c75bf9 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 c7d4fdcdd49f..e71958046e4f 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 acbcc6f6df0d..664c672f3174 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 fd12d8d0e5f5..a2cb7e573047 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 606f9fcfd66d..ad4d3b95eef8 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 40179d8fa639..f80079b942e9 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 670792010f32..a401c47660c9 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 4740a34f12b3..5566d08b9958 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 4c3d23f68f38..45c56a519000 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 65d6c0014a87..19f5b17a73d4 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 7fc0839027a5..625dabfdc0f4 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 fbea449f8790..568b18c19c36 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 8b3c34a98eab..31412f7407a3 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 2a6730a608d0..26f279c47dc6 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 ade1b961546c..d6f11b298cc0 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 8f938acb677f..cbe207f01ea4 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 72708f90ec02..32a55787cb7d 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 8d939e3e0d66..b090d1e71823 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 1bf196f5dd26..b64098a72e58 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 3949e48bc0d3..6677692c1249 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 c0498c83b3ee..94cc82a9aa40 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 258e301973ff..1b94b1d0635b 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 1351426f4c2d..51887898f440 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 0562f61b6832..fe304e405f8e 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 cc6ee59475b8..f36fac889169 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 20bea88fe1d2..109daa959841 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 11707f192749..0b8b04cd473f 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 6bbec039df0a..af989c815a67 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 4aa2b6fca3a1..d5352d06125e 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 b9ef569163f1..d6742d00dcfb 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 f36c7431c2fd..aafedc813e49 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 db843888a6f5..2ef17543767a 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 17988fb38464..4ca6c9e3489b 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 15ecf2e531dd..7e2f7ffe86b1 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 a181387773e4..42ea3fc6d026 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 7cac544672e7..9694034e06ef 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 a0805c843680..11587fc9ba21 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 6547a7718787..706e39a3fb39 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 d1a7c560a7f3..8373e93bb0e1 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 384d891d7d05..3d53c4c1b0a9 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 2e92493bfc01..7134dd4826c3 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 e2a503cc6267..a32ff6bf79b6 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 a0800550a337..292038da230e 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 b9930dd0eb59..19f99212947a 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 328edd271c08..70a270d4db3d 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 dc955792d5ae..eb336e0636ac 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 45f3fd46d626..0bdb0b2aa3ac 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 870f26dad722..e59c827a560d 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 519e61aa7f10..05abcf361abe 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 2e06210df506..fd3219fac9ee 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 2235959a9d4d..c9d491eefa80 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 4bc3b0aef41d..569f0d50d0a8 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 677be7bb0616..727127e2559e 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 dfa48c259723..631bc849af37 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 9075de21b649..2b4cb6400354 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 fd1bef8af342..e006ceb42e81 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 8d126b468823..0c594908e518 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 017da68379ea..8c7676080d28 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 bfca1af1ac6b..bbe8e480feea 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 88453c8cda04..d51a4bb56ce7 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 ea73fc3415fa..bddcbdf3bd68 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 2cf4898e7512..b9bc5681a5bb 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 3215a0cceb3a..75c8216289f7 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 f36a61ef0304..ab3de39fd834 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 c4a6f33f3a15..325d0ddb1a8a 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 7e9fb7169817..f18762e76d83 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 af8d0a3a71c0..e7b433c1fb61 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 add96c3fbf61..2d513251ea0e 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 299f330c85f3..998f843074ae 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 01bec029f011..e71ce573c838 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 d9e999ebd10b..0e2bb545e55b 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 8af951e90558..f07a1e86b92b 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 ccac3cae2318..6257d422cc80 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 48192d9f1f73..da7b723f6bde 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 ef2c3d0c1542..3ca08687d5fe 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 9a673edbb032..0b601472aa7c 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 2d8affb47a35..440c364199ad 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 79d3c0fddb86..8513b6eb9649 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 0cc542f94b1b..aae51efc4e1b 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 4311c5b2a00e..64d27e4a1185 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 212ee335aec9..cb91f43abf9a 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 72aecc4850b5..7b8619eec1ff 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 2efd1811d246..22cb557282f4 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 39aacda37f4c..41660f6010ee 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 9931ea8e5efd..509bd378d8ab 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 23812c1d3359..ca3a8a1a1df1 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 3b94272d26e1..d3526b8857df 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 71568d141c61..167ce4a366b0 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 dfe169113d6e..9f8bfde06fec 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 0d7f4caf263d..d6738c64ceb0 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 c99eed58fc06..efb47aa0229e 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 69694c55c4b6..b7d15a3b952d 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 857844c074f0..4eb72456a4e0 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 58d158d42ed7..da8490c6f5ad 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 ac4774c6a7f5..efca5ac2d94a 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 dab470ced320..1d18d75683ec 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 059fd75c1af9..e9a95c598905 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 1fe194891100..71daa17993b4 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 aacea9649b65..87a7a5c46181 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 d6b35304a3c8..8c172b78c63b 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 bffd7219f5fd..34269250de1b 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 b102b15967b1..39415cc71ede 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 57dbf8fbb203..f24397c4b2ff 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 5bd8eb508f10..f4eec712e5e1 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 abc58278a36b..fa2f249216da 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 0fb732f00096..a4aa44fff66a 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 97838022445e..8e263d543f8f 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 fd296d3d48a5..ca7908be4132 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 18fbfbf3638e..769e833421d6 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 31e72915eaaf..c8092885ed0d 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 cbf5fcfaf59f..0d332193fadd 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 19a23324bd6a..1e13d8da5ee3 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 81783c7e1cb8..46a404d13073 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 d267e68b5e2e..6cb3c813ceff 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 3eaea94dc889..3190206a4dc8 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 51556557be79..3bf913ad06f4 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 30df55a01ca0..0f803d8cb89a 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 a213adb00e9a..dd12052eea3c 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 d4f5ca1cc3b1..d024c32f9f7a 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 afe44cf63a47..20e8d083676f 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 7dd1f2797c3d..fa3d0f02bbd6 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 4e6cda010def..6a0ccc30f0b6 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 0e10762736ca..39e700bb348f 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 fb353a3ba61b..70ec48170001 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 c95b72d7b919..fefdad39316c 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 bcd52b914e40..19cf6b36b1dc 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 ad7f2a61f70b..94d34fb674cf 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 0e1b79b836e2..9a919337bceb 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 e23a992de215..875ff20b7495 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 1827bab967ff..222bc5020b1b 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 6fed93a42b55..4d2f0c0cf599 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 61e396d3af53..66ab68de32ac 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 a545621778a7..f56f6aa4c7ed 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 a1bd578cb391..adf9cc98eb45 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 8107f534170b..41cd8b3cc69a 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 777926da488d..de1d3510e290 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 158272cfc4d6..7eb80e4e2923 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 1ba14709865c..b003b177a82a 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 3a871a73021a..193c23a4fe3c 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 1a5ec3102965..20ebb62d2eb6 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 a6149e31c152..d557b8b839b1 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 076b088e9ad8..c48c84ba9861 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 e9e5bdc0f4d8..e72695e13cda 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 ea259a7c6d7b..3010aa56fc49 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 e05a3b5f0bc6..fb3fe98b025e 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 0a1060ffd5b5..cddff3c39f58 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 64d4e7557546..a65e8ec5f488 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 397deff7d29f..203fabe9a0af 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 373ea79b52d2..4bb02e4d5b3e 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 df82f81684de..0e30b4017ceb 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 b25987581e21..c1436eee557f 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 3b5562fdf6ed..f566d2547eb6 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 4cd164649d6c..f57f89320a6e 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 b69677f78427..c6e2d102151a 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 0061e3877e81..175e0cef7914 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 a5a84f2e5369..dd996e8abaff 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 1500b49b4036..6e03e60f2b5d 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 eecf338caa74..e54c070e3790 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 5f3f0969c8c1..7e7126968dcf 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 a6fb823fa134..9e40cc1dc848 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 83974b557efa..2af411694d9e 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 a1d2cc125f11..4094d8b0bdf2 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 c487abf416ee..d879f1144173 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 6fb9aadadeed..c9f34230858e 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 238a747a3491..d5acd1b47b3d 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 de35e2c45a61..0ccbecc5f279 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 350ef90b0f73..c7cd3f25bc21 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 1140017fa231..a50474a23b03 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 8b913d6e03bb..44ed8e782891 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 01c23431aa63..d855e640c755 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 1d8c78c540f9..02e76967002f 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 57aab600d5f7..801fe9e0b634 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 63b84505e7af..50bbb46a4483 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 dfe362e80ec0..f8a0088505e2 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 ea30ab2561dc..9f92f8a0de5c 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 0691844b636b..29efbb86061b 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 2d183c61b9a0..156390a6033b 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 3439f84fc3ac..16ba8e6cc035 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 5f304c767711..bf762795206b 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 14a318a2dcd9..3be316fc8234 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 8991fdd4c135..3dc4b433604b 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 35f9e20d5061..929df1e91572 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 ab561ef2e651..d49b0f34687a 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 d66fdc2ab208..c226ba4bcdfe 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 d8c09abd4dce..e253e0663f73 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 8c976be132e6..5832fc6f574f 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 9595c3a580e6..253211016f9c 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 85b027e457af..11f7e8954cc5 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 e1480fde7ca3..9aa2199bb34d 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 f60cc25aa307..c449b1c61468 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 5856d23a87d3..dfeb16ccf1c0 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 89750e21c049..8cb1e0dfeab3 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 c3fb9b62e7a0..62bcf2df6dd4 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 16ca558d36b2..052303a79ff4 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 1617d1382ce6..9a05115b1c6c 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 e0f7f5586360..29ac44249aea 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 d885b1931a25..d4644fd0ea9f 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 59e52d4a9cfb..c1b55e48d42e 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 12c30e9d72a5..37c878e14ab8 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 06d053ac9e88..22861608a17a 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 df1ecd584165..dd43021392ed 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 c89d0ae54a2a..888accaf39e0 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 4c1cec434393..255658d63300 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 3e1adfe89675..64d9787b3708 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 179676eaf51f..b96af52ef2a5 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 84e2664939bc..739ef7683d5a 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 e06c3bc7f36f..317cc07664f4 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 9df71da8143e..3f47737b3fb2 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 c729a6931c64..02c4465524c9 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 69be4d12d836..353ab93f7c1b 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 8cd285e131ed..7b7bcd9784a8 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 a547a2018d6e..1a62cf9fe7ed 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 b8522cbad3bb..fe4e7934f643 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 760caa07519a..fc8bba18d0a4 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 0a80be36de00..84f2814a6c87 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 48b8ea70118f..41d23e837a7c 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 624ca65bdf8a..96d9e0b9406f 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 c4135e2b28e6..20c7dab9d987 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 f2032802e966..4ff85275f055 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 42e90a983441..1236432ded76 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 c7cca836504b..71bd2cb7eb55 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 4bf87e9a6a70..4619bf110f59 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 f2eb315c8e55..6b41f3a77c4b 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 b61d1b46a3a8..d7db102b9878 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 211372698fa0..8f9cd16c0b24 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 0059ea6aba28..328a6035e6b8 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 ac844c72115a..dffb8479b0fe 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 ff630544554a..272e1af9fb55 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 d60ae9cb1dd8..51e8f14f3c8e 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 a92b00acb23f..68ed04f5d6b3 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 9ea2ad87b86e..611692b537e0 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 7e354da930ea..826caee9fbe5 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 ec11a1363216..8f2114adbf45 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 06bc5a2d6a70..a3668edeced9 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 b5b20fe8f675..25eb630a517b 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 2129028f5ff5..51834a6aed6a 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 43c6cd708f35..a63104942b05 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 44ec30c47bfa..1680872bc926 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 9bf60ab54b99..31d7d0cea6df 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 f90f5dd7d39a..2fc641480c2c 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 68b7d26d6b72..5661f9a41ff3 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 17754e0a3056..c60ae80e83aa 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 a67d836bcc45..4030e41a4078 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 a793d71da659..850400e7649c 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 91f8e6ae5e78..34aae77e9ab7 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 7d037516efa7..0d92f11d32c7 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 4229755c7d5c..7a3a84e6d113 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 3ee3660c383c..f9b0e89d543e 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 bfdb26db2a3c..cdd900833f0d 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 8e3c234fc745..26fc2ef1cde0 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 1dd5f99f8350..ea7d8f79d331 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 6d016ed8db38..aef40ac1c3f6 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 7b97ae4ca9c1..ae1e14bed907 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 678eff35b72a..77ec208b2e46 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 019e48d4b009..89b8e0a95bf3 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 546c5fd77bf7..ff7981c6a7c8 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 9646809e725b..36b5103f8980 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 668c5a855491..33b000994c77 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 26c2c9289b81..71c907f5a057 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 e8471787512e..ccda06622e39 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 35020c3bda1f..f888152f590f 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 450f6ae9963d..6e8c507772e4 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 5c6d202627c8..355ab3549b53 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 3486aa484834..8a8029556cf6 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 51b264a12d0c..714f84640a14 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 ed614abe108d..b1808b22b37d 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 9baa2d07e42d..0345e7b2d4ba 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 2c29ef3ef994..5db21b79844b 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 e704a19e7b7c..160bfccdc7b6 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 3d89860899da..d7e56186f01f 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 4dfab2204644..946d14513753 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 1d76d7c794e4..683dc97b1bf9 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 7e30dbb03542..205eefa18517 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 e4b33bcb917c..5d779cee00ba 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 3d9125d89624..8dd068ec2bde 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 53679c7a88e2..ae7ab7ea9c38 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 808946851854..6f9f6ae7d20a 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 b47a393cab48..2bc506f08dbe 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 f4da83a5bf78..b9c1ad056302 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 43b356c1ab70..b40e325f2f44 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 3e02460f1f09..1ced88681091 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 094187274cab..6f75cc5ca9cb 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 d981469122c7..4f53f961e8d4 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 7affc6c5a6e7..958c524b268b 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 4eec4ce61d8d..d9a8db61e2a6 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 3924243acbf8..b0f82101c6df 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 e6fb09c5d782..ecddb9d71cce 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 3abcb4a9c2a8..6ec0e8a36a53 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 89ef8473d234..9ddcd1c6d9f6 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 28fc4ce1dfb8..24c7f75af7a5 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 e7c03727f26c..ee75a83eaf7b 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 c04cfe124fe6..b591258a02ad 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 54fa5e3ad7dc..3fc0696d0d93 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 345adb390140..1629b209724e 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 92d6d4747052..ef9b464f1a39 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 0e993e6cdfa3..6de3cc458802 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 a04903fc1a2f..4ee3a33eb42f 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 de4de30c60e2..29a7b592a849 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 dc87911147a4..ac8df74fb8b1 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 50fe8a5166c0..0731cea47a3b 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 221a586d0255..6b4028c1f627 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 e075e0c827e9..7b4e7c4a26f2 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 20a3336ac4e5..f449dd8f506e 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 7e21ed4eff6e..a0e3c9e97e20 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 837c484eda97..95cba9aab474 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 e960be81e63b..f89d508d8cd6 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 13d00e4e31cc..e3260911f971 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 49e5c026c418..9979de538da9 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 5ef68dd87cf5..ecf5b3f9ff46 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 0bc9203b3fc2..0381b5e084a7 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 d7d998c54db7..2f1cde97bf05 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 ae44b798b0b7..176fcca09982 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 fe02427055ab..f27b03125e4c 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 330eca7f59e7..1a928c202154 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 7147fde4bc30..903e45ffe9c7 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 a9bf8ae9a50a..db11282930bc 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 bc262e980518..19d96c9f2289 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 eddbc155a4ba..96720ed4d1d3 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 998e884b43b9..05e42fd6dd67 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 e2c428b9ee59..5b8be3828a4e 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 6ad0f0ba1fca..cc248b9c02d5 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 1b1b0618c585..d3014e07c8e6 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 4daed6f4b457..4528e1909b09 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 d0537e1adf6e..f2da3198f7da 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 c705d92ed7cb..d7dc414745d6 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 9f52800be9cb..b6387bd733a1 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 c7d514dc36ab..943d9204a41e 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 167c223288e9..600ba6e1b953 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 24a9669f8c87..707ddb138332 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 e6bd40e4169b..24ddbecd9778 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 547fae2c1af6..426e6cd680de 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 21bb914c7743..b3c9e25e733e 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 2a82858ec1fe..131c76c37310 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 c6be4fd8fc6c..d9448a82eb52 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 dbd731d3d0ec..95c8477161fb 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 aa9340c49171..14f2037152c9 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 637809b39da7..e98ae8a2ad42 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 a386b58a8e91..8a6e09faf19e 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 b8d5ee405f20..defd04a514e9 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 8471ca9503a3..6ea1d7958e8c 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 4b9f4a8b692d..d515ca3f0e16 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 531811e9bfba..b840fc19287f 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 45163e7771d8..d6cec4529f7a 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 8221c3b3a2fe..66646e6c31ed 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 63725d374f1b..3f6f4454f914 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 c818fd7ee1a3..d91e4d9dad3a 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 649aaa7763f5..5c741b4aa149 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 754c5ac83d02..cc4d218d167f 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 074d619a8369..5a1a8ad4603d 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 157cba8789ab..d0ec2dd15f4a 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 961a09b6d066..946328c3b54c 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 0a2a08ad7c83..ccd6d0cb5828 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 f2f93cb99bfb..9461c4dd82d7 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 80c84249ad5b..79ec627bb1e9 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 a04eacd82d28..69c7cb8fb7d5 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 b68498ce8456..38c3dd5fcf52 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 d7e86b5c1d19..b6b307fbd23f 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 5800cba38039..019ad7d12c85 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 cd1369c85a35..9ad9bbf604af 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 666bcda52292..5487f7ab50c0 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 138172ffe56f..1f6abec02c4d 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 95e6b722ba2e..8e28b1d5d94a 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 38a25c66dd28..d737ce282eb7 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 9b07e351b5c5..c89f3f252dc1 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 ebe97e29b139..ddce7ef041c3 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 13b457509a60..99d5eab74c1f 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 f626db45c37a..4de09047f333 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 96ca94dd8f77..359c82a10afb 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 ca32c8017950..532d20e14ed1 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 ebcd7a3c0bab..fb4f729ebfa5 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 d0f58ea9749e..08c3109e597b 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 ee99e5725da1..5f594ad6637a 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 a196ea1870da..afe5dd81e4b8 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 15ed8a507c93..a773a7734a31 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 eb4f382f7291..6879f611857b 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 554daf9f1e7e..341f146db25b 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 7ccdae59bceb..fce9f6d53ff1 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 f7849ff38fa1..25d2a0ad98e3 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 6a2e86dd52f6..eb3b8740a408 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 ea79e86d436b..5f725520d16d 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 9dfe182e3d2c..9725c4cb4ee5 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 6dfa02571e05..8e6d904ede3f 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 f16c1d853779..9183b20718d9 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 0c6ba5a6f3ee..e2e7e02e184f 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 daef8ac1fbf9..a36dd2ed9c4f 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 fa7d9f99e9a0..b8a47e2401c7 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 666e807afeef..01bfb5f9483d 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 67c2864f7d39..850131b4b380 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 a9f6d12af6d6..7f7178bdbeb7 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 e9951c54230e..8d8b73a47c99 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 380dc9dd2d5d..71b43dd45c6a 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 0f6a5f6019b3..615e42a06bfe 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 309f56b96a9a..2f0a3a347d29 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 f561d50ec03e..981c5e6bf422 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 320a2f68c277..e34a8246f6c7 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 e009251705d1..60560afadbe4 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 93e61390606d..e8fe77b900a3 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 1ab09c43d6f6..abb276f407d8 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 4d3ba81aba42..0887b759bea8 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 24cdc21d4f8d..5dceaca2381a 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 fe947603d506..e0fabd270315 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 48f617b697df..d500f538719b 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 c432ffdbf9d5..4aeb6a52d300 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 d7eea324b417..2076079d0664 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 7fb385b45825..817882fa9259 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 d747810bb8c9..6ad593e710f9 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 142b756b1363..94a90b82e9da 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 a5e4d869dc2a..cfbae69c1db2 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 fb6fe4f9b5cc..e95b97632ffe 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 84939e712a4e..9de596fa64cd 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 f60cce6501be..f97cf9f96786 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 0e4e550ddd9f..5489638c16b1 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 827fe1c00df3..4bcd5ced27a2 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 eb454c68d888..288e5ea51192 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 f3101cdca0a4..ce1e4b0ccd78 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 7dc4a7b786bd..04703e30c56c 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 9a6d9cdf1d16..7f0d62f0bad2 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 d53544460dc9..639ed29d92c0 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 0116e818031e..1ebca3c5d212 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 a736de50a1e9..310091c24557 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 8bef7fe62b54..02f84bf78ea9 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 bd14471057b8..b016fd53c815 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 6a2153fec441..b519113902c5 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 4b084e23579b..90a61b16ced7 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 c7a82868e180..20f5c90d2855 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 4081a53342bb..9f04f3c5fd3e 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 2f5ed427a531..d44be12029d7 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 2ceb9fd15c28..41ef77dbee8a 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 807ffb1605f3..7d82ac6d15b1 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 df7b69caa680..f30f43491b32 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 82f0a7e6a3bb..8dd19e3a7925 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 c4e5c818839d..6d9695331c20 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 bb59dd244776..b66403836177 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 e9482a2148b0..ece842c92d56 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 540622076133..e39ba0901d96 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 b8f3a641a69f..fce581ebe25f 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 77d728f18c52..ce9fc21bdbb5 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 55f9d996049e..b28438bef1b1 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 2afd78d3df1e..d67ecaa37e7e 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 79b8009b0fb5..4af3c4583f4f 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 1a5dc6de11f2..e239012adcd0 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 115207af4129..e519ad890a83 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 37a993c13fd4..853011bd9f97 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 2bd0da08ec6d..ecc08d7c7ed5 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 f43c5e285a58..44513105c5a3 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 232be2baab30..1fbade913320 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 c1ef5531544f..5866fc6b8471 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 f21fb392e8a6..64febafb9d01 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 0d4e5b89a9fa..c79c6c7fbb83 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 35c0b3ef0e7d..d559378340dd 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 c034d956246d..17184310fa9f 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 a8d89e33cd72..fb440144a994 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 fc189ea914c8..20cfaf6ca6c2 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 57758bbe0d75..43551a6b5a69 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 2c67fd217f5e..fc4e7803b63c 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 413e4103368f..43113c6b6351 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 618789a71412..18f21038dabb 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 afdd375f8341..51a8f1996357 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 c76f57535d56..08fe456c31a6 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 c99052346df6..b5b3b40e540e 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 db67291be4bd..d3546716df10 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 d798f39ae850..2b449a7643f9 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 e911a70c5099..43cda630d77e 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 f8cb67e9bd4f..028d5d2a40ed 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 6c501267411a..98ed9854e966 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 cebd3a522ddb..6f842a8ded88 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 0c77f0a77755..9e4e7d3548e0 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 fbd4a4ced4d8..23f2a8397686 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 f750f79cd8a3..db1473bb81a4 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 adb650814ad5..a4b3a429d2a9 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 40ccb8b7b46f..2ee12506ed47 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 e96a74807341..89f282f6e97b 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 57d5872e16bf..cd778dc94dd8 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 ab645d418bc3..a763914fc3ba 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 e13c1e4b56e4..38ef643aa487 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 7121600e40e0..660420aec530 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 9425cfdd3ad2..dc855b76bb76 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 591213cbd149..5daf5719eb4a 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 dd53eed4e9a3..f7a41e0f8dfd 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 b03f2d0f36ad..039a74d2d547 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 454ab3cf272d..7bee4d1221b4 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 3d35d5fc0529..3f7a96ccec07 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 e6bb060c1389..4714a30b66ae 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 aedf346b610f..855221f221fb 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 a5b7217b08d0..f5ca9ed33b72 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 42b301afd664..3c7e44f407b3 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 9969ab42ef6f..923f678b8558 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 d028f6a90f60..4ba973fc6187 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 6066cc8a9bd8..a38a837b15f6 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 f5df138d2bd3..2c57236270be 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 543cc35aba9b..1329567f0371 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 1db4b0098da4..190d0d859797 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 628fdd229861..06cc8e9009d1 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 59c5c01cfe51..6dd792f3185a 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 20037e11a4da..e152f60083f7 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 3e3fce7b3010..bdb6de33eb8c 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 6b4d38c208ba..f6f4cd3a7808 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 ab7934a394f3..bcc01b46114f 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 3fb38e82976a..da474a66eb5e 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 81eb07709e91..7cefd35c4bed 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 df9e5149015a..7d6949047a48 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 d52a096f80c8..1c1bd973606d 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 b67c01d6ad41..d784c25ee784 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 8dc29f1687eb..641993ffca2c 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 376abbf3be6d..8dc073d60760 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 65a4cb4e0d98..7d25522f1338 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 5e4f62c0ec1b..a52edff4e3f1 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 4355327b4094..bed9eef3a87b 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 386206a7cc83..d4ada077bf01 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 8e02e0f4d8a8..91a2974808d5 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 6b8462783724..4c1c23167720 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 77d64e14bef3..a38bca284788 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 967473537b55..7c1f3067b3c9 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 d487400d8ea9..8c2b0063f735 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 07c1ea8d0927..84f3e25fd837 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 7d0cacaf697e..145e2d4661e3 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 c5febb6ee047..091f44c6f402 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 610613e83c41..17ef198e613f 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 39595ec546de..7c9609035faf 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 30523d4e0703..1bd027ca3b9e 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 3c366ca60dbf..7706d525082c 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 a0c7276cf5ab..bedce0906afa 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 1136d3471f01..c35c3a5f0b5c 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 1519453f319e..91d90ed1a985 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 a3a1b6438537..ef3575ac5056 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 f528cbe64682..b31fa0a1b6f8 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 d18e1a7112f4..570cc39b935b 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 d4349a8552b6..994fd5e83fb6 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 5db132608aee..5428c9ef9678 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 f40c72b9b085..2483e0d62945 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 a37a69f14e34..357c97a4a113 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 bb28d74723af..2a55e345c1bb 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 d1aaf2004540..a27f5b5b2593 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 6c5b3d752fbc..ae8286036084 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 5da31acbb21e..93f0edea806d 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 744b759309a1..d8becf472952 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 f329187a009e..e60606868827 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 48a04eb7a83e..6fed56f20780 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 e92adbfbb6d9..ce208b0a0aa7 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 7386b9157a83..36e28c142444 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 fd9c738af6c0..667ec815408d 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 d42ca90cc5c2..16376dc1f865 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 63fe6593936c..d12588c3bdb1 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 b7c6e8ebaba6..415846e1945e 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 e70fd136338b..f4cd8ad965af 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 5a8f0843ef58..79e485f417b6 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 19e037d24df2..6a8758a03952 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 3f65d2189581..5e4cb3bd8a8d 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 fa0e62b08b28..879bfeff9e38 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 473078b6fe60..6295879bcea9 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 9f55143cdb5d..4859fa525548 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 438fb5c685cf..3fa4b4b3030d 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 de14c0752216..e68be9a7bec4 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 1f8b46709e1d..661d7523a2ef 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 aa7bd2a46e57..299b9ea5fe7a 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 f729d7275bbd..5e93f30102f7 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 71e1c306ace4..f0c787918562 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 270239f067e2..58a58dbdf08d 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 f3231684dcc6..5f23e4ec954d 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 4e7cda5535fc..1db56cf57806 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 cba235b54a9f..70fcd8d30680 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 62728944935c..c995e80c9cfe 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 69e9cdcbd114..d30820800d0b 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 bb2f7f326f88..bb0fe6df6a75 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 1a71f58ee7b8..f060612b9dcb 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 0af49dfb772b..f5f6c54469e3 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 2eff463a0318..8e444519b6c9 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 b211d6abe88f..8230beca85a8 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 a1c73b41b573..216b5443f12b 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 b29f78519b99..ad28180c8085 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 0ba72d3d42b6..747498cc4475 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 9ee005466420..829cdd43eb6c 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 6a7cd930f913..edb518711564 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 e6b493e8c4aa..8b6993eb0394 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 bac275e9f28c..5c9a68c02825 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 db085c69e9f2..c9462875f1fd 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 2afbd03d579a..848bcb6e57b9 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 5476d8bc8b3a..522c766caa24 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 d9a706ba0b36..03aa7fae7d12 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 1a59c8959f23..6be1709c05b2 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 f1c7fbeb3c7f..353bb6ced1d2 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 114615311229..be10f354839f 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 908ca5249352..4c93b2f9486b 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 cea683fafc1a..88e2584e6c81 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 5db30f72ad92..2d8d35c1b3b3 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 6d0330347de8..c959645be377 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 210bff2ab6d5..ecd9dad0bebe 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 cbc73f9b0374..dbb5137cede5 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 01852e806281..b03e7e8a13a6 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 dfcb51e33bea..e0ceda445997 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 894bb442affb..e8c0595a026f 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 8d96b3d6b30d..18c48fb28e98 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 120652626dcb..b7b86c958bfc 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 7941a15bf0d5..721b5f2d0e33 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 89d73c5f6f82..be10c403432f 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 3199dd0a349a..3005e3e19117 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 f6d3c490c9fd..d51586f58434 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 f5ce6477807c..a36c18878c88 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 f4e4df193cb9..3fc2d89b83f0 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 21d45e8bc399..ce9928bf53c0 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 59dd17b66ed7..495852e02410 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 8c89900f1878..7c909fb78e96 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 223e80b92532..295413378a32 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 513f335b2af3..c1a80263acdf 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 c78f99718d83..113ae12fccae 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 438189455db0..56fcca67b168 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 32f2ce6b74a3..4450cdafc460 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 952ce382dc92..6264b82b0df5 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 531811053d67..d39f4d7cf3b4 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 62d364a7e524..32128a170b10 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 4d14b7b805f6..b90528c228d1 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 ee708ff66e7c..f80fb5ec020b 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 15b7eeb6de3b..b427efc6f4e2 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 3f1ded6ab425..3099b95848ae 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 9011df9725fc..fd78827a6c9b 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 4f7d7d9f0b7a..e252940e1ba3 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 4b8fa4601b8c..1ec07ddc0b10 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 e73266737ea9..23f5ce6f6490 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 06f6da0dc884..467bcc035374 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 d01483cb25a8..d39c81e3dff3 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 383d8f4be200..25b9127ce965 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 0e19207edef5..021057446431 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 d1979a0c1ed1..579cb9060fa9 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 d41694358e55..fe34019d0da7 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 4e685ad76f3c..64ee1c3e55d4 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 6182cabb8c7f..c2a004608904 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 29177bfb8cac..4b13a9ce9f59 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 7b598be6ee74..0d0881b5bb31 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 4cc7518fb56e..96ec4e480938 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 4d11decf5596..f0f5e1f12d45 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 fffbaa1bbab9..06d140171aa6 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 2ba94b1ca25e..29d1b32e07dd 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 677185530eb1..b021443c51f4 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 c7f0a38ee9fc..d93c013c2076 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 15f2a2f597db..02f4c4312361 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 cf9e1a4d16b3..7e3a44be1f5a 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 52bd57aeb242..4e2712af7b70 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 58be62bd9348..04bda015ffbc 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 5309a6bc9281..8b2a0f65f9a4 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 f6ecba71db62..289388b378cd 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 58c12889d4d4..49cd31294c95 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 5c3b41851fc7..6ae025a60bfa 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 56b2ed16dda6..24c3b62f407d 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 6c44fb39e7c0..9b7be8c40233 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 38d7bac4b57e..8db839e0e4da 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 1f1be6a06da3..bf073790239f 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 b37cf790c720..482b4411991a 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 76c98d91e160..c8f4ae843eb6 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 ba32eacffe38..6970abf3ac01 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 11035cb6b02f..579547ddecdb 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 e5edf9c06e5f..31c6822286d1 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 6f76f03c3664..e7ae8c2c6492 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 550ee6d57c7a..0dd44dc8a2e1 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 5197e3c31505..31e6840bf149 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 9eba3e7b2b79..5f679fd51b9c 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 03af68ee9c9e..ba83e5d65840 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 3a58020a3e8f..56b5333622e9 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 1df31c769be5..bd42915e119e 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 b228b730cb59..2e35d1f1d5eb 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 e83d28d90a1b..ba113bec9a40 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 376549fcc295..d437e6cc52cf 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 5be604e7225a..03283caa49a3 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 43113ee750b2..cb381b8eaba3 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 8e8f9bc63bef..48851179e977 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 44ffeb5d4989..d46d81c1d726 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 f6fdd790fc0c..0a48d4287f80 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 7f5c4a7a2031..b2c387b61705 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 55ff3daa8d38..5c100b96cad6 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 eae69217759b..4abf80d6bb16 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 55cd351cfa58..bbc1274c8b7f 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 f7159994bdd6..a3572aa9183b 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 ea175907e8c8..3ff91ea073be 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 e4602a6ef7ca..a21f8e97034f 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 6da49a3b0703..a9f70e1151e2 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 77ea3aae21b7..1d8f26311c69 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 c2ffe54dc113..b773801281ed 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 bb592630219e..1e608c2447ee 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 aa1276e50210..1cfa1f3c0850 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 be07fc5bdf47..dcdb3f7e6948 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 7f829d8bd11c..8573e1fc65d8 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 c92746290130..aa357d59491d 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 f4b6e33f97c6..8f9c30045000 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 3c8bf8125fba..b6405835c826 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 43ab25b105e5..9c020d211db5 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 7076282e4459..978962d32cfe 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 ae8058aaf620..de7671c3a8d5 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 335af4ef0cdc..00e171867dae 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 3ccf76e32fb2..4f490a9ffeec 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 65df255b9266..c3486019c18c 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 f4cd872ea151..ec42b2c9ffe4 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 0931441809d2..70a5fb429477 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 c0ba63f59bbb..0d43fadb0fb6 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 6f24784ea5c3..dc686467c742 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 e11b2dce7c7c..743c9ea47586 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 a6499c3872b9..98aeca787c3b 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 78af666d7ce3..fc28be8d20ff 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 77ff7f7be50c..aab79c2a24d4 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 a922172094e3..839c1901f87f 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 4948c53ed374..9a5f98bb2d62 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 f09a3a0b00ca..9e619538d6f8 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 b6262a12edae..4dfb9a2329a5 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 eb75634c210b..e76703b190c9 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 23ee415f47b4..7a0bdfa65c9b 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 c49a7a3506e1..d2be0aa0befa 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 26957ee7a232..d9a443adfc1c 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 982a100e3997..497d54e8bb00 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 37750bff6e7e..e3717ca9df48 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 95d8484b1c66..d99cef37aca1 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 1c95bcb3da94..3892e93d8028 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 a5bbbb532de2..f0778fb5d26f 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 972c2a88bedc..7662965c2717 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 9b2312240e42..a83030692161 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 06e3622a2a49..b51676cf770c 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 3cd91c45a13b..22c32e13abd0 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 852c788a082f..135386d7c59d 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 d671a09b8b67..0c93604d30a1 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 5e41393b9021..a010208e1e98 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 026c1c26cf32..316a2368feeb 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 247c76115328..10d59a405fcb 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 95dd4d2c234b..3f5529c5a836 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 294bd3bb4171..ffba2ac9bfea 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 03353614b43e..47423db209b1 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 f828dfd0067a..62bd3eaaec2b 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 9eab8ad7e502..0be34a26b654 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 91a8936827a9..160bfc96d4a6 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 611ff09e301f..50dde089ec71 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 18b60e6e1703..561e83712085 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 cbbbd7c8a3b7..e3c59c57abe9 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 14b456e7ee13..f2b18fafc7ee 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 ba50901b0948..545f17afe0a9 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 0cbf45cfe71c..0f680584f1d8 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 de8fbb269ee1..c731c142f4f0 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 cfd7e8de03f0..df3b4d603356 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 c5d6dd637327..7f040143fb1d 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 e42a6607a10a..be588352138d 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 9976ed2862c2..dc5da06fd815 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 b74cab059ac5..8c86fa649e58 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 33e6f0f8a138..c21c579a53aa 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 1bfc24bab4cb..ab79e61eb349 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 e4341e9157ed..5fc0f0b4b17d 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 8f4b4ace7465..64c8be5f8bef 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 e4eb3fab5dea..64d489a6b2fb 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 0a1f6fbcc5b3..7c775f94a508 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 2573f763a053..2ab2f4bcfc49 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 58fa0d2ffebd..b211ba528bcb 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 5212c82d9ac2..147efe9927b0 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 d2058b239c6c..4410c591aece 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 705663af0152..f452ac504326 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 65f30769973d..2a1a77dee417 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 1bd73776540f..0e4b9ccc712e 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 ea74c821882a..b003aaf22488 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 757f0b32a064..9a095e93ee61 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 9b8716f0c07b..ce6e763ebd21 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 2ed94d3f07a3..67d11d3b03ae 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 b70adb74b2c5..00a63cde1a07 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 1fb96df38cb5..100f4cde2112 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 632f50e3087c..e55592abc8e6 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 44cb68e4569b..24863d32ff08 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 24e5a922d081..e217a004989b 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 a92f3875caed..8849f9bc2019 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 fc3f8bca9e5f..509636a237e0 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 edd4dca4c8c8..e6d568b86ea5 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 9ef1dbbc0b2a..afa97cb947a2 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 e7aa2e866b1f..9980d5cf46ec 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 e879438e3dcd..7b7a903a9d5d 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 698b91be5222..72c46072f38b 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 9949b8e865bd..b7ec32b04dfc 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 f4603ce09815..0114a9487c9a 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 cf1e35ed7bcc..70c7124c3651 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 92f514d75ca5..dbff717427b9 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 e9f14ae0e878..6941141522ba 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 992d1a0dacae..9315d7481c49 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 e0bb81f57cb2..c8599aca31ac 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 b9d2359623a8..9e47140bb6f3 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 1b35c61cbf32..eafac270242b 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 f369957382db..4cb9e5330ea1 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 9c0f372397df..ffcd5e3ae7bb 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 001b0c359c1a..46732f606f61 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 568c84ee2d39..91af0a144aa7 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 7d56c6694c54..998e148b4870 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 8ad0f8dd394f..82b33cdbd032 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 de616b5f1a37..259bed79a7e1 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 d66c59a9937e..be71ac787fb6 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 0dc9de228e5b..9e87ee2ed9ce 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 60761facf829..d5c6f6608e96 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 69af79909352..139dc22020d8 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 e476f3b9f0e6..e5640afaadcb 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 a73c5120c48f..d4e9e91ba1b4 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 085006ac10f2..55a740965bf2 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 a0d35e39af2e..ca2266042320 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 64785dfc593b..e4fae962537c 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 85d7e687621b..6f3e37700426 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 d6a93266f748..31e3dab5aff3 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 0fbc6d853db3..24a1fd740433 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 9a8f403d2637..8a58fa211394 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 52eca17ce554..3735bc5c80b1 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 8ceeac16037f..d48121f03cfd 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 09db5df745a0..e4f1560d591e 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 c0befde542e3..548d39233c55 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 27b7ff2f1c58..7d7587b9fcc3 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 a641a28a0d25..b1a19fc3145a 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 e84e4c68d88f..10b6be51ea13 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 58c009deb15c..9b7af3924e57 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 b06791128835..ba363f8e26d9 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 80dd3f7bb31c..ca93d4c58fc0 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 e36b3d4020da..a10f0d43e286 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 474f1119e309..70b994bcf160 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 0f64364ce43d..e3c137971e24 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 ad63165acdfc..276449c2ada0 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 a9d06729c9d3..ef0873ddc756 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 b62d3b920507..b64a0089bf67 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 6a91aeea830e..1bd6f56061c2 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 488d9ff3ae8e..cc266823f703 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 45f6eb557b60..60418e47ef79 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 236a3ddfd73c..f74b647bebd4 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 cfc2931610e4..482ead05926f 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 f37c737e974a..e7096ada2c82 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 2ad11e53671a..44619047eb9a 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 6be8c71946af..edb2a8fa9f57 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 2955b75b179f..381e9b6ff512 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 04b8c5159662..a97a52392c33 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 c242cafb43e0..d5787f3318a7 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 bb16387a823e..c2fb483290c3 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 1235537a1f47..bcec656c2da4 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 5a7a1c013fb8..222e2f82eec3 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 208eec61221e..43ca5956000a 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 be8135287e43..c76334c2c880 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 de1b5595b35f..ac7999c93e9c 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 244bebd5cfbb..b3ac5ece77ea 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 b9f3a2f0010b..455db0fd9bee 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 f1aa95a246a1..6cf1c1cf6c67 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 293a62c2a3b5..62a38a52e278 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 1869f8dbdbc1..dd0c29c71f44 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 5ba9c884ebaa..7e56677743a9 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 52eca17ce554..3735bc5c80b1 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 4c117cc89157..a104ffd43473 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 bb086fbaa24e..8862f597cb0e 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 79818c4992fe..1374fdd9d43f 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 2e2adae3cde3..dbef1cd5c46a 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 991b2baa97ba..a62359aac075 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 b92aef5c89bf..a2b2d8b60d2d 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 ce0e8c2fc1db..49088f5d25f6 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 20b914bcde8b..b31453d12aa2 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 29568f9103c7..d7be3117ac29 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 a8a360dc5661..ebee3b929fe8 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 012e084a3a9f..68b32f1d547c 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 10b0f531cc3f..5a767c20c451 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 230d29c04877..9029de60ce10 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 27caad918066..64408de7bbba 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 374e2208bca9..6b1056eda7b7 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 d9a01445a06d..126869d1064d 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 e4acf291e341..15af62d72768 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 7d402e65a2d9..43a74f4b41bb 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 10818ad44f35..471dce47f5b6 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 428bd16e35e6..822556e4aa03 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 6c5fe2cea38d..2ac18464801e 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 53a169c2e224..ffa549258c6d 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 043212e638ef..647324e32d42 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 b10d5e7f9bd4..8e063f7f7e23 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 03e136274e38..56e58dece28c 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 dfab668a0bfc..426215257e0b 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 3db5c877553a..7932cf21060f 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 7fae32048eaa..10c14c6f0c76 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 17115c66b426..a7615c7d6c33 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 02fe205e4e75..8e7ce345ce9f 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 df85ae0b74aa..91468a9a5103 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 7e656f3c5329..d6650091700f 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 a9ff2c95dba3..e794ce8fd622 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 ce0cae35b92a..b7865feb8afe 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 03f25f8874f9..4796beda8c9f 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 f65eabf31d87..b499f0469013 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 2cc0c353cd1d..dd73cc9476df 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 fc80db7a7251..74333df6512b 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 3b259a007585..a3cc35625f78 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 59d669ff21a4..a1879d8174ba 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 c471902ad3e8..6685bece9126 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 7ed6dbd81ea0..d489d370bccc 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 6c5e1cb20238..cd07abe81bbb 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 6a21a149ae02..585096122c51 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 e3f84153fd5c..f24bbed53892 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 d5c5a310a528..bf8be17f28fa 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 da2754dc514e..49311f391fdd 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 ad458a8eda30..4b71de2e8706 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 faf244c0cb9c..4e31afd1df7b 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 ad56a6e270a1..1ea929d7ba3c 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 5b386385faa9..186ae050e9f2 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 5d2259850ff6..06060bc4de6d 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 3605aadebaab..f30958940004 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 0995c768dde1..368de8a6a7b8 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 0d27cd0b598d..419327a2c9ad 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 a17fcbb35e7e..5afdf902fe2a 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 3f928b283108..c658d10886b9 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 10990ad3302e..20fc675b39f7 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 389bb34a9420..3f9b871d91b2 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 3c9603d9c77c..982760cce3f2 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 a3d196164696..eb2158e033bd 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 05d9a62a2a51..35a974ff504a 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 643f897d9f24..87ce22e92a3e 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 8b46416e0202..70b70a2ee958 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 6b1c192c7451..be0d5c296f91 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 e2551eec08bd..b4022863d3b2 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 65c5cdacbfa7..7a1a2b5f0166 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 660770d0ed95..50d392fa6403 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 a4fb6c5347c4..911f87f0e13f 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 405c1799e3a5..bf61e18a9288 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 f5574b6d931d..4042a8554fd4 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 4e379e0b6db6..eb5335bd1729 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 66807a295632..02c652ec12b2 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 31bcc7b773ae..67b6efac6b1f 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 c1586ace88a7..2559917acee3 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 9b995f0effb6..6b3be9d4d105 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 7096d21d4796..935535ad4ec4 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 b51e548ac613..74608beda709 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 98214edfde21..b17be65108fe 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 8579845a24f4..b07eccd459d4 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 a50cf1fdb53a..a8e684d1bff6 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 ac20e0220f31..e98880d84a28 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 159ccf77b49f..940a044d6456 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 66e7c47f03ac..1be6d9bca701 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 db57c58b91c2..963106c53d75 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 971e505d8678..d64f7b8a226d 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 c1965d5050a4..40d1c344acb0 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 87669db99746..d07913e071f9 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 3512be270206..070d35ac21b4 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 26be541b20c1..eca3f964457a 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 f8c3e6d6eb7e..801efeab73b3 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 88c52c2286b2..6ae9ac334dfb 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 2bd13e4ca024..fd74565371bd 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 ab929abf20d7..f9e0850274ee 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 452cbd2dba7f..7f18f9f2d9f9 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 f0c323b5cdaf..0a9ff7272bb9 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 2af9b7d2c32f..310a4d9eef1b 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 dc4fbffa813a..841d17b29158 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 30080dd49fd5..81aaa567314e 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 1152eb3a47a1..0a6ab8985dee 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 e0f75798fda5..e380310617c2 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 6a20edfcca15..4a291967b40f 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 e2b94371427f..4a0a65fb6ec9 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 9fd0565b6dc1..3a79530f2729 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 02f5fa0196fc..613212ca86ab 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 93edfe6534b6..4f47a2543058 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 6a8b03b6c2fd..5cdba3882f20 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 2402ee059dec..8f78b891fda1 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 63434d9a4cc3..1efe88f30967 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 30462960568f..e2bd6a1dd735 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 749c4ff6be71..56f28012406a 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 de25723032cc..8d52b67c2619 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 e39c8c98e6c8..3c3bc1967b84 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 5e1e816475ef..fd4e6bfb6866 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 0e0156e79c9f..f03bbf78af40 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 fba6aa7abfd0..fe2ac2afdbcf 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 3114a7c1c57c..37fe9ba82230 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 a0af91d98006..8d89ad81f8e4 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 6a37dd2f3a01..8508fc319d5e 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 329771bef5f6..99b443991eef 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 441ad02fea93..b3707e2d65ef 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 8fe6c415f3af..8e2e650e18b1 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 0db56d51fdcd..98897101984d 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 fb183ce3b55f..3c963c0ab5e8 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 178c943316b9..70dde42b74f7 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 074033088556..9b371cbd06fd 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 7239c389eb1c..3d6907080560 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 79d5f12198c0..f41d07a57a40 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 4af5a882ef00..72c904e50d3d 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 c79a24d1e6df..a02cbdc45aca 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 0a0f9eb418cc..8cc5a9f4e2a5 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 dcd82ee4e688..b4aa208ea499 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 d4d8b2c97fb3..7b0de6c9c14d 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 94032ccdbb86..b483a5db793d 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 75406ffd3f40..b3fcba913b43 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 816edba2bbde..67b5465cd259 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 43236b0cc11e..71d3c458d799 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 ec95dd3e825d..50e59d763947 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 ca68e49aef72..d391e15f8622 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 88dc57dfd6e6..e41c85294f88 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 befbe1578eeb..902dc290c871 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 db2450969e1e..c69d83576c28 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 6e1bcdce4428..c3b3387f03c1 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 cac5b8ae7fbf..5d689ae018f4 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 be1eaf7d8e0b..b50a7eecf349 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 991887103c03..dc3a4fbdee82 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 452dc71301e2..aaae2ca3211f 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 311c0624f30d..a68b617f5d19 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 00e1f2085458..63831b4008cb 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 d804dfb2d491..e840a9a1ae50 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 c2ddce64d4cc..9aa23e7f8a1a 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 7aa73e7288c3..8493a4957a26 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 9ff093f65570..5ee9b03d49b8 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 76cd04df700b..2d25c17228e9 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 74855dd3fbdd..c03fc7221c1c 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 9ca723756edf..e4ab283a2e0b 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 ca0a608768a6..dd688dd9b2b2 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 b68f858d4353..44eecaccf2d1 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 c01a652f70d8..e28414122402 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 df0464c1dbb0..3e837db24f36 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 9973fbec43c5..6a6134146e3c 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 9d6d3d007fd1..578db86977a8 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 844e2a18e325..88f23e9440d5 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 edd12eb77c37..9abcdd88c811 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 bbd69dc1c55e..385428211034 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 a7540ddf5581..c348555de434 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 b7de0b1d6608..6831f516c3fd 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 b8b1e7a7b555..39d70aae9015 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 43ef16983970..215e9ff840f4 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 302ea7eac70d..3f5f8b25bca3 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 d7d086d67570..71073179c0e0 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 b8017a6b5e24..65e58b368f0c 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 d1b512b4fa2f..929ea1f7c061 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 08a462335147..50030b219c88 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 7eb47f506ff1..106205fa92e1 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 d0fadb2545b9..0d8554754973 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 619da6c41c72..34f6085a8ddf 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 679c4b84ce3f..619535b3320e 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 faec1bed8319..f9992a961247 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 73c75afbf47a..969be0fa953a 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 5bece99bc547..f860bf1651b9 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 1167f0c680bf..b73fe3bcefaa 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 07de5f93933e..cac99d09e2f9 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 f4c67f29b350..01458d4c54d5 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 c36831c2d8ea..af1988ba1298 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 333755964673..ce02468851ca 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 356247482dd5..75854ce226cd 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 c6703713e2dc..2569d6c767b5 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 ad49f5dcb7b5..7ad084a1dae5 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 d2dbc70d6250..ab193155c7cb 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 4818fb6bc7a7..01acb0891626 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 1e6640868c36..b1cb36461281 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 d2e5dc6bb958..9b079155c5f8 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 c66d4e000460..bd71ac1513b6 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 365e01d44ed0..40aae7cfee8b 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 382324de890d..c2364e3bfc13 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 7a9806eb2dfb..bc27f4d188bd 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 a35a8146f328..afb2ee01192b 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 a6927e23d7bb..ee4a9466b7d3 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 dc34560b453d..5d0ac1249ef0 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 4a1b94bc3fe9..325ab75bc928 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 b1b7f357f6d9..487ce46ed3fd 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 45bbe08dd16f..ed69da95ea85 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 8974318ae019..bb8371872bb3 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 5a881a413ff3..0477925c8d4f 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 85d3ce987b0b..36e58e05ab68 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 ff151bc09bf5..af05f78acc3d 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 3682b11c0ed8..d942e91e25fc 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 1261265787c3..030df94201e9 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 e2327cd94669..1f4208df7ee5 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 4181dd09dfa1..c3d39e19ea89 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 4700a682358b..ec70506c4d63 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 769f22856a07..6de767b978ca 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 8f7513ad545d..fc3e8d43c3a8 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 3fc13c714e3d..a48f1a22a3c5 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 d1dfabf1f32b..4ef04d26f405 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 90070c6369ff..7edecf894d73 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 d2960db1046d..7d46a71fd87d 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 78f4c7de08d9..75f6f565faa9 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 480e70d56323..110d71dbad20 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 b100b7e53fa0..3cf02404ff69 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 7c7726f1292a..db978d54abc9 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 2f8496469e7a..d12949bed15b 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 3316d1a62892..010ae7a04984 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 6b7d1c55f1a8..a1f6321b4dce 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 af3e9c7cc8a7..12ab5e8d8583 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 66cd79a05291..2b927a3450b5 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 2cf583f8b1cb..68d98a05da33 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 82ee9258c272..fe3a84986c5e 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 e2332a884007..164f4e7f0d45 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 7c92941760a3..d41df902f9b2 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 645959d0e50f..73c5249ef198 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 981e80ac1b7a..4b819a7dedfc 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 7f92107a44b4..2576db5fd8a6 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 6a5ccbdde3dd..6c1ace043d89 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 639ad85e11ef..218181519c4a 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 6a996365bfef..78fa39738973 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 1726d25ca30a..f5a719d04dde 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 b8298dfad674..3d3385b93c5a 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 c0ed089977d7..9fe89422e9f4 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 2f4bb68e1633..181b1aaefdfd 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 25a08baba3b4..ab0d079d3e80 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 ccf6cf34923e..3a26d6abc053 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 3db81b0ed3b7..ae737e37d190 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 a90f61968ea5..c8d359148da0 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 7c0d94853d8d..c72241341179 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 db1297e59b8a..e4901d1d4d30 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 31e687d3df9f..88aecb9e2eb4 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 abd787022867..027874bef902 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 08f861eb8f42..119c899410ad 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 375500ad11f5..1c28d45996bc 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 aa2577d5a140..1586c6c8bae5 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 e3162457e6bb..5cda4eb980e6 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 eab05baebb4d..7434bb2a27a2 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 9047a5b8d449..dbe436dd9875 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 486cf1d8f415..211b0bedec8e 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 cfbc1e1c3cd7..2e8c9cb6cd99 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 d65696ad6aa5..f1dcd5ee5395 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 4b775c09862f..05b8f7b48acf 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 88e6dfbf5208..3975004d2665 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 443b92164ed3..d18a255eb4a7 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 bc7458e6a5b6..d9618f74f55f 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 00267704854e..4f9d7389549c 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 8f889ed99232..01b69f274588 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 84453f079c40..7717d75645ef 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 1b584c5a5d14..dde7d942bfd6 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 4e5c2ed7c16c..65b7a77f2efd 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 00a76e2e1e9a..b27bd0321838 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 fab8d90948b1..d5352832375d 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 f36ce53a303d..15f5448e9f76 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 462a2693d729..f4d77f9a09b3 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 6b0492e4b7b4..0dfd7741903d 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 33e7b4aca687..107212c6150e 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 dbbbe375cc9e..81e8eddbeeb0 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 cb343689f74d..b0cae3071686 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 5bbf4da779cb..61949a4fda68 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 1aa19694fba5..0283a86c6bbc 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 ed4315c3bd4c..1680d91b6e16 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 ee4da4636435..c500adff1b8a 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 d2a2e8624166..1c4ede29fad3 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 dff4fa164fb2..62b18d7b0778 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 ccc5bd8a13dd..0da4ea08495a 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 3cd7d8005beb..185c438ece0c 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 55f7fb08be3e..7684a30276af 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 bacd18fc6700..5ee72dc371f5 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 6f8f7285cf65..d2f12ff157a4 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 8168e3eb8914..9ca9585912da 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 2b12e7d141e3..8341ff8ddc68 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 c4a6bda72372..3adae3dd6529 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 f81eda6f918f..da8b28e93687 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 bd9b9bf0b049..976706206d6f 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 d524efc8691c..564bcfaeccfd 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 21c1d5a74150..cb21cd0718ab 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 b7dba285c91c..ee62c087b688 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 8022e03d5f4c..4e3f7b817ead 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 13b6db0b2e0a..ab6de2a7c586 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 0774889870e5..77e43a9c457c 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 f0b52ebe84f9..72f6568fe9e8 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 b1b314f95372..949fec961ddd 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 0613d8c38a5f..6719ac5466bc 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 764892130b7f..648430b3eb84 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 a5e7795be418..c532ced9d4ba 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 0de6bf13850f..721866357d1d 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 8ba498e8a715..2c3299992432 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 4dfd04211de6..f2ba8067393d 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 bd2c119998f9..44b2d7b60820 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 462b39d5a339..561c0b43bef7 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 0cb0f32abe46..e64e78851abf 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 16a1836d67cc..83f840c8bf8a 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 8909873bcf07..24bcc6160607 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 82af27af3d6b..ca75e662c204 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 8ddc8060299e..41a70676b0fc 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 3664b16f96a6..5379ee1d4c3e 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 e5f74cab905b..ae7218aae766 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 abd2571b9e3a..8bd781270482 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 2e27e0460b85..1aace1a17906 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 c965e8222795..e6335a4a21bc 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 fb670e6ffe57..9456c14297ba 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 30c8837cb5d0..75883ca62d57 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 6295427b775a..28d76066425a 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 17e6acb78c94..c70162b18dd6 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 d9d862f167e7..f1a038cf4eaf 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 68e985424fca..926d789e1a52 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 e9446efd4b36..9bb22c40c458 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 8c034a09aafd..846f4c4ff19d 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 ea316a166a79..312a34021f5d 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 7a8393f19528..3c446e9d268e 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 62af5b50ae44..9761e5895b74 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 499e22108b3d..9096a5979ed1 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 d46e5559b443..0f1f6991f977 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 bd4682b57141..a76318d839b0 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 cf2b508dd1a6..e9ace946d933 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 e1bae54b72ae..798efc6ef090 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 9f2ac7b6b2f0..d80ce3140a36 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 bd9d8c8634e6..883751d9d1e7 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 89706ea66198..d502266c9ac0 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 a7703d0f48e9..902dda21fcb3 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 4e4274d7bd10..650560033b6d 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 e182175a3157..9f2f676e74df 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 a55eeea6213f..e21fb182a944 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 c7d90240b1b0..143c5defac86 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 fb7404c38028..6555e1f9f6ab 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 26ba9a24e8c1..063b38344acb 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 49b5f92788e3..12ba00eeb80d 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 a3cdcbb360c9..204e7548f4de 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 51b99c0a14f8..549d196194a1 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 8b9353f0e9fb..bcef4b5c212c 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 cc627b4a4c9f..419a4d51f05a 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 c45f8f38c123..cac6153184ea 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 c579b5bdedc2..13c3c11a37f4 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 419d75a611d2..8ea8d2cfec63 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 35cf133d2882..cb24eb4a0acb 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 7a9532e70f6f..849fa722d2ce 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 3aacb4221371..e0b1725cf272 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 34155a648564..f028d797d510 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 88a5404c8aa9..55fb4a6c6fb6 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 be6f22d65335..b6ac92e3cb6d 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 13b7d19e9f64..eb10f2c8a76a 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 96829b86480a..aa28b5ab58ea 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 fdadf4c13197..01dc45ac3ec9 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 a7d3a69b3711..c0ea6fa225bc 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 04208d3f3029..364625d1e4e2 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 9e774f3a623d..c5756c85f4ec 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 dd0a1b9a2c5d..81e4b9272f9c 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 b6f2e7f1468b..5f5cf4be714e 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 b6f850407dec..dd0ba14d7521 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 092ce0ed6c6e..6888ded9676c 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 68120998a720..0f9856dbc49c 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 99681aaad62a..f919c35f0d96 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 509cd383d281..a07ba5e00590 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 048fa5f61a3f..4346797ccca4 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 3b5b70f6dee3..dedb14230ac1 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 e918fc9953fd..f6aa7fccafa7 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 7ea969499a4d..db09849d7805 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 b737520d1a9a..6357111d5ca1 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 fcdc8604abed..01126dd57c6a 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 377e338ad9aa..21499e701e66 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 08de9965488d..7346ffab65d7 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 1ebc7afcba2e..dbbd902a9bec 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 cebf59ce6949..571b560f3892 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 f3b2daaf5e67..b047ed3271c2 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 9f62ac6955d3..3ef4fe6297a8 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 876397447b46..66eb3decc794 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 11929f0b2199..2bf12031e4cc 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 124be0b54b7a..6c0d6869f75d 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 bb8fd5679050..3c4ee9024113 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 5382fd329085..80672f78a66a 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 41ec60e45c1b..9b05b7f9fc4a 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 4f54f3226d85..967435e34c3a 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 efc28a1b94a2..e46a1196fe50 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 fcc63526d9b5..1c3ae4607d40 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 b73aaf9d8ce5..072cef6810b9 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 2ef5d6f28a81..9a4691a60a79 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 dd1a300b27d2..0f375ca642d4 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 8d94c8a579e9..88132b8ed4d3 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 6e92c49ba6bd..e66eebadbdec 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 2fcbba01580f..17e7eba209fc 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 141e21ba2cc1..0c23602a585f 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 714b3264b38f..e2709fce1b53 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 8366a549d7ef..ba789cee49c8 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 6b9efc15a29e..26e206ddf08d 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 3eaebb370fe0..80a328cce960 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 9dfb26ce13d8..22d372709396 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 384dd425b7ec..61d537485c14 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 8b8369459647..373eaa2a788b 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 6e1e57e9f217..6652807edc48 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 63daef44445f..d24129dde9ca 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 3ee2516fbca6..a93a5219f0c6 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 4b25ef5541aa..0d22199c0a58 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 f25ca34321d2..b9d529747ece 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 49ebc24e1dcb..6c60873332ac 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 9e6e4400cce9..54c9027407e5 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 580d621ab88f..615de622f483 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 f3a372e81559..ab47398bf410 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 099db87ad7fa..f06b25cc826b 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 463900bcbee3..e0afa6c5add9 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 4e790e8b5b41..6ef922e170b7 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 92d6caa3f854..b23126e58fc1 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 c7ebea4e4321..054c259199d8 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 052e2d876952..28b7b3733c33 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 dc9d5abdbe9f..3e2514ace5d0 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 cac8813193a1..76e0e34a18ee 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 47235c943880..a59d5f2111f2 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 0b50daf66fd2..c33a30a6afe6 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 d9c69d99c348..b2d124e1356a 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 7c32d50a1e4d..1ff934c94bac 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 39674bae62e4..a73a40408b3a 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 c90f282932d7..9790bd511055 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 adef2ed2d524..49c63ecc2159 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 408fd7ae43a9..1f74548703cb 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 dc8c2f8c0d80..526f6d9dd7a5 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 098949297d63..8d4af1767db3 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 2e54cd47f928..38fa2281cbd8 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 df0944915f2f..49e6d6666e9c 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 031f6b0b476d..3906eb4f1e8f 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 68d6ee49bade..f8ad5f0e78e3 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 945e2123f123..a226bf293837 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 0a131405f7f8..c9f6bf335a66 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 f5f92627ea10..978e90711ef3 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 5ecd62fcf744..d67b9fdff065 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 93b0a244bbc8..db978a3a41d8 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 1184ed1fa2af..4b9ca8f2fceb 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 15442bcd30f8..ea618ddb0633 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 c552c3f46741..2d0402793498 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 e6bcecaac503..86dc79f7afa7 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 e7897e42ce10..52e02fb04202 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 8a567e1929f1..79b7a57c846a 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 ecc60f3b38ee..0f675694748e 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 5582920c0d84..5f4192af84c8 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 1d3b705bac9f..113a3e09f223 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 235ebb0a9b15..a500f07e10eb 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 68c23c1014cf..51941be244f2 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 49ecbbead42f..d7cf6e2a5e19 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 3add77719a59..2de3d78c1f6c 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 3bd3f8a9182a..7629e94a3265 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 e52f73ad2dae..7d74aa931eb1 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 e2a2b4dab456..41c8f9b33b3e 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 1b9ed5e41652..56a639b45a2a 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 9a84514045b8..a6b4d5596866 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 1b9cf356aa5e..8b47e2c8f7a6 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 d0c637e48e1a..070fc5fb6729 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 8f9f69793c35..47d53f1e2c72 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 c2465da04653..96577d76cdcb 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 6830d171e706..c011351eea24 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 4a253e8ccc90..564d4c048c1f 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 4e4a23b2459b..598309d09dce 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 f25c90e86649..176932942625 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 11983c24d7e8..5f4559ba0d0c 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 759dd9fc5dfd..f7037f47d784 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 8ca705337a47..c14da3d4dde9 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 48e6ab95bc0f..58f8c80c3de1 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 41d32ac60ebb..081dfacd2242 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 d651d75bad4a..c2b20a8e6249 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 9106d20d8aa1..0f085c12b5e0 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 e2aec36fa29e..fae3804eb13d 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 89bff526867f..c31aff9743cd 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 4bd8d8bebe40..493378aa1c5b 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 2298c61c3ef5..7b1a7fc04fbf 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 9c13ccc54c3f..04b719ef36ad 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 e9afadfb7803..acf3379fd6b6 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 4af33f58969e..bdc1398b5d22 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 0c1e0c3fe594..9dc6af85bd67 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 056608337fba..7b19841d867d 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 0949fec2b343..f0e840c8473d 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 e63a1ed9ab54..03f20555b5d5 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 bca24b9013ed..066ae7189599 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 79ead730f2b9..a1206d3d000f 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 848072c1b003..9af99d654450 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 7be7bce15ade..1d06e6ce8d93 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 a7ca51559a93..0e85114667ed 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 d3e1def77155..e7bd4ec339ca 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 2b14f11f9147..3e7d05d649cb 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 7d5bf6c39eeb..04dad37d3fa2 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 9779ad63e5f5..ad0c255c6fcf 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 17f033ede65d..5e01291f0916 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 3e1694199d14..8961940846f6 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 17a68f180373..c96a048119b7 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 bd8789757e28..421c50308963 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 eedfd56017db..ebc47fa4e309 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 f2ba91d74232..b71ac237cb0e 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 b82ce89a00fc..afa99d1aa65a 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 81e6dadf05eb..996408cedb7b 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 f82844e8f197..38d9efadd640 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 a493d999df80..91737b3621e0 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 12980013b6b8..a83ea22d8195 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 404c17dbdec4..6c6e685896ff 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 02ff1db19d46..dbdebf15129e 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 59a5c1ed034c..8d98a000472f 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 e3264e7a881b..5066a2077705 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 54a666985fbd..5d8f52850089 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 58fe2a355276..38ba98d4fd39 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 1864703889e6..c9aefd048fae 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 b4f75df625ab..bba5d192b856 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 747329fec3b8..ded963ae1ef0 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 20913c711bc4..39dfb3e0f8d8 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 f7a469b7c7c5..21aa2860aec0 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 79ce7a24c49c..8c607d1bf463 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 6cf29dab2dc9..d2aef15831c6 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 39e884292a58..fdbaf7eb0014 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 24d8e12d25e7..4366d30c083a 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 3f01facc531b..d609d07f5980 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 cfc569108fb5..f454db34235a 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 3aebea21e54f..5f6bb9b753e2 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 6eb1ec3ef154..5fd5080ad5fb 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 2df3da2e5934..3a49b66617a5 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 83df47965475..d5900ebb343c 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 0c5fef638374..c1c39cd1ac37 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 14d7023d5fa7..4583741d54ba 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 e5087f95a631..681279bbdc15 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 97bd604538e5..003f9ad9ab59 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 0f306aa85355..b61c86c030a5 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 932bd09e4d8e..4d7ab0fab4af 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 035031e35d86..0d0a0a27261e 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 56a1d9e707b8..68be2af72fd7 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 a83afb02baf7..8724f92552e9 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 a1da24dd2d94..c9dd0d9f97a0 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 79ae6160c069..df577af88aaa 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 80e4cdbcb874..8929c88694ae 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 d66f96b597b4..7904e216ee34 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 10a000f9b93b..eb40a8f7375a 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 0e6776af7abf..61dfc7a84815 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 c14f4c65feac..63b7e39aaa88 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 2026c906ccec..b07c840b2423 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 8ba79c818f44..3fef9fc3c091 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 94aef96b549c..5397d38e0622 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 d9b09b33ac91..f390e044b45b 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 5f5d0d4bfd96..89fd2f4291b4 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 948ed5c6722e..67a9a84951e1 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 28e5121a5cd1..cea7f5d90d18 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 09cc54f84a1a..51b11ff760cf 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 0f9392c9aa0e..0389606147ed 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 a9383aca8923..f0168724f9a8 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 66804fe6597e..93e6d9e93273 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 b600bc19438a..3e4ed2fc2155 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 23e9bde77e99..afb0b43d7ca9 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 4eeb5c4a74cb..9ad110f47f5c 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 474d4eba7c2e..2548d96da8e6 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 4255632f9d6a..469ddef72396 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 320b699a7586..924b72b23bea 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 c19fb0a7aafb..9bc9078ca8fb 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 dfe8e04cce21..c8e4e12796f5 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 971fda29e9dd..c109ad978f55 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 a2b420536ac0..72359afe6f9a 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 945ee4b4e2dd..abdf133a9d38 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 227c963a0aeb..438f338f4615 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 ca3054e161c9..72f0902d3212 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 b557839f0865..0af624dd2412 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 86a40a0309bc..e5af5cb0538a 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 9ec344e39055..e2383f28956f 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 2e99972d309b..91a8ce256849 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 efb49752dd9f..cf10e2b47077 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 74e87563f646..0ed5b9752812 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 cca836cdce2f..ec9fbb50ee16 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 baba18093d17..424671f82525 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 822fae0b5cfa..59164952a9d6 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 0f05ff57448b..31ed055932ac 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 28253da4fb7e..e706f50d7b44 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 167b5c79aa99..f0bc0508a138 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 5be2b651d5e6..08d167adcbde 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 c4a7fe4f532d..ffc167cfba34 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 5c2f44df9298..a1eb411ee336 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 fdfbc5b95f2b..6c09ece6f341 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 fa8b72c28b21..ff873797c0fa 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 2d300dd43fb2..4f7bec0c8838 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 7b0e1d1cb02f..33aeb3d4e201 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 47d02054bf05..d4bcebb28544 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 d5de7d8c4644..6a4dffc8d273 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 de3b781fa19a..4ac9577aae31 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 2cecbe16fee2..412cabdc0387 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 61ab6fe8ff1f..e684bc3d80a7 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 83e8503b171f..c2fefbff0d64 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 ff61a632e771..0b7277618d9c 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 5a1f4f247729..6636b86885a5 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 a08da906805b..eec65109c20b 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 7900cce3e64d..8c96edf173c2 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 d8e6fa253613..59125bcd2c1e 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 dd4ae1c00198..6eaf0b6266a3 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 f5f16f39bf9a..79f0126e50d2 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 e375756388f3..ceca32fc2df6 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 8d73731736b1..569698eaf36b 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 a43f38b63bdb..5c309292343b 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 7fa5a9b14199..3741b88a03be 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 01185200f552..74bcefbb0e89 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 0c47c799bfe8..55c05266cc41 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 df56aa28e583..aee62bfea8fc 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 0341b2d51789..2184d9bc4e38 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 1337ea3df81d..1d30b1674767 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 107fc3e18bb9..4ab74863f6ee 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 93914f471cec..f8b6c1312d95 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 ae190d6756ac..0a41f68796f6 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 b0f5ed63195f..78fdad8bbf6a 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 f810c1b48929..66e766c15a86 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 6528ce33c4e9..04bf7b874ab4 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 dd9c52e3c67a..20fb8fe6c7fe 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 77a8a7750ea7..4610718f9d11 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 f7509db746ca..f781778b32b1 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 ea528b87e914..0be1c511f9ee 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 6ca7c593df66..221c82ffecbd 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 a31b38eeb69d..32b1528a70f5 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 ba4816358dfc..ae22c5bc3c80 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 cfb919a52f12..72edd13a2c32 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 08edafc51132..def97faca7f2 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 9f47624a8fc0..612f977f83bb 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 76969e3b24b9..b4718e7b2903 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 ee557fbea5b0..fea89f118874 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 e5d39128b049..72afb414bd0f 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 7ca9d3dc9c37..878e5a70d698 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 dc2fa695104d..cd6cfad2f323 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 827e1b972910..ed397826ff5d 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 eb12ccbbe745..1129605ec4f6 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 aeafdc649036..a1ece2dce6a2 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 a280fb535ed0..87428f94d967 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 f15e0f5dd0bd..14eeb82404c2 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 bb10d7e53647..e4cdd85fdd97 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 546f53d4a460..87d1547d18f9 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 6e268280aba4..b98a9a913135 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 88b1c88f907c..90fc28e770da 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 6059aabb8d46..a6364ebc91f9 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 6b901764c4d4..dd8c5f4f1988 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 3ce4fafd4c3b..eebf7b29ad98 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 203f54886fa2..ab5f1d6169cb 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 f2117e74bef6..77561a79a8bc 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 678b82819534..f4b7ff5e9314 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 938491cda09c..3a48dea4a509 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 c4f2f9c3f35f..8c56e3f0ccb5 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 544a017d402c..912bcc7b6411 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 9a52edba35df..a04ad8e083ee 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 2067e7daaeb2..430348f6b4fc 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 8f4d4f20bc7e..29ba108d7281 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 cfd659a035cc..cc5077c90324 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 f27536f50c56..493d5337b8c9 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 1031e23fadc4..fd70085c7803 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 166bffa788a4..955a2bfbd7ff 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 a3418e758b31..973eac5d1c67 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 a218390724bb..68ddeca49a76 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 85aa2af72182..1458c1ad9bb6 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 08dad851ae7b..e8b35b69b53d 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 e50c550e9150..e15d845e0263 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 741f1e79e90b..680229dfd90d 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 130ee852b393..8a874f19a68d 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 0526e07dfca0..af8590f69ba6 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 3ab0e35890f9..0363f457ae2d 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 70c42f64f7e4..741138e9d5b4 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 18e8897ba70e..4b498906364f 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 0949573db046..352cf1775f22 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 b317e5634265..dda7244890db 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 0c22e42cee91..453e4cb53fee 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 eb03753bc2cc..e0e625420dc9 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 acf53538f434..bde4db6482cb 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 767327a778bb..2c6338cb222b 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>
--
GitLab
From 92b2f6d482d5f715671b299a55fe47c77f257c12 Mon Sep 17 00:00:00 2001
From: Stewart Martin-Haugh <smh@cern.ch>
Date: Tue, 18 Dec 2018 17:31:24 +0100
Subject: [PATCH 2/8] Remove unused AthApi
---
Control/AthenaCommon/CMakeLists.txt | 3 +-
Control/AthenaCommon/python/AthApi.py | 660 -----------------------
Control/AthenaCommon/share/athena-app.py | 146 -----
3 files changed, 1 insertion(+), 808 deletions(-)
delete mode 100644 Control/AthenaCommon/python/AthApi.py
delete mode 100755 Control/AthenaCommon/share/athena-app.py
diff --git a/Control/AthenaCommon/CMakeLists.txt b/Control/AthenaCommon/CMakeLists.txt
index de809b8cd17a..68b6abb75163 100644
--- a/Control/AthenaCommon/CMakeLists.txt
+++ b/Control/AthenaCommon/CMakeLists.txt
@@ -13,10 +13,9 @@ atlas_depends_on_subdirs( PRIVATE
atlas_install_headers( AthenaCommon )
atlas_install_python_modules( python/*.py python/Utils )
atlas_install_joboptions( share/Preparation.py share/Execution.py share/Atlas.UnixStandardJob.py test/*.py share/Atlas_Gen.UnixStandardJob.py share/MemTraceInclude.py share/runbatch.py )
-atlas_install_scripts( share/athena.py share/athena_preload.sh share/athena-app.py share/chappy.py share/find_cfg_dups.py share/test_cfg_pickling.py )
+atlas_install_scripts( share/athena.py share/athena_preload.sh share/chappy.py share/find_cfg_dups.py share/test_cfg_pickling.py )
# Aliases:
-atlas_add_alias( athena-app "athena-app.py" )
atlas_add_alias( athena "athena.py" )
atlas_add_test( AthAppMgrUnitTests SCRIPT test/test_AthAppMgrUnitTests.sh
diff --git a/Control/AthenaCommon/python/AthApi.py b/Control/AthenaCommon/python/AthApi.py
deleted file mode 100644
index 3620642c8128..000000000000
--- a/Control/AthenaCommon/python/AthApi.py
+++ /dev/null
@@ -1,660 +0,0 @@
-# Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
-
-# @file AthenaCommon/python/AthApi.py
-# @purpose API for driving athena
-# @author Sebastien Binet <binet@cern.ch>
-
-from __future__ import with_statement
-
-__version__ = "$Revision: 1.3 $"
-__author__ = "Sebastien Binet <binet@cern.ch>"
-__doc__ = """
-a set of api functions for driving athena
-"""
-
-__all__ = [
- 'AthCfg',
- 'AthApp',
- ]
-
-import sys, os
-if '' not in sys.path:
- sys.path.insert(0, '')
-
-from . import ExitCodes
-from . import Logging
-msg = Logging.log
-
-class State:
- """Python equivalent of IService::State enum (kind of silly to load a whole
- dictionary library for just this quartet of integers
- """
-
- # for reference, the numbers below can also be obtained through a dict:
- # import cppyy
- # melm = cppyy.makeClass( 'MinimalEventLoopMgr' )
- # print melm.OFFLINE, melm.CONFIGURED, melm.FINALIZED, melm.INITIALIZED
-
- OFFLINE = 0
- CONFIGURED = 1
- INITIALIZED = 2
- RUNNING = 3
-
-def cast_to(obj, iface):
- from GaudiPython.Bindings import InterfaceCast as icast
- return icast(iface)(obj)
-
-class AthCfg(object):
-
- def __init__(self):
-
- self._jobo = open('athapi-%s-jobo.py' % os.getpid(), 'w+')
- for fname in ('seek', 'write', 'read'):
- setattr(self, fname, getattr(self._jobo, fname))
- return
-
- def include(self, jobo_name):
- self._jobo.write('include("%s")\n'%jobo_name)
- self._jobo.flush()
-
- def __lshift__(self, o):
- if isinstance(o, str):
- import textwrap
- self._jobo.write(textwrap.dedent(o))
- self._jobo.flush()
- return
- raise TypeError('unexpected type %s'%type(o))
-
- pass # AthCfg
-
-class AthApp(object):
-
- def __init__(self, options, **kw):
- object.__init__(self)
-
- self.options = options
-
- from . import Logging
- self.msg = Logging.log
- self.msg.setLevel(Logging.logging.INFO)
-
- self.app = None
- self.cfg = AthCfg()
-
- self.__dict__['_exitstate'] = ExitCodes.ALL_OK
- self.__dict__['_current_event'] = 0
-
- return
-
- def configure(self, joboptions=None, commands=None,
- dllname=None,
- factname=None,
- extra_options=None):
-
- if not (self.app is None):
- self.msg.info('C++ application already configured')
- return self.app
-
- self.msg.info('configuring application...')
-
- usr_cfg = AthCfg()
- self.cfg.seek(0)
- usr_cfg << self.cfg.read()
-
- # reset
- self.cfg = AthCfg()
-
- if commands:
- self.cfg << commands+'\n'
-
- # common configuration
- self.cfg << """
- # basic job configuration
- include('AthenaCommon/Atlas.UnixStandardJob.py')
- include.block('AthenaCommon/Atlas.UnixStandardJob.py')
-
- if not (not %(run_batch)s and
- theApp.EventLoop == 'PyAthenaEventLoopMgr'):
- # make SIG_INT fatal
- svcMgr.CoreDumpSvc.FatalHandler = -1
- """ % {'run_batch' : self.options.run_batch}
-
- self.cfg << """
- # user level configuration
- try:
- include('$HOME/.athenarc')
- except IncludeError:
- pass
- """
-
- # another user level configuration
- usr_cfg.seek(0)
- self.cfg << usr_cfg.read()
-
- if isinstance(joboptions, (list,tuple)):
- for jobo_name in joboptions:
- self.cfg.include(jobo_name)
-
- if not self.options.run_batch:
- self.cfg << """
- theApp.EventLoop = 'PyAthenaEventLoopMgr'
- svcMgr += CfgMgr.PyAthenaEventLoopMgr()
- """
-
- self.cfg << """
- ### logging and messages ---------
- from AthenaCommon.Logging import *
- _msg = log
- _msg.setLevel(getattr(logging, '%(output_level)s'))
-
- import AthenaCommon.Constants as Lvl
- theApp.setOutputLevel(%(output_level)s)
- theApp.OutputLevel = Lvl.%(output_level)s
- from AthenaCommon.AppMgr import ServiceMgr as svcMgr
- svcMgr.MessageSvc.OutputLevel = Lvl.%(output_level)s
- """ % dict(output_level=self.options.msg_lvl)
-
- self.cfg << """
- from AthenaCommon.Include import Include, IncludeError, include
- include.setShowIncludes(%(showincludes)s)
- if %(showincludes)s:
- import AthenaCommon.Include as AthCIncMod
- AthCIncMod.marker=' -#-' # distinguish bootstrap from other jo-code
- """ % dict(showincludes=self.options.showincludes)
-
- cfg_name = self.cfg._jobo.name.replace('.py','.pkl')
- self.msg.info('dumping job-configuration into [%s]...',
- cfg_name)
-
- # run configuration in a forked-subprocess...
- sc = _app_configure(self.cfg, cfg_name, extra_options)
- if sc:
- err = 'could not configure application [sc=%d]' % sc
- self.msg.error(err)
- raise RuntimeError(err)
- self.msg.info('configuring application w/ [%s]', cfg_name)
-
- import os
- self.cfg._jobo.close()
- os.remove(self.cfg._jobo.name)
-
- import GaudiPython.Bindings as gaudi
- # remove the gaudimodule exit handler as to prevent them from clobering
- import atexit
- for hdlr in reversed(atexit._exithandlers[:]):
- module_name = hdlr[0].__module__
- if ('GaudiPython' in module_name or
- 'gaudimodule' in module_name):
- atexit._exithandlers.remove(hdlr)
- del hdlr
- # install our own exit handler (if needed)
- import sys
- if hasattr(sys, 'ps1'): # ie: is interactive
- atexit.register(self.exit)
- del atexit
-
- from . import ResourceLimits
- ResourceLimits.SetMaxLimits()
-
- import PyUtils.dbsqlite as dbs
- db = dbs.open(cfg_name, 'r')
-
- jobo_cfg = db['jobopts']
-
- kw = jobo_cfg['ApplicationMgr']
- for k in ('Go', 'Exit', 'AuditInitialize', 'AuditFinalize'):
- if k in kw:
- del kw[k]
- outputlevel = jobo_cfg['ApplicationMgr']['OutputLevel']
-
- self.app = gaudi.AppMgr(outputlevel=outputlevel,
- selfoptions=kw,
- dllname=dllname,
- factname=factname)
-
- # open the pycomps folder
- pycomps = db.get('pycomps', None) # just opening it should do
-
- if pycomps:
- import AthenaPython.Configurables as _C
- _C.PyComponents.instances = dict((p.name, p) for p in pycomps)
- #_C.PyComponents.instances = pycomps
- for p in pycomps:
- if hasattr(p, 'setup'):
- if callable(p.setup):
- p.setup()
-
- setattr(self, '_pycomps', pycomps)
-
- import AthenaPython.PyAthena as PyAthena
- josvc = PyAthena.py_svc('JobOptionsSvc',
- createIf=False,
- iface='IJobOptionsSvc')
- assert josvc is not None
-
- for client in jobo_cfg:
- if client == 'ApplicationMgr':
- continue
- for n,v in jobo_cfg[client].iteritems():
- p = gaudi.StringProperty(n, v)
- if not josvc.addPropertyToCatalogue(client, p).isSuccess():
- self.msg.error(
- 'could not add property [%s.%s = %s]',
- client, n, v
- )
- if client in ('MessageSvc', 'JobOptionsSvc'):
- svc = PyAthena.py_svc(client, iface='IProperty')
- svc.setProperty(p)
-
- db.close()
-
- import os
- if os.path.exists(cfg_name):
- os.remove(cfg_name)
- pass
- #import AthenaCommon.Debugging as dbg
- #dbg.hookDebugger()
-
- return self.app
-
- def __getattr__(self, name):
- if name[0]=='_':
- return object.__getattr__(self, name)
- if name in self.__dict__:
- return self.__dict__[name]
- else:
- return getattr(self.app, name)
-
- @property
- def exitstate(self):
- return self._exitstate
-
- @property
- def event(self):
- return self._current_event
-
- def state(self):
- if self.app is None:
- return State.OFFLINE
- return self.app.state()
-
- def service(self, name, iface=None):
- return self.app.service(name,interface=iface)
-
- def initialize(self):
- assert(self.app)
-
- try:
- sc = self.app.initialize()
- if not sc.isSuccess():
- self._exitstate = ExitCodes.INI_ALG_FAILURE
- except:
- self._exitstate = ExitCodes.INI_ALG_EXCEPTION
- raise
- return sc
-
- def reinitialize(self):
- assert(self.app)
-
- # ApplicationMgr::reinitialize does not re-init algorithms...
- for name in self.app.TopAlg:
- try:
- name = name.split('/')
- alg_name = name[1] if len(name)==2 else name[0]
- sc = self.app.algorithm(alg_name).reinitialize()
- if not sc.isSuccess() and not self._exitstate:
- self._exitstate = ExitCodes.REINI_ALG_FAILURE
- return sc
- except AttributeError:
- pass
- except:
- self._exitstate = ExitCodes.REINI_ALG_EXCEPTION
- raise
-
- # normal reinitialize kicks services, tools left out...
- sc = self.app.reinitialize()
- if not sc.isSuccess():
- self._exitstate = ExitCodes.REINI_ALG_FAILURE
- return sc
-
- def run(self, nevents=None):
- assert(self.app)
-
- if self.state() in (State.OFFLINE,
- State.CONFIGURED,):
- self.msg.debug('Initializing application manager')
- sc = self.initialize()
- else:
- self.msg.debug('Re-initializing application manager')
- sc = self.reinitialize()
-
- if not sc.isSuccess():
- return sc
-
- sc = self.start()
- if not sc.isSuccess():
- # XXX add-in new states in ExitCodes !
- self._exitstate = ExitCodes.BEGIN_RUN_FAILURE
- return sc
-
- if nevents is None:
- nevents = self.app.EvtMax
-
- # XXX: gdb
-
- # actual run
- # XXX: capture beginRun() exceptions and failures
- # this is not currently published by IEventProcessor iface
- try:
- sc = self.app._evtpro.executeRun(nevents)
- if not sc.isSuccess() and not self._exitstate:
- self.msg.error('failed to "executeRun(%d)"',nevents)
- self._exitstate = ExitCodes.EXE_ALG_FAILURE # likely an alg
- except:
- self._exitstate = ExitCodes.EXE_ALG_EXCEPTION # idem
- raise
-
- # what to do when executeRun(nevents) failed ?
- # self.stop would override the value (and likely return success)
- # in effect 'poisonning' the next call to self.app !
- if not sc.isSuccess():
- return sc
-
- sc = self.stop()
- if not sc.isSuccess():
- # XXX add-in new states in ExitCodes !
- self._exitstate = ExitCodes.END_RUN_FAILURE
- return sc
-
- # done, update and report
- self._current_event = nevents
-
- return sc
-
- def nextEvent(self, nevents=None):
- assert(self.app)
- # start app if not already done
- sc = self.start()
- if not (sc.isSuccess()) and not self._exitstate:
- self._exitstate = ExitCodes.INI_ALG_FAILURE
- return sc
-
- if nevents is None:
- nevents = self.event + 1
-
- try:
- sc = self.app._evtpro.nextEvent(nevents)
- if (not sc.isSuccess()) and not self._exitstate:
- self._exitstate = ExitCodes.EXE_ALG_FAILURE
- except:
- self._exitstate = ExitCodes.EXE_ALG_EXCEPTION
- raise
-
- # TODO: would like NOT to advance on failure, but...
- self._current_event = nevents
- return sc
-
- def start(self):
- import GaudiPython.Bindings as gaudi
- sc = gaudi.SUCCESS
- can_start = gaudi.Gaudi.StateMachine.INITIALIZED == self.app.FSMState()
- if can_start:
- self.msg.debug('Starting application manager')
- sc = self.app.start()
- sc.ignore()
- return sc
-
- def stop(self):
- import GaudiPython.Bindings as gaudi
- sc = gaudi.SUCCESS
- can_stop = gaudi.Gaudi.StateMachine.RUNNING == self.app.FSMState()
- if can_stop:
- self.msg.debug('Stopping application manager')
- sc = self.app.stop()
- sc.ignore()
- return sc
-
- def finalize(self):
- assert(self.app)
-
- sc = self.stop()
- if not sc.isSuccess() and not self._exitstate:
- self._exitstate = ExitCodes.FIN_ALG_FAILURE
-
- try:
- sc = self.app._appmgr.finalize()
- if not sc.isSuccess():
- self._exitstate = ExitCodes.FIN_ALG_FAILURE
- except:
- self._exitstate = ExitCodes.FIN_ALG_EXCEPTION
- raise
-
- return sc
-
- def exit(self, code=None):
- try:
- if self.state() > State.CONFIGURED:
- sc1 = self.finalize()
- sc2 = self.app._appmgr.terminate()
- if ((not sc1.isSuccess() or not sc2.isSuccess()) and
- not self._exitstate):
- self._exitstate = ExitCodes.FIN_ALG_FAILURE
- except:
- if not self._exitstate:
- self._exitstate = ExitCodes.FIN_ALG_EXCEPTION
- import traceback
- traceback.print_exc() # no re-raise to allow sys.exit next
-
- self.msg.info('leaving with code %d: "%s"',
- self.exitstate,
- ExitCodes.what(self.exitstate))
- import sys
- sys.exit(code is None and self.exitstate or code)
-
- pass # AthApp
-
-## ## helper class to hold a joboptionssvc configuration
-## import ConfigParser
-## class JobOptCfg(ConfigParser.RawConfigParser):
-## # We want to retain case sensitivity
-## def optionxform(self, optionstr):
-## return optionstr
-
-## --- helper functions for configuration storage -----------------------------
-import PyUtils.dbsqlite as dbs
-from collections import defaultdict
-def store_configuration(cfg_fname=None):
- """helper function to inspect the 'configured' JobOptionsSvc and dump
- the properties of each component into a (sqlite) shelve.
- it will eventually dump the properties of py-components too.
- """
- jobo_cfg = defaultdict(dict)
- if cfg_fname is None:
- import tempfile
- tmpfile = tempfile.NamedTemporaryFile(suffix='-jobo.pkl')
- cfg_fname = tmpfile.name
- tmpfile.close()
- import os
- if os.path.exists(cfg_fname):
- os.remove(cfg_fname)
-
- assert cfg_fname
-
- from AthenaCommon.AppMgr import theApp
-
- def _fill_cfg(client, props):
- for p in props:
- n = p[0]
- v = p[1]
- if hasattr(v, 'toStringProperty'):
- v = str(v.toStringProperty().toString())
- elif hasattr(v, 'toString'):
- v = str(v.toString())
- else:
- v = str(v)
- jobo_cfg[client][n] = v
-
- from AthenaCommon.AppMgr import ServiceMgr as svcMgr
-
- # special cases: joboptionsvc and messagesvc
- def _fill_props(svcname):
- if not hasattr(svcMgr, svcname):
- return
- svc = getattr(svcMgr, svcname)
- props = []
- for k,v in svc.properties().iteritems():
- if v == svc.propertyNoValue:
- v = svc.getDefaultProperty(k)
- props.append((k,v))
- _fill_cfg(svcname, props)
- _fill_props('JobOptionsSvc')
- _fill_props('MessageSvc')
-
- # tickle C++ and configure the whole app
- theApp.setup()
-
- app_props = [(k,v.value())
- for k,v in theApp.getHandle().properties().iteritems()]
- _fill_cfg(theApp.name(), app_props)
-
- import AthenaPython.PyAthena as PyAthena
- josvc = PyAthena.py_svc('JobOptionsSvc', iface='IJobOptionsSvc')
- assert josvc is not None
-
- clients = list(josvc.getClients())
- for client in clients:
- props = josvc.getProperties(client)
- for prop in props:
- n = prop.name()
- v = prop.toString()
- jobo_cfg[client][n] = v
-
- cfg = dbs.open(cfg_fname, 'w')
- cfg['jobopts'] = jobo_cfg
-
- pycomps = []
-
- # all other pycomps
- from .Configurable import Configurable as C
- for c in C.allConfigurables.itervalues():
- if not isinstance(c, (PyAthena.Alg,
- PyAthena.AlgTool,
- PyAthena.Svc,
- PyAthena.Aud)):
- continue
- # FIXME: should check if the component is still 'active'
- # ie: is it in one of the TopAlg,SvcMgr,ToolSvc and children ?
- if hasattr(c, 'msg'):
- delattr(c, 'msg')
- pycomps.append(c)
- pass
-
- # folder for the pyathena-components
- cfg['pycomps'] = pycomps
- cfg.close()
-
- return cfg_fname
-
-import code
-class AthenaInteractiveConsole(code.InteractiveConsole):
- def __init__(self, *args, **kw):
- code.InteractiveConsole.__init__(self, *args, **kw)
- import sys
- sys.ps1 = 'athena> '
- sys.ps2 = '. ... '
- pass
-
-### helper functions ----------------------------------------------------------
-def enter_interactive_loop(banner=None, app=None, options=None):
- import sys
- import os
-
- # retrieve the current frame
- frame = sys._getframe(0)
-
- # evaluate commands in current namespace
- namespace = frame.f_globals.copy()
- namespace.update(frame.f_locals)
- # NOTE: the above namespace won't capture the below :)
-
- try:
- import readline
- except ImportError:
- pass
- else:
- import rlcompleter
- readline.set_completer(rlcompleter.Completer(namespace).complete)
- readline.parse_and_bind('tab:complete')
- readline.parse_and_bind('set show-all-if-ambiguous On')
-
- # history support
- history = os.path.expanduser('~/.athena.history')
- if os.path.exists(history):
- readline.read_history_file(history)
- readline.set_history_length(1024)
-
- # we want to honor both $PYTHONSTARTUP and .pythonrc.py, so follow system
- # conventions and get $PYTHONSTARTUP first, then import user
- pythonrc = os.environ.get('PYTHONSTARTUP')
- if pythonrc and os.path.isfile(pythonrc):
- try:
- execfile(pythonrc)
- except NameError:
- pass
- # this will import .pythonrc.py as a side effect
- import user # noqa: 401
-
- # use of shell escapes
- from . import ShellEscapes as SE
- sys.excepthook = SE.ShellEscapes()
-
- namespace.update(frame.f_globals)
- namespace.update(frame.f_locals)
-
- # now ready for the full "interactive python experience"
- shell = AthenaInteractiveConsole(locals=namespace)
- shell.interact(banner=banner)
-
-#from PyUtils.Decorators import forking
-#@forking
-def _app_configure(cfg, ascii_cfg_name, extra_options=None):
- cfg << """
- import AthenaCommon.AthApi as api
- cfg_fname = '%s'
- api.store_configuration(cfg_fname)
- """ % ascii_cfg_name
-
- cfg << """
- api.msg.info('configuration dumped to [%s]', cfg_fname)
- import os
- import sys
- devnull = open(os.devnull, 'w')
-
- # redirect stderr to devnull
- #os.dup2(devnull.fileno(), sys.stderr.fileno())
-
- # redirect stdout to devnull
- os.dup2(devnull.fileno(), sys.stdout.fileno())
- #sys.stderr = devnull
- #sys.stdout = devnull
-
- sys.exit(0)
- """
- import os
- import subprocess as sub
- athena_exe = sub.Popen(['which', 'athena.py'],
- stdout=sub.PIPE).communicate()[0].strip()
-
- athena_exe = os.path.expanduser(os.path.expandvars(athena_exe))
- athena_exe = os.path.realpath(athena_exe)
- athena_exe = os.path.abspath(athena_exe)
-
- athena_args = [athena_exe, cfg._jobo.name]
- if extra_options and isinstance(extra_options, (list, tuple)):
- athena_args.extend(list(extra_options))
-
- sc = sub.call(athena_args)#,
- # stdout=None,#open(os.devnull,'w'),
- # stderr=sub.STDOUT)
- return sc
-
diff --git a/Control/AthenaCommon/share/athena-app.py b/Control/AthenaCommon/share/athena-app.py
deleted file mode 100755
index 20616b734c51..000000000000
--- a/Control/AthenaCommon/share/athena-app.py
+++ /dev/null
@@ -1,146 +0,0 @@
-#!/usr/bin/env python
-
-# @file AthenaCommon/share/athena-app.py
-
-from __future__ import with_statement
-
-__version__ = "$Revision: 1.2 $"
-__author__ = "Sebastien Binet <binet@cern.ch>"
-__doc__ = """a better? athena.py"""
-
-#import user
-
-import os
-import sys
-
-def main(options):
- import sys
- import os
-
- import AthenaCommon.ExitCodes as ExitCodes
- import AthenaCommon.AthApi as api
- app = api.AthApp(options)
-
- api.msg.info('running app.configure(...)')
- app.configure(joboptions=options.scripts,
- commands=options.command,
- extra_options=sys.argv[:])
-
- sc = 0
- if options.run_batch:
- api.msg.info("entering batch mode")
- try:
- sc = app.run().isSuccess()
- if options.dbg_stage == "fini":
- import AthenaCommon.Debugging as _dbg
- _dbg.hookDebugger()
- except:
- # print a stack trace to know something bad happened !
- import traceback, sys
- traceback.print_exc(file=sys.stderr)
- # update the exit-code
- if app.exitstate == ExitCodes.ALL_OK:
- app.exitstate = ExitCodes.UNKNOWN_EXCEPTION
- # re-raise, in case somebody wants to do something about it
- raise
- finally:
- if app.exitstate != ExitCodes.ALL_OK:
- # trigger the AthenaSummarySvc...
- # FIXME
- pass
- app.exit()
- else:
- api.msg.info("entering interactive mode")
- api.enter_interactive_loop(app=app)
-
- sc = app.exitstate
- return sc
-
-def _process_cmdline_args():
- import AthenaCommon.AthOptionsParser as aop
-
- opts = aop.parse(chk_tcmalloc=False)
-
- #-----------------------------------------------------------------
- # side-effect: bootstrap ourselves and handle the environment
- # changing options (tcmalloc/stdcmalloc -> LD_PRELOAD)
- # => we may need to os.execvpe ourselves with the correct new env.
- _frozen = os.environ.get('_ATHENA_APP_FROZEN', '0')
- os.environ['_ATHENA_APP_FROZEN'] = _frozen
- # may not return !
- _bootstrap_env(opts)
- #-----------------------------------------------------------------
-
- from AthenaCommon.Logging import log as msg
- from AthenaCommon.Logging import logging
- msg.setLevel(getattr(logging, opts.msg_lvl))
-
- import AthenaCommon.ExitCodes as ExitCodes
-
- if len(opts.scripts)<=0 and opts.run_batch:
- msg.error("batch mode requires at least one joboptions")
- raise aop.AthOptionsError(reason=ExitCodes.INCLUDE_ERROR)
-
- return opts
-
-def _bootstrap_env(options):
- """helper function to modify the current process environment according
- to `options` and os.execvpe.
- we set a special environment variable '_ATHENA_APP_FROZEN' to 1 to
- prevent infinite recursion.
- if we are already a 'frozen' process, perform some clean-up if any
- """
- _frozen = os.environ['_ATHENA_APP_FROZEN']
- if _frozen == '1':
- ### remove pre-load hack for proper execution of child-processes ------
- ldpreload = os.environ.get('LD_PRELOAD', '')
- if ldpreload:
- tcmlib = os.environ['TCMALLOCDIR'] + '/libtcmalloc.so'
- import string
- ldpreload = string.replace( ldpreload, tcmlib, '' )
- ldpreload = string.replace( ldpreload, '::', ':')
- ldpreload = ldpreload.strip(':')
- del tcmlib
-
- if not ldpreload:
- del os.environ['LD_PRELOAD']
- else:
- os.environ['LD_PRELOAD'] = ldpreload
- return
-
- # freeze...
- os.environ['_ATHENA_APP_FROZEN'] = '1'
- if options.use_tcmalloc:
- tcmalloc_dir = os.environ.get('TCMALLOCDIR', None)
- #dont display the warning if in AthAnalysisBase
- if tcmalloc_dir is None and "ManaCore" not in os.environ.get("CMTEXTRATAGS",""):
- print "WARNING: $TCMALLOCDIR not defined, will use libc malloc"
- else:
- dso = os.path.join(tcmalloc_dir, 'libtcmalloc.so')
- if not os.path.exists(dso):
- raise OSError('library [%s] does not exist' % dso)
- ldpreload = os.environ.get('LD_PRELOAD', None)
- if ldpreload:
- os.environ['LD_PRELOAD'] = os.pathsep.join(
- [dso] + ldpreload.split(os.pathsep)
- )
- else:
- os.environ['LD_PRELOAD'] = dso
- else:
- # stdcmalloc
- pass
-
- # spawn a new process with the correct environment...
- import AthenaCommon.Utils.unixtools as uut
- exe = uut.FindFile('python',
- os.environ['PATH'].split(os.pathsep),
- os.X_OK)
- args= [exe] + sys.argv
- #print "---> args:",args
- os.execvpe(exe, args, os.environ)
-
-if __name__ == "__main__":
- options = _process_cmdline_args()
- retcode=main(options)
- sys.exit(retcode)
-
--
GitLab
From 78267b520794c9322425430e3a49c359094f0d05 Mon Sep 17 00:00:00 2001
From: Stewart Martin-Haugh <smh@cern.ch>
Date: Tue, 18 Dec 2018 17:37:08 +0100
Subject: [PATCH 3/8] Remove unused AthApi from PyJobTransformsCore
---
Tools/PyJobTransformsCore/python/runargs.py | 1 -
Tools/PyJobTransformsCore/python/trf.py | 17 +----------------
2 files changed, 1 insertion(+), 17 deletions(-)
diff --git a/Tools/PyJobTransformsCore/python/runargs.py b/Tools/PyJobTransformsCore/python/runargs.py
index 49b8eab87dea..1ac5784f0f93 100755
--- a/Tools/PyJobTransformsCore/python/runargs.py
+++ b/Tools/PyJobTransformsCore/python/runargs.py
@@ -211,7 +211,6 @@ class RunOptions(JobConfig):
command = CommandLineOption('c', 'command', 'Python code to be pre-executed before any scripts', True )
mcinput = CommandLineOption('', 'mcinput', 'Monte Carlo input file used. Omit if real data is used. Enabling this option also implies setting --usesqlite=True', True, False, choices = [ True, False ] )
usesqlite = CommandLineOption('', 'usesqlite', 'Force the use of local/symlinked sqlite files rather than ORACLE.', True, False, choices = [ True, False ] )
- useathenaapp = CommandLineOption('', 'useathenaapp', 'Force the use of athena-app.py instead of athena.py', True, False, choices = [ True, False ] )
omitvalidation = CommandLineOption('', 'omitvalidation', 'Omit certain validation routines. Use "ALL" to omit all validation routines, use "NONE" to remove all validation ommissions.', True, choices = VALIDATION_DICT.keys() + ['NONE'] )
athenaopts = CommandLineOption('a', 'athenaopts', 'Options to be passed on to athena', True)
argdict = CommandLineOption('', 'argdict', 'Run arguments given in a python dictionary in a pickle file', True)
diff --git a/Tools/PyJobTransformsCore/python/trf.py b/Tools/PyJobTransformsCore/python/trf.py
index d1438e865d94..5d906383f560 100755
--- a/Tools/PyJobTransformsCore/python/trf.py
+++ b/Tools/PyJobTransformsCore/python/trf.py
@@ -48,7 +48,7 @@ class JobTransform(TransformLogger):
_runArgsName = 'runArgs'
## Command line options shared between composite transforms
- _sharedRunOpts = [ 'athenaopts', 'ignoreunknown', 'ignoreall', 'ignoreerrors', 'tcmalloc', 'leakcheckexecute', 'rss', 'vmem', 'extrametadatadict', 'extraignorefilters', 'usenewmeta', 'omitvalidation', 'command', 'mcinput', 'usesqlite', 'useathenaapp', 'uploadtoami' ]
+ _sharedRunOpts = [ 'athenaopts', 'ignoreunknown', 'ignoreall', 'ignoreerrors', 'tcmalloc', 'leakcheckexecute', 'rss', 'vmem', 'extrametadatadict', 'extraignorefilters', 'usenewmeta', 'omitvalidation', 'command', 'mcinput', 'usesqlite', 'uploadtoami' ]
## Options that are also accepted as arguments (via full_trfarg.OptionArg)
_optionArgNames = [ 'athenaopts', 'ignoreunknown', 'ignoreall', 'ignoreerrors', 'tcmalloc', 'leakcheckexecute', 'rss', 'vmem', 'extrametadatadict', 'extraignorefilters', 'usenewmeta', 'omitvalidation', 'command', 'mcinput', 'usesqlite', 'uploadtoami' ]
@@ -209,9 +209,6 @@ class JobTransform(TransformLogger):
self._useSQLite = None
## Set to true if random throw gives a number smaller than the value of input argument --uploadtoami
self._exportToAmi = False
- ## True when athena-app.py is to be used instead of athena.py
- # @see Set using enableAthenaApp().
- self._useAthenaApp = False
## Dictionary of key/values of arguments.
self._namedArgs = {}
## List of arguments in strict order.
@@ -267,7 +264,6 @@ class JobTransform(TransformLogger):
runOpts.getProperty('command').setActionFunction( self.setPECommand )
runOpts.getProperty('mcinput').setActionFunction( self.enableMCInput )
runOpts.getProperty('usesqlite').setActionFunction( self.enableSQLite )
- runOpts.getProperty('useathenaapp').setActionFunction( self.enableAthenaApp )
runOpts.getProperty('ignoreerrors').setActionFunction( self.enableMaskAllErrors )
runOpts.getProperty('ignoreunknown').setActionFunction( self.enableIgnoreUnknownErrors )
runOpts.getProperty('ignoreall').setActionFunction( self.enableIgnoreAllErrors )
@@ -674,17 +670,6 @@ class JobTransform(TransformLogger):
def enableSQLite( self, val ):
self._useSQLite = val
- ## Setter function to force the transform to use athena-app.py instead of athena.py
- # @param val A boolean value is expected.
- # @see _useAthenaApp attribute.
- # @return None
- def enableAthenaApp( self, val ):
- self._useAthenaApp = val
- if val:
- trfconsts.athena_py = 'athena-app.py'
- else:
- trfconsts.athena_py = 'athena.py'
-
## @brief Allow various validation routines to be omitted.
# @param omitStr Valid strings are based on the keys of the trfutil.VALIDATION_DICT dictionary. Multiple values can be comma-delimited (without spaces). Use 'ALL' to omit all validation routines, use 'NONE' to remove all validation ommissions.
# @see trfutil.VALIDATION_DICT dictionary.
--
GitLab
From eccd63a0ec2de9b603105c3b42004416e3357a17 Mon Sep 17 00:00:00 2001
From: Stewart Martin-Haugh <smh@cern.ch>
Date: Tue, 18 Dec 2018 17:41:01 +0100
Subject: [PATCH 4/8] Remove unneeded config.h.in
---
Control/AthenaCommon/AthenaCommon/config.h.in | 1 -
1 file changed, 1 deletion(-)
delete mode 100755 Control/AthenaCommon/AthenaCommon/config.h.in
diff --git a/Control/AthenaCommon/AthenaCommon/config.h.in b/Control/AthenaCommon/AthenaCommon/config.h.in
deleted file mode 100755
index 3192515880c7..000000000000
--- a/Control/AthenaCommon/AthenaCommon/config.h.in
+++ /dev/null
@@ -1 +0,0 @@
-/* AthenaCommon/config.h.in. Generated automatically from configure.in by autoheader. */
--
GitLab
From c7b3c6bf182b1767e90ee9f73fdc8607ce3a28dc Mon Sep 17 00:00:00 2001
From: Frank Winklmeier <frank.winklmeier@cern.ch>
Date: Tue, 18 Dec 2018 17:48:07 +0100
Subject: [PATCH 5/8] Delete obsolete CMT-related packages
The following packages were only relevant for CMT-based releases:
- LCG_Interfaces/Boost
- LCG_Interfaces/CLHEP
- PackDist
- ReleaseTests
---
LCG_Interfaces/Boost/CMakeLists.txt | 10 -
.../cmt/fragments/nmake/pythonmodulebuilder | 0
.../Boost/cmt/fragments/pythonmodulebuilder | 7 -
LCG_Interfaces/Boost/cmt/requirements | 94 -
LCG_Interfaces/CLHEP/CMakeLists.txt | 10 -
LCG_Interfaces/CLHEP/cmt/requirements | 23 -
PackDist/CMakeLists.txt | 6 -
PackDist/cmt/fragments/help2doc | 17 -
PackDist/cmt/fragments/help2doc_header | 5 -
PackDist/cmt/fragments/help2doc_trailer | 9 -
PackDist/cmt/fragments/pack_install | 56 -
PackDist/cmt/fragments/pack_install_header | 8 -
PackDist/cmt/fragments/pack_run | 22 -
PackDist/cmt/fragments/pack_run_header | 5 -
PackDist/config/pack-nightly-bugfix.cfg | 34 -
PackDist/doc/Makefile | 23 -
PackDist/doc/html/pack-relocate.sh.html | 67 -
PackDist/doc/html/proj-run.sh.html | 117 --
PackDist/hscript.py | 99 -
PackDist/man/man1/pack-relocate.sh.1 | 33 -
PackDist/man/man1/proj-run.sh.1 | 108 --
PackDist/scripts/basic-requirements.template | 13 -
PackDist/scripts/defaults.cfg | 40 -
PackDist/scripts/doc.ptn | 9 -
PackDist/scripts/extern-junk.ptn | 9 -
PackDist/scripts/junk.ptn | 20 -
PackDist/scripts/pack-common.sh | 217 ---
PackDist/scripts/pack-extern.sh | 703 -------
PackDist/scripts/pack-find.py | 195 --
PackDist/scripts/pack-proj.sh | 1700 -----------------
PackDist/scripts/pack.cfg.example | 145 --
PackDist/scripts/platforms | 60 -
PackDist/scripts/pltfm-junk.ptn | 10 -
PackDist/scripts/proj-run.sh | 622 ------
PackDist/scripts/relink.py | 322 ----
PackDist/scripts/requirements.template | 47 -
PackDist/scripts/src.ptn | 19 -
PackDist/share/bin/pack-rpm-extern.sh | 6 -
PackDist/share/bin/pack-rpm-proj.sh | 10 -
PackDist/share/bin/pack-rpm-settings.sh | 7 -
PackDist/share/bin/pack-rpm.py | 403 ----
PackDist/share/create-cmthome.sh | 37 -
PackDist/share/pack-relocate.sh | 132 --
PackDist/share/pack-standalone.py | 283 ---
PackDist/share/python/PackDistCommon.py | 61 -
PackDist/share/rpm-erase.sh | 239 ---
PackDist/share/setup-standalone.sh | 33 -
PackDist/share/specs/DBRelease.spec | 123 --
PackDist/share/specs/Makefile.cmt | 4 -
PackDist/share/specs/proj.spec.in | 58 -
ReleaseTests/CMakeLists.txt | 14 -
ReleaseTests/bin/testSelectionXML.py | 87 -
.../test/ReleaseTests_TestConfiguration.xml | 20 -
docs/doxyfile | 2 +-
54 files changed, 1 insertion(+), 6402 deletions(-)
delete mode 100644 LCG_Interfaces/Boost/CMakeLists.txt
delete mode 100644 LCG_Interfaces/Boost/cmt/fragments/nmake/pythonmodulebuilder
delete mode 100755 LCG_Interfaces/Boost/cmt/fragments/pythonmodulebuilder
delete mode 100755 LCG_Interfaces/Boost/cmt/requirements
delete mode 100644 LCG_Interfaces/CLHEP/CMakeLists.txt
delete mode 100644 LCG_Interfaces/CLHEP/cmt/requirements
delete mode 100644 PackDist/CMakeLists.txt
delete mode 100644 PackDist/cmt/fragments/help2doc
delete mode 100644 PackDist/cmt/fragments/help2doc_header
delete mode 100644 PackDist/cmt/fragments/help2doc_trailer
delete mode 100755 PackDist/cmt/fragments/pack_install
delete mode 100755 PackDist/cmt/fragments/pack_install_header
delete mode 100755 PackDist/cmt/fragments/pack_run
delete mode 100755 PackDist/cmt/fragments/pack_run_header
delete mode 100755 PackDist/config/pack-nightly-bugfix.cfg
delete mode 100755 PackDist/doc/Makefile
delete mode 100644 PackDist/doc/html/pack-relocate.sh.html
delete mode 100755 PackDist/doc/html/proj-run.sh.html
delete mode 100644 PackDist/hscript.py
delete mode 100644 PackDist/man/man1/pack-relocate.sh.1
delete mode 100755 PackDist/man/man1/proj-run.sh.1
delete mode 100644 PackDist/scripts/basic-requirements.template
delete mode 100755 PackDist/scripts/defaults.cfg
delete mode 100755 PackDist/scripts/doc.ptn
delete mode 100755 PackDist/scripts/extern-junk.ptn
delete mode 100755 PackDist/scripts/junk.ptn
delete mode 100755 PackDist/scripts/pack-common.sh
delete mode 100755 PackDist/scripts/pack-extern.sh
delete mode 100755 PackDist/scripts/pack-find.py
delete mode 100755 PackDist/scripts/pack-proj.sh
delete mode 100755 PackDist/scripts/pack.cfg.example
delete mode 100755 PackDist/scripts/platforms
delete mode 100755 PackDist/scripts/pltfm-junk.ptn
delete mode 100755 PackDist/scripts/proj-run.sh
delete mode 100755 PackDist/scripts/relink.py
delete mode 100755 PackDist/scripts/requirements.template
delete mode 100755 PackDist/scripts/src.ptn
delete mode 100644 PackDist/share/bin/pack-rpm-extern.sh
delete mode 100644 PackDist/share/bin/pack-rpm-proj.sh
delete mode 100644 PackDist/share/bin/pack-rpm-settings.sh
delete mode 100755 PackDist/share/bin/pack-rpm.py
delete mode 100755 PackDist/share/create-cmthome.sh
delete mode 100755 PackDist/share/pack-relocate.sh
delete mode 100755 PackDist/share/pack-standalone.py
delete mode 100755 PackDist/share/python/PackDistCommon.py
delete mode 100755 PackDist/share/rpm-erase.sh
delete mode 100644 PackDist/share/setup-standalone.sh
delete mode 100644 PackDist/share/specs/DBRelease.spec
delete mode 100644 PackDist/share/specs/Makefile.cmt
delete mode 100644 PackDist/share/specs/proj.spec.in
delete mode 100644 ReleaseTests/CMakeLists.txt
delete mode 100755 ReleaseTests/bin/testSelectionXML.py
delete mode 100644 ReleaseTests/test/ReleaseTests_TestConfiguration.xml
diff --git a/LCG_Interfaces/Boost/CMakeLists.txt b/LCG_Interfaces/Boost/CMakeLists.txt
deleted file mode 100644
index f845ed33f584..000000000000
--- a/LCG_Interfaces/Boost/CMakeLists.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-################################################################################
-# Package: Boost
-################################################################################
-
-# Declare the package name:
-atlas_subdir( Boost )
-
-# External dependencies:
-find_package( PythonLibs )
-
diff --git a/LCG_Interfaces/Boost/cmt/fragments/nmake/pythonmodulebuilder b/LCG_Interfaces/Boost/cmt/fragments/nmake/pythonmodulebuilder
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/LCG_Interfaces/Boost/cmt/fragments/pythonmodulebuilder b/LCG_Interfaces/Boost/cmt/fragments/pythonmodulebuilder
deleted file mode 100755
index f995ba0b9737..000000000000
--- a/LCG_Interfaces/Boost/cmt/fragments/pythonmodulebuilder
+++ /dev/null
@@ -1,7 +0,0 @@
-${CONSTITUENT} :: ${FILEPATH}$(library_prefix)${NAME}${FILESUFFIX}
- cp $? ${FILEPATH}`echo ${NAME} | cut -c4-`${FILESUFFIX}
-
-
-${CONSTITUENT}clean ::
- /bin/rm -f ${FILEPATH}`echo ${NAME} | cut -c4-`${FILESUFFIX}
-
diff --git a/LCG_Interfaces/Boost/cmt/requirements b/LCG_Interfaces/Boost/cmt/requirements
deleted file mode 100755
index 6578c4c38105..000000000000
--- a/LCG_Interfaces/Boost/cmt/requirements
+++ /dev/null
@@ -1,94 +0,0 @@
-package Boost
-
-use LCG_Configuration v*
-use LCG_Settings v*
-use Python v* LCG_Interfaces -no_auto_imports
-
-macro Boost_native_version "$(Boost_config_version)_python$(Python_config_version_twodigit)"
-# 'sed' is not available on windows, I've moved this macro to the LCG_Configuration
-# macro Boost_file_version "`echo $(Boost_native_version) | sed 's/\./_/g'`"
-
-#handle debug builds properly
-macro Boost_debug "" \
- target-dbg "d-"
-
-macro Boost_home $(LCG_external)/Boost/$(Boost_native_version)/$(LCG_system)
-
-include_path none
-macro Boost_include $(Boost_home)/include/boost-$(Boost_file_version)
-
-# silence warnings from gcc48 and later
-macro Boost_pp_cppflags "-isystem $(Boost_home)/include/boost-$(Boost_file_version) "
-
-macro Boost_compiler_version "$(LCG_compiler)" \
- target-icc "$(gcc2icc)" \
- target-clang "$(gcc2clang)" \
- target-gccmax "$(gcc2max)" \
- target-g11max "$(gcc2g11)" \
- target-gcc42&target-darwin "xgcc42" \
- target-llvm42&target-darwin "xgcc42" \
- target-gcc40&target-darwin "xgcc40" \
- target-vc9 "vc90"
-
-macro Boost_linkopts "-L$(Boost_home)/lib " \
- target-win "/LIBPATH:$(Boost_home)/lib "
-
-macro Boost_linkopts_python " -lboost_python-$(Boost_compiler_version)-mt-$(Boost_debug)$(Boost_file_version) " \
- target-win " boost_python-$(Boost_compiler_version)-mt-$(Boost_file_version).lib "
-
-macro Boost_linkopts_system " -lboost_system-$(Boost_compiler_version)-mt-$(Boost_debug)$(Boost_file_version) " \
- target-win " boost_system-$(Boost_compiler_version)-mt-$(Boost_file_version).lib "
-
-macro Boost_linkopts_filesystem " -lboost_filesystem-$(Boost_compiler_version)-mt-$(Boost_debug)$(Boost_file_version) " \
- target-win " boost_filesystem-$(Boost_compiler_version)-mt-$(Boost_file_version).lib "
-
-macro Boost_linkopts_filesystem_mt " -lboost_filesystem-$(Boost_compiler_version)-mt-$(Boost_debug)$(Boost_file_version) " \
- target-win " boost_filesystem-$(Boost_compiler_version)-mt-$(Boost_file_version).lib "
-
-macro Boost_linkopts_iostreams " -lboost_iostreams-$(Boost_compiler_version)-mt-$(Boost_debug)$(Boost_file_version) " \
- target-win " boost_iostreams-$(Boost_compiler_version)-mt-$(Boost_file_version).lib "
-
-macro Boost_linkopts_regex " -lboost_regex-$(Boost_compiler_version)-mt-$(Boost_debug)$(Boost_file_version) " \
- target-win " boost_regex-$(Boost_compiler_version)-mt-$(Boost_file_version).lib "
-
-macro Boost_linkopts_thread " -lboost_thread-$(Boost_compiler_version)-mt-$(Boost_debug)$(Boost_file_version) " \
- target-win " boost_thread-$(Boost_compiler_version)-mt-$(Boost_file_version).lib "
-
-macro Boost_linkopts_program_options " -lboost_program_options-$(Boost_compiler_version)-mt-$(Boost_debug)$(Boost_file_version) " \
- target-win " boost_program_options-$(Boost_compiler_version)-mt-$(Boost_file_version).lib "
-
-macro Boost_linkopts_serialization " -lboost_serialization-$(Boost_compiler_version)-mt-$(Boost_debug)$(Boost_file_version) " \
- target-win " boost_serialization-$(Boost_compiler_version)-mt-$(Boost_file_version).lib "
-
-macro Boost_linkopts_date_time " -lboost_date_time-$(Boost_compiler_version)-mt-$(Boost_debug)$(Boost_file_version) " \
- target-win " boost_date_time-$(Boost_compiler_version)-mt-$(Boost_file_version).lib "
-
-macro Boost_linkopts_graph " -lboost_graph-$(Boost_compiler_version)-mt-$(Boost_debug)$(Boost_file_version) " \
- target-win " boost_graph-$(Boost_compiler_version)-mt-$(Boost_file_version).lib "
-
-# Setup CMT dependency optimization macros
-macro Boost_header_file_filter $(Boost_home)/include/boost-$(Boost_file_version)
-macro Boost_header_file_stamp $(Boost_home)/include/boost-$(Boost_file_version)/boost/any.hpp
-
-apply_pattern set_lib_path
-apply_pattern set_root_include_path
-
-macro_append cppflags "" target-win " /DBOOST_ALL_DYN_LINK /wd4275 /wd4251 "
-
-# Special tag for using date_time with nano sec resolution
-macro_append cppflags "" USE_BOOST_TIME_WITH_NSEC_RESOLUTION " -DBOOST_DATE_TIME_POSIX_TIME_STD_CONFIG "
-macro_append Boost_linkopts "" USE_BOOST_TIME_WITH_NSEC_RESOLUTION " $(Boost_linkopts_date_time) "
-
-make_fragment pythonmodulebuilder
-
-pattern lcg_python_module \
- library <name> -import=Python -import=Boost <files> ;\
- macro <name>_shlibflags "$(libraryshr_linkopts) $(use_linkopts)" ;\
- document pythonmodulebuilder pymodule $(bin)<name>.so ;\
- macro_remove constituents "" target-win "pymodule" ;\
- macro_append <name>_cppflags " -ftemplate-depth-64" target-win "" ;\
- path_remove PYTHONPATH "/<package>/" target-win "\<package>\" ;\
- path_append PYTHONPATH $(<PACKAGE>ROOT)/$(tag)
-
-macro Boost_export_paths "$(Boost_home)"
-
diff --git a/LCG_Interfaces/CLHEP/CMakeLists.txt b/LCG_Interfaces/CLHEP/CMakeLists.txt
deleted file mode 100644
index 1329eeee2f0d..000000000000
--- a/LCG_Interfaces/CLHEP/CMakeLists.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-################################################################################
-# Package: CLHEP
-################################################################################
-
-# Declare the package name:
-atlas_subdir( CLHEP )
-
-# this line failed automatic conversion in cmt2cmake :
-# macro CLHEP_linkopts "-L$(CLHEP_home)/lib -lCLHEP-$(CLHEP_native_version)
-
diff --git a/LCG_Interfaces/CLHEP/cmt/requirements b/LCG_Interfaces/CLHEP/cmt/requirements
deleted file mode 100644
index 5cd3d19000e7..000000000000
--- a/LCG_Interfaces/CLHEP/cmt/requirements
+++ /dev/null
@@ -1,23 +0,0 @@
-package CLHEP
-
-use LCG_Configuration v*
-use LCG_Settings v*
-
-# Use CLHEP 2.2.0.4
-macro CLHEP_native_version "2.2.0.4"
-
-# overwrite with fixed location, needed for newer LCGs
-macro CLHEP_home "${SITEROOT}/sw/lcg/external/clhep/$(CLHEP_native_version)/$(LCG_system)"
-macro CLHEP_include "$(CLHEP_home)/include"
-
-include_path none
-include_dirs $(CLHEP_home)/include
-
-macro CLHEP_linkopts "-L$(CLHEP_home)/lib \
- -lCLHEP-$(CLHEP_native_version)
-
-macro CLHEP_name "clhep"
-apply_pattern set_lib_path
-apply_pattern set_root_include_path
-
-macro CLHEP_export_paths "$(CLHEP_home)/include $(CLHEP_home)/lib"
diff --git a/PackDist/CMakeLists.txt b/PackDist/CMakeLists.txt
deleted file mode 100644
index 8da3a1343637..000000000000
--- a/PackDist/CMakeLists.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-################################################################################
-# Package: PackDist
-################################################################################
-
-# Declare the package name:
-atlas_subdir( PackDist )
diff --git a/PackDist/cmt/fragments/help2doc b/PackDist/cmt/fragments/help2doc
deleted file mode 100644
index bbcb2d1491d2..000000000000
--- a/PackDist/cmt/fragments/help2doc
+++ /dev/null
@@ -1,17 +0,0 @@
-# File: PackDist/cmt/fragments/help2doc
-# Author: Grigori Rybkine <Grigori.Rybkine@cern.ch>
-
-MAN_${NAME}_${FILEEXTENSION} = ../man/man1/${FILENAME}.1
-HTML_${NAME}_${FILEEXTENSION} = ../doc/html/${FILENAME}.html
-
-$(MAN_${NAME}_${FILEEXTENSION}) : ${FULLNAME}
- mkdir -p $(@D)
- help2man -o $@ -n "$(doc_${NAME}_${FILEEXTENSION})" \
- -m "Packaging and Distribution Tools" -N -h -h -v -v $<
-
-$(HTML_${NAME}_${FILEEXTENSION}) : $(MAN_${NAME}_${FILEEXTENSION})
- mkdir -p $(@D)
- man2html $< >|$@
-
-MAN += $(MAN_${NAME}_${FILEEXTENSION})
-HTML += $(HTML_${NAME}_${FILEEXTENSION})
diff --git a/PackDist/cmt/fragments/help2doc_header b/PackDist/cmt/fragments/help2doc_header
deleted file mode 100644
index 93d2ba068c62..000000000000
--- a/PackDist/cmt/fragments/help2doc_header
+++ /dev/null
@@ -1,5 +0,0 @@
-# File: PackDist/cmt/fragments/help2doc_header
-# Author: Grigori Rybkine <Grigori.Rybkine@cern.ch>
-
-# This file is left empty on purpose
-
diff --git a/PackDist/cmt/fragments/help2doc_trailer b/PackDist/cmt/fragments/help2doc_trailer
deleted file mode 100644
index 1c0a3acf2200..000000000000
--- a/PackDist/cmt/fragments/help2doc_trailer
+++ /dev/null
@@ -1,9 +0,0 @@
-# File: PackDist/cmt/fragments/help2doc_trailer
-# Author: Grigori Rybkine <Grigori.Rybkine@cern.ch>
-
-${CONSTITUENT} :: $(MAN) $(HTML)
- $(echo) ${CONSTITUENT} done
-
-${CONSTITUENT}clean ::
- $(cleanup_echo) $(MAN) $(HTML)
- $(cleanup_silent) \rm -f $(MAN) $(HTML)
diff --git a/PackDist/cmt/fragments/pack_install b/PackDist/cmt/fragments/pack_install
deleted file mode 100755
index 5d66c2ef2ae5..000000000000
--- a/PackDist/cmt/fragments/pack_install
+++ /dev/null
@@ -1,56 +0,0 @@
-# File: PackDist/cmt/fragments/pack_install
-# Author: Grigori Rybkine <Grigori.Rybkine@cern.ch>
-
-# Install the most recently modified (binary, if available) package
-# from repository PACKREPO in directory PACKINSTALL
-
-PKG = $(PACKINSTALL)/pkg
-UNPACK = $(PACKINSTALL)/pacman
-DOWNLOAD = $(PACKINSTALL)/pacman-latest.tar.gz
-URL = http://atlas-computing.web.cern.ch/atlas-computing/links/monolith
-#URL = http://physics.bu.edu/pacman/sample_cache/tarballs
-
-.PHONY: ${CONSTITUENT} ${CONSTITUENT}clean
-.PHONY: get $(PKG)
-
-${CONSTITUENT} :: get
-
-get : $(PKG) $(UNPACK)
- cd $(UNPACK); . ./setup.sh; cd -; \
- cd $(<D); \
- pacman -allow trust-all-caches tar-overwrite; \
- pacman -get `cat $(<F)` -ask none; retval=$$?; \
- rm -f $(<F); exit $$retval
-
-$(PKG) : $(PACKREPO)
- @find $(<) -type f -name "*.pacman" >$(bin)pkglist
- @test -s $(bin)pkglist || { echo Empty repository: $<; exit 1; }
- @rm -f $(bin)pkg
- @ls -1t `cat $(bin)pkglist` | grep '\(opt\|dbg\)[^/]*\.pacman' | head -n 1 | \
- sed -e 's!\(.*\)/\([^/]\{1,\}\)!\1:\2!' -e 's!\.pacman!!' >$(bin)pkg
- @test -s $(bin)pkg || { echo No binary packages in repository: $<; \
- rm -f $(bin)pkg; \
- ls -1t `cat $(bin)pkglist` | head -n 1 | \
- sed -e 's!\(.*\)/\([^/]\{1,\}\)!\1:\2!' -e 's!\.pacman!!' >$(bin)pkg; }
- @mkdir -p $(@D)
- @cp -p $(bin)pkg $@
- @echo Package: `cat $@`
-
-$(PACKREPO) :
- @echo No such repository: $@; exit 1
-
-$(UNPACK) : $(DOWNLOAD)
- rm -f $@
- mkdir -p $(@D)
- cd $(@D); tar zxf $<
- @top=`ls -1dt \`find $(@D) -maxdepth 1 -type d -name "pacman-*"\`|head -n 1`; \
- test -d "$$top" || { echo Cannot find pacman: $(@D); ls -ltr; exit 1; }; \
- ln -sfnv `basename $$top` $@
-
-$(DOWNLOAD) :
- mkdir -p $(@D)
- cd $(@D); $(urlget) $(URL)/$(@F)
-
-${CONSTITUENT}clean ::
- $(cleanup_echo) $(PACKINSTALL)/*
- $(cleanup_silent) \rm -rf $(PACKINSTALL)/*
diff --git a/PackDist/cmt/fragments/pack_install_header b/PackDist/cmt/fragments/pack_install_header
deleted file mode 100755
index 20da337252e9..000000000000
--- a/PackDist/cmt/fragments/pack_install_header
+++ /dev/null
@@ -1,8 +0,0 @@
-# File: PackDist/cmt/fragments/pack_install_header
-# Author: Grigori Rybkine <Grigori.Rybkine@cern.ch>
-
-${CONSTITUENT} ::
- @\printf "\n%s\n\n" \
- "$(version_info)"
-
-# End of file: PackDist/cmt/fragments/pack_install_header
diff --git a/PackDist/cmt/fragments/pack_run b/PackDist/cmt/fragments/pack_run
deleted file mode 100755
index 07e8fe956126..000000000000
--- a/PackDist/cmt/fragments/pack_run
+++ /dev/null
@@ -1,22 +0,0 @@
-# File: PackDist/cmt/fragments/pack_run
-# Author: Grigori Rybkine <Grigori.Rybkine@cern.ch>
-
-# Pack...
-
-.PHONY: ${CONSTITUENT} ${CONSTITUENT}clean
-
-${CONSTITUENT} :: $(PACKREPO)
- test -d $(PACKREPO) || mkdir $(PACKREPO)
- if [ -n "`printenv PACKCFG`" ]; then \
- $(FULLNAME) $(PACKOPTS) -C $(PACKREPO) -L $(bin) $(PACKEXTRAOPTS);\
- else \
- $(FULLNAME) -c $(PACKCFG) $(PACKOPTS) -C $(PACKREPO) -L $(bin) $(PACKEXTRAOPTS); fi
-
-$(PACKREPO) :
- mkdir $(PACKREPO)
-
-${CONSTITUENT}clean ::
- $(cleanup_echo) $(PACKREPO)/*
- $(cleanup_silent) \rm -rf $(PACKREPO)/*
- $(cleanup_echo) ../run
- $(cleanup_silent) test ! -d ../run || \rm -rf ../run
diff --git a/PackDist/cmt/fragments/pack_run_header b/PackDist/cmt/fragments/pack_run_header
deleted file mode 100755
index b11690832d03..000000000000
--- a/PackDist/cmt/fragments/pack_run_header
+++ /dev/null
@@ -1,5 +0,0 @@
-# File: PackDist/cmt/fragments/pack_run_header
-# Author: Grigori Rybkine <Grigori.Rybkine@cern.ch>
-
-# This file is left empty on purpose
-
diff --git a/PackDist/config/pack-nightly-bugfix.cfg b/PackDist/config/pack-nightly-bugfix.cfg
deleted file mode 100755
index da342f5da33a..000000000000
--- a/PackDist/config/pack-nightly-bugfix.cfg
+++ /dev/null
@@ -1,34 +0,0 @@
-# This is a configuration file for the pack-run.sh script.
-#
-# The configuration files read by the script are defaults.cfg,
-# ~/.pack.cfg, the file specified in the environment variable PACKCFG,
-# the file specified with the -c command line option
-# (values from "earlier" files are overridden by "later" files).
-#
-# The format is: option = value # comments
-# or: option : value # comments
-#
-# (Command line options override values from the configuration files.)
-#
-# Report bugs to <Grigori.Rybkine@cern.ch>.
-#
-
-#cmthome = ${HOME}/cmthome-v1r18p20060301
-cmthome = /afs/cern.ch/user/a/alibrari/cmthome
-#logdir = /afs/cern.ch/atlas/software/builds/kitrel/bugfix/log
-logdir = ../run
-pacmancache= /afs/cern.ch/atlas/software/builds/kitrel/bugfix
-#patchdir = $HOME/Kit/patches3
-patchdir = /afs/cern.ch/user/a/alibrari/Kit/patches3
-
-#overwrite : Nope
-#overwrite : yep
-#upgrade: yeah
-
-projbase=/afs/cern.ch/atlas/software/builds/nightlies/bugfix
-
-release=
-project = AtlasProduction
-builddir = /build/atnight
-#recursive = Yep
-cmtcache = http://cern.ch/atlas-computing/links/kitsDirectory/CMT/pacman/cache
diff --git a/PackDist/doc/Makefile b/PackDist/doc/Makefile
deleted file mode 100755
index 8ab395ce689e..000000000000
--- a/PackDist/doc/Makefile
+++ /dev/null
@@ -1,23 +0,0 @@
-# File: PackDist/doc/Makefile
-# Author: Grigori Rybkine <Grigori.Rybkine@cern.ch>
-
-# Build documentation: man page and in html format
-
-name = proj-run.sh
-script = ../scripts/$(name)
-man = ../man/man1/$(name).1
-html = ../doc/html/$(name).html
-
-.PHONY: all
-
-all : $(man) $(html)
-
-$(man) : $(script) ../ChangeLog
- @mkdir -p $(@D)
- help2man -o $@ -n "pack project(s), external package(s)" \
- -m "Packaging and Distribution Tools" -N -h -h -v -v $<
-
-$(html) : $(man)
- @mkdir -p $(@D)
- @rm -f $@
- man2html $< >$@
diff --git a/PackDist/doc/html/pack-relocate.sh.html b/PackDist/doc/html/pack-relocate.sh.html
deleted file mode 100644
index c6f21ba364df..000000000000
--- a/PackDist/doc/html/pack-relocate.sh.html
+++ /dev/null
@@ -1,67 +0,0 @@
-Content-type: text/html
-
-<HTML><HEAD><TITLE>Manpage of PACK-RELOCATE.SH</TITLE>
-</HEAD><BODY>
-<H1>PACK-RELOCATE.SH</H1>
-Section: Packaging and Distribution Tools (1)<BR>Updated: August 2013<BR><A HREF="#index">Index</A>
-<A HREF="http://localhost/cgi-bin/man/man2html">Return to Main Contents</A><HR>
-
-<A NAME="lbAB"> </A>
-<H2>NAME</H2>
-
-pack-relocate.sh - relocate or transform distribution kit
-<A NAME="lbAC"> </A>
-<H2>SYNOPSIS</H2>
-
-<B>pack-relocate.sh</B>
-
-[<I>OPTION</I>]... <I>SOURCE DEST</I>
-<BR>
-
-<B>pack-relocate.sh</B>
-
-[<I>OPTION</I>]... <I>-t PATH</I>...
-<A NAME="lbAD"> </A>
-<H2>DESCRIPTION</H2>
-
-In first form, relocate the ATLAS distribution kit from SOURCE to DEST.
-In second form, locate the ATLAS distribution kit in PATH and transform
-as described for <B>-t</B> option (implies <B>-i</B> option).
-<DL COMPACT>
-<DT><B>-i</B><DD>
-edit files in-place, without moving them from SOURCE to DEST
-<DT><B>-c</B><DD>
-only relocate files in cmtsite
-<DT><B>-t</B><DD>
-transform setup scripts so that full paths in them may be changed by setting ATLAS_RELEASE_BASE environment variable
-<DT><B>-h</B><DD>
-display this help and exit
-<DT><B>-v</B><DD>
-output version information and exit
-</DL>
-<A NAME="lbAE"> </A>
-<H2>AUTHOR</H2>
-
-Written by Grigori Rybkine.
-<A NAME="lbAF"> </A>
-<H2>REPORTING BUGS</H2>
-
-Report bugs to <<A HREF="mailto:Grigori.Rybkine@cern.ch">Grigori.Rybkine@cern.ch</A>>.
-<P>
-
-<HR>
-<A NAME="index"> </A><H2>Index</H2>
-<DL>
-<DT><A HREF="#lbAB">NAME</A><DD>
-<DT><A HREF="#lbAC">SYNOPSIS</A><DD>
-<DT><A HREF="#lbAD">DESCRIPTION</A><DD>
-<DT><A HREF="#lbAE">AUTHOR</A><DD>
-<DT><A HREF="#lbAF">REPORTING BUGS</A><DD>
-</DL>
-<HR>
-This document was created by
-<A HREF="http://localhost/cgi-bin/man/man2html">man2html</A>,
-using the manual pages.<BR>
-Time: 14:57:23 GMT, August 20, 2013
-</BODY>
-</HTML>
diff --git a/PackDist/doc/html/proj-run.sh.html b/PackDist/doc/html/proj-run.sh.html
deleted file mode 100755
index 074f641189d2..000000000000
--- a/PackDist/doc/html/proj-run.sh.html
+++ /dev/null
@@ -1,117 +0,0 @@
-Content-type: text/html
-
-<HTML><HEAD><TITLE>Manpage of PROJ-RUN.SH</TITLE>
-</HEAD><BODY>
-<H1>PROJ-RUN.SH</H1>
-Section: Packaging and Distribution Tools (1)<BR>Updated: August 2013<BR><A HREF="#index">Index</A>
-<A HREF="http://localhost/cgi-bin/man/man2html">Return to Main Contents</A><HR>
-
-<A NAME="lbAB"> </A>
-<H2>NAME</H2>
-
-proj-run.sh - pack project(s), external package(s)
-<A NAME="lbAC"> </A>
-<H2>SYNOPSIS</H2>
-
-<B>proj-run.sh</B>
-
-[<I>OPTION</I>]...
-<A NAME="lbAD"> </A>
-<H2>DESCRIPTION</H2>
-
-Pack project with external packages it depends upon, or only external package(s).
-<DL COMPACT>
-<DT><B>-L</B> <path><DD>
-create log file in directory <path>
-<DT><B>-C</B> <path><DD>
-create packages in directory <path>
-<DT><B>-X</B> <path><DD>
-create external packages in directory <path>
-(takes precedence over <B>-C</B> value)
-<DT><B>-J</B> <path><DD>
-create project packages in directory <path>
-(takes precedence over <B>-C</B> value)
-<DT><B>-o</B> <path><DD>
-create RPMs in directory <path>
-<DT><B>-x</B> <path><DD>
-create external RPMs in directory <path>
-(takes precedence over <B>-o</B> value)
-<DT><B>-j</B> <path><DD>
-create project RPMs in directory <path>
-(takes precedence over <B>-o</B> value)
-<DT><B>-b</B> <path><DD>
-pack project located in project base directory <path>
-<DT><B>-P</B> <project><DD>
-pack project <project>
-<DT><B>-r</B> <id><DD>
-pack project release <id>
-<DT><B>-p</B> <package><DD>
-pack external package <package> (may be multiple)
-<DT><B>-D</B><DD>
-pack debug build
-<DT><B>-I</B><DD>
-create debug information packages (for not debug build)
-<DT><B>-S</B> <suffix><DD>
-suffix of debug information files (for not debug build)
-<DT><B>-t</B> <tag>[,<tag>...]<DD>
-use additional tag(s) for setup (may be multiple)
-<DT><B>-T</B> <cmtconfig><DD>
-force CMTCONFIG <cmtconfig> (platform tag) for setup
-<DT><B>-d</B><DD>
-pack documentation files also
-<DT><B>-F</B><DD>
-overwrite existing tarballs of external packages
-<DT><B>-U</B><DD>
-overwrite existing tarballs of project packages
-<DT><B>-k</B><DD>
-keep existing tarballs of settings packages
-(default is overwrite if their versions differ from those in use)
-<DT><B>-R</B><DD>
-recursively pack projects required by the project being packed
-<DT><B>-V</B><DD>
-verify that existing tarballs (of project and/or external packages) are up-to-date
-<DT><B>-w</B><DD>
-wait until packing completion
-<DT><B>-q</B><DD>
-do not write anything to standard output
-<DT><B>-n</B><DD>
-do not execute, only dump configuration
-<DT><B>-B</B> <path><DD>
-use directory <path> for temporary files
-<DT><B>-c</B> <path><DD>
-use configuration file <path>
-<DT><B>-h</B><DD>
-display this help and exit
-<DT><B>-v</B><DD>
-output version information and exit
-</DL>
-<P>
-
-The PACKOPTS environment variable specifies a space separated list of default options
-to be placed in front of any explicit options.
-<A NAME="lbAE"> </A>
-<H2>AUTHOR</H2>
-
-Written by Grigori Rybkine.
-<A NAME="lbAF"> </A>
-<H2>REPORTING BUGS</H2>
-
-Report bugs to <<A HREF="mailto:Grigori.Rybkine@cern.ch">Grigori.Rybkine@cern.ch</A>>.
-<P>
-
-<HR>
-<A NAME="index"> </A><H2>Index</H2>
-<DL>
-<DT><A HREF="#lbAB">NAME</A><DD>
-<DT><A HREF="#lbAC">SYNOPSIS</A><DD>
-<DT><A HREF="#lbAD">DESCRIPTION</A><DD>
-<DT><A HREF="#lbAE">AUTHOR</A><DD>
-<DT><A HREF="#lbAF">REPORTING BUGS</A><DD>
-</DL>
-<HR>
-This document was created by
-<A HREF="http://localhost/cgi-bin/man/man2html">man2html</A>,
-using the manual pages.<BR>
-Time: 15:16:06 GMT, August 20, 2013
-</BODY>
-</HTML>
diff --git a/PackDist/hscript.py b/PackDist/hscript.py
deleted file mode 100644
index 3916380c9a61..000000000000
--- a/PackDist/hscript.py
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-
-## -*- python -*-
-## automatically generated from a hscript
-## do NOT edit.
-
-## waf imports
-import waflib.Logs as msg
-
-PACKAGE = {
- "name": "PackDist",
- "authors": ["Grigori Rybkine <Grigori.Rybkine@cern.ch>", "Christian Arnault <arnault@lal.in2p3.fr>"],
-
-
-}
-
-### ---------------------------------------------------------------------------
-def pkg_deps(ctx):
-
- ## no public dependencies
- ## no private dependencies
- ## no runtime dependencies
- return # pkg_deps
-
-
-### ---------------------------------------------------------------------------
-def options(ctx):
-
- return # options
-
-
-### ---------------------------------------------------------------------------
-def configure(ctx):
-
-
-
- #### set &{{PACKCFG [{default [../config/pack-nightly-bugfix.cfg]}]}}
- ctx.hwaf_declare_macro("PACKCFG", (
- {"default": "../config/pack-nightly-bugfix.cfg"},
- ))
- ctx.hwaf_declare_runtime_env("PACKCFG")
- #### set &{{PACKOPTS [{default [${PACKOPTS}]}]}}
- ctx.hwaf_declare_macro("PACKOPTS", (
- {"default": "${PACKOPTS}"},
- ))
- ctx.hwaf_declare_runtime_env("PACKOPTS")
- #### set_remove &{{PACKOPTS [{default [-w]}]}}
- ctx.hwaf_macro_remove("PACKOPTS", (
- {"default": "-w"},
- ))
- ##### **** statement *hlib.SetAppendStmt (&{{PACKOPTS [{default [-w]}]}})
- #### macro &{{PACKREPO [{default [../run]}]}}
- ctx.hwaf_declare_macro("PACKREPO", (
- {"default": "../run"},
- ))
- #### macro &{{PACKINSTALL [{default [../installation]}]}}
- ctx.hwaf_declare_macro("PACKINSTALL", (
- {"default": "../installation"},
- ))
- #### macro &{{urlget [{default [wget]} {Darwin [curl -L -O]}]}}
- ctx.hwaf_declare_macro("urlget", (
- {"default": "wget"},
- {"Darwin": ["curl", "-L", "-O"]},
- ))
- #### macro &{{main [{default [${PACKAGE_ROOT}/scripts/proj-run.sh]}]}}
- ctx.hwaf_declare_macro("main", (
- {"default": "${PACKAGE_ROOT}/scripts/proj-run.sh"},
- ))
- #### macro &{{version_info [{default [`${main} -v`]}]}}
- ctx.hwaf_declare_macro("version_info", (
- {"default": ["`${main}", "-v`"]},
- ))
- #### macro &{{doc_proj-run_sh [{default [pack project(s}, external package(s}]}]}}
- ctx.hwaf_declare_macro("doc_proj-run_sh", (
- {"default": ["pack", "project(s},", "external", "package(s}"]},
- ))
- #### macro &{{doc_pack-relocate_sh [{default [relocate or transform distribution kit]}]}}
- ctx.hwaf_declare_macro("doc_pack-relocate_sh", (
- {"default": ["relocate", "or", "transform", "distribution", "kit"]},
- ))
- ##### **** statement *hlib.MakeFragmentStmt (&{pack_run})
- ##### **** statement *hlib.MakeFragmentStmt (&{pack_install})
- ##### **** statement *hlib.MakeFragmentStmt (&{help2doc})
-
- return # configure
-
-
-### ---------------------------------------------------------------------------
-def build(ctx):
-
-
- ##### **** statement *hlib.DocumentStmt (&{pack_run [Run -group=run $(main)]})
- ##### **** statement *hlib.DocumentStmt (&{pack_install [Installation -group=installation -s=. $(PACKREPO)]})
- ##### **** statement *hlib.DocumentStmt (&{help2doc [Doc -group=doc $(main) ../share/pack-relocate.sh]})
-
-
- return # build
-
-## EOF ##
diff --git a/PackDist/man/man1/pack-relocate.sh.1 b/PackDist/man/man1/pack-relocate.sh.1
deleted file mode 100644
index 99de09bca584..000000000000
--- a/PackDist/man/man1/pack-relocate.sh.1
+++ /dev/null
@@ -1,33 +0,0 @@
-.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.36.
-.TH PACK-RELOCATE.SH "1" "August 2013" "pack-relocate.sh (PackDist) 0.6.1" "Packaging and Distribution Tools"
-.SH NAME
-pack-relocate.sh \- relocate or transform distribution kit
-.SH SYNOPSIS
-.B pack-relocate.sh
-[\fIOPTION\fR]... \fISOURCE DEST\fR
-.br
-.B pack-relocate.sh
-[\fIOPTION\fR]... \fI-t PATH\fR...
-.SH DESCRIPTION
-In first form, relocate the ATLAS distribution kit from SOURCE to DEST.
-In second form, locate the ATLAS distribution kit in PATH and transform
-as described for \fB\-t\fR option (implies \fB\-i\fR option).
-.TP
-\fB\-i\fR
-edit files in\-place, without moving them from SOURCE to DEST
-.TP
-\fB\-c\fR
-only relocate files in cmtsite
-.TP
-\fB\-t\fR
-transform setup scripts so that full paths in them may be changed by setting ATLAS_RELEASE_BASE environment variable
-.TP
-\fB\-h\fR
-display this help and exit
-.TP
-\fB\-v\fR
-output version information and exit
-.SH AUTHOR
-Written by Grigori Rybkine.
-.SH "REPORTING BUGS"
-Report bugs to <Grigori.Rybkine@cern.ch>.
diff --git a/PackDist/man/man1/proj-run.sh.1 b/PackDist/man/man1/proj-run.sh.1
deleted file mode 100755
index f09233bbcea4..000000000000
--- a/PackDist/man/man1/proj-run.sh.1
+++ /dev/null
@@ -1,108 +0,0 @@
-.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.36.
-.TH PROJ-RUN.SH "1" "August 2013" "proj-run.sh (PackDist) 00-12-00" "Packaging and Distribution Tools"
-.SH NAME
-proj-run.sh \- pack project(s), external package(s)
-.SH SYNOPSIS
-.B proj-run.sh
-[\fIOPTION\fR]...
-.SH DESCRIPTION
-Pack project with external packages it depends upon, or only external package(s).
-.TP
-\fB\-L\fR <path>
-create log file in directory <path>
-.TP
-\fB\-C\fR <path>
-create packages in directory <path>
-.TP
-\fB\-X\fR <path>
-create external packages in directory <path>
-(takes precedence over \fB\-C\fR value)
-.TP
-\fB\-J\fR <path>
-create project packages in directory <path>
-(takes precedence over \fB\-C\fR value)
-.TP
-\fB\-o\fR <path>
-create RPMs in directory <path>
-.TP
-\fB\-x\fR <path>
-create external RPMs in directory <path>
-(takes precedence over \fB\-o\fR value)
-.TP
-\fB\-j\fR <path>
-create project RPMs in directory <path>
-(takes precedence over \fB\-o\fR value)
-.TP
-\fB\-b\fR <path>
-pack project located in project base directory <path>
-.TP
-\fB\-P\fR <project>
-pack project <project>
-.TP
-\fB\-r\fR <id>
-pack project release <id>
-.TP
-\fB\-p\fR <package>
-pack external package <package> (may be multiple)
-.TP
-\fB\-D\fR
-pack debug build
-.TP
-\fB\-I\fR
-create debug information packages (for not debug build)
-.TP
-\fB\-S\fR <suffix>
-suffix of debug information files (for not debug build)
-.TP
-\fB\-t\fR <tag>[,<tag>...]
-use additional tag(s) for setup (may be multiple)
-.TP
-\fB\-T\fR <cmtconfig>
-force CMTCONFIG <cmtconfig> (platform tag) for setup
-.TP
-\fB\-d\fR
-pack documentation files also
-.TP
-\fB\-F\fR
-overwrite existing tarballs of external packages
-.TP
-\fB\-U\fR
-overwrite existing tarballs of project packages
-.TP
-\fB\-k\fR
-keep existing tarballs of settings packages
-(default is overwrite if their versions differ from those in use)
-.TP
-\fB\-R\fR
-recursively pack projects required by the project being packed
-.TP
-\fB\-V\fR
-verify that existing tarballs (of project and/or external packages) are up\-to\-date
-.TP
-\fB\-w\fR
-wait until packing completion
-.TP
-\fB\-q\fR
-do not write anything to standard output
-.TP
-\fB\-n\fR
-do not execute, only dump configuration
-.TP
-\fB\-B\fR <path>
-use directory <path> for temporary files
-.TP
-\fB\-c\fR <path>
-use configuration file <path>
-.TP
-\fB\-h\fR
-display this help and exit
-.TP
-\fB\-v\fR
-output version information and exit
-.PP
-The PACKOPTS environment variable specifies a space separated list of default options
-to be placed in front of any explicit options.
-.SH AUTHOR
-Written by Grigori Rybkine.
-.SH "REPORTING BUGS"
-Report bugs to <Grigori.Rybkine@cern.ch>.
diff --git a/PackDist/scripts/basic-requirements.template b/PackDist/scripts/basic-requirements.template
deleted file mode 100644
index a866b8aadc34..000000000000
--- a/PackDist/scripts/basic-requirements.template
+++ /dev/null
@@ -1,13 +0,0 @@
-#
-# !!! DO NOT EDIT - GENERATED AUTOMATICALLY FOR USE AT KIT INSTALLATION TIME !!!
-#
-
-set CMTSITE STANDALONE
-set SITEROOT @INSTALL_PREFIX@
-
-path_prepend CMTPROJECTPATH ${SITEROOT}
-
-path CMTPATH
-
-set CMTEXTRATAGS ${CMTEXTRATAGS}
-set_prepend CMTEXTRATAGS ATLAS,
diff --git a/PackDist/scripts/defaults.cfg b/PackDist/scripts/defaults.cfg
deleted file mode 100755
index e2dce8dcf412..000000000000
--- a/PackDist/scripts/defaults.cfg
+++ /dev/null
@@ -1,40 +0,0 @@
-# File: defaults.cfg
-#
-# This is the configuration file for the pack-run.sh script with default settings.
-# Do not edit!!!
-# To override the settings and/or add those without default values use
-# ~/.pack.cfg, the file specified in the environment variable PACKCFG,
-# the file specified with the -c command line option
-# (values from "earlier" files are overridden by "later" files).
-#
-# The format is: option = value # comments
-# or: option : value # comments
-#
-# (Command line options override values from the configuration files.)
-#
-# Report bugs to <Grigori.Rybkine@cern.ch>.
-#
-
-cmthome = ${HOME}/cmthome
-logdir = $HOME
-pacmancache= .
-patchdir = ${HOME}
-
-# overwrite (yes) or not (no) existing tarballs of external packages
-overwrite : no
-
-# projbase=/afs/cern.ch/atlas/software/builds
-# projbase=/afs/cern.ch/atlas/software/dist
- mainpkg=AtlasRelease
-
-project = AtlasOffline
-# release= 10.5.0
-
-mode = opt # opt, dbg
-
-cmtcache: http://www.cmtsite.org/pacman/cache
-
-setuproot = /afs/cern.ch/atlas/software/dist/AtlasSetup
-tags = builds,noruntime
-debuginfo = no
-debuginfosuffix = .debug
diff --git a/PackDist/scripts/doc.ptn b/PackDist/scripts/doc.ptn
deleted file mode 100755
index e4bcea6b537b..000000000000
--- a/PackDist/scripts/doc.ptn
+++ /dev/null
@@ -1,9 +0,0 @@
-doc
-doc/*
-docs
-docs/*
-doc-files
-doc-files/*
-ChangeLog
-README
-*.doc
diff --git a/PackDist/scripts/extern-junk.ptn b/PackDist/scripts/extern-junk.ptn
deleted file mode 100755
index 40fe6aaec5e1..000000000000
--- a/PackDist/scripts/extern-junk.ptn
+++ /dev/null
@@ -1,9 +0,0 @@
-CVS
-*~
-*.pyc
-*.pyo
-*.stamp
-*.shstamp
-*.cmtref
-.svn
-.__afs*
diff --git a/PackDist/scripts/junk.ptn b/PackDist/scripts/junk.ptn
deleted file mode 100755
index d857e8ddb0ea..000000000000
--- a/PackDist/scripts/junk.ptn
+++ /dev/null
@@ -1,20 +0,0 @@
-CVS
-CVS/*
-cmt/setup.*
-cmt/cleanup.*
-cmt/*make*
-cmt/*.log
-cmt/.cvsignore
-run/*
-*.BAK
-*~
-src/*.g
-temp
-temp/*
-NICOS_*
-*.cmtref
-*.pyc
-*.pyo
-.svn
-.svn/*
-.__afs*
diff --git a/PackDist/scripts/pack-common.sh b/PackDist/scripts/pack-common.sh
deleted file mode 100755
index 7a7a9044bf71..000000000000
--- a/PackDist/scripts/pack-common.sh
+++ /dev/null
@@ -1,217 +0,0 @@
-# File: pack-common.sh
-#
-# Functions used by all scripts.
-#
-# Author: Grigori Rybkine <Grigori.Rybkine@cern.ch>.
-#
-
-#
-# Usage: info|warn|error [message [location]]
-#
-info () { echo -e ${scriptname:=`basename $0`}: ${2:+$2:} INFO: "$1" 1>&2; }
-#info () { echo -e "${scriptname:=`basename $0`}: ${2:+$2: }INFO:" "$1" 1>&2; }
-#info () { echo -e "`basename $0`: ${2:+$2: }INFO:" "$1"; }
-warn () { echo -e "${scriptname:=`basename $0`}: ${2:+$2: }WARNING:" "$1" 1>&2; }
-error () { echo -e "${scriptname:=`basename $0`}: ${2:+$2: }ERROR:" "$1" 1>&2; }
-
-abspath ()
-{
-#
-# Usage: abspath FILEPATH
-#
-# if FILEPATH is invalid or empty,
-# the result is an empty string
-#
-[ $# -eq 1 ] || { error "Wrong number of arguments: $#" $FUNCNAME; return 1; }
-if [ -f "$1" ]; then
- local d=`dirname $1`
- d=`cd $d || exit; pwd -P` ||
- { error "Cannot resolve path: $1" $FUNCNAME; return 1; }
- echo $d/`basename $1`
-elif [ -d "$1" ]; then
- (cd $1 || exit; pwd -P) ||
- { error "Cannot resolve path: $1" $FUNCNAME; return 1; }
-# (cd $1; /bin/pwd)
-else
- error "No such file or directory: $1" $FUNCNAME; return 1
-fi
-}
-
-duf ()
-{
-#
-# Usage: duf [OPTION]... [FILE]...
-# Show information about the filesystem on which the current directory resides,
-# display the total amount of disk space required for FILEs, or standard input,
-# or the current directory by default.
-#
-# -p PATH show information about the filesystem on which PATH resides
-#
-local path
-OPTIND=1
-while getopts "p:" opt; do
- case $opt in
- p) path=${OPTARG} ;;
- \?) error "Invalid usage" $FUNCNAME; return 1 ;;
- esac
-done
-
-shift $(($OPTIND - 1))
-
-[ "$path" ] || path=$PWD
-
-#local fstype=$(df -P -T $path|tail -n 1|awk '{print $2}')
-# use POSIX output (and options)
-local -a fsinfo=(`df -kP $path|tail -n 1|awk '{print $1, $2, $4}'`) ||
-{ error "awk" $FUNCNAME; return 1; }
-[ "${fsinfo[0]}" ] || { error "Cannot determine filesystem type: $path" $FUNCNAME; return 1; }
-#[ "$fstype" ] || { error "Cannot determine filesystem type: $path" $FUNCNAME; return 1; }
-
-if [[ ${fsinfo[0]} == [Aa][Ff][Ss] ]]; then
- fsinfo=(`fs lq $path|tail -n 1|awk '{print $1, $2, $2 - $3}'`)
-fi
-# local -a fsinfo=(`
-# case $fstype in
-# afs) fs lq $path|tail -n 1|awk '{print $1, $2, $2 - $3}' ;;
-# *) df -P $path|tail -n 1|awk '{print $1, $2, $4}' ;;
-# esac
-# `)
-
-# use POSIX options of du -ksL (c - grand total, not POSIX)
-case $# in
- 0) local reqspace=$(xargs du -k -s -c -L |
- awk '$2 == "total" { sum += $1 }; END{ print sum }') ;;
- *) local reqspace=$(du -k -s -c -L "$@" |
- awk '$2 == "total" { sum += $1 }; END{ print sum }') ;;
-esac
-
-local fmt="%-20s %15s %15s %15s\n"
-printf "$fmt" "Filesystem" "1024-blocks" "Available" "Required"
-printf "$fmt" ${fsinfo[0]} ${fsinfo[1]} ${fsinfo[2]} ${reqspace}
-}
-
-newer ()
-{
-#
-# Usage: newer -p PATH [OPTION]... [FILE]...
-#
-# -L dereference all symbolic links
-#
-
-local path follow
-
-OPTIND=1
-while getopts "p:L" opt; do
- case $opt in
- p) path=${OPTARG} ;;
- L) follow=yes ;;
- \?) error "Invalid usage" $FUNCNAME; return 1 ;;
- esac
-done
-
-shift $(($OPTIND - 1))
-
-[ "$path" ] || { error "PATH must be supplied with '-p'" $FUNCNAME; return 1; }
-
-local tmpnew=$(mktemp -t tmp.XXXXXXXXXX) || { error "mktemp" $FUNCNAME; return 1; }
-
-case $# in
-# 0) xargs findnewer -p $path ${follow:+-L} ;;
- 0) xargs -r sh -c "findnewer -p $path ${follow:+-L} \$0 \$@" >>$tmpnew ;;
- *) findnewer -p $path ${follow:+-L} "$@" >|$tmpnew ;;
-esac
-
-local retval=$?
-
-[ -s $tmpnew ] && { warn "$path: Newer files available:" $FUNCNAME; cat $tmpnew >&2; }
-rm -f $tmpnew
-
-case $retval in
- 123|124) error "findnewer" $FUNCNAME; return 1 ;;
- 125|126|127|1) error "xargs" $FUNCNAME; return 1 ;;
- 2) error "findnewer" $FUNCNAME; return 2 ;;
-esac
-}
-
-findnewer ()
-{
-#
-# Usage: findnewer -p PATH [OPTION]... [FILE]...
-#
-# -L dereference all symbolic links
-#
-
-local path follow
-
-OPTIND=1
-while getopts "p:L" opt; do
- case $opt in
- p) path=${OPTARG} ;;
- L) follow=yes ;;
- \?) error "Invalid usage" $FUNCNAME; return 2 ;;
- esac
-done
-
-shift $(($OPTIND - 1))
-
-[ "$path" ] || { error "PATH must be supplied with '-p'" $FUNCNAME; return 2; }
-
-[ ${uname} != Linux ] || noleaf=yes
-find $(echo_F "$@") ${noleaf:+-noleaf} ${follow:+-follow} -newer $path -ls ||
-#find ${follow:+-L} $(echo_F "$@") ${noleaf:+-noleaf} -newer $path -ls ||
-{ error "find" $FUNCNAME; return 2; }
-}
-
-echo_F ()
-{
-#
-# Usage: echo_F [FILE]...
-# Append forward slash (/) to the names of FILEs that are symbolic links to existing directories.
-# Print the names of the other FILEs unchanged.
-#
-local s first=y
-for s; do
- if [ "$first" ]; then
- echo -n "$s"; unset first
- else
- echo -n " $s"
- fi
- if [ -h "$s" -a -d "$s" ]; then
- [[ $s == ?*/ ]] || echo -n /
- fi
-done
-}
-
-export -f findnewer error echo_F
-#export scriptname
-
-path_prepend ()
-{
-#
-# Usage: path_prepend PATHVARIABLE PATH
-#
-[ $# -eq 2 ] || return 0
-[ "$1" ] && [ "$2" ] || return 0
-
-local val=$2
-for p in $(eval echo \$$1 | tr -s ':' ' '); do
- [ $p = $2 ] || val=${val}:$p
-done
-eval $1=$val
-}
-
-path_append ()
-{
-#
-# Usage: path_append PATHVARIABLE PATH
-#
-[ $# -eq 2 ] || return 0
-[ "$1" ] && [ "$2" ] || return 0
-
-local val
-for p in $(eval echo \$$1 | tr -s ':' ' '); do
- [ $p = $2 ] || if [ -n "${val}" ]; then val=${val}:$p; else val=$p; fi
-done
-if [ -n "${val}" ]; then val=${val}:$2; else val=$2; fi
-eval $1=$val
-}
diff --git a/PackDist/scripts/pack-extern.sh b/PackDist/scripts/pack-extern.sh
deleted file mode 100755
index 6e0189763775..000000000000
--- a/PackDist/scripts/pack-extern.sh
+++ /dev/null
@@ -1,703 +0,0 @@
-#!/bin/bash
-# File: pack-extern.sh
-#
-# Pack external software interfaced to by a cmt package.
-#
-# Author: Christian Arnault <arnault@lal.in2p3.fr>
-# Author: Grigori Rybkine <Grigori.Rybkine@cern.ch>.
-#
-
-[ "$PACKEXTERNDBG" ] && set -x
-
-: ${externcache:?} ${patchdir:?} ${overwrite:?}
-
-: ${scriptdir:?}
-. $scriptdir/pack-common.sh
-
-: ${CMTCONFIG:?}
-: ${SITEROOT:?}
-#: ${tmpdir:?}
-#: ${tmppatch:?}
-
-##################################### functions #####################################
-_patch ()
-{
-#
-# Parameters: 'project' 'release' 'package'
-# Create a patched requirements file, install it
-# in the right place in the directory tree under tmppatch and
-# print its path on the standard output: 'patch-path'
-#
-# Return status: 0 if a patched file is created, 1 otherwise
-#
-[ -d "${patchdir}" ] ||
-{ warn "patchdir=$patchdir: No such directory" $FUNCNAME; return 1; }
-
-# Check for patches
-if [ -f ${patchdir}/${1}/${2}/requirements -o \
- -f ${patchdir}/${1}/${2}/${3}/requirements ]; then
-
-local projpatch=${patchdir}/${1}/${2}/requirements pkgpatch=${patchdir}/${1}/${2}/${3}/requirements
-local reqpatch=$(mktemp -d -t tmp.XXXXXXXXXX)/requirements || { error "mktemp" $FUNCNAME; return 1; }
->|${reqpatch}
-
-if [ -f $pkgpatch ]; then
- if head -n 1 $pkgpatch | grep -q '^#!'; then
- $pkgpatch <requirements >>${reqpatch}
- else
- cat requirements $pkgpatch >>${reqpatch}
- fi
- [ $? -eq 0 ] || { error "Cannot apply: $pkgpatch" $FUNCNAME; }
-fi
-
-if [ -f $projpatch ]; then
-# echo >>${reqpatch}
- cat $projpatch >>${reqpatch} || { error "Cannot apply: $projpatch" $FUNCNAME; }
-fi
-
-[ -s ${reqpatch} ] || { rm -rf $(dirname $reqpatch)
-warn "Empty patch(es) provided: $1 $2 $3" $FUNCNAME; return 1; }
-
-# if _install_patched $1 $2 $3 ${reqpatch}; then
-# rm -rf $(dirname $reqpatch) || return 0
-# else echo ${reqpatch}
-# fi
-_install_patched $1 $2 $3 ${reqpatch} >/dev/null
-echo ${reqpatch}
-
-else return 1
-fi
-}
-
-_install_patched ()
-{
-#
-# Parameters: 'project' 'release' 'package' 'patched-path'
-# Install patched requirements file 'patched-path'
-# in the right place in the directory tree under tmppatch and
-# print its path on the standard output: 'installed-path'
-#
-[ $# -eq 4 ] || { error "Wrong number of arguments: $#" $FUNCNAME; return 1; }
-[ -d "${tmppatch}" ] ||
-{ error "tmppatch=$tmppatch: No such directory" $FUNCNAME; return 1; }
-local reqdir=$(pwd | sed -n 's#^.*\('$1/$2'\)#\1#p')
-[ "$reqdir" ] || { error "$(pwd): $1 $2 $3" $FUNCNAME; return 1; }
-mkdir -p ${tmppatch}/$reqdir || { error "mkdir" $FUNCNAME; return 1; }
-info "Writing patched requirements: $1 $2 $3" $FUNCNAME
-[ "$PACKEXTERNDBG" ] && cat $4 >&2
-cp -p $4 ${tmppatch}/$reqdir/requirements ||
-{ error "cp" $FUNCNAME; return 1; }
-echo ${tmppatch}/$reqdir/requirements
-}
-
-_mkname ()
-{
-#
-# Parameters: 'package' 'version' ['platform']
-# (bin noarch debuginfo)
-#
-[ $# -eq 2 -o $# -eq 3 ] || { error "Wrong number of arguments: $#" $FUNCNAME; return 1; }
-
-if [ $# -eq 2 -o "$3" == bin ]; then
- sed -e 's/[-.]/_/g' -e "s/${1}_${1}/${1}/" <<<${1}_${2}_${CMTCONFIG} || { error "sed" $FUNCNAME; return 1; }
-elif [ $3 = debuginfo ]; then
- sed -e 's/[-.]/_/g' -e "s/${1}_${1}/${1}/" <<<${1}_${2}_${CMTCONFIG}_debuginfo || { error "sed" $FUNCNAME; return 1; }
-else
- sed -e 's/[-.]/_/g' -e "s/${1}_${1}/${1}/" <<<${1}_${2}_${3} || { error "sed" $FUNCNAME; return 1; }
-fi
-}
-
-_bad_symlinks ()
-{
-#
-# Parameters: [FILE...]
-# Print on the standard output broken symlinks paths (format: 'path:' 'error message')
-# The error message format is different at least with find (GNU findutils) 4.4.2 (SLC6),
-# e.g,
-# find: File system loop detected; `dst/l_cur' is part of the same file system loop as `dst'.
-
-# better not to rely on it
-#
-find "$@" -follow 2>&1 >/dev/null | sed 's/^find:[ ]*//'
-# -L option is not supported by GNU find version 4.1.20 (SL4)
-# but supported by GNU find version 4.2.27 (SL5) and find on Mac OS X 10.5, 10.6
-# -follow supported by all (is deprecated on Mac OS X 10.5)
-#find -L "$@" 2>&1 >/dev/null | sed 's/^find:[ ]*//'
-#
-#find "$@" -follow -fprint /dev/null 2>&1 | sed 's/^find:[ ]*//'
-#find $* -follow -fprint /dev/null 2>&1 | sed 's/^find:[ ]*//'
-# [ -d $_s ] && symlinks -rv $_s | grep ^dangling >|$tmperr
-# if [ -s $tmperr ]; then
-# [ "$PACKEXTERNDBG" ] && cat $tmperr
-# { error "Symlinks below cannot be followed:" $FUNCNAME; cat $tmperr 1>&2; }
-# # does not work - bug in symlinks
-# #symlinks -rv $_d | grep ^dangling | cut -d' ' -f2 >|$tmperr
-# find $_d/ -noleaf | xargs file | grep broken | cut -d: -f1 >|$tmperr
-# [ "$PACKEXTERNDBG" ] && cat $tmperr
-# fi
-}
-
-_chk_links ()
-{
-[ -d "$1" ] || return 0
-local tmperr=$(mktemp -t tmp.XXXXXXXXXX) || return 1
-
-type symlinks >/dev/null || { warn "type" $FUNCNAME; return 0; }
-symlinks -rv $1 |
- awk -v tmperr=$tmperr '
- /^absolute|^other_fs|^dangling|^messy/ { print >tmperr; next }
- { print }
-' |
-while read line; do
-
-grep -q $(abspath $1) <<<"$(
- abspath $(
- awk '
- {
- if (substr($4, 1, 1) == "/") print $4
- else { n = split($2, a, "/")
- print substr($2, 1, length($2) - length(a[n])) $4 }
- }
- ' <<<$line
- )
-)" || echo $line >>$tmperr
-
-done
-
-[ -s $tmperr ] && { warn "Symlinks will not be followed:" $FUNCNAME; cat $tmperr >&2; }
-
-rm -f $tmperr || return 0
-}
-
-_tar_extern ()
-{
-#
-# Parameters: 'name'
-#
-[ $# -eq 1 ] || { error "Wrong number of arguments: $#" $FUNCNAME; return 1; }
-
-local n=${#src[*]}
-[ $n -gt 0 ] || return 0
-if [ ${uname} = Linux ]; then
- local tar_basic_opts="-v --owner=root --group=root --mode=u=rwX,go=rX --no-anchored --wildcards"
- noleaf=yes
-# group=yes
-else
- local tar_basic_opts="-v"
- unset noleaf
-# unset group
-fi
-
-local tar_cmd=tar
-#local tar_basic_opts="-v --owner=root ${group:+--group=root} --mode=u=rwX,go=rX --no-anchored --wildcards"
-#local tar_basic_opts="-v --owner=root --group=root --mode=u=rwX,go=rX --no-anchored --wildcards"
-#local tar_basic_opts="-v --owner=root --group=root --mode=u=rwX,go=rX"
-
-local fpath=${externcache}/kits/${1}.tar
-
-# create an empty archive to append to
-${tar_cmd} ${tar_basic_opts} -cf ${fpath} -T /dev/null 1>&2 ||
-{ error "${tar_cmd}" $FUNCNAME; return 1; }
-
-local empty_sum=$(sha1sum ${fpath}) || { error "sha1sum" $FUNCNAME; return 1; }
-
-cd ${tempcopydir} || { error "cd" $FUNCNAME; return 1; }
-#local n=${#src[*]}
-
-[ "${mode:-}" != dbg ] || unset debuginfo_suffix
-
-for (( i=0 ; i!=n ; i++ )) ; do
- #s=$(echo ${src[$i]} | sed 's#/\+$##')
- local s=$(sed 's#/\+$##' <<<${src[$i]}) || { error "sed" $FUNCNAME; return 1; }
- local d=$(sed 's#/\+$##' <<<${dst[$i]}) || { error "sed" $FUNCNAME; return 1; }
-
- rm -rf ${tempcopydir}/*
- [ -f $s -o -d $s ] || { error "$(stat -L $s 2>&1)" $FUNCNAME; continue; }
-
- if [ "${follow_symlinks}" ]; then
- warn "Following symlinks to pack '$s' as '$d'" $FUNCNAME
- mkdir -p $(dirname $d) || { error "mkdir" $FUNCNAME; continue; }
- ln -sf $s $d || { error "ln" $FUNCNAME; continue; }
-
- local tmperr=$(mktemp -t tmp.XXXXXXXXXX) || { error "mktemp" $FUNCNAME; continue; }
- _bad_symlinks $s >|$tmperr
- if [ -s $tmperr ]; then
- { error "Symlinks cannot be followed:" $FUNCNAME; cat $tmperr 1>&2; }
- _bad_symlinks $d | cut -d: -f1 >|$tmperr
- [ "$PACKEXTERNDBG" ] && cat $tmperr 1>&2
- fi
-
- ${tar_cmd} ${tar_basic_opts} -hrf ${fpath} \
- -X $tmperr \
- -X $scriptdir/extern-junk.ptn ${exclude_objfiles:+--exclude='*.o'} \
- ${debuginfo_suffix:+--exclude='*'${debuginfo_suffix}} \
- $d 1>&2 || { error "${tar_cmd}" $FUNCNAME; continue; }
-
- rm -f $tmperr
- elif [ . == $(dirname $d) ]; then
- [ -f $s ] && \
- { error "Cowardly refusing to pack '$s' as '$d' - no top directory" $FUNCNAME; continue; }
- ln -sf $s $d || { error "ln" $FUNCNAME; continue; }
- ${tar_cmd} ${tar_basic_opts} --no-recursion -hrf ${fpath} \
- -X $scriptdir/extern-junk.ptn ${exclude_objfiles:+--exclude='*.o'} \
- ${debuginfo_suffix:+--exclude='*'${debuginfo_suffix}} \
- $d 1>&2 || { error "${tar_cmd}" $FUNCNAME; continue; }
- find $d/ ${noleaf:+-noleaf} -mindepth 1 -maxdepth 1 | \
- ${tar_cmd} ${tar_basic_opts} -rf ${fpath} -T - \
- -X $scriptdir/extern-junk.ptn ${exclude_objfiles:+--exclude='*.o'} \
- ${debuginfo_suffix:+--exclude='*'${debuginfo_suffix}} \
- 1>&2 || { error "${tar_cmd}" $FUNCNAME; continue; }
-# find $d/ ${noleaf:+-noleaf} -mindepth 1 -maxdepth 1 | xargs \
-# ${tar_cmd} ${tar_basic_opts} -rf ${fpath} \
-# -X $scriptdir/extern-junk.ptn ${exclude_objfiles:+--exclude='*.o'} \
-# 1>&2 # || { error "${tar_cmd}" $FUNCNAME; return 1; }
-# case $? in
-# 123|124) error "${tar_cmd}" $FUNCNAME; continue ;;
-# 125|126|127|1) error "xargs" $FUNCNAME; continue ;;
-# esac
- [ ${uname} != Linux ] || _chk_links $s
- elif [ -f $s ]; then
- mkdir -p $(dirname $(dirname $d)) || { error "mkdir" $FUNCNAME; continue; }
- ln -sf $(dirname $s) $(dirname $d) || { error "ln" $FUNCNAME; continue; }
- ${tar_cmd} ${tar_basic_opts} -rf ${fpath} \
- -X $scriptdir/extern-junk.ptn ${exclude_objfiles:+--exclude='*.o'} \
- ${debuginfo_suffix:+--exclude='*'${debuginfo_suffix}} \
- $d 1>&2 || { error "${tar_cmd}" $FUNCNAME; continue; }
-
- [ -h $s ] &&
- warn "Symlink $s -> $(readlink $s) packed as '$d'" $FUNCNAME
- else
-# [ -h $s ] &&
- if [ -h $s ]; then
- warn "Following symlink $s -> $(readlink $s) to pack as '$d'" $FUNCNAME
- follow=yes
- else
- unset follow
- fi
- mkdir -p $(dirname $d) || { error "mkdir" $FUNCNAME; continue; }
- ln -sf $s $d || { error "ln" $FUNCNAME; continue; }
- ${tar_cmd} ${tar_basic_opts} --no-recursion -hrf ${fpath} \
- -X $scriptdir/extern-junk.ptn ${exclude_objfiles:+--exclude='*.o'} \
- ${debuginfo_suffix:+--exclude='*'${debuginfo_suffix}} \
- $d 1>&2 || { error "${tar_cmd}" $FUNCNAME; continue; }
- find $d/ ${noleaf:+-noleaf} ${follow:+-follow} -mindepth 1 -maxdepth 1 | \
- ${tar_cmd} ${tar_basic_opts} -rf ${fpath} -T - \
- -X $scriptdir/extern-junk.ptn ${exclude_objfiles:+--exclude='*.o'} \
- ${debuginfo_suffix:+--exclude='*'${debuginfo_suffix}} \
- 1>&2 || { error "${tar_cmd}" $FUNCNAME; continue; }
-# find $d/ ${noleaf:+-noleaf} -mindepth 1 -maxdepth 1 | xargs \
-# ${tar_cmd} ${tar_basic_opts} -rf ${fpath} \
-# -X $scriptdir/extern-junk.ptn ${exclude_objfiles:+--exclude='*.o'} \
-# 1>&2 #|| { error "${tar_cmd}" $FUNCNAME; return 1; }
-# case $? in
-# 123|124) error "${tar_cmd}" $FUNCNAME; continue ;;
-# 125|126|127|1) error "xargs" $FUNCNAME; continue ;;
-# esac
- [ ${uname} != Linux ] || _chk_links $s
-# _chk_links $s
- fi
-
-done
-cd $OLDPWD
-
-local payload_sum=$(sha1sum ${fpath}) || { error "sha1sum" $FUNCNAME; return 1; }
-if [ "$empty_sum" = "$payload_sum" ]; then
- info "Nothing to include: $fpath" $FUNCNAME
- rm -f ${fpath} || { error "rm" $FUNCNAME; return 1; }
- return 0
-fi
-
-gzip -vf ${fpath} >&2 || {
-rm -f ${fpath}
-error "gzip" $FUNCNAME; return 1; }
-}
-
-_tar_extern_debuginfo ()
-{
-#
-# Parameters: 'name'
-#
-[ $# -eq 1 ] || { error "Wrong number of arguments: $#" $FUNCNAME; return 1; }
-
-[ -n "${debuginfo_suffix-}" ] || return 0
-
-local n=${#src[*]}
-[ $n -gt 0 ] || return 0
-if [ ${uname} = Linux ]; then
- local tar_basic_opts="-v --owner=root --group=root --mode=u=rwX,go=rX --no-anchored --wildcards"
- noleaf=yes
-# group=yes
-else
- local tar_basic_opts="-v"
- unset noleaf
-# unset group
-fi
-
-local tar_cmd=tar
-#local tar_basic_opts="-v --owner=root ${group:+--group=root} --mode=u=rwX,go=rX --no-anchored --wildcards"
-#local tar_basic_opts="-v --owner=root --group=root --mode=u=rwX,go=rX --no-anchored --wildcards"
-#local tar_basic_opts="-v --owner=root --group=root --mode=u=rwX,go=rX"
-
-local fpath=${externcache}/kits/${1}.tar
-
-# create an empty archive to append to
-${tar_cmd} ${tar_basic_opts} -cf ${fpath} -T /dev/null 1>&2 ||
-{ error "${tar_cmd}" $FUNCNAME; return 1; }
-
-local empty_sum=$(sha1sum ${fpath}) || { error "sha1sum" $FUNCNAME; return 1; }
-
-cd ${tempcopydir} || { error "cd" $FUNCNAME; return 1; }
-#local n=${#src[*]}
-
-rm -rf ${tempcopydir}/*
-for (( i=0 ; i!=n ; i++ )) ; do
- #s=$(echo ${src[$i]} | sed 's#/\+$##')
- local s=$(sed 's#/\+$##' <<<${src[$i]}) || { error "sed" $FUNCNAME; return 1; }
- local d=$(sed 's#/\+$##' <<<${dst[$i]}) || { error "sed" $FUNCNAME; return 1; }
-
- [ -f $s -o -d $s ] || { error "$(stat -L $s 2>&1)" $FUNCNAME; continue; }
-
- if [ "${follow_symlinks}" ]; then
- warn "Following symlinks to pack '$s' as '$d'" $FUNCNAME
- mkdir -p $(dirname $d) || { error "mkdir" $FUNCNAME; continue; }
- ln -sfn $s $d || { error "ln" $FUNCNAME; continue; }
-
- local tmperr=$(mktemp -t tmp.XXXXXXXXXX) || { error "mktemp" $FUNCNAME; continue; }
- _bad_symlinks $s >|$tmperr
- if [ -s $tmperr ]; then
- { error "Symlinks cannot be followed:" $FUNCNAME; cat $tmperr 1>&2; }
- fi
-
- local tmplist=$(mktemp -t tmp.XXXXXXXXXX) || { error "mktemp" $FUNCNAME; continue; }
- find -L $d ${noleaf:+-noleaf} -name "*$debuginfo_suffix" -fprint $tmplist 2>/dev/null
- ${tar_cmd} ${tar_basic_opts} -hrf ${fpath} -T $tmplist 1>&2 ||
- { error "${tar_cmd}" $FUNCNAME; continue; }
-
- if [ "$PACKEXTERNDBG" ]; then
- echo "extern_debuginfo:" >&2
- cat $tmplist >&2
- fi
- rm -f $tmperr $tmplist
- elif [ -f $s ]; then
- [[ $d == *$debuginfo_suffix ]] || continue
- [ . != $(dirname $d) ] ||
- { error "Cowardly refusing to pack '$s' as '$d' - no top directory" $FUNCNAME; continue; }
-
- mkdir -p $(dirname $(dirname $d)) || { error "mkdir" $FUNCNAME; continue; }
- ln -sfn $(dirname $s) $(dirname $d) || { error "ln" $FUNCNAME; continue; }
- ${tar_cmd} ${tar_basic_opts} -rf ${fpath} \
- $d 1>&2 || { error "${tar_cmd}" $FUNCNAME; continue; }
-
- [ -h $s ] &&
- warn "Symlink $s -> $(readlink $s) packed as '$d'" $FUNCNAME
- else
- if [ -h $s ]; then
- warn "Following symlink $s -> $(readlink $s) to pack as '$d'" $FUNCNAME
- fi
- mkdir -p $(dirname $d) || { error "mkdir" $FUNCNAME; continue; }
- ln -sfn $s $d || { error "ln" $FUNCNAME; continue; }
-
- local tmplist=$(mktemp -t tmp.XXXXXXXXXX) || { error "mktemp" $FUNCNAME; continue; }
- find -H $d ${noleaf:+-noleaf} -name "*$debuginfo_suffix" -fprint $tmplist ||
- { error "find" $FUNCNAME; continue; }
- ${tar_cmd} ${tar_basic_opts} -rf ${fpath} -T $tmplist 1>&2 ||
- { error "${tar_cmd}" $FUNCNAME; continue; }
-
- if [ "$PACKEXTERNDBG" ]; then
- echo "extern_debuginfo:" >&2
- cat $tmplist >&2
- fi
- rm -f $tmplist
- fi
-
-done
-cd $OLDPWD
-
-local payload_sum=$(sha1sum ${fpath}) || { error "sha1sum" $FUNCNAME; return 1; }
-if [ "$empty_sum" = "$payload_sum" ]; then
- info "Nothing to include: $fpath" $FUNCNAME
- rm -f ${fpath} || { error "rm" $FUNCNAME; return 1; }
- return 0
-fi
-
-gzip -vf ${fpath} >&2 || {
-rm -f ${fpath}
-error "gzip" $FUNCNAME; return 1; }
-}
-
-_getver ()
-{
-#
-# Determine package version and print on the standard output
-# (empty if cannot be determined )
-#
-# Parameters: 'name'
-#
-local fpath=${externcache}/cache/${1}.pacman
-
-if [ -f $fpath ]; then
-sed -e '/^[ \t]*version(.*)[ \t]*$/!d' -e 's/version(//' -e 's/)[ \t]*$//' -e "s/['\"]//g" ${fpath} || { error "sed" $FUNCNAME; return 1; }
-fi
-}
-
-_pacman ()
-{
-#
-# Write pacman file
-#
-# Parameters: 'name' ['requires-file' ['postinstall-script' ['preinstall-script' ['version']]]]
-#
-local reqs fpath ver _ver
-
-fpath=${externcache}/cache/${1}.pacman
-
-if [ "$5" ]; then
- ver=$5
-else
- _ver=$(_getver ${1}) || { _ver=; warn "${fpath}: Version reset" $FUNCNAME; }
- ver=$(expr ${_ver:-0} + 1) ||
- { ver=1; warn "${fpath}: Version set to ${ver}" $FUNCNAME; }
-fi
-
-info "Writing ${fpath}, version ${ver}" $FUNCNAME
-
-# add dependencies
-if [ -s "$2" ]; then
-
-while read req rest; do
- reqs="${reqs}
-package('${req}')"
-done <${2}
-
-fi
-
-# write pacman file
-cat <<EOF >|${fpath}
-
-description('External Package ${1}')
-version('${ver}')
-${reqs}
-
-EOF
-
-# add preinstall-script
-if [ -s "$4" ]; then
- echo "shell('$(sed s/@INSTALL_PREFIX@/\$PACMAN_INSTALLATION/g $4)')" >>${fpath}
-fi
-
-if [ -f ${externcache}/kits/${1}.tar.gz ]; then
-
-cat <<EOF >>${fpath}
-
-downloadUntar('../kits/${1}.tar.gz')
-
-EOF
-else
- warn "${externcache}/kits/${1}.tar.gz: No such file" $FUNCNAME
-fi
-
-# add postinstall-script
-if [ -s "$3" ]; then
- echo "shell(\"$(sed s/@INSTALL_PREFIX@/\$PACMAN_INSTALLATION/g $3)\")" >>${fpath}
- #echo "shell('$(sed s/@INSTALL_PREFIX@/\$PACMAN_INSTALLATION/g $3)')" >>${fpath}
-fi
-}
-
-_add_opt_dep ()
-{
-#
-# for external dbg package
-# add dependency on opt mode package
-# as the former contains dbg mode ONLY
-# (to aviod files conflicts with the latter)
-#
-# Parameters: 'name' ['requires-file']
-#
- local name_opt=$(sed "s/dbg/opt/" <<<${1}) || { error "sed" $FUNCNAME; return 1; }
- if [ ${1} != "${name_opt}" ]; then
- if [ -f "${2:-}" ] && ! grep -q "${name_opt}" ${2}; then
- echo "${name_opt}" >>${2} || { error "echo" $FUNCNAME; return 1; }
- elif [ ! -f "${2:-}" ]; then
- echo "${name_opt}"
- fi
- [ -f ${externcache}/cache/${name_opt}.pacman ] &&
- [ -f ${externcache}/kits/${name_opt}.tar.gz ] ||
- warn "Not packed: ${name_opt}" $FUNCNAME
- fi
-}
-
-##################################### main ##########################################
-#info "$(date)" $FUNCNAME
-
-package=`cmt show macro_value package`
-project=`cmt show macro_value ${package}_project`
-release=`cmt show macro_value ${package}_project_release`
-
-if reqpatch=$(_patch ${project} ${release} ${package}); then
- export CMTUSERCONTEXT=$(dirname $reqpatch)
-else unset reqpatch
-fi
-
-# Check if there are external packages required
-for pkg in `cmt -q -tag_add=ATLAS show macro_value ${package}_requires`; do
- [ -f "${tmpreq:-}" ] || tmpreq=$(mktemp -t tmp.XXXXXXXXXX) || { error "mktemp" $FUNCNAME; exit 1; }
- echo "$pkg" >>$tmpreq || { error "echo" $FUNCNAME; exit 1; }
-done
-
-# Check if there is external software to pack
-export_paths=`cmt -q -tag_add=ATLAS show macro_value ${package}_export_paths`
-# Remove leading and trailing whitespace (to make the value empty if it was whitespace)
-src=(${export_paths})
-
-[ ${#src[*]} -gt 0 ] || [ -s "${tmpreq:-}" ] || exit 0
-#[ "$export_paths" ] || [ -s "$tmpreq" ] || exit 0
-
-export_paths=${src[*]}
-
-if [ -n "$export_paths" ]; then
-
-dst=($(cmt -q -tag_add=ATLAS,STANDALONE show macro_value ${package}_export_paths))
-dst=(${dst[*]#${SITEROOT}/})
-
-info "source:\n'${src[*]}'" $FUNCNAME
-info "destination:\n'${dst[*]}'" $FUNCNAME
-
-[ ${#src[*]} -eq ${#dst[*]} ] ||
-{ error "source # ${#src[*]}, destination # ${#dst[*]}" $FUNCNAME; exit 1; }
-
-debuginfo_suffix=$(cmt -q -tag_add=PACK,ATLAS show macro_value ${package}_debuginfo_suffix)
-
-if [ $# -eq 1 ] && [ -f "${1}" ]; then
- n=${#src[*]}
- for (( i=0 ; i!=n ; i++ )) ; do
- printf '%s\0%s\0%s\n' "${src[$i]}" "${dst[$i]}" "${debuginfo_suffix}" >>"${1}"
-# echo ${src[$i]} ${dst[$i]} >>"${1}"
- done
-fi
-
-fi
-
-if [ -s "${tmpreq:-}" ]; then
-info "requires:\n'$(<$tmpreq)'" $FUNCNAME
-fi
-
-native_version=`cmt -q -tag_add=PACK show macro_value ${package}_native_version`
-if [ -n "$native_version" ]; then
- if [ LCG_Interfaces = "$(cmt -q show macro_value ${package}_offset)" ] || \
- cmt -q show uses|grep -q -F -w LCG_Interfaces; then
- LCG_config_version=$(cmt -q show macro_value LCG_config_version)
- _LCG_config_version=$(echo ${LCG_config_version}|sed -n 's/^\([[:digit:]]\{1,\}\).*/\1/p')
- if [ -n "${_LCG_config_version}" ] && [ ${_LCG_config_version} -ge 68 ] && \
- [ -n "$export_paths" ] && echo "${dst[*]}"|grep -q -F "/LCG_${LCG_config_version}/" && \
- ! echo "$native_version"|grep -q -F "_lcgcmt${LCG_config_version}"; then
- version=${native_version}_lcgcmt${LCG_config_version}
- fi
- fi
- [ -z ${version+t} ] && version=$native_version
-else
-version=`cmt show macro_value version`
-[ "${version}" = "v*" ] &&
-{ warn "Invalid CMT package version: $version: $project $release $package" $FUNCNAME;
-version=v1; }
- warn "Macro ${package}_native_version unspecified: $project $release $package $version" $FUNCNAME
-fi
-
-platform=`cmt -q -tag_add=PACK show macro_value ${package}_platform`
-
-#
-# Need to handle dbg mode
-#
-if [ -n "$export_paths" ] && [[ ${CMTCONFIG} == *dbg* ]] && [[ "${dst[*]}" != *dbg* ]] && [ -z $platform ]; then
-#if [[ ${CMTCONFIG} == *dbg* ]] && [[ "${export_paths}" != *dbg* ]] && [ -z $platform ]; then
- info "No debug build available, using optimised" $FUNCNAME
- platform=$(sed 's/dbg/opt/' <<<${CMTCONFIG}) ||
- { error "sed" $FUNCNAME; exit 1; }
-fi
-
-if [ -n "$export_paths" ] && [[ ${CMTCONFIG} == *dbg* ]] && [ -z ${platform} ]; then
- n=${#src[*]}
- for (( i=0 ; i!=n ; i++ )) ; do
- if [[ ${dst[$i]} != *dbg* ]]; then
- #
- # Pack dbg mode ONLY into external dbg tarball
- #
- [ -f "${tmpreq:-}" ] || tmpreq=$(mktemp -t tmp.XXXXXXXXXX) || { error "mktemp" $FUNCNAME; exit 1; }
- _add_opt_dep $(_mkname $package $version $platform) ${tmpreq} || exit 1
- # _add_opt_dep ${name} ${tmpreq} || exit 1
- info "Skipped non-debug path: ${dst[$i]}" $FUNCNAME
- unset src[$i] dst[$i]
- fi
- done
- # After possibly unsetting some array member(s) with path(s) to skip
- # still want array members to be indexed contiguously
- src=(${src[*]})
- dst=(${dst[*]})
-fi
-
-follow_symlinks=`cmt -q -tag_add=PACK show macro_value ${package}_follow_symlinks`
-include_objfiles=`cmt -q -tag_add=PACK show macro_value ${package}_include_objfiles`
-if [ -n "$include_objfiles" ]; then
- unset exclude_objfiles
-else
- exclude_objfiles=yes
-fi
-if [ -n "$export_paths" ] &&
- [ "${debuginfo}" = yes ] && [ -n "${debuginfo_suffix}" ] && [[ ${CMTCONFIG} != *dbg* ]]; then
- do_debuginfo=yes
-else
- unset do_debuginfo
-fi
-
-if [ "${do_debuginfo:-}" = yes ]; then
-# name=`_mkname $package $version $platform`
- if [ -n "${platform:-}" ]; then
- platform_debuginfo=${platform}_debuginfo
- [ "${platform}" != noarch ] ||
- warn "${package}_platform set to noarch and ${package}_debuginfo_suffix to non-empty" $FUNCNAME
- fi
- echo "$(_mkname $package $version $platform)" "$package" "$version" "$(_mkname $package $version ${platform_debuginfo:-${CMTCONFIG}_debuginfo})" || exit 1
- # echo "$(_mkname $package $version $platform)" "$package" "$version" "$(_mkname $package $version ${platform_debuginfo:-debuginfo})" || exit 1
-else
- echo "$(_mkname $package $version $platform)" "$package" "$version" || exit 1
-fi
-
-for pltfm in bin debuginfo; do
- [ ${pltfm} = debuginfo ] && [ "${do_debuginfo:-}" != yes ] && continue
-
- if [ ${pltfm} = bin ]; then
- name=$(_mkname $package $version $platform) || exit 1
- elif [ ${pltfm} = debuginfo ]; then
- name=$(_mkname $package $version ${platform_debuginfo:-${CMTCONFIG}_debuginfo}) || exit 1
- # name=$(_mkname $package $version ${platform_debuginfo:-debuginfo}) || exit 1
- fi
-
- fpath=${externcache}/cache/$name.pacman
- if [ -f $fpath -a "${overwrite}" != yes ]; then
-
- info "Existing $fpath will not be overwritten" $FUNCNAME
-
- if [ "${verify}" = yes ]; then
- spath=${externcache}/kits/$name.tar.gz
- if [ -f $spath -a -n "${src[*]}" ]; then
- newer ${follow_symlinks:+-L} -p $spath ${src[*]}
- elif [ -f $spath -a -z "${src[*]}" ]; then
- warn "$spath: No 'export_paths' to verify" $FUNCNAME
- elif [ ! -f $spath -a -n "${src[*]}" ]; then
- error "$spath: No such file" $FUNCNAME
- fi
- fi
-
- else
-
- tempcopydir=$(mktemp -d -t tmp.XXXXXXXXXX) || { error "mktemp" $FUNCNAME; exit 1; }
- if [ ${pltfm} = bin ]; then
- _tar_extern $name || { \rm -rf $tempcopydir; exit 1; }
- elif [ ${pltfm} = debuginfo ]; then
- _tar_extern_debuginfo ${name} || { \rm -rf $tempcopydir; exit 1; }
- fi
- _pacman ${name} ${tmpreq:-} || { \rm -rf $tempcopydir; exit 1; }
- \rm -rf $tempcopydir
-
- fi
- [ ! -f $PACKRPM/bin/pack-rpm-extern.sh ] || . $PACKRPM/bin/pack-rpm-extern.sh || exit 1
-done
diff --git a/PackDist/scripts/pack-find.py b/PackDist/scripts/pack-find.py
deleted file mode 100755
index adf612ca9133..000000000000
--- a/PackDist/scripts/pack-find.py
+++ /dev/null
@@ -1,195 +0,0 @@
-#!/usr/bin/env python
-
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-"""File: pack-find.py
-
-Usage: pack-find.py [OPTION]... PATH...
-Search directory tree rooted at each filename PATH for ${CMTCONFIG} directories,
-pathnames matching any of shell patterns, supplied in files 'src.ptn', 'doc.ptn'
-in directory ${scriptdir}, excluding any other directories listed in file
-'platforms' or pathnames matching any of shell patterns in file 'junk.ptn' and
-writing pathnames into files specified with relevant options or on standard output,
-followed by a newline.
-
- --bin-file=BINFILE file for CMTCONFIG value binary directories pathnames
- --src-file=SRCFILE file for source code pathnames matching list of patterns in src.ptn
- --doc-file=DOCFILE file for documentation pathnames matching list of patterns in doc.ptn
- --noarch-file=NOARCHFILE file for any other pathnames except for directories
- --dirs-file=DIRSFILE file for any other directories
- -d, --debug print lots of debugging information
- -h, --help display this help and exit
- --version output version information and exit
-
-Report bugs to <Grigori.Rybkine@cern.ch>.
-"""
-
-__version__ = '0.1.0'
-__date__ = 'Sat Feb 06 2010'
-__author__ = 'Grigory Rybkin'
-
-import sys, os
-import getopt
-from os.path import join, islink, basename
-from fnmatch import fnmatch
-import logging
-
-class ProjectFiles(object):
- def __init__(self):
- self.cmtconfig = os.environ['CMTCONFIG']
- self.scriptdir = os.environ['scriptdir']
- self.types = ['bin', 'src', 'doc', 'noarch', 'dirs']
- for t in self.types:
- setattr(self, t, list())
- setattr(self, 'f' + t, None)
-
- def _init(self):
- platforms = open(join(self.scriptdir, 'platforms'))
- # platforms to skip - all but ${CMTCONFIG}
- self.platforms = [p for p in [p.strip() for p in platforms.readlines()]
- if p != self.cmtconfig]
- platforms.close()
- logger.debug(self.platforms)
-
- def gen_expr(s):
- ptn = []
- for l in s.splitlines():
- ptn.append(l)
- if not l.startswith('*'):
- ptn.append(join('*', l))
- logger.debug(ptn)
- return ptn
- def init_ptn(obj, name):
- f = open(join(obj.scriptdir, name + '.ptn'))
- setattr(obj, name + '_ptn', gen_expr(f.read()))
- f.close()
-
- for name in ['junk', 'src', 'doc']:
- init_ptn(self, name)
-
- def walk(self, top):
- self._init()
-
- def onerror(e):
- logger.error(e)
- Errno.set(e.errno)
-
- for root, dirs, files in os.walk(top, onerror = onerror):
- for n in dirs + files:
- p = join(root, n)
- # platforms to skip - all but ${CMTCONFIG}
- if n in self.platforms:
- if n in dirs and not islink(p): dirs.remove(n)
- continue
- # platform to pack - ${CMTCONFIG}
- if n == self.cmtconfig:
- self.bin.append(p)
- if n in dirs and not islink(p): dirs.remove(n)
-# if n in dirs: dirs.remove(n)
- continue
- # exclude junk (print nothing)
- m = False
- for ptn in self.junk_ptn:
- if fnmatch(p, ptn):
- m = True
- break
- if m: continue
- if n in files or islink(p):
- # source code
- for ptn in self.src_ptn:
- if fnmatch(p, ptn):
- m = True
- self.src.append(p)
- break
- if m: continue
- # documentation files
- for ptn in self.doc_ptn:
- if fnmatch(p, ptn):
- m = True
- self.doc.append(p)
- break
- if m: continue
- # anything else - noarch files
- self.noarch.append(p)
- else:
- # ALL directories
- self.dirs.append(p)
- return Errno.errno
-
- def fprint(self):
- def write(obj, name):
- try:
- if getattr(obj, 'f' + name):
- f = open(getattr(obj, 'f' + name), 'w')
- for line in getattr(obj, name):
- f.write(line + '\n')
- f.close()
- else:
- for line in getattr(obj, name):
- sys.stdout.write(line + '\n')
- except IOError, e:
- logger.error(e)
- Errno.set(e.errno)
-
- for t in self.types:
- write(self, t)
-
-class Errno:
- def set(code):
- Errno.errno = code
- set = staticmethod(set)
- errno = 0
-
-def help():
- print sys.modules[__name__].__doc__
-
-def main(argv=[__name__]):
- self = basename(argv[0])
- try:
- opts, args = getopt.getopt(argv[1:],
- "hd",
- ["bin-file=", "src-file=", "doc-file=",
- "noarch-file=", "dirs-file=",
- "help", "version", "debug"])
- except getopt.error, e:
- print >>sys.stderr, '%s: %s' % (self, str(e))
- print >>sys.stderr, "Try '%s --help' for more information." % self
- return 1
-
- global logger
- logging.basicConfig()
- logger = logging.getLogger(self)
- logger.setLevel(logging.INFO)
-
- pfs = ProjectFiles()
-
- for o, v in opts:
- if o in ("-h", "--help"):
- print sys.modules[__name__].__doc__
- return 0
- elif o in ("--version",):
- print '%s %s (%s)' % (self, __version__, __date__)
- print '%sWritten by %s.' % (os.linesep, __author__)
- return 0
- elif o in ("-d", "--debug"):
- logger.setLevel(logging.DEBUG)
- else:
- for type in pfs.types:
- if o == '--' + type + '-file':
- setattr(pfs, 'f' + type, v)
- logger.debug('set %r to %r' % (o, v))
-
- if not args:
- args = [os.curdir]
-# print >>sys.stderr, '%s: missing path argument' % self
-# print >>sys.stderr, "Try '%s --help' for more information." % self
-# return 1
-
- for arg in args:
- pfs.walk(arg)
-# if 0 != Errno.errno: return 1
- pfs.fprint()
- if 0 != Errno.errno: return 1
- else: return 0
-
-if __name__ == '__main__':
- sys.exit(main(sys.argv))
diff --git a/PackDist/scripts/pack-proj.sh b/PackDist/scripts/pack-proj.sh
deleted file mode 100755
index 3af67c9b4c4c..000000000000
--- a/PackDist/scripts/pack-proj.sh
+++ /dev/null
@@ -1,1700 +0,0 @@
-#!/bin/bash
-# File: pack-proj.sh
-#
-# Pack project in five parts:
-# binary platform - corresponds to CMTCONFIG value
-# debuginfo files (for not debug build)
-# source code
-# documentation files
-# other architecture independent files
-#
-# Author: Grigori Rybkine <Grigori.Rybkine@cern.ch>.
-#
-
-[ "$PACKPROJDEBUG" ] && set -x
-
-: ${projbase:?}
-: ${project:?} ${release:?}
-#: ${platform:?}
-: ${projcache:?} # ${upgrade:?} #${patchdir:?} ${overwrite:?}
-
-: ${scriptdir:?}
-. $scriptdir/pack-common.sh
-
-: ${cmthome:?}
-: ${cmtcache:?}
-
-# : ${requires:?}
-#[ -f "$requires" ] || requires=$(mktemp) || return 1
-
-: ${externcache:?} ${patchdir:?} ${overwrite:?}
-
-: ${CMTCONFIG:?}
-
-##################################### functions #####################################
-_mktmpdir ()
-{
-#
-# Make temporary directory, set 'tmpdir' and,
-# if possible, the TMPDIR environment variable to it
-#
-# (the latter allows to call mktemp(1) with specifying no template
-# and have all temporary files rooted in 'tmpdir')
-#
-# Parameters: ['directory' in which to place the temporary directory]
-#
-
-#: ${builddir:?}
-#[ -d "$builddir" ] || builddir=$(mktemp -d) || return 1
-if [ -d "${1}" ]; then
- tmpdir=$(mktemp -d ${1}/pack.$$.XXXXXXXXXX) || return 1
-else # make temp dir in TMPDIR, if set, or in /tmp
- tmpdir=$(mktemp -dt pack.$$.XXXXXXXXXX) || return 1
-fi
-
-#trap 'rm -rf $tmpdir; exit 1' 1 2 15
-trap 'rm -rf $tmpdir; exit 1' 2 15
-
-# want all temp files in 'tmpdir'
-export TMPDIR=$tmpdir ||
-warn "Temporary directory may not be cleaned up on completion: $TMPDIR" $FUNCNAME
-tmppatch=$tmpdir/patch
-mkdir $tmppatch || { error "mkdir" $FUNCNAME; return 1; }
-if [ -n "${PACKRPM:-}" ]; then
- builddir=$tmpdir/BUILD
- mkdir ${builddir} || { error "mkdir" $FUNCNAME; return 1; }
- export builddir || { error "export" $FUNCNAME; return 1; }
- buildrootdir=$tmpdir/BUILDROOT
- mkdir ${buildrootdir} || { error "mkdir" $FUNCNAME; return 1; }
- export buildrootdir || { error "export" $FUNCNAME; return 1; }
- if [ -z "${specdir+T}" ]; then # specdir is unset
- specdir=$tmpdir/SPECS
- mkdir ${specdir} || { error "mkdir" $FUNCNAME; return 1; }
- export specdir || { error "export" $FUNCNAME; return 1; }
- fi
-fi
-}
-
-_mkname ()
-{
-#
-# Parameters: 'project' 'release' 'platform'
-# (bin src doc noarch debuginfo)
-#
-if [ $3 == bin ]; then
- sed 's/[-.]/_/g' <<<${1}_${2}_${CMTCONFIG} || { error "sed" $FUNCNAME; return 1; }
-elif [ $3 == debuginfo ]; then
- sed 's/[-.]/_/g' <<<${1}_${2}_${CMTCONFIG}_debuginfo || { error "sed" $FUNCNAME; return 1; }
-else
- sed 's/[-.]/_/g' <<<${1}_${2}_${3} || { error "sed" $FUNCNAME; return 1; }
-fi
-}
-
-_mkver ()
-{
-#
-# Make package version and print on the standard output
-#
-# Parameters: ['version']
-#
-local ver
-
-ver=$(awk '
-{ n=split($0, a, /[-vrp.]/)
-for (i=1; i<=n; i++) {
- if (a[i] ~ /[[:digit:]]+/)
- if (v != "") v=v"."a[i]
- else v=a[i]
-}
-print v }
-' <<<"$1")
-echo ${ver:-0}
-}
-
-_getver ()
-{
-#
-# Determine package version and print on the standard output
-# (empty if cannot be determined )
-#
-# Parameters: 'name'
-#
-local fpath
-
-fpath=${projcache}/cache/${1}.pacman
-
-#[ -f $fpath ] || { echo 0; return; }
-[ -f $fpath ] || return 0
-sed -e '/^[ \t]*version(.*)[ \t]*$/!d' -e 's/version(//' -e 's/)[ \t]*$//' -e "s/['\"]//g" $fpath || { error "sed" $FUNCNAME; return 1; }
-# [ "$_ver" ] && { echo $_ver; return; }
-# echo 0
-}
-
-_mkcntnr ()
-{
-#
-# Parameters: 'project'
-# Print on the standard output: 'container' (container-name [access-path])
-#
-[ $# -eq 1 ] || { error "Wrong number of arguments: $#" $FUNCNAME; return 1; }
-case $1 in
- LCGCMT) echo LCG_Release ;;
- Gaudi) echo Gaudi ;;
- Atlas?*) echo ${1}Release ;;
- tdaq-common) echo TDAQCRelease ;;
- dqm-common) echo DQMCRelease ;;
- *) error "Unknown project: $1" $FUNCNAME; return 1 ;;
-esac
-}
-
-_getcntnr ()
-{
-#
-# Parameters: 'project-release-directory' 'project' 'release'
-# Print on the standard output: 'container' (container-name [access-path])
-#
-[ $# -eq 3 ] || { error "Wrong number of arguments: $#" $FUNCNAME; return 1; }
-local -a cntnr
-if [ -f $1/cmt/project.cmt ]; then
-# determine which package is container
-cntnr=($(awk '$1 == "container" && $2 ~ /./ { print $2, $4; exit }' $1/cmt/project.cmt))
-case ${#cntnr[*]} in
- 0) warn "No container specification: $1/cmt/project.cmt" $FUNCNAME; return 1 ;;
- 1) : ;;
- 2) cntnr[1]=$(sed 's#/*$#/#' <<<${cntnr[1]}) ;;
- *) error "Invalid container specification: ${cntnr[*]}: $1/cmt/project.cmt" $FUNCNAME
- return 1 ;;
-esac
-echo ${cntnr[*]}
-# case ${#cntnr[*]} in
-# 0) warn "Cannot determine container package of $2 $3 ($1)" $FUNCNAME
-# cntnr=($(_mkcntnr $2)) || return 1 ;;
-# 1) : ;;
-# # 1) cntnr[1]=. ;;
-# 2) cntnr[1]=$(sed 's#/*$#/#' <<<${cntnr[1]}) ;;
-# *) error "Wrong container package specification for $2 $3 ($1): ${cntnr[*]}" $FUNCNAME
-# return 1 ;;
-# esac
-local proj=$(awk '$1 == "project" && $2 ~ /./ { print $2; exit }' $1/cmt/project.cmt)
-[ "$proj" ] || warn "No project specification: $1/cmt/project.cmt" $FUNCNAME
-else
- error "$1/cmt/project.cmt: No such file" $FUNCNAME; return 1
-fi
-}
-
-_gen_expr ()
-{
-#
-# Parameters: 'patterns-file'...
-# Print on the standard output `find' expression which is true for any pathname matching
-# any of the patterns in 'patterns-file'...
-#
-[ $# -ge 1 ] || { error "Wrong number of arguments: $#" $FUNCNAME; return 1; }
-awk '
-BEGIN { expr = " (" }
-{ if (NR != 1) expr = expr " -o"
- if (substr($1, 1, 1) != "*") expr = expr " -path */"$1
- else expr = expr " -path "$1
-}
-END { print expr " )" }
-' "$@" || { error "awk" $FUNCNAME; return 1; }
-}
-
-_prep_lists ()
-{
-#
-# Parameters: 'project-release-directory' 'project' 'release'
-# 'bin-file' 'src-file' 'doc-file' 'noarch-file'
-# 'dirs-file' 'debuginfo-file'
-#
-[ $# -eq 9 ] || { error "Wrong number of arguments: $#" $FUNCNAME; return 1; }
-
-if [ ${uname} = Linux ]; then
-
-local tmppltfms=$(mktemp -t tmp.XXXXXXXXXX) || { error "mktemp" $FUNCNAME; return 1; }
-cp $scriptdir/platforms $tmppltfms || { error "cp" $FUNCNAME; return 1; }
-sed '\%^'${CMTCONFIG}'$%d' ${tmppltfms} >${tmppltfms}.tmp ||
-{ error "sed" $FUNCNAME; return 1; }
-mv -f ${tmppltfms}.tmp ${tmppltfms} || { error "mv" $FUNCNAME; return 1; }
-#sed -i '\%^'${CMTCONFIG}'$%d' ${tmppltfms} || { error "sed" $FUNCNAME; return 1; }
-
-local opts=-noleaf
-local _expr
-
-# platforms to skip - all but ${CMTCONFIG}
-_expr="$opts $(
-awk '
-BEGIN { expr = "(" }
-{ if (NR != 1) expr = expr " -o"
- expr = expr " -name "$1
-}
-END { print expr " ) -prune" }
-' $tmppltfms
-)" || { error "awk" $FUNCNAME; return 1; }
-
-# platform to pack - ${CMTCONFIG}
-_expr="$_expr -o -name $CMTCONFIG -prune -fprint $4"
-
-# exclude junk (print nothing)
-_expr="$_expr -o $(_gen_expr $scriptdir/junk.ptn)" || return 1
-
-# source code
-_expr="$_expr -o ! -type d $(_gen_expr $scriptdir/src.ptn) -fprint $5" || return 1
-
-# documentation files
-_expr="$_expr -o ! -type d $(_gen_expr $scriptdir/doc.ptn) -fprint $6" || return 1
-
-# anything else - noarch files and ALL directories
-_expr="$_expr -o ! -type d -fprint $7 -o -fprint $8"
-# anything else - after a cleanup - noarch files
-#_expr="$_expr -o ( ! -type d -o -empty ) -fprint $7"
-
-fi # end Linux
-
-cd $(dirname $(dirname $1)) || { error "cd" $FUNCNAME; return 1; }
-
-local projdir
-if [ $2 == AtlasRelease ]; then
-# projdir=dist
- projdir=$(basename $(dirname $1))
-else
- projdir=$2
-fi
-
-if [ ${uname} = Linux ]; then
-
-set -f
- find ${projdir}/$3/ $_expr || { error "find" $FUNCNAME; return 1; }
-set +f
-
-else
-
-$scriptdir/pack-find.py --bin-file=$4 --src-file=$5 --doc-file=$6 --noarch-file=$7 --dirs-file=$8 ${projdir}/$3/ || return 1
-
-fi # end Linux
-
-if [ -n "${debuginfosuffix:-}" ] && [ "${mode:-}" != dbg ]; then
- if [ -s $4 ]; then
- xargs sh -c 'find "$@" -name "*$debuginfosuffix"' find <$4 >>$9
- #xargs -I % find % -name "*$debuginfosuffix" <$4 >>$9
- case $? in
- 123|124) error "find" $FUNCNAME; return 1 ;;
- 125|126|127|1) error "xargs" $FUNCNAME; return 1 ;;
- esac
- fi
-fi
-
-cd $OLDPWD || { error "cd" $FUNCNAME; return 1; }
-
-[ -s $4 ] || warn "No binaries: $1 $2 $3" $FUNCNAME
-[ -s $5 ] || warn "No source code: $1 $2 $3" $FUNCNAME
-[ -s $6 ] || warn "No documentation: $1 $2 $3" $FUNCNAME
-[ -s $7 ] || warn "No noarch: $1 $2 $3" $FUNCNAME
-[ -s $8 ] || warn "No directories: $1 $2 $3" $FUNCNAME
-if [ "${debuginfo:-}" = yes ] && [ "${mode:-}" != dbg ]; then
- [ -s $9 ] || warn "No debuginfo: $1 $2 $3" $FUNCNAME
-fi
-
-if [ "$PACKPROJDEBUG" ]; then
- echo "binaries:" >&2
- cat $4 >&2
- echo "source code:" >&2
- cat $5 >&2
- echo "documentation:" >&2
- cat $6 >&2
- echo "noarch:" >&2
- cat $7 >&2
- echo "directories:" >&2
- cat $8 >&2
- echo "debuginfo:" >&2
- cat $9 >&2
-fi
-
-rm -f $tmppltfms || return 0
-}
-
-_prep_lists_ ()
-{
-#
-# Parameters: 'project-release-directory' 'project' 'release'
-# 'bin-file' 'src-file' 'doc-file' 'noarch-file'
-# 'dirs-file'
-#
-[ $# -eq 8 ] || { error "Wrong number of arguments: $#" $FUNCNAME; return 1; }
-
-local tmppltfms=$(mktemp -t tmp.XXXXXXXXXX) || { error "mktemp" $FUNCNAME; return 1; }
-cp $scriptdir/platforms $tmppltfms || { error "cp" $FUNCNAME; return 1; }
-sed -i '\%^'${CMTCONFIG}'$%d' ${tmppltfms} || { error "sed" $FUNCNAME; return 1; }
-
-local opts=-noleaf
-local _expr
-
-# platforms to skip - all but ${CMTCONFIG}
-_expr="$opts $(
-awk '
-BEGIN { expr = "(" }
-{ if (NR != 1) expr = expr " -o"
- expr = expr " -name "$1
-}
-END { print expr " ) -prune" }
-' $tmppltfms
-)"
-
-# platform to pack - ${CMTCONFIG}
-_expr="$_expr -o -name $CMTCONFIG -prune -fprint $4"
-
-# exclude junk
-_expr="$_expr -o $(
-awk '
-BEGIN { expr = " (" }
-{ if (NR != 1) expr = expr " -o"
- if (substr($1, 1, 1) != "*") expr = expr " -path */"$1
- else expr = expr " -path "$1
-}
-END { print expr " )" }
-' $scriptdir/junk.ptn
-)"
-# print nothing
-
-# source code
-_expr="$_expr -o $(
-awk '
-BEGIN { expr = "! -type d (" }
-{ if (NR != 1) expr = expr " -o"
- if (substr($1, 1, 1) != "*") expr = expr " -path */"$1
- else expr = expr " -path "$1
-}
-END { print expr " )" }
-' $scriptdir/src.ptn
-)"
-_expr="$_expr -fprint $5"
-#_expr="$_expr -fprint $5 -fprintf $8 %h\n" # file's directory
-
-# documentation files
-_expr="$_expr -o $(
-awk '
-BEGIN { expr = "! -type d (" }
-{ if (NR != 1) expr = expr " -o"
- if (substr($1, 1, 1) != "*") expr = expr " -path */"$1
- else expr = expr " -path "$1
-}
-END { print expr " )" }
-' $scriptdir/doc.ptn
-)"
-_expr="$_expr -fprint $6"
-
-# anything else - after a cleanup - noarch files and ALL directories
-_expr="$_expr -o ! -type d -fprint $7 -o -fprint $8"
-# anything else - after a cleanup - noarch files
-#_expr="$_expr -o ( ! -type d -o -empty ) -fprint $7"
-
-cd $1/../.. || { error "cd" $FUNCNAME; return 1; }
-set -f
-if [ $2 == AtlasRelease ]; then
-# find dist/$3 $_expr || return 1
- find $(basename $(dirname $1))/$3 $_expr || { error "find" $FUNCNAME; return 1; }
-else
- find $2/$3 $_expr || { error "find" $FUNCNAME; return 1; }
-fi
-set +f
-cd $OLDPWD || { error "cd" $FUNCNAME; return 1; }
-
-[ -s $5 ] || warn "No source code: $1 $2 $3" $FUNCNAME
-[ -s $6 ] || warn "No documentation: $1 $2 $3" $FUNCNAME
-
-[ "$PACKPROJDEBUG" ] && cat $8 >&2
-
-rm -f $tmppltfms || return 0
-}
-
-_prep_extern_debuginfo_list ()
-{
-#
-# Parameters: 'project-release-directory' 'project' 'release' 'exps-file'
-# 'debuginfo-file'
-#
-[ $# -eq 5 ] || { error "Wrong number of arguments: $#" $FUNCNAME; return 1; }
-
-local tmpptns=$(mktemp -t tmp.XXXXXXXXXX) || { error "mktemp" $FUNCNAME; return 1; }
-awk '
-BEGIN { FS = "\0" }
-{ if ($3 != "") sfxs[$3] = 1 }
-END { for (sfx in sfxs) print "*"sfx }
-' "$4" <&- >> $tmpptns || { error "awk" $FUNCNAME; return 1; }
-
-[ -s $tmpptns ] || { >| $5; return 0; }
-
-local _expr
-_expr="${noleaf:+-noleaf} $(_gen_expr $tmpptns) -fprint $5" || return 1
-
-cd $1/${cntnr[1]}${cntnr[0]}/${verdir}cmt || { error "cd" $FUNCNAME; return 1; }
-local installarea_prefix
-installarea_prefix=$(cmt show macro_value ${2}_installarea_prefix) || { error "cmt" $FUNCNAME; return 1; }
-cd $OLDPWD || { error "cd" $FUNCNAME; return 1; }
-
-cd $(dirname $(dirname $1)) || { error "cd" $FUNCNAME; return 1; }
-local projdir
-if [ $2 == AtlasRelease ]; then
-# projdir=dist
- projdir=$(basename $(dirname $1))
-else
- projdir=$2
-fi
-set -f
- find ${projdir}/$3/${installarea_prefix} $_expr || { error "find" $FUNCNAME; return 1; }
-set +f
-cd $OLDPWD || { error "cd" $FUNCNAME; return 1; }
-
-[ -s $5 ] || info "No extern_debuginfo: $1 $2 $3" $FUNCNAME
-
-if [ "$PACKPROJDEBUG" ]; then
- echo "extern_debuginfo:" >&2
- cat $5 >&2
-fi
-
-rm -f $tmpptns || return 0
-}
-
-_clean ()
-{
-#
-# Parameters: 'project-release-directory' 'project' 'release'
-#
-[ $# -eq 3 ] || { error "Wrong number of arguments: $#" $FUNCNAME; return 1; }
-local projdir
-
-if [ $2 == AtlasRelease ]; then
-# projdir=dist
- projdir=$(basename $(dirname $1))
-else
- projdir=$2
-fi
-
-rm -rf $tmpdir/${projdir}/$3 || { error "rm" $FUNCNAME; return 1; }
-}
-
-_copy ()
-{
-#
-# Usage: _copy [OPTION]... 'project-release-directory' 'project' 'release' 'names-file'...
-#
-# -n do not recursively descend directories
-# -r recursively descend directories (the default)
-# -x PATTERN exclude files that match PATTERN
-# -X FILE exclude files that match any pattern in FILE
-#
-local opts exclude exclude_from
-OPTIND=1
-while getopts "nrx:X:" opt; do
- case $opt in
- n) opts=--no-recursion ;;
- r) opts=--recursion ;;
- x) exclude="${OPTARG}" ;;
- X) exclude_from="${OPTARG}" ;;
- \?) error "Invalid option: -${OPTARG}" $FUNCNAME; return 1 ;;
- :) error "Argument required for option: -${OPTARG}" $FUNCNAME; return 1 ;;
- esac
-done
-
-shift $(($OPTIND - 1))
-[ $# -ge 4 ] || { error "Wrong number of arguments: $#" $FUNCNAME; return 1; }
-
-cd $(dirname $(dirname $1)) || { error "cd" $FUNCNAME; return 1; }
-shift 3
-
-#local tmperr=$(mktemp -t tmp.XXXXXXXXXX) || { error "mktemp" $FUNCNAME; return 1; }
-
-local list sc
-for list; do
-[ -s $list ] || continue
-
-# want to check exit status of the first tar in the pipe
-exec 3>&1 || { error "exec" $FUNCNAME; return 1; }
-sc=`((tar ${tar_basic_opts} ${opts} -cf - \
- -X $scriptdir/pltfm-junk.ptn \
- -X $scriptdir/extern-junk.ptn \
- ${exclude_from:+-X "${exclude_from}"} \
- ${exclude:+--exclude="${exclude}"} \
- -T $list 3>&- 4>&-; echo $? >&4) | \
- tar ${opts} -C $tmpdir -xf - >&3 3>&- 4>&-) 4>&1 >&-` ||
-{ warn "Disk space on the filesystem of $tmpdir:
-$(cat $list|duf -p $tmpdir)" $FUNCNAME
-exec 3>&-
-error "tar" $FUNCNAME; return 1; }
-exec 3>&-
-[ $sc -eq 0 ] || { error "tar" $FUNCNAME; return 1; }
-
-# BSDTAR issues on stderr
-# tar: getpwuid(XXXXX) failed: No such file or directory
-# if no matching entry for user uid XXXXX is found in password database
-# GNUTAR does NOT
-done
-
-#rm -f $tmperr
-cd $OLDPWD || { error "cd" $FUNCNAME; return 1; }
-}
-
-_copy_ ()
-{
-#
-# Parameters: 'project-release-directory' 'project' 'release' 'names-file'
-#
-[ $# -eq 4 ] || { error "Wrong number of arguments: $#" $FUNCNAME; return 1; }
-
-if [ $2 == AtlasRelease ]; then
-# rm -rf $tmpdir/dist/$3 || return 1
- rm -rf $tmpdir/$(basename $(dirname $1))/$3 || return 1
-else
- rm -rf $tmpdir/$2/$3 || return 1
-fi
-
-cd $1/../.. || { error "cd" $FUNCNAME; return 1; }
-
-local tmperr=$(mktemp -t tmp.XXXXXXXXXX) || return 1
-tar ${tar_basic_opts} -cf - -X $scriptdir/junk.ptn -X $scriptdir/pltfm-junk.ptn \
- -T $4 2>|$tmperr | (cd $tmpdir; tar -xf -) || {
-
-warn "Disk space on the filesystem of $tmpdir:
-$(cat $4|duf -p $tmpdir)" $FUNCNAME
-
-error "tar" $FUNCNAME; return 1; }
-
-# cannot check exit status
-[ -s $tmperr ] && { error "\n$(<$tmperr)" $FUNCNAME; return 1; }
-
-rm -f $tmperr
-cd $OLDPWD || { error "cd" $FUNCNAME; return 1; }
-}
-
-_install_dirs ()
-{
-#
-# Parameters: ['directories-file'...]
-#
-cd $tmpdir || { error "cd" $FUNCNAME; return 1; }
-local list
-for list; do
- [ -s $list ] || continue
- xargs install -d <$list
-# xargs mkdir -p <$list
- case $? in
- 123|124) error "install" $FUNCNAME; return 1 ;;
-# 123|124) error "mkdir" $FUNCNAME; return 1 ;;
- 125|126|127|1) error "xargs" $FUNCNAME; return 1 ;;
- esac
-done
-cd $OLDPWD || { error "cd" $FUNCNAME; return 1; }
-}
-
-_symlinks ()
-{
-#
-# Usage: _symlinks [OPTION]... 'project-release-directory' 'project' 'release' ['exps-file']
-#
-# -I relink symbolic links to external debuginfo files
-#
-local debuginfo
-OPTIND=1
-while getopts "I" opt; do
- case $opt in
- I) debuginfo=yes ;;
- \?) error "Invalid option: -${OPTARG}" $FUNCNAME; return 1 ;;
- :) error "Argument required for option: -${OPTARG}" $FUNCNAME; return 1 ;;
- esac
-done
-
-shift $(($OPTIND - 1))
-[ $# -eq 3 -o $# -eq 4 ] || { error "Wrong number of arguments: $#" $FUNCNAME; return 1; }
-local tmperr=$(mktemp -t tmp.XXXXXXXXXX) || return 1
-local projdir
-
-if [ $2 == AtlasRelease ]; then
-# projdir=dist
- projdir=$(basename $(dirname $1))
-else
- projdir=$2
-fi
-
-[ -d $tmpdir/${projdir}/$3 ] || return 0
-
-$scriptdir/relink.py -S $1 -H ${projdir}/$3 ${4:+-X ${4}} ${debuginfo:+-I} $tmpdir/${projdir}/$3 >/dev/null 2>|$tmperr ||
-{ [ -s $tmperr ] && cat $tmperr >&2
-error "$scriptdir/relink.py" $FUNCNAME; return 1; }
-
-[ -s $tmperr ] && warn "\n$(<$tmperr)" $FUNCNAME
-
-if [ -z "${4:-}" ]; then
-# check symlinks left
-type symlinks >/dev/null || { warn "type" $FUNCNAME; return 0; }
-symlinks -r $tmpdir/${projdir}/$3 | grep '^absolute\|^other_fs\|^dangling\|^messy' >|$tmperr
-
-# check exit status instead?
-[ -s $tmperr ] && warn "Suspicious symlinks left:\n$(<$tmperr)" $FUNCNAME
-fi
-
-rm -f $tmperr || return 0
-}
-
-_tar ()
-{
-#
-# Parameters: 'project' 'release' 'name'
-#
-[ $# -eq 3 ] || { error "Wrong number of arguments: $#" $FUNCNAME; return 1; }
-#cd $tmpdir || { error "cd" $FUNCNAME; return 1; }
-local reldir
-
-if [ $1 == AtlasRelease ]; then
-# reldir=dist/$2
- reldir=$(basename ${projbase})/$2
-else
- reldir=$1/$2
-fi
-
-local fpath=${projcache}/kits/${3}.tar.gz
-
-rm -f ${fpath} || { error "rm" $FUNCNAME; return 1; }
-
-[ -d $tmpdir/$reldir ] ||
-{ info "Nothing to include: $fpath" $FUNCNAME; return 0; }
-# { install -d $reldir && info "Created directory '$reldir'" $FUNCNAME; } ||
-# { error "install" $FUNCNAME; return 1; }
-
-info "Writing $fpath" $FUNCNAME
-
-# -z -v --remove-files \
-
-tar ${tar_basic_opts} -C $tmpdir -cf $fpath \
- -z -v \
- $reldir >&2 ||
-{ warn "Disk space on the filesystem of `dirname $fpath`:
-$(duf -p `dirname $fpath` $tmpdir/$reldir)" $FUNCNAME
-rm -f $fpath
-error "tar" $FUNCNAME; return 1; }
-
-#cd $OLDPWD
-rm -rf $tmpdir/$reldir || return 0
-}
-
-_patch ()
-{
-#
-# Parameters: 'project' 'release' 'name'
-#
-[ $# -eq 3 ] || { error "Wrong number of arguments: $#" $FUNCNAME; return 1; }
-local reldir=$1/$2
-[ -d "$tmppatch/$reldir" ] || return 0
-
-local tmplist=$(mktemp -t tmp.XXXXXXXXXX) || return 1
-
-cd $tmppatch || { error "cd" $FUNCNAME; return 1; }
-#find $reldir -noleaf -type f -fprint $tmplist ||
-find $reldir ${noleaf:+-noleaf} -type f >>$tmplist ||
-{ error "find" $FUNCNAME; cd $OLDPWD; return 1; }
-cd $OLDPWD
-
-local fpath=${projcache}/kits/${3}.tar
-
-gunzip -t ${fpath}.gz || { error "gunzip" $FUNCNAME; return 1; }
-gunzip -f ${fpath}.gz || { error "gunzip" $FUNCNAME; return 1; }
-
-info "Appending to ${fpath}.gz" $FUNCNAME
-
-#tar -v ${tar_basic_opts} -rf $fpath -C $tmppatch $reldir >&2 ||
-tar -v ${tar_basic_opts} -rf $fpath -C $tmppatch -T $tmplist >&2 ||
-{ rm -rf $fpath; error "tar" $FUNCNAME; return 1; }
-rm -f $tmplist
-gzip -f ${fpath} || { error "gzip" $FUNCNAME; return 1; }
-}
-
-_settings ()
-{
-#
-# Pack AtlasSettings, AtlasLogin packages
-# Pack AtlasSetup package
-# Print on the standard output information on them (format: 'name' 'package' 'version')
-#
-local tmppre=$(mktemp -t tmp.XXXXXXXXXX) || { error "mktemp" $FUNCNAME; return 1; }
-local name fpath curver nver
-local -a pkg
-
-cd ${cmthome} || { error "cd" $FUNCNAME; return 1; }
-cmt show uses | awk '
-$1 == "use" && $2 ~ /Atlas(Settings|Login)/ { gsub(/[()]/, "", $4); print $2, $3, $4}
-' |
-while read -a pkg; do
- #name=$(sed "s/${pkg[0]}-${pkg[0]}/${pkg[0]}/" <<<${pkg[0]}-${pkg[1]})
- name=${pkg[0]}
-
-# echo $name ${pkg[0]} ${pkg[1]}
-
- fpath=${projcache}/kits/$name.tar.gz
- curver=$(_mkver ${pkg[1]})
- if [ ${curver} == "$(_getver $name)" ]; then
- if [ -f ${fpath} ]; then
- info "Existing ${fpath} will not be overwritten" $FUNCNAME
- else
- error "${fpath}: No such file" $FUNCNAME
- fi
- elif [ -f ${fpath} -a -f ${projcache}/cache/$name.pacman -a "${keep}" == yes ]; then
- warn "Keeping ${fpath} ($(_getver $name)) while using different version: ${pkg[0]} ${pkg[1]} ${pkg[2]}" $FUNCNAME
- nver=$(tar -ztf ${fpath}|sed -n 's!^'${pkg[0]}'/\([^/]\+\)/*$!\1!p') ||
- { error "sed" $FUNCNAME; }
- if [ "$nver" ]; then
- pkg[1]=$nver
- else
- error "Cannot determine native version: ${fpath}" $FUNCNAME
- fi
- else
- info "Writing ${fpath}" $FUNCNAME
-
- tar -v ${tar_basic_opts} -cf ${fpath} -z \
- -X $scriptdir/junk.ptn \
- -C ${pkg[2]} ${pkg[0]}/${pkg[1]} 1>&2 ||
- { rm -f ${fpath}; error "tar" $FUNCNAME; }
- _pre ${pkg[2]}/${pkg[0]}/${pkg[1]} ${pkg[0]} ${pkg[1]} >|${tmppre}
- _pacman $name "" "" ${tmppre} ${curver}
- fi
-
- echo $name ${pkg[0]} ${pkg[1]}
-
- [ ! -f $PACKRPM/bin/pack-rpm-settings.sh ] || . $PACKRPM/bin/pack-rpm-settings.sh
-
-done # || return 1
-cd $OLDPWD
-
-if [ -d "${setuproot:-}" ]; then
- cd ${setuproot}/cmt || { error "cd" $FUNCNAME; return 1; }
- pkg[0]=$(basename ${setuproot})
- #pkg[0]=$(cmt show macro_value package)
- pkg[1]=$(cmt show macro_value version)
- pkg[2]=$(dirname ${setuproot})
-
- name=${pkg[0]}
-
- fpath=${projcache}/kits/$name.tar.gz
- curver=$(_mkver ${pkg[1]})
- if [ ${curver} == "$(_getver $name)" ]; then
- if [ -f ${fpath} ]; then
- info "Existing ${fpath} will not be overwritten" $FUNCNAME
- else
- error "${fpath}: No such file" $FUNCNAME
- fi
- elif [ -f ${fpath} -a -f ${projcache}/cache/$name.pacman -a "${keep}" == yes ]; then
- warn "Keeping ${fpath} ($(_getver $name)) while using different version: ${pkg[0]} ${pkg[1]} ${pkg[2]}" $FUNCNAME
- # determine native version in the tarball
- nver=$(tar -O -zxf ${fpath} ${pkg[0]}/cmt/version.cmt) ||
- { error "tar" $FUNCNAME; }
- if [ "$nver" ]; then
- pkg[1]=$nver
- else
- error "Cannot determine native version: ${fpath}" $FUNCNAME
- fi
- else
- info "Writing ${fpath}" $FUNCNAME
-
- tar -v ${tar_basic_opts} -cf ${fpath} -z \
- -X $scriptdir/junk.ptn \
- -C ${pkg[2]} ${pkg[0]} 1>&2 ||
- { rm -f ${fpath}; error "tar" $FUNCNAME; }
- _pre ${pkg[2]}/${pkg[0]} ${pkg[0]} ${pkg[1]} >|${tmppre}
- _pacman $name "" "" ${tmppre} ${curver}
- fi
-
- echo $name ${pkg[0]} ${pkg[1]}
-
- [ ! -f $PACKRPM/bin/pack-rpm-settings.sh ] || . $PACKRPM/bin/pack-rpm-settings.sh
-
- cd $OLDPWD
-fi
-
-rm -f $tmppre || return 0
-}
-
-_pre ()
-{
-#
-# Print on the standard output pre-install script
-#
-# Parameters: 'project-release-directory' 'project'|'package' 'release'|'version'
-#
-if [ $2 == AtlasSettings ]; then
-awk '
-BEGIN { printf "mkdir -p @INSTALL_PREFIX@/.cmtsite; if [ -f @INSTALL_PREFIX@/.cmtsite/requirements ]; then mv -f @INSTALL_PREFIX@/.cmtsite/requirements @INSTALL_PREFIX@/.cmtsite/requirements.orig; cmtconfig_=`awk \"/^macro cmtconfig_default/{print \\\\\\$3}\" @INSTALL_PREFIX@/.cmtsite/requirements.orig`; fi; printf \""}
-{ gsub(/\$/,"\\$"); printf "%s\\n", $0 }
-END { printf "\" >@INSTALL_PREFIX@/.cmtsite/requirements; if [ \"${cmtconfig_:-}\" ]; then sed \"s/^macro cmtconfig_default.*/macro cmtconfig_default ${cmtconfig_}/g\" @INSTALL_PREFIX@/.cmtsite/requirements >@INSTALL_PREFIX@/.cmtsite/requirements.$$ && mv -f @INSTALL_PREFIX@/.cmtsite/requirements.$$ @INSTALL_PREFIX@/.cmtsite/requirements; fi" }
-' $scriptdir/basic-requirements.template
-
-[ $? -eq 0 ] || { error "awk" $FUNCNAME; return 1; }
-
-elif [ $2 == AtlasLogin ]; then
-awk '
-BEGIN { printf "mkdir -p @INSTALL_PREFIX@/cmtsite; if [ -f @INSTALL_PREFIX@/cmtsite/requirements ]; then mv -f @INSTALL_PREFIX@/cmtsite/requirements @INSTALL_PREFIX@/cmtsite/requirements.orig; cmtconfig_=`awk \"/^macro cmtconfig_default/{print \\\\\\$3}\" @INSTALL_PREFIX@/cmtsite/requirements.orig`; fi; printf \""}
-FILENAME == "'$scriptdir/requirements.template'" { gsub(/\$/,"\\$"); if (NR != 1) printf "\\n%s", $0; else printf "%s", $0 }
-FILENAME == "'$scriptdir/platforms'" { printf "\\t%s %s", $1, $1 }
-END { printf "\\n\" >@INSTALL_PREFIX@/cmtsite/requirements; if [ \"${cmtconfig_:-}\" ]; then sed \"s/^macro cmtconfig_default.*/macro cmtconfig_default ${cmtconfig_}/g\" @INSTALL_PREFIX@/cmtsite/requirements >@INSTALL_PREFIX@/cmtsite/requirements.$$ && mv -f @INSTALL_PREFIX@/cmtsite/requirements.$$ @INSTALL_PREFIX@/cmtsite/requirements; fi" }
-' $scriptdir/requirements.template $scriptdir/platforms
-
-[ $? -eq 0 ] || { error "awk" $FUNCNAME; return 1; }
-
-elif [ $2 == AtlasSetup ]; then
-cat <<\EOF
-mkdir -p @INSTALL_PREFIX@/cmtsite; if [ -f @INSTALL_PREFIX@/cmtsite/asetup.sh ]; then mv -f @INSTALL_PREFIX@/cmtsite/asetup.sh @INSTALL_PREFIX@/cmtsite/asetup.sh.orig; fi; printf "export AtlasSetup=@INSTALL_PREFIX@/AtlasSetup\nsource @INSTALL_PREFIX@/AtlasSetup/scripts/asetup.sh \$*\nalias asetup=\'source @INSTALL_PREFIX@/AtlasSetup/scripts/asetup.sh\'\n" >@INSTALL_PREFIX@/cmtsite/asetup.sh; if [ -f @INSTALL_PREFIX@/cmtsite/asetup.csh ]; then mv -f @INSTALL_PREFIX@/cmtsite/asetup.csh @INSTALL_PREFIX@/cmtsite/asetup.csh.orig; fi; printf "setenv AtlasSetup @INSTALL_PREFIX@/AtlasSetup\nsource @INSTALL_PREFIX@/AtlasSetup/scripts/asetup.csh \$*\nalias asetup \'source @INSTALL_PREFIX@/AtlasSetup/scripts/asetup.csh\'\n" >@INSTALL_PREFIX@/cmtsite/asetup.csh; asetup_defaults="standalone = True\nreleasesarea = @INSTALL_PREFIX@ `dirname @INSTALL_PREFIX@` $(dirname $(dirname @INSTALL_PREFIX@))/\${CMTCONFIG}\n"; if [ ! -f @INSTALL_PREFIX@/cmtsite/asetup_defaults ]; then printf "${asetup_defaults}" >@INSTALL_PREFIX@/cmtsite/asetup_defaults; elif ! printf "${asetup_defaults}" | cmp -s @INSTALL_PREFIX@/cmtsite/asetup_defaults -; then printf "${asetup_defaults}" >@INSTALL_PREFIX@/cmtsite/asetup_defaults.new; fi
-EOF
-
-#mkdir -p @INSTALL_PREFIX@/cmtsite; if [ -f @INSTALL_PREFIX@/cmtsite/asetup.sh ]; then mv -f @INSTALL_PREFIX@/cmtsite/asetup.sh @INSTALL_PREFIX@/cmtsite/asetup.sh.orig; fi; printf "export AtlasSetup=@INSTALL_PREFIX@/AtlasSetup\nsource @INSTALL_PREFIX@/AtlasSetup/scripts/asetup.sh \$*\nalias asetup=\'source @INSTALL_PREFIX@/AtlasSetup/scripts/asetup.sh\'\n" >@INSTALL_PREFIX@/cmtsite/asetup.sh; if [ -f @INSTALL_PREFIX@/cmtsite/asetup.csh ]; then mv -f @INSTALL_PREFIX@/cmtsite/asetup.csh @INSTALL_PREFIX@/cmtsite/asetup.csh.orig; fi; printf "setenv AtlasSetup @INSTALL_PREFIX@/AtlasSetup\nsource @INSTALL_PREFIX@/AtlasSetup/scripts/asetup.csh \$*\nalias asetup \'source @INSTALL_PREFIX@/AtlasSetup/scripts/asetup.csh\'\n" >@INSTALL_PREFIX@/cmtsite/asetup.csh; asetup_defaults="standalone = True\nreleasesarea = @INSTALL_PREFIX@ `dirname @INSTALL_PREFIX@`\n"; if [ ! -f @INSTALL_PREFIX@/cmtsite/asetup_defaults ]; then printf "${asetup_defaults}" >@INSTALL_PREFIX@/cmtsite/asetup_defaults; elif ! printf "${asetup_defaults}" | cmp -s @INSTALL_PREFIX@/cmtsite/asetup_defaults -; then printf "${asetup_defaults}" >@INSTALL_PREFIX@/cmtsite/asetup_defaults.new; fi
-
-#mkdir -p @INSTALL_PREFIX@/cmtsite; if [ -f @INSTALL_PREFIX@/cmtsite/asetup.sh ]; then mv -f @INSTALL_PREFIX@/cmtsite/asetup.sh @INSTALL_PREFIX@/cmtsite/asetup.sh.orig; fi; printf "export AtlasSetup=@INSTALL_PREFIX@/AtlasSetup\nsource @INSTALL_PREFIX@/AtlasSetup/scripts/asetup.sh \$*\nalias asetup=\'source @INSTALL_PREFIX@/AtlasSetup/scripts/asetup.sh\'\n" >@INSTALL_PREFIX@/cmtsite/asetup.sh; if [ -f @INSTALL_PREFIX@/cmtsite/asetup.csh ]; then mv -f @INSTALL_PREFIX@/cmtsite/asetup.csh @INSTALL_PREFIX@/cmtsite/asetup.csh.orig; fi; printf "setenv AtlasSetup @INSTALL_PREFIX@/AtlasSetup\nsource @INSTALL_PREFIX@/AtlasSetup/scripts/asetup.csh \$*\nalias asetup \'source @INSTALL_PREFIX@/AtlasSetup/scripts/asetup.csh\'\n" >@INSTALL_PREFIX@/cmtsite/asetup.csh; if [ -f @INSTALL_PREFIX@/cmtsite/asetup_defaults ]; then mv -f @INSTALL_PREFIX@/cmtsite/asetup_defaults @INSTALL_PREFIX@/cmtsite/asetup_defaults.orig; fi; printf "standalone = True\nreleasesarea = @INSTALL_PREFIX@ `dirname @INSTALL_PREFIX@`\n" >@INSTALL_PREFIX@/cmtsite/asetup_defaults
-
-#mkdir -p @INSTALL_PREFIX@/cmtsite; if [ -f @INSTALL_PREFIX@/cmtsite/asetup.sh ]; then mv -f @INSTALL_PREFIX@/cmtsite/asetup.sh @INSTALL_PREFIX@/cmtsite/asetup.sh.orig; fi; printf "export AtlasSetup=@INSTALL_PREFIX@/AtlasSetup\nif [ -z \\\"\${AtlasSetupSite:-}\\\" ]; then\n export AtlasSetupSite=@INSTALL_PREFIX@/cmtsite/defaults\nfi\nsource @INSTALL_PREFIX@/AtlasSetup/scripts/asetup.sh --releasesarea=@INSTALL_PREFIX@ standalone \$*\nalias asetup=\'source @INSTALL_PREFIX@/AtlasSetup/scripts/asetup.sh --releasesarea=@INSTALL_PREFIX@ standalone\'\n" >@INSTALL_PREFIX@/cmtsite/asetup.sh; if [ -f @INSTALL_PREFIX@/cmtsite/asetup.csh ]; then mv -f @INSTALL_PREFIX@/cmtsite/asetup.csh @INSTALL_PREFIX@/cmtsite/asetup.csh.orig; fi; printf "setenv AtlasSetup @INSTALL_PREFIX@/AtlasSetup\nif ( \$?AtlasSetupSite == 0 ) then\n setenv AtlasSetupSite @INSTALL_PREFIX@/cmtsite/defaults\nendif\nsource @INSTALL_PREFIX@/AtlasSetup/scripts/asetup.csh --releasesarea=@INSTALL_PREFIX@ standalone \$*\nalias asetup \'source @INSTALL_PREFIX@/AtlasSetup/scripts/asetup.csh --releasesarea=@INSTALL_PREFIX@ standalone\'\n" >@INSTALL_PREFIX@/cmtsite/asetup.csh; if [ -f @INSTALL_PREFIX@/cmtsite/defaults ]; then mv -f @INSTALL_PREFIX@/cmtsite/defaults @INSTALL_PREFIX@/cmtsite/defaults.orig; fi; printf "releasesarea = `dirname @INSTALL_PREFIX@`\n" >@INSTALL_PREFIX@/cmtsite/defaults
-
-#mkdir -p @INSTALL_PREFIX@/cmtsite; if [ -f @INSTALL_PREFIX@/cmtsite/asetup.sh ]; then mv -f @INSTALL_PREFIX@/cmtsite/asetup.sh @INSTALL_PREFIX@/cmtsite/asetup.sh.orig; fi; printf "export AtlasSetup=@INSTALL_PREFIX@/AtlasSetup\nsource @INSTALL_PREFIX@/AtlasSetup/scripts/asetup.sh --input=@INSTALL_PREFIX@/cmtsite/defaults \$*\nalias asetup=\'source @INSTALL_PREFIX@/AtlasSetup/scripts/asetup.sh --input=@INSTALL_PREFIX@/cmtsite/defaults\'\n" >@INSTALL_PREFIX@/cmtsite/asetup.sh; if [ -f @INSTALL_PREFIX@/cmtsite/asetup.csh ]; then mv -f @INSTALL_PREFIX@/cmtsite/asetup.csh @INSTALL_PREFIX@/cmtsite/asetup.csh.orig; fi; printf "setenv AtlasSetup @INSTALL_PREFIX@/AtlasSetup\nsource @INSTALL_PREFIX@/AtlasSetup/scripts/asetup.csh --input=@INSTALL_PREFIX@/cmtsite/defaults \$*\nalias asetup \'source @INSTALL_PREFIX@/AtlasSetup/scripts/asetup.csh --input=@INSTALL_PREFIX@/cmtsite/defaults\'\n" >@INSTALL_PREFIX@/cmtsite/asetup.csh; if [ -f @INSTALL_PREFIX@/cmtsite/defaults ]; then mv -f @INSTALL_PREFIX@/cmtsite/defaults @INSTALL_PREFIX@/cmtsite/defaults.orig; fi; printf "standalone = True\nreleasesarea = @INSTALL_PREFIX@ `dirname @INSTALL_PREFIX@`\n" >@INSTALL_PREFIX@/cmtsite/defaults
-[ $? -eq 0 ] || { error "cat" $FUNCNAME; return 1; }
-
-#awk '
-#BEGIN { printf "; printf \""}
-#{ printf "\\t%s \\\"%s\\\"", $1, $1 }
-#END { printf "\" >>@INSTALL_PREFIX@/cmtsite/requirements" }
-#' $scriptdir/platforms
-# awk '
-# BEGIN { printf "PATH=/bin:/usr/bin; mkdir -p @INSTALL_PREFIX@/cmtsite; if [ -f @INSTALL_PREFIX@/cmtsite/requirements ]; then mv -f @INSTALL_PREFIX@/cmtsite/requirements @INSTALL_PREFIX@/cmtsite/requirements.orig; cmtconfig_=`awk \"/^set CMTCONFIG/{print \\$3}\" @INSTALL_PREFIX@/cmtsite/requirements.orig`; fi; printf \""}
-# { gsub(/\$/,"\\$"); printf "%s\\n", $0 }
-# END { printf "\" >@INSTALL_PREFIX@/cmtsite/requirements; if [ \"$cmtconfig_\" ]; then sed -i \"/^set CMTCONFIG/d\" @INSTALL_PREFIX@/cmtsite/requirements; sed -n \"/^set CMTCONFIG/,\\$p\" @INSTALL_PREFIX@/cmtsite/requirements.orig >>@INSTALL_PREFIX@/cmtsite/requirements; fi" }
-# ' $scriptdir/requirements.template
-#[ $? -eq 0 ] || { error "awk" $FUNCNAME; return 1; }
-
-#elif [ $2 == AtlasCore ]; then
-#elif [[ $2 == Atlas?* || $2 == LCGCMT ]]; then
-else
-: ${cmtver:?}
-: ${CMTCONFIG:?}
-if [ "${relocate:-}" = yes ]; then
-cat <<EOF
-sed "s/^macro cmtconfig_default.*$/macro cmtconfig_default $CMTCONFIG/g" @INSTALL_PREFIX@/cmtsite/requirements >@INSTALL_PREFIX@/cmtsite/requirements.\$\$ && mv -f @INSTALL_PREFIX@/cmtsite/requirements.\$\$ @INSTALL_PREFIX@/cmtsite/requirements; cd @INSTALL_PREFIX@/cmtsite; . @INSTALL_PREFIX@/CMT/${cmtver}/mgr/setup.sh; cmt config
-EOF
-else
-cat <<EOF
-sed "s/^set CMTCONFIG.*$/set CMTCONFIG $CMTCONFIG/g" @INSTALL_PREFIX@/cmtsite/requirements >@INSTALL_PREFIX@/cmtsite/requirements.\$\$ && mv -f @INSTALL_PREFIX@/cmtsite/requirements.\$\$ @INSTALL_PREFIX@/cmtsite/requirements; cd @INSTALL_PREFIX@/cmtsite; . @INSTALL_PREFIX@/CMT/${cmtver}/mgr/setup.sh; cmt config
-EOF
-fi
-#PATH=/bin:/usr/bin; sed -i "s/^set CMTCONFIG.*$/set CMTCONFIG $CMTCONFIG/g" @INSTALL_PREFIX@/cmtsite/requirements; cd @INSTALL_PREFIX@/cmtsite; . @INSTALL_PREFIX@/CMT/${cmtver}/mgr/setup.sh; cmt -quiet config
-[ $? -eq 0 ] || { error "cat" $FUNCNAME; return 1; }
-fi
-}
-
-_post ()
-{
-#
-# Print on the standard output post-install script
-#
-# Parameters: 'project-release-directory' 'project'|'package' 'release'|'version'
-#
-: ${cmtver:?}
-: ${CMTCONFIG:?}
-: ${verdir?} ${cntnr[0]:?} #${cntnr[1]:?}
-case ${CMTCONFIG} in
- *dbg*) local mode=dbg ;;
- *) local mode=opt ;;
-esac
-
-local cntnrcmt=${cntnr[1]}${cntnr[0]}/${verdir}cmt
-
-cd $1/$cntnrcmt || return 1
-[ -f ${tmppatch}/$2/$3/$cntnrcmt/requirements ] &&
-export CMTUSERCONTEXT=$(echo ${tmppatch}/$2/$3/$cntnrcmt)
-local project_post=$(cmt -q -tag_add=PACK show macro_value $(sed 's/[-.]/_/g' <<<${2})_post)
-#local project_post=$(cmt -tag_add=PACK show macro_value ${2}_post)
-unset CMTUSERCONTEXT
-cd $OLDPWD
-
-if [ "${relocate:-}" = yes ]; then
-
-if [ $2 == AtlasRelease ]; then
-: ${CMTCONFIG:?}
-case ${CMTCONFIG} in
- *dbg*) local mode=dbg ;;
- *) local mode=opt ;;
-esac
-cat <<EOF
-. @INSTALL_PREFIX@/CMT/${cmtver}/mgr/setup.sh; export CMTCONFIG=$CMTCONFIG; cd @INSTALL_PREFIX@/.cmtsite; [ -f ./setup.sh ] || cmt config; . ./setup.sh; cd @INSTALL_PREFIX@/$(basename $(dirname $1))/$3/AtlasRelease/*/cmt; cmt br - cmt -no_cleanup config; ${project_post:+${project_post}; }true
-EOF
-#unset CMTROOT; cd @INSTALL_PREFIX@/.cmtsite; . ./setup.sh; cd @INSTALL_PREFIX@/$(basename $(dirname $1))/$3/AtlasRelease/*/cmt; cmt br - cmt -no_cleanup config; ${project_post:+${project_post}; }true
-else
-cat <<EOF
-. @INSTALL_PREFIX@/CMT/${cmtver}/mgr/setup.sh; export CMTCONFIG=$CMTCONFIG; cd @INSTALL_PREFIX@/.cmtsite; [ -f ./setup.sh ] || cmt config; . ./setup.sh; cd @INSTALL_PREFIX@/$2/$3/$cntnrcmt; cmt br - 'cmt -no_cleanup config'; ${project_post:+${project_post}; }true
-EOF
-#unset CMTROOT; cd @INSTALL_PREFIX@/.cmtsite; . ./setup.sh; cd @INSTALL_PREFIX@/$2/$3/$cntnrcmt; cmt br - 'cmt -no_cleanup config'; ${project_post:+${project_post}; }true
-fi
-
-else
-
-if [ $2 == AtlasRelease ]; then
-: ${CMTCONFIG:?}
-case ${CMTCONFIG} in
- *dbg*) local mode=dbg ;;
- *) local mode=opt ;;
-esac
-cat <<EOF
-unset CMTROOT CMTSITE; cd @INSTALL_PREFIX@/cmtsite; . @INSTALL_PREFIX@/cmtsite/setup.sh -tag_add=${3},${mode},noTest; cd @INSTALL_PREFIX@/$(basename $(dirname $1))/$3/AtlasRelease/*/cmt; cmt br - cmt -no_cleanup config; cd @INSTALL_PREFIX@/$(basename $(dirname $1))/$3/Control/AthenaRunTime/*/cmt; . ./setup.sh; cmt build library_links; ${project_post:+cd @INSTALL_PREFIX@/$(basename $(dirname $1))/$3/AtlasRelease/*/cmt; ${project_post}; }true
-EOF
-
-#PATH=/bin:/usr/bin; unset CMTROOT CMTSITE; cd @INSTALL_PREFIX@/cmtsite; . @INSTALL_PREFIX@/cmtsite/setup.sh -tag_add=${3},${mode},noTest; cd @INSTALL_PREFIX@/$(basename $(dirname $1))/$3/AtlasRelease/*/cmt; cmt -quiet br - cmt -quiet -no_cleanup config; cd @INSTALL_PREFIX@/$(basename $(dirname $1))/$3/Control/AthenaRunTime/*/cmt; . setup.sh; cmt build library_links; ${project_post:+cd @INSTALL_PREFIX@/$(basename $(dirname $1))/$3/AtlasRelease/*/cmt; ${project_post}; }true
-elif [ $2 == LCGCMT ]; then
-cat <<EOF
-unset CMTROOT CMTSITE; cd @INSTALL_PREFIX@/cmtsite; . @INSTALL_PREFIX@/cmtsite/setup.sh -tag_add=${mode},noTest; unset CMTPATH CMTHOME CMTUSERCONTEXT; cd @INSTALL_PREFIX@/$2/$3/$cntnrcmt; cmt br - 'cmt -no_cleanup config;cmt build library_links'; ${project_post:+${project_post}; }true
-EOF
-
-#PATH=/bin:/usr/bin; unset CMTROOT CMTSITE; cd @INSTALL_PREFIX@/cmtsite; . @INSTALL_PREFIX@/cmtsite/setup.sh -tag_add=${mode},noTest; unset CMTPATH; cd @INSTALL_PREFIX@/$2/$3/$cntnrcmt; cmt -quiet br - 'cmt -quiet -no_cleanup config;cmt -quiet build library_links'; ${project_post:+${project_post}; }true
-elif [ $2 == Gaudi ]; then
-cat <<EOF
-unset CMTROOT CMTSITE; cd @INSTALL_PREFIX@/cmtsite; . @INSTALL_PREFIX@/cmtsite/setup.sh -tag_add=${mode},noTest; unset CMTPATH CMTHOME CMTUSERCONTEXT; cd @INSTALL_PREFIX@/$2/$3/$cntnrcmt; cmt br - 'cmt -no_cleanup config;cmt build library_links'; ${project_post:+${project_post}; }true
-EOF
-
-#PATH=/bin:/usr/bin; unset CMTROOT CMTSITE; cd @INSTALL_PREFIX@/cmtsite; . @INSTALL_PREFIX@/cmtsite/setup.sh -tag_add=${mode},noTest; unset CMTPATH; cd @INSTALL_PREFIX@/$2/$3/$cntnrcmt; cmt -quiet br - 'cmt -quiet -no_cleanup config;cmt -quiet build library_links'; ${project_post:+${project_post}; }true
-elif [[ $2 == Atlas?* ]]; then # Atlas projects
-cat <<EOF
-unset CMTROOT CMTSITE; cd @INSTALL_PREFIX@/cmtsite; . @INSTALL_PREFIX@/cmtsite/setup.sh -tag_add=${2},${3},${mode},noTest; cd @INSTALL_PREFIX@/$2/$3/$cntnrcmt; cmt br - 'cmt -no_cleanup config;cmt build library_links'; ${project_post:+${project_post}; }true
-EOF
-
-#PATH=/bin:/usr/bin; unset CMTROOT CMTSITE; cd @INSTALL_PREFIX@/cmtsite; . @INSTALL_PREFIX@/cmtsite/setup.sh -tag_add=${2},${3},${mode},noTest; cd @INSTALL_PREFIX@/$2/$3/$cntnrcmt; cmt -quiet br - 'cmt -quiet -no_cleanup config;cmt -quiet build library_links'; ${project_post:+${project_post}; }true
-else
-cat <<EOF
-unset CMTROOT CMTSITE; cd @INSTALL_PREFIX@/cmtsite; . @INSTALL_PREFIX@/cmtsite/setup.sh -tag_add=${mode},noTest; unset CMTPATH CMTHOME CMTUSERCONTEXT; cd @INSTALL_PREFIX@/$2/$3/$cntnrcmt; cmt br - 'cmt -no_cleanup config;cmt build library_links'; ${project_post:+${project_post}; }true
-EOF
-
-#PATH=/bin:/usr/bin; unset CMTROOT CMTSITE; cd @INSTALL_PREFIX@/cmtsite; . @INSTALL_PREFIX@/cmtsite/setup.sh -tag_add=${mode},noTest; unset CMTPATH; cd @INSTALL_PREFIX@/$2/$3/$cntnrcmt; cmt -quiet br - 'cmt -quiet -no_cleanup config;cmt -quiet build library_links'; ${project_post:+${project_post}; }true
-# cat <<EOF
-# PATH=/bin:/usr/bin; unset CMTROOT CMTSITE; . @INSTALL_PREFIX@/cmtsite/setup.sh -tag_add=${mode},noTest; unset CMTPATH; cd @INSTALL_PREFIX@/$2/$3/$cntnrcmt; cmt -quiet br - cmt -quiet -no_cleanup config; ${project_post:+${project_post}; }true
-# EOF
-
-fi
-
-fi
-}
-
-_preun ()
-{
-#
-# Print on the standard output preun-install script
-#
-# Parameters: 'project-release-directory' 'project'|'package' 'release'|'version'
-#
-: ${cmtver:?}
-: ${CMTCONFIG:?}
-: ${verdir?} ${cntnr[0]:?} #${cntnr[1]:?}
-case ${CMTCONFIG} in
- *dbg*) local mode=dbg ;;
- *) local mode=opt ;;
-esac
-
-local cntnrcmt=${cntnr[1]}${cntnr[0]}/${verdir}cmt
-
-cd $1/$cntnrcmt || return 1
-[ -f ${tmppatch}/$2/$3/$cntnrcmt/requirements ] &&
-export CMTUSERCONTEXT=$(echo ${tmppatch}/$2/$3/$cntnrcmt)
-local project_preun=$(cmt -q -tag_add=PACK show macro_value $(sed 's/[-.]/_/g' <<<${2})_preun)
-#local project_preun=$(cmt -tag_add=PACK show macro_value ${2}_preun)
-local installarea=$(cmt -q show macro_value ${2}_installarea_prefix)
-unset CMTUSERCONTEXT
-cd $OLDPWD
-
-if [ "${relocate:-}" = yes ]; then
-
-: ${cmtver:?}
-: ${CMTCONFIG:?}
-if [ $2 == AtlasRelease ]; then
-case ${CMTCONFIG} in
- *dbg*) local mode=dbg ;;
- *) local mode=opt ;;
-esac
-if [ "${project_preun:-}" ]; then
-# sed -i "s/^macro cmtconfig_default.*$/macro cmtconfig_default $CMTCONFIG/g" @INSTALL_PREFIX@/.cmtsite/requirements
-# unset CMTROOT; cd @INSTALL_PREFIX@/.cmtsite;
-# (. @INSTALL_PREFIX@/CMT/${cmtver}/mgr/setup.sh; cmt config)
-cat <<EOF
-if [ \$1 -eq 0 ]; then
-shift \$#;
-. @INSTALL_PREFIX@/CMT/${cmtver}/mgr/setup.sh
-export CMTCONFIG=$CMTCONFIG
-cd @INSTALL_PREFIX@/.cmtsite;
-[ -f ./setup.sh ] || cmt config
-. ./setup.sh;
-cd @INSTALL_PREFIX@/$(basename $(dirname $1))/$3/AtlasRelease/*/cmt;
-${project_preun}
-cd @INSTALL_PREFIX@/$(basename $(dirname $1))/$3/AtlasRelease/*/cmt;
-true
-fi
-EOF
-fi
-else
-if [ "${project_preun:-}" ]; then
-# sed -i "s/^macro cmtconfig_default.*$/macro cmtconfig_default $CMTCONFIG/g" @INSTALL_PREFIX@/.cmtsite/requirements
-# unset CMTROOT; cd @INSTALL_PREFIX@/.cmtsite;
-# (. @INSTALL_PREFIX@/CMT/${cmtver}/mgr/setup.sh; cmt config)
-cat <<EOF
-if [ \$1 -eq 0 ]; then
-shift \$#;
-. @INSTALL_PREFIX@/CMT/${cmtver}/mgr/setup.sh
-export CMTCONFIG=$CMTCONFIG
-cd @INSTALL_PREFIX@/.cmtsite;
-[ -f ./setup.sh ] || cmt config
-. ./setup.sh;
-cd @INSTALL_PREFIX@/$2/$3/$cntnrcmt
-${project_preun}
-cd @INSTALL_PREFIX@/$2/$3/$cntnrcmt;
-true
-fi
-EOF
-fi
-fi
-
-else
-
-if [ $2 == AtlasRelease ]; then
-: ${CMTCONFIG:?}
-case ${CMTCONFIG} in
- *dbg*) local mode=dbg ;;
- *) local mode=opt ;;
-esac
-cat <<EOF
-if [ \$1 -eq 0 ]; then
-shift \$#;
-unset CMTROOT CMTSITE; cd @INSTALL_PREFIX@/cmtsite;
-. @INSTALL_PREFIX@/cmtsite/setup.sh -tag_add=${3},${mode},noTest;
-${project_preun:+cd @INSTALL_PREFIX@/$(basename $(dirname $1))/$3/AtlasRelease/*/cmt;
-${project_preun}
-}cd @INSTALL_PREFIX@/$(basename $(dirname $1))/$3/AtlasRelease/*/cmt;
-rm -rf @INSTALL_PREFIX@/$(basename $(dirname $1))/$3/$installarea/${CMTCONFIG}/lib;
-true
-fi
-EOF
-
-#PATH=/bin:/usr/bin;
-elif [ $2 == LCGCMT ]; then
-cat <<EOF
-if [ \$1 -eq 0 ]; then
-shift \$#;
-unset CMTROOT CMTSITE; cd @INSTALL_PREFIX@/cmtsite;
-. @INSTALL_PREFIX@/cmtsite/setup.sh -tag_add=${mode},noTest;
-unset CMTPATH CMTHOME CMTUSERCONTEXT;
-${project_preun:+cd @INSTALL_PREFIX@/$2/$3/$cntnrcmt
-${project_preun}
-}cd @INSTALL_PREFIX@/$2/$3/$cntnrcmt;
-rm -rf @INSTALL_PREFIX@/$2/$3/$installarea/${CMTCONFIG}/lib;
-true
-fi
-EOF
-
-#PATH=/bin:/usr/bin;
-#cmt -quiet br - 'rm -f Makefile setup.sh setup.csh cleanup.sh cleanup.csh';
-#cmt -quiet br - 'cmt -quiet remove library_links; rm -f Makefile setup.sh setup.csh cleanup.sh cleanup.csh';
-
-elif [ $2 == Gaudi ]; then
-cat <<EOF
-if [ \$1 -eq 0 ]; then
-shift \$#;
-unset CMTROOT CMTSITE; cd @INSTALL_PREFIX@/cmtsite;
-. @INSTALL_PREFIX@/cmtsite/setup.sh -tag_add=${mode},noTest;
-unset CMTPATH CMTHOME CMTUSERCONTEXT
-${project_preun:+cd @INSTALL_PREFIX@/$2/$3/$cntnrcmt;
-${project_preun}
-}cd @INSTALL_PREFIX@/$2/$3/$cntnrcmt;
-cmt br - 'cmt remove library_links';
-true
-fi
-EOF
-
-#PATH=/bin:/usr/bin;
-#cmt -quiet br - 'cmt show applied_patterns|grep -q declare_installed_libraries&&cmt -quiet remove library_links; rm -f Makefile setup.sh setup.csh cleanup.sh cleanup.csh';
-
-elif [[ $2 == Atlas?* ]]; then # Atlas projects
-cat <<EOF
-if [ \$1 -eq 0 ]; then
-shift \$#;
-unset CMTROOT CMTSITE; cd @INSTALL_PREFIX@/cmtsite;
-. @INSTALL_PREFIX@/cmtsite/setup.sh -tag_add=${2},${3},${mode},noTest;
-${project_preun:+cd @INSTALL_PREFIX@/$2/$3/$cntnrcmt;
-${project_preun}
-}cd @INSTALL_PREFIX@/$2/$3/$cntnrcmt;
-rm -rf @INSTALL_PREFIX@/$2/$3/$installarea/${CMTCONFIG}/lib;
-true
-fi
-EOF
-
-#PATH=/bin:/usr/bin;
-#cmt -quiet br - 'rm -f Makefile setup.sh setup.csh cleanup.sh cleanup.csh';
-
-else
-cat <<EOF
-if [ \$1 -eq 0 ]; then
-shift \$#;
-unset CMTROOT CMTSITE; cd @INSTALL_PREFIX@/cmtsite;
-. @INSTALL_PREFIX@/cmtsite/setup.sh -tag_add=${mode},noTest;
-unset CMTPATH CMTHOME CMTUSERCONTEXT;
-${project_preun:+cd @INSTALL_PREFIX@/$2/$3/$cntnrcmt;
-${project_preun}
-}cd @INSTALL_PREFIX@/$2/$3/$cntnrcmt;
-cmt br - 'cmt remove library_links';
-true
-fi
-EOF
-
-#PATH=/bin:/usr/bin;
-#cmt -quiet br - 'cmt -quiet remove library_links; rm -f Makefile setup.sh setup.csh cleanup.sh cleanup.csh';
-
-fi
-
-fi
-}
-
-_pacman ()
-{
-#
-# Write pacman file
-#
-# Parameters: 'name' ['requires-file' ['postinstall-script' ['preinstall-script' ['version']]]]
-#
-local reqs fpath ver _ver
-
-fpath=${projcache}/cache/${1}.pacman
-
-if [ "$5" ]; then
- ver=$5
-else
-# ver=$(expr $(_getver ${1}) + 1 2>/dev/null) ||
- _ver=$(_getver ${1}) || { _ver=; warn "${fpath}: Version reset" $FUNCNAME; }
- ver=$(expr ${_ver:-0} + 1) ||
- { ver=1; warn "${fpath}: Version set to ${ver}" $FUNCNAME; }
-fi
-
-info "Writing ${fpath}, version ${ver}" $FUNCNAME
-
-# add dependencies
-if [ -s "$2" ]; then
-
-while read req rest; do
- reqs="${reqs}
-package('${req}')"
-done <${2}
-
-fi
-
-# write pacman file
-cat <<EOF >|${fpath}
-
-description('Package ${1}')
-version('${ver}')
-${reqs}
-
-EOF
-
-# add preinstall-script
-if [ -s "$4" ]; then
- echo "shell('$(sed s/@INSTALL_PREFIX@/\$PACMAN_INSTALLATION/g $4)')" >>${fpath}
-fi
-
-if [ -f ${projcache}/kits/${1}.tar.gz ]; then
-cat <<EOF >>${fpath}
-
-downloadUntar('../kits/${1}.tar.gz')
-
-EOF
-else
- warn "${projcache}/kits/${1}.tar.gz: No such file" $FUNCNAME
-fi
-
-# add postinstall-script
-if [ -s "$3" ]; then
- echo "shell(\"$(sed s/@INSTALL_PREFIX@/\$PACMAN_INSTALLATION/g $3)\")" >>${fpath}
- #echo "shell('$(sed s/@INSTALL_PREFIX@/\$PACMAN_INSTALLATION/g $3)')" >>${fpath}
-fi
-}
-
-_requires ()
-{
-#
-# Print on the standard output project dependencies (format: 'name' 'project' 'release')
-# (
-# Atlas proj opt -> externals + CMT + AtlasSettings, AtlasLogin +
-# proj dependencies opt + Atlas proj noarch
-# Atlas proj src -> Atlas proj noarch
-# Atlas proj doc, noarch, debuginfo
-# Atlas proj dbg -> externals + CMT + AtlasSettings, AtlasLogin +
-# proj dependencies dbg + Atlas proj src
-# Gaudi the same as Atlas proj
-# )
-#
-# Parameters: 'project-release-directory' 'project' 'release' 'platform'
-# (bin src doc noarch debuginfo)
-# 'container'
-# (container-name [access-path])
-# ['exps-file'
-# ['binreq-file']]
-#
-[ $# -eq 5 -o $# -eq 6 -o $# -eq 7 ] || { error "Wrong number of arguments: $#" $FUNCNAME; return 1; }
-#[ $# -eq 4 -o $# -eq 5 ] || { error "Wrong number of arguments: $#" $FUNCNAME; return 1; }
-local name cmtverfile cmtver
-local -a proj
-
-if [ $4 == bin ]; then
-
-# dependencies on external software
-#_extern $1 $2 $3 ${5:+"$5"} ||
-_extern $1 $2 $3 "${5:-}" ${6:-} ||
-warn "Cannot pack external software: $1 $2 $3" $FUNCNAME
-
-# CMT dependency only
-# first, try to determine which CMT version the project built with
-for f_ in $1/${cntnr[1]}${cntnr[0]}/${verdir}$CMTCONFIG/${cntnr[0]}setup.make \
-$1/${cntnr[1]}${cntnr[0]}/${verdir}$CMTCONFIG/${cntnr[0]}_setup.make \
-$1/${cntnr[1]}${cntnr[0]}/${verdir}$CMTCONFIG/setup.make
-do
- [ -f "$f_" ] && { cmtverfile=$f_; break; }
-done
-
-if [ -f "${cmtverfile-}" ]; then
- cmtver=$(awk '$1 == "use" && $2 == "CMT" { print $3; exit }' $cmtverfile) ||
- { warn "Cannot determine CMT version: $cmtverfile" $FUNCNAME; unset cmtver; }
-elif f_=$1/${cntnr[1]}${cntnr[0]}/${verdir}cmt/setup.sh; [ -f $f_ ]; then
- cmtver=$(cd $(dirname $f_) && unset CMTROOT && . $f_ 2>/dev/null && cmt version) ||
- { warn "Cannot determine CMT version: $f_" $FUNCNAME; unset cmtver; }
-fi
-
-if [ -n "${cmtver-}" ]; then
- case $2 in
- tdaq-common|dqm-common)
- if [ "${cmtver}" != $(cmt version) ]; then
- warn "Ignore CMT ${cmtver}: $1 $2 $3 (${CMTCONFIG})" $FUNCNAME
- cmtver=$(cmt version)
- fi
- ;;
- esac
- _extern_proj "" CMT $cmtver
-else
- warn "Cannot determine CMT version: $1 $2 $3 (${CMTCONFIG})" $FUNCNAME
- # use currently setup CMT version
- _extern_proj "" CMT $(cmt version)
- # use the CMT version from ${cmthome}
-# _extern_proj $(cd ${cmthome}; cmt show uses | awk '
-#$1 == "use" && $2 == "CMT" { gsub(/[()]/, "", $4); print $4, $2, $3; exit }
-#')
-fi
-
-# dependencies on AtlasSettings, AtlasLogin
-_settings || return 1
-
-if [ -f $1/cmt/project.cmt ]; then
-# direct project dependencies only
-awk '$1 == "use" && $2 ~ /./ { print $2 }' $1/cmt/project.cmt |
-while read projname; do
- proj=($(cd $1/cmt; cmt show projects | awk '
-$1 == "'${projname}'" && $3 == "(in" { sub(/[)]$/, "", $4); print $1, $2, $4; exit }
-'))
- case $recursive in
- no)
- name=$(_mkname ${proj[0]} ${proj[1]} bin)
- echo $name ${proj[0]} ${proj[1]}
- [ -f ${projcache}/cache/$name.pacman ] ||
- warn "Not packed: ${proj[0]} ${proj[1]} ${CMTCONFIG}" $FUNCNAME ;;
- yes)
- if grep "${proj[0]} ${proj[1]}" $tmpdone; then
- info "Done already: ${proj[0]} ${proj[1]} ${CMTCONFIG}" $FUNCNAME
- else
- case ${proj[0]} in
- LCGCMT)
- _extern_proj ${proj[2]} ${proj[0]} ${proj[1]} >>$tmpdone &&
- grep "${proj[0]} ${proj[1]}" $tmpdone ;;
- *)
- _proj ${proj[2]} ${proj[0]} ${proj[1]} >>$tmpdone &&
- grep "${proj[0]} ${proj[1]}" $tmpdone ;;
- esac
- fi ;;
- *) error "Invalid value: recursive: $recursive" $FUNCNAME; return 1 ;;
- esac
-done || return 1
-
-else warn "$1/cmt/project.cmt: No such file" $FUNCNAME
-fi
-
-# dependencies on other parts of the project
- case ${CMTCONFIG} in
- *dbg*) echo $(_mkname $2 $3 src) $2 $3 ;;
- *) echo $(_mkname $2 $3 noarch) $2 $3 ;;
- esac
-
-elif [ $4 == src ]; then
- echo $(_mkname $2 $3 noarch) $2 $3
-
-elif [ $4 == debuginfo ]; then
- if [ $# -eq 7 ]; then
-awk '
-{ if (NF == 4) print $4, $2, $3 }
-' "$7" <&- || { error "awk" $FUNCNAME; return 1; }
- fi
-
-fi
-}
-
-_extern ()
-{
-#
-# Pack external software (Boost, Python, ROOT, ...)
-# accessible via the glue packages in the current project directory ONLY
-# Print on the standard output information on it (format: 'name' 'package' 'version')
-#
-# Parameters: 'project-release-directory' 'project' 'release' 'container'
-# (container-name [access-path])
-# ['exps-file']
-#
-[ $# -eq 4 -o $# -eq 5 ] || { error "Wrong number of arguments: $#" $FUNCNAME; return 1; }
-#[ $# -eq 3 -o $# -eq 4 ] || { error "Wrong number of arguments: $#" $FUNCNAME; return 1; }
-#[ $# -eq 4 ] || { error "Wrong number of arguments: $#" $FUNCNAME; return 1; }
-local cmd
-local tmpout=$(mktemp -t tmp.XXXXXXXXXX) || { error "mktemp" $FUNCNAME; return 1; }
-
-#if [ $# -eq 4 ] && [ "$4" ]; then
-if [ $# -ge 4 ] && [ "$4" ]; then
- cntnr=($4); [ ${#cntnr[*]} -eq 2 ] && cntnr[1]=$(sed 's#/*$#/#' <<<${cntnr[1]})
-else
- cntnr=($(_getcntnr $1 $2 $3)) || cntnr=($(_mkcntnr $2)) || return 1
-fi
-
-# determine version directory
-# (<version-tag>/ - with_version_directory, [empty] - without_version_directory)
-# (CMT structure_strategy query not reliable)
-if [ -d $1/${cntnr[1]}${cntnr[0]}/cmt ]; then
- verdir=
-elif [ -d "$(echo $1/${cntnr[1]}${cntnr[0]}/*/cmt)" ]; then
- verdir=$(basename $(dirname $1/${cntnr[1]}${cntnr[0]}/*/cmt))/
- #verdir=*/
-else
- error "Cannot determine cmt directory: $1/${cntnr[1]}${cntnr[0]}" $FUNCNAME; return 1
-fi
-
-cd $1/${cntnr[1]}${cntnr[0]}/${verdir}cmt || { error "cd" $FUNCNAME; return 1; }
-info "`date`\tdirectory:\n`pwd`" $FUNCNAME
-
-# cmd="externcache=${externcache} patchdir=${patchdir} overwrite=${overwrite} tmppatch=${tmppatch} cmt -quiet broadcast ${selected:+-select='${selected}'} - ${scriptdir}/pack-extern.sh"
- cmd="externcache=${externcache} patchdir=${patchdir} overwrite=${overwrite} verify=$verify tmppatch=${tmppatch} cmt broadcast ${selected:+-select='${selected}'} - ${scriptdir}/pack-extern.sh"
- info "$cmd" $FUNCNAME
-# time eval $cmd | tee -a $tmpout >&2
-
-#if [ $waiting == yes -a $quiet == no ]; then
- tail -f $tmpout >&2 & local pid=$!
-#fi
-
- time eval $cmd ${5:-} >>$tmpout; local retval=$?
-# time eval $cmd >>$tmpout; local retval=$?
-
-#if [ $waiting == yes -a $quiet == no ]; then
- kill $pid
-#else cat $tmpout >&2; fi
-
- [ $retval -eq 0 ] && ! sed '/^#/d' $tmpout && { error "sed" $FUNCNAME; return 1; }
-# [ $retval -eq 0 ] && cat $tmpout | grep -v '^#'
-
-#info "`date`" $FUNCNAME
-cd $OLDPWD || { error "cd" $FUNCNAME; return 1; }
-rm -f $tmpout
-return $retval
-}
-
-_extern_proj ()
-{
-#
-# Pack external project (Gaudi, LCGCMT, CMT)
-# Print on the standard output information on it (format: 'name' 'project' 'release')
-#
-# Parameters: 'project-release-directory' 'project' 'release' ['container']
-# (container-name [access-path])
-#
-[ $# -eq 3 -o $# -eq 4 ] || { error "$#: Wrong number of arguments" $FUNCNAME; return 1; }
-#[ $# -eq 4 ] || { error "Wrong number of arguments: $#" $FUNCNAME; return 1; }
-
-local name fpath
-
-if [ $2 == Gaudi -o $2 == LCGCMT ]; then
-#if [ $2 == Gaudi ]; then
-
- _proj $1 $2 $3 ${4:+"$4"}
-
-elif [ $2 == LCGCMT ]; then
-info "`date`\targuments:\n$*" $FUNCNAME
-
-local tmpreq=$(mktemp -t tmp.XXXXXXXXXX) || return 1
-
-local tmppre=$(mktemp -t tmp.XXXXXXXXXX) || return 1
-local tmppost=$(mktemp -t tmp.XXXXXXXXXX) || return 1
-local tmppreun=$(mktemp -t tmp.XXXXXXXXXX) || return 1
-
-#local cmtver requires
-local cmtver
-local -a cntnr
-local verdir
-
-#if [ -s "$4" ]; then requires=$4; else requires=${tmpreq}; fi
-
-#_settings >>${requires}
-
-name=$(_mkname $2 $3 bin)
-echo $name $2 $3
-_requires ${1} ${2} ${3} bin "${4:-}" >|${tmpreq} || return 1
-#_requires ${1} ${2} ${3} bin ${4:+"$4"} >|${tmpreq} || return 1
-if [ -f ${projcache}/cache/$name.pacman -a "${upgrade}" != yes ]; then
- info "Existing ${projcache}/cache/$name.pacman will not be overwritten" $FUNCNAME
-else
-# _requires ${1} ${2} ${3} bin ${4:+"$4"} >|${tmpreq}
- #_requires ${1} ${2} ${3} bin >>$requires
- # need assign the right value to cmtver
- cmtver=$(awk '$2 == "CMT" { print $3; exit }' ${tmpreq}) || return 1
- #cmtver=$(awk '$2 == "CMT" { print $3; exit }' $requires) || return 1
- _pre ${1} ${2} ${3} >|${tmppre} || return 1
- _post ${1} ${2} ${3} >|${tmppost} || return 1
- _pacman ${name} ${tmpreq} ${tmppost} ${tmppre} || return 1
- #_pacman ${name} $requires ${tmppost} ${tmppre}
-fi
-[ ! -f $PACKRPM/bin/pack-rpm-LCGCMT-bin.sh ] || . $PACKRPM/bin/pack-rpm-LCGCMT-bin.sh || return 1
-
-name=$(_mkname $2 $3 noarch)
-fpath=${projcache}/kits/$name.tar.gz
-if [ -f $fpath -a "${upgrade}" != yes ]; then
- info "Existing $fpath will not be overwritten" $FUNCNAME
-else
- info "Writing $fpath" $FUNCNAME
- tar -v ${tar_basic_opts} -cf $fpath -z \
- -X $scriptdir/junk.ptn \
- -X $scriptdir/pltfm-junk.ptn \
- --exclude=$(cd $1/${cntnr[1]}${cntnr[0]}/${verdir}cmt; \
- cmt -q show macro_value LCGCMT_installarea_prefix)/'*' \
- -C $1/../.. $2/$3 >&2 ||
-{ warn "Disk space on the filesystem of `dirname $fpath`:
-$(duf -p `dirname $fpath` $1)" $FUNCNAME
-rm -f $fpath
-error "tar" $FUNCNAME; return 1; }
-
- _patch ${2} ${3} ${name} || return 1
- _pacman $name || return 1
-fi
-[ ! -f $PACKRPM/bin/pack-rpm-LCGCMT-noarch.sh ] || . $PACKRPM/bin/pack-rpm-LCGCMT-noarch.sh || return 1
-
-rm -f ${tmpreq} ${tmppost} ${tmppre} ${tmppreun} || return 0
-
-elif [ $2 == CMT ]; then
-: ${CMTCONFIG:?}
- # CMTv1r18p20050901Linux-i686.tar.gz from www.cmtsite.org
- name=${2}${3}${uname}-$(cut -d- -f1 <<<$CMTCONFIG)
-# name=${2}${3}Linux-$(cut -d- -f1 <<<$CMTCONFIG)
-
- echo $name $2 $3
-
- fpath=${projcache}/cache/$name.pacman
-# if [ -f $fpath ]; then
- if [ -f $fpath -a "${upgrade}" != yes ]; then
- info "Existing $fpath will not be overwritten" $FUNCNAME
- else
- info "Writing $fpath" $FUNCNAME
-
-cat >|$fpath <<EOF
-#
-# CMT from a CMT cache
-#
-description ('Package $name')
-
-package('${cmtcache}:CMT | version ("${3}")')
-EOF
-
- fi
-
-else
- error "Unknown external project: $1 $2 $3" $FUNCNAME; return 1
-fi
-}
-
-_proj ()
-{
-#
-# Pack project in five parts:
-# binary platform - corresponds to CMTCONFIG value
-# debuginfo files (for not debug build)
-# source code
-# documentation files
-# other architecture independent files
-# Print on the standard output information on it (format: 'name' 'project' 'release')
-#
-# Parameters: 'project-release-directory' 'project' 'release' ['container']
-# (container-name [access-path])
-#
-### Parameters: 'project-release-directory' 'project' 'release' ['requires-file']
-#
-info "`date`\targuments:\n$*" $FUNCNAME
-[ $# -eq 3 -o $# -eq 4 ] || { error "Wrong number of arguments: $#" $FUNCNAME; return 1; }
-local tmpbin=$(mktemp -t tmp.XXXXXXXXXX) || { error "mktemp" $FUNCNAME; return 1; }
-local tmpsrc=$(mktemp -t tmp.XXXXXXXXXX) || { error "mktemp" $FUNCNAME; return 1; }
-local tmpdoc=$(mktemp -t tmp.XXXXXXXXXX) || { error "mktemp" $FUNCNAME; return 1; }
-local tmpnoarch=$(mktemp -t tmp.XXXXXXXXXX) || { error "mktemp" $FUNCNAME; return 1; }
-
-local tmpdirs=$(mktemp -t tmp.XXXXXXXXXX) || { error "mktemp" $FUNCNAME; return 1; }
-local tmpdebuginfo=$(mktemp -t tmp.XXXXXXXXXX) || { error "mktemp" $FUNCNAME; return 1; }
-
-_prep_lists ${1} ${2} ${3} \
-${tmpbin} ${tmpsrc} ${tmpdoc} ${tmpnoarch} \
-${tmpdirs} ${tmpdebuginfo} || return 1
-
-local tmpreq=$(mktemp -t tmp.XXXXXXXXXX) || { error "mktemp" $FUNCNAME; return 1; }
-local tmpreqbin=$(mktemp -t tmp.XXXXXXXXXX) || { error "mktemp" $FUNCNAME; return 1; }
-
-if [ "${relocate:-}" = yes ]; then
- local tmpexps=$(mktemp -t tmp.XXXXXXXXXX) || { error "mktemp" $FUNCNAME; return 1; }
- local tmpexterndebuginfo=$(mktemp -t tmp.XXXXXXXXXX) || { error "mktemp" $FUNCNAME; return 1; }
-fi
-
-local tmppre=$(mktemp -t tmp.XXXXXXXXXX) || { error "mktemp" $FUNCNAME; return 1; }
-local tmppost=$(mktemp -t tmp.XXXXXXXXXX) || { error "mktemp" $FUNCNAME; return 1; }
-local tmppreun=$(mktemp -t tmp.XXXXXXXXXX) || { error "mktemp" $FUNCNAME; return 1; }
-
-#local pltfm name cmtver requires
-local pltfm name cmtver
-local -a cntnr
-local verdir
-local do_debuginfo
-
-if [ "${debuginfo}" = yes ] && [ -n "${debuginfosuffix:-}" ] && [ "${mode:-}" != dbg ]; then
- do_debuginfo=yes
-else
- unset do_debuginfo
-fi
-
-for pltfm in bin src doc noarch debuginfo; do
- [ ${pltfm} = doc ] && [ "${docfiles}" != yes ] && continue
- [ ${pltfm} = debuginfo ] && [ "${do_debuginfo:-}" != yes ] && continue
-
- name=$(_mkname ${2} ${3} ${pltfm}) || return 1
-
- if [ ${pltfm} = bin ]; then
- echo $name $2 $3
- fi
-
- if [ ${pltfm} != debuginfo ]; then
- _requires ${1} ${2} ${3} ${pltfm} "${4:-}" ${tmpexps:-} >|${tmpreq} || return 1
- else
- _requires ${1} ${2} ${3} ${pltfm} "${4:-}" "${tmpexps:-}" $tmpreqbin >|${tmpreq} || return 1
- fi
- if [ ${pltfm} = bin ] && [ "${do_debuginfo:-}" = yes ]; then
- cat $tmpreq >>$tmpreqbin || { error "cat" $FUNCNAME; return 1; }
- fi
-
-# _requires ${1} ${2} ${3} ${pltfm} ${4:+"$4"} >|${tmpreq} || return 1
-#if [ -f "${tmpexps:-}" ]; then
-# cat ${tmpexps:-} >&2 || { error "cat" $FUNCNAME; return 1; }
-#fi
-
-# if [ -f ${projcache}/kits/$name.tar.gz -a "${upgrade}" != yes ]; then
-# info "Existing ${projcache}/kits/$name.tar.gz will not be overwritten" $FUNCNAME
-# else
- if [ ${pltfm} = debuginfo ] && [ -f "${tmpexps:-}" ]; then
- _prep_extern_debuginfo_list ${1} ${2} ${3} "${tmpexps:-}" ${tmpexterndebuginfo} || return 1
- fi
-
- if [ -f ${projcache}/cache/$name.pacman -a "${upgrade}" != yes ]; then
- info "Existing ${projcache}/cache/$name.pacman will not be overwritten" $FUNCNAME
- if [ "${verify}" == yes ]; then
- local spath=${projcache}/kits/$name.tar.gz
- if [ -f $spath ] && eval [ -s \${tmp${pltfm}} ]; then
- eval sed 's#^'$2/$3'#'$1'#' \${tmp${pltfm}} | newer -p $spath
- elif [ -f $spath ] && eval [ ! -s \${tmp${pltfm}} ]; then
- warn "$spath: Empty file list" $FUNCNAME
- elif [ ! -f $spath ] && eval [ -s \${tmp${pltfm}} ]; then
- error "$spath: No such file" $FUNCNAME
- fi
- fi
- else
- _clean ${1} ${2} ${3} || return 1
- if [ ${pltfm} = bin ]; then
- eval _copy -X ${tmpdebuginfo} ${1} ${2} ${3} \${tmp${pltfm}} || return 1
-# eval _copy -x \\*${debuginfosuffix} ${1} ${2} ${3} \${tmp${pltfm}} || return 1
- elif [ ${pltfm} = debuginfo ]; then
- eval _copy ${1} ${2} ${3} \${tmp${pltfm}} ${tmpexterndebuginfo} || return 1
- else
- eval _copy ${1} ${2} ${3} \${tmp${pltfm}} || return 1
- fi
- if [ ${pltfm} == noarch ]; then
- _install_dirs ${tmpdirs} || return 1
-# _copy -n ${1} ${2} ${3} ${tmpdirs} || return 1
- fi
- if [ ${pltfm} = debuginfo ] || [ "${mode:-}" = dbg ]; then
- _symlinks -I ${1} ${2} ${3} ${tmpexps:-} || return 1
- else
- _symlinks ${1} ${2} ${3} ${tmpexps:-} || return 1
- fi
- _tar ${2} ${3} ${name} || return 1
- if [ ${pltfm} == noarch ]; then
- _patch ${2} ${3} ${name} || return 1
- fi
-
- if [ ${pltfm} == bin ]; then
- # need assign the right value to cmtver
- cmtver=$(awk '$2 == "CMT" { print $3; exit }' ${tmpreq}) || { error "awk" $FUNCNAME; return 1; }
- _pre ${1} ${2} ${3} >|${tmppre} || return 1
- _post ${1} ${2} ${3} >|${tmppost} || return 1
- _pacman ${name} ${tmpreq} ${tmppost} ${tmppre} || return 1
- else
- _pacman ${name} ${tmpreq} || return 1
- fi
- fi
- [ ! -f $PACKRPM/bin/pack-rpm-proj.sh ] || . $PACKRPM/bin/pack-rpm-proj.sh || return 1
-done
-rm -f ${tmpbin} ${tmpsrc} ${tmpdoc} ${tmpnoarch} \
-${tmpdirs} ${tmpdebuginfo} \
-${tmpreq} ${tmpexps:-} ${tmppost} ${tmppre} ${tmppreun} \
-${tmpreqbin} ${tmpexterndebuginfo} || return 0
-}
-
-##################################### main ##########################################
-_mktmpdir $builddir || exit 1
-
-if [ ${uname} = Linux ]; then
- tar_basic_opts="--owner=root --group=root --mode=u=rwX,go=rX --no-anchored --wildcards"
- noleaf=yes
-# group=yes
-else
- tar_basic_opts=
- unset noleaf
-# unset group
-fi
-#tar_basic_opts="--owner=root ${group:+--group=root} --mode=u=rwX,go=rX --no-anchored --wildcards"
-#tar_basic_opts="--owner=root --group=root --mode=u=rwX,go=rX --no-anchored --wildcards"
-#tar_basic_opts="--owner=root --group=root --mode=u=rwX,go=rX"
-
-tmpdone=$(mktemp -t tmp.XXXXXXXXXX) || { error "mktemp" $FUNCNAME; exit 1; }
-
-if [ "$selected" ]; then
-
- _extern ${projbase}/${project}/${release} ${project} ${release} "${container:-}" >>$tmpdone
- #_extern ${projbase}/${project}/${release} ${project} ${release} ${container:+"$container"} >>$tmpdone
- #_extern ${projbase}/${project}/${release} ${project} ${release} "${container}"
-
-else
-
-#_settings >>${requires}
-if [ $project == AtlasRelease ]; then
- #_settings >>${requires}
- _proj ${projbase}/${release} ${project} ${release} ${requires}
-#elif [ $project == LCGCMT ]; then
-elif [ $project == LCGCMT -o $project == CMT ]; then
- _extern_proj ${projbase}/${project}/${release} ${project} ${release} ${container:+"$container"} >>$tmpdone
-else
- _proj ${projbase}/${project}/${release} ${project} ${release} ${container:+"$container"} >>$tmpdone
- #_proj ${projbase}/${project}/${release} ${project} ${release} ${requires}
-fi
-
-fi
-
-retval=$?
-[ $retval -eq 0 ] && [ -s "$tmpdone" ] && cat $tmpdone
-# [ -s "$tmpdone" ] && cat $tmpdone >&2
-[ -f "$tmpdone" ] && rm -rf $tmpdone
-
-rm -rf $tmpdir
-###rm -rf $requires
-exit $retval
-#####################################################################################
diff --git a/PackDist/scripts/pack.cfg.example b/PackDist/scripts/pack.cfg.example
deleted file mode 100755
index 8bdd4fe20a4d..000000000000
--- a/PackDist/scripts/pack.cfg.example
+++ /dev/null
@@ -1,145 +0,0 @@
-# This is an example configuration file for the pack-run.sh and proj-run.sh scripts.
-#
-# The configuration files read by the scripts are defaults.cfg,
-# ~/.pack.cfg, the file specified in the environment variable PACKCFG,
-# the file specified with the -c command line option
-# (values from "earlier" files are overridden by "later" files).
-#
-# The format is: option = value # comments
-# or: option : value # comments
-#
-# (Command line options override values from the configuration files.)
-#
-# Report bugs to <Grigori.Rybkine@cern.ch>.
-#
-
-#cmthome: $HOME/cmthome-latest
-
-# AtlasSetup package root
-#setuproot = /afs/cern.ch/atlas/software/dist/AtlasSetup
-
-# (command line option -L)
-#logdir: $HOME/log
-
-# directory to create packages in (command line option -C)
-#pacmancache=/data/pacman
-
-#patchdir: $HOME/patches
-
-# (command line option -b)
-#projbase=/afs/cern.ch/atlas/software/builds
-
-# the release to package
-# (command line option -r)
-#release=10.4.0
-
-# this option is only currently used to pack monolithic releases
-# as 'AtlasRelease' project
-# use the 'container' option for all (other) projects if needed
-#mainpkg=AtlasRelease # this is default
-
-# the packages to pack
-# (command line option -p)
-# (value accumulates over configuration files and -p command line options)
-#packages = AtlasShift oracle
-
-#mode = dbg
-
-# overwrite (yes) or not (no) existing tarballs of external packages
-# (command line option -F)
-#overwrite : yes # (boolean option)
-
-
-# The options ONLY supported by the proj-run.sh script.
-#
-
-# directory to create external packages in, takes precedence over pacmancache value
-# (command line option -X)
-#externcache = /data/Proj/extern
-
-# directory to create project packages in, takes precedence over pacmancache value
-# (command line option -J)
-#projcache = /data/Proj/proj
-
-# directory to create RPMs in (command line option -o)
-#rpmdir=/data/rpms
-
-# directory to create external RPMs in, takes precedence over rpmdir value
-# (command line option -x)
-#externdir = /data/Proj/extern
-
-# directory to create project RPMs in, takes precedence over rpmdir value
-# (command line option -j)
-#projdir = /data/Proj/proj
-
-# the project to pack
-# (command line option -P)
-#project = AtlasSimulation #AtlasCore #AtlasConditions
-
-# container package specification for the project to pack
-# this option is useful if the cmt/project.cmt file
-# does not specify the container package
-#container: container-name [access-path]
-
-# additional tag(s) for setup
-# (command line option -t)
-# the value may be a space or comma separated list
-#tags: 32 # to pack 32-bit build on 64-bit machine
-
-# CMTCONFIG (platform tag) for setup
-# (command line option -T)
-# the value shall be a CMTCONFIG value recognised by the setup procedure/tool
-#cmtconfig: x86_64-slc6-gcc47-opt
-
-# package (yes) or not (no) documentation files
-# (command line option -d)
-#docfiles: yes # (boolean option)
-
-# overwrite (yes) or not (no) existing tarballs of project packages
-# (command line option -U)
-#upgrade: yes # (boolean option)
-
-# keep (yes) existing tarballs of settings packages or overwrite (no) them
-# if their versions differ from those in use
-# (command line option -k)
-#keep: yes # (boolean option)
-
-# recursively pack projects required by the project being packed
-# (command line option -R)
-# yes if starts with y or Y or is 1, no - otherwise
-# (the same applies to the other boolean options)
-#recursive: Yep # nope # (boolean option)
-
-# verify (yes) or not (no) that existing tarballs are up-to-date
-# (command line option -V)
-#verify: yes # (boolean option)
-
-# wait (yes) or not (no) until packaging completion
-# (command line option -w)
-#waiting: yes # (boolean option)
-
-# do not write anything to standard output
-# (command line option -q)
-#quiet: no # yes # (boolean option)
-
-# do not execute, only dump configuration
-# (command line option -n)
-#configure: no # yes # (boolean option)
-
-# directory to use for temporary files during packaging
-# (with enough space to copy the project into)
-# defaults to the TMPDIR environment variable if set, or /tmp
-# (command line option -B)
-#builddir = /data/kitbuild
-
-# CMT cache location
-# defaults to the CMT site cache (http://www.cmtsite.org/pacman/cache)
-#cmtcache = http://cern.ch/atlas-computing/links/kitsDirectory/CMT/pacman/cache
-
-# create (yes) or not (no) debug information packages (for not debug build)
-# (command line option -I)
-#debuginfo: no # (boolean option)
-
-# extention of debug information files (for not debug build)
-# (command line option -S)
-#debuginfosuffix = .debug
diff --git a/PackDist/scripts/platforms b/PackDist/scripts/platforms
deleted file mode 100755
index 45ff481b2b8c..000000000000
--- a/PackDist/scripts/platforms
+++ /dev/null
@@ -1,60 +0,0 @@
-i686-slc4-gcc345-opt
-i686-slc4-gcc345-dbg
-x86_64-slc4-gcc345-opt
-x86_64-slc4-gcc345-dbg
-i686-slc4-gcc34-opt
-i686-slc4-gcc34-dbg
-x86_64-slc4-gcc34-opt
-x86_64-slc4-gcc34-dbg
-i686-slc4-gcc41-opt
-i686-slc4-gcc41-dbg
-x86_64-slc4-gcc41-opt
-x86_64-slc4-gcc41-dbg
-i686-slc4-gcc43-opt
-i686-slc4-gcc43-dbg
-x86_64-slc4-gcc43-opt
-x86_64-slc4-gcc43-dbg
-i686-slc5-gcc34-opt
-i686-slc5-gcc34-dbg
-x86_64-slc5-gcc34-opt
-x86_64-slc5-gcc34-dbg
-i686-slc5-gcc43-opt
-i686-slc5-gcc43-dbg
-x86_64-slc5-gcc43-opt
-x86_64-slc5-gcc43-dbg
-i686-slc5-icc11-opt
-i686-slc5-icc11-dbg
-i686-slc5-gcc46-opt
-i686-slc5-gcc46-dbg
-x86_64-slc5-gcc46-opt
-x86_64-slc5-gcc46-dbg
-i686-slc5-gcc47-dbg
-i686-slc5-gcc47-opt
-x86_64-slc5-gcc47-dbg
-x86_64-slc5-gcc47-opt
-x86_64-slc6-gcc46-opt
-x86_64-slc6-gcc46-dbg
-i686-slc6-gcc47-opt
-i686-slc6-gcc47-dbg
-x86_64-slc6-gcc47-opt
-x86_64-slc6-gcc47-dbg
-i686-slc6-gcc48-opt
-i686-slc6-gcc48-dbg
-x86_64-slc6-gcc48-opt
-x86_64-slc6-gcc48-dbg
-x86_64-slc6-gcc49-opt
-x86_64-slc6-gcc49-dbg
-i386-mac104-gcc40-opt
-i386-mac104-gcc40-dbg
-ppc-mac104-gcc40-opt
-ppc-mac104-gcc40-dbg
-i386-mac105-gcc40-opt
-i386-mac105-gcc40-dbg
-i386-mac106-gcc42-opt
-i386-mac106-gcc42-dbg
-x86_64-mac106-gcc42-opt
-x86_64-mac106-gcc42-dbg
-x86_64-slc6-clang37-opt
-x86_64-slc6-clang37-dbg
-x86_64-slc6-clang38-opt
-x86_64-slc6-clang38-dbg
diff --git a/PackDist/scripts/pltfm-junk.ptn b/PackDist/scripts/pltfm-junk.ptn
deleted file mode 100755
index d9bfaca3ae44..000000000000
--- a/PackDist/scripts/pltfm-junk.ptn
+++ /dev/null
@@ -1,10 +0,0 @@
-*.o
-*.make
-*.stamp
-*.shstamp
-*.cmtref
-*.d
-*.dep
-*.in
-*.makesav
-*.makecmtsave
diff --git a/PackDist/scripts/proj-run.sh b/PackDist/scripts/proj-run.sh
deleted file mode 100755
index bcde0b560d86..000000000000
--- a/PackDist/scripts/proj-run.sh
+++ /dev/null
@@ -1,622 +0,0 @@
-#!/bin/bash
-
-[ "$PROJRUNDBG" ] && set -x
-
-scriptdir=$(dirname $0)
-. $scriptdir/pack-common.sh
-scriptdir=$(abspath $scriptdir)
-export scriptdir
-
-help ()
-{
-cat <<EOF
-Usage: `basename $0` [OPTION]...
-Pack project with external packages it depends upon, or only external package(s).
-
- -L <path> create log file in directory <path>
- -C <path> create packages in directory <path>
- -X <path> create external packages in directory <path>
- (takes precedence over -C value)
- -J <path> create project packages in directory <path>
- (takes precedence over -C value)
- -o <path> create RPMs in directory <path>
- -x <path> create external RPMs in directory <path>
- (takes precedence over -o value)
- -j <path> create project RPMs in directory <path>
- (takes precedence over -o value)
- -b <path> pack project located in project base directory <path>
- -P <project> pack project <project>
- -r <id> pack project release <id>
- -p <package> pack external package <package> (may be multiple)
- -D pack debug build
- -I create debug information packages (for not debug build)
- -S <suffix> suffix of debug information files (for not debug build)
- -t <tag>[,<tag>...] use additional tag(s) for setup (may be multiple)
- -T <cmtconfig> force CMTCONFIG <cmtconfig> (platform tag) for setup
- -d pack documentation files also
- -F overwrite existing tarballs of external packages
- -U overwrite existing tarballs of project packages
- -k keep existing tarballs of settings packages
- (default is overwrite if their versions differ from those in use)
- -R recursively pack projects required by the project being packed
- -V verify that existing tarballs (of project and/or external packages) are up-to-date
- -w wait until packing completion
- -q do not write anything to standard output
- -n do not execute, only dump configuration
- -B <path> use directory <path> for temporary files
- -c <path> use configuration file <path>
- -h display this help and exit
- -v output version information and exit
-
-The PACKOPTS environment variable specifies a space separated list of default options
-to be placed in front of any explicit options.
-
-Report bugs to <Grigori.Rybkine@cern.ch>.
-EOF
-}
-
-version ()
-{
-if [ -r $scriptdir/../ChangeLog ]; then
-printf "`basename $0` (PackDist) %s\nWritten by Grigori Rybkine.\n" \
-`sed -n '/^[[:blank:]]*PackDist-\([0-9][0-9]\(-[0-9][0-9]\)\{2,3\}\)[[:blank:]]*$/{s//\1/p
-q
-}' $scriptdir/../ChangeLog`
-else
-printf "`basename $0` (PackDist) %s\nWritten by Grigori Rybkine.\n" \
-`cd $scriptdir/../cmt && cmt show version|sed -n '/^[[:blank:]]*PackDist-\([0-9][0-9]\(-[0-9][0-9]\)\{2,3\}\)[[:blank:]]*$/s//\1/p'`
-fi
-}
-
-parse_opts ()
-{
-local msg="Try '`basename $0` -h' for more information."
-
-while getopts ":L:C:X:J:o:x:j:b:P:r:p:DIS:t:T:dFUkRVwqnB:c:hv" opt; do
- case $opt in
- L) eval logdir=${OPTARG} ;;
- C) eval pacmancache=${OPTARG} ;;
- X) eval externcache=${OPTARG} ;;
- J) eval projcache=${OPTARG} ;;
- o) eval rpmdir=${OPTARG} ;;
- x) eval externdir=${OPTARG} ;;
- j) eval projdir=${OPTARG} ;;
- b) eval projbase=${OPTARG} ;;
- P) project=${OPTARG} ;;
- r) release=${OPTARG} ;;
- p) if [ "$packages" ]; then
- packages="$packages ${OPTARG}"
- else packages=${OPTARG}; fi ;;
- D) mode=dbg ;; # Debug
- I) debuginfo=yes ;;
- S) debuginfosuffix=${OPTARG} ;;
- t) if [ "$tags" ]; then
- tags="$tags ${OPTARG}"
- else tags=${OPTARG}; fi ;;
- T) cmtconfig=${OPTARG} ;;
- d) docfiles=yes ;;
- F) overwrite=yes ;; # Fresh
- U) upgrade=yes ;; # Upgrade
- k) keep=yes ;;
- R) recursive=yes ;;
- V) verify=yes ;;
- w) waiting=yes ;;
- q) quiet=yes ;;
- n) configure=yes ;;
- B) eval builddir=${OPTARG} ;;
- c) config_read -e ${OPTARG} || return 1 ;;
- h) help ; exit 0 ;;
- v) version ; exit 0 ;;
- \?) error "Invalid option: -${OPTARG}\n$msg" $FUNCNAME; return 1 ;;
- :) error "Argument required for option: -${OPTARG}\n$msg" $FUNCNAME; return 1 ;;
- esac
-done
-
-shift $(($OPTIND - 1))
-
-[ $# -eq 0 ] || { error "Invalid argument(s): $*\n$msg" $FUNCNAME; return 1; }
-}
-
-config_read ()
-{
-_error_level=0
-tmpcfg=$(mktemp -t tmp.XXXXXXXXXX) || { error "mktemp" $FUNCNAME; return 1; }
-tmperr=$(mktemp -t tmp.XXXXXXXXXX) || { error "mktemp" $FUNCNAME; return 1; }
-for f; do
- if [ "X$f" = "X-e" ]; then
- _error_level=2
- continue
- elif [ "X$f" = "X-w" ]; then
- _error_level=1
- continue
- elif [ "X$f" = "X-i" ]; then
- _error_level=0
- continue
- fi
-# [ -f "$f" ] || continue
- if [ ! -r "$f" ]; then
- case ${_error_level} in
- 2) error "Cannot read file '$f'" $FUNCNAME; return 1 ;;
- 1) warn "Cannot read file '$f'" $FUNCNAME; continue ;;
- 0) continue ;;
- esac
- fi
-# awk -v tmperr=$tmperr '
- awk 'BEGIN { tmperr="'$tmperr'" }
- NF == 0 || /^#/ { next }
- { sub(/[ \t]#.*$/, " "); if (NF == 0) next }
- /^[ \t]*[^ \t=:]+[ \t]*[=:]/ { sub(/[=:]/, " "); print; next }
- { printf "%s: line %d: %s\n", FILENAME, NR, $0 >> tmperr }
-# { printf "%s: line %d:\n%s\n", FILENAME, NR, $0 >> tmperr }
- ' "$f" >>$tmpcfg || { error "awk" $FUNCNAME; return 1; }
-done
-[ -s $tmperr ] &&
-{ error "Invalid syntax:\n$(<$tmperr)" $FUNCNAME; rm -f $tmperr $tmpcfg; return 2; }
-rm -f $tmperr
-while read opt val; do
- case $opt in
- cmthome) eval cmthome=${val} ;; # eval ${opt}=${val}
- setuproot) eval setuproot=${val} ;; # eval ${opt}=${val}
- logdir) eval logdir=${val} ;;
- pacmancache) eval pacmancache=${val} ;;
- externcache) eval externcache=${val} ;;
- projcache) eval projcache=${val} ;;
- rpmdir) eval rpmdir=${val} ;;
- externdir) eval externdir=${val} ;;
- projdir) eval projdir=${val} ;;
- patchdir) eval patchdir=${val} ;;
- projbase) eval projbase=${val} ;;
- project) project=${val} ;;
- release) release=${val} ;;
- mainpkg) mainpkg=${val} ;;
- container) container="${val}" ;;
- packages) if [ "$packages" ]; then
- packages="$packages ${val}"
- else packages=${val}; fi ;;
- mode) mode=${val} ;;
- debuginfo) debuginfo=${val} ;;
- debuginfosuffix) debuginfosuffix=${val} ;;
- tags) if [ "$tags" ]; then
- tags="$tags ${val}"
- else tags=${val}; fi ;;
- cmtconfig) cmtconfig=${val} ;;
- docfiles) docfiles=${val} ;;
- overwrite) overwrite=${val} ;;
- upgrade) upgrade=${val} ;;
- keep) keep=${val} ;;
- recursive) recursive=${val} ;;
- verify) verify=${val} ;;
- waiting) waiting=${val} ;;
- quiet) quiet=${val} ;;
- configure) configure=${val} ;;
- builddir) eval builddir=${val} ;;
- cmtcache) cmtcache=${val} ;;
- *) error "Invalid option: '${opt}'" $FUNCNAME; rm -f $tmpcfg; return 1 ;;
- esac
-done <${tmpcfg}
-#rm -f $tmperr $tmpcfg
-rm -f $tmpcfg
-}
-
-config_dump () {
-cat <<EOF
-cmthome: $cmthome
-setuproot: $setuproot
-logdir: $logdir
-pacmancache: $pacmancache
-externcache: $externcache
-projcache: $projcache
-rpmdir: $rpmdir
-externdir: $externdir
-projdir: $projdir
-patchdir: $patchdir
-projbase: $projbase
-project: $project
-release: $release
-mainpkg: $mainpkg
-container: $container
-packages: $packages
-mode: $mode
-debuginfo: $debuginfo
-debuginfosuffix: $debuginfosuffix
-tags: $tags
-cmtconfig: $cmtconfig
-docfiles: $docfiles
-overwrite: $overwrite
-upgrade: $upgrade
-keep: $keep
-recursive: $recursive
-verify: $verify
-waiting: $waiting
-quiet: $quiet
-configure: $configure
-builddir: $builddir
-cmtcache: $cmtcache
-EOF
-}
-
-parse_bool ()
-{
-local i v
-for i; do
- eval v=\$$i
- case $v in [yY]*|1) eval $i=yes ;; *) eval $i=no ;; esac
-done
-}
-
-config_read -e $scriptdir/defaults.cfg -i $HOME/.pack.cfg -w $PACKCFG || exit
-parse_opts $PACKOPTS "$@" || exit
-shift $#
-
-[ "${uname:-}" ] || uname=$(uname)
-
-[ -t 2 ] || printf "\n`version`\n\n" >&2
-
-parse_bool debuginfo docfiles overwrite upgrade keep recursive verify waiting quiet configure
-
-for pkg in $packages; do
- pkg=`echo $pkg | sed -e 's#^[^/]#/&#' -e 's#[^/]$#&/#'`
- if [ "$selected" ]; then
- selected="$selected $pkg"
- else selected=$pkg
- fi
-done
-
-[ -z "$tags" ] || tags=$(tr -s ' \t' ',,' <<<"$tags" | sed 's/^,//;s/,$//')
-#config_dump; exit 18
-
-[ $(wc -w <<<"$container") -le 2 ] ||
-{ error "Wrong container package specification: '$container'\n\t(must be: [container-name [access-path]])" $FUNCNAME; exit 1; }
-[ "$container" ] && container=$(sed 's/[ \t]\+/ /g' <<<"$container")
-
-: ${project:?}
-[ $project = CMT ] || : ${release:?}
-#: ${release:?}
-#: ${projbase:?}
-
-#[ -d "$projbase" ] && { projbase=$(abspath $projbase) || exit; }
-: ${cmtcache:?}
-
-if [ "${debuginfo:-}" = yes ] && [ "${mode:-}" != dbg ]; then
- [ -n "${debuginfosuffix:-}" ] || { error "'debuginfosuffix' must be non-empty" $FUNCNAME; exit 1; }
-fi
-
-_setuproot ()
-{
-setuproot=$(abspath $setuproot) || return
-export AtlasSetup=${setuproot}
-
-if [ -n "${projbase:-}" ]; then
- if [ -d ${projbase} ]; then
- cmtprojectpath=/afs/cern.ch/atlas/software/builds:/afs/cern.ch/atlas/project/tdaq/prod:/afs/cern.ch/atlas/offline/external
-#### _cmd=". $setuproot/scripts/asetup.sh ${project},${release},${mode},notest,ignore${tags:+,${tags}} --releasesarea=${projbase}:${cmtprojectpath} ${PROJRUNDBG:+--debugprint}"
- _cmd=". $setuproot/scripts/asetup.sh ${project},${release},${mode},notest,ignore${tags:+,${tags}} ${cmtconfig:+--cmtconfig=${cmtconfig}} --releasebase=${projbase} ${PROJRUNDBG:+--debugprint}"
- else
- warn "${projbase}: No such directory" $FUNCNAME
- fi
- [ -d ${projbase}/${project}/${release} ] || unset projbase
-fi
-[ -n "${_cmd:-}" ] ||
-_cmd=". $setuproot/scripts/asetup.sh ${project},${release},${mode},notest,ignore,builds${tags:+,${tags}} ${cmtconfig:+--cmtconfig=${cmtconfig}} ${PROJRUNDBG:+--debugprint}"
-
-info "asetup command=${_cmd}" $FUNCNAME
-
-[ "$PROJRUNDBG" ] && set +x
-${_cmd} || { error "${_cmd}" $FUNCNAME; return 1; }
-[ "$PROJRUNDBG" ] && set -x
-
-if [ -n "${projbase:-}" ]; then
- for p in $(echo $cmtprojectpath | tr -s ':' ' '); do
- path_append CMTPROJECTPATH $p
- done
- path_prepend CMTPROJECTPATH ${projbase}
-fi
-
-if [ -z "${projbase:-}" ]; then
- for _path in `echo "${CMTPATH:-}" | tr -s ':' ' '`; do
- if [ -d ${_path} ]; then
- [ ${release} = $(basename ${_path}) ] || continue
- _p=$(dirname ${_path}) || return
- [ ${project} = $(basename ${_p}) ] || continue
- projbase=$(dirname ${_p}) || return
- #projbase=$(dirname $(dirname ${_p})) || return
- break
- else
- warn "${_path}: No such directory" $FUNCNAME
- fi
- done
-fi
-unset CMTPATH
-if [ -z "${projbase:-}" ]; then
- for _p in `echo "${CMTPROJECTPATH:-}" | tr -s ':' ' '`; do
- if [ -d ${_p}/${project}/${release} ]; then
- projbase=${_p} || return
- break
- else
- warn "${_p}: No such directory" $FUNCNAME
- fi
- done
-fi
-[ -n "${projbase:-}" ] ||
-{ error "${project} ${release}: Cannot locate" $FUNCNAME; return 2; }
-
-#asetup LCGCMT,LCGCMT_59,builds,notest --releasebase=/afs/cern.ch/atlas/software/builds
-#asetup LCGCMT,LCGCMT_59,builds,notest --releasebase=/afs/cern.ch/atlas/offline/external
-#asetup LCGCMT,LCGCMT_59,builds,notest
-#asetup LCGCMT,LCGCMT_59,notest --releasebase=/afs/cern.ch/atlas/offline/external
-
-#> cmt version v1r22
-#> echo $CMTCONFIG
-# i686-slc5-gcc43-opt
-#> echo $CMTPROJECTPATH
-# /afs/cern.ch/atlas/software/builds:/afs/cern.ch/atlas/project/tdaq/prod:/afs/cern.ch/atlas/offline/external
-#> echo $CMTEXTRATAGS
-# ATLAS
-#> echo $CMTSITE
-# CERN
-
-#asetup AtlasConditions,16.3.0,builds,notest,ignore,noruntime
-#source $AtlasSetup/scripts/asetup.sh AtlasConditions,16.3.0,builds,notest,ignore,noruntime
-#. $setuproot/scripts/asetup.sh AtlasConditions,16.3.0,builds,notest,ignore,noruntime
-#asetup 16.2.0,builds,notest --releasebase=/afs/cern.ch/atlas/software/builds
-}
-
-_cmthome ()
-{
-cmthome=$(abspath $cmthome) || exit
-cd ${cmthome} || return 1
-unset CMTPATH CMTPROJECTPATH
-unset CMTROOT CMTSITE
-if [ $project == AtlasRelease ]; then
- [ "$PROJRUNDBG" ] && set +x
- . ${cmthome}/setup.sh -tag_add=${release},${mode},noTest${tags:+,${tags}} || exit 1
- [ "$PROJRUNDBG" ] && set -x
- if [ -z ${projbase} ]; then
- projbase=`cmt -q show macro_value ATLAS_DIST_AREA`
- : ${projbase:?}
- else
- export CMTPATH=$(sed 's#^:*[^:]*#'${projbase}/${release}'#' <<<"$CMTPATH")
- fi
- [ -d ${projbase}/${release} ] ||
- { error "${projbase}/${release} must exist and be a directory" $FUNCNAME; exit 1; }
-
-elif [ $project == LCGCMT -o $project == Gaudi ]; then
- [ "$PROJRUNDBG" ] && set +x
- . ${cmthome}/setup.sh -tag_add=${mode},noTest${tags:+,${tags}} || exit 1
- [ "$PROJRUNDBG" ] && set -x
- if [ -z ${projbase} ]; then
- projbase=`cmt -q show macro_value EXTERNAL_PROJECT_AREA`
- : ${projbase:?}
- fi
- [ -d ${projbase}/${project}/${release} ] ||
- { error "${projbase}/${project}/${release}: No such directory" $FUNCNAME; exit 1; }
-# export CMTPATH=${projbase}/${project}/${release}
-# export CMTPROJECTPATH=${projbase}
- path_prepend CMTPROJECTPATH ${projbase}
- export CMTPROJECTPATH
- unset CMTHOME
- unset CMTPATH
-
-elif [ $project == CMT ]; then
- [ "$PROJRUNDBG" ] && set +x
- . ${cmthome}/setup.sh -tag_add=${mode},noTest${tags:+,${tags}} || exit 1
- [ "$PROJRUNDBG" ] && set -x
- cmtinfo=(`cmt show uses | awk '
-$1 == "use" && $2 == "CMT" { gsub(/[()]/, "", $4); print $4, $3; exit }
-'`)
- [ ${#cmtinfo[*]} -eq 2 ] ||
- { error "Wrong CMT info: ${cmtinfo[*]}" $FUNCNAME; exit 1; }
- [ -z ${projbase} ] && { projbase=${cmtinfo[0]}; : ${projbase:?}; }
- [ -z ${release} ] && { release=${cmtinfo[1]}; : ${release:?}; }
-
- [ -d ${projbase}/${project}/${release} ] ||
- { error "${projbase}/${project}/${release}: No such directory" $FUNCNAME; exit 1; }
- #{ warn "${projbase}/${project}/${release}: No such directory" $FUNCNAME; }
- export CMTPROJECTPATH=${projbase}
- unset CMTHOME
- unset CMTPATH
-
-else
- [ "$PROJRUNDBG" ] && set +x
- . ${cmthome}/setup.sh -tag_add=${project},${release},${mode},noTest,builds${tags:+,${tags}} || exit 1
- [ "$PROJRUNDBG" ] && set -x
- if [ -z ${projbase} ]; then
- projbase=`echo $CMTPROJECTPATH | sed 's#^:\+##' | cut -d: -f1`
- : ${projbase:?}
- else
- #export CMTPATH=${projbase}/${project}/${release}
- #export CMTPROJECTPATH=$(sed 's#^:*[^:]*#'${projbase}'#' <<<"$CMTPROJECTPATH")
- path_prepend CMTPROJECTPATH ${projbase}
- export CMTPROJECTPATH
- fi
- unset CMTHOME
- unset CMTPATH
- [ -d ${projbase}/${project}/${release} ] ||
- { error "${projbase}/${project}/${release}: No such directory" $FUNCNAME; exit 1; }
-fi
-cd $OLDPWD
-}
-
-if [ $project = CMT ]; then
- unset setuproot
- [ "${cmthome:-}" ] ||
- { error "cmthome must be set" $FUNCNAME; exit 1; }
-fi
-
-if [ "${setuproot:-}" ]; then
- _setuproot || exit
-elif [ "${cmthome:-}" ]; then
- warn "Obsolete cmthome use" $FUNCNAME
- _cmthome || exit
-else
- error "Neither cmthome or setuproot set" $FUNCNAME; exit 1
-fi
-
-: ${CMTCONFIG:?}
-
-[ -z "$pacmancache" ] || pacmancache=$(abspath $pacmancache) || exit
-
-if [ -z "$externcache" ]; then
- [ ! -d "$pacmancache" ] &&
- { error "pacmancache or externcache must exist and be a directory" $FUNCNAME; exit 1; }
- info "setting externcache to pacmancache=$pacmancache" $FUNCNAME; externcache=$pacmancache
-fi
-[ -d "$externcache" ] || { error "externcache=$externcache must exist and be a directory" $FUNCNAME; exit 1; }
-
-if [ -z "$projcache" ]; then
- [ ! -d "$pacmancache" ] &&
- { error "pacmancache or projcache must exist and be a directory" $FUNCNAME; exit 1; }
- info "setting projcache to pacmancache=$pacmancache" $FUNCNAME; projcache=$pacmancache
-fi
-[ -d "$projcache" ] || { error "projcache=$projcache must exist and be a directory" $FUNCNAME; exit 1; }
-
-#[ -d "$pacmancache" ] || { error "$pacmancache must exist and be a directory" $FUNCNAME; exit 1; }
-
-for i in rpmdir externdir projdir; do
- eval d=\$$i
- if [ "$d" ]; then
- [ -d "$d" ] || { error "$d: No such directory" $FUNCNAME; exit 1; }
- eval export $i=$(abspath $d) || exit
- [ "$PACKRPM" ] || export PACKRPM=$(dirname $scriptdir)/share
- fi
-done
-
-if [ -z "$rpmdir" ]; then
- if [ "$externdir" ] && [ -z "$projdir" ]; then
- info "setting rpmdir to externdir=$externdir" $FUNCNAME
- export rpmdir=$(abspath $externdir) || exit
- elif [ -z "$externdir" ] && [ "$projdir" ]; then
- info "setting rpmdir to projdir=$projdir" $FUNCNAME
- export rpmdir=$(abspath $projdir) || exit
- fi
-fi
-
-[ -d "$patchdir" ] || { error "patchdir=$patchdir must exist and be a directory" $FUNCNAME; exit 1; }
-
-[ -d "$logdir" ] || { error "logdir=$logdir must exist and be a directory" $FUNCNAME; exit 1; }
-
-# Make paths absolute
-for i in logdir externcache projcache patchdir projbase; do
- eval v=\$$i; eval $i=$(abspath $v) || exit
-done
-[ -z "$builddir" ] || builddir=$(abspath $builddir) || exit
-
-if [ "$configure" == yes ]; then
- config_dump
- exit
-fi
-
-# Create auxiliary directories and files
-#[ -d $pacmancache/kits ] || mkdir $pacmancache/kits || exit 1
-#[ -d $pacmancache/cache ] || mkdir $pacmancache/cache || exit 1
-
-[ -d $externcache/kits ] || mkdir $externcache/kits || exit 1
-[ -d $externcache/cache ] || mkdir $externcache/cache || exit 1
-
-[ -d $projcache/kits ] || mkdir $projcache/kits || exit 1
-[ -d $projcache/cache ] || mkdir $projcache/cache || exit 1
-
-[ -d "$logdir/$project/$release" ] || mkdir -p $logdir/$project/$release || exit 1
-logfile=$logdir/$project/$release/`basename $0 .sh`-${CMTCONFIG}.log
-
-#TMPLOG=$(mktemp -t tmp.XXXXXXXXXX) || exit 1
-#mv --backup=t $TMPLOG $logfile || exit 1
-#chmod +r $logfile
-_backup ()
-{
-for f; do
- [ -f "$f" ] || continue
- i=1
- while [ -f ${f}.~${i}~ ]; do
- i=$(expr ${i} + 1) || { error "expr" $FUNCNAME; return 1; }
- done
- mv $f ${f}.~${i}~ || { error "mv" $FUNCNAME; return 1; }
-done
-}
-
-_backup $logfile || exit 1
-
-main ()
-{
-info "Start `date`\t@ `hostname`" $FUNCNAME
-
-[ -z "$mainpkg" -a $project == AtlasRelease ] && mainpkg=AtlasRelease
-: ${mainpkg:?}
-cd $projbase/${release}/$mainpkg/*/cmt || exit 1
-
-info "Start packing from `pwd -P`" $FUNCNAME
-
-if [ "$selected" ]; then
-# cmd="pacmancache=${pacmancache} patchdir=${patchdir} overwrite=${overwrite} platform=${platform} cmt -quiet broadcast -global -select='${selected}' - ${scriptdir}/pack-extern.sh"
- cmd="externcache=${externcache} patchdir=${patchdir} overwrite=${overwrite} cmt broadcast -global -select='${selected}' - ${scriptdir}/pack-extern.sh"
- info "$cmd" $FUNCNAME
- eval $cmd
-else
- requires=$(mktemp -t tmp.XXXXXXXXXX) || return 1
-
-# cmd="pacmancache=${pacmancache} patchdir=${patchdir} overwrite=${overwrite} platform=${platform} cmt -quiet broadcast -global - ${scriptdir}/pack-extern.sh"
- cmd="externcache=${externcache} patchdir=${patchdir} overwrite=${overwrite} cmt broadcast -global - ${scriptdir}/pack-extern.sh"
- info "$cmd" $FUNCNAME
- eval $cmd | tee -a ${requires} || { error "tee" $FUNCNAME; return 1; }
- sed '/^#/d' ${requires} >${requires}.tmp || { error "sed" $FUNCNAME; return 1; }
- mv -f ${requires}.tmp ${requires} || { error "mv" $FUNCNAME; return 1; }
-# sed -i '/^#/d' ${requires}
-
- cmd="projbase=${projbase} project=${project} release=${release} projcache=${projcache} upgrade=${upgrade} mode=${mode} debuginfo=${debuginfo} debuginfosuffix=${debuginfosuffix} docfiles=${docfiles} builddir=${builddir} cmthome=${cmthome} uname=${uname} setuproot=${setuproot} ${scriptdir}/pack-proj.sh"
- info "$cmd" $FUNCNAME
- eval requires=${requires} $cmd
-
- rm -f ${requires} || return 0
-
-fi
-
-info "Finish `date`\t@ `hostname`" $FUNCNAME
-}
-
-proj ()
-{
-info "Start `date`\t@ `hostname`" $FUNCNAME
-
-cmd="selected='$selected' projbase=${projbase} project=${project} release=${release} container='${container}' projcache=${projcache} upgrade=${upgrade} mode=${mode} debuginfo=${debuginfo} debuginfosuffix=${debuginfosuffix} docfiles=${docfiles} builddir=${builddir} cmthome=${cmthome} setuproot=${setuproot} externcache=${externcache} patchdir=${patchdir} overwrite=${overwrite} keep=$keep recursive=$recursive relocate=yes verify=$verify cmtcache=$cmtcache waiting=$waiting quiet=$quiet uname=${uname} ${scriptdir}/pack-proj.sh"
- info "$cmd" $FUNCNAME
- eval $cmd
-
-local retval=$?
-info "Finish `date`\t@ `hostname`" $FUNCNAME
-return $retval
-}
-
-# Do the packing
-printf "\n`version`\n\n" >>$logfile
-case $quiet in
- no) info "Current configuration:\n`config_dump`" $FUNCNAME 2>&1 | tee -a $logfile ;;
- yes) info "Current configuration:\n`config_dump`" $FUNCNAME >>$logfile 2>&1 ;;
- *) error "Invalid value: quiet: $quiet" $FUNCNAME ;;
-esac
-
-if [ $project == AtlasRelease ]; then
- { time main; } >>$logfile 2>&1 &
-# elif [ $project == LCGCMT ]; then
-# { time extern_proj; } >>$logfile 2>&1 &
-else
-
-case $waiting in
- no) case $quiet in
- no) { time proj; } >>$logfile 2>&1 &
- info "`date`\tPID: $!\t@ `hostname`" $FUNCNAME ;;
- yes) { time proj; } >>$logfile 2>&1 & ;;
- *) error "Invalid value: quiet: $quiet" $FUNCNAME ;;
- esac ;;
- yes) case $quiet in
- no) info "`date`\tPID: $$\t@ `hostname`" $FUNCNAME
- { time proj; } 2>&1 | tee -a $logfile ;;
- yes) { time proj; } >>$logfile 2>&1; retval=$? ;;
- *) error "Invalid value: quiet: $quiet" $FUNCNAME ;;
- esac ;;
-esac
-
-fi
-
-info "\n\nLog file: $logfile" $FUNCNAME
-
-exit $retval
diff --git a/PackDist/scripts/relink.py b/PackDist/scripts/relink.py
deleted file mode 100755
index 8e60ad2572af..000000000000
--- a/PackDist/scripts/relink.py
+++ /dev/null
@@ -1,322 +0,0 @@
-#!/usr/bin/env python
-
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-"""File: relink.py
-
-Developed against Python 2.3
-"""
-
-__version__ = '0.9.0'
-__date__ = 'Tue Mar 15 2016'
-__author__ = 'Grigori Rybkine <Grigori.Rybkine@cern.ch>'
-
-import os, sys
-import getopt
-import shutil
-
-def cwd():
- _cwd = os.getenv('PWD')
- _gcwd = os.getcwd()
- if _cwd and os.path.samefile(_cwd, _gcwd):
- return _cwd
- else:
- return _gcwd
-
-def cd(path):
- new = os.path.normpath(os.path.join(cwd(), path))
- os.chdir(path)
- _gcwd = os.getcwd()
- if os.path.samefile(new, _gcwd):
- os.environ['PWD'] = new
- else:
- os.environ['PWD'] = _gcwd
-
-def commonhead(list1, list2):
- c = -1
- for i in xrange(min(len(list1), len(list2))):
- if list1[i] == list2[i]: c = i
- else: break
- #if c > -1: print >> sys.stderr, 'commonhead:', c, list1, list2
- return list1[:c + 1]
-
-#def relink(path, v = False):
-def relink(path, Arg = (None, True, False)):
- """Convert absolute link `path' (within current directory, to file in PROJ_SRC) to relative link.
-
- Current directory is a copy of (a part of) PROJ_SRC.
- Remove `path' if it is a dangling link, or points to a file outside PROJ_SRC.
- If the conversion results in a dangling link, replace `path' with a copy
- in case it originally pointed to a regular file in PROJ_SRC,
- create the empty target directory in case it originally pointed to a directory.
- """
- if not os.path.islink(path): return
-
- exps = Arg[0]
- debuginfo = Arg[1]
- v = Arg[2]
-
- path = os.path.normpath(path)
- s = os.readlink(path)
- snorm = os.path.normpath(s)
- p = os.path.join(PROJ_SRC, path)
- hatpath = os.path.join(PROJ_HAT, path)
-
- if snorm.startswith(PROJ_SRC + os.sep):
- srcpath = snorm[len(PROJ_SRC + os.sep):]
-
- pathl = path.split(os.sep)
- srcpathl = srcpath.split(os.sep)
- head = commonhead(pathl, srcpathl)
-
- if len(pathl) > len(head) + 1 or \
- len(pathl) == len(head) + 1 and len(srcpathl) > len(head):
- # pathl: o o o a b # pathl: o o o a
- # srcpathl: o o o c d e # srcpathl: o o o c d e
- # head: o o o or # head: o o o
- # --------------------- # ---------------------
- # src: ../c/d/e # src: c/d/e
- srcl = [os.pardir for i in xrange(len(pathl) - 1 - len(head))] + srcpathl[len(head):]
- src = os.path.join(*srcl)
- elif len(pathl) == len(head) + 1 and len(srcpathl) == len(head):
- # pathl: o o o a
- # srcpathl: o o o
- # head: o o o
- # ---------------------
- # src: .
- src = os.curdir
- if v: print >> sys.stderr, 'detected symlink to current directory', `hatpath`, '->', `src`
- elif len(pathl) == len(head):
- src = os.path.join(*srcpathl[len(head) - 1:])
- if len(srcpathl) == len(head):
- # pathl: o o a
- # srcpathl: o o a
- # ---------------------
- # src: a
- if v: print >> sys.stderr, 'detected symlink to itself', `hatpath`, '->', `src`
- else:
- # pathl: o o a
- # srcpathl: o o a c
- # ---------------------
- # src: a/c
- if v: print >> sys.stderr, 'detected too many levels of symlinks', `hatpath`, '->', `src`
- else:
- print >> sys.stderr, 'detected UNFORESEEN', `path`, '->', `srcpath`
- return
-
- _srcpath = os.path.normpath(os.path.join(os.path.dirname(path), src))
- assert srcpath == _srcpath, '%s:\n%s not equal to %s' % (path, `srcpath`, `_srcpath`)
-
- os.remove(path)
- if os.path.isfile(srcpath) or os.path.isdir(srcpath):
- try:
- os.symlink(src, path)
- except (IOError, os.error), why:
- print >> sys.stderr, 'Cannot symlink %s -> %s: %s' % (`hatpath`, `src`, str(why))
- else:
- if v: print 'symlinked', `hatpath`, '->', `src`
- else:
- if os.path.isfile(s):
- print >> sys.stderr, 'missing:', hatpath, '->', src
- try:
- shutil.copy2(s, path)
- except (IOError, os.error), why:
- print >> sys.stderr, 'Cannot copy %s -> %s: %s' % (`s`, `hatpath`, str(why))
- else:
- if v: print >> sys.stderr, 'copied', `s`, '->', `hatpath`
- elif os.path.isdir(s):
- print >> sys.stderr, 'missing:', hatpath, '->', src
- try:
- os.makedirs(srcpath)
- except (IOError, os.error), why:
- print >> sys.stderr, 'Cannot create directory %s: %s' % (`os.path.join(PROJ_HAT, srcpath)`, str(why))
- else:
- if v: print >> sys.stderr, 'created directory', `os.path.join(PROJ_HAT, srcpath)`
- try:
- os.symlink(src, path)
- except (IOError, os.error), why:
- print >> sys.stderr, 'Cannot symlink %s -> %s: %s' % (`hatpath`, `src`, str(why))
- else:
- if v: print 'symlinked', `hatpath`, '->', `src`
- else:
- print >> sys.stderr, 'dangling:', p, '->', s
- if v: print >> sys.stderr, 'removed', `hatpath`
-# elif os.path.normpath(os.path.join(os.path.dirname(p), s)).startswith(PROJ_SRC + os.sep):
- else:
- srcpath = os.path.normpath(os.path.join(os.path.dirname(p), s))
-# os.path.normpath(os.path.join(os.path.dirname(p), s)).startswith(PROJ_SRC + os.sep):
- if srcpath.startswith(PROJ_SRC + os.sep):
- if os.path.isfile(path) or os.path.isdir(path):
- if v: print 'relative:', hatpath, '->', s
- else:
- if os.path.isfile(p) or os.path.isdir(p):
- print >> sys.stderr, 'missing:', hatpath, '->', s
- else:
- print >> sys.stderr, 'dangling:', p, '->', s
- os.remove(path);
- if v: print >> sys.stderr, 'removed', `hatpath`
- else:
- if os.path.isfile(p) or os.path.isdir(p):
- if exps:
- dst = exps.destination(srcpath)
- if dst:
- os.remove(path)
- if not dst[1] or debuginfo:
- # if not dst[1] or DEBUGINFO == 'yes' or MODE == 'dbg':
- upl = [os.pardir for i in xrange(len(hatpath.split(os.sep)) - 1)]
- src = os.path.join(os.path.join(*upl), dst[0])
- try:
- os.symlink(src, path)
- except (IOError, os.error), why:
- print >> sys.stderr, 'Cannot symlink %s -> %s: %s' % (`hatpath`, `src`, str(why))
- else:
- if v: print 'symlinked', `hatpath`, '->', `src`
- else:
- print 'debuginfo:', hatpath, '->', s
- if v: print 'removed', `hatpath`
- else:
- print >> sys.stderr, 'not_exported:', srcpath
- os.remove(path);
- if v: print >> sys.stderr, 'removed', `hatpath`, '->', `s`
- else:
- print >> sys.stderr, 'external:', hatpath, '->', s
- os.remove(path);
- if v: print >> sys.stderr, 'removed', `hatpath`
- else:
- print >> sys.stderr, 'dangling:', p, '->', s
- os.remove(path);
- if v: print >> sys.stderr, 'removed', `hatpath`
-
-def doTree(top = cwd(), v = (None, True, True)):
- global PROJ_SRC, PROJ_HAT
- PROJ_SRC = os.path.normpath(os.path.join(cwd(), os.environ['projsrc']))
- PROJ_HAT = os.path.normpath(os.environ['projhat'])
-
- assert os.path.normpath(os.path.join(cwd(), top)).endswith(PROJ_HAT), '%s: Parent directory not %s' % (top, `PROJ_HAT`)
-
- def doList(v, dirpath, filenames):
- #print >> sys.stderr, dirpath, filenames
- for filename in filenames:
- path = os.path.join(dirpath, filename)
- #print >> sys.stderr, path
- if os.path.islink(path):
- relink(path, v)
-
- curdir = cwd()
- cd(top)
-
- os.path.walk(os.curdir, doList, v)
-
- cd(curdir)
-
-#if __name__ == '__main__':
- #fout = file(os.path.basename(sys.argv[0]) + '.out', 'w')
- #sys.stdout = fout
- #ferr = file(os.path.basename(sys.argv[0]) + '.err', 'w')
- #sys.stderr = ferr
-# if len(sys.argv) > 1:
-# for arg in sys.argv[1:]: doTree(arg)
-# else: doTree()
-
-class ExportPaths(object):
- def __init__(self, path):
- self.paths = {}
- f = open(path, 'U')
- try:
- for l in f:
- # expected line format: <src>\0<dst>\0<debuginfo_suffix>\n
- i = l[:-1].split('\0')
- assert len(i) == 3, '%s: %s: Wrong line format' % (path, `l`)
- r = os.path.realpath(i[0])
- i[0], i[1] = [os.path.normpath(p) for p in (i[0], i[1])]
- assert os.path.realpath(i[0]) == r, '%s (%s): Ambiguous export path' % (i[0], i[1])
- if i[2] == '': i[2] = '\0' # null character '\0' does not appear in file paths
-
- for (_r, s), (d, suf) in self.paths.iteritems():
- if r == _r:
- if i[0] == s and i[1] == d:
- print >>sys.stderr, '%s (%s): Duplicate export path' % (i[0], i[1])
- else:
- print >>sys.stderr, '%s (%s), %s (%s): Redundant export paths' % \
- (i[0], i[1], s, d)
-
- self.paths[(r, i[0])] = (i[1], i[2])
- finally:
- f.close()
-
- def destination(self, path):
- rpathl = os.path.realpath(path).lstrip(os.sep).split(os.sep)
- pathl = os.path.normpath(path).lstrip(os.sep).split(os.sep)
- for (r, s), (d, suf) in self.paths.iteritems():
- # first try with real paths
- rl = r.lstrip(os.sep).split(os.sep)
- head = commonhead(rl, rpathl)
-# print >>sys.stderr, 'destination: %s %s: %s' % \
-# (str(rl), str(rpathl), str(head))
- if len(rl) == len(head):
- return (os.path.join(*(d.split(os.sep) + rpathl[len(rl):])), rpathl[-1].endswith(suf))
- elif len(rpathl) == len(head):
- dl = d.lstrip(os.sep).split(os.sep)
- if len(dl) + len(rpathl) - len(rl) > 0:
- return (os.path.join(*dl[:len(dl) + len(rpathl) - len(rl)]), False)
- # then try with normalized paths
- sl = s.lstrip(os.sep).split(os.sep)
- head = commonhead(sl, pathl)
-# print >>sys.stderr, 'destination: %s %s: %s' % \
-# (str(sl), str(pathl), str(head))
- if len(sl) == len(head):
- return (os.path.join(*(d.split(os.sep) + pathl[len(sl):])), pathl[-1].endswith(suf))
- elif len(pathl) == len(head):
- dl = d.lstrip(os.sep).split(os.sep)
- if len(dl) + len(pathl) - len(sl) > 0:
- return (os.path.join(*dl[:len(dl) + len(pathl) - len(sl)]), False)
- return None
-
-def main(argv=[__name__]):
- self = os.path.basename(argv[0])
- try:
- opts, args = getopt.getopt(argv[1:],
- "hIS:H:X:",
- ["help", "version", "debuginfo", "project-src=", "project-hat=",
- "export-paths-from="])
- except getopt.error, e:
- print >>sys.stderr, '%s: %s' % (self, str(e))
- print >>sys.stderr, "Try '%s --help' for more information." % self
- return 1
-
- debuginfo = False
- for o, v in opts:
- if o in ("-h", "--help"):
- print sys.modules[__name__].__doc__
- return 0
- elif o in ("--version",):
- print '%s %s (%s)' % (self, __version__, __date__)
- print '%sWritten by %s.' % (os.linesep, __author__)
- return 0
- elif o in ("-I", "--debuginfo"):
- debuginfo = True
- elif o in ("-S", "--project-src"):
- os.environ['projsrc'] = v.rstrip(os.sep)
- elif o in ("-H", "--project-hat"):
- os.environ['projhat'] = v.strip(os.sep)
- elif o in ("-X", "--export-paths-from"):
- export_paths = ExportPaths(v)
-
-# if not args:
-# print >>sys.stderr, '%s: missing path argument' % self
-# print >>sys.stderr, "Try '%s --help' for more information." % self
-# return 1
-
- try:
- Arg = (export_paths, debuginfo, True)
- except NameError:
- Arg = (None, debuginfo, True)
-
-# print >> sys.stderr, Arg
-# return 17
-
- if args:
- for arg in args: doTree(arg, Arg)
- else: doTree(cwd(), Arg)
-
-if __name__ == '__main__':
- sys.exit(main(sys.argv))
diff --git a/PackDist/scripts/requirements.template b/PackDist/scripts/requirements.template
deleted file mode 100755
index fb2f8237699c..000000000000
--- a/PackDist/scripts/requirements.template
+++ /dev/null
@@ -1,47 +0,0 @@
-#
-# !!! DO NOT EDIT - GENERATED AUTOMATICALLY !!!
-#
-# Usage:
-#
-# . @INSTALL_PREFIX@/cmtsite/setup.sh -tag=<project>,<release>[,<cmtconfig>]
-#
-# or
-#
-# export ATLAS_TEST_AREA=<path-to-your-development-area>
-# . @INSTALL_PREFIX@/cmtsite/setup.sh -tag=<project>,<release>,<type>[,<cmtconfig>]
-#
-# where <type> is one of the following: simpleTest, oneTest, projectTest
-#
-# Two additional styles of override of the default CMTCONFIG value are possible:
-# 1. Specifying the forceConfig tag on the command line in which case the CMTCONFIG
-# environment variable is used to setup the build and runtime environments
-# 2. Specifying a subset of the opt/dbg, gcc34/gcc43, 32/64 and slc4/slc5 tags on
-# the command line, in which case the default configuration will be overridden
-# accordingly.
-#
-# Report bugs to <hn-atlas-releaseKitProblem@cern.ch>.
-#
-
-set CMTSITE STANDALONE
-set SITEROOT @INSTALL_PREFIX@
-
-macro ATLAS_DIST_AREA ${SITEROOT}
-
-apply_tag noTest
-tag_exclude simpleTest noTest
-tag_exclude oneTest noTest
-tag_exclude projectTest noTest
-
-apply_tag projectArea
-macro SITE_PROJECT_AREA ${SITEROOT}
-macro EXTERNAL_PROJECT_AREA ${SITEROOT}
-
-use AtlasLogin AtlasLogin-* $(ATLAS_DIST_AREA)
-
-#
-# This will be overridden by a known CMTCONFIG value (i.e. listed below),
-# if set via AtlasLogin above
-#
-macro cmtconfig_default @CMTCONFIG@
-
-set CMTCONFIG $(cmtconfig_default)
diff --git a/PackDist/scripts/src.ptn b/PackDist/scripts/src.ptn
deleted file mode 100755
index ed95aae52f89..000000000000
--- a/PackDist/scripts/src.ptn
+++ /dev/null
@@ -1,19 +0,0 @@
-src/*.c
-*src/*.cc
-src/*.cxx
-*.cpp
-*.f
-*.F
-*.f90
-*.F90
-*.FF90
-*.y
-*.l
-configure
-*.in
-*.age
-test/*.cxx
-srctest/*.cxx
-pool/*.cxx
-pool_plugins/*.cxx
-cpp_any/*.cxx
diff --git a/PackDist/share/bin/pack-rpm-extern.sh b/PackDist/share/bin/pack-rpm-extern.sh
deleted file mode 100644
index c5811bac3470..000000000000
--- a/PackDist/share/bin/pack-rpm-extern.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-
- if [ ${pltfm} = bin ]; then
- $PACKRPM/bin/pack-rpm.py "$name $package $version $platform" "$tmpreq" "" "" $(_getver $name) "${src[*]}" "${dst[*]}"
- elif [ ${pltfm} = debuginfo ]; then
- $PACKRPM/bin/pack-rpm.py "$name $package $version ${platform_debuginfo:-${CMTCONFIG}_debuginfo}" "$tmpreq" "" "" $(_getver $name) "${src[*]}" "${dst[*]}"
- fi
diff --git a/PackDist/share/bin/pack-rpm-proj.sh b/PackDist/share/bin/pack-rpm-proj.sh
deleted file mode 100644
index 51c3f78b736a..000000000000
--- a/PackDist/share/bin/pack-rpm-proj.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-
- if [ ${pltfm} == bin ]; then
- cmtver=$(awk '$2 == "CMT" { print $3; exit }' ${tmpreq}) || return 1
- _pre ${1} ${2} ${3} >|${tmppre} || return 1
- _post ${1} ${2} ${3} >|${tmppost} || return 1
- _preun ${1} ${2} ${3} >|${tmppreun} || return 1
- $PACKRPM/bin/pack-rpm.py "$name ${2} ${3} $pltfm" $tmpreq ${tmppost} ${tmppre} $(_getver $name) "" "" ${tmppreun} || return 1
- else
- $PACKRPM/bin/pack-rpm.py "$name ${2} ${3} $pltfm" $tmpreq "" "" $(_getver $name) || return 1
- fi
diff --git a/PackDist/share/bin/pack-rpm-settings.sh b/PackDist/share/bin/pack-rpm-settings.sh
deleted file mode 100644
index 7be95047db48..000000000000
--- a/PackDist/share/bin/pack-rpm-settings.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-
-if [ ${pkg[0]} = AtlasSetup ]; then
- _pre ${pkg[2]}/${pkg[0]} ${pkg[0]} ${pkg[1]} >|${tmppre}
-else
- _pre ${pkg[2]}/${pkg[0]}/${pkg[1]} ${pkg[0]} ${pkg[1]} >|${tmppre}
-fi
- $PACKRPM/bin/pack-rpm.py "$name ${pkg[0]} ${pkg[1]} noarch" "" "" ${tmppre} $(_getver $name)
diff --git a/PackDist/share/bin/pack-rpm.py b/PackDist/share/bin/pack-rpm.py
deleted file mode 100755
index faa01eca568c..000000000000
--- a/PackDist/share/bin/pack-rpm.py
+++ /dev/null
@@ -1,403 +0,0 @@
-#!/usr/bin/env python
-"""File: pack-rpm.py
-
-This script builds (binary) rpm package
-based on meta-data provided and from a tarball built
-by the PackDist package.
-"""
-
-__version__ = '0.12.0'
-__date__ = 'Tue Mar 15 2016'
-__author__ = 'Grigori Rybkine <Grigori.Rybkine@cern.ch>'
-
-#
-# Write spec file and build (binary) rpm package
-#
-# Parameters: 'name package/project version [architecture]' ['requires-file'
-# ['postinstall-script' ['preinstall-script' ['version' ['source-paths' 'destination-paths'
-# ['preuninstall-script']]]]]]
-#
-
-import sys, os
-import re
-import commands
-
-try:
- __path__ = [os.path.join(os.path.dirname(sys.modules[__name__].__file__), os.pardir, 'python')]
-except AttributeError, e:
- # with Python 2.2.3, sys.modules['__main__']
- # AttributeError: 'module' object has no attribute '__file__': even for scripts
- if __name__ == '__main__':
- __path__ = [os.path.join(os.path.dirname(sys.argv[0]), os.pardir, 'python')]
- else:
- raise
-from PackDistCommon import *
-
-def _getver(name, default='', type=None):
- fpath = os.path.join(os.environ['projcache'], 'specs', name + '.spec')
- if not os.access(fpath, os.R_OK): return default
- s = file(fpath).read()
- p = r'version[ \t]*:[ \t]*(?P<ver>[\w.]+)'
- m = re.search(p, s, re.I)
- if m: return m.group('ver')
- else: return default
-
-def info(message='', location=''):
- if message: message = ': ' + message
- if location: location += ': '
- print >> sys.stderr, "%s: %sINFO%s" % (os.path.basename(sys.argv[0]), location, message)
-
-def warn(message='', location=''):
- if message: message = ': ' + message
- if location: location += ': '
- print >> sys.stderr, "%s: %sWARNING%s" % (os.path.basename(sys.argv[0]), location, message)
-
-def error(message='', location=''):
- if message: message = ': ' + message
- if location: location += ': '
- print >> sys.stderr, "%s: %sERROR%s" % (os.path.basename(sys.argv[0]), location, message)
-
-def rpmfile(name, version, release, arch, type=None):
- cmd = 'rpm -D "NAME %s" -D "VERSION %s" -D "RELEASE %s" -D "ARCH %s" -E `rpm -E %%_rpmfilename`' % (name, version, release, arch)
- status, rpmfilename = commands.getstatusoutput(cmd)
- if status != 0:
- error(rpmfilename, rpmfile.__name__)
- raise CommandError(cmd, rpmfilename, exitstatus(status))
- if type == 'extern': rpmdir = os.getenv('externdir')
- elif type == 'proj': rpmdir = os.getenv('projdir')
- else: rpmdir = None
- if not rpmdir: rpmdir = os.getenv('rpmdir')
- if not rpmdir:
- cmd = 'rpm -E %_rpmdir'
- status, rpmdir = commands.getstatusoutput(cmd)
- if status != 0:
- error(rpmdir, rpmfile.__name__)
- raise CommandError(cmd, rpmfilename, exitstatus(status))
- return (rpmdir, rpmfilename)
-
-def _getalien(requires):
- reqs = []
- for r in requires:
- i = r.rfind(':')
- if i != -1: reqs.append((r[0:i], r[i+1:]))
- return reqs
-
-def _buildalien(aliendeps, buildarch):
- errs = list()
- builddir = _builddir()
- buildrootdir = _buildrootdir()
- tmppath = _tmppath()
- sourcedir = tmppath
- suffix = '.tar.gz'
- for d in aliendeps:
- i = d[1].find('-')
- if i == -1:
- warn('%s %s: No name or version specified' % (d[0], d[1]),
- _buildalien.__name__)
- continue
- else:
- _name = d[1][0:i]
- _version = d[1][i + 1:]
- if not _name:
- warn('%s %s: Empty name specified' % (d[0], d[1]),
- _buildalien.__name__)
- continue
- if not _version:
- warn('%s %s: Empty version specified' % (d[0], d[1]),
- _buildalien.__name__)
- continue
- try:
- rpmdir, rpmfilename = rpmfile(d[1], _version.replace('-', '.'), '1', buildarch, 'extern')
- except Error, e:
- errs.append(e)
- e.write()
- continue
- rpmpath = os.path.join(rpmdir, rpmfilename)
- if os.path.isfile(rpmpath):
- info('%s: File exists' % rpmpath)
- continue
- specpath = os.path.join(os.path.dirname(sys.argv[0]), os.pardir, 'specs', _name + '.spec')
- if not os.path.isfile(specpath):
- warn('%s: No such file' % specpath,
- _buildalien.__name__)
- continue
- _swversion = os.getenv('release')
- if not _swversion:
- _swversion = _version
- source0 = os.path.join(sourcedir, d[1] + suffix)
- if d[0].startswith('http://'):
- cmd = '{ cd %s && wget %s; } >&2' % (sourcedir, os.path.join(d[0], d[1] + suffix))
- status = os.system(cmd)
- if status != 0:
- errs.append(Error(_buildalien.__name__, cmd, exitstatus(status)))
- error(cmd, _buildalien.__name__)
- if os.path.exists(source0):
- os.remove(source0)
- continue
- else:
- warn('%s %s: No source found' % (d[0], d[1]),
- _buildalien.__name__)
- continue
-
- cmd = 'rpmbuild --define "_version %s" --define "_swversion %s" --define "_sourcedir %s" --define "_builddir %s" --define "_buildrootdir %s" --define "_rpmdir %s" --define "_tmppath %s" --target=%s -bb %s >&2' % (_version, _swversion, sourcedir, builddir, buildrootdir, rpmdir, tmppath, buildarch, specpath)
- status = os.system(cmd)
- if status != 0:
- errs.append(Error(_buildalien.__name__, cmd, exitstatus(status)))
- error(cmd, _buildalien.__name__)
- os.remove(source0)
-
- if errs: raise errs.pop()
-
-#macro AtlasDBRelease_requires "http://atlas.web.cern.ch/Atlas/GROUPS/DATABASE/pacman4/DBRelease:DBRelease-$(AtlasDBRelease_native_version)"
-
-def _tmppath():
- #tmppath = os.getenv('builddir')
- tmppath = os.getenv('TMPDIR') # should always be set
- if not tmppath:
- cmd = 'rpm -E %_tmppath'
- status, tmppath = commands.getstatusoutput(cmd)
- if status != 0:
- #error(tmppath, rpmfile.__name__)
- raise CommandError(cmd, tmppath, exitstatus(status))
- return tmppath
-
-def _builddir():
- builddir = os.getenv('builddir') # should always be set
- if not builddir:
- cmd = 'rpm -E %_builddir'
- status, builddir = commands.getstatusoutput(cmd)
- if status != 0:
- #error(builddir, rpmfile.__name__)
- raise CommandError(cmd, builddir, exitstatus(status))
- return builddir
-
-def _buildrootdir():
- buildrootdir = os.getenv('buildrootdir') # should always be set
- if not buildrootdir:
- cmd = 'rpm -E %_buildrootdir'
- status, buildrootdir = commands.getstatusoutput(cmd)
- if status != 0:
- #error(buildrootdir, rpmfile.__name__)
- raise CommandError(cmd, buildrootdir, exitstatus(status))
- return buildrootdir
-
-def _specdir():
- specdir = os.getenv('specdir') # should always be set
- if not specdir:
- cmd = 'rpm -E %_specdir'
- status, specdir = commands.getstatusoutput(cmd)
- if status != 0:
- #error(specdir, rpmfile.__name__)
- raise CommandError(cmd, specdir, exitstatus(status))
- return specdir
-
-##################################### main ##########################################
-
-NPVA = sys.argv[1].split() # Name Package Version Architecture (CMTCONFIG noarch)
- # Name Project Release Architecture (bin src doc noarch)
-if len(NPVA) < 3:
- error('%s: Too few parameters' % ' '.join(NPVA))
- sys.exit(2)
-if len(NPVA) == 3:
- NPVA.append(os.getenv('CMTCONFIG'))
-
-name = NPVA[0] # 'ROOT_3_10_02_0411_slc3_gcc323'
-
-if len(sys.argv) > 7 and sys.argv[6] and sys.argv[7]: # external software paths
- type = 'extern'
-else:
- type = 'proj'
-
-if len(sys.argv) > 5 and sys.argv[5]:
- version = sys.argv[5]
-else:
- try: version = str(int(_getver(name)) + 1)
- except ValueError:
- version = '1'
- print >> sys.stderr, "%s: Version set to %s" % (name, version)
- warn('%s: Set version to %s' % (name, version))
-
-summary = ' '.join(NPVA[1:3]) #name #'ROOT'
-
-if NPVA[3] in ['src', 'doc', 'noarch']:
- buildarch = 'noarch'
-else:
- buildarch = os.getenv('CMTCONFIG').split('-')[0] #'i686'
-
-# add dependencies
-extradeps = ['atlas-filesystem']
-requires = extradeps
-if len(sys.argv) > 2 and sys.argv[2]:
- reqfile = file(sys.argv[2])
- requires += reqfile.read().splitlines()
-requires = [r.split()[0] for r in requires if r]
-
-retval = 0
-# try to build dependencies from external tarballs, if can be found
-try:
- _buildalien(_getalien(requires), buildarch)
-except Error, e:
- retval += 1
-
-requires = ', '.join([r[r.rfind(':') + 1:] for r in requires])
-
-rpmdir, rpmfilename = rpmfile(name, version, '1', buildarch, type)
-rpmpath = os.path.join(rpmdir, rpmfilename)
-if os.path.isfile(rpmpath):
- info('%s: File exists' % rpmpath)
- sys.exit(retval)
-
-# add provides, if needed
-provides = []
-#if len(sys.argv) > 7 and sys.argv[6] and sys.argv[7]: # external software paths
-if type == 'extern':
- p = '_'.join([NPVA[1], NPVA[2], '_'.join(NPVA[3].split('-'))])
- if p != NPVA[0] and p not in provides:
- provides += [p]
-# IndexError: list index out of range
-provides = ', '.join(provides)
-
-# write spec file
-specinfile=file(os.path.join(os.path.dirname(sys.argv[0]), os.pardir, 'specs', 'proj.spec.in'))
-#IOError: [Errno 2] No such file or directory: '/data/rybkine/PAD/bin/specs/extern.spec.in'
-spec = specinfile.read() % vars()
-# KeyError: provides
-specinfile.close()
-
-if not requires:
- spec = re.sub(r'(?mi)^requires[ \t]*:[ \t\S]*\n', '', spec)
-if not provides:
- spec = re.sub(r'(?mi)^provides[ \t]*:[ \t\S]*\n', '', spec)
-
-# fill in %files section
-if type == 'extern': sourcedir = os.path.join(os.environ['externcache'], 'kits')
-elif type == 'proj': sourcedir = os.path.join(os.environ['projcache'], 'kits')
-else: sourcedir = None
-if not sourcedir:
- error('No source directory specified')
- sys.exit(2)
-
-source0 = os.path.join(sourcedir, name + '.tar.gz')
-if os.path.isfile(source0):
- if len(sys.argv) > 7 and sys.argv[6] and sys.argv[7]: # external software paths
- if NPVA[3].endswith('_debuginfo'):
- cmd = 'find . -noleaf \\( \\! -type d -o -empty \\) -print >|$RPM_BUILD_DIR/files.txt\n'
- cmd += '%{__sed} -i "s#^\\.#%%{prefix}#" $RPM_BUILD_DIR/files.txt\n'
- spec = spec.replace('%{_fixperms} .\n', '%{_fixperms} .\n' + cmd)
- spec = spec.replace('%files', '%files -f files.txt')
- else:
- src = sys.argv[6].split()
- dst = sys.argv[7].split()
- paths = ''
- for f in zip(src, dst):
- if not (os.path.isfile(f[0]) or os.path.isdir(f[0])):
- error("%s: No such file or directory" % f[0])
- retval += 1
- paths += os.path.join('%{prefix}', f[1]) + '\n'
- if paths:
- spec = spec.replace('%defattr(-,root,root,-)\n',
- '%defattr(-,root,root,-)\n' + paths)
-
- elif len(NPVA) > 3: # projects, settings
- if NPVA[3] == 'bin':
- cmd = 'find . -noleaf -name ' + os.getenv('CMTCONFIG') + ' -prune -print >|$RPM_BUILD_DIR/files.txt\n'
- cmd += '%{__sed} -i "s#^\\.#%%{prefix}#" $RPM_BUILD_DIR/files.txt\n'
- spec = spec.replace('%{_fixperms} .\n', '%{_fixperms} .\n' + cmd)
- spec = spec.replace('%files', '%files -f files.txt')
- elif NPVA[3] == 'debuginfo':
- cmd = 'find . -noleaf \\( \\! -type d -o -empty \\) -print >|$RPM_BUILD_DIR/files.txt\n'
- # cmd = 'find . -noleaf -name "*' + os.getenv('debuginfosuffix') + '" -print >|$RPM_BUILD_DIR/files.txt\n'
- cmd += '%{__sed} -i "s#^\\.#%%{prefix}#" $RPM_BUILD_DIR/files.txt\n'
- spec = spec.replace('%{_fixperms} .\n', '%{_fixperms} .\n' + cmd)
- spec = spec.replace('%files', '%files -f files.txt')
- elif NPVA[3] in ['src', 'doc']:
- cmd = 'find . -noleaf \\( \\! -type d -o -empty \\) -print >|$RPM_BUILD_DIR/files.txt\n'
- cmd += '%{__sed} -i "s#^\\.#%%{prefix}#" $RPM_BUILD_DIR/files.txt\n'
- spec = spec.replace('%{_fixperms} .\n', '%{_fixperms} .\n' + cmd)
- spec = spec.replace('%files', '%files -f files.txt')
- elif NPVA[3] == 'noarch':
- cmd = 'find . -noleaf -type d -name cmt -exec test -f \'{}\'/requirements \\; \
--exec touch -a \'{}\'/setup.sh \'{}\'/setup.csh \'{}\'/cleanup.sh \'{}\'/cleanup.csh \\; \
--not -exec test -f \'{}\'/Makefile \\; -exec %{__cp} -p $PACKRPM/specs/Makefile.cmt \'{}\'/Makefile \\;\n'
- spec = spec.replace('%{_fixperms} .\n', '%{_fixperms} .\n' + cmd)
- if NPVA[1] == 'AtlasSetup':
- # %{prefix}/NPVA[1]
- paths = os.path.join('%{prefix}', NPVA[1]) + '\n'
- else:
- # %{prefix}/NPVA[1]/NPVA[2]
- paths = os.path.join('%{prefix}', NPVA[1], NPVA[2]) + '\n'
- spec = spec.replace('%defattr(-,root,root,-)\n',
- '%defattr(-,root,root,-)\n' + paths)
- else:
- error("%s: Unknown platform: %s %s %s" % NPVA[3], NPVA[0], NPVA[1], NPVA[2])
- sys.exit(1)
- else:
- error("%s: Cannot build file list: %s" % source0, sys.argv[1])
- sys.exit(1)
-else:
- warn("%s: No such file" % source0)
- spec = re.sub(r'(?mi)^Source0[ \t]*:[ \t\S]*\n', '', spec)
-
- spec = re.sub(r'(?m)^%{__gzip}.*$', 'touch %{name}.ghost', spec)
- paths = '%ghost %{prefix}/%{name}.ghost\n'
- spec = spec.replace('%defattr(-,root,root,-)\n',
- '%defattr(-,root,root,-)\n' + paths)
- #spec = re.sub(r'(?s)\n%install.*\n%clean', '\n%install\n\n%clean', spec)
-
- #spec = re.sub(r'(?s)\n%files.*\Z', '\n', spec)
-
-logpath = '$RPM_INSTALL_PREFIX/var/log/scripts.log'
-# add preinstall-script
-if len(sys.argv) > 4 and sys.argv[4]:
- prefile = file(sys.argv[4])
- pre = prefile.read().replace('@INSTALL_PREFIX@', '$RPM_INSTALL_PREFIX')
- prefile.close()
- if pre:
- pre = '{ %s; } >>%s 2>&1' % (pre.rstrip(), logpath)
- #spec += '\n%pre\n' + pre + '\n'
- spec += '\n%pre\nshift $#\n' + pre + '\n' # better add to the script
-# echo "shell('$(sed s/@INSTALL_PREFIX@/\$PACMAN_INSTALLATION/g $4)')" >>${fpath}
-
-# add postinstall-script
-if len(sys.argv) > 3 and sys.argv[3]:
- postfile = file(sys.argv[3])
- post = postfile.read().replace('@INSTALL_PREFIX@', '$RPM_INSTALL_PREFIX')
- postfile.close()
- if post:
- post = '{ %s; } >>%s 2>&1' % (post.rstrip(), logpath)
- #spec += '\n%post\n' + post + '\n'
- spec += '\n%post\nshift $#\n' + post + '\n' # better add to the script
-# echo "shell(\"$(sed s/@INSTALL_PREFIX@/\$PACMAN_INSTALLATION/g $3)\")" >>${fpath}
-
-# add preuninstall-script
-if len(sys.argv) > 8 and sys.argv[8]:
- preunfile = file(sys.argv[8])
- preun = preunfile.read().replace('@INSTALL_PREFIX@', '$RPM_INSTALL_PREFIX')
- preunfile.close()
- if preun:
- preun = '{ %s; } >>%s 2>&1' % (preun.rstrip(), logpath)
- spec += '\n%preun\n' + preun + '\n'
-
-builddir = _builddir()
-buildrootdir = _buildrootdir()
-tmppath = _tmppath()
-specdir = _specdir()
-
-specpath = os.path.join(specdir, name + '.spec')
-specfile = file(specpath, 'w')
-specfile.write(spec)
-specfile.close()
-#info "Writing ${fpath}, version ${ver}" $FUNCNAME
-info("Wrote: %s, version %s" % (specpath, version))
-
-cmd = 'rpmbuild --define "_sourcedir %s" --define "_builddir %s" --define "_buildrootdir %s" --define "_rpmdir %s" --define "_tmppath %s" --target=%s -bb %s >&2' \
- % (sourcedir, builddir, buildrootdir, rpmdir, tmppath, buildarch, specpath)
-status = os.system(cmd)
-if status != 0:
- if exitstatus(status):
- retval = exitstatus(status)
- else:
- retval += 1
- error(cmd)
-
-sys.exit(retval)
diff --git a/PackDist/share/create-cmthome.sh b/PackDist/share/create-cmthome.sh
deleted file mode 100755
index a86a684e5a3e..000000000000
--- a/PackDist/share/create-cmthome.sh
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/sh
-# File: create-cmthome.sh
-#
-# Create cmthome with a customised requirements file
-# and a test area directory to use with the distribution kit
-#
-# Usage: ./create-cmthome.sh # from where the kit has been installed
-#
-# version 0.0.1
-#
-# Report bugs to <Grigori.Rybkine@cern.ch>.
-# Written by Grigori Rybkine.
-#
-
-[ -d cmtsite ] || { echo "cmtsite: No such directory"; exit 2; }
-if [ -d $HOME/cmthome ]; then
- echo $HOME/cmthome exists
- echo Trying to make a backup of $HOME/cmthome
- mv -v $HOME/cmthome $HOME/cmthome.bak || exit 1
-fi
-
-echo Copying
-cp -av cmtsite $HOME/cmthome
-
-[ -f $HOME/cmthome/requirements ] || { echo "$HOME/cmthome/requirements: No such file"; exit 2; }
-
-echo Customising $HOME/cmthome/requirements to use with the kit
-sed -i -e 's%#.*$%%' -e '/^$/d' -e 's/apply_tag noTest/#apply_tag noTest/' \
--e 's#\(use AtlasLogin.*\)#macro ATLAS_TEST_AREA ${HOME}/testarea\n\n\1#' \
-$HOME/cmthome/requirements
-echo ATLAS_TEST_AREA will be set to ${HOME}/testarea
-echo "check https://twiki.cern.ch/twiki/bin/view/Atlas/AtlasLoginPackage for further details"
-
-[ -d ${HOME}/testarea ] || mkdir -v ${HOME}/testarea
-
-echo Configuring to use CMT from the kit
-(. cmtsite/setup.sh >/dev/null 2>&1; cd $HOME/cmthome; cmt config)
diff --git a/PackDist/share/pack-relocate.sh b/PackDist/share/pack-relocate.sh
deleted file mode 100755
index 4c8dcce13cf8..000000000000
--- a/PackDist/share/pack-relocate.sh
+++ /dev/null
@@ -1,132 +0,0 @@
-#!/bin/sh
-
-msg="Usage: `basename $0` [OPTION]... SOURCE DEST
- or: `basename $0` [OPTION]... -t PATH...
-In first form, relocate the ATLAS distribution kit from SOURCE to DEST.
-In second form, locate the ATLAS distribution kit in PATH and transform
-as described for -t option (implies -i option).
-
- -i edit files in-place, without moving them from SOURCE to DEST
- -c only relocate files in cmtsite
- -t transform setup scripts so that full paths in them may be changed by setting ATLAS_RELEASE_BASE environment variable
- -h display this help and exit
- -v output version information and exit
-
-Report bugs to <Grigori.Rybkine@cern.ch>."
-
-ver="`basename $0` (PackDist) 0.7.0
-Written by Grigori Rybkine."
-
-unset _inplace _config _transform
-
-while getopts "icthv" opt; do
- case $opt in
- i) _inplace=y ;;
- c) _config=y ;;
- t) _transform=y ;;
- h) echo "$msg"; exit 0 ;;
- v) echo "$ver"; exit 0 ;;
- \?) echo "$msg"; exit 1 ;;
- esac
-done
-
-shift $(($OPTIND - 1))
-
-transform ()
-{
- p=$(find "$1" -path '*/cmtsite/requirements' -print -quit) || return
- [ -f "$p" ] || { echo >&2 "Cannot find release in $1"; return 1; }
- siteroot=$(awk '$1 == "set" && $2 == "SITEROOT" {print $3; exit}' $p) || return
- [ -d "$siteroot" ] || { echo >&2 "Cannot determine SITEROOT from $p"; return 1; }
- resiteroot=$(echo "${siteroot}"|awk '{gsub("/", "\\/");print}') || return
-
- for suffix in .sh .csh; do
-if [ ${suffix} = .csh ]; then
-sed_script='/^[^#]*'"${resiteroot}"'/{
-i\
-if (! ${?ATLAS_RELEASE_BASE}) then
-p
-i\
-else
-s/'"${resiteroot}"'/${ATLAS_RELEASE_BASE}/g
-a\
-endif
-}'
-elif [ ${suffix} = .sh ]; then
-sed_script='/^[^#]*'"${resiteroot}"'/{
-s/'"${resiteroot}"'/${ATLAS_RELEASE_BASE:-'"${resiteroot}"'}/g
-}'
-fi
-
-find "${siteroot}"/.cmtsite "${siteroot}"/cmtsite -noleaf -type f \( -name setup${suffix} -o -name cleanup${suffix} -o -name asetup${suffix} \) \! -exec grep -F -q ATLAS_RELEASE_BASE '{}' \; -exec sed -i "${sed_script}" '{}' \+ || retval=1
-
-[ "${_config:-}" != y ] || continue
-
-find "${siteroot}"/CMT -noleaf -type f \( -path \*/mgr/setup${suffix} -o -path \*/mgr/cleanup${suffix} \) \! -exec grep -F -q ATLAS_RELEASE_BASE '{}' \; -exec sed -i "${sed_script}" '{}' \+ || retval=1
-
-find "${siteroot}" -noleaf -type f \( -path \*/cmt/setup${suffix} -o -path \*/cmt/cleanup${suffix} \) \! -exec grep -F -q ATLAS_RELEASE_BASE '{}' \; -exec sed -i "${sed_script}" '{}' \+ || retval=1
-
-# optimised environment setup - setup scripts
-find "${siteroot}" -noleaf -type f \( -path \*/standalone-setup${suffix} -o -path \*/standalone-init${suffix} \) \! -exec grep -F -q ATLAS_RELEASE_BASE '{}' \; -exec sed -i "${sed_script}" '{}' \+ || retval=1
-done
-
-# optimised environment setup - requirements file
-sed_script='/^[^#]*'"${resiteroot}"'/{
-s/'"${resiteroot}"'/${SITEROOT}/g
-}'
-find "${siteroot}" -noleaf -type f -name requirements -exec grep -q '^# CMTFLAGS:' '{}' \; -exec grep -F -q "${siteroot}" '{}' \; -exec sed -i "${sed_script}" '{}' \+ || retval=1
- return ${retval}
-}
-
-retval=0
-if [ "${_transform-}" = y ]; then
- [ $# -ge 1 ] || set $PWD || exit
- for p; do
- transform "$p" || retval=1
- done
- exit ${retval}
-fi
-
-[ $# -eq 2 ] || { echo "$msg"; exit 1; }
-
-src=$(echo $1|sed -e 's#/\{1,\}#/#g' -e 's#/*$##')
-dst=$(echo $2|sed -e 's#/\{1,\}#/#g' -e 's#/*$##')
-
-if [ `expr $src : '/'` -eq 0 ]; then
- src=${PWD}/${src}
-fi
-if [ `expr $dst : '/'` -eq 0 ] ; then
- dst=${PWD}/${dst}
-fi
-
-[ -d ${src}/.cmtsite ] ||
-{ echo >&2 "Distribution kit in '$src' built with PackDist prior to PackDist-00-05-00: Cannot relocate"; exit 1; }
-
-if [ "${_inplace}" != y ]; then
- [ ! -d ${dst} ] || { echo >&2 "Directory '${dst}' already exists"; exit 2; }
- mv ${src} ${dst} || exit
- _dst=${dst}
-else
- _dst=${src}
-fi
-
-find ${_dst}/.cmtsite ${_dst}/cmtsite -noleaf -type f \( -name requirements\* -o -name asetup_defaults\* -o -name setup.sh -o -name setup.csh -o -name cleanup.sh -o -name cleanup.csh -o -name asetup.sh -o -name asetup.csh \) | xargs -r sed -i 's,'${src}','${dst}',g' || exit
-
-find ${_dst}/cmtsite -noleaf -type f -name asetup_defaults\* | xargs -r sed -i 's,'`dirname ${src}`','`dirname ${dst}`',g' || exit
-
-[ "${_config:-}" != y ] || exit 0
-
-find ${_dst}/CMT -noleaf -type f \( -path \*/mgr/setup.sh -o -path \*/mgr/setup.csh -o -path \*/mgr/cleanup.sh -o -path \*/mgr/cleanup.csh \) | xargs -r sed -i 's,'${src}','${dst}',g' || exit
-
-find ${_dst} -noleaf -type f \( -path \*/cmt/setup.sh -o -path \*/cmt/setup.csh -o -path \*/cmt/cleanup.sh -o -path \*/cmt/cleanup.csh \) | xargs -r sed -i 's,'${src}','${dst}',g' || exit
-
-find ${_dst}/DBRelease -noleaf -type f -name \*.xml | xargs -r sed -i 's,'${src}','${dst}',g' || exit
-
-sed_script='s,'"${src}"','"${dst}"',g'
-# optimised environment setup - setup scripts
-find "${_dst}" -noleaf -type f \( -path \*/standalone-setup.sh -o -path \*/standalone-init.sh -o -path \*/standalone-setup.csh -o -path \*/standalone-init.csh \) -exec sed -i "${sed_script}" '{}' \+ || retval=1
-
-# optimised environment setup - requirements file
-find "${_dst}" -noleaf -type f -name requirements -exec grep -q '^# CMTFLAGS:' '{}' \; -exec sed -i "${sed_script}" '{}' \+ || retval=1
-
-exit ${retval}
diff --git a/PackDist/share/pack-standalone.py b/PackDist/share/pack-standalone.py
deleted file mode 100755
index 125ffb11bc61..000000000000
--- a/PackDist/share/pack-standalone.py
+++ /dev/null
@@ -1,283 +0,0 @@
-#!/usr/bin/env python
-"""File: pack-standalone.py
-
-Usage: pack-standalone.py [OPTION]... PATH...
-Create a standalone pacman file from the pacman file built by the PackDist tools
-for project (binary) package(s) found in command line argument(s) PATH...
-Only dependencies on the same project packages and external software packages,
-if found in the same directory as the processed package, are preserved.
-
- -d, --debug print lots of debugging information
- -h, --help display this help and exit
- --version output version information and exit
-
-Report bugs to <Grigori.Rybkine@cern.ch>.
-"""
-
-__version__ = '0.3.1'
-__date__ = 'Sun Aug 01 2010'
-__author__ = 'Grigory Rybkin'
-
-import sys, os
-import re
-import commands
-import logging
-import shutil
-import getopt
-
-try:
- __path__ = [os.path.join(os.path.dirname(sys.modules[__name__].__file__), 'python')]
-except AttributeError, e:
- # with Python 2.2.3, sys.modules['__main__']
- # AttributeError: 'module' object has no attribute '__file__': even for scripts
- if __name__ == '__main__':
- __path__ = [os.path.join(os.path.dirname(sys.argv[0]), 'python')]
- else:
- raise
-from PackDistCommon import *
-
-class Parser(object):
- def __init__(self, package):
- self.package = package
- self.parsers = []
- p_cmt = re.compile(r'package\(\'CMTv\d+(?:r\d+)?(?:p\d+)?.*\'\)\s*')
- self.parsers.append((p_cmt, self.comment))
- p_settings = re.compile(r'package\(\'Atlas(?:Settings|Login|Setup)\'\)\s*')
- self.parsers.append((p_settings, self.comment))
- p_self = re.compile(r'package\(\'%s.+\'\)\s*' % \
- re.sub('[-.]', '_', '%s_%s' % \
- (self.package.project, self.package.release)))
- self.parsers.append((p_self, self.keep))
- p_other = re.compile(r'package\(\'(?P<package>.+)\'\)\s*')
- self.parsers.append((p_other, self.other))
- p_shell = re.compile(r'shell\s*\(.*\)\s*')
- self.parsers.append((p_shell, self.shell))
- p_any = re.compile(r'(?s).*')
- self.parsers.append((p_any, self.keep))
- self.pacman = []
- self.pre = True
- self.post = False
- def comment(self, line, match):
- self.pacman.append('#%s' % line)
- logger.debug('comment: %r\n%s' % (line, self.pacman))
- def keep(self, line, match):
- self.pacman.append(line)
- logger.debug('keep: %r\n%s' % (line, self.pacman))
- def other(self, line, match):
- logger.debug('other: %r %s' % (line, match.group('package')))
- try:
- pkg = Package(os.path.join(os.path.dirname(self.package.filename),
- match.group('package') + self.package.name[1]
- )
- )
- if pkg.type == 'extern':
- self.keep(line, match)
- logger.warning('%s: Kept external dependency %r',
- self.package.name[0], match.group('package'))
- else:
- self.comment(line, match)
- except IOError, e:
- logger.debug('other: %s', e, exc_info=True)
- self.comment(line, match)
- def skip(self, line, match):
- logger.debug('skip: %r\n%s' % (line, self.pacman))
- def shell(self, line, match):
- logger.debug('shell: %r\n%s' % (line, self.pacman))
- if self.pre:
- self.pre = False
- self.post = True
- l = self.package.pre + os.linesep
- self.pacman.append(l)
- logger.debug('append: %r\n%s' % (l, self.pacman))
- elif self.post:
- try:
- self.post = False
- l = self.package.post + os.linesep
- self.pacman.append(l)
- logger.debug('append: %r\n%s' % (l, self.pacman))
- except AttributeError, e:
- logger.debug('shell: %s', e, exc_info=True)
- self.comment(line, match)
- else:
- logger.warning('unexpected: %r' % line)
- self.comment(line, match)
-
- def parse(self):
- for line in self.package.pacman.splitlines(True):
- logger.debug('parsing: %r', line)
- for (p, a) in self.parsers:
- m = p.match(line)
- if m:
- a(line, m)
- break
-
- logger.debug('parsed: %s' % self.pacman)
- return ''.join(self.pacman)
-
-class Package(object):
- def __init__(self, filename):
- self.name = os.path.splitext(os.path.basename(filename))
- assert self.name[1] == '.pacman', '%s: Instantiated with file name' % `filename`
- self.filename = filename
-
- pacmanfile = open(self.filename)
- self.pacman = pacmanfile.read()
- pacmanfile.close()
-
- m = re.search(r'description(.*External.*)', self.pacman)
- if m: self.type = 'extern'
- else: self.type = 'proj'
-
- if self.name[0].startswith('CMTv'): self.type = 'CMT'
-
- if self.type in ('extern', 'CMT'): return
-
- name = self.name[0].split('_')
- self.project = name[0]
- if name[0] in ('AtlasSettings', 'AtlasLogin', 'AtlasSetup'):
- self.platform = 'noarch'
- self.release = re.search(r'version\(\'(?P<version>.+)\'\)',
- self.pacman).group('version')
- elif name[-1] in ('src', 'noarch'):
- self.platform = name[-1]
- self.release = '.'.join(name[1:-1])
- else:
- self.platform = '-'.join(name[-4:])
- self.release = '.'.join(name[1:-4])
- self.pre = 'shell(\'[ "$CMTROOT" ] && [ "$CMTBIN" ] && [ "$CMTCONFIG" ] || { echo "Project environment not set" >&2; exit 1; }\')'
-
- m = re.search(r'shell\s*\(".*?(?P<config>cd\s+\$PACMAN_INSTALLATION/(?P<project>[\w.-]+)/(?P<release>[\w.-]+)/(?P<cntnrcmt>([\w.-]+/)+cmt).*)"\)\s*', self.pacman)
- if m:
- self.project = m.group('project')
- self.release = m.group('release')
- self.cntnrcmt = m.group('cntnrcmt')
- self.post = 'shell("unset CMTPATH; %s")' % m.group('config')
- logger.debug('cntnrcmt: %s', m.group('cntnrcmt'))
- logger.debug('postinstall script:\n%s', self.post)
- else:
- logger.warning('%s %s %s: Cannot determine postinstall script',
- self.project, self.release, self.platform)
-
- logger.debug('%s %s %s: Initialised',
- self.project, self.release, self.platform)
-
- def standalone(self):
- if self.type in ('extern', 'CMT'):
- logger.debug('type %s: %s: Nothing to change',
- `self.type`, self.name[0])
- return 0
- if self.platform in ('src', 'noarch'):
- logger.debug('platform %s: %s: Nothing to change',
- `self.platform`, self.name[0])
- return 0
-
- if len(self.release.split('.')) < 4:
- logger.warning('%s %s %s %s: Does not look a patch project',
- self.name[0], self.project, self.release, self.platform)
-
- try:
- pacman_new = Parser(self).parse()
-# if pacman_new == ''.join(pacman):
- if pacman_new == self.pacman:
- logger.info('standalone: %s' % self.filename)
- return 0
-
- filename_real = os.path.realpath(self.filename)
- os.rename(filename_real, filename_real + '.save')
-# shutil.copy2(filename_real, filename_real + '.save')
-# logger.info('copied %s -> %s',
- logger.info('renamed %s -> %s',
- `filename_real`, `filename_real + '.save'`)
-
- pacmanfile = open(filename_real, 'w')
- pacmanfile.write(pacman_new)
- pacmanfile.close()
- logger.info('wrote: %s' % pacmanfile.name)
- return 0
-
- except (IOError, os.error), e:
-# logger.error(e)
- logger.error(e, exc_info=True)
-# pacmanfile.close()
- return 1
-
-def pkg_files(paths):
- ps = []
- errs = []
- for p in paths:
- if os.path.isfile(p) or os.path.isdir(p):
- ps.append(p)
- else:
- errs.append(p)
- for p in errs:
- print >> sys.stderr, 'No such file or directory:', p
- if not ps:
- raise InputError(' '.join(paths), 'No valid arguments')
-
- cmd = 'find ' + ' '.join(ps) + ' -noleaf -name "*.pacman"'
-# cmd = 'find ' + ' '.join(ps) + ' -noleaf \\( -name "*opt*.pacman" -o -name "*dbg*.pacman" \\)'
- sc, filenames = commands.getstatusoutput(cmd)
- if sc != 0:
- # The exit status for the command can be interpreted
- # according to the rules for the C function wait().
- raise CommandError(cmd, filenames, sc)
- return filenames.splitlines()
-
-def help():
- print sys.modules[__name__].__doc__
-
-def main(argv=[__name__]):
- self = os.path.basename(argv[0])
- try:
- opts, args = getopt.getopt(argv[1:],
- "hd",
- ["help", "version", "debug"])
- except getopt.error, e:
- print >>sys.stderr, '%s: %s' % (self, str(e))
- print >>sys.stderr, "Try '%s --help' for more information." % self
- return 1
-
- global logger
- logging.basicConfig()
- logger = logging.getLogger(self)
- logger.setLevel(logging.INFO)
-
-# ch = logging.StreamHandler()
-# ch.setFormatter(logging.Formatter("%(name)s: %(levelname)s: %(message)s"))
-# ch.setLevel(logging.INFO)
-
- for o, v in opts:
- if o in ("-h", "--help"):
- print sys.modules[__name__].__doc__
- return 0
- elif o in ("--version",):
- print '%s %s (%s)' % (self, __version__, __date__)
- print '%sWritten by %s.' % (os.linesep, __author__)
- return 0
- elif o in ("-d", "--debug"):
- logger.setLevel(logging.DEBUG)
-# ch.setLevel(logging.DEBUG)
-
-# logger.addHandler(ch)
-
- if not args:
- print >>sys.stderr, '%s: missing path argument' % self
- print >>sys.stderr, "Try '%s --help' for more information." % self
- return 1
-
- try:
- filenames = pkg_files(args)
- except InputError, e:
- print >> sys.stderr, e
- help()
- return 1
-
- sc = 0
- for filename in filenames:
- sc += Package(filename).standalone()
-
- if sc != 0: return 1
- else: return 0
-
-if __name__ == '__main__':
- sys.exit(main(sys.argv))
diff --git a/PackDist/share/python/PackDistCommon.py b/PackDist/share/python/PackDistCommon.py
deleted file mode 100755
index 0833847cfd10..000000000000
--- a/PackDist/share/python/PackDistCommon.py
+++ /dev/null
@@ -1,61 +0,0 @@
-"""File: PackDistCommon.py
-
-Common classes and utility functions of the PackDist package.
-"""
-
-__author__ = 'Grigori Rybkine <Grigori.Rybkine@cern.ch>'
-__version__ = '0.2.1'
-__date__ = 'Wed Oct 03 2012'
-
-__all__ = ['Error', 'InputError', 'CommandError', 'exitstatus']
-
-import sys
-import os
-
-class Error(Exception):
- """Base class for exceptions in this module."""
- def __str__(self):
- return ': '.join([str(arg) for arg in self.args])
- def write(self, file = sys.stderr):
- print >> file, '%s: %s' % (self.__class__.__name__, self)
-
-class InputError(Error):
- """Exception raised for errors in the input.
-
- Attributes:
- expression() -- input expression in which the error occurred
- message() -- explanation of the error
- """
-
- def __init__(self, expression, message):
- Error.__init__(self, expression, message)
- def expression(self):
- return self.args[0]
- def message(self):
- return self.args[1]
-
-class CommandError(Error):
- """Exception raised for errors executing shell commands.
-
- Attributes:
- args[0] -- shell command executing which the error occurred
- args[1] -- stderr and stdout of the command
- args[2] -- exit status of the command
- """
-
- def __init__(self, cmd, output, sc = None):
- Error.__init__(self, cmd, output, sc)
-
-def exitstatus (status):
- """Return child exit status, if child terminated normally, None otherwise.
-
- Parameter status: child process status information as returned by os.wait(),
- or os.waitpid(),
- os.system(), close() method of file object returned by os.popen(),
- commands.getstatusoutput()
- """
-
- if os.WIFEXITED(status):
- return os.WEXITSTATUS(status)
- else:
- return None
diff --git a/PackDist/share/rpm-erase.sh b/PackDist/share/rpm-erase.sh
deleted file mode 100755
index 8c2b686104ba..000000000000
--- a/PackDist/share/rpm-erase.sh
+++ /dev/null
@@ -1,239 +0,0 @@
-#!/bin/sh
-# File: rpm-erase.sh
-#
-# Author: Grigori Rybkine <Grigori.Rybkine@cern.ch>.
-#
-__version__='0.3.1'
-__date__='Fri Mar 28 2008'
-__author__='Grigori Rybkine <Grigori.Rybkine@cern.ch>'
-
-_help ()
-{
-cat <<EOF
-Usage: `basename $0` [OPTION]... PACKAGE [PACKAGE]...
-Erase (uninstall) RPM PACKAGE(s).
-
- -p <path> use the database in directory <path>
- -D erase as many package(s) upon which PACKAGE(s) depend as possible
- -k <pattern> do not erase package(s) which match (basic) regular expression <pattern>
- -y assume Yes to all queries and do not prompt
- -h display this help and exit
- -v output version information and exit
-
-Report bugs to <Grigori.Rybkine@cern.ch>.
-EOF
-}
-
-_version ()
-{
-echo "`basename $0` version $__version__"
-echo Written by Grigori Rybkine.
-}
-
-_parse_opts ()
-{
-local msg="Try '`basename $0` -h' for more information."
-
-unset dbpath deps keep reply
-
-while getopts ":p:Dk:yhv" opt; do
- case $opt in
- p) eval dbpath=${OPTARG} ;;
- D) deps=yes ;;
- k) keep="${OPTARG}" ;;
- y) reply=yes ;;
- h) _help; exit 0 ;;
- v) _version; exit 0 ;;
- \?) echo -e "`basename $0`: invalid option: -${OPTARG}\n$msg"; exit 1;;
- :) echo -e "`basename $0`: argument required for option: -${OPTARG}\n$msg"; exit 1;;
- esac
-done
-
-shift $(($OPTIND - 1))
-
-[ $# -gt 0 ] || { echo -e "`basename $0`: no argument(s) specified\n$msg"; exit 1; }
-}
-
-_reqpkg_d ()
-{
-#
-# depth-first
-#
-local created=no
-[ -f "$tmpdone" ] ||
-# Do not consider the /bin/sh capability
-{ tmpdone=$(mktemp) && created=yes && echo /bin/sh >>$tmpdone; } || return
-
-local tmpreq=$(mktemp) || return
-local tmppkg=$(mktemp) || return
-local reqnm pkg
-
-for pkg; do
-
-rpm ${dbpath:+--dbpath ${dbpath}} -q --quiet $pkg || continue
-rpm ${dbpath:+--dbpath ${dbpath}} -q --qf '[%{REQUIRENAME}\n]' $pkg >|$tmpreq || continue
-
-for reqnm in $(<$tmpreq); do
- grep -q "^$reqnm\$" $tmpdone && continue
- echo $reqnm >>$tmpdone || return
- rpm ${dbpath:+--dbpath ${dbpath}} -q --qf '[%{NAME}\n]' --whatprovides $reqnm >|$tmppkg || continue
- _exclude "$keep" $tmppkg || return
- cat $tmppkg || return
- if [ "$deps" ]; then
- _reqpkg_d $(<$tmppkg) || return
- fi
-done
-
-done
-
-rm -f $tmpreq $tmppkg
-[ $created == no ] || rm -f $tmpdone
-}
-
-_reqpkg ()
-{
-[ $# -gt 0 ] || return 0
-
-local created=no
-[ -f "$tmpdone" ] ||
-# Do not consider the /bin/sh capability
-{ tmpdone=$(mktemp) && created=yes && echo /bin/sh >>$tmpdone; } || return
-
-local tmpreq=$(mktemp) || return
-local tmpnm=$(mktemp) || return
-local tmppkg=$(mktemp) || return
-local pkg reqnm
-
-for pkg; do
-rpm ${dbpath:+--dbpath ${dbpath}} -q --quiet $pkg || continue
-rpm ${dbpath:+--dbpath ${dbpath}} -q --qf '[%{REQUIRENAME}\n]' $pkg >|$tmpnm || continue
-cat $tmpnm >>$tmpreq || return
-done
-sort -u -o $tmpreq $tmpreq || return
-
-for reqnm in $(<$tmpreq); do
- grep -q "^$reqnm\$" $tmpdone && continue
- echo $reqnm >>$tmpdone || return
- rpm ${dbpath:+--dbpath ${dbpath}} -q --qf '[%{NAME}\n]' --whatprovides $reqnm >|$tmpnm || continue
- cat $tmpnm >>$tmppkg || return
-done
-sort -u -o $tmppkg $tmppkg || return
-
-rm -f $tmpreq $tmpnm
-
-_exclude "$keep" $tmppkg || return
-cat $tmppkg || return
-if [ "$deps" ]; then
- _reqpkg $(<$tmppkg) || return
-fi
-
-rm -f $tmppkg
-[ $created == no ] || rm -f $tmpdone
-}
-
-_erase ()
-{
-local tmpdone=$(mktemp) || return
-
-local total=`<$1 sort -u | wc -l` || return
-local nmbr=0 erased pkg
-while true; do
- erased=0
- for pkg in $(<$1); do
- grep -q "^$pkg\$" $tmpdone && continue
- rpm ${dbpath:+--dbpath ${dbpath}} --test -e "$pkg" >/dev/null 2>&1 || continue
- rpm ${dbpath:+--dbpath ${dbpath}} -e "$pkg" || continue
- #let erased++ nmbr++ || return
- erased=`expr $erased + 1` || return
- nmbr=`expr $nmbr + 1` || return
- #echo -e "\t$nmbr: $pkg\t[$((nmbr*100/total))%]" || return
- #echo -e "\t$nmbr: $pkg\t[$(expr $nmbr '*' 100 / $total)%]" || return
- printf "%5d: %-65s [%3d%%]\n" $nmbr $pkg $(expr $nmbr '*' 100 / $total) || return
- echo $pkg >>$tmpdone || return
- _exclude "^$pkg\$" $1 || return
- done
- [ $erased -gt 0 ] || break
-done
-rm -f $tmpdone
-}
-
-_uniq ()
-{
-#
-# Discard all but one of identical lines from standard input,
-# writing to standard output.
-#
-awk '{ if (vue[$0] != 1) { vue[$0] = 1; print } }'
-}
-
-_exclude ()
-{
-#
-# Discard all lines of file $2 which match (basic) regular expression $1.
-#
-[ "$1" ] || return 0
-sed -i '\%'"$1"'%d' "$2"
-}
-
-main ()
-{
-_parse_opts "$@"
-shift $(($OPTIND - 1))
-
-local tmppkg=$(mktemp) || return
-
-if rpm ${dbpath:+--dbpath ${dbpath}} -q "$@" &&
- rpm ${dbpath:+--dbpath ${dbpath}} --test -e "$@"; then
-
- rpm ${dbpath:+--dbpath ${dbpath}} -q --qf '%{NAME}\n' "$@" | _uniq >>$tmppkg || return
-
- _exclude "$keep" $tmppkg || return
- if [ "$deps" ]; then
- echo -n "Building Dependency Tree..."
- local tmppkgs=$(mktemp) || return
- if [ "$depth" != yes ]; then
- _reqpkg $(<$tmppkg) | _uniq >>$tmppkgs || return
- else
- _reqpkg_d $(<$tmppkg) | _uniq >>$tmppkgs || return
- fi
- cat $tmppkgs >>$tmppkg || return
- rm -f $tmppkgs
- echo " Done"
-# _exclude "$keep" $tmppkg || return
- fi
-
- if [ "$reply" != yes ]; then
-
- echo "Try to REMOVE the following packages:"
- <$tmppkg sort -u | sed 's/^/\t/' || return
- echo "`<$tmppkg sort -u | wc -l` removed."
- echo -n "Do you want to continue? [Y/n] "
- read reply
-
- fi
-
- case "$reply" in
- y*|Y*)
- echo "Executing RPM (-e)..."
- _erase $tmppkg || return
- echo "Done."
- if [ -s $tmppkg ]; then
- echo "Could not REMOVE the following packages:"
- <$tmppkg sort -u | sed 's/^/\t/' || return
- echo "`<$tmppkg sort -u | wc -l` not removed."
- fi
- ;;
- *) echo "Abort.";;
- esac
-
-else
- rm -f $tmppkg
- return 1
-
-fi
-retval=$?
-rm -f $tmppkg
-return $retval
-}
-
-main "$@"
diff --git a/PackDist/share/setup-standalone.sh b/PackDist/share/setup-standalone.sh
deleted file mode 100644
index 67dbd3e5337e..000000000000
--- a/PackDist/share/setup-standalone.sh
+++ /dev/null
@@ -1,33 +0,0 @@
-#
-# Usage: . ./setup-standalone.sh [-H CMTHOME] [TAG]...
-# Setup the environment for standalone installation of a project
-# containing patches for the projects via asetup command [found in CMTHOME]
-# with the tags [TAG]...
-#
-# Example:
-# . ./setup-standalone.sh -H /afs/cern.ch/atlas/software/releases/17.0.3/cmtsite 17.0.3 32
-#
-
-unset cmthome
-if [ $# -ge 1 ]; then
- if [ $1 = -H ]; then
- shift
- if [ $# -ge 1 ]; then
- cmthome=$1; shift
- else
- echo "setup-standalone.sh: ERROR: Argument required for option: -H" >&2; return 1
- fi
- fi
-fi
-
-tags=$(echo $* | tr -s ' ' ',')
-shift $#
-
-if [ -n "$cmthome" ]; then
- source $cmthome/asetup.sh ${tags}
-else
- asetup ${tags}
-fi
-setupstandalonestatus=$?
-unset cmthome tags
-return $setupstandalonestatus
diff --git a/PackDist/share/specs/DBRelease.spec b/PackDist/share/specs/DBRelease.spec
deleted file mode 100644
index b66b16a02d84..000000000000
--- a/PackDist/share/specs/DBRelease.spec
+++ /dev/null
@@ -1,123 +0,0 @@
-%global __os_install_post /usr/lib/rpm/brp-compress %{nil}
-
-%{!?_version: %{error:_version not defined}}
-%{!?_release: %{expand:%define _release 1}}
-
-%{!?_swversion: %{error:_swversion not defined}}
-
-Name: DBRelease-%{_version}
-Version: %(echo %{_version} | %{__sed} 's/-/./g')
-Release: %{_release}
-Epoch: 0
-Summary: DBRelease
-
-Group: Application
-License: ATLAS
-URL: http://atlas.web.cern.ch/Atlas/GROUPS/DATABASE/pacman4/DBRelease/%{name}.tar.gz
-Packager: ATLAS Offline
-Source0: %{name}.tar.gz
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildArch: noarch
-
-AutoReqProv: no
-#Requires: AtlasLogin
-
-Prefix: /opt/atlas
-
-%description
-Package DBRelease for s/w rel %{_swversion}
-
-%prep
-
-%build
-
-%define _fixowner [ `%{__id_u}` = '0' ] && %{__chown_Rhf} root
-%define _fixgroup [ `%{__id_u}` = '0' ] && %{__chgrp_Rhf} root
-
-%install
-%{__rm} -rf $RPM_BUILD_ROOT
-%{__mkdir_p} $RPM_BUILD_ROOT%{prefix}
-cd $RPM_BUILD_ROOT%{prefix}
-%{__gzip} -dc %{SOURCE0} | %{__tar} -xvvf -
-if [ -h DBRelease/current ]; then
- %{__rm} -f DBRelease/current
-fi
-STATUS=$?
-if [ $STATUS -ne 0 ]; then
- exit $STATUS
-fi
-%{_fixowner} .
-%{_fixgroup} .
-%{_fixperms} .
-
-%clean
-%{__rm} -rf $RPM_BUILD_ROOT
-
-%files
-%defattr(-,root,root,-)
-%{prefix}/DBRelease/%{_version}
-
-%post
-{
-dbdir=$RPM_INSTALL_PREFIX/DBRelease/%{_version}
-# Edit XML configuration files, insert the full path to SQLite replicas
-fn=dblookup.xml
-fp=$dbdir/XMLConfig/$fn
-sed -i "s#sqliteGenerated:#sqlite_file:$dbdir/#" $fp
-# Edit file catalogs, insert the full paths to CondDB payload files
-fns="PoolCat_oflcond.xml PoolCat_tbcond.xml PoolCat_cmccond.xml \
-PoolCat_comcond.xml"
-fps=
-for fn in $fns; do
- fps="$fps $dbdir/poolcond/$fn"
-done
-sed -i "s#--GENERATED--#$dbdir/poolcond/#" $fps
-# Modify the installed kit
-#echo "Updating $RPM_INSTALL_PREFIX/cmtsite/requirements..."
-#sed -i.dborig '$a\
-#set DBRELEASE_INSTALLED %{_version}
-#/DBRELEASE/d' \
-#$RPM_INSTALL_PREFIX/cmtsite/requirements
-
-if [ -h $RPM_INSTALL_PREFIX/DBRelease/current ]; then
- rm -f $RPM_INSTALL_PREFIX/DBRelease/current
-fi
-ln -s %{_version} $RPM_INSTALL_PREFIX/DBRelease/current
-} >>$RPM_INSTALL_PREFIX/var/log/scripts.log 2>&1
-
-%changelog
-* Thu Dec 06 2012 Grigori Rybkine <Grigori.Rybkine@cern.ch>
-- Override system __os_install_post macro
-- Define _fixowner, _fixgroup macros since they are missing with RPM 4.8.0 and later
-- In %%install section, do not exit (so as to let RPM run __spec_install_post actions)
-
-* Tue Aug 08 2007 Grigori Rybkine <Grigori.Rybkine@cern.ch>
-- Make spec file more generic by introducing the _version, _release, _swversion macros
-- Prints message to stderr and return BADSPEC if the _version or _swversion macro
- not defined on the command line
-- Set the _release macro to 1 if not defined on the command line
-- Drop dependency on AtlasLogin (starting from DBRelease 4.1.1)
-
-* Sun Jul 01 2007 Grigori Rybkine <Grigori.Rybkine@cern.ch>
-- Make spec file more generic by introducing the dbversion, swversion parameters
-- Redirect the post scriptlet stdout and stderr to a log file
-
-* Mon Jan 22 2007 Grigori Rybkine <Grigori.Rybkine@cern.ch>
-- Update to version 3.1.1
-
-* Sun Dec 17 2006 Grigori Rybkine <Grigori.Rybkine@cern.ch>
-- Update to version 3.0.1
-
-* Sat Dec 02 2006 Grigori Rybkine <Grigori.Rybkine@cern.ch>
-- Update to version 2.9.1
-
-* Fri Dec 01 2006 Grigori Rybkine <Grigori.Rybkine@cern.ch>
-- Update to new version (3.0-LST)
-- Modify the post scriptlet
-
-* Sat Oct 21 2006 Grigori Rybkine <Grigori.Rybkine@rhul.ac.uk>
-- Modify the post scriptlet (2.8-2)
-
-* Sun Oct 15 2006 Grigori Rybkine <Grigori.Rybkine@rhul.ac.uk>
-- First spec file for DBRelease (2.8-1)
diff --git a/PackDist/share/specs/Makefile.cmt b/PackDist/share/specs/Makefile.cmt
deleted file mode 100644
index c2c9dbbed79a..000000000000
--- a/PackDist/share/specs/Makefile.cmt
+++ /dev/null
@@ -1,4 +0,0 @@
-include $(CMTROOT)/src/Makefile.header
-
-include $(CMTROOT)/src/constituents.make
-
diff --git a/PackDist/share/specs/proj.spec.in b/PackDist/share/specs/proj.spec.in
deleted file mode 100644
index 63a475aa61dd..000000000000
--- a/PackDist/share/specs/proj.spec.in
+++ /dev/null
@@ -1,58 +0,0 @@
-%%undefine _enable_debug_packages
-%%global __os_install_post /usr/lib/rpm/brp-compress %%{nil}
-
-Name: %(name)s
-Version: %(version)s
-Release: 1
-Epoch: 0
-Summary: %(summary)s
-
-Group: Application/Physics
-License: ATLAS
-URL: http://atlas.web.cern.ch/Atlas
-Packager: ATLAS Offline
-Source0: %%{name}.tar.gz
-BuildRoot: %%{_tmppath}/%%{name}-%%{version}-%%{release}-root-%%(%%{__id_u} -n)
-
-AutoReqProv: no
-Requires: %(requires)s
-Provides: %(provides)s
-
-Prefix: /opt/atlas
-
-%%description
-High Energy Physics Application
-
-%%prep
-
-%%build
-
-%%define _fixowner [ `%%{__id_u}` = '0' ] && %%{__chown_Rhf} root
-%%define _fixgroup [ `%%{__id_u}` = '0' ] && %%{__chgrp_Rhf} root
-
-%%install
-%%{__rm} -rf $RPM_BUILD_ROOT
-%%{__mkdir_p} $RPM_BUILD_ROOT%%{prefix}
-cd $RPM_BUILD_ROOT%%{prefix}
-%%{__gzip} -dc %%{SOURCE0} | %%{__tar} -xvvf -
-STATUS=$?
-if [ $STATUS -ne 0 ]; then
- exit $STATUS
-fi
-%%{_fixowner} .
-%%{_fixgroup} .
-%%{_fixperms} .
-
-%%clean
-%%{__rm} -rf $RPM_BUILD_ROOT
-
-%%files
-%%defattr(-,root,root,-)
-
-%%changelog
-* Thu Dec 06 2012 Grigori Rybkine <Grigori.Rybkine@cern.ch>
-- Undefine _enable_debug_packages macro (so as to disable building debuginfo packages)
-- Override system __os_install_post macro
-- Define _fixowner, _fixgroup macros since they are missing with RPM 4.8.0 and later
-- In %%%%install section, do not exit (so as to let RPM run __spec_install_post actions)
-
diff --git a/ReleaseTests/CMakeLists.txt b/ReleaseTests/CMakeLists.txt
deleted file mode 100644
index 47c0786e2d03..000000000000
--- a/ReleaseTests/CMakeLists.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-################################################################################
-# Package: ReleaseTests
-################################################################################
-
-# Declare the package name:
-atlas_subdir( ReleaseTests )
-
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PRIVATE
- TestPolicy )
-
-# Install files from the package:
-atlas_install_runtime( test/ReleaseTests_TestConfiguration.xml )
-
diff --git a/ReleaseTests/bin/testSelectionXML.py b/ReleaseTests/bin/testSelectionXML.py
deleted file mode 100755
index 8e597f71d0dc..000000000000
--- a/ReleaseTests/bin/testSelectionXML.py
+++ /dev/null
@@ -1,87 +0,0 @@
-#!/usr/bin/env python
-
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-
-import os
-import xml.etree.ElementTree as ET
-import re
-import commands
-
-# list = commands.getstatusoutput("cmt show packages /afs/cern.ch/work/s/seuster/sel | gawk '{print $3 \"/\" $1}'")[1].split()
-list = commands.getstatusoutput("cmt show packages | gawk '{print $3 \"/\" $1}'")[1].split()
-# list = os.getenv("CMTPATH").split(':')
-
-# list = ['/afs/cern.ch/atlas/software/builds/nightlies/devval/AtlasAnalysis/rel_2/Reconstruction/egamma/egammaPhysCalib/egammaPhysCalib/selection.xml']
-
-ErrorList = {}
-ErrorContent = {}
-GUIDList = {}
-GUIDListDup = {}
-
-print "Processing these packages:"
-for index, item in enumerate(list):
- print index, item
-
-for path in list:
- #print path
- from os.path import join, getsize
- for root, dirs, files in os.walk(path):
- if os.path.exists(root):
- for name in files:
- path=join(root, name)
- if os.path.exists(path) and name=="selection.xml":
- #print ("file ", path," size ",getsize(path))
- with open(path, 'r') as content_file:
- content = content_file.read()
- old="different"
- while old != content:
- old = content
- content = re.sub(r"(class +[a-zA-Z]+ *= *\")([a-zA-Z0-9:_* ,&;]+)<([a-zA-Z0-9:_* ,<&;]+)>([a-zA-Z0-9:_* ,>&;]*)", r"\1\2<\3>\4", content)
- #print "TEST"
- #print
- #print content
-
- try:
- tree = ET.fromstring(content)
- #for child in tree:
- # print child.tag, child.attrib
- for neighbor in tree.findall('./class'):
- guid=neighbor.get("id")
- clnm=neighbor.get("name")
- #print "id: ",clnm,guid
- if guid != None:
- if guid in GUIDList:
- print "Duplicate ! ", guid, " found twice !!"
- print " 1. ", GUIDList[guid]
- print " 2. ", path, " (", clnm, ")"
- GUIDListDup[guid]=path + " (" + clnm + ")"
- else:
- GUIDList[guid]=path + " (" + clnm + ")"
-
- except Exception as e:
- #print "ERROR: ", type(e)
- #print "ERROR: ", e.args
- #print "ERROR: ", content
- # ErrorList.append(path)
- ErrorList[path]=e.args
- ErrorContent[path]=content
- pass
-
-if len(ErrorList):
- print "Failed reading these selection.xml files:"
- for index, item in enumerate(ErrorList):
- print index, item, ErrorList[item]
- print " Error was : ", ErrorList[item]
- print " selection.xml was: "
- print ErrorContent[item]
-else:
- print "All selection.xml files in all packages were read successfully"
-
-if len(GUIDListDup):
- print "Found following Duplicates in selection.xml:"
- for index, item in enumerate(GUIDListDup):
- print index, item, GUIDListDup[item]
- print " also declared in ", GUIDList[item]
-
-import sys
-sys.exit(len(GUIDListDup))
diff --git a/ReleaseTests/test/ReleaseTests_TestConfiguration.xml b/ReleaseTests/test/ReleaseTests_TestConfiguration.xml
deleted file mode 100644
index af325748c54e..000000000000
--- a/ReleaseTests/test/ReleaseTests_TestConfiguration.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE unifiedTestConfiguration SYSTEM "http://www.hep.ucl.ac.uk/atlas/AtlasTesting/DTD/unifiedTestConfiguration.dtd">
-
-<unifiedTestConfiguration>
-
- <atn>
- <TEST name="ReleaseTests" type="script" suite="Examples">
- <options_atn>
- ${ATN_PACKAGE}/bin/testSelectionXML.py
- </options_atn>
- <timelimit>60</timelimit>
- <author>Rolf Seuster</author>
- <prescript>rm -f $ATN_WORK_AREA/*</prescript>
- <expectations>
- <returnValue>0</returnValue>
- </expectations>
- </TEST>
- </atn>
-
-</unifiedTestConfiguration>
diff --git a/docs/doxyfile b/docs/doxyfile
index bc54420578d5..2c2dca8f56cd 100644
--- a/docs/doxyfile
+++ b/docs/doxyfile
@@ -771,7 +771,7 @@ WARN_LOGFILE = doxygen_warnings.log
# spaces. See also FILE_PATTERNS and EXTENSION_MAPPING
# Note: If this tag is empty the current directory is searched.
-INPUT = README.md AtlasGeometryCommon AtlasTest Calorimeter Commission Control DataQuality Database DetectorDescription Event External ForwardDetectors Generators InnerDetector LumiBlock MagneticField MuonSpectrometer PhysicsAnalysis Projects Reconstruction ReleaseTests Simulation TestBeam TestPolicy TileCalorimeter Tools Tracking graphics
+INPUT = README.md AtlasGeometryCommon AtlasTest Calorimeter Commission Control DataQuality Database DetectorDescription Event External ForwardDetectors Generators InnerDetector LumiBlock MagneticField MuonSpectrometer PhysicsAnalysis Projects Reconstruction Simulation TestBeam TestPolicy TileCalorimeter Tools Tracking graphics
INPUT += Trigger HLT
# This tag can be used to specify the character encoding of the source files
--
GitLab
From 5dd67c5faa5e4ce64d7721939aa056b551f05e78 Mon Sep 17 00:00:00 2001
From: "Yohei Yamaguchi (TIT)" <yoyamagu@lxatut26.cern.ch>
Date: Wed, 19 Dec 2018 03:52:00 +0100
Subject: [PATCH 6/8] add dynamic variables for monitoring L2SA
---
.../TrigL2MuonSA/TrigL2MuonSA/CscData.h | 1 +
.../TrigL2MuonSA/src/CscDataPreparator.cxx | 3 ++-
.../TrigL2MuonSA/src/MuFastSteering.cxx | 8 ++++++++
.../TriggerCommon/TrigEDMConfig/python/TriggerEDM.py | 11 ++++++++---
4 files changed, 19 insertions(+), 4 deletions(-)
diff --git a/Trigger/TrigAlgorithms/TrigL2MuonSA/TrigL2MuonSA/CscData.h b/Trigger/TrigAlgorithms/TrigL2MuonSA/TrigL2MuonSA/CscData.h
index ec860123c0a2..839b38c447e4 100644
--- a/Trigger/TrigAlgorithms/TrigL2MuonSA/TrigL2MuonSA/CscData.h
+++ b/Trigger/TrigAlgorithms/TrigL2MuonSA/TrigL2MuonSA/CscData.h
@@ -28,6 +28,7 @@ namespace TrigL2MuonSA {
double z;
int charge;
double time;
+ float resolution;
//
double Residual;
int isOutlier;
diff --git a/Trigger/TrigAlgorithms/TrigL2MuonSA/src/CscDataPreparator.cxx b/Trigger/TrigAlgorithms/TrigL2MuonSA/src/CscDataPreparator.cxx
index e0f853c2127f..1dcf43f220d7 100644
--- a/Trigger/TrigAlgorithms/TrigL2MuonSA/src/CscDataPreparator.cxx
+++ b/Trigger/TrigAlgorithms/TrigL2MuonSA/src/CscDataPreparator.cxx
@@ -210,12 +210,13 @@ StatusCode TrigL2MuonSA::CscDataPreparator::prepareData(const TrigRoiDescriptor*
cscHit.StripId = (cscHit.StationName << 18)
| ((cscHit.StationEta + 2) << 16) | (cscHit.StationPhi << 12)
| (cscHit.WireLayer << 9) | (cscHit.MeasuresPhi << 8) | (cscHit.Strip);
- cscHit.eta = sqrt( prepData.localCovariance()(0,0) );
+ cscHit.eta = prepData.globalPosition().eta();
cscHit.phi = prepData.globalPosition().phi();
cscHit.r = prepData.globalPosition().perp();
cscHit.z = prepData.globalPosition().z();
cscHit.charge = prepData.charge();
cscHit.time = prepData.time();
+ cscHit.resolution = sqrt( prepData.localCovariance()(0,0) );
cscHit.Residual = ( cscHit.MeasuresPhi==0 ) ? calc_residual( aw, bw, cscHit.z, cscHit.r ) : calc_residual_phi( aw,bw,phiw, cscHit.phi, cscHit.z);
cscHit.isOutlier = 0;
/*if( fabs(cscHit.Residual) > rWidth ) {
diff --git a/Trigger/TrigAlgorithms/TrigL2MuonSA/src/MuFastSteering.cxx b/Trigger/TrigAlgorithms/TrigL2MuonSA/src/MuFastSteering.cxx
index 1408a4556889..fc773f9d09de 100644
--- a/Trigger/TrigAlgorithms/TrigL2MuonSA/src/MuFastSteering.cxx
+++ b/Trigger/TrigAlgorithms/TrigL2MuonSA/src/MuFastSteering.cxx
@@ -1146,15 +1146,20 @@ bool MuFastSteering::storeMuonSA(const LVL1::RecMuonRoI* roi,
muonSA->setCscHitsCapacity( m_esd_csc_size );
// MDT hits
+ std::vector<std::string> mdtId;
for (unsigned int i_hit=0; i_hit<mdtHits.size(); i_hit++) {
if ( mdtHits[i_hit].isOutlier==0 || mdtHits[i_hit].isOutlier==1 ) {
muonSA->setMdtHit(mdtHits[i_hit].OnlineId, mdtHits[i_hit].isOutlier, mdtHits[i_hit].Chamber,
mdtHits[i_hit].R, mdtHits[i_hit].Z, mdtHits[i_hit].cPhi0, mdtHits[i_hit].Residual,
mdtHits[i_hit].DriftTime, mdtHits[i_hit].DriftSpace, mdtHits[i_hit].DriftSigma);
+ mdtId.push_back(mdtHits[i_hit].Id.getString());
}
}
+ SG::AuxElement::Accessor< std::vector<std::string> > accessor_mdthitid( "mdtHitId" );
+ accessor_mdthitid( *muonSA ) = mdtId;
//CSC hits
+ std::vector<float> cscResol;
for(unsigned int i_hit=0; i_hit<cscHits.size(); i_hit++) {
if ( 1/*cscHits[i_hit].MeasuresPhi==0*/ ){
if ( cscHits[i_hit].isOutlier==0 || cscHits[i_hit].isOutlier==1 ) {
@@ -1163,6 +1168,7 @@ bool MuFastSteering::storeMuonSA(const LVL1::RecMuonRoI* roi,
cscHits[i_hit].ChamberLayer, cscHits[i_hit].WireLayer, cscHits[i_hit].MeasuresPhi, cscHits[i_hit].Strip,
cscHits[i_hit].eta, cscHits[i_hit].phi, cscHits[i_hit].r, cscHits[i_hit].z,
cscHits[i_hit].charge, cscHits[i_hit].time, cscHits[i_hit].Residual);
+ cscResol.push_back(cscHits[i_hit].resolution);
ATH_MSG_DEBUG("CSC Hits stored in xAOD: "
<< "OL=" << cscHits[i_hit].isOutlier << ","
<< "Ch=" << cscHits[i_hit].Chamber << ","
@@ -1183,6 +1189,8 @@ bool MuFastSteering::storeMuonSA(const LVL1::RecMuonRoI* roi,
}
}
}
+ SG::AuxElement::Accessor< std::vector<float> > accessor_cschitresol( "cscHitResolution" );
+ accessor_cschitresol( *muonSA ) = cscResol;
// RPC hits
float sumbeta[8]={0};
diff --git a/Trigger/TriggerCommon/TrigEDMConfig/python/TriggerEDM.py b/Trigger/TriggerCommon/TrigEDMConfig/python/TriggerEDM.py
index ecad149c6ccf..1860061ee184 100644
--- a/Trigger/TriggerCommon/TrigEDMConfig/python/TriggerEDM.py
+++ b/Trigger/TriggerCommon/TrigEDMConfig/python/TriggerEDM.py
@@ -133,6 +133,11 @@ RemoveEgammaIsoVariables = ".-"+identifier.join(UnusedEgammaIsoVariables)
#####################
#####################
+# Add Dynamic Var
+identifierAdd = "."
+l2saVariableToAdd = ['mdtHitId','cscHitResolution']
+addL2saVars = "." + identifierAdd.join(l2saVariableToAdd)
+
# temporary functionality to discover version of EDM
####################
@@ -286,7 +291,7 @@ TriggerHLTList = [
#muons
#L2 Muons
('xAOD::L2StandAloneMuonContainer#HLT_MuonL2SAInfo', 'BS ESD AODFULL AODSLIM', 'Muon'),
- ('xAOD::L2StandAloneMuonAuxContainer#HLT_MuonL2SAInfoAux.', 'BS ESD AODFULL AODSLIM', 'Muon'),
+ ('xAOD::L2StandAloneMuonAuxContainer#HLT_MuonL2SAInfoAux' + addL2saVars, 'BS ESD AODFULL AODSLIM', 'Muon'),
('xAOD::L2CombinedMuonContainer#HLT_MuonL2CBInfo', 'BS ESD AODFULL AODSLIM', 'Muon'), #fp
('xAOD::L2CombinedMuonAuxContainer#HLT_MuonL2CBInfoAux.', 'BS ESD AODFULL AODSLIM', 'Muon'), #fp
('xAOD::L2IsoMuonContainer#HLT_MuonL2ISInfo', 'BS ESD AODFULL', 'Muon'), #fp
@@ -294,7 +299,7 @@ TriggerHLTList = [
#MuonEFInfo
('xAOD::MuonContainer#HLT_MuonEFInfo', 'BS ESD AODFULL AODSLIM AODVERYSLIM', 'Muon'),
- ('xAOD::MuonAuxContainer#HLT_MuonEFInfoAux.', 'BS ESD AODFULL AODSLIM AODVERYSLIM', 'Muon'),
+ ('xAOD::MuonAuxContainer#HLT_MuonEFInfoAux'+RemoveMuonVariables, 'BS ESD AODFULL AODSLIM AODVERYSLIM', 'Muon'),
('xAOD::TrackParticleContainer#HLT_MuonEFInfo_CombTrackParticles', 'BS ESD AODFULL AODSLIM', 'Muon'),#fp
('xAOD::TrackParticleAuxContainer#HLT_MuonEFInfo_CombTrackParticlesAux'+RemoveIDVariables, 'BS ESD AODFULL AODSLIM','Muon'),#fp
('xAOD::TrackParticleContainer#HLT_MuonEFInfo_ExtrapTrackParticles', 'BS ESD AODFULL AODSLIM', 'Muon'),#fp
@@ -1674,7 +1679,7 @@ def getTriggerEDMSlimList(key):
for k,v in _edmList.items():
newnames = []
for el in v:
- if 'Aux' in el:
+ if 'Aux' in el and '.-' in el:
newnames+=[el.split('.')[0]+'.-']
else:
newnames+=[el]
--
GitLab
From 000941f9e45cce4fa1c56b5817ef7a46ed138bb9 Mon Sep 17 00:00:00 2001
From: Tomasz Bold <tomasz.bold@gmail.com>
Date: Wed, 19 Dec 2018 07:56:04 +0100
Subject: [PATCH 7/8] removing problematic collection
---
.../TrigValidation/TrigUpgradeTest/share/egamma.withViews.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/share/egamma.withViews.py b/Trigger/TrigValidation/TrigUpgradeTest/share/egamma.withViews.py
index 60e46f4f64b0..936adeb829fa 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/share/egamma.withViews.py
+++ b/Trigger/TrigValidation/TrigUpgradeTest/share/egamma.withViews.py
@@ -250,7 +250,7 @@ summary.FinalDecisions = [ "ElectronL2Decisions", "MuonL2Decisions" ]
from TrigOutputHandling.TrigOutputHandlingConf import HLTEDMCreator
egammaViewsMerger = HLTEDMCreator("egammaViewsMerger")
-egammaViewsMerger.TrigCompositeContainer = [ "L2ElectronLinks", "filterCaloRoIsAlg", "EgammaCaloDecisions","ElectronL2Decisions", "MuonL2Decisions", "EMRoIDecisions", "METRoIDecisions", "MURoIDecisions", "HLTChainsResult", "JRoIDecisions", "MonitoringSummaryStep1", "RerunEMRoIDecisions", "RerunMURoIDecisions", "TAURoIDecisions", "L2CaloLinks", "FilteredEMRoIDecisions", "FilteredEgammaCaloDecisions" ]
+egammaViewsMerger.TrigCompositeContainer = [ "filterCaloRoIsAlg", "EgammaCaloDecisions","ElectronL2Decisions", "MuonL2Decisions", "EMRoIDecisions", "METRoIDecisions", "MURoIDecisions", "HLTChainsResult", "JRoIDecisions", "MonitoringSummaryStep1", "RerunEMRoIDecisions", "RerunMURoIDecisions", "TAURoIDecisions", "L2CaloLinks", "FilteredEMRoIDecisions", "FilteredEgammaCaloDecisions" ]
egammaViewsMerger.TrackParticleContainerViews = [ l2ElectronViewsMaker.Views ]
egammaViewsMerger.TrackParticleContainerInViews = [ TrackParticlesName ]
--
GitLab
From d7bdbeb74ac8a646e5306af263ee84bbd6e8cdc1 Mon Sep 17 00:00:00 2001
From: Edward Moyse <edward.moyse@cern.ch>
Date: Wed, 19 Dec 2018 09:44:11 +0000
Subject: [PATCH 8/8] Update README.md - fix TrigMC details.
---
README.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/README.md b/README.md
index 1a511c89261d..8fbb76c37fb1 100644
--- a/README.md
+++ b/README.md
@@ -18,7 +18,7 @@ Branch | Purpose
[21.0](https://gitlab.cern.ch/atlas/athena/tree/21.0) | Tier0 and MC16c | Athena, 21.0.X
[21.0-mc16a](https://gitlab.cern.ch/atlas/athena/tree/21.0-mc16a) | MC16a bugfixes | Athena, 21.0.20.Y
[21.0-mc16d](https://gitlab.cern.ch/atlas/athena/tree/21.0-mc16d) | MC16d bugfixes | Athena, 21.0.20.Y
-[21.0-TrigMC](https://gitlab.cern.ch/atlas/athena/tree/21.0-TrigMC) | MC production with new trigger developments | AthenaP1, No production releases
+[21.0-TrigMC](https://gitlab.cern.ch/atlas/athena/tree/21.0-TrigMC) | MC production with new trigger developments | Athena, 21.5.X
[21.1](https://gitlab.cern.ch/atlas/athena/tree/21.1) | HLT and P1 monitoring | AthenaP1, 21.1.X
[21.2](https://gitlab.cern.ch/atlas/athena/tree/21.2) | Derivations and Analysis | AthDerivations + (Ath)AnalysisBase, 21.2.X
[21.3](https://gitlab.cern.ch/atlas/athena/tree/21.3) | MC18 Simulation | Athena + AthSimulation, 21.3.X
--
GitLab