GeomConverter/src/org/lcsim/geometry

diff -N SubdetectorIDDecoder.java
--- SubdetectorIDDecoder.java	28 Oct 2005 00:34:17 -0000	1.3
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,21 +0,0 @@

-/*
- * SubdetectorID.java
- *
- * Created on July 17, 2005, 4:58 PM
- *
- */
-package org.lcsim.geometry;
-/**
- *
- * @author jeremym
- */
-public interface SubdetectorIDDecoder extends IDDecoder
-{            
-    public Subdetector getSubdetector();    
-    public int getBarrelOrEndcapFlag();
-    public int getSystemNumber();    
-    public boolean isBarrel();
-    public boolean isEndcap();
-    public boolean isEndcapNorth();
-    public boolean isEndcapSouth();
-}

\ No newline at end of file

GeomConverter/src/org/lcsim/geometry/util

diff -N SubdetectorIDDecoder.java
--- SubdetectorIDDecoder.java	28 Oct 2005 00:34:25 -0000	1.2
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,87 +0,0 @@

-/*
- * SubdetectorID.java
- *
- * Created on July 17, 2005, 4:58 PM
- *
- */
-package org.lcsim.geometry.util;
-
-import org.lcsim.geometry.Subdetector;
-
-
-
-/**
- *
- * @author jeremym
- */
-abstract public class SubdetectorIDDecoder extends BaseIDDecoder
-        implements org.lcsim.geometry.SubdetectorIDDecoder
-{
-    public static final int BARREL = 0;
-    public static final int ENDCAP_NORTH = 1;
-    public static final int ENDCAP_SOUTH = 2;
-        
-    protected int layerIndex;
-    protected Subdetector detector;
-    
-    public void setSubdetector(Subdetector d)
-    {
-        detector = d;
-    }
-    
-    public Subdetector getSubdetector()
-    {
-        return detector;
-    }
-    
-    public void setIDDescription(IDDescriptor id)
-    {
-        super.setIDDescription(id);
-        setLayerIndex(id);
-    }
-    
-    private void setLayerIndex(IDDescriptor id)
-    {
-        layerIndex = id.indexOf("layer");
-    }
-    
-    public int getLayer()
-    {
-        return values[layerIndex];
-    }
-    
-    public int getBarrelOrEndcapFlag()
-    {
-        return getValue("barrel");
-    }
-
-    /* subsystem identifier (unique???) */
-    public int getSystemNumber()
-    {
-        return getValue("system");
-    }
-    
-    /* id from hit = barrel? */
-    public boolean isBarrel()
-    {
-        return ( getBarrelOrEndcapFlag() == BARREL );
-    }
-    
-    /* id from hit = endcap? */
-    public boolean isEndcap()
-    {
-        return (!isBarrel());
-    }
-    
-    /* endcap w/ pos Z */
-    public boolean isEndcapNorth()
-    {
-        return ( getBarrelOrEndcapFlag() == ENDCAP_NORTH );
-    }
- 
-    /* endcap w/ neg Z */
-    public boolean isEndcapSouth()
-    {
-        return ( getBarrelOrEndcapFlag() == ENDCAP_SOUTH );
-    }
-}

\ No newline at end of file