GeomConverter/src/org/lcsim/geometry/compact/converter/lcdd

diff -u -r1.7 -r1.8
--- PolyhedraEndcapCalorimeter2.java	13 Feb 2009 09:47:49 -0000	1.7
+++ PolyhedraEndcapCalorimeter2.java	20 Feb 2009 05:48:48 -0000	1.8
@@ -97,6 +97,7 @@

                 		sliceVolume.setSensitiveDetector(sens);
                 	}
                 }

+                

                 // Visualization of slice.
                 if (sliceElement.getAttribute("vis") != null)
                 {

@@ -143,22 +144,24 @@

             envelopeVolume.setVisAttributes(lcdd.getVisAttributes(node.getAttribute("vis").getValue()));
         }            
         

-        double zrot = Math.PI / numsides;
-        

+        // The envelope volume is complete.        

         structure.addVolume(envelopeVolume);
                 
         // Positive endcap.

+        
+        double zrot = Math.PI / numsides;

         PhysVol physvol = new PhysVol(envelopeVolume);
         physvol.setZ(zmin+subdetectorThickness/2);
         physvol.addPhysVolID("system",id);
         physvol.addPhysVolID("barrel",1);        

-        Rotation rotation = new Rotation(envelopeVolume + "_reflected");

+        Rotation rotation = new Rotation(envelopeVolume + "_positive");

         rotation.setZ(zrot);
         physvol.setRotation(rotation);        
         motherVolume.addPhysVol(physvol);
         
         // Negative endcap.
         

+        // Assume 2 endcaps but check for setting.

         boolean reflect = true;
         if (node.getAttribute("reflect") != null )
         {

@@ -169,7 +172,7 @@

         {
             PhysVol physvol2 = new PhysVol(envelopeVolume);
             physvol2.setZ(-zmin-subdetectorThickness/2);

-            Rotation reflection = new Rotation(envelopeVolume + "_reflected");

+            Rotation reflection = new Rotation(envelopeVolume + "_negative");

             reflection.setX(Math.PI);
             reflection.setZ(zrot);