Commit in GeomConverter/src/org/lcsim/detector/converter/compact on MAIN
EcalBarrelConverter.java+4-41.7 -> 1.8
PolyhedraEndcapCalorimeterConverter.java+3-31.6 -> 1.7
SiTrackerEndcapConverter.java+7-11.36 -> 1.37
+14-8
3 modified files


GeomConverter/src/org/lcsim/detector/converter/compact
EcalBarrelConverter.java 1.7 -> 1.8
diff -u -r1.7 -r1.8
--- EcalBarrelConverter.java	30 Nov 2010 00:16:27 -0000	1.7
+++ EcalBarrelConverter.java	7 Dec 2010 20:12:11 -0000	1.8
@@ -98,14 +98,14 @@
 
         // Create the trapezoid for the stave.
         Trd moduleTrd = new Trd( name + "_module_trd", moduleX1 / 2, // Outer side, i.e.
-                                                                     // the "short" X
-                                                                     // side.
+                                 // the "short" X
+                                 // side.
                                  moduleX2 / 2, // Inner side, i.e. the "long" X side.
                                  moduleY1 / 2, // Corresponds to subdetector (or module)
-                                               // Z.
+                                 // Z.
                                  moduleY2 / 2, // "
                                  moduleZ / 2 ); // Thickness, in Y for top stave, when
-                                                // rotated.
+        // rotated.
 
         LogicalVolume moduleVolume = new LogicalVolume( name + "_module", moduleTrd, MaterialStore.getInstance().get(
                 "Air" ) );

GeomConverter/src/org/lcsim/detector/converter/compact
PolyhedraEndcapCalorimeterConverter.java 1.6 -> 1.7
diff -u -r1.6 -r1.7
--- PolyhedraEndcapCalorimeterConverter.java	30 Nov 2010 00:16:27 -0000	1.6
+++ PolyhedraEndcapCalorimeterConverter.java	7 Dec 2010 20:12:11 -0000	1.7
@@ -185,11 +185,11 @@
                     Translation3D slicePosition = new Translation3D( 0, slicePositionY, 0 );
 
                     double sliceInnerFaceLength = layerInnerFaceLength;// -
-                                                                       // SLICE_ENVELOPE_TOLERANCE;
+                    // SLICE_ENVELOPE_TOLERANCE;
                     double sliceOuterFaceLength = layerOuterFaceLength;// -
-                                                                       // SLICE_ENVELOPE_TOLERANCE;
+                    // SLICE_ENVELOPE_TOLERANCE;
                     double sliceRadialThickness = layerRadialThickness;// -
-                                                                       // SLICE_ENVELOPE_TOLERANCE;
+                    // SLICE_ENVELOPE_TOLERANCE;
 
                     Trd sliceTrd = new Trd( sliceName + "_trapezoid",
                                             sliceInnerFaceLength / 2,

GeomConverter/src/org/lcsim/detector/converter/compact
SiTrackerEndcapConverter.java 1.36 -> 1.37
diff -u -r1.36 -r1.37
--- SiTrackerEndcapConverter.java	30 Nov 2010 00:16:27 -0000	1.36
+++ SiTrackerEndcapConverter.java	7 Dec 2010 20:12:11 -0000	1.37
@@ -49,7 +49,7 @@
  * Converter for SiTrackerEndcap.
  * 
  * @author Jeremy McCormick, Tim Nelson
- * @version $Id: SiTrackerEndcapConverter.java,v 1.36 2010/11/30 00:16:27 jeremy Exp $
+ * @version $Id: SiTrackerEndcapConverter.java,v 1.37 2010/12/07 20:12:11 jeremy Exp $
  */
 
 public class SiTrackerEndcapConverter extends AbstractSubdetectorConverter implements ISubdetectorConverter
@@ -767,6 +767,8 @@
                                  * -1*strip_angle_magnitude; }
                                  * 
                                  * 
+                                 * 
+                                 * 
                                  * //System.out.println("Plane of p_side polygon has... ");
                                  * /
                                  * /System.out.println("                        normal: "+
@@ -777,6 +779,8 @@
                                  * System.out.println("      Vertex: "+point); //}
                                  * 
                                  * 
+                                 * 
+                                 * 
                                  * //System.out.println("Plane of n_side polygon has... ");
                                  * /
                                  * /System.out.println("                        normal: "+
@@ -791,6 +795,8 @@
                                  * double strip_angle = Math.PI/nwedges;
                                  * 
                                  * 
+                                 * 
+                                 * 
                                  * //System.out.println("                        side = : "
                                  * +side);
                                  * 
CVSspam 0.2.8