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

diff -u -r1.1 -r1.2
--- PolyhedraEndcapCalorimeter2.java	6 Feb 2009 16:36:23 -0000	1.1
+++ PolyhedraEndcapCalorimeter2.java	6 Feb 2009 18:07:32 -0000	1.2
@@ -28,6 +28,8 @@

 
     public void addToLCDD(LCDD lcdd, SensitiveDetector sens) throws JDOMException
     {

+    	System.out.println("TEST");
+    	

         Solids solids = lcdd.getSolids();
         Structure structure = lcdd.getStructure();
         Volume motherVolume = lcdd.pickMotherVolume(this);

@@ -51,9 +53,9 @@

         LayerStack layers = Layering.makeLayering(this.node).getLayerStack();
         
         double subdetectorThickness = org.lcsim.geometry.layer.LayerFromCompactCnv.computeDetectorTotalThickness(node);                        

-        double radialThickness = rmax - rmin;

+        //double radialThickness = rmax - rmin;

-        System.out.println("subdetectorThickness: " + subdetectorThickness);

+        //System.out.println("subdetectorThickness: " + subdetectorThickness);

         PolyhedraRegular envelopeSolid = new PolyhedraRegular(subdetectorName + "_envelope", numsides, rmin, rmax, subdetectorThickness);
         solids.addSolid(envelopeSolid);
         Volume envelopeVolume = new Volume(subdetectorName + "_volume", envelopeSolid, air);

@@ -72,7 +74,7 @@

             }
             PolyhedraRegular layerSolid = new PolyhedraRegular(layerTypeName + "_solid", numsides, rmin, rmax, layerThickness);
             solids.addSolid(layerSolid);

-            Volume layerVolume = new Volume(layerTypeName + "_volume", envelopeSolid, air);

+            Volume layerVolume = new Volume(layerTypeName + "_volume", layerSolid, air);

             
             int sliceNumber = 0;
             double sliceZ = layerThickness/2;

@@ -98,24 +100,24 @@

                 new PhysVol(sliceVolume, layerVolume, slicePosition, identityRotation);
                 sliceNumber++;
             }

+

             structure.addVolume(layerVolume);

-            sliceNumber = 0;                        

+            //sliceNumber = 0;                        

             int repeat = (int)layerElement.getAttribute("repeat").getDoubleValue();
             if (repeat <= 0)
                 throw new RuntimeException("The repeat value of " + repeat + " is invalid.");          
             for ( int j=0; j<repeat; j++)
             {

-                String physLayerName = subdetectorName + "_layer" + layerNumber; 

+                String physLayerName = subdetectorName + "_layer" + layerNumber;
+                //System.out.println("incr: " + layerThickness/2);

                 layerZ -= layerThickness/2;

-                System.out.println("layer" + layerNumber + ": " + layerZ);

+                //System.out.println("layer " + layerNumber + " at " + layerZ);

                 Position layerPosition = new Position(physLayerName + "_position", 0, 0, layerZ);
                 define.addPosition(layerPosition);
                 new PhysVol(layerVolume, envelopeVolume, layerPosition, identityRotation);
                 layerZ -= layerThickness/2;

+                //System.out.println("new layer Z " + layerZ);

                 ++layerNumber;

-                
-                // DEBUG
-                break;

             }
             ++layerType;            
         }