GeomConverter/src/org/lcsim/geometry

diff -u -r1.7.2.2 -r1.7.2.3
--- Calorimeter.java	28 Sep 2005 06:21:14 -0000	1.7.2.2
+++ Calorimeter.java	29 Sep 2005 21:18:25 -0000	1.7.2.3
@@ -3,7 +3,7 @@

 
 import org.lcsim.geometry.layer.Layering;
 import org.lcsim.geometry.Layered;

-import org.lcsim.geometry.subdetector.CalorimeterIDDecoder;

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

 
 /**
  *

GeomConverter/src/org/lcsim/geometry/compact

diff -u -r1.16 -r1.16.2.1
--- CompactReader.java	26 Sep 2005 20:19:33 -0000	1.16
+++ CompactReader.java	29 Sep 2005 21:18:26 -0000	1.16.2.1
@@ -9,7 +9,7 @@

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

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

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

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

@@ -18,7 +18,7 @@

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

- * @version $Id: CompactReader.java,v 1.16 2005/09/26 20:19:33 jeremy Exp $

+ * @version $Id: CompactReader.java,v 1.16.2.1 2005/09/29 21:18:26 jeremy Exp $

  *
  * This class does not create subclass objects.  For example, CylindricalBarrelCalorimeter
  * is inserted into Detector as a generic Subdetector.  To get subclasses, use the

GeomConverter/src/org/lcsim/geometry/compact

diff -u -r1.7.2.1 -r1.7.2.2
--- Readout.java	28 Sep 2005 05:44:16 -0000	1.7.2.1
+++ Readout.java	29 Sep 2005 21:18:26 -0000	1.7.2.2
@@ -1,7 +1,7 @@

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

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

+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;

GeomConverter/src/org/lcsim/geometry/compact

diff -u -r1.3 -r1.3.2.1
--- Segmentation.java	20 Jul 2005 19:11:58 -0000	1.3
+++ Segmentation.java	29 Sep 2005 21:18:26 -0000	1.3.2.1
@@ -6,7 +6,7 @@

  *
  * @author tonyj
  */

-public class Segmentation extends org.lcsim.geometry.subdetector.CalorimeterIDDecoder

