diff -u -r1.9 -r1.10
--- Readout.java	14 Dec 2005 19:56:45 -0000	1.9
+++ Readout.java	14 Dec 2005 20:04:49 -0000	1.10
@@ -1,10 +1,8 @@

 package org.lcsim.geometry.compact;
 
 import org.lcsim.geometry.IDDecoder;

-import org.lcsim.geometry.util.TrackerIDDecoder;

 import org.lcsim.geometry.util.IDDescriptor;
 import org.lcsim.geometry.util.IDDescriptor.IDException;

-import org.lcsim.geometry.segmentation.SegmentationBase;

 
 import org.jdom.Element;
 import org.jdom.JDOMException;

@@ -41,14 +39,7 @@

     
     public Segmentation getSegmentation()
     {

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

+       return hasSegmentation ? (Segmentation)decoder : null;

     }
     
     public void setSegmentation(Segmentation segmentation)

@@ -69,11 +60,7 @@

     
     protected void setIDDecoder(IDDecoder d)
     {

-        if ( d == null )
-        {
-            throw new IllegalArgumentException("IDDecoder was null.");
-        }
-        

+        if ( d == null ) throw new IllegalArgumentException("IDDecoder was null.");

         decoder = d;
         decoder.setIDDescription(getIDDescriptor() );
     }