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

diff -u -r1.4 -r1.5
--- ForwardDetector.java	1 Jul 2005 00:15:06 -0000	1.4
+++ ForwardDetector.java	15 Jul 2005 00:09:16 -0000	1.5
@@ -184,9 +184,9 @@

                 Position layerSubtraction1Pos = new Position(layerBasename + "_subtraction1_pos");
                                                
                 double layerGlobalZ = zinner + layerDisplZ;

-                //System.out.println("layerGlobalZ: " + layerGlobalZ);

+                System.out.println("layerGlobalZ: " + layerGlobalZ);

                 double layerPosX = Math.tan(xangleHalf) * layerGlobalZ;                

-                //System.out.println("layerPosX: " + layerPosX);

+                System.out.println("layerPosX: " + layerPosX);

                 layerSubtraction1Pos.setX(layerPosX);
                 defines.addPosition(layerSubtraction1Pos); 
                 

@@ -232,8 +232,8 @@

                     sliceDisplZ += sliceThickness / 2;
                     slicePosZ += sliceThickness / 2;
                     

-                    //System.out.println("sliceDisplZ: " + sliceDisplZ );
-                    //System.out.println("slicePosZ: " + slicePosZ );

+                    System.out.println("sliceDisplZ: " + sliceDisplZ );
+                    System.out.println("slicePosZ: " + slicePosZ );

                     
                     /** Slice's basic tube. */
                     Tube sliceTube = new Tube(sliceBasename + "_tube");

@@ -252,11 +252,11 @@

                     Position sliceSubtraction1Pos = new Position(sliceBasename + "_subtraction1_pos");
                     double sliceGlobalZ = zinner + (layerDisplZ - layerThickness / 2) + sliceDisplZ;
                     

-                    //System.out.println("sliceGlobalZ: " + sliceGlobalZ);

+                    System.out.println("sliceGlobalZ: " + sliceGlobalZ);

                     
                     double slicePosX = Math.tan(xangleHalf) * sliceGlobalZ;
                     

-                    //System.out.println("slicePosX: " + slicePosX);

+                    System.out.println("slicePosX: " + slicePosX);

                     
                     sliceSubtraction1Pos.setX(slicePosX);
                     defines.addPosition(sliceSubtraction1Pos);

@@ -267,7 +267,7 @@

                     /** Second slice subtraction solid. */
                     SubtractionSolid sliceSubtraction2 = 
                             new SubtractionSolid(sliceBasename + "_subtraction2");

-                    sliceSubtraction2.setFirstSolid(sliceTube);

+                    sliceSubtraction2.setFirstSolid(sliceSubtraction1);

                     sliceSubtraction2.setSecondSolid(beamOutTube);
                     solids.addSolid(sliceSubtraction2);