Import Geant4 10.7.1 source tree

source/persistency/gdml/History

@@ -16,9 +16,21 @@ committal in the CVS repository !
      * Reverse chronological order (last date on top), please *
      ----------------------------------------------------------
 
+3 February 2021 Gabriele Cosmo (gdml-V10-06-06)
+- Fixed parsing of regions in G4GDMLParser::ImportRegions().
+  Allow for proper deletion of meta-data lists in destructor.
+  Based on GitHub PR#19 by shangjiaxuan.
+- Fixed reading of units for GenericTrap in G4GDMLReadSolids.
+  Addressing problem report #2317.
+
+18 January 2021 Witek Pokorski
+- Fixed importing of skin/border-surface properties by changing the key of
+  the G4GDMLReadSolids property vector map from 'name' to 'name + ref'.
+  Addressing problem report #2305
+
 5 November 2020 Witek Pokorski (gdml-V10-06-05)
 - Adding new method to the parser SetOutputFileOverwrite(G4bool flag) which 
-allows to set the flag to enable overwriting of the output GDML file.
+  allows to set the flag to enable overwriting of the output GDML file.
 
 19 October 2020 Witek Pokorski (gdml-V10-06-04)
 - Fix for problem 2273 (fixing loops when from == to).

source/persistency/gdml/src/G4GDMLParser.cc

@@ -83,9 +83,9 @@ G4GDMLParser::~G4GDMLParser()
   if(!uwcode)
   {
     delete writer;
-    delete ullist;
-    delete rlist;
   }
+  delete ullist;
+  delete rlist;
 
   delete messenger;
 }
@@ -98,7 +98,7 @@ void G4GDMLParser::ImportRegions()
   for(auto iaux = auxInfoList->cbegin(); iaux != auxInfoList->cend(); ++iaux)
   {
     if(iaux->type != "Region")
-      return;
+      continue;
 
     G4String name = iaux->value;
     if(strip)

source/persistency/gdml/src/G4GDMLReadSolids.cc

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