Merge branch 'master' into 'master'

small changes in the GDML processor (to avoid crashes with elemenent...

See merge request !177

GeoModelCore/GeoModelKernel/src/GeoMaterial.cxx

@@ -294,7 +294,7 @@ void GeoMaterial::lock ()
 
   if (getNumElements () == 0)
     {
-      throw std::out_of_range ("Attempt to lock a material with no elements");
+      throw std::out_of_range ("Attempt to lock a material with no elements "+getName());
       return;
     }
 

GeoModelTools/GDMLtoGM/src/GDMLController.cxx

@@ -263,6 +263,7 @@ void GDMLController::registerHandlers()
 	new MEEHandler("MEE",this);
 	new atomHandler("atom",this);
 	new fractionHandler("fraction",this);
+	new fractionHandler("composite",this);
 	new isotopeHandler("isotope",this);
 	new elementHandler("element",this);
 	new materialHandler("material",this);

GeoModelTools/GeoModelXML/GeoModelXml/src/AssemblyrefProcessor.cxx

@@ -35,7 +35,7 @@ char *toRelease;
     toRelease = XMLString::transcode(elem->getNodeName());
     string nodeName(toRelease);
     XMLString::release(&toRelease);
-    if (nodeName != string("assembly")) {
+    if (nodeName != string("assembly") && nodeName != string("set")) {
         msglog << MSG::FATAL << "Error in xml/gmx file: assemblyref " << XMLString::transcode(idref) << " referenced a " << 
                               nodeName << " instead of an assembly.\n";
 	std::abort();