fix tests
This commit is contained in:
@@ -54,22 +54,23 @@ public:
|
||||
};
|
||||
|
||||
Solid::Solid()
|
||||
: m_Logical(new G4LogicalVolume(NULL, NULL, "unnamed_solid")),
|
||||
m_Material(NULL) {}
|
||||
: m_Name("unnamed_solid"), m_Material(NULL), m_Logical(NULL), m_Physical(NULL) {}
|
||||
|
||||
Solid::Solid(const char *name)
|
||||
: m_Logical(new G4LogicalVolume(NULL, NULL, name)), m_Material(NULL) {}
|
||||
: m_Name(name), m_Material(NULL), m_Logical(NULL), m_Physical(NULL) {}
|
||||
|
||||
void Solid::SetNistMaterial(const char *name) {
|
||||
G4NistManager *nist = G4NistManager::Instance();
|
||||
m_Material = nist->FindOrBuildMaterial(name);
|
||||
m_Logical->SetMaterial(m_Material);
|
||||
if (m_Logical)
|
||||
m_Logical->SetMaterial(m_Material);
|
||||
}
|
||||
|
||||
void Solid::SetMaterial(G4Material *material) {
|
||||
if (material) {
|
||||
m_Material = material;
|
||||
m_Logical->SetMaterial(material);
|
||||
if (m_Logical)
|
||||
m_Logical->SetMaterial(material);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user