diff --git a/Simulation/BeamEffects/CMakeLists.txt b/Simulation/BeamEffects/CMakeLists.txt
index 545095a53e0eaaa4922d8c3658d00c9905d7e3b1..9f1d61558fcee2ae30605520d86c1da8f8cd3b7a 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 42e2b0b50dd345392f37c13589283097fbc65fa3..f53eae4b0314c75611a23a3d66415f932cbc60a7 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 ab7972bda69d3d30606540993e2b30453ecf7a11..ff0450e6684540e8ac20e1296c515b94e10c67d6 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 eb3024414ed501349ae071166bba1e26b182c7fe..b673c3c0a473b82b583db7f6b7da26099682a692 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 09e632671186c0eacb33b08d7f151caafeb64770..a038afa4e718e2e70895b0e73181af9e62de1c3a 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 73f0687c14d315c6e844c9ca89c67f787c143c68..7d65d527731d630b4c225058ed052379144612d0 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 722150c2452c49e1f45e6cbf12c2ffef4ce06e71..97388fc5b1d0915609e92dc31945eb1268bf6225 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 64842feaea6b9b93810cf1a7ab60f2ce17f993bf..2309786d7f0fb87c5659933e3bf4dbbd7f824ff8 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 49e01674b1664ff94d25cdb4a760220f56fb2660..171ed997fab4ae5109dc87ad8dc3df780cdbe57b 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 28c3f71728c8794be7ee4fd55508ec1dda3235b9..c71bcfef3808e9ad9f0db9cc96903c831ad91b48 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 a0a7a0c93ba1186383f8d88ae50ab2f38bcafa4a..31b2a2ce5151e9abb447c4ea747e3b78c0e5e1b4 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 aa88d9d64bfe8e350eab1564735b85421d5c0f39..9f6a32300947045f80c907bd63fb854eb4c3c5e9 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 b79e3fed380b7639e6876c2e9140a79c4247bd8b..2def56788045ffaf76c0a79e81bf44e6dc93c08a 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 11fca94a6c082d2dede0bf470e132d3787bc8ba8..b904cd191a472732d6829e0457bb7fb3f608829c 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 3bf63a424726afa2d17e9b2faa7863f8ded24bcd..5b7ebac8926a8e4ea2255a4e5112dc3072cfe508 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 f84116592d0a441b541c5a7ae4b0fc2b401330d6..91b2c0650decc88d0c1f90187ecf922324345f99 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 8e8ce2d791b8562dccf8c9c49decffafeb943b44..25543835b3bc9e92a7e11f0c497162cedb9a7624 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 2c7908077062b5079daf753d2906acfde099e318..d1e9c39b6a6bbce83ca16dadd92d20d8b048c066 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 9e56a66df8d9ad681cf60ee23e4cc09143424cc7..7cfd1339c881b6cba3c6a4e4a46a94368ff91339 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 a62b06e8f6e65bc6fc0710c7a8e1fc6ad6258abc..1e6c0a1d14f2798ebc7b82f99c78f17b5c9b746f 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 2fe6af3fa8524df1084d13564ac2ca06df881edd..087392e6851ce13d47c1446abd3a9561d07eb3dd 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 a636c67a54263fb60b3f449f297f70429f20f985..25019dae8f8f779a5d9d67654878f97743b54593 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 3050016dd1cd453683ccb01acb6948cc9be8f369..519944ad0cd7780a95446f168a3b5898e8d06573 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 af39ba821e4b5a76ea497fda70c961d33aa00283..1093cbe875de74a7d889456b1070dafe6caec5c4 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 801a4bbeabea7a3cb4257cf0afb9ed1f7396c5f2..1b6d341428741425aa1e4c11f018a3a1b52b70eb 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 8d18426bff70afcb095fc869ff8cddafee02fbb5..a0e11fb01a3888a76fcfc3f22cf988107fbca804 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 9f4ba74792325c5bd0695f35e69dc2a116eacad8..8c6158af1c297779e971f8a092fd9c99cb6a8045 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 8825f4a55e20023b19f2bce9df9d7b217d140674..67127796fd9cf58646e03e08241c3b6cff826137 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 b87de2ed0d84f2943fc95da62ceeb7f97f12e251..5ab10a5f4c739cd62db7bcf2df74a35ddc3767e6 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 9ce698f33eaf4d72d8756cf8427690e748773f40..221106200076aa1cd1ffbc90677286f57668dd3c 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 5b098001b8f4f4e1d0ca5e380c2f5197e91e5a69..bd612a6ce9f087bc8ce3e4cd4ead7a25211d446f 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 4847d6ba178ca093d15ee62d52d7a8c6455233d6..d2f25c647c514740b137cef8bed9ea2aff126942 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 bf26bd9b8ae61ef8d3252fc1b799f11df8edb5fb..50632e3c4d256dbc245947d8308b35fcbee8ba3a 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 5259ec50f9e075c54cf227b97234184bf1072682..c6a25d31dd43ddd2997663ae1528b7e5cbabf544 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 7cbe47e06ede952fa1651f5375750b7f2cee4b42..9cbddd001aa70439f9faf3e3997135b99c38e488 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 ec6902ffea88b0390c37f29e8e09eae1f638376e..ee174effb781a12617e6afc61fc2c87264e3f2b2 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 ca3bb535b5effca291ac3d49631bf1f2d5650cac..b9fbfdb08dd7085501a15c576729b6fad5c06cc2 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 d3a7ff3acbdb5f735cb4a94173abe8dd32acd1b0..1de0980c5619d8e17fa647d309f3ae77898358c5 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 0ec2052985d2a7b73439bc165f73cefb7ea33284..c1721c39452d76a8007add66a4a23fa8086342a8 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 4c03c106111bed7f6a8b90f37a0839758b36b8ca..a89f67460669376c6807b69d726f39f7f543a828 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 7df4b9c974dae8a427ff028af4465e9fbae0085c..01860dcc0f94252367c637f9d3cb8c4f36c90a2b 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 5baa2a3a491804aa98b7bb4683a9e2abc1dbf0e7..d3101a3f7e071e8dd6c7c18b1836888b16fbdff7 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 335c9ae7e02127890d8dfd5cdbeaa69692d9c71b..d9f48c612affd0490528cade701cd052a088e9d8 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 7875374c8d007295b70d20e735892410c5537c03..3de80496fcc16fe3db78253acbeb2c5d9598da82 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 1f9a1c13e30a3650ebc1fd72c529a9b07a8daf95..07dc984d2cac1ae8de05cdb9ef2b48b3b7711445 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 e8d4a9b7652dd37da36a8e5cba6d814d961f1f6d..5a93007d345a6373af1b423ef2fe0fb652d83041 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 e2af36fdeb6285d142758f6e60c3767a046afcb9..a4573861ef218c774cd508f47d35217eaaef1720 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 522a2adab571767228593eca8be1484642e19e6d..47fba0483d52549b9519819cf2912efad1ddeffe 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 25425cfc68fc6f05914d961f1de7d924c2ea28fb..453e4758dade2fdc6a22a0f64a8f3c73a215f6ae 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 edd1f33034eebf60b96d96aade88f027e8afc4e4..6d51b4d75d34ee4f644733ae859c2346c1d9b7fc 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 ddf0c0505df1be3bb7a1c4748f67b81928683899..768cc48873ed951355dedeb070be037144858c56 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 d3f2259874cff1ec473ca0c3e04c9e2fc54809a1..b5fdf7ca33f9f9322d048a32d4ba883dcb9f7192 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 4b163d93dd79b6387cfd90023d8aac541e1affe4..04269ad50576720d4404b5b635ac2e4518578027 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 699b21c7dba878f5bc9c9b3194dc5c95e6c9bdb6..f8729bdede17a3c1b25f9950be33b950d19c0dc9 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 fe9cee09c057d8ba7cc51942f0391bca550b4243..318e6528bed53dec3dbf2508fa31b36b50ac51fd 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 c1a2b918e346168e003e53dc7fd9d7f639068194..8fb9f1d59c93188c989c77e562a804c797d1f149 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();