GeomConverter/src/org/lcsim/geometry/subdetector

diff -u -r1.7 -r1.8
--- SiTrackerBarrel.java	20 Mar 2007 23:43:41 -0000	1.7
+++ SiTrackerBarrel.java	9 Apr 2007 23:19:52 -0000	1.8
@@ -2,10 +2,6 @@

 
 import hep.graphics.heprep.HepRep;
 import hep.graphics.heprep.HepRepFactory;

-import hep.graphics.heprep.HepRepInstance;
-import hep.graphics.heprep.HepRepInstanceTree;
-import hep.graphics.heprep.HepRepType;
-import hep.graphics.heprep.HepRepTypeTree;

 
 import java.util.ArrayList;
 import java.util.HashMap;

@@ -16,6 +12,7 @@

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

+import org.lcsim.detector.converter.heprep.DetectorElementToHepRepConverter;

 import org.lcsim.geometry.layer.Layer;
 import org.lcsim.geometry.layer.LayerSlice;
 import org.lcsim.geometry.layer.LayerStack;

@@ -58,7 +55,7 @@

 		//System.out.println("SiTrackerBarrel.build");
 
 		Element detector = node;

-

+ 

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

@@ -198,10 +195,6 @@

 
 	private void makeLayering()
 	{

-		//System.out.println("SiTrackerBarrel.makeLayering");
-
-		//System.out.println("nlayers=" + this._layers.size());
-

 		LayerStack layerStack = new LayerStack();
 		for (SiTrackerBarrelLayer tkrlayer : this._layers)
 		{

@@ -239,8 +232,6 @@

 
 			for (Material material : matMap.keySet())
 			{

-				//System.out.println("material=" + material.getName());
-

 				double volume = matMap.get(material);
 
 				double mat_or = Math.sqrt((volume / (Math.PI * z)) + ir * ir);

@@ -258,32 +249,13 @@

 			layerStack.addLayer(l);
 		}
 

-		//System.out.println(layerStack.toString());
-

 		setLayering(new Layering(layerStack));
 	}
 
 	public void appendHepRep(HepRepFactory factory, HepRep heprep)
 	{

-        HepRepInstanceTree instanceTree = heprep.getInstanceTreeTop("Detector","1.0");
-        HepRepTypeTree typeTree = heprep.getTypeTree("DetectorType","1.0");
-        HepRepType barrel = typeTree.getType("Barrel");
-        
-        HepRepType type = factory.createHepRepType(barrel, getName());
-        type.addAttValue("drawAs","Cylinder");
-
-        for (SiTrackerBarrelLayer layer : _layers)
-        {
-            HepRepInstance instance = factory.createHepRepInstance(instanceTree, type);
-            instance.addAttValue("radius",layer.getInnerRadius());
-            factory.createHepRepPoint(instance,0,0,-layer.getZLength()/2);
-            factory.createHepRepPoint(instance,0,0,layer.getZLength()/2);
-            
-            HepRepInstance instance2 = factory.createHepRepInstance(instanceTree, type);
-            instance2.addAttValue("radius",layer.getInnerRadius() + layer.getThickness());
-            factory.createHepRepPoint(instance2,0,0,-layer.getZLength()/2);
-            factory.createHepRepPoint(instance2,0,0,layer.getZLength()/2);
-        }

+        //System.out.println("SiTrackerBarrel.appendHepRep");
+        DetectorElementToHepRepConverter.convert(this, factory, heprep, true);        

 	}
 
 	public boolean isBarrel()