--- projects/lcsim/trunk/detector-framework/src/main/java/org/lcsim/geometry/compact/converter/lcdd/SiTrackerBarrel.java	2014-04-01 19:04:20 UTC (rev 3069)
+++ projects/lcsim/trunk/detector-framework/src/main/java/org/lcsim/geometry/compact/converter/lcdd/SiTrackerBarrel.java	2014-04-01 20:47:38 UTC (rev 3070)
@@ -3,9 +3,9 @@

 import static java.lang.Math.cos;
 import static java.lang.Math.sin;
 

+import java.util.HashMap;

 import java.util.Iterator;
 import java.util.Map;

-import java.util.HashMap;

 
 import org.jdom.Element;
 import org.jdom.JDOMException;

@@ -19,6 +19,7 @@

 import org.lcsim.geometry.compact.converter.lcdd.util.Solids;
 import org.lcsim.geometry.compact.converter.lcdd.util.Structure;
 import org.lcsim.geometry.compact.converter.lcdd.util.Tube;

+import org.lcsim.geometry.compact.converter.lcdd.util.VisAttributes;

 import org.lcsim.geometry.compact.converter.lcdd.util.Volume;
 
 /**

@@ -62,6 +63,10 @@

 
 		// Pick the mother volume (tracking volume).
 		Volume tracking_volume = lcdd.pickMotherVolume(this);

+		
+		VisAttributes vis = null;
+		if (node.getAttribute("vis") != null)
+		    vis = lcdd.getVisAttributes(node.getAttributeValue("vis"));

 
 		// Loop over the modules and put them into a map for lookup later.
 		for (Iterator i = node.getChildren("module").iterator(); i.hasNext();)

@@ -71,7 +76,7 @@

 			Volume module_envelope;
 			try
 			{

-				module_envelope = buildModule(node, module_name, lcdd, sens);

+				module_envelope = buildModule(node, module_name, lcdd, sens, vis);

 				modules.put(module_name, module_envelope);
 			}
 			catch (Exception x)

@@ -283,7 +288,7 @@

 
             setRegion(lcdd, layer_element, layer_volume);
             setLimitSet(lcdd, layer_element, layer_volume);

-			setVisAttributes(lcdd, layer_element, layer_volume);

+			//setVisAttributes(lcdd, layer_element, layer_volume);

             
 			// Set the layer envelope to invisible to help Geant4 visualization.
 			//if (layer_element.getAttribute("vis") == null)

@@ -322,13 +327,15 @@

 	 * @return
 	 * @throws Exception
 	 */

-	Volume buildModule(Element detector, String name, LCDD lcdd, SensitiveDetector sens) throws Exception

+	Volume buildModule(Element detector, String name, LCDD lcdd, SensitiveDetector sens, VisAttributes vis) throws Exception

 	{
 		String detector_name = detector.getAttributeValue("name");
 		Volume module_volume = null;
 
 		int sensor_number = 0;
 

+		VisAttributes visOff = lcdd.getVisAttributes("InvisibleNoDaughters");
+		

 		// Search for module.
 		for (Iterator i = detector.getChildren("module").iterator(); i.hasNext();)
 		{

@@ -454,11 +461,14 @@

                     
                     setRegion(lcdd, component_element, component_volume);
                     setLimitSet(lcdd, component_element, component_volume);

-                    setVisAttributes(lcdd, component_element, component_volume);

+                    //setVisAttributes(lcdd, component_element, component_volume);
+                    component_volume.setVisAttributes(visOff);

 
 					module_volume.addPhysVol(component_physvol);
 				}

-				setVisAttributes(lcdd, module_element, module_volume);

+				//setVisAttributes(lcdd, module_element, module_volume);
+				if (vis != null)
+				    module_volume.setVisAttributes(vis);

 				break;
 			}
 		}