diff -u -r1.12 -r1.13
--- CompactReader.java	5 Jul 2005 22:40:16 -0000	1.12
+++ CompactReader.java	5 Jul 2005 23:11:39 -0000	1.13
@@ -15,7 +15,7 @@

 /**
  * A tool for reading xml files containing compact detector descriptions.
  * @author tonyj

- * @version $Id: CompactReader.java,v 1.12 2005/07/05 22:40:16 jeremy Exp $

+ * @version $Id: CompactReader.java,v 1.13 2005/07/05 23:11:39 jeremy Exp $

  *
  * This class does not create subclass objects.  For example, CylindricalBarrelCalorimeter
  * is inserted into Detector as a generic Subdetector.  To get subclasses, use the

@@ -126,14 +126,8 @@

     
     /** Create impl objects of materials and their references. */                
     void setupMaterials(org.jdom.Element lccdd, Detector det) throws JDOMException

-    {
-        System.out.println("CompactReader.setupMaterials()");        
-        
-        /** Set parent material manager containing chem element materials. */
-        //det.getMaterialManager().setParentManager(XMLMaterialManager.elements() );
-        
-        XMLMaterialManager matmgr = det.getMaterialManager();        
-                

+    {               
+        XMLMaterialManager matmgr = det.getMaterialManager();                        

         matmgr.addReferencesFromCompact(lccdd);
         matmgr.makeMaterials(null);
     }

diff -u -r1.11 -r1.12
--- Material.java	2 Jul 2005 00:49:47 -0000	1.11
+++ Material.java	5 Jul 2005 23:11:39 -0000	1.12
@@ -11,7 +11,7 @@

  *
  * Material implementation, mostly based on Geant4's G4Material.
  *

- * NIL / RL calcs based on W.L.'s Matprop.

+ * NIL and RL calcs based on W.L.'s Matprop.

  *
  * http://www.slac.stanford.edu/comp/physics/matprop.html
  *

diff -u -r1.12 -r1.13
--- XMLMaterialManager.java	5 Jul 2005 22:40:17 -0000	1.12
+++ XMLMaterialManager.java	5 Jul 2005 23:11:39 -0000	1.13
@@ -84,7 +84,6 @@

             try
             {
                 materials.loadFromStream(XMLMaterialManager.class.getResourceAsStream((materialResource)));

-                //materials.makeMaterials(null);

             }
             catch (Exception e)
             {

@@ -269,7 +268,7 @@

     {
         if ( !e.getName().equals("material"))
         {

-            throw new JDOMException("Element is not named material.");

+            throw new JDOMException("org.jdom.Element argument is not named material.");

         }
         
         if (materialMap.get(e.getAttributeValue("name")) == null )

@@ -316,10 +315,10 @@

             //}
         }
         

-        if ( m != null )
-        {
-            System.out.println("fnd mat: " + matName);
-        }

+        //if ( m != null )
+        //{
+        //    System.out.println("fnd mat: " + matName);
+        //}

         
         return m;
     }

@@ -775,7 +774,7 @@

      */
     public void makeMaterial(org.jdom.Element materialElement, LCDD lcdd) throws JDOMException
     {        

-        System.out.println("makeMaterial - " + materialElement.getAttributeValue("name"));

+        //System.out.println("makeMaterial - " + materialElement.getAttributeValue("name"));

         
         /* Add the referenced material if it does not exist already. */
         if ( MaterialManager.getMaterial(materialElement.getAttributeValue("name")) == null )