diff --git a/NPSimulation/Core/MaterialManager.cc b/NPSimulation/Core/MaterialManager.cc index 9f80915593327e6e003b4362ad476fc31223f780..633fd6d40d0b3081c7ddd89d7f5e97245c8b65f3 100644 --- a/NPSimulation/Core/MaterialManager.cc +++ b/NPSimulation/Core/MaterialManager.cc @@ -245,6 +245,16 @@ G4Material* MaterialManager::GetMaterialFromLibrary(string Name, return material; } + else if (Name == "EJ309") { + if (!density) + density = 0.964 * g / cm3; + G4Material* material = new G4Material("NPS_" + Name, density, 2); + material->AddElement(GetElementFromLibrary("C"), 5); + material->AddElement(GetElementFromLibrary("H"), 4); + m_Material[Name] = material; + return material; + } + else if (Name == "Cu") { if (!density) @@ -831,6 +841,18 @@ G4Material* MaterialManager::GetMaterialFromLibrary(string Name, return material; } + else if (Name == "PMMA") { + if (!density) + density = 1.18 * mg / cm3; + G4Material* material = new G4Material("NPS_" + Name, density, 3); + material->AddElement(GetElementFromLibrary("C"), 5); + material->AddElement(GetElementFromLibrary("O"), 2); + material->AddElement(GetElementFromLibrary("H"), 8); + m_Material[Name] = material; + return material; + } + + else if (Name == "Pyrex") { if (!density) density = 2.23 * g / cm3; @@ -840,6 +862,19 @@ G4Material* MaterialManager::GetMaterialFromLibrary(string Name, material->AddElement(GetElementFromLibrary("B"), 7); material->AddElement(GetElementFromLibrary("Na"), 2); material->AddElement(GetElementFromLibrary("Al"), 1); + m_Material[Name] = material; + return material; + } + + else if (Name == "Pyrex_optical") { + if (!density) + density = 2.23 * g / cm3; + G4Material* material = new G4Material("NPS_" + Name, density, 5); + material->AddElement(GetElementFromLibrary("Si"), 25); + material->AddElement(GetElementFromLibrary("O"), 65); + material->AddElement(GetElementFromLibrary("B"), 7); + material->AddElement(GetElementFromLibrary("Na"), 2); + material->AddElement(GetElementFromLibrary("Al"), 1); //--------------------- PMMA optical Properties ---------------------// const G4int NUMENTRIES = 15;