From deaf80190460bb804d676aca6056bd40e9b34db0 Mon Sep 17 00:00:00 2001
From: John Chapman <jchapman@cern.ch>
Date: Thu, 11 Jul 2019 12:21:04 +0200
Subject: [PATCH] Replace usage of CxxUtils::make_unique with std::make_unique
---
Simulation/BeamEffects/CMakeLists.txt | 5 ++--
.../BeamEffects/test/BeamEffectsAlg_test.cxx | 1 -
.../FastShower/FastCaloSimHit/CMakeLists.txt | 5 ++--
.../FastCaloSimHit/src/FastHitConv.cxx | 11 ++++----
.../FastCaloSimHit/src/FastHitConvertTool.cxx | 11 ++++----
Simulation/G4Atlas/G4AtlasAlg/CMakeLists.txt | 5 ++--
.../G4Atlas/G4AtlasServices/CMakeLists.txt | 3 +--
.../G4AtlasServices/src/UserActionSvc.cxx | 11 ++++----
.../G4Atlas/G4AtlasTests/CMakeLists.txt | 1 -
.../G4Extensions/G4HitFilter/CMakeLists.txt | 3 +--
.../G4HitFilter/src/G4HitFilterTool.cxx | 3 +--
Simulation/G4Extensions/Quirks/CMakeLists.txt | 1 -
.../Quirks/src/DebugSteppingActionTool.cxx | 3 +--
.../G4Extensions/RHadrons/CMakeLists.txt | 1 -
.../RHadrons/src/SG_StepNtupleTool.cxx | 3 +--
Simulation/G4Sim/MCTruthBase/CMakeLists.txt | 5 ++--
.../src/MCTruthSteppingActionTool.cxx | 1 -
.../MCTruthBase/src/RecordingEnvelope.cxx | 3 +--
.../G4DebuggingTools/CMakeLists.txt | 3 +--
.../src/CheckActivationTool.cxx | 3 +--
.../src/EnergyConservationTestTool.cxx | 3 +--
.../src/G4AtlantisDumperTool.cxx | 3 +--
.../src/Geant4SetupCheckerTool.cxx | 3 +--
.../src/HyperspaceCatcherTool.cxx | 3 +--
.../G4DebuggingTools/src/StepNtupleTool.cxx | 3 +--
.../src/VerboseSelectorTool.cxx | 3 +--
.../src/VolumeDebuggerTool.cxx | 3 +--
.../G4ProfilingTools/CMakeLists.txt | 1 -
.../src/TestActionEHistTool.cxx | 3 +--
.../src/TestActionTimerTool.cxx | 3 +--
.../src/TestActionVPTimerTool.cxx | 3 +--
.../G4Utilities/G4UserActions/CMakeLists.txt | 3 +--
.../G4UserActions/src/CosmicPerigeeAction.cxx | 3 +--
.../TrackWriteFastSim/CMakeLists.txt | 5 ++--
.../TrackWriteFastSim/src/TrackFastSimSD.cxx | 3 +--
.../ISF_Core/ISF_Algorithms/CMakeLists.txt | 3 +--
.../ISF_Algorithms/src/CollectionMerger.h | 1 -
.../ISF_Core/ISF_Algorithms/src/SimKernel.cxx | 3 +--
.../test/CollectionMerger_test.cxx | 25 +++++++++----------
.../ISF_FastCaloSimSD/CMakeLists.txt | 3 +--
.../ISF_FastCaloSimSD/src/SDWrapper.cxx | 3 +--
.../ISF_FatrasEventTPCnv/CMakeLists.txt | 5 ++--
.../ISF_FatrasEvent/PlanarClusterCnv_p2.cxx | 3 +--
.../test/PlanarClusterCnv_p1_test.cxx | 9 +++----
.../test/PlanarClusterCnv_p2_test.cxx | 9 +++----
.../PlanarClusterContainerCnv_p1_test.cxx | 21 ++++++++--------
.../PlanarClusterContainerCnv_p2_test.cxx | 21 ++++++++--------
.../ISF_Geant4/ISF_Geant4Tools/CMakeLists.txt | 3 +--
.../src/MCTruthUserActionTool.cxx | 3 +--
.../src/PhysicsValidationUserActionTool.cxx | 2 +-
.../TrackProcessorUserActionFullG4Tool.cxx | 3 +--
.../TrackProcessorUserActionPassBackTool.cxx | 3 +--
.../ISF_Geant4UserActions/CMakeLists.txt | 3 +--
.../src/FastCaloSimParamActionTool.cxx | 3 +--
.../src/TestBoundariesUserActionTool.cxx | 3 +--
.../src/McEventCollectionFilter.cxx | 19 +++++++-------
56 files changed, 110 insertions(+), 165 deletions(-)
diff --git a/Simulation/BeamEffects/CMakeLists.txt b/Simulation/BeamEffects/CMakeLists.txt
index 545095a53e0..9f1d61558fc 100644
--- a/Simulation/BeamEffects/CMakeLists.txt
+++ b/Simulation/BeamEffects/CMakeLists.txt
@@ -12,7 +12,6 @@ atlas_depends_on_subdirs( PUBLIC
PRIVATE
AtlasTest/TestTools
Control/AthenaBaseComps
- Control/CxxUtils
Control/StoreGate
Event/EventInfo
Generators/GeneratorObjects
@@ -32,7 +31,7 @@ include_directories(SYSTEM ${EIGEN_INCLUDE_DIRS})
atlas_add_test( BeamEffectsAlg_test
SOURCES src/*.cxx test/BeamEffectsAlg_test.cxx
INCLUDE_DIRS ${EIGEN_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS} ${HEPMC_INCLUDE_DIRS} ${GTEST_INCLUDE_DIRS} #${GMOCK_INCLUDE_DIRS}
- LINK_LIBRARIES ${CLHEP_LIBRARIES} ${HEPMC_LIBRARIES} GaudiKernel TestTools AthenaBaseComps CxxUtils StoreGateLib EventInfo GeneratorObjects BeamSpotConditionsData ${GTEST_LIBRARIES} #${GMOCK_LIBRARIES}
+ LINK_LIBRARIES ${CLHEP_LIBRARIES} ${HEPMC_LIBRARIES} GaudiKernel TestTools AthenaBaseComps StoreGateLib EventInfo GeneratorObjects BeamSpotConditionsData ${GTEST_LIBRARIES} #${GMOCK_LIBRARIES}
EXTRA_PATTERNS "[0-9]+ ms"
)
@@ -48,7 +47,7 @@ atlas_add_component( BeamEffects
src/*.cxx
src/components/*.cxx
INCLUDE_DIRS ${EIGEN_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS} ${HEPMC_INCLUDE_DIRS}
- LINK_LIBRARIES ${CLHEP_LIBRARIES} ${HEPMC_LIBRARIES} GaudiKernel AthenaBaseComps CxxUtils StoreGateLib EventInfo GeneratorObjects BeamSpotConditionsData )
+ LINK_LIBRARIES ${CLHEP_LIBRARIES} ${HEPMC_LIBRARIES} GaudiKernel AthenaBaseComps StoreGateLib EventInfo GeneratorObjects BeamSpotConditionsData )
# Install files from the package:
atlas_install_python_modules( python/*.py )
diff --git a/Simulation/BeamEffects/test/BeamEffectsAlg_test.cxx b/Simulation/BeamEffects/test/BeamEffectsAlg_test.cxx
index 42e2b0b50dd..f53eae4b031 100644
--- a/Simulation/BeamEffects/test/BeamEffectsAlg_test.cxx
+++ b/Simulation/BeamEffects/test/BeamEffectsAlg_test.cxx
@@ -14,7 +14,6 @@
#include "TestTools/initGaudi.h"
// ATLAS C++
-#include "CxxUtils/make_unique.h"
// Google Test
#include "gtest/gtest.h"
diff --git a/Simulation/FastShower/FastCaloSimHit/CMakeLists.txt b/Simulation/FastShower/FastCaloSimHit/CMakeLists.txt
index ab7972bda69..ff0450e6684 100644
--- a/Simulation/FastShower/FastCaloSimHit/CMakeLists.txt
+++ b/Simulation/FastShower/FastCaloSimHit/CMakeLists.txt
@@ -17,7 +17,6 @@ atlas_depends_on_subdirs( PUBLIC
PRIVATE
Calorimeter/CaloEvent
Calorimeter/CaloIdentifier
- Control/CxxUtils
Control/PileUpTools
Event/EventInfo
TileCalorimeter/TileConditions
@@ -37,11 +36,11 @@ atlas_add_library( FastCaloSimHitLib
src/*.cxx
PUBLIC_HEADERS FastCaloSimHit
LINK_LIBRARIES AthenaBaseComps GaudiKernel LArSimEvent TileSimEvent StoreGateLib SGtests PileUpToolsLib TileConditionsLib
- PRIVATE_LINK_LIBRARIES CaloEvent CaloIdentifier CxxUtils EventInfo TileEvent )
+ PRIVATE_LINK_LIBRARIES CaloEvent CaloIdentifier EventInfo TileEvent )
atlas_add_component( FastCaloSimHit
src/components/*.cxx
- LINK_LIBRARIES AthenaBaseComps StoreGateLib SGtests GaudiKernel LArSimEvent TileSimEvent CaloEvent CaloIdentifier CxxUtils PileUpToolsLib EventInfo TileConditionsLib TileEvent FastCaloSimHitLib )
+ LINK_LIBRARIES AthenaBaseComps StoreGateLib SGtests GaudiKernel LArSimEvent TileSimEvent CaloEvent CaloIdentifier PileUpToolsLib EventInfo TileConditionsLib TileEvent FastCaloSimHitLib )
# Install files from the package:
atlas_install_python_modules( python/*.py )
diff --git a/Simulation/FastShower/FastCaloSimHit/src/FastHitConv.cxx b/Simulation/FastShower/FastCaloSimHit/src/FastHitConv.cxx
index eb3024414ed..b673c3c0a47 100644
--- a/Simulation/FastShower/FastCaloSimHit/src/FastHitConv.cxx
+++ b/Simulation/FastShower/FastCaloSimHit/src/FastHitConv.cxx
@@ -11,7 +11,6 @@
#include "CaloIdentifier/LArFCAL_ID.h"
#include "CaloIdentifier/LArHEC_ID.h"
#include "CaloIdentifier/TileID.h"
-#include "CxxUtils/make_unique.h"
#include "EventInfo/PileUpEventInfo.h"
#include "EventInfo/EventType.h"
#include "LArSimEvent/LArHitFloat.h"
@@ -116,11 +115,11 @@ StatusCode FastHitConv::initEvent()
//MsgStream log(msgSvc(), name());
//log << MSG::DEBUG << "initEvent()" << endmsg;
ATH_MSG_DEBUG("initEvent()");
- if(!m_embHitContainer.isValid() ) { m_embHitContainer = CxxUtils::make_unique<LArHitContainer>(m_embHitContainer.name());}
- if(!m_emecHitContainer.isValid()) { m_emecHitContainer = CxxUtils::make_unique<LArHitContainer>(m_emecHitContainer.name());}
- if(!m_fcalHitContainer.isValid()) { m_fcalHitContainer = CxxUtils::make_unique<LArHitContainer>(m_fcalHitContainer.name());}
- if(!m_hecHitContainer.isValid() ) { m_hecHitContainer = CxxUtils::make_unique<LArHitContainer>(m_hecHitContainer.name());}
- if(!m_tileHitVector.isValid() ) { m_tileHitVector = CxxUtils::make_unique<TileHitVector>(m_tileHitVector.name());}
+ if(!m_embHitContainer.isValid() ) { m_embHitContainer = std::make_unique<LArHitContainer>(m_embHitContainer.name());}
+ if(!m_emecHitContainer.isValid()) { m_emecHitContainer = std::make_unique<LArHitContainer>(m_emecHitContainer.name());}
+ if(!m_fcalHitContainer.isValid()) { m_fcalHitContainer = std::make_unique<LArHitContainer>(m_fcalHitContainer.name());}
+ if(!m_hecHitContainer.isValid() ) { m_hecHitContainer = std::make_unique<LArHitContainer>(m_hecHitContainer.name());}
+ if(!m_tileHitVector.isValid() ) { m_tileHitVector = std::make_unique<TileHitVector>(m_tileHitVector.name());}
return StatusCode::SUCCESS;
diff --git a/Simulation/FastShower/FastCaloSimHit/src/FastHitConvertTool.cxx b/Simulation/FastShower/FastCaloSimHit/src/FastHitConvertTool.cxx
index 09e63267118..a038afa4e71 100644
--- a/Simulation/FastShower/FastCaloSimHit/src/FastHitConvertTool.cxx
+++ b/Simulation/FastShower/FastCaloSimHit/src/FastHitConvertTool.cxx
@@ -15,7 +15,6 @@
#include "CaloIdentifier/LArFCAL_ID.h"
#include "CaloIdentifier/LArHEC_ID.h"
#include "CaloIdentifier/TileID.h"
-#include "CxxUtils/make_unique.h"
#include "EventInfo/PileUpEventInfo.h"
#include "EventInfo/EventType.h"
#include "LArSimEvent/LArHitFloat.h"
@@ -135,11 +134,11 @@ StatusCode FastHitConvertTool::initEvent()
// m_hecHitContainer=new LArHitContainer();
// m_tileHitVector=new TileHitVector(m_tileHitContainerName);
- if(!m_embHitContainer.isValid() ) { m_embHitContainer = CxxUtils::make_unique<LArHitContainer>(m_embHitContainer.name());}
- if(!m_emecHitContainer.isValid()) { m_emecHitContainer = CxxUtils::make_unique<LArHitContainer>(m_emecHitContainer.name());}
- if(!m_fcalHitContainer.isValid()) { m_fcalHitContainer = CxxUtils::make_unique<LArHitContainer>(m_fcalHitContainer.name());}
- if(!m_hecHitContainer.isValid() ) { m_hecHitContainer = CxxUtils::make_unique<LArHitContainer>(m_hecHitContainer.name());}
- if(!m_tileHitVector.isValid() ) { m_tileHitVector = CxxUtils::make_unique<TileHitVector>(m_tileHitVector.name());}
+ if(!m_embHitContainer.isValid() ) { m_embHitContainer = std::make_unique<LArHitContainer>(m_embHitContainer.name());}
+ if(!m_emecHitContainer.isValid()) { m_emecHitContainer = std::make_unique<LArHitContainer>(m_emecHitContainer.name());}
+ if(!m_fcalHitContainer.isValid()) { m_fcalHitContainer = std::make_unique<LArHitContainer>(m_fcalHitContainer.name());}
+ if(!m_hecHitContainer.isValid() ) { m_hecHitContainer = std::make_unique<LArHitContainer>(m_hecHitContainer.name());}
+ if(!m_tileHitVector.isValid() ) { m_tileHitVector = std::make_unique<TileHitVector>(m_tileHitVector.name());}
return StatusCode::SUCCESS;
}
diff --git a/Simulation/G4Atlas/G4AtlasAlg/CMakeLists.txt b/Simulation/G4Atlas/G4AtlasAlg/CMakeLists.txt
index 73f0687c14d..7d65d527731 100644
--- a/Simulation/G4Atlas/G4AtlasAlg/CMakeLists.txt
+++ b/Simulation/G4Atlas/G4AtlasAlg/CMakeLists.txt
@@ -11,7 +11,6 @@ atlas_depends_on_subdirs( PUBLIC
PRIVATE
Control/AthenaBaseComps
Control/AthenaKernel
- Control/CxxUtils
Control/SGTools
Control/StoreGate
DetectorDescription/GeoModel/GeoModelInterfaces
@@ -38,14 +37,14 @@ atlas_add_library( G4AtlasAlgLib
PUBLIC_HEADERS G4AtlasAlg
INCLUDE_DIRS ${GEANT4_INCLUDE_DIRS} ${EIGEN_INCLUDE_DIRS} ${XERCESC_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
${HEPMC_INCLUDE_DIRS}
- LINK_LIBRARIES ${GEANT4_LIBRARIES} ${EIGEN_LIBRARIES} ${XERCESC_LIBRARIES} ${CLHEP_LIBRARIES} ${HEPMC_LIBRARIES} AthenaBaseComps AthenaKernel GaudiKernel G4AtlasInterfaces G4AtlasToolsLib CxxUtils SGTools StoreGateLib SGtests EventInfo GeneratorObjects MCTruth MCTruthBaseLib )
+ LINK_LIBRARIES ${GEANT4_LIBRARIES} ${EIGEN_LIBRARIES} ${XERCESC_LIBRARIES} ${CLHEP_LIBRARIES} ${HEPMC_LIBRARIES} AthenaBaseComps AthenaKernel GaudiKernel G4AtlasInterfaces G4AtlasToolsLib SGTools StoreGateLib SGtests EventInfo GeneratorObjects MCTruth MCTruthBaseLib )
# Component(s) in the package:
atlas_add_component( G4AtlasAlg
src/components/*.cxx
PUBLIC_HEADERS G4AtlasAlg
INCLUDE_DIRS ${GEANT4_INCLUDE_DIRS} ${EIGEN_INCLUDE_DIRS} ${XERCESC_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS} ${HEPMC_INCLUDE_DIRS}
- LINK_LIBRARIES ${GEANT4_LIBRARIES} ${EIGEN_LIBRARIES} ${XERCESC_LIBRARIES} ${CLHEP_LIBRARIES} ${HEPMC_LIBRARIES} AthenaBaseComps AthenaKernel GaudiKernel G4AtlasInterfaces G4AtlasToolsLib G4AtlasAlgLib CxxUtils SGTools StoreGateLib SGtests EventInfo GeneratorObjects MCTruth MCTruthBaseLib )
+ LINK_LIBRARIES ${GEANT4_LIBRARIES} ${EIGEN_LIBRARIES} ${XERCESC_LIBRARIES} ${CLHEP_LIBRARIES} ${HEPMC_LIBRARIES} AthenaBaseComps AthenaKernel GaudiKernel G4AtlasInterfaces G4AtlasToolsLib G4AtlasAlgLib SGTools StoreGateLib SGtests EventInfo GeneratorObjects MCTruth MCTruthBaseLib )
# Install files from the package:
atlas_install_python_modules( python/*.py )
diff --git a/Simulation/G4Atlas/G4AtlasServices/CMakeLists.txt b/Simulation/G4Atlas/G4AtlasServices/CMakeLists.txt
index 722150c2452..97388fc5b1d 100644
--- a/Simulation/G4Atlas/G4AtlasServices/CMakeLists.txt
+++ b/Simulation/G4Atlas/G4AtlasServices/CMakeLists.txt
@@ -10,7 +10,6 @@ atlas_depends_on_subdirs( PUBLIC
GaudiKernel
PRIVATE
Control/AthenaBaseComps
- Control/CxxUtils
MagneticField/MagFieldInterfaces
Simulation/G4Atlas/G4AtlasInterfaces
Simulation/G4Atlas/G4AtlasTools )
@@ -26,7 +25,7 @@ atlas_add_component( G4AtlasServices
src/*.cxx
src/components/*.cxx
INCLUDE_DIRS ${GEANT4_INCLUDE_DIRS} ${XERCESC_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS} ${TBB_INCLUDE_DIRS}
- LINK_LIBRARIES ${GEANT4_LIBRARIES} ${XERCESC_LIBRARIES} ${CLHEP_LIBRARIES} ${TBB_LIBRARIES} GaudiKernel AthenaBaseComps CxxUtils G4AtlasInterfaces G4AtlasToolsLib MagFieldInterfaces)
+ LINK_LIBRARIES ${GEANT4_LIBRARIES} ${XERCESC_LIBRARIES} ${CLHEP_LIBRARIES} ${TBB_LIBRARIES} GaudiKernel AthenaBaseComps G4AtlasInterfaces G4AtlasToolsLib MagFieldInterfaces)
#test G4AtlasFieldServices
atlas_add_test( G4AtlasFieldServices_test
diff --git a/Simulation/G4Atlas/G4AtlasServices/src/UserActionSvc.cxx b/Simulation/G4Atlas/G4AtlasServices/src/UserActionSvc.cxx
index 64842feaea6..2309786d7f0 100644
--- a/Simulation/G4Atlas/G4AtlasServices/src/UserActionSvc.cxx
+++ b/Simulation/G4Atlas/G4AtlasServices/src/UserActionSvc.cxx
@@ -5,7 +5,6 @@
#include <mutex>
// Framework includes
-#include "CxxUtils/make_unique.h"
// Geant4 includes
#include "G4RunManager.hh"
@@ -91,7 +90,7 @@ namespace G4UA
ATH_MSG_ERROR("Run action already exists for current thread!");
return StatusCode::FAILURE;
}
- auto runAction = CxxUtils::make_unique<G4AtlasRunAction>();
+ auto runAction = std::make_unique<G4AtlasRunAction>();
// Assign run plugins
for(auto* action : actions.runActions)
runAction->addRunAction(action);
@@ -103,7 +102,7 @@ namespace G4UA
ATH_MSG_ERROR("Event action already exists for current thread!");
return StatusCode::FAILURE;
}
- auto eventAction = CxxUtils::make_unique<G4AtlasEventAction>();
+ auto eventAction = std::make_unique<G4AtlasEventAction>();
// Assign event plugins
for(auto* action : actions.eventActions)
eventAction->addEventAction(action);
@@ -115,7 +114,7 @@ namespace G4UA
ATH_MSG_ERROR("Stacking action already exists for current thread!");
return StatusCode::FAILURE;
}
- auto stackAction = CxxUtils::make_unique<G4AtlasStackingAction>();
+ auto stackAction = std::make_unique<G4AtlasStackingAction>();
// Assign stacking plugins
for(auto* action : actions.stackingActions)
stackAction->addAction(action);
@@ -127,7 +126,7 @@ namespace G4UA
ATH_MSG_ERROR("Tracking action already exists for current thread!");
return StatusCode::FAILURE;
}
- auto trackAction = CxxUtils::make_unique<G4AtlasTrackingAction>();
+ auto trackAction = std::make_unique<G4AtlasTrackingAction>();
// Assign tracking plugins
for(auto* action : actions.trackingActions)
trackAction->addTrackAction(action);
@@ -139,7 +138,7 @@ namespace G4UA
ATH_MSG_ERROR("Stepping action already exists for current thread!");
return StatusCode::FAILURE;
}
- auto stepAction = CxxUtils::make_unique<G4AtlasSteppingAction>();
+ auto stepAction = std::make_unique<G4AtlasSteppingAction>();
// Assign stepping plugins
for(auto* action : actions.steppingActions)
stepAction->addAction(action);
diff --git a/Simulation/G4Atlas/G4AtlasTests/CMakeLists.txt b/Simulation/G4Atlas/G4AtlasTests/CMakeLists.txt
index 49e01674b16..171ed997fab 100644
--- a/Simulation/G4Atlas/G4AtlasTests/CMakeLists.txt
+++ b/Simulation/G4Atlas/G4AtlasTests/CMakeLists.txt
@@ -14,7 +14,6 @@ atlas_depends_on_subdirs( PUBLIC
Calorimeter/CaloIdentifier
Calorimeter/CaloSimEvent
Control/AthenaKernel
- Control/CxxUtils
Control/StoreGate
DetectorDescription/GeoModel/GeoAdaptors
DetectorDescription/GeoPrimitives
diff --git a/Simulation/G4Extensions/G4HitFilter/CMakeLists.txt b/Simulation/G4Extensions/G4HitFilter/CMakeLists.txt
index 28c3f71728c..c71bcfef380 100644
--- a/Simulation/G4Extensions/G4HitFilter/CMakeLists.txt
+++ b/Simulation/G4Extensions/G4HitFilter/CMakeLists.txt
@@ -11,7 +11,6 @@ atlas_depends_on_subdirs( PUBLIC
PRIVATE
Calorimeter/CaloSimEvent
Control/AthenaBaseComps
- Control/CxxUtils
Control/StoreGate
ForwardDetectors/LUCID/LUCID_SimUtils/LUCID_SimEvent
InnerDetector/InDetSimEvent
@@ -31,7 +30,7 @@ atlas_add_component( G4HitFilter
src/*.cxx
src/components/*.cxx
INCLUDE_DIRS ${GEANT4_INCLUDE_DIRS} ${XERCESC_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
- LINK_LIBRARIES ${GEANT4_LIBRARIES} ${XERCESC_LIBRARIES} ${CLHEP_LIBRARIES} GaudiKernel CaloSimEvent AthenaBaseComps CxxUtils StoreGateLib SGtests LUCID_SimEvent InDetSimEvent LArSimEvent MuonSimEvent G4AtlasInterfaces G4AtlasToolsLib TileSimEvent )
+ LINK_LIBRARIES ${GEANT4_LIBRARIES} ${XERCESC_LIBRARIES} ${CLHEP_LIBRARIES} GaudiKernel CaloSimEvent AthenaBaseComps StoreGateLib SGtests LUCID_SimEvent InDetSimEvent LArSimEvent MuonSimEvent G4AtlasInterfaces G4AtlasToolsLib TileSimEvent )
# Install files from the package:
atlas_install_python_modules( python/*.py )
diff --git a/Simulation/G4Extensions/G4HitFilter/src/G4HitFilterTool.cxx b/Simulation/G4Extensions/G4HitFilter/src/G4HitFilterTool.cxx
index a0a7a0c93ba..31b2a2ce515 100644
--- a/Simulation/G4Extensions/G4HitFilter/src/G4HitFilterTool.cxx
+++ b/Simulation/G4Extensions/G4HitFilter/src/G4HitFilterTool.cxx
@@ -2,7 +2,6 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-#include "CxxUtils/make_unique.h"
#include "G4HitFilterTool.h"
@@ -23,7 +22,7 @@ namespace G4UA
G4HitFilterTool::makeAndFillAction(G4AtlasUserActions& actionList)
{
ATH_MSG_DEBUG("Constructing a G4HitFilter action");
- auto action = CxxUtils::make_unique<G4HitFilter>(m_config);
+ auto action = std::make_unique<G4HitFilter>(m_config);
actionList.runActions.push_back( action.get() );
actionList.eventActions.push_back( action.get() );
return action;
diff --git a/Simulation/G4Extensions/Quirks/CMakeLists.txt b/Simulation/G4Extensions/Quirks/CMakeLists.txt
index aa88d9d64bf..9f6a3230094 100644
--- a/Simulation/G4Extensions/Quirks/CMakeLists.txt
+++ b/Simulation/G4Extensions/Quirks/CMakeLists.txt
@@ -10,7 +10,6 @@ atlas_depends_on_subdirs( PUBLIC
GaudiKernel
PRIVATE
Control/AthenaBaseComps
- Control/CxxUtils
Simulation/G4Atlas/G4AtlasInterfaces
Simulation/G4Atlas/G4AtlasTools )
diff --git a/Simulation/G4Extensions/Quirks/src/DebugSteppingActionTool.cxx b/Simulation/G4Extensions/Quirks/src/DebugSteppingActionTool.cxx
index b79e3fed380..2def5678804 100644
--- a/Simulation/G4Extensions/Quirks/src/DebugSteppingActionTool.cxx
+++ b/Simulation/G4Extensions/Quirks/src/DebugSteppingActionTool.cxx
@@ -2,7 +2,6 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-#include "CxxUtils/make_unique.h"
#include "DebugSteppingActionTool.h"
namespace G4UA
@@ -21,7 +20,7 @@ namespace G4UA
DebugSteppingActionTool::makeAndFillAction(G4AtlasUserActions& actionList)
{
ATH_MSG_DEBUG("Constructing a DebugSteppingAction");
- auto action = CxxUtils::make_unique<DebugSteppingAction>(m_config);
+ auto action = std::make_unique<DebugSteppingAction>(m_config);
actionList.steppingActions.push_back( action.get() );
return action;
}
diff --git a/Simulation/G4Extensions/RHadrons/CMakeLists.txt b/Simulation/G4Extensions/RHadrons/CMakeLists.txt
index 11fca94a6c0..b904cd191a4 100644
--- a/Simulation/G4Extensions/RHadrons/CMakeLists.txt
+++ b/Simulation/G4Extensions/RHadrons/CMakeLists.txt
@@ -11,7 +11,6 @@ if( NOT GENERATIONBASE )
GaudiKernel
PRIVATE
Control/AthenaBaseComps
- Control/CxxUtils
Simulation/G4Atlas/G4AtlasInterfaces
Simulation/G4Atlas/G4AtlasTools
Simulation/G4Extensions/G4ExternalDecay
diff --git a/Simulation/G4Extensions/RHadrons/src/SG_StepNtupleTool.cxx b/Simulation/G4Extensions/RHadrons/src/SG_StepNtupleTool.cxx
index 3bf63a42472..5b7ebac8926 100644
--- a/Simulation/G4Extensions/RHadrons/src/SG_StepNtupleTool.cxx
+++ b/Simulation/G4Extensions/RHadrons/src/SG_StepNtupleTool.cxx
@@ -2,7 +2,6 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-#include "CxxUtils/make_unique.h"
#include "SG_StepNtupleTool.h"
namespace G4UA
@@ -20,7 +19,7 @@ namespace G4UA
SG_StepNtupleTool::makeAndFillAction(G4AtlasUserActions& actionList)
{
ATH_MSG_DEBUG("Constructing an SG_StepNtuple action");
- auto action = CxxUtils::make_unique<SG_StepNtuple>(m_pdgids);
+ auto action = std::make_unique<SG_StepNtuple>(m_pdgids);
actionList.runActions.push_back( action.get() );
actionList.eventActions.push_back( action.get() );
actionList.steppingActions.push_back( action.get() );
diff --git a/Simulation/G4Sim/MCTruthBase/CMakeLists.txt b/Simulation/G4Sim/MCTruthBase/CMakeLists.txt
index f84116592d0..91b2c0650de 100644
--- a/Simulation/G4Sim/MCTruthBase/CMakeLists.txt
+++ b/Simulation/G4Sim/MCTruthBase/CMakeLists.txt
@@ -13,7 +13,6 @@ atlas_depends_on_subdirs( PUBLIC
Simulation/ISF/ISF_Core/ISF_Interfaces
PRIVATE
Control/AthenaBaseComps
- Control/CxxUtils
Control/StoreGate
Simulation/G4Atlas/G4AtlasInterfaces
Simulation/G4Atlas/G4AtlasTools
@@ -35,7 +34,7 @@ atlas_add_library( MCTruthBaseLib
INCLUDE_DIRS ${GEANT4_INCLUDE_DIRS} ${XERCESC_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS} ${HEPMC_INCLUDE_DIRS}
DEFINITIONS ${CLHEP_DEFINITIONS}
LINK_LIBRARIES ${GEANT4_LIBRARIES} ${XERCESC_LIBRARIES} ${CLHEP_LIBRARIES} ${HEPMC_LIBRARIES} AthenaKernel GaudiKernel StoreGateLib SGtests G4AtlasToolsLib
- PRIVATE_LINK_LIBRARIES AthenaBaseComps CxxUtils
+ PRIVATE_LINK_LIBRARIES AthenaBaseComps
G4AtlasInterfaces MCTruth SimHelpers ISF_Interfaces
AtlasDetDescr ISF_Geant4Event
)
@@ -46,7 +45,7 @@ atlas_add_component( MCTruthBase
LINK_LIBRARIES ${GEANT4_LIBRARIES}
${XERCESC_LIBRARIES} ${CLHEP_LIBRARIES}
${HEPMC_LIBRARIES} AthenaKernel GaudiKernel
- AthenaBaseComps CxxUtils StoreGateLib SGtests
+ AthenaBaseComps StoreGateLib SGtests
G4AtlasInterfaces G4AtlasToolsLib MCTruth
SimHelpers ISF_Interfaces
AtlasDetDescr MCTruthBaseLib
diff --git a/Simulation/G4Sim/MCTruthBase/src/MCTruthSteppingActionTool.cxx b/Simulation/G4Sim/MCTruthBase/src/MCTruthSteppingActionTool.cxx
index 8e8ce2d791b..25543835b3b 100644
--- a/Simulation/G4Sim/MCTruthBase/src/MCTruthSteppingActionTool.cxx
+++ b/Simulation/G4Sim/MCTruthBase/src/MCTruthSteppingActionTool.cxx
@@ -3,7 +3,6 @@
*/
#include "MCTruthSteppingActionTool.h"
-#include "CxxUtils/make_unique.h"
namespace G4UA
diff --git a/Simulation/G4Sim/MCTruthBase/src/RecordingEnvelope.cxx b/Simulation/G4Sim/MCTruthBase/src/RecordingEnvelope.cxx
index 2c790807706..d1e9c39b6a6 100644
--- a/Simulation/G4Sim/MCTruthBase/src/RecordingEnvelope.cxx
+++ b/Simulation/G4Sim/MCTruthBase/src/RecordingEnvelope.cxx
@@ -6,7 +6,6 @@
#include "RecordingEnvelope.h"
// Athena headers
-#include "CxxUtils/make_unique.h"
#include "MCTruth/TrackHelper.h"
//G4 headers
@@ -63,7 +62,7 @@ bool RecordingEnvelope::Initialize()
void RecordingEnvelope::BeginOfEvent()
{
- if (!m_trackRecordCollection.isValid()) m_trackRecordCollection = CxxUtils::make_unique<TrackRecordCollection>(m_trackRecordCollection.name());
+ if (!m_trackRecordCollection.isValid()) m_trackRecordCollection = std::make_unique<TrackRecordCollection>(m_trackRecordCollection.name());
return;
}
void RecordingEnvelope::AddTrackRecord(const G4Step* aStep)
diff --git a/Simulation/G4Utilities/G4DebuggingTools/CMakeLists.txt b/Simulation/G4Utilities/G4DebuggingTools/CMakeLists.txt
index 9e56a66df8d..7cfd1339c88 100644
--- a/Simulation/G4Utilities/G4DebuggingTools/CMakeLists.txt
+++ b/Simulation/G4Utilities/G4DebuggingTools/CMakeLists.txt
@@ -10,7 +10,6 @@ atlas_depends_on_subdirs( PUBLIC
GaudiKernel
PRIVATE
Control/AthenaBaseComps
- Control/CxxUtils
Control/StoreGate
Event/EventInfo
Simulation/G4Atlas/G4AtlasInterfaces
@@ -36,7 +35,7 @@ atlas_add_component( G4DebuggingTools
src/*.cxx
src/components/*.cxx
INCLUDE_DIRS ${GEANT4_INCLUDE_DIRS} ${XERCESC_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS} ${TBB_INCLUDE_DIRS}
- LINK_LIBRARIES ${GEANT4_LIBRARIES} ${XERCESC_LIBRARIES} ${CLHEP_LIBRARIES} ${TBB_LIBRARIES} GaudiKernel AthenaBaseComps CxxUtils StoreGateLib SGtests EventInfo G4AtlasInterfaces G4AtlasToolsLib MCTruth MCTruthBaseLib SimHelpers )
+ LINK_LIBRARIES ${GEANT4_LIBRARIES} ${XERCESC_LIBRARIES} ${CLHEP_LIBRARIES} ${TBB_LIBRARIES} GaudiKernel AthenaBaseComps StoreGateLib SGtests EventInfo G4AtlasInterfaces G4AtlasToolsLib MCTruth MCTruthBaseLib SimHelpers )
# Install files from the package:
atlas_install_python_modules( python/*.py )
diff --git a/Simulation/G4Utilities/G4DebuggingTools/src/CheckActivationTool.cxx b/Simulation/G4Utilities/G4DebuggingTools/src/CheckActivationTool.cxx
index a62b06e8f6e..1e6c0a1d14f 100644
--- a/Simulation/G4Utilities/G4DebuggingTools/src/CheckActivationTool.cxx
+++ b/Simulation/G4Utilities/G4DebuggingTools/src/CheckActivationTool.cxx
@@ -2,7 +2,6 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-#include "CxxUtils/make_unique.h"
#include "CheckActivationTool.h"
namespace G4UA
@@ -19,7 +18,7 @@ namespace G4UA
CheckActivationTool::makeAndFillAction(G4AtlasUserActions& actionList)
{
ATH_MSG_DEBUG("Constructing a CheckActivation action");
- auto action = CxxUtils::make_unique<CheckActivation>();
+ auto action = std::make_unique<CheckActivation>();
actionList.eventActions.push_back( action.get() );
return action;
}
diff --git a/Simulation/G4Utilities/G4DebuggingTools/src/EnergyConservationTestTool.cxx b/Simulation/G4Utilities/G4DebuggingTools/src/EnergyConservationTestTool.cxx
index 2fe6af3fa85..087392e6851 100644
--- a/Simulation/G4Utilities/G4DebuggingTools/src/EnergyConservationTestTool.cxx
+++ b/Simulation/G4Utilities/G4DebuggingTools/src/EnergyConservationTestTool.cxx
@@ -2,7 +2,6 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-#include "CxxUtils/make_unique.h"
#include "EnergyConservationTestTool.h"
namespace G4UA
@@ -18,7 +17,7 @@ namespace G4UA
EnergyConservationTestTool::makeAndFillAction(G4AtlasUserActions& actionList)
{
ATH_MSG_DEBUG("Constructing an EnergyConservationTest action");
- auto action = CxxUtils::make_unique<EnergyConservationTest>();
+ auto action = std::make_unique<EnergyConservationTest>();
actionList.eventActions.push_back( action.get() );
actionList.trackingActions.push_back( action.get() );
actionList.steppingActions.push_back( action.get() );
diff --git a/Simulation/G4Utilities/G4DebuggingTools/src/G4AtlantisDumperTool.cxx b/Simulation/G4Utilities/G4DebuggingTools/src/G4AtlantisDumperTool.cxx
index a636c67a542..25019dae8f8 100644
--- a/Simulation/G4Utilities/G4DebuggingTools/src/G4AtlantisDumperTool.cxx
+++ b/Simulation/G4Utilities/G4DebuggingTools/src/G4AtlantisDumperTool.cxx
@@ -2,7 +2,6 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-#include "CxxUtils/make_unique.h"
#include "G4AtlantisDumperTool.h"
namespace G4UA
@@ -23,7 +22,7 @@ namespace G4UA
G4AtlantisDumperTool::makeAndFillAction(G4AtlasUserActions& actionList)
{
ATH_MSG_DEBUG("Constructing a G4AtlasDumper action");
- auto action = CxxUtils::make_unique<G4AtlantisDumper>(m_config);
+ auto action = std::make_unique<G4AtlantisDumper>(m_config);
actionList.eventActions.push_back( action.get() );
actionList.steppingActions.push_back( action.get() );
return action;
diff --git a/Simulation/G4Utilities/G4DebuggingTools/src/Geant4SetupCheckerTool.cxx b/Simulation/G4Utilities/G4DebuggingTools/src/Geant4SetupCheckerTool.cxx
index 3050016dd1c..519944ad0cd 100644
--- a/Simulation/G4Utilities/G4DebuggingTools/src/Geant4SetupCheckerTool.cxx
+++ b/Simulation/G4Utilities/G4DebuggingTools/src/Geant4SetupCheckerTool.cxx
@@ -2,7 +2,6 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-#include "CxxUtils/make_unique.h"
#include "Geant4SetupCheckerTool.h"
namespace G4UA
@@ -23,7 +22,7 @@ namespace G4UA
Geant4SetupCheckerTool::makeAndFillAction(G4AtlasUserActions& actionList)
{
ATH_MSG_DEBUG("Constructing a Geant4SetupChecker");
- auto action = CxxUtils::make_unique<Geant4SetupChecker>(m_file_location,m_test);
+ auto action = std::make_unique<Geant4SetupChecker>(m_file_location,m_test);
actionList.runActions.push_back( action.get() );
return action;
}
diff --git a/Simulation/G4Utilities/G4DebuggingTools/src/HyperspaceCatcherTool.cxx b/Simulation/G4Utilities/G4DebuggingTools/src/HyperspaceCatcherTool.cxx
index af39ba821e4..1093cbe875d 100644
--- a/Simulation/G4Utilities/G4DebuggingTools/src/HyperspaceCatcherTool.cxx
+++ b/Simulation/G4Utilities/G4DebuggingTools/src/HyperspaceCatcherTool.cxx
@@ -2,7 +2,6 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-#include "CxxUtils/make_unique.h"
#include "HyperspaceCatcherTool.h"
namespace G4UA
@@ -21,7 +20,7 @@ namespace G4UA
HyperspaceCatcherTool::makeAndFillAction(G4AtlasUserActions& actionList)
{
ATH_MSG_DEBUG("Constructing a HyperspaceCatcher");
- auto action = CxxUtils::make_unique<HyperspaceCatcher>(m_config);
+ auto action = std::make_unique<HyperspaceCatcher>(m_config);
actionList.runActions.push_back( action.get() );
actionList.steppingActions.push_back( action.get() );
return action;
diff --git a/Simulation/G4Utilities/G4DebuggingTools/src/StepNtupleTool.cxx b/Simulation/G4Utilities/G4DebuggingTools/src/StepNtupleTool.cxx
index 801a4bbeabe..1b6d3414287 100644
--- a/Simulation/G4Utilities/G4DebuggingTools/src/StepNtupleTool.cxx
+++ b/Simulation/G4Utilities/G4DebuggingTools/src/StepNtupleTool.cxx
@@ -2,7 +2,6 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-#include "CxxUtils/make_unique.h"
#include "StepNtupleTool.h"
namespace G4UA
@@ -18,7 +17,7 @@ namespace G4UA
StepNtupleTool::makeAndFillAction(G4AtlasUserActions& actionList)
{
ATH_MSG_DEBUG("Constructing a StepNtuple action");
- auto action = CxxUtils::make_unique<StepNtuple>();
+ auto action = std::make_unique<StepNtuple>();
actionList.runActions.push_back( action.get() );
actionList.eventActions.push_back( action.get() );
actionList.steppingActions.push_back( action.get() );
diff --git a/Simulation/G4Utilities/G4DebuggingTools/src/VerboseSelectorTool.cxx b/Simulation/G4Utilities/G4DebuggingTools/src/VerboseSelectorTool.cxx
index 8d18426bff7..a0e11fb01a3 100644
--- a/Simulation/G4Utilities/G4DebuggingTools/src/VerboseSelectorTool.cxx
+++ b/Simulation/G4Utilities/G4DebuggingTools/src/VerboseSelectorTool.cxx
@@ -2,7 +2,6 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-#include "CxxUtils/make_unique.h"
#include "VerboseSelectorTool.h"
namespace G4UA
@@ -33,7 +32,7 @@ namespace G4UA
VerboseSelectorTool::makeAndFillAction(G4AtlasUserActions& actionList)
{
ATH_MSG_DEBUG("Constructing a VerboseSelector");
- auto action = CxxUtils::make_unique<VerboseSelector>(m_config);
+ auto action = std::make_unique<VerboseSelector>(m_config);
actionList.eventActions.push_back( action.get() );
actionList.trackingActions.push_back( action.get() );
actionList.steppingActions.push_back( action.get() );
diff --git a/Simulation/G4Utilities/G4DebuggingTools/src/VolumeDebuggerTool.cxx b/Simulation/G4Utilities/G4DebuggingTools/src/VolumeDebuggerTool.cxx
index 9f4ba747923..8c6158af1c2 100644
--- a/Simulation/G4Utilities/G4DebuggingTools/src/VolumeDebuggerTool.cxx
+++ b/Simulation/G4Utilities/G4DebuggingTools/src/VolumeDebuggerTool.cxx
@@ -2,7 +2,6 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-#include "CxxUtils/make_unique.h"
#include "VolumeDebuggerTool.h"
namespace G4UA
@@ -27,7 +26,7 @@ namespace G4UA
VolumeDebuggerTool::makeAndFillAction(G4AtlasUserActions& actionList)
{
ATH_MSG_DEBUG("Constructing a VolumeDebugger");
- auto action = CxxUtils::make_unique<VolumeDebugger>(m_config);
+ auto action = std::make_unique<VolumeDebugger>(m_config);
actionList.runActions.push_back( action.get() );
return action;
}
diff --git a/Simulation/G4Utilities/G4ProfilingTools/CMakeLists.txt b/Simulation/G4Utilities/G4ProfilingTools/CMakeLists.txt
index 8825f4a55e2..67127796fd9 100644
--- a/Simulation/G4Utilities/G4ProfilingTools/CMakeLists.txt
+++ b/Simulation/G4Utilities/G4ProfilingTools/CMakeLists.txt
@@ -11,7 +11,6 @@ atlas_depends_on_subdirs( PUBLIC
PRIVATE
Control/AthenaKernel
Simulation/G4Atlas/G4AtlasTools
- Control/CxxUtils
Simulation/G4Atlas/G4AtlasInterfaces )
# External dependencies:
diff --git a/Simulation/G4Utilities/G4ProfilingTools/src/TestActionEHistTool.cxx b/Simulation/G4Utilities/G4ProfilingTools/src/TestActionEHistTool.cxx
index b87de2ed0d8..5ab10a5f4c7 100644
--- a/Simulation/G4Utilities/G4ProfilingTools/src/TestActionEHistTool.cxx
+++ b/Simulation/G4Utilities/G4ProfilingTools/src/TestActionEHistTool.cxx
@@ -2,7 +2,6 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-#include "CxxUtils/make_unique.h"
#include "TestActionEHistTool.h"
namespace G4UA
@@ -26,7 +25,7 @@ namespace G4UA
TestActionEHistTool::makeAndFillAction(G4AtlasUserActions& actionList)
{
ATH_MSG_DEBUG("Constructing a TestActionEHist");
- auto action = CxxUtils::make_unique<TestActionEHist>(m_config);
+ auto action = std::make_unique<TestActionEHist>(m_config);
actionList.runActions.push_back( action.get() );
actionList.trackingActions.push_back( action.get() );
actionList.steppingActions.push_back( action.get() );
diff --git a/Simulation/G4Utilities/G4ProfilingTools/src/TestActionTimerTool.cxx b/Simulation/G4Utilities/G4ProfilingTools/src/TestActionTimerTool.cxx
index 9ce698f33ea..22110620007 100644
--- a/Simulation/G4Utilities/G4ProfilingTools/src/TestActionTimerTool.cxx
+++ b/Simulation/G4Utilities/G4ProfilingTools/src/TestActionTimerTool.cxx
@@ -2,7 +2,6 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-#include "CxxUtils/make_unique.h"
#include "TestActionTimerTool.h"
#include "GaudiKernel/ITHistSvc.h"
#include "TH1D.h"
@@ -28,7 +27,7 @@ namespace G4UA
TestActionTimerTool::makeAndFillAction(G4AtlasUserActions& actionList)
{
ATH_MSG_DEBUG("Constructing a TestActionTimer");
- auto action = CxxUtils::make_unique<TestActionTimer>();
+ auto action = std::make_unique<TestActionTimer>();
actionList.runActions.push_back( action.get() );
actionList.eventActions.push_back( action.get() );
actionList.steppingActions.push_back( action.get() );
diff --git a/Simulation/G4Utilities/G4ProfilingTools/src/TestActionVPTimerTool.cxx b/Simulation/G4Utilities/G4ProfilingTools/src/TestActionVPTimerTool.cxx
index 5b098001b8f..bd612a6ce9f 100644
--- a/Simulation/G4Utilities/G4ProfilingTools/src/TestActionVPTimerTool.cxx
+++ b/Simulation/G4Utilities/G4ProfilingTools/src/TestActionVPTimerTool.cxx
@@ -2,7 +2,6 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-#include "CxxUtils/make_unique.h"
#include "TestActionVPTimerTool.h"
#include "VolumeTreeNavigator.h"
#include "boost/io/ios_state.hpp"
@@ -56,7 +55,7 @@ namespace G4UA
TestActionVPTimerTool::makeAndFillAction(G4AtlasUserActions& actionList)
{
ATH_MSG_DEBUG("Constructing a TestActionVPTimer");
- auto action = CxxUtils::make_unique<TestActionVPTimer>(m_config);
+ auto action = std::make_unique<TestActionVPTimer>(m_config);
actionList.runActions.push_back( action.get() );
actionList.eventActions.push_back( action.get() );
actionList.steppingActions.push_back( action.get() );
diff --git a/Simulation/G4Utilities/G4UserActions/CMakeLists.txt b/Simulation/G4Utilities/G4UserActions/CMakeLists.txt
index 4847d6ba178..d2f25c647c5 100644
--- a/Simulation/G4Utilities/G4UserActions/CMakeLists.txt
+++ b/Simulation/G4Utilities/G4UserActions/CMakeLists.txt
@@ -15,7 +15,6 @@ atlas_depends_on_subdirs( PUBLIC
Simulation/G4Atlas/G4AtlasTools
Simulation/G4Sim/TrackRecord
PRIVATE
- Control/CxxUtils
Event/EventInfo
InnerDetector/InDetSimEvent
MuonSpectrometer/MuonSimEvent
@@ -38,7 +37,7 @@ atlas_add_component( G4UserActions
src/*.cxx
src/components/*.cxx
INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${XERCESC_INCLUDE_DIRS} ${GEANT4_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS} ${TBB_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} ${XERCESC_LIBRARIES} ${GEANT4_LIBRARIES} ${CLHEP_LIBRARIES} ${TBB_LIBRARIES} AthenaBaseComps AthenaKernel StoreGateLib SGtests GaudiKernel G4AtlasInterfaces G4AtlasToolsLib CxxUtils EventInfo InDetSimEvent MuonSimEvent MCTruth SimHelpers TrackWriteFastSimLib PathResolver G4DebuggingHelperLib)
+ LINK_LIBRARIES ${ROOT_LIBRARIES} ${XERCESC_LIBRARIES} ${GEANT4_LIBRARIES} ${CLHEP_LIBRARIES} ${TBB_LIBRARIES} AthenaBaseComps AthenaKernel StoreGateLib SGtests GaudiKernel G4AtlasInterfaces G4AtlasToolsLib EventInfo InDetSimEvent MuonSimEvent MCTruth SimHelpers TrackWriteFastSimLib PathResolver G4DebuggingHelperLib)
# Install files from the package:
diff --git a/Simulation/G4Utilities/G4UserActions/src/CosmicPerigeeAction.cxx b/Simulation/G4Utilities/G4UserActions/src/CosmicPerigeeAction.cxx
index bf26bd9b8ae..50632e3c4d2 100644
--- a/Simulation/G4Utilities/G4UserActions/src/CosmicPerigeeAction.cxx
+++ b/Simulation/G4Utilities/G4UserActions/src/CosmicPerigeeAction.cxx
@@ -5,7 +5,6 @@
//class header
#include "G4UserActions/CosmicPerigeeAction.h"
//athena headers
-#include "CxxUtils/make_unique.h"
#include "MCTruth/TrackHelper.h"
//Geant4 headers
#include "G4Geantino.hh"
@@ -32,7 +31,7 @@ namespace G4UA
void CosmicPerigeeAction::BeginOfEventAction(const G4Event*)
{
if (!m_trackRecordCollection.isValid()) {
- m_trackRecordCollection = CxxUtils::make_unique<TrackRecordCollection>(
+ m_trackRecordCollection = std::make_unique<TrackRecordCollection>(
m_trackRecordCollection.name());
}
diff --git a/Simulation/G4Utilities/TrackWriteFastSim/CMakeLists.txt b/Simulation/G4Utilities/TrackWriteFastSim/CMakeLists.txt
index 5259ec50f9e..c6a25d31dd4 100644
--- a/Simulation/G4Utilities/TrackWriteFastSim/CMakeLists.txt
+++ b/Simulation/G4Utilities/TrackWriteFastSim/CMakeLists.txt
@@ -10,7 +10,6 @@ atlas_depends_on_subdirs( PUBLIC
Control/StoreGate
Simulation/G4Sim/TrackRecord
PRIVATE
- Control/CxxUtils
GaudiKernel
Simulation/G4Atlas/G4AtlasInterfaces
Simulation/G4Atlas/G4AtlasTools
@@ -29,12 +28,12 @@ atlas_add_library( TrackWriteFastSimLib
PRIVATE_INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS}
PRIVATE_DEFINITIONS ${CLHEP_DEFINITIONS}
LINK_LIBRARIES ${GEANT4_LIBRARIES} ${XERCESC_LIBRARIES} StoreGateLib SGtests G4AtlasToolsLib
- PRIVATE_LINK_LIBRARIES ${CLHEP_LIBRARIES} CxxUtils GaudiKernel G4AtlasInterfaces MCTruth )
+ PRIVATE_LINK_LIBRARIES ${CLHEP_LIBRARIES} GaudiKernel G4AtlasInterfaces MCTruth )
atlas_add_component( TrackWriteFastSim
src/components/*.cxx
INCLUDE_DIRS ${GEANT4_INCLUDE_DIRS} ${XERCESC_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
- LINK_LIBRARIES ${GEANT4_LIBRARIES} ${XERCESC_LIBRARIES} ${CLHEP_LIBRARIES} StoreGateLib SGtests CxxUtils GaudiKernel G4AtlasInterfaces G4AtlasToolsLib MCTruth TrackWriteFastSimLib )
+ LINK_LIBRARIES ${GEANT4_LIBRARIES} ${XERCESC_LIBRARIES} ${CLHEP_LIBRARIES} StoreGateLib SGtests GaudiKernel G4AtlasInterfaces G4AtlasToolsLib MCTruth TrackWriteFastSimLib )
# Install files from the package:
atlas_install_python_modules( python/*.py )
diff --git a/Simulation/G4Utilities/TrackWriteFastSim/src/TrackFastSimSD.cxx b/Simulation/G4Utilities/TrackWriteFastSim/src/TrackFastSimSD.cxx
index 7cbe47e06ed..9cbddd001aa 100644
--- a/Simulation/G4Utilities/TrackWriteFastSim/src/TrackFastSimSD.cxx
+++ b/Simulation/G4Utilities/TrackWriteFastSim/src/TrackFastSimSD.cxx
@@ -6,7 +6,6 @@
#include "TrackWriteFastSim/TrackFastSimSD.h"
// Athena headers
-#include "CxxUtils/make_unique.h" // For make unique
#include "MCTruth/TrackHelper.h"
// Geant4 headers
@@ -30,7 +29,7 @@ TrackFastSimSD::TrackFastSimSD(const std::string& name, const std::string& outpu
// Initialize from G4 - necessary to new the write handle for now
void TrackFastSimSD::Initialize(G4HCofThisEvent *)
{
- if (!m_trackRecordCollection.isValid()) m_trackRecordCollection = CxxUtils::make_unique<TrackRecordCollection>(m_trackRecordCollection.name());
+ if (!m_trackRecordCollection.isValid()) m_trackRecordCollection = std::make_unique<TrackRecordCollection>(m_trackRecordCollection.name());
}
G4bool TrackFastSimSD::ProcessHits(G4Step* aStep,G4TouchableHistory* )
diff --git a/Simulation/ISF/ISF_Core/ISF_Algorithms/CMakeLists.txt b/Simulation/ISF/ISF_Core/ISF_Algorithms/CMakeLists.txt
index ec6902ffea8..ee174effb78 100644
--- a/Simulation/ISF/ISF_Core/ISF_Algorithms/CMakeLists.txt
+++ b/Simulation/ISF/ISF_Core/ISF_Algorithms/CMakeLists.txt
@@ -12,7 +12,6 @@ atlas_depends_on_subdirs(
GaudiKernel
Control/AthenaBaseComps
Control/StoreGate
- Control/CxxUtils
DetectorDescription/AtlasDetDescr
InnerDetector/InDetSimEvent
LArCalorimeter/LArSimEvent
@@ -37,7 +36,7 @@ atlas_add_component( ISF_Algorithms
src/*.h src/*.cxx src/components/*.cxx
INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS}
LINK_LIBRARIES ${Boost_LIBRARIES} ${ROOT_LIBRARIES} GaudiKernel
- AthenaBaseComps StoreGateLib CxxUtils AtlasDetDescr GeneratorObjects
+ AthenaBaseComps StoreGateLib AtlasDetDescr GeneratorObjects
ISF_Event ISF_Interfaces PmbCxxUtils InDetSimEvent LArSimEvent TileSimEvent
MuonSimEvent )
diff --git a/Simulation/ISF/ISF_Core/ISF_Algorithms/src/CollectionMerger.h b/Simulation/ISF/ISF_Core/ISF_Algorithms/src/CollectionMerger.h
index ca3bb535b5e..b9fbfdb08dd 100644
--- a/Simulation/ISF/ISF_Core/ISF_Algorithms/src/CollectionMerger.h
+++ b/Simulation/ISF/ISF_Core/ISF_Algorithms/src/CollectionMerger.h
@@ -17,7 +17,6 @@
#include "StoreGate/WriteHandleKey.h"
// ATLAS C++
-#include "CxxUtils/make_unique.h"
// SimHit EDM includes
// InnerDetector
diff --git a/Simulation/ISF/ISF_Core/ISF_Algorithms/src/SimKernel.cxx b/Simulation/ISF/ISF_Core/ISF_Algorithms/src/SimKernel.cxx
index d3a7ff3acbd..1de0980c561 100644
--- a/Simulation/ISF/ISF_Core/ISF_Algorithms/src/SimKernel.cxx
+++ b/Simulation/ISF/ISF_Core/ISF_Algorithms/src/SimKernel.cxx
@@ -17,7 +17,6 @@
// Boost
#include <boost/lexical_cast.hpp>
// ATLAS cxx utils
-#include "CxxUtils/make_unique.h"
#include "PmbCxxUtils/CustomBenchmark.h"
// ROOT includes
#include "TTree.h"
@@ -501,7 +500,7 @@ StatusCode ISF::SimKernel::prepareInput(SG::ReadHandle<McEventCollection>& input
}
// create copy
- outputTruth = CxxUtils::make_unique<McEventCollection>(*inputTruth);
+ outputTruth = std::make_unique<McEventCollection>(*inputTruth);
// Apply QS patch if required
if(!m_qspatcher.empty()) {
diff --git a/Simulation/ISF/ISF_Core/ISF_Algorithms/test/CollectionMerger_test.cxx b/Simulation/ISF/ISF_Core/ISF_Algorithms/test/CollectionMerger_test.cxx
index 0ec2052985d..c1721c39452 100644
--- a/Simulation/ISF/ISF_Core/ISF_Algorithms/test/CollectionMerger_test.cxx
+++ b/Simulation/ISF/ISF_Core/ISF_Algorithms/test/CollectionMerger_test.cxx
@@ -14,7 +14,6 @@
#include "TestTools/initGaudi.h"
// ATLAS C++
-#include "CxxUtils/make_unique.h"
// Google Test
#include "gtest/gtest.h"
@@ -159,20 +158,20 @@ TEST_F(CollectionMerger_test, mergeCollections) {
mergeCollections(inputKeys, outputKey);
// create dummy input collections containing dummy data
- auto inputTestDataA = CxxUtils::make_unique<TestHitCollection_t>();
+ auto inputTestDataA = std::make_unique<TestHitCollection_t>();
SG::WriteHandle<TestHitCollection_t> inputTestDataHandleA{"inputCollectionA"};
inputTestDataHandleA.record( std::move(inputTestDataA) );
inputTestDataHandleA->Emplace(1);
inputTestDataHandleA->Emplace(20);
inputTestDataHandleA->Emplace(5);
- auto inputTestDataB = CxxUtils::make_unique<TestHitCollection_t>();
+ auto inputTestDataB = std::make_unique<TestHitCollection_t>();
SG::WriteHandle<TestHitCollection_t> inputTestDataHandleB{"inputCollectionB"};
inputTestDataHandleB.record( std::move(inputTestDataB) );
inputTestDataHandleB->Emplace(50);
inputTestDataHandleB->Emplace(1);
- auto inputTestDataC = CxxUtils::make_unique<TestHitCollection_t>();
+ auto inputTestDataC = std::make_unique<TestHitCollection_t>();
SG::WriteHandle<TestHitCollection_t> inputTestDataHandleC{"inputCollectionC"};
inputTestDataHandleC.record( std::move(inputTestDataC) );
inputTestDataHandleC->Emplace(20);
@@ -222,20 +221,20 @@ TEST_F(CollectionMerger_test, integration_with_data) {
// create dummy input collections containing dummy data
HepGeom::Point3D<double> pos(0.,0.,0.);
- auto inputTestDataA = CxxUtils::make_unique<SiHitCollection>();
+ auto inputTestDataA = std::make_unique<SiHitCollection>();
SG::WriteHandle<SiHitCollection> inputTestDataHandleA{"inputPixelCollectionIntegrationTestA"};
inputTestDataHandleA.record( std::move(inputTestDataA) );
inputTestDataHandleA->Emplace( pos, pos, 1., 1., 1, 0 );
inputTestDataHandleA->Emplace( pos, pos, 1., 1., 20, 0 );
inputTestDataHandleA->Emplace( pos, pos, 1., 1., 5, 0 );
- auto inputTestDataB = CxxUtils::make_unique<SiHitCollection>();
+ auto inputTestDataB = std::make_unique<SiHitCollection>();
SG::WriteHandle<SiHitCollection> inputTestDataHandleB{"inputPixelCollectionIntegrationTestB"};
inputTestDataHandleB.record( std::move(inputTestDataB) );
inputTestDataHandleB->Emplace( pos, pos, 1., 1., 50, 0 );
inputTestDataHandleB->Emplace( pos, pos, 1., 1., 1, 0 );
- auto inputTestDataC = CxxUtils::make_unique<SiHitCollection>();
+ auto inputTestDataC = std::make_unique<SiHitCollection>();
SG::WriteHandle<SiHitCollection> inputTestDataHandleC{"inputPixelCollectionIntegrationTestC"};
inputTestDataHandleC.record( std::move(inputTestDataC) );
inputTestDataHandleC->Emplace( pos, pos, 1., 1., 20, 0 );
@@ -275,13 +274,13 @@ TEST_F(CollectionMerger_test, one_empty_one_filled_input_collection___expect_fil
// create dummy input collections containing dummy data
HepGeom::Point3D<double> pos(0.,0.,0.);
SG::WriteHandle<SiHitCollection> inputTestDataHandleFilled{"inputPixelCollectionIntegrationTestFilled"};
- ASSERT_TRUE(inputTestDataHandleFilled.record(CxxUtils::make_unique<SiHitCollection>()).isSuccess());
+ ASSERT_TRUE(inputTestDataHandleFilled.record(std::make_unique<SiHitCollection>()).isSuccess());
inputTestDataHandleFilled->Emplace( pos, pos, 1., 1., 1, 0 );
inputTestDataHandleFilled->Emplace( pos, pos, 1., 1., 20, 0 );
inputTestDataHandleFilled->Emplace( pos, pos, 1., 1., 5, 0 );
SG::WriteHandle<SiHitCollection> inputTestDataHandleEmpty{"inputPixelCollectionIntegrationTestEmpty"};
- ASSERT_TRUE(inputTestDataHandleEmpty.record(CxxUtils::make_unique<SiHitCollection>()).isSuccess());
+ ASSERT_TRUE(inputTestDataHandleEmpty.record(std::make_unique<SiHitCollection>()).isSuccess());
ASSERT_TRUE( m_alg->initialize().isSuccess() );
ASSERT_TRUE( m_alg->execute().isSuccess() );
@@ -309,11 +308,11 @@ TEST_F(CollectionMerger_test, preexisting_output_collection___expect_execute_isF
// create dummy input collections containing dummy data
SG::WriteHandle<SiHitCollection> inputTestDataHandleA{"inputPixelCollectionTestX"};
- ASSERT_TRUE( inputTestDataHandleA.record(CxxUtils::make_unique<SiHitCollection>()).isSuccess() );
+ ASSERT_TRUE( inputTestDataHandleA.record(std::make_unique<SiHitCollection>()).isSuccess() );
// create pre-existing output collection
SG::WriteHandle<SiHitCollection> outputDataHandle{"outputPixelCollectionTestPreexisting"};
- ASSERT_TRUE( outputDataHandle.record(CxxUtils::make_unique<SiHitCollection>()).isSuccess() );
+ ASSERT_TRUE( outputDataHandle.record(std::make_unique<SiHitCollection>()).isSuccess() );
ASSERT_TRUE( m_alg->initialize().isSuccess() );
ASSERT_TRUE( m_alg->execute().isFailure() );
@@ -337,7 +336,7 @@ TEST_F(CollectionMerger_test, mergeCollections_with_pointer_types___expect_merge
ASSERT_TRUE( outputKey.initialize().isSuccess() );
// create dummy input collections containing dummy data
- auto inputTestDataA = CxxUtils::make_unique<TestPointerHitCollection_t>();
+ auto inputTestDataA = std::make_unique<TestPointerHitCollection_t>();
SG::WriteHandle<TestPointerHitCollection_t> inputTestDataHandleA{"inputPointerCollectionA"};
inputTestDataHandleA.record( std::move(inputTestDataA) );
auto* inputHitA1 = new ISFTesting::TestHit(1);
@@ -347,7 +346,7 @@ TEST_F(CollectionMerger_test, mergeCollections_with_pointer_types___expect_merge
auto* inputHitA3 = new ISFTesting::TestHit(5);
inputTestDataHandleA->push_back(inputHitA3);
- auto inputTestDataB = CxxUtils::make_unique<TestPointerHitCollection_t>();
+ auto inputTestDataB = std::make_unique<TestPointerHitCollection_t>();
SG::WriteHandle<TestPointerHitCollection_t> inputTestDataHandleB{"inputPointerCollectionB"};
inputTestDataHandleB.record( std::move(inputTestDataB) );
auto* inputHitB1 = new ISFTesting::TestHit(50);
diff --git a/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimSD/CMakeLists.txt b/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimSD/CMakeLists.txt
index 4c03c106111..a89f6746066 100644
--- a/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimSD/CMakeLists.txt
+++ b/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimSD/CMakeLists.txt
@@ -15,7 +15,6 @@ atlas_depends_on_subdirs( PUBLIC
PRIVATE
Calorimeter/CaloDetDescr
Calorimeter/CaloIdentifier
- Control/CxxUtils
Control/AthenaBaseComps
Generators/GeneratorObjects
LArCalorimeter/LArG4/LArG4Code
@@ -33,7 +32,7 @@ atlas_add_component( ISF_FastCaloSimSD
src/*.cxx
src/components/*.cxx
INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${XERCESC_INCLUDE_DIRS} ${GEANT4_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} ${XERCESC_LIBRARIES} ${GEANT4_LIBRARIES} ${CLHEP_LIBRARIES} StoreGateLib SGtests GaudiKernel G4AtlasInterfaces G4AtlasToolsLib CaloDetDescrLib CaloIdentifier CxxUtils GeneratorObjects LArG4Code ISF_FastCaloSimEvent Identifier )
+ LINK_LIBRARIES ${ROOT_LIBRARIES} ${XERCESC_LIBRARIES} ${GEANT4_LIBRARIES} ${CLHEP_LIBRARIES} StoreGateLib SGtests GaudiKernel G4AtlasInterfaces G4AtlasToolsLib CaloDetDescrLib CaloIdentifier GeneratorObjects LArG4Code ISF_FastCaloSimEvent Identifier )
# Install files from the package:
atlas_install_headers( ISF_FastCaloSimSD )
diff --git a/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimSD/src/SDWrapper.cxx b/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimSD/src/SDWrapper.cxx
index 7df4b9c974d..01860dcc0f9 100644
--- a/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimSD/src/SDWrapper.cxx
+++ b/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimSD/src/SDWrapper.cxx
@@ -8,7 +8,6 @@
#include "G4SDManager.hh"
// Framework utilities
-#include "CxxUtils/make_unique.h"
// Project includes
#include "ISF_FastCaloSimEvent/FCS_StepInfoCollection.h"
@@ -55,7 +54,7 @@ namespace FCS_Param
G4cout << GetName() << " \tDEBUG\t" << "Initializing hit container: "
<< m_hitCollName << G4endl;
}
- m_hitColl = CxxUtils::make_unique<HitContainerType>();
+ m_hitColl = std::make_unique<HitContainerType>();
}
}
diff --git a/Simulation/ISF/ISF_Fatras/ISF_FatrasEventTPCnv/CMakeLists.txt b/Simulation/ISF/ISF_Fatras/ISF_FatrasEventTPCnv/CMakeLists.txt
index 5baa2a3a491..d3101a3f7e0 100644
--- a/Simulation/ISF/ISF_Fatras/ISF_FatrasEventTPCnv/CMakeLists.txt
+++ b/Simulation/ISF/ISF_Fatras/ISF_FatrasEventTPCnv/CMakeLists.txt
@@ -19,7 +19,6 @@ atlas_depends_on_subdirs(
PRIVATE
AtlasTest/TestTools
Control/AthenaKernel
- Control/CxxUtils
Control/AthAllocators
Control/StoreGate
DetectorDescription/GeoPrimitives
@@ -36,7 +35,7 @@ atlas_add_tpcnv_library( ISF_FatrasEventTPCnv
PUBLIC_HEADERS ISF_FatrasEventTPCnv
LINK_LIBRARIES AthenaPoolCnvSvcLib AthenaPoolUtilities Identifier
InDetEventTPCnv ISF_FatrasDetDescrModel ISF_FatrasEvent TrkEventTPCnv
- PRIVATE_LINK_LIBRARIES AthenaKernel CxxUtils AthAllocators StoreGateLib
+ PRIVATE_LINK_LIBRARIES AthenaKernel AthAllocators StoreGateLib
EventPrimitives GaudiKernel InDetIdentifier )
atlas_add_dictionary( ISF_FatrasEventTPCnvDict
@@ -48,7 +47,7 @@ atlas_add_dictionary( ISF_FatrasEventTPCnvDict
macro( _add_test name )
atlas_add_test( ${name}
SOURCES test/${name}.cxx
- LINK_LIBRARIES TestTools CxxUtils StoreGateLib GeoPrimitives IdDictParser
+ LINK_LIBRARIES TestTools StoreGateLib GeoPrimitives IdDictParser
GaudiKernel InDetIdentifier TrkGeometry ISF_FatrasEventTPCnv
ENVIRONMENT "JOBOPTSEARCHPATH=${CMAKE_CURRENT_SOURCE_DIR}/share" )
endmacro( _add_test )
diff --git a/Simulation/ISF/ISF_Fatras/ISF_FatrasEventTPCnv/src/ISF_FatrasEvent/PlanarClusterCnv_p2.cxx b/Simulation/ISF/ISF_Fatras/ISF_FatrasEventTPCnv/src/ISF_FatrasEvent/PlanarClusterCnv_p2.cxx
index 335c9ae7e02..d9f48c612af 100644
--- a/Simulation/ISF/ISF_Fatras/ISF_FatrasEventTPCnv/src/ISF_FatrasEvent/PlanarClusterCnv_p2.cxx
+++ b/Simulation/ISF/ISF_Fatras/ISF_FatrasEventTPCnv/src/ISF_FatrasEvent/PlanarClusterCnv_p2.cxx
@@ -14,7 +14,6 @@
#include "ISF_FatrasEventTPCnv/ISF_FatrasEvent/PlanarClusterCnv_p2.h"
#include "InDetIdentifier/PixelID.h"
#include "InDetIdentifier/SCT_ID.h"
-#include "CxxUtils/make_unique.h"
#include <algorithm>
@@ -43,7 +42,7 @@ PlanarClusterCnv_p2::createPlanarCluster (const iFatras::PlanarCluster_p2 *persO
localPos[Trk::locY] = persObj->m_localPosY;
// Error matrix
- auto cmat = CxxUtils::make_unique<Amg::MatrixX>(2,2);
+ auto cmat = std::make_unique<Amg::MatrixX>(2,2);
(*cmat)(0,0) = static_cast<double>(persObj->m_mat00);
(*cmat)(1,0) = static_cast<double>(persObj->m_mat01);
(*cmat)(0,1) = static_cast<double>(persObj->m_mat01);
diff --git a/Simulation/ISF/ISF_Fatras/ISF_FatrasEventTPCnv/test/PlanarClusterCnv_p1_test.cxx b/Simulation/ISF/ISF_Fatras/ISF_FatrasEventTPCnv/test/PlanarClusterCnv_p1_test.cxx
index 7875374c8d0..3de80496fcc 100644
--- a/Simulation/ISF/ISF_Fatras/ISF_FatrasEventTPCnv/test/PlanarClusterCnv_p1_test.cxx
+++ b/Simulation/ISF/ISF_Fatras/ISF_FatrasEventTPCnv/test/PlanarClusterCnv_p1_test.cxx
@@ -19,7 +19,6 @@
#include "GeoPrimitives/GeoPrimitivesHelpers.h"
#include "StoreGate/StoreGateSvc.h"
#include "TestTools/initGaudi.h"
-#include "CxxUtils/make_unique.h"
#include "GaudiKernel/MsgStream.h"
#include "GaudiKernel/ISvcLocator.h"
#include "TestTools/leakcheck.h"
@@ -134,7 +133,7 @@ std::unique_ptr<iFatras::PlanarDetElement> makeEle(const Identifier& id,
xform = Amg::getRotateX3D (0.5+o/100);
else
xform = Amg::getRotateY3D (0.5+o/100);
- return CxxUtils::make_unique<iFatras::PlanarDetElement>
+ return std::make_unique<iFatras::PlanarDetElement>
(id,
idhash,
Amg::Vector3D (10.5+o, 11.5+o, 12.5+o),
@@ -158,9 +157,9 @@ std::unique_ptr<iFatras::PlanarDetElement> makeEle(const Identifier& id,
std::unique_ptr<IDHelpers> make_idhelpers (ISvcLocator* svcLoc)
{
- auto helpers = CxxUtils::make_unique<IDHelpers>();
- auto pix_id = CxxUtils::make_unique<PixelID>();
- auto sct_id = CxxUtils::make_unique<SCT_ID>();
+ auto helpers = std::make_unique<IDHelpers>();
+ auto pix_id = std::make_unique<PixelID>();
+ auto sct_id = std::make_unique<SCT_ID>();
helpers->m_pix_id = pix_id.get();
helpers->m_sct_id = sct_id.get();
diff --git a/Simulation/ISF/ISF_Fatras/ISF_FatrasEventTPCnv/test/PlanarClusterCnv_p2_test.cxx b/Simulation/ISF/ISF_Fatras/ISF_FatrasEventTPCnv/test/PlanarClusterCnv_p2_test.cxx
index 1f9a1c13e30..07dc984d2ca 100644
--- a/Simulation/ISF/ISF_Fatras/ISF_FatrasEventTPCnv/test/PlanarClusterCnv_p2_test.cxx
+++ b/Simulation/ISF/ISF_Fatras/ISF_FatrasEventTPCnv/test/PlanarClusterCnv_p2_test.cxx
@@ -19,7 +19,6 @@
#include "GeoPrimitives/GeoPrimitivesHelpers.h"
#include "StoreGate/StoreGateSvc.h"
#include "TestTools/initGaudi.h"
-#include "CxxUtils/make_unique.h"
#include "GaudiKernel/MsgStream.h"
#include "GaudiKernel/ISvcLocator.h"
#include "TestTools/leakcheck.h"
@@ -164,7 +163,7 @@ std::unique_ptr<iFatras::PlanarDetElement> makeEle(const Identifier& id,
xform = Amg::getRotateX3D (0.5+o/100);
else
xform = Amg::getRotateY3D (0.5+o/100);
- return CxxUtils::make_unique<iFatras::PlanarDetElement>
+ return std::make_unique<iFatras::PlanarDetElement>
(id,
idhash,
Amg::Vector3D (10.5+o, 11.5+o, 12.5+o),
@@ -188,9 +187,9 @@ std::unique_ptr<iFatras::PlanarDetElement> makeEle(const Identifier& id,
std::unique_ptr<IDHelpers> make_idhelpers (ISvcLocator* svcLoc)
{
- auto helpers = CxxUtils::make_unique<IDHelpers>();
- auto pix_id = CxxUtils::make_unique<PixelID>();
- auto sct_id = CxxUtils::make_unique<SCT_ID>();
+ auto helpers = std::make_unique<IDHelpers>();
+ auto pix_id = std::make_unique<PixelID>();
+ auto sct_id = std::make_unique<SCT_ID>();
helpers->m_pix_id = pix_id.get();
helpers->m_sct_id = sct_id.get();
diff --git a/Simulation/ISF/ISF_Fatras/ISF_FatrasEventTPCnv/test/PlanarClusterContainerCnv_p1_test.cxx b/Simulation/ISF/ISF_Fatras/ISF_FatrasEventTPCnv/test/PlanarClusterContainerCnv_p1_test.cxx
index e8d4a9b7652..5a93007d345 100644
--- a/Simulation/ISF/ISF_Fatras/ISF_FatrasEventTPCnv/test/PlanarClusterContainerCnv_p1_test.cxx
+++ b/Simulation/ISF/ISF_Fatras/ISF_FatrasEventTPCnv/test/PlanarClusterContainerCnv_p1_test.cxx
@@ -19,7 +19,6 @@
#include "GeoPrimitives/GeoPrimitivesHelpers.h"
#include "StoreGate/StoreGateSvc.h"
#include "TestTools/initGaudi.h"
-#include "CxxUtils/make_unique.h"
#include "GaudiKernel/MsgStream.h"
#include "GaudiKernel/ISvcLocator.h"
#include "TestTools/leakcheck.h"
@@ -113,7 +112,7 @@ void test1 (const IDHelpers& helpers)
{
Identifier wafer_id = helpers.m_pixel_ids[0];
IdentifierHash wafer_hash = helpers.m_pix_id->wafer_hash (wafer_id);
- auto coll = CxxUtils::make_unique<iFatras::PlanarClusterCollection> (wafer_hash);
+ auto coll = std::make_unique<iFatras::PlanarClusterCollection> (wafer_hash);
for (int i=0; i < NELTS; i++) {
int o = i*10;
@@ -136,7 +135,7 @@ void test1 (const IDHelpers& helpers)
for (int j=0; j < 2; j++)
cov(i,j) = 100*(i+1)*(j+1) + o;
- auto clus = CxxUtils::make_unique<iFatras::PlanarCluster>
+ auto clus = std::make_unique<iFatras::PlanarCluster>
(helpers.m_pix_id->pixel_id (wafer_id,
21+o,
31+o),
@@ -155,7 +154,7 @@ void test1 (const IDHelpers& helpers)
{
Identifier wafer_id = helpers.m_sct_ids[0];
IdentifierHash wafer_hash = helpers.m_sct_id->wafer_hash (wafer_id);
- auto coll = CxxUtils::make_unique<iFatras::PlanarClusterCollection> (wafer_hash);
+ auto coll = std::make_unique<iFatras::PlanarClusterCollection> (wafer_hash);
for (int i=0; i < NELTS; i++) {
int o = i*10+5;
@@ -172,7 +171,7 @@ void test1 (const IDHelpers& helpers)
for (int j=0; j < 2; j++)
cov(i,j) = 100*(i+1)*(j+1) + o;
- auto clus = CxxUtils::make_unique<iFatras::PlanarCluster>
+ auto clus = std::make_unique<iFatras::PlanarCluster>
(helpers.m_sct_id->strip_id (wafer_id, 41+i),
locpos,
rdoList,
@@ -203,7 +202,7 @@ std::unique_ptr<iFatras::PlanarDetElement> makeEle(const Identifier& id,
xform = Amg::getRotateX3D (0.5+o/100);
else
xform = Amg::getRotateY3D (0.5+o/100);
- return CxxUtils::make_unique<iFatras::PlanarDetElement>
+ return std::make_unique<iFatras::PlanarDetElement>
(id,
idhash,
Amg::Vector3D (10.5+o, 11.5+o, 12.5+o),
@@ -227,9 +226,9 @@ std::unique_ptr<iFatras::PlanarDetElement> makeEle(const Identifier& id,
std::unique_ptr<IDHelpers> make_idhelpers (ISvcLocator* svcLoc)
{
- auto helpers = CxxUtils::make_unique<IDHelpers>();
- auto pix_id = CxxUtils::make_unique<PixelID>();
- auto sct_id = CxxUtils::make_unique<SCT_ID>();
+ auto helpers = std::make_unique<IDHelpers>();
+ auto pix_id = std::make_unique<PixelID>();
+ auto sct_id = std::make_unique<SCT_ID>();
helpers->m_pix_id = pix_id.get();
helpers->m_sct_id = sct_id.get();
@@ -245,7 +244,7 @@ std::unique_ptr<IDHelpers> make_idhelpers (ISvcLocator* svcLoc)
assert ( sg->record (std::move (pix_id), "PixelID") );
assert ( sg->record (std::move (sct_id), "SCT_ID") );
- auto pixel_map = CxxUtils::make_unique<iFatras::IdHashDetElementCollection>();
+ auto pixel_map = std::make_unique<iFatras::IdHashDetElementCollection>();
{
Identifier id = helpers->m_pix_id->wafer_id (0,
1,
@@ -260,7 +259,7 @@ std::unique_ptr<IDHelpers> make_idhelpers (ISvcLocator* svcLoc)
}
assert ( sg->record (std::move (pixel_map), "Pixel_IdHashDetElementMap") );
- auto sct_map = CxxUtils::make_unique<iFatras::IdHashDetElementCollection>();
+ auto sct_map = std::make_unique<iFatras::IdHashDetElementCollection>();
{
Identifier id = helpers->m_sct_id->wafer_id (0,
1,
diff --git a/Simulation/ISF/ISF_Fatras/ISF_FatrasEventTPCnv/test/PlanarClusterContainerCnv_p2_test.cxx b/Simulation/ISF/ISF_Fatras/ISF_FatrasEventTPCnv/test/PlanarClusterContainerCnv_p2_test.cxx
index e2af36fdeb6..a4573861ef2 100644
--- a/Simulation/ISF/ISF_Fatras/ISF_FatrasEventTPCnv/test/PlanarClusterContainerCnv_p2_test.cxx
+++ b/Simulation/ISF/ISF_Fatras/ISF_FatrasEventTPCnv/test/PlanarClusterContainerCnv_p2_test.cxx
@@ -19,7 +19,6 @@
#include "GeoPrimitives/GeoPrimitivesHelpers.h"
#include "StoreGate/StoreGateSvc.h"
#include "TestTools/initGaudi.h"
-#include "CxxUtils/make_unique.h"
#include "GaudiKernel/MsgStream.h"
#include "GaudiKernel/ISvcLocator.h"
#include "TestTools/leakcheck.h"
@@ -113,7 +112,7 @@ void test1 (const IDHelpers& helpers)
{
Identifier wafer_id = helpers.m_pixel_ids[0];
IdentifierHash wafer_hash = helpers.m_pix_id->wafer_hash (wafer_id);
- auto coll = CxxUtils::make_unique<iFatras::PlanarClusterCollection> (wafer_hash);
+ auto coll = std::make_unique<iFatras::PlanarClusterCollection> (wafer_hash);
for (int i=0; i < NELTS; i++) {
int o = i*10;
@@ -136,7 +135,7 @@ void test1 (const IDHelpers& helpers)
for (int j=0; j < 2; j++)
cov(i,j) = 100*(i+1)*(j+1) + o;
- auto clus = CxxUtils::make_unique<iFatras::PlanarCluster>
+ auto clus = std::make_unique<iFatras::PlanarCluster>
(helpers.m_pix_id->pixel_id (wafer_id,
21+o,
31+o),
@@ -154,7 +153,7 @@ void test1 (const IDHelpers& helpers)
{
Identifier wafer_id = helpers.m_sct_ids[0];
IdentifierHash wafer_hash = helpers.m_sct_id->wafer_hash (wafer_id);
- auto coll = CxxUtils::make_unique<iFatras::PlanarClusterCollection> (wafer_hash);
+ auto coll = std::make_unique<iFatras::PlanarClusterCollection> (wafer_hash);
for (int i=0; i < NELTS; i++) {
int o = i*10+5;
@@ -171,7 +170,7 @@ void test1 (const IDHelpers& helpers)
for (int j=0; j < 2; j++)
cov(i,j) = 100*(i+1)*(j+1) + o;
- auto clus = CxxUtils::make_unique<iFatras::PlanarCluster>
+ auto clus = std::make_unique<iFatras::PlanarCluster>
(helpers.m_sct_id->strip_id (wafer_id, 41+i),
locpos,
rdoList,
@@ -201,7 +200,7 @@ std::unique_ptr<iFatras::PlanarDetElement> makeEle(const Identifier& id,
xform = Amg::getRotateX3D (0.5+o/100);
else
xform = Amg::getRotateY3D (0.5+o/100);
- return CxxUtils::make_unique<iFatras::PlanarDetElement>
+ return std::make_unique<iFatras::PlanarDetElement>
(id,
idhash,
Amg::Vector3D (10.5+o, 11.5+o, 12.5+o),
@@ -225,9 +224,9 @@ std::unique_ptr<iFatras::PlanarDetElement> makeEle(const Identifier& id,
std::unique_ptr<IDHelpers> make_idhelpers (ISvcLocator* svcLoc)
{
- auto helpers = CxxUtils::make_unique<IDHelpers>();
- auto pix_id = CxxUtils::make_unique<PixelID>();
- auto sct_id = CxxUtils::make_unique<SCT_ID>();
+ auto helpers = std::make_unique<IDHelpers>();
+ auto pix_id = std::make_unique<PixelID>();
+ auto sct_id = std::make_unique<SCT_ID>();
helpers->m_pix_id = pix_id.get();
helpers->m_sct_id = sct_id.get();
@@ -243,7 +242,7 @@ std::unique_ptr<IDHelpers> make_idhelpers (ISvcLocator* svcLoc)
assert ( sg->record (std::move (pix_id), "PixelID") );
assert ( sg->record (std::move (sct_id), "SCT_ID") );
- auto pixel_map = CxxUtils::make_unique<iFatras::IdHashDetElementCollection>();
+ auto pixel_map = std::make_unique<iFatras::IdHashDetElementCollection>();
{
Identifier id = helpers->m_pix_id->wafer_id (0,
1,
@@ -258,7 +257,7 @@ std::unique_ptr<IDHelpers> make_idhelpers (ISvcLocator* svcLoc)
}
assert ( sg->record (std::move (pixel_map), "Pixel_IdHashDetElementMap") );
- auto sct_map = CxxUtils::make_unique<iFatras::IdHashDetElementCollection>();
+ auto sct_map = std::make_unique<iFatras::IdHashDetElementCollection>();
{
Identifier id = helpers->m_sct_id->wafer_id (0,
1,
diff --git a/Simulation/ISF/ISF_Geant4/ISF_Geant4Tools/CMakeLists.txt b/Simulation/ISF/ISF_Geant4/ISF_Geant4Tools/CMakeLists.txt
index 522a2adab57..47fba0483d5 100644
--- a/Simulation/ISF/ISF_Geant4/ISF_Geant4Tools/CMakeLists.txt
+++ b/Simulation/ISF/ISF_Geant4/ISF_Geant4Tools/CMakeLists.txt
@@ -12,7 +12,6 @@ atlas_depends_on_subdirs( PUBLIC
Simulation/G4Atlas/G4AtlasInterfaces
PRIVATE
Control/AthenaBaseComps
- Control/CxxUtils
Control/StoreGate
DetectorDescription/AtlasDetDescr
Generators/GeneratorObjects
@@ -38,7 +37,7 @@ atlas_add_component( ISF_Geant4Tools
src/*.cxx
src/components/*.cxx
INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${XERCESC_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS} ${HEPMC_INCLUDE_DIRS} ${GEANT4_INCLUDE_DIRS} ${EIGEN_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} ${XERCESC_LIBRARIES} ${CLHEP_LIBRARIES} ${HEPMC_LIBRARIES} ${GEANT4_LIBRARIES} ${EIGEN_LIBRARIES} AthenaKernel GaudiKernel G4AtlasInterfaces AthenaBaseComps CxxUtils StoreGateLib SGtests AtlasDetDescr GeneratorObjects G4AtlasToolsLib G4AtlasAlgLib MCTruth SimHelpers ISF_Event ISF_Interfaces ISF_Geant4Event )
+ LINK_LIBRARIES ${ROOT_LIBRARIES} ${XERCESC_LIBRARIES} ${CLHEP_LIBRARIES} ${HEPMC_LIBRARIES} ${GEANT4_LIBRARIES} ${EIGEN_LIBRARIES} AthenaKernel GaudiKernel G4AtlasInterfaces AthenaBaseComps StoreGateLib SGtests AtlasDetDescr GeneratorObjects G4AtlasToolsLib G4AtlasAlgLib MCTruth SimHelpers ISF_Event ISF_Interfaces ISF_Geant4Event )
# Install files from the package:
atlas_install_headers( ISF_Geant4Tools )
diff --git a/Simulation/ISF/ISF_Geant4/ISF_Geant4Tools/src/MCTruthUserActionTool.cxx b/Simulation/ISF/ISF_Geant4/ISF_Geant4Tools/src/MCTruthUserActionTool.cxx
index 25425cfc68f..453e4758dad 100644
--- a/Simulation/ISF/ISF_Geant4/ISF_Geant4Tools/src/MCTruthUserActionTool.cxx
+++ b/Simulation/ISF/ISF_Geant4/ISF_Geant4Tools/src/MCTruthUserActionTool.cxx
@@ -2,7 +2,6 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-#include "CxxUtils/make_unique.h"
#include "MCTruthUserActionTool.h"
namespace G4UA
@@ -27,7 +26,7 @@ namespace G4UA
ATH_MSG_DEBUG("Constructing an MCTruthUserAction");
if(msgLvl(MSG::VERBOSE)) { m_config.verboseLevel = 10; }
else if(msgLvl(MSG::DEBUG)) { m_config.verboseLevel = 5; }
- auto action = CxxUtils::make_unique<MCTruthUserAction>(m_config);
+ auto action = std::make_unique<MCTruthUserAction>(m_config);
actionList.trackingActions.push_back( action.get() );
return action;
}
diff --git a/Simulation/ISF/ISF_Geant4/ISF_Geant4Tools/src/PhysicsValidationUserActionTool.cxx b/Simulation/ISF/ISF_Geant4/ISF_Geant4Tools/src/PhysicsValidationUserActionTool.cxx
index edd1f33034e..6d51b4d75d3 100644
--- a/Simulation/ISF/ISF_Geant4/ISF_Geant4Tools/src/PhysicsValidationUserActionTool.cxx
+++ b/Simulation/ISF/ISF_Geant4/ISF_Geant4Tools/src/PhysicsValidationUserActionTool.cxx
@@ -46,7 +46,7 @@ namespace G4UA
else if(msgLvl(MSG::WARNING)) { m_config.verboseLevel = MSG::WARNING; }
else if(msgLvl(MSG::ERROR)) { m_config.verboseLevel = MSG::ERROR; }
else if(msgLvl(MSG::FATAL)) { m_config.verboseLevel = MSG::FATAL; }
- auto action = CxxUtils::make_unique<PhysicsValidationUserAction>(m_config);
+ auto action = std::make_unique<PhysicsValidationUserAction>(m_config);
actionList.runActions.push_back( action.get() );
actionList.eventActions.push_back( action.get() );
actionList.trackingActions.push_back( action.get() );
diff --git a/Simulation/ISF/ISF_Geant4/ISF_Geant4Tools/src/TrackProcessorUserActionFullG4Tool.cxx b/Simulation/ISF/ISF_Geant4/ISF_Geant4Tools/src/TrackProcessorUserActionFullG4Tool.cxx
index ddf0c0505df..768cc48873e 100644
--- a/Simulation/ISF/ISF_Geant4/ISF_Geant4Tools/src/TrackProcessorUserActionFullG4Tool.cxx
+++ b/Simulation/ISF/ISF_Geant4/ISF_Geant4Tools/src/TrackProcessorUserActionFullG4Tool.cxx
@@ -2,7 +2,6 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-#include "CxxUtils/make_unique.h"
#include "TrackProcessorUserActionFullG4Tool.h"
namespace G4UA
@@ -29,7 +28,7 @@ namespace G4UA
ATH_MSG_DEBUG("Constructing a TrackProcessorUserActionFullG4");
if(msgLvl(MSG::VERBOSE)) { m_config.verboseLevel = 10; }
else if(msgLvl(MSG::DEBUG)) { m_config.verboseLevel = 5; }
- auto action = CxxUtils::make_unique<TrackProcessorUserActionFullG4>(m_config);
+ auto action = std::make_unique<TrackProcessorUserActionFullG4>(m_config);
actionList.eventActions.push_back( action.get() );
actionList.trackingActions.push_back( action.get() );
actionList.steppingActions.push_back( action.get() );
diff --git a/Simulation/ISF/ISF_Geant4/ISF_Geant4Tools/src/TrackProcessorUserActionPassBackTool.cxx b/Simulation/ISF/ISF_Geant4/ISF_Geant4Tools/src/TrackProcessorUserActionPassBackTool.cxx
index d3f2259874c..b5fdf7ca33f 100644
--- a/Simulation/ISF/ISF_Geant4/ISF_Geant4Tools/src/TrackProcessorUserActionPassBackTool.cxx
+++ b/Simulation/ISF/ISF_Geant4/ISF_Geant4Tools/src/TrackProcessorUserActionPassBackTool.cxx
@@ -2,7 +2,6 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-#include "CxxUtils/make_unique.h"
#include "TrackProcessorUserActionPassBackTool.h"
#include "ISF_Interfaces/IParticleBroker.h"
@@ -36,7 +35,7 @@ namespace G4UA
ATH_MSG_DEBUG("Constructing a TrackProcessorUserActionPassBack");
if(msgLvl(MSG::VERBOSE)) { m_config.verboseLevel = 10; }
else if(msgLvl(MSG::DEBUG)) { m_config.verboseLevel = 5; }
- auto action = CxxUtils::make_unique<TrackProcessorUserActionPassBack>(m_config);
+ auto action = std::make_unique<TrackProcessorUserActionPassBack>(m_config);
actionList.eventActions.push_back( action.get() );
actionList.trackingActions.push_back( action.get() );
actionList.steppingActions.push_back( action.get() );
diff --git a/Simulation/ISF/ISF_Geant4/ISF_Geant4UserActions/CMakeLists.txt b/Simulation/ISF/ISF_Geant4/ISF_Geant4UserActions/CMakeLists.txt
index 4b163d93dd7..04269ad5057 100644
--- a/Simulation/ISF/ISF_Geant4/ISF_Geant4UserActions/CMakeLists.txt
+++ b/Simulation/ISF/ISF_Geant4/ISF_Geant4UserActions/CMakeLists.txt
@@ -15,7 +15,6 @@ atlas_depends_on_subdirs( PUBLIC
PRIVATE
Calorimeter/CaloDetDescr
Calorimeter/CaloIdentifier
- Control/CxxUtils
Control/AthenaBaseComps
Generators/GeneratorObjects
LArCalorimeter/LArG4/LArG4Code
@@ -33,7 +32,7 @@ atlas_add_component( ISF_Geant4UserActions
src/*.cxx
src/components/*.cxx
INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${XERCESC_INCLUDE_DIRS} ${GEANT4_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} ${XERCESC_LIBRARIES} ${GEANT4_LIBRARIES} ${CLHEP_LIBRARIES} StoreGateLib SGtests GaudiKernel G4AtlasInterfaces G4AtlasToolsLib CaloDetDescrLib CaloIdentifier CxxUtils GeneratorObjects LArG4Code ISF_FastCaloSimEvent Identifier )
+ LINK_LIBRARIES ${ROOT_LIBRARIES} ${XERCESC_LIBRARIES} ${GEANT4_LIBRARIES} ${CLHEP_LIBRARIES} StoreGateLib SGtests GaudiKernel G4AtlasInterfaces G4AtlasToolsLib CaloDetDescrLib CaloIdentifier GeneratorObjects LArG4Code ISF_FastCaloSimEvent Identifier )
# Install files from the package:
atlas_install_headers( ISF_Geant4UserActions )
diff --git a/Simulation/ISF/ISF_Geant4/ISF_Geant4UserActions/src/FastCaloSimParamActionTool.cxx b/Simulation/ISF/ISF_Geant4/ISF_Geant4UserActions/src/FastCaloSimParamActionTool.cxx
index 699b21c7dba..f8729bdede1 100644
--- a/Simulation/ISF/ISF_Geant4/ISF_Geant4UserActions/src/FastCaloSimParamActionTool.cxx
+++ b/Simulation/ISF/ISF_Geant4/ISF_Geant4UserActions/src/FastCaloSimParamActionTool.cxx
@@ -2,7 +2,6 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-#include "CxxUtils/make_unique.h"
#include "ISF_Geant4UserActions/FastCaloSimParamActionTool.h"
#include "LArG4Code/ILArCalculatorSvc.h"
#include "TileG4Interfaces/ITileCalculator.h"
@@ -101,7 +100,7 @@ namespace G4UA
FastCaloSimParamActionTool::makeAndFillAction(G4AtlasUserActions& actionList)
{
ATH_MSG_DEBUG("Constructing a FastCaloSimParamAction");
- auto action = CxxUtils::make_unique<FastCaloSimParamAction>(m_config);
+ auto action = std::make_unique<FastCaloSimParamAction>(m_config);
actionList.runActions.push_back( action.get() );
actionList.eventActions.push_back( action.get() );
actionList.steppingActions.push_back( action.get() );
diff --git a/Simulation/ISF/ISF_Geant4/ISF_Geant4UserActions/src/TestBoundariesUserActionTool.cxx b/Simulation/ISF/ISF_Geant4/ISF_Geant4UserActions/src/TestBoundariesUserActionTool.cxx
index fe9cee09c05..318e6528bed 100644
--- a/Simulation/ISF/ISF_Geant4/ISF_Geant4UserActions/src/TestBoundariesUserActionTool.cxx
+++ b/Simulation/ISF/ISF_Geant4/ISF_Geant4UserActions/src/TestBoundariesUserActionTool.cxx
@@ -2,7 +2,6 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-#include "CxxUtils/make_unique.h"
#include "TestBoundariesUserActionTool.h"
namespace G4UA
@@ -22,7 +21,7 @@ namespace G4UA
TestBoundariesUserActionTool::makeAndFillAction(G4AtlasUserActions& actionList)
{
ATH_MSG_DEBUG("Constructing a TestBoundariesUserAction");
- auto action = CxxUtils::make_unique<TestBoundariesUserAction>();
+ auto action = std::make_unique<TestBoundariesUserAction>();
actionList.runActions.push_back( action.get() );
actionList.steppingActions.push_back( action.get() );
return action;
diff --git a/Simulation/Tools/McEventCollectionFilter/src/McEventCollectionFilter.cxx b/Simulation/Tools/McEventCollectionFilter/src/McEventCollectionFilter.cxx
index c1a2b918e34..8fb9f1d59c9 100644
--- a/Simulation/Tools/McEventCollectionFilter/src/McEventCollectionFilter.cxx
+++ b/Simulation/Tools/McEventCollectionFilter/src/McEventCollectionFilter.cxx
@@ -20,7 +20,6 @@
#include "CLHEP/Geometry/Point3D.h"
#include "GeoPrimitives/GeoPrimitives.h"
#include <climits>
-#include "CxxUtils/make_unique.h"
McEventCollectionFilter::McEventCollectionFilter(const std::string& name, ISvcLocator* pSvcLocator)
: AthAlgorithm(name, pSvcLocator)
@@ -146,7 +145,7 @@ StatusCode McEventCollectionFilter::ReduceMCEventCollection(){
}
ATH_MSG_DEBUG( "Found McEventCollection");
- if (!m_outputTruthCollection.isValid()) m_outputTruthCollection = CxxUtils::make_unique<McEventCollection>();
+ if (!m_outputTruthCollection.isValid()) m_outputTruthCollection = std::make_unique<McEventCollection>();
//.......Create new particle (geantino) to link hits from pileup
HepMC::GenParticle* genPart=new HepMC::GenParticle();
@@ -242,7 +241,7 @@ StatusCode McEventCollectionFilter::SiliconHitsTruthRelink(){
}
ATH_MSG_DEBUG( "Found Pixel SiHitCollection");
- if (!m_outputPixelHits.isValid()) m_outputPixelHits = CxxUtils::make_unique<SiHitCollection>();
+ if (!m_outputPixelHits.isValid()) m_outputPixelHits = std::make_unique<SiHitCollection>();
ATH_CHECK(this->SiHitsTruthRelink(m_inputPixelHits,m_outputPixelHits));
@@ -253,7 +252,7 @@ StatusCode McEventCollectionFilter::SiliconHitsTruthRelink(){
}
ATH_MSG_DEBUG( "Found SCT SiHitCollection");
- if (!m_outputSCTHits.isValid()) m_outputSCTHits = CxxUtils::make_unique<SiHitCollection>();
+ if (!m_outputSCTHits.isValid()) m_outputSCTHits = std::make_unique<SiHitCollection>();
ATH_CHECK(this->SiHitsTruthRelink(m_inputSCTHits,m_outputSCTHits));
@@ -264,7 +263,7 @@ StatusCode McEventCollectionFilter::SiliconHitsTruthRelink(){
}
ATH_MSG_DEBUG( "Found BCM SiHitCollection");
- if (!m_outputBCMHits.isValid()) m_outputBCMHits = CxxUtils::make_unique<SiHitCollection>();
+ if (!m_outputBCMHits.isValid()) m_outputBCMHits = std::make_unique<SiHitCollection>();
ATH_CHECK(this->SiHitsTruthRelink(m_inputBCMHits,m_outputBCMHits));
@@ -305,7 +304,7 @@ StatusCode McEventCollectionFilter::TRTHitsTruthRelink()
}
ATH_MSG_DEBUG( "Found TRTUncompressedHitsCollection");
- if (!m_outputTRTHits.isValid()) m_outputTRTHits = CxxUtils::make_unique<TRTUncompressedHitCollection>();
+ if (!m_outputTRTHits.isValid()) m_outputTRTHits = std::make_unique<TRTUncompressedHitCollection>();
for (TRTUncompressedHitCollection::const_iterator i = m_inputTRTHits->begin(); i != m_inputTRTHits->end(); ++i)
{
@@ -350,7 +349,7 @@ StatusCode McEventCollectionFilter::MDTHitsTruthRelink(){
}
ATH_MSG_DEBUG( "Found MDTSimHitCollection");
- if (!m_outputMDTHits.isValid()) m_outputMDTHits = CxxUtils::make_unique<MDTSimHitCollection>();
+ if (!m_outputMDTHits.isValid()) m_outputMDTHits = std::make_unique<MDTSimHitCollection>();
for(MDTSimHitConstIterator i=m_inputMDTHits->begin();i!=m_inputMDTHits->end();++i){
const HepMcParticleLink oldLink = (*i).particleLink();
@@ -385,7 +384,7 @@ StatusCode McEventCollectionFilter::CSCHitsTruthRelink(){
}
ATH_MSG_DEBUG( "Found CSCSimHitCollection");
- if (!m_outputCSCHits.isValid()) m_outputCSCHits = CxxUtils::make_unique<CSCSimHitCollection>();
+ if (!m_outputCSCHits.isValid()) m_outputCSCHits = std::make_unique<CSCSimHitCollection>();
for(CSCSimHitConstIterator i=m_inputCSCHits->begin();i!=m_inputCSCHits->end();++i){
const HepMcParticleLink oldLink = (*i).particleLink();
@@ -418,7 +417,7 @@ StatusCode McEventCollectionFilter::RPCHitsTruthRelink(){
}
ATH_MSG_DEBUG( "Found RPCSimHitCollection");
- if (!m_outputRPCHits.isValid()) m_outputRPCHits = CxxUtils::make_unique<RPCSimHitCollection>();
+ if (!m_outputRPCHits.isValid()) m_outputRPCHits = std::make_unique<RPCSimHitCollection>();
for(RPCSimHitConstIterator i=m_inputRPCHits->begin();i!=m_inputRPCHits->end();++i){
const HepMcParticleLink oldLink = (*i).particleLink();
@@ -452,7 +451,7 @@ StatusCode McEventCollectionFilter::TGCHitsTruthRelink(){
}
ATH_MSG_DEBUG( "Found TGCSimHitCollection");
- if (!m_outputTGCHits.isValid()) m_outputTGCHits = CxxUtils::make_unique<TGCSimHitCollection>();
+ if (!m_outputTGCHits.isValid()) m_outputTGCHits = std::make_unique<TGCSimHitCollection>();
for(TGCSimHitConstIterator i=m_inputTGCHits->begin();i!=m_inputTGCHits->end();++i){
const HepMcParticleLink oldLink = (*i).particleLink();
--
GitLab