GeomConverter/src/org/lcsim/geometry/segmentation

diff -u -r1.21 -r1.22
--- NonprojectiveCylinder.java	9 Feb 2006 19:18:07 -0000	1.21
+++ NonprojectiveCylinder.java	5 Jul 2006 15:30:41 -0000	1.22
@@ -32,6 +32,8 @@

 
     private int zIndex;
     private int phiIndex;

+    private int systemIndex;
+    private int barrelIndex;

 
     /** Creates a new instance of NonprojectiveCylinder */
     public NonprojectiveCylinder(Element node) throws DataConversionException

@@ -115,6 +117,8 @@

         super.setIDDescription(id);
         phiIndex = id.indexOf("phi");
         zIndex = id.indexOf("z");

+        systemIndex = id.indexOf("system");
+        barrelIndex = id.indexOf("barrel");

     }
 
     public boolean supportsNeighbours()

@@ -235,6 +239,8 @@

         enc.setValue(layerIndex, ilay);
         enc.setValue(zIndex, iz);
         enc.setValue(phiIndex, iphi);

+	enc.setValue(barrelIndex,0);
+	enc.setValue(systemIndex, detector.getSystemID());

         long resultID = enc.getID();
 
         return resultID;