GeomConverter/src/org/lcsim/geometry/compact

diff -u -r1.21 -r1.22
--- CompactReader.java	18 Jan 2006 01:46:24 -0000	1.21
+++ CompactReader.java	7 Feb 2006 17:07:27 -0000	1.22
@@ -5,15 +5,16 @@

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

+

 import org.jdom.Document;
 import org.jdom.Element;
 import org.jdom.JDOMException;
 import org.jdom.input.SAXBuilder;

-import org.lcsim.geometry.util.TrackerIDDecoder;
-import org.lcsim.util.xml.ElementFactory.ElementCreationException;

+import org.lcsim.geometry.util.BaseIDDecoder;

 import org.lcsim.material.XMLMaterialManager;
 import org.lcsim.util.xml.ElementFactory;
 import org.lcsim.util.xml.JDOMExpressionFactory;

+import org.lcsim.util.xml.ElementFactory.ElementCreationException;

 
 /**
  * A tool for reading xml files containing compact detector descriptions.

@@ -23,7 +24,7 @@

  * org.lcsim.geometry.GeometryReader class, which extends this.
  *
  * @author tonyj

- * @version $Id: CompactReader.java,v 1.21 2006/01/18 01:46:24 jeremy Exp $

+ * @version $Id: CompactReader.java,v 1.22 2006/02/07 17:07:27 jeremy Exp $

  *
  */
 public class CompactReader

@@ -131,10 +132,10 @@

                 Segmentation seg = factory.createElement(Segmentation.class, segmentation, type);
                 r.setSegmentation(seg);
             }

-            /* Setup a generic TrackerIDDecoder for the tracker Readout. */

+            /* Setup a generic IDDecoder for the tracker Readout. */

             else
             {

-                r.setIDDecoder( new TrackerIDDecoder() );

+                r.setIDDecoder( new BaseIDDecoder() );

             }
             
             readoutMap.put(r.getName(),r);