GeomConverter/src/org/lcsim/geometry/compact/converter/lcdd/util

diff -u -r1.27 -r1.28
--- LCDD.java	11 Mar 2011 19:22:20 -0000	1.27
+++ LCDD.java	25 Apr 2011 20:27:00 -0000	1.28
@@ -60,16 +60,16 @@

         addContent(display);
      
         // Add an invisible vis settings that shows daughters.

-        //VisAttributes invisible = new VisAttributes("InvisibleWithDaughters");
-        //invisible.setVisible(false);
-        //invisible.setShowDaughters(true);
-        //this.add(invisible);

+        VisAttributes invisible = new VisAttributes("InvisibleWithDaughters");
+        invisible.setVisible(false);
+        invisible.setShowDaughters(true);
+        this.add(invisible);

         
         // Add an invisible vis settings that shows daughters.

-        //VisAttributes invisibleNoDau = new VisAttributes("InvisibleNoDaughters");
-        //invisibleNoDau.setVisible(false);
-        //invisibleNoDau.setShowDaughters(false);
-        //this.add(invisibleNoDau);

+        VisAttributes invisibleNoDau = new VisAttributes("InvisibleNoDaughters");
+        invisibleNoDau.setVisible(false);
+        invisibleNoDau.setShowDaughters(false);
+        this.add(invisibleNoDau);

         
         Element gdml = new Element("gdml");
         addContent(gdml);

@@ -134,6 +134,7 @@

         
         Volume worldVolume = structure.getWorldVolume();
         worldVolume.setMaterial(getMaterial("Air"));

+        

         // Move to end
         structure.removeContent(worldVolume);
         structure.addContent(worldVolume);

@@ -220,16 +221,7 @@

     
     public VisAttributes getVisAttributes(String name)
     {

-        VisAttributes vis = null;
-        // debug
-        //System.out.println("display");
-        //for (Iterator i = getChild("display").getChildren("vis").iterator(); i.hasNext(); )
-        //{
-        //    VisAttributes thisvis = (VisAttributes) i.next();
-        //    System.out.println("vis - " + thisvis.getAttributeValue("name"));
-        //}
-        //System.out.println("--");
-        

+        VisAttributes vis = null;        

         for (Iterator i = getChild("display").getChildren("vis").iterator(); i.hasNext(); )
         {
             VisAttributes thisvis = (VisAttributes) i.next();

@@ -250,8 +242,12 @@

     // FIXME Weird stuff going on with this method.
     public Material getMaterial(String name) throws JDOMException
     {

+        //System.out.println("LCDD.getMaterial - " + name);
+        

         Material mat = (Material) materials.get(name);
         

+        //System.out.println("found material - " + name);
+        

         /**
          * This may be a material that was not defined in the materials
          * block.  Attempt to look it up using the global materials manager.

@@ -261,6 +257,8 @@

          */
         if (mat == null)
         {

+            //System.out.println("resolving mat ref - " + name);
+            

             // This call will push material XML references into the LCDD object.  (???)
             matHelper.resolveLCDDMaterialReference(name , this);
         }

@@ -289,7 +287,7 @@

     
     public void addMaterial(Material material)
     {

-        if ( materials.get(material.getRefName()) == null )

+        if (materials.get(material.getRefName()) == null)

         {
             getChild("gdml").getChild("materials").addContent(material);
             materials.put(material.getRefName(),material);