Import Geant4 10.5.1 source tree

source/persistency/gdml/src/G4GDMLReadStructure.cc

@@ -373,6 +373,10 @@ PhysvolRead(const xercesc::DOMElement* const physvolElement,
 
    if (pAssembly)   // Fill assembly structure
    {
+     if (assembly)   // Case of recursive assemblies
+     {
+       pAssembly->AddPlacedAssembly(assembly, transform);
+     }
      if (!logvol) { return; }
      pAssembly->AddPlacedVolume(logvol, transform);
    }

source/persistency/gdml/src/G4GDMLWriteMaterials.cc

@@ -209,6 +209,12 @@ void G4GDMLWriteMaterials::MaterialWrite(const G4Material* const materialPtr)
 void G4GDMLWriteMaterials::PropertyVectorWrite(const G4String& key,
                            const G4PhysicsOrderedFreeVector* const pvec)
 {
+   for (size_t i=0; i<propertyList.size(); i++)   // Check if property is
+   {                                              // already in the list!
+      if (propertyList[i] == pvec)  { return; }
+   }
+   propertyList.push_back(pvec);
+ 
    const G4String matrixref = GenerateName(key, pvec);
    xercesc::DOMElement* matrixElement = NewElement("matrix");
    matrixElement->setAttributeNode(NewAttribute("name", matrixref));
@@ -292,6 +298,7 @@ void G4GDMLWriteMaterials::MaterialsWrite(xercesc::DOMElement* element)
    isotopeList.clear();
    elementList.clear();
    materialList.clear();
+   propertyList.clear(); 
 }
 
 void G4GDMLWriteMaterials::AddIsotope(const G4Isotope* const isotopePtr)

source/persistency/gdml/src/G4GDMLWriteStructure.cc

@@ -353,8 +353,9 @@ G4GDMLWriteStructure::GetBorderSurface(const G4VPhysicalVolume* const pvol)
     for (pos = btable->begin(); pos != btable->end(); pos++)
     {
       if (pvol == (*pos)->GetVolume1())  // just the first in the couple 
-      {                                  // is enough
-        surf = *pos; break;
+      {                                  // could be enough?
+        surf = *pos; // break;
+        BorderSurfaceCache(surf);
       }
     }
   }
@@ -542,7 +543,8 @@ TraverseVolumeTree(const G4LogicalVolume* const volumePtr, const G4int depth)
                    
 	       PhysvolWrite(volumeElement,physvol,invR*P*daughterR,ModuleName);
 	     }
-       BorderSurfaceCache(GetBorderSurface(physvol));
+       //       BorderSurfaceCache(GetBorderSurface(physvol));
+       GetBorderSurface(physvol);
      }
 
    if (cexport)  { ExportEnergyCuts(volumePtr); }