Print

Print


Commit in GeomConverter on MAIN
src/org/lcsim/geometry/compact/converter/lcdd/EcalBarrel.java+1-51.1 -> 1.2
test/org/lcsim/geometry/subdetector/EcalBarrelTest.xml+2-151.1 -> 1.2
+3-20
2 modified files


GeomConverter/src/org/lcsim/geometry/compact/converter/lcdd
EcalBarrel.java 1.1 -> 1.2
diff -u -r1.1 -r1.2
--- EcalBarrel.java	21 Jan 2006 02:41:35 -0000	1.1
+++ EcalBarrel.java	21 Jan 2006 02:50:07 -0000	1.2
@@ -30,7 +30,7 @@
  * Class to convert from Ecal model similar to Mokka's "ecal02" to LCDD.
  * 
  * @author jeremym
- * @version $Id: EcalBarrel.java,v 1.1 2006/01/21 02:41:35 jeremy Exp $
+ * @version $Id: EcalBarrel.java,v 1.2 2006/01/21 02:50:07 jeremy Exp $
  */
 // FIXME: need subdetector envelope
 public class EcalBarrel extends LCDDSubdetector
@@ -203,10 +203,6 @@
 		double posZ = -(subdetectorThickness / 2);
 		
 		System.out.println("slice start posZ=" + posZ);
-
-//		double outerRadius = innerRadius + subdetectorThickness;
-//		System.out.println("outerRadius=" + outerRadius);
-
 		String detectorName = subdetector.getName();
 
 		double dphi = PI * 2.0 / nsides;

GeomConverter/test/org/lcsim/geometry/subdetector
EcalBarrelTest.xml 1.1 -> 1.2
diff -u -r1.1 -r1.2
--- EcalBarrelTest.xml	21 Jan 2006 02:41:36 -0000	1.1
+++ EcalBarrelTest.xml	21 Jan 2006 02:50:07 -0000	1.2
@@ -1,21 +1,11 @@
-<!--
-     Time-stamp: <2004-12-14 11:20:57 jeremym>
-
-     Example compact description ("lccdd") corresponding to
-     stdhep examples in SLIC: examples/stdhep/barr.lcdd.
--->
-
-<!-- top-level compact description element -->
 <lccdd xmlns:lccdd="namespaceUrl"
        xmlns:xs="http://www.w3.org/2001/XMLSchema-instance"
        xs:noNamespaceSchemaLocation="noNamespaceUrl">
 
-  <!-- info tag containing author, version, time, unique id (url) -->
   <info name="EcalBarrelTest"
         title="EcalBarrelTest">
   </info>
 
-  <!-- Constants -->
   <define>
 
     <constant name="cm" value="10"/>
@@ -29,11 +19,7 @@
     <!-- tracking region -->
     <constant name="tracking_region_radius" value="127.0"/>
     <constant name="tracking_region_zmax" value="168.0"/>
-
-    <constant name="vertex_inner_r" value="1.2"/>
-    <constant name="vertex_delta_r" value="1.2"/>
-    <constant name="vertex_outer_z" value="12.5"/>
-
+    
   </define>
 
   <materials>
@@ -41,6 +27,7 @@
 
   <detectors>
 
+    <!-- Example EcalBarrel -->
     <detector id="2" name="EcalBarrelTest" type="EcalBarrel" readout="EcalBarrHits">
 
       <dimensions nsides="8" inner_radius="1700.0" />
CVSspam 0.2.8