lars/geant4
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Import Geant4 10.7.1 source tree

Browse Source
This commit is contained in:
Gabriele Cosmo
2021-02-05 15:10:05 +01:00
parent dab42d2018
commit 3dfcdb544e
281 changed files with 37738 additions and 47638 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/persistency/gdml/src/G4GDMLReadSolids.cc
+6 -4
View File
@@ -2323,7 +2323,7 @@ void G4GDMLReadSolids::GenTrapRead(
}
else if(attName == "lunit")
{
G4UnitDefinition::GetValueOf(attValue);
lunit = G4UnitDefinition::GetValueOf(attValue);
if(G4UnitDefinition::GetCategory(attValue) != "Length")
{
G4Exception("G4GDMLReadSolids::GenTrapRead()", "InvalidRead",
@@ -3558,8 +3558,10 @@ void G4GDMLReadSolids::PropertyRead(
else // build the material properties vector
{
G4MaterialPropertyVector* propvect;
G4String temp = name + ref;
std::cout << temp << std::endl;
// first check if it was already built
if(mapOfMatPropVects.find(Strip(name)) == mapOfMatPropVects.end())
if(mapOfMatPropVects.find(temp) == mapOfMatPropVects.end())
{
// if not create a new one
propvect = new G4MaterialPropertyVector();
@@ -3568,11 +3570,11 @@ void G4GDMLReadSolids::PropertyRead(
propvect->InsertValues(matrix.Get(i, 0), matrix.Get(i, 1));
}
// and add it to the list for potential future reuse
mapOfMatPropVects[Strip(name)] = propvect;
mapOfMatPropVects[temp] = propvect;
}
else
{
propvect = mapOfMatPropVects[Strip(name)];
propvect = mapOfMatPropVects[temp];
}
matprop->AddProperty(Strip(name), propvect);