GeomConverter/src/org/lcsim/geometry/subdetector

diff -u -r1.15 -r1.16
--- PolyhedraEndcapCalorimeter.java	14 Apr 2010 02:06:31 -0000	1.15
+++ PolyhedraEndcapCalorimeter.java	10 May 2010 22:01:50 -0000	1.16
@@ -47,7 +47,8 @@

 
         irad = dimensions.getAttribute("rmin").getDoubleValue();
         orad = dimensions.getAttribute("rmax").getDoubleValue();

-        

+        orad = orad * Math.cos(Math.PI / this.nsides);
+

         // Set layering pre-offset.
         getLayering().setOffset(zmin);
     }

@@ -137,7 +138,7 @@

             zin = -zin;
             zout = -zout;
         }

-        */

+         */

     }
 
     public boolean isEndcap()

GeomConverter/src/org/lcsim/geometry/subdetector

diff -u -r1.8 -r1.9
--- PolyhedraEndcapCalorimeter2.java	14 Apr 2010 02:06:31 -0000	1.8
+++ PolyhedraEndcapCalorimeter2.java	10 May 2010 22:01:50 -0000	1.9
@@ -26,11 +26,12 @@

         Element dimensions = node.getChild("dimensions");
 
         zmin = dimensions.getAttribute("zmin").getDoubleValue();

-        zmax = zmin + thickness;        

+        zmax = zmin + thickness;

 
         irad = dimensions.getAttribute("rmin").getDoubleValue();
         orad = dimensions.getAttribute("rmax").getDoubleValue();

-        

+        orad = orad * Math.cos(Math.PI / this.nsides);
+

         // Set layering pre-offset.
         getLayering().setOffset(zmin);
     }

@@ -44,7 +45,7 @@

     {
         return zmax;
     }

-    

+

     public void appendHepRep(HepRepFactory factory, HepRep heprep)
     {
         DetectorElementToHepRepConverter.convert(this.getDetectorElement(), factory, heprep, 2, true);