diff --git a/NPSimulation/Core/MaterialManager.cc b/NPSimulation/Core/MaterialManager.cc index a4fe23398b58f30ab715e8982271a936e3c46d79..e66bc6168a3e9aa0269523fcf3bf3732af3b4bd2 100644 --- a/NPSimulation/Core/MaterialManager.cc +++ b/NPSimulation/Core/MaterialManager.cc @@ -135,6 +135,19 @@ G4Material* MaterialManager::GetMaterialFromLibrary(string Name, return material; } + else if (Name == "Rogers4003C") { + if (!density) + density = 1.79 * g / cm3; + G4Material* material = new G4Material("NPS_" + Name, density, 4); + material->AddElement(GetElementFromLibrary("H"), 2); + material->AddElement(GetElementFromLibrary("C"), 50); + material->AddElement(GetElementFromLibrary("O"), 38); + material->AddElement(GetElementFromLibrary("Si"), 10); + m_Material[Name] = material; + return material; + } + + else if (Name == "Mylar") { if (!density) density = 1.397 * g / cm3; diff --git a/NPSimulation/Detectors/ChiNu/ChiNu.cc b/NPSimulation/Detectors/ChiNu/ChiNu.cc index 7d747ef2a82a010a5e40e0a58c9323db06d22523..1f948124ecc42431b681979acc051ec1cba2b5fe 100644 --- a/NPSimulation/Detectors/ChiNu/ChiNu.cc +++ b/NPSimulation/Detectors/ChiNu/ChiNu.cc @@ -444,10 +444,10 @@ void ChiNu::ConstructDetector(G4LogicalVolume* world){ BuildDetector()->MakeImprint(world,Det_pos,Rot,i); } - /*G4RotationMatrix* Rot_FC = new G4RotationMatrix(0,0,0); + G4RotationMatrix* Rot_FC = new G4RotationMatrix(0,0,0); G4ThreeVector Pos_FC = G4ThreeVector(0,0,0) ; BuildFissionChamber()->MakeImprint(world,Pos_FC,Rot_FC,0); -*/ + } //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......