Skip to content
Snippets Groups Projects
Commit 791c6aa0 authored by Morfouace's avatar Morfouace
Browse files

Adding material to MaterialManager

parent 5484d5ac
No related branches found
No related tags found
No related merge requests found
...@@ -245,6 +245,16 @@ G4Material* MaterialManager::GetMaterialFromLibrary(string Name, ...@@ -245,6 +245,16 @@ G4Material* MaterialManager::GetMaterialFromLibrary(string Name,
return material; 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") { else if (Name == "Cu") {
if (!density) if (!density)
...@@ -831,6 +841,18 @@ G4Material* MaterialManager::GetMaterialFromLibrary(string Name, ...@@ -831,6 +841,18 @@ G4Material* MaterialManager::GetMaterialFromLibrary(string Name,
return material; 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") { else if (Name == "Pyrex") {
if (!density) if (!density)
density = 2.23 * g / cm3; density = 2.23 * g / cm3;
...@@ -840,6 +862,19 @@ G4Material* MaterialManager::GetMaterialFromLibrary(string Name, ...@@ -840,6 +862,19 @@ G4Material* MaterialManager::GetMaterialFromLibrary(string Name,
material->AddElement(GetElementFromLibrary("B"), 7); material->AddElement(GetElementFromLibrary("B"), 7);
material->AddElement(GetElementFromLibrary("Na"), 2); material->AddElement(GetElementFromLibrary("Na"), 2);
material->AddElement(GetElementFromLibrary("Al"), 1); 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 ---------------------// //--------------------- PMMA optical Properties ---------------------//
const G4int NUMENTRIES = 15; const G4int NUMENTRIES = 15;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment