GeomConverter/src/org/lcsim/geometry/subdetector

diff -N DESubdetectorBox.java
--- DESubdetectorBox.java	20 Mar 2007 21:20:00 -0000	1.4
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,101 +0,0 @@

-package org.lcsim.geometry.subdetector;
-
-import static org.lcsim.units.clhep.SystemOfUnits.cm;
-import static org.lcsim.units.clhep.SystemOfUnits.m;
-import hep.graphics.heprep.HepRep;
-import hep.graphics.heprep.HepRepFactory;
-import hep.physics.vec.BasicHep3Vector;
-
-import org.jdom.Element;
-import org.jdom.JDOMException;
-import org.lcsim.detector.DetectorElement;
-import org.lcsim.detector.IDetectorElement;
-import org.lcsim.detector.IPhysicalVolume;
-import org.lcsim.detector.IPhysicalVolumeNavigator;
-import org.lcsim.detector.IPhysicalVolumePath;
-import org.lcsim.detector.LogicalVolume;
-import org.lcsim.detector.PhysicalVolume;
-import org.lcsim.detector.PhysicalVolumeNavigatorStore;
-import org.lcsim.detector.Transform3D;
-import org.lcsim.detector.converter.heprep.DetectorElementToHepRepConverter;
-import org.lcsim.detector.material.IMaterial;
-import org.lcsim.detector.material.MaterialElement;
-import org.lcsim.detector.solids.Box;
-
-public class DESubdetectorBox
-extends AbstractSubdetector
-{
-	private static IMaterial dummymat = new MaterialElement("dummymat",1,1,1.0);
-	IDetectorElement detelem = null;
-	
-	public class DummyDE
-	extends DetectorElement
-	{
-		DummyDE(IPhysicalVolumePath support)
-		{
-			//super("dummy",null,support,null);
-            super("dummy");
-            this.setSupport(support);
-		}
-	}
-		
-	DESubdetectorBox(Element element) throws JDOMException
-	{		
-		super(element);
-		System.out.println("MySubdetector");
-		build();
-	}
-	
-	private void build()
-	{
-		IPhysicalVolume world = createWorld();
-	 
-		Box box = new Box("test_box1",1.0*m,1.0*m,1.0*m);
-		LogicalVolume lvTest = new LogicalVolume("lvTest",box,dummymat);
-		new PhysicalVolume(
-				new Transform3D(
-						new BasicHep3Vector(10.0*cm,10.0*cm,10.0*cm)
-						),
-				"box1",
-				lvTest,
-				world.getLogicalVolume(),
-				0);
-		
-		IPhysicalVolumeNavigator nav = 
-            PhysicalVolumeNavigatorStore.getInstance().createDefault(world);
-		IPhysicalVolumePath path = nav.getPath("/box1");
-		detelem = new DummyDE(path);	
-	}
-	
-	private final IPhysicalVolume createWorld()
-	{		
-		Box boxWorld = new Box(
-				"world_box",
-				10.0*m,
-				10.0*m,
-				10.0*m);
-		
-		LogicalVolume lvWorld = 
-			new LogicalVolume(
-					"world",
-					boxWorld,
-					dummymat);
-		
-		IPhysicalVolume pvTop = 
-			new PhysicalVolume(
-					null,
-					"world",
-					lvWorld,
-					null,
-					0);
-		
-		return pvTop;
-	}   	
-	
-	public void appendHepRep(HepRepFactory factory, HepRep heprep)
-	{
-		System.out.println("MySubdetector.appendHepRep");
-		DetectorElementToHepRepConverter cnv = new DetectorElementToHepRepConverter();
-		cnv.convert(this.detelem, factory, heprep);
-	}
-}

\ No newline at end of file

GeomConverter/src/org/lcsim/geometry/subdetector

diff -N DESubdetectorTube.java
--- DESubdetectorTube.java	20 Mar 2007 23:43:41 -0000	1.3
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,103 +0,0 @@

-package org.lcsim.geometry.subdetector;
-
-import static org.lcsim.units.clhep.SystemOfUnits.cm;
-import static org.lcsim.units.clhep.SystemOfUnits.m;
-import hep.graphics.heprep.HepRep;
-import hep.graphics.heprep.HepRepFactory;
-import hep.physics.vec.BasicHep3Vector;
-
-import org.jdom.Element;
-import org.jdom.JDOMException;
-import org.lcsim.detector.DetectorElement;
-import org.lcsim.detector.IDetectorElement;
-import org.lcsim.detector.IPhysicalVolume;
-import org.lcsim.detector.IPhysicalVolumeNavigator;
-import org.lcsim.detector.IPhysicalVolumePath;
-import org.lcsim.detector.LogicalVolume;
-import org.lcsim.detector.PhysicalVolume;
-import org.lcsim.detector.PhysicalVolumeNavigatorStore;
-import org.lcsim.detector.Transform3D;
-import org.lcsim.detector.converter.heprep.DetectorElementToHepRepConverter;
-import org.lcsim.detector.material.IMaterial;
-import org.lcsim.detector.material.MaterialElement;
-import org.lcsim.detector.solids.Box;
-import org.lcsim.detector.solids.Tube;
-
-public class DESubdetectorTube
-extends AbstractSubdetector
-{
-	private static IMaterial dummymat = new MaterialElement("dummymat",1,1,1.0);
-	IDetectorElement detelem = null;
-	
-	public class DummyDE
-	extends DetectorElement
-	{
-		DummyDE(IPhysicalVolumePath support)
-		{
-			super("dummy",null,support,null);
-		}
-	}	
-	
-	DESubdetectorTube(Element element) throws JDOMException
-	{		
-		super(element);
-		//System.out.println("MySubdetector");
-		build();
-	}
-	
-	private void build()
-	{
-		IPhysicalVolume world = createWorld();
-	 
-		Tube tube = new Tube("test_tube1", 1.0*m,2.0*m,3.0*m);
-		LogicalVolume lvTest = new LogicalVolume("lvTest",tube,dummymat);
-		new PhysicalVolume(
-				new Transform3D(
-						new BasicHep3Vector(10.0*cm,10.0*cm,10.0*cm)
-						),
-				"tube1",
-				lvTest,
-				world.getLogicalVolume(),
-				0);
-		
-		IPhysicalVolumeNavigator nav = 
-            PhysicalVolumeNavigatorStore
-        .getInstance()
-        .get(world);
-        
-		IPhysicalVolumePath path = nav.getPath("/tube1");
-		detelem = new DummyDE(path);	
-	}
-	
-	private final IPhysicalVolume createWorld()
-	{		
-		Box boxWorld = new Box(
-				"world_box",
-				10.0*m,
-				10.0*m,
-				10.0*m);
-		
-		LogicalVolume lvWorld = 
-			new LogicalVolume(
-					"world",
-					boxWorld,
-					dummymat);
-		
-		IPhysicalVolume pvTop = 
-			new PhysicalVolume(
-					null,
-					"world",
-					lvWorld,
-					null,
-					0);
-		
-		return pvTop;
-	}   	
-	
-	public void appendHepRep(HepRepFactory factory, HepRep heprep)
-	{
-		System.out.println("MySubdetector.appendHepRep");
-		DetectorElementToHepRepConverter cnv = new DetectorElementToHepRepConverter();
-		cnv.convert(this.detelem, factory, heprep);
-	}
-}

\ No newline at end of file