GeomConverter/src/org/lcsim/geometry/compact

diff -u -r1.5 -r1.6
--- Readout.java	25 Jul 2005 19:59:28 -0000	1.5
+++ Readout.java	7 Aug 2005 06:19:21 -0000	1.6
@@ -19,11 +19,12 @@

     private String name;
     private IDDecoderBase decoder;
     private IDDescriptor desc;

+    private boolean hasSegmentation;

     
     public Readout(Element node) throws JDOMException
     {
         name = node.getAttributeValue("name");

-            

+        

         setupIDDescriptor(node);
         
         /** No segmentation tag means that this Readout is for a tracker. */

@@ -31,6 +32,10 @@

         {
             setupTrackerIDDecoder(node);
         }

+        else
+        {
+            hasSegmentation = true;
+        }

     }
     
     /** Create a new IDDescriptor by parsing the CDATA from the <id> tag. */

@@ -53,11 +58,19 @@

     
     public Segmentation getSegmentation()
     {

-        return (Segmentation)decoder;

+        
+        if(hasSegmentation)
+        {
+            return (Segmentation)decoder;
+        }
+        else
+        {
+            return null;
+        }

     }
     
     public void setSegmentation(Segmentation segmentation)

-    {        

+    {

         setIDDecoder((IDDecoderBase)segmentation);
     }