From 2efb66202f7a1bc6ee648d476ea8c161572afb72 Mon Sep 17 00:00:00 2001
From: Adrien Matta <matta@lpccaen.in2p3.fr>
Date: Tue, 16 Aug 2022 15:21:43 +0200
Subject: [PATCH] * Removing c++ spec of npsimulation
---
NPSimulation/CMakeLists.txt | 2 +-
NPSimulation/Core/MaterialManager.cc | 5 +++++
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/NPSimulation/CMakeLists.txt b/NPSimulation/CMakeLists.txt
index ec76a6cbc..38fb9a2a4 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 2a52bf28d..07ae1a438 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;
--
GitLab