Print

Print


Commit in GeomConverter/src/org/lcsim/geometry/compact on MAIN
CompactReader.java+5-41.33 -> 1.34
JM: remove the TrackerIDDecoder (replaced by DetectorIdentifierHelper and TrackerIdentifierHelper)

GeomConverter/src/org/lcsim/geometry/compact
CompactReader.java 1.33 -> 1.34
diff -u -r1.33 -r1.34
--- CompactReader.java	9 Apr 2007 19:32:22 -0000	1.33
+++ CompactReader.java	8 Dec 2007 02:08:24 -0000	1.34
@@ -11,6 +11,7 @@
 import org.jdom.Element;
 import org.jdom.JDOMException;
 import org.jdom.input.SAXBuilder;
+import org.lcsim.geometry.util.BaseIDDecoder;
 import org.lcsim.material.XMLMaterialManager;
 import org.lcsim.units.clhep.Constants;
 import org.lcsim.util.cache.CachingEntityResolver;
@@ -26,7 +27,7 @@
  * org.lcsim.geometry.GeometryReader class, which extends this.
  *
  * @author tonyj
- * @version $Id: CompactReader.java,v 1.33 2007/04/09 19:32:22 jeremy Exp $
+ * @version $Id: CompactReader.java,v 1.34 2007/12/08 02:08:24 jeremy Exp $
  *
  */
 public class CompactReader
@@ -166,17 +167,17 @@
         Readout readout = factory.createElement(Readout.class,readoutElement,null);
         Element segmentation = readoutElement.getChild("segmentation");
         
-        // Setup an IDDecoder, i.e. Segmentation, for the Calorimeter. 
+        // Setup an IDDecoder with segmentation for a calorimeter. 
         if (segmentation != null)
         {
             String type = segmentation.getAttributeValue("type");
             Segmentation seg = factory.createElement(Segmentation.class, segmentation, type);
             readout.setSegmentation(seg);
         }
-        // No segmentation means a TrackerIDDecoder. 
+        // Use a generic IDDecoder.
         else
         {
-            readout.setIDDecoder( new org.lcsim.geometry.util.TrackerIDDecoder() );
+            readout.setIDDecoder( new BaseIDDecoder() );
         }
         
         return readout;
CVSspam 0.2.8