diff --git a/NPSimulation/CMakeLists.txt b/NPSimulation/CMakeLists.txt index ec76a6cbcad7d5b648b8d6c8f95d9aaf3c63362d..38fb9a2a492d5db6fda04714f1f0b36962c380e5 100644 --- a/NPSimulation/CMakeLists.txt +++ b/NPSimulation/CMakeLists.txt @@ -55,7 +55,7 @@ if(rdet) endif() # Add root to the link and include directories -set(CMAKE_CXX_STANDARD 14) +#set(CMAKE_CXX_STANDARD 17) if(Geant4_gdml_FOUND) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DNPS_GDML") diff --git a/NPSimulation/Core/MaterialManager.cc b/NPSimulation/Core/MaterialManager.cc index 2a52bf28d3ad03465ab6a13c64e67b2faf53e88b..07ae1a438355f11bd773fe7ab1921ded8b171d6c 100644 --- a/NPSimulation/Core/MaterialManager.cc +++ b/NPSimulation/Core/MaterialManager.cc @@ -220,6 +220,7 @@ G4Material* MaterialManager::GetMaterialFromLibrary(string Name, double density) m_Material[Name] = material; return material; } + // Metalic natural Lithium else if (Name == "Li") { if (!density) density = 0.534 * g / cm3; @@ -228,6 +229,8 @@ G4Material* MaterialManager::GetMaterialFromLibrary(string Name, double density) m_Material[Name] = material; return material; } + + // Metalic enriched Lithium else if (Name == "6Li") { if (!density) density = 0.534 * g / cm3; @@ -236,6 +239,8 @@ G4Material* MaterialManager::GetMaterialFromLibrary(string Name, double density) m_Material[Name] = material; return material; } + + // Metalic enriched Lithium else if (Name == "7Li") { if (!density) density = 0.534 * g / cm3;