GeomConverter/src/org/lcsim/detector/converter/compact

diff -u -r1.1 -r1.2
--- DeSubdetector.java	9 May 2007 00:59:58 -0000	1.1
+++ DeSubdetector.java	3 Jul 2007 23:29:49 -0000	1.2
@@ -1,6 +1,7 @@

 package org.lcsim.detector.converter.compact;
 
 import org.lcsim.detector.DetectorElement;

+import org.lcsim.detector.IDetectorElement;

 import org.lcsim.detector.IPhysicalVolumePath;
 import org.lcsim.geometry.compact.Detector;
 import org.lcsim.geometry.compact.Subdetector;

@@ -10,12 +11,17 @@

  * in a {@link org.lcsim.detector.DetectorElement}.
  *
  * @author Jeremy McCormick

- * @version $Id: DeSubdetector.java,v 1.1 2007/05/09 00:59:58 jeremy Exp $

+ * @version $Id: DeSubdetector.java,v 1.2 2007/07/03 23:29:49 jeremy Exp $

  */
 public class DeSubdetector
 extends DetectorElement
 {
     private Subdetector subdetector;

+    
+    public DeSubdetector(String name, IDetectorElement parent)
+    {
+    	super(name,parent);
+    }

 
     public DeSubdetector(Detector detector, Subdetector subdetector, String path)
     {

GeomConverter/src/org/lcsim/detector/tracker/silicon

diff -u -r1.1 -r1.2
--- DeSiTrackerBarrel.java	25 May 2007 20:16:27 -0000	1.1
+++ DeSiTrackerBarrel.java	3 Jul 2007 23:29:49 -0000	1.2
@@ -1,8 +1,8 @@

 package org.lcsim.detector.tracker.silicon;
 

-import org.lcsim.detector.DetectorElement;

 import org.lcsim.detector.IDetectorElement;
 import org.lcsim.detector.IDetectorElementContainer;

+import org.lcsim.detector.converter.compact.DeSubdetector;

 import org.lcsim.detector.identifier.IExpandedIdentifier;
 import org.lcsim.detector.identifier.IIdentifier;
 import org.lcsim.detector.identifier.IIdentifierHelper;

@@ -11,11 +11,11 @@

  * A {@link IDetectorElement} for SiTrackerBarrel.
  *
  * @author Jeremy McCormick

- * @version $Id: DeSiTrackerBarrel.java,v 1.1 2007/05/25 20:16:27 jeremy Exp $

+ * @version $Id: DeSiTrackerBarrel.java,v 1.2 2007/07/03 23:29:49 jeremy Exp $

  */
 
 public class DeSiTrackerBarrel

-extends DetectorElement

+extends DeSubdetector

 {
     public DeSiTrackerBarrel(String name, IDetectorElement parent)
     {

@@ -37,4 +37,4 @@

         // Use super method once non-geometric fields have been stripped out.
         return super.findDetectorElement(geomId);
     }    

-}

\ No newline at end of file

+}