diff -u -r1.9 -r1.10
--- CylindricalBarrelCalorimeter.java	2 Jun 2008 20:37:00 -0000	1.9
+++ CylindricalBarrelCalorimeter.java	22 Feb 2009 00:19:12 -0000	1.10
@@ -85,11 +85,7 @@

                     volume.setSolid(tube);
                     if (sensitive) volume.setSensitiveDetector(sens);                    
                     

-                    /* FIXME: these need to be called automatically whenever a new volume is created --JM */
-                    setRegion(lcdd, slice, volume);
-                    setLimitSet(lcdd, slice, volume);      
-                    
-                    setVisAttributes(lcdd, node, volume);

+                    setAttributes(lcdd, slice, volume);

                     
                     structure.addVolume(volume);
                     volume1.addPhysVol(new PhysVol(volume));                    

diff -u -r1.16 -r1.17
--- CylindricalEndcapCalorimeter.java	21 Feb 2009 23:35:15 -0000	1.16
+++ CylindricalEndcapCalorimeter.java	22 Feb 2009 00:19:12 -0000	1.17
@@ -47,6 +47,7 @@

         double z = zmin;
         
         Tube envelope = new Tube(detectorName+"_envelope");

+        solids.addSolid(envelope);

         Volume envelopeVolume = new Volume(detectorName+"_envelope_volume");
         envelopeVolume.setMaterial(air);
         envelopeVolume.setSolid(envelope);

@@ -108,6 +109,8 @@

                     z += w;
                 }
                 

+                setVisAttributes(lcdd, layer, layerVolume);
+                

                 layerTube.setZ(layerWidth);
                 layerTube.setRMin(rmin);
                 layerTube.setRMax(rmax);

@@ -119,9 +122,7 @@

                 envelopeVolume.addPhysVol(physvol);
                 structure.addVolume(layerVolume);
                 solids.addSolid(layerTube);

-                n++;
-                
-                setVisAttributes(lcdd, layer, layerVolume);

+                n++;                

             }            
         }
         

@@ -145,10 +146,8 @@

             physvol2.addPhysVolID("barrel",2);
             motherVolume.addPhysVol(physvol2);
         }

-        
-        solids.addSolid(envelope);
-        structure.addVolume(envelopeVolume);

         setVisAttributes(lcdd, node, envelopeVolume);

+        structure.addVolume(envelopeVolume);

     }
     
     public boolean isCalorimeter()

diff -u -r1.19 -r1.20
--- DiskTracker.java	20 Feb 2009 22:19:42 -0000	1.19
+++ DiskTracker.java	22 Feb 2009 00:19:12 -0000	1.20
@@ -140,8 +140,6 @@

             }
             solids.addContent(tube1);
             structure.addContent(layerVolume);

-
-            setVisAttributes(lcdd, node, layerVolume);

         }
 
         setCombineHits(node, sens);

diff -u -r1.18 -r1.19
--- MultiLayerTracker.java	20 Feb 2009 17:25:32 -0000	1.18
+++ MultiLayerTracker.java	22 Feb 2009 00:19:12 -0000	1.19
@@ -25,7 +25,7 @@

     }
 
     public void addToLCDD(LCDD lcdd, SensitiveDetector sens) throws JDOMException

-    {	                   

+    {

         int id = node.getAttribute("id").getIntValue();
         String detectorName = node.getAttributeValue("name");
 

@@ -100,8 +100,6 @@

             trackingVolume.addPhysVol(physvol);
             solids.addSolid(tube1);
 

-            setVisAttributes(lcdd,node,volume1);
-

             structure.addVolume(volume1);
         }