diff -u -r1.1 -r1.2
--- MaterialElementDataToGDMLCnv.java	30 Jun 2005 00:37:50 -0000	1.1
+++ MaterialElementDataToGDMLCnv.java	1 Jul 2005 00:09:48 -0000	1.2
@@ -37,10 +37,16 @@

     {
         Element root = createMaterialsRoot();
         

-        for ( Object o : MaterialElement.elements().values() )
-        {

+        //for ( Object o : MaterialElement.elements().values() )
+        new MaterialElementData();
+        //System.out.println("nelements to cnv: " + MaterialManager.elements().size() );
+        
+        for ( Object o : MaterialManager.elements().values() )
+        {                        

             MaterialElement d = (MaterialElement) o;
             

+            //System.out.println("elem to GDML: " + d.name() );
+            

             Element e = createElement(d);
             Element m = createMaterial(d);
             

@@ -82,8 +88,10 @@

      */
     public static Element createElement(MaterialElement d)
     {

+        //System.out.println("MaterialElementDataToGDMLCnv.createElement() - " + d.name() );
+        

         Element e = new Element("element");

-        e.setAttribute("name", d.fullName()+"_e" );

+        e.setAttribute("name", d.name() );

         e.setAttribute("formula", d.name() );
         e.setAttribute("Z", String.valueOf( d.getZ() ));
         

@@ -100,7 +108,7 @@

     public static Element createMaterial(MaterialElement d)
     {
         Element m = new Element("material");

-        m.setAttribute("name", d.fullName());

+        m.setAttribute("name", d.fullName() );

         
         Element dens = new Element("D");
         dens.setAttribute("type", "density");

@@ -110,7 +118,7 @@

         
         Element comp = new Element("composite");
         comp.setAttribute("n","1");

-        comp.setAttribute("ref",d.fullName()+"_e");

+        comp.setAttribute("ref",d.name() );

         m.addContent(comp);
         
         return m;