+public class Segmentation extends org.lcsim.geometry.util.CalorimeterIDDecoder

 {
    protected Segmentation(Element segmentation)
    {

GeomConverter/src/org/lcsim/geometry/subdetector

diff -u -r1.1 -r1.1.2.1
--- AbstractCalorimeter.java	24 Aug 2005 07:05:07 -0000	1.1
+++ AbstractCalorimeter.java	29 Sep 2005 21:18:27 -0000	1.1.2.1
@@ -9,6 +9,7 @@

 import org.jdom.Element;
 import org.jdom.JDOMException;
 import org.lcsim.geometry.Calorimeter;

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

 
 /**
  *

GeomConverter/src/org/lcsim/geometry/subdetector

diff -u -r1.3 -r1.3.2.1
--- AbstractTestBeam.java	27 Sep 2005 19:25:12 -0000	1.3
+++ AbstractTestBeam.java	29 Sep 2005 21:18:27 -0000	1.3.2.1
@@ -23,7 +23,7 @@

  * @author jeremym
  */
 /* FIXME: Another instance where "is a" should be "has a" w.r.t. shape/topology of the subdetector. */

-abstract class AbstractTestBeam extends AbstractLayeredSubdetector

+public abstract class AbstractTestBeam extends AbstractLayeredSubdetector

 {
     double x;
     double y;

GeomConverter/src/org/lcsim/geometry/subdetector

diff -u -r1.2 -r1.2.2.1
--- TestBeamCalorimeter.java	26 Sep 2005 18:14:16 -0000	1.2
+++ TestBeamCalorimeter.java	29 Sep 2005 21:18:27 -0000	1.2.2.1
@@ -19,6 +19,7 @@

 import hep.graphics.heprep.HepRepInstanceTree;
 import hep.graphics.heprep.HepRepType;
 import hep.graphics.heprep.HepRepTypeTree;

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

 
 /**
  * @author jeremym

GeomConverter/src/org/lcsim/geometry/subdetector

diff -N CalorimeterIDDecoder.java
--- CalorimeterIDDecoder.java	28 Sep 2005 05:44:18 -0000	1.4.2.2
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,34 +0,0 @@

-package org.lcsim.geometry.subdetector;
-import org.lcsim.geometry.Calorimeter;
-
-/**
- *
- * @author tonyj
- *
- */
-abstract public class CalorimeterIDDecoder 
-        extends org.lcsim.geometry.subdetector.SubdetectorIDDecoder
-        implements org.lcsim.geometry.CalorimeterIDDecoder
-{
-    public Calorimeter getCalorimeter()
-    {
-        return (Calorimeter) getSubdetector();
-    }   
-    
-    /* FIXME: Next 3 should be in CellNeighbours (or equiv) interface definition. */
-    public long[] getNeighbourIDs(int deltaLayer, int deltaTheta, int deltaPhi)
-    {
-        long[] dummyNeighbours = {0, 0, 0};
-        return dummyNeighbours;
-    }
-    
-    public boolean supportsNeighbours()
-    {
-        return false;
-    }
-    
-    public long[] getNeighbourIDs()
-    {
-        return getNeighbourIDs(1,1,1);
-    }
-}

\ No newline at end of file

GeomConverter/src/org/lcsim/geometry/subdetector

diff -N SubdetectorIDDecoder.java
--- SubdetectorIDDecoder.java	28 Sep 2005 05:44:18 -0000	1.3.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,88 +0,0 @@

-/*
- * SubdetectorID.java
- *
- * Created on July 17, 2005, 4:58 PM
- *
- */
-package org.lcsim.geometry.subdetector;
-
-import org.lcsim.geometry.Subdetector;
-import org.lcsim.geometry.util.BaseIDDecoder;
-import org.lcsim.geometry.util.IDDescriptor;
-
-
-/**
- *
- * @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

GeomConverter/src/org/lcsim/geometry/subdetector

diff -N TrackerIDDecoder.java
--- TrackerIDDecoder.java	28 Sep 2005 05:44:18 -0000	1.1.2.2
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,30 +0,0 @@

-/*
- * TrackerIDDecoder.java
- *
- * Created on July 20, 2005, 3:44 AM
- *
- */
-
-package org.lcsim.geometry.subdetector;
-
-import org.lcsim.geometry.Tracker;
-
-/**
- *
- * @author jeremym
- */
-public class TrackerIDDecoder 
-        extends org.lcsim.geometry.subdetector.SubdetectorIDDecoder
-        implements org.lcsim.geometry.TrackerIDDecoder
-{   
-    Tracker tracker;
-    
-    /** Creates a new instance of TrackerIDDecoder */
-    public TrackerIDDecoder()
-    {}       
-   
-    public Tracker getTracker()
-    {
-        return tracker;
-    }
-}

\ No newline at end of file

GeomConverter/src/org/lcsim/geometry/util

diff -N SubdetectorIDDecoder.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ SubdetectorIDDecoder.java	29 Sep 2005 21:18:28 -0000	1.1.2.1
@@ -0,0 +1,87 @@

+/*
+ * 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

GeomConverter/src/org/lcsim/geometry/util

diff -N TrackerIDDecoder.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ TrackerIDDecoder.java	29 Sep 2005 21:18:28 -0000	1.1.2.1
@@ -0,0 +1,30 @@

+/*
+ * TrackerIDDecoder.java
+ *
+ * Created on July 20, 2005, 3:44 AM
+ *
+ */
+
+package org.lcsim.geometry.util;
+
+import org.lcsim.geometry.Tracker;
+
+/**
+ *
+ * @author jeremym
+ */
+public class TrackerIDDecoder 
+        extends org.lcsim.geometry.util.SubdetectorIDDecoder
+        implements org.lcsim.geometry.TrackerIDDecoder
+{   
+    Tracker tracker;
+    
+    /** Creates a new instance of TrackerIDDecoder */
+    public TrackerIDDecoder()
+    {}       
+   
+    public Tracker getTracker()
+    {
+        return tracker;
+    }
+}

\ No newline at end of file

GeomConverter/src/org/lcsim/geometry/util

diff -u -r1.1.2.2 -r1.1.2.3
--- BaseDetector.java	29 Sep 2005 01:03:58 -0000	1.1.2.2
+++ BaseDetector.java	29 Sep 2005 21:18:28 -0000	1.1.2.3
@@ -9,7 +9,7 @@

 import org.lcsim.geometry.IDDecoder;
 import org.lcsim.geometry.compact.Field;
 import org.lcsim.geometry.compact.Readout;

-import org.lcsim.geometry.subdetector.SubdetectorIDDecoder;

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

 
 import org.lcsim.geometry.HepRepProvider;
 import hep.graphics.heprep.HepRep;