Commit in GeomConverter/src/org/lcsim/geometry/segmentation on MAIN
EcalBarrelCartesianGridXY.java+21.2 -> 1.3
RegularNgonCartesianGridXY.java+21.2 -> 1.3
RegularNgonCartesianGridXZ.java+21.2 -> 1.3
+6
3 modified files
Find number of modules from subdetector

GeomConverter/src/org/lcsim/geometry/segmentation
EcalBarrelCartesianGridXY.java 1.2 -> 1.3
diff -u -r1.2 -r1.3
--- EcalBarrelCartesianGridXY.java	20 Nov 2009 18:04:41 -0000	1.2
+++ EcalBarrelCartesianGridXY.java	9 Dec 2009 16:24:02 -0000	1.3
@@ -16,6 +16,7 @@
 import org.lcsim.geometry.util.IDDescriptor;
 import org.lcsim.geometry.util.BaseIDDecoder;
 import org.lcsim.geometry.util.IDEncoder;
+import org.lcsim.geometry.subdetector.AbstractPolyhedraCalorimeter;
 
 /**
  * XY Cartesian grid segmentation for overlapping staves.
@@ -319,6 +320,7 @@
 
     protected void initializeMappings()
     {
+        nmodules = ((AbstractPolyhedraCalorimeter)getSubdetector()).getNumberOfSides();
         // Initialize all the needed parameters for the neighbor
         // finding across borders
 		// Get number of layers.

GeomConverter/src/org/lcsim/geometry/segmentation
RegularNgonCartesianGridXY.java 1.2 -> 1.3
diff -u -r1.2 -r1.3
--- RegularNgonCartesianGridXY.java	20 Nov 2009 18:04:41 -0000	1.2
+++ RegularNgonCartesianGridXY.java	9 Dec 2009 16:24:02 -0000	1.3
@@ -20,6 +20,7 @@
 import org.lcsim.geometry.util.IDDescriptor;
 import org.lcsim.geometry.util.BaseIDDecoder;
 import org.lcsim.geometry.util.IDEncoder;
+import org.lcsim.geometry.subdetector.AbstractPolyhedraCalorimeter;
 
 /**
  * Extend XY Cartesian grid segmentation for neighboring across
@@ -183,6 +184,7 @@
 	}
     protected void initializeBorders()
     {
+        nmodules = ((AbstractPolyhedraCalorimeter)getSubdetector()).getNumberOfSides();
 		IIdentifierHelper helper = detector.getDetectorElement().getIdentifierHelper();
         // Current packed id.
         IIdentifier currId = new Identifier(this.getDecoder().getID());

GeomConverter/src/org/lcsim/geometry/segmentation
RegularNgonCartesianGridXZ.java 1.2 -> 1.3
diff -u -r1.2 -r1.3
--- RegularNgonCartesianGridXZ.java	20 Nov 2009 18:04:41 -0000	1.2
+++ RegularNgonCartesianGridXZ.java	9 Dec 2009 16:24:02 -0000	1.3
@@ -16,6 +16,7 @@
 import org.lcsim.geometry.util.IDDescriptor;
 import org.lcsim.geometry.util.BaseIDDecoder;
 import org.lcsim.geometry.util.IDEncoder;
+import org.lcsim.geometry.subdetector.AbstractPolyhedraCalorimeter;
 
 /**
  * XZ Cartesian grid segmentation. 
@@ -190,6 +191,7 @@
     }
     protected void initializeBorders()
     {
+        nmodules = ((AbstractPolyhedraCalorimeter)getSubdetector()).getNumberOfSides();
 		IIdentifierHelper helper = detector.getDetectorElement().getIdentifierHelper();
 		// Current packed id.
 		IIdentifier currId = new Identifier(this.getDecoder().getID());
CVSspam 0.2.8