Print

Print


Commit in GeomConverter/src/org/lcsim/geometry/compact/converter/lcdd on MAIN
AbstractTestBeam.java+7-71.1 -> 1.2
Sync AbstractTestBeam with RefactorBranch

GeomConverter/src/org/lcsim/geometry/compact/converter/lcdd
AbstractTestBeam.java 1.1 -> 1.2
diff -u -r1.1 -r1.2
--- AbstractTestBeam.java	26 Sep 2005 18:13:28 -0000	1.1
+++ AbstractTestBeam.java	29 Sep 2005 00:07:56 -0000	1.2
@@ -17,7 +17,7 @@
 
 /**
  *
- * @author tonyj
+ * @author jeremym
  */
 abstract class AbstractTestBeam extends LCDDSubdetector
 {
@@ -84,7 +84,7 @@
         envelopePosition.setZ(zpos);
         define.addPosition(envelopePosition);
         
-        double layerZPos = -zdim / 2;
+        double layerZPos = zdim / 2;
         
         int layerCount = 0;
         int layerTypeCount = 0;
@@ -129,7 +129,7 @@
             layerVolume.setSolid(layerBox);
             
             int sliceCount = 0;
-            double slicePosZ = -layerZ / 2;
+            double slicePosZ = layerZ / 2;
             for ( Object so : layer.getChildren("slice"))
             { 
                 Element slice = (Element) so;
@@ -169,9 +169,9 @@
                 PhysVol slicePhysVol = new PhysVol(sliceVolume);
                 slicePhysVol.addPhysVolID("slice", sliceCount);
                 Position slicePosition = new Position(sliceName + "_position");
-                slicePosZ += sliceZ / 2;
+                slicePosZ -= sliceZ / 2;
                 slicePosition.setZ(slicePosZ);
-                slicePosZ += sliceZ / 2;
+                slicePosZ -= sliceZ / 2;
                 define.addPosition(slicePosition);
                 slicePhysVol.setPosition(slicePosition);
                 layerVolume.addPhysVol(slicePhysVol);
@@ -188,12 +188,12 @@
                 PhysVol layerPhysVol = new PhysVol(layerVolume);
                 layerPhysVol.addPhysVolID("layer", layerCount);
                 
-                layerZPos += layerZ / 2;
+                layerZPos -= layerZ / 2;
                 Position layerPosition = new Position(layerPhysVolName + "_position");
                 define.addPosition(layerPosition);
                 layerPosition.setZ(layerZPos);
                 layerPhysVol.setPosition(layerPosition);
-                layerZPos += layerZ / 2;
+                layerZPos -= layerZ / 2;
                 
                 envelopeVolume.addPhysVol(layerPhysVol);
                 
CVSspam 0.2.8