Merge branch 'sgtools.MuonD3PDMaker-20190425' into 'master'

MuonD3PDMaker: SGTools->AthenaKernel

See merge request atlas/athena!22965

PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/CMakeLists.txt

@@ -9,9 +9,7 @@ atlas_subdir( MuonD3PDMaker )
 atlas_depends_on_subdirs( PRIVATE
                           Control/AthenaBaseComps
                           Control/AthenaKernel
-                          Control/CxxUtils
                           Control/AthContainers
-                          Control/SGTools
                           Control/StoreGate
                           DetectorDescription/AtlasDetDescr
                           Event/EventInfo
@@ -59,7 +57,7 @@ atlas_add_component( MuonD3PDMaker
                      src/*.cxx
                      src/components/*.cxx
                      INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS} ${HEPMC_INCLUDE_DIRS}
-                     LINK_LIBRARIES ${Boost_LIBRARIES} ${CLHEP_LIBRARIES} ${HEPMC_LIBRARIES} AthenaBaseComps AthenaKernel CxxUtils AthContainers SGTools StoreGateLib SGtests AtlasDetDescr EventInfo EventKernel FourMomUtils xAODMuon xAODTracking xAODTruth GaudiKernel MuonCalibITools MuonIdHelpersLib MuonPattern MuonPrepRawData MuonSegment MuonRecHelperToolsLib MuonRecToolInterfaces MuonSimEvent AnalysisTriggerEvent D3PDMakerUtils TriggerD3PDMakerLib MCTruthClassifierLib McParticleEvent muonEvent TrkGeometry TrkEventPrimitives TrkPrepRawData TrkSegment TrkTrackSummary TrkTruthData TrkExInterfaces TrkToolInterfaces TrigObjectMatchingLib TrigInDetEvent TrigMuonEvent )
+                     LINK_LIBRARIES ${Boost_LIBRARIES} ${CLHEP_LIBRARIES} ${HEPMC_LIBRARIES} AthenaBaseComps AthenaKernel AthContainers StoreGateLib SGtests AtlasDetDescr EventInfo EventKernel FourMomUtils xAODMuon xAODTracking xAODTruth GaudiKernel MuonCalibITools MuonIdHelpersLib MuonPattern MuonPrepRawData MuonSegment MuonRecHelperToolsLib MuonRecToolInterfaces MuonSimEvent AnalysisTriggerEvent D3PDMakerUtils TriggerD3PDMakerLib MCTruthClassifierLib McParticleEvent muonEvent TrkGeometry TrkEventPrimitives TrkPrepRawData TrkSegment TrkTrackSummary TrkTruthData TrkExInterfaces TrkToolInterfaces TrigObjectMatchingLib TrigInDetEvent TrigMuonEvent )
 
 # Install files from the package:
 atlas_install_python_modules( python/*.py )

PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/ispellwords

@@ -282,7 +282,6 @@ IncidentService
 AlgTool
 originalTrack
 TileTimingFillerTool
-SGTools
 elif
 TrackExtrapolatorToCalo
 AuditEndRun

PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/src/MuonPatternCombinationMissedHitFillerTool.cxx

 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 //////////////////////////////////////////////////////
@@ -20,7 +20,6 @@
 #include "MuonPrepRawData/MuonPrepDataContainer.h"
 #include "MuonPrepRawData/MuonPrepDataCollection.h"
 #include "MuonPattern/MuonPatternChamberIntersect.h"
-#include "CxxUtils/make_unique.h"
 
 
 using namespace std;
@@ -153,7 +152,7 @@ namespace D3PD {
       chambers.push_back(chIntersect);
     }
     //build the pattern combination
-    auto pattern = CxxUtils::make_unique<Muon::MuonPatternCombination>
+    auto pattern = std::make_unique<Muon::MuonPatternCombination>
       (new Trk::Perigee(patpos,patdir,1,patpos), chambers);
     pattern->setTrackRoadType(3);
 

PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/src/muonInheritance.cxx

 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 // $Id$
@@ -17,7 +17,7 @@
 #include "TrigMuonEvent/CombinedMuonFeature.h"
 #include "AnalysisTriggerEvent/Muon_ROI.h"
 #include "EventKernel/INavigable4Momentum.h"
-#include "SGTools/BaseInfo.h"
+#include "AthenaKernel/BaseInfo.h"
 
 SG_ADD_BASE (TrigMuonEF,          SG_VIRTUAL(INavigable4Momentum));
 SG_ADD_BASE (CombinedMuonFeature, SG_VIRTUAL(INavigable4Momentum));