OpenCMT/uLib
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix tests

Browse Source
This commit is contained in:
AndreaRigoni
2026-03-14 12:28:40 +00:00
parent 20d4967356
commit 35e4fb949d
7 changed files with 51 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/HEP/Geant/Solid.cpp
View File

@@ -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);
}
}

5
src/HEP/Geant/Solid.h
View File

@@ -58,10 +58,13 @@ public:
uLibGetSetMacro(Logical, G4LogicalVolume *)
uLibGetSetMacro(Physical, G4VPhysicalVolume *)
inline const char *GetName() const { return m_Logical->GetName().c_str(); }
inline const char *GetName() const {
return m_Logical ? m_Logical->GetName().c_str() : m_Name.c_str();
}
protected:
std::string m_Name;
G4Material *m_Material;
G4LogicalVolume *m_Logical;
G4VPhysicalVolume *m_Physical; // <-- Memorizza l'oggetto posizionato