GeomConverter/src/org/lcsim/geometry/compact/converter/lcdd
diff -u -r1.4 -r1.5
--- EcalBarrel.java 1 Feb 2006 01:33:17 -0000 1.4
+++ EcalBarrel.java 7 Mar 2006 00:36:21 -0000 1.5
@@ -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.4 2006/02/01 01:33:17 jeremy Exp $
+ * @version $Id: EcalBarrel.java,v 1.5 2006/03/07 00:36:21 jeremy Exp $
*/
// FIXME: needs subdetector envelope
public class EcalBarrel extends LCDDSubdetector
@@ -52,15 +52,15 @@
// check required attributes
assert (dimensions != null);
- assert (dimensions.getAttribute("nsides") != null);
- assert (dimensions.getAttribute("inner_radius") != null);
+ assert (dimensions.getAttribute("numsides") != null);
+ assert (dimensions.getAttribute("rmin") != null);
assert (dimensions.getAttribute("z") != null);
// number of sides
- int nsides = dimensions.getAttribute("nsides").getIntValue();
+ int nsides = dimensions.getAttribute("numsides").getIntValue();
// inner radius to first surface of module
- double inner_radius = dimensions.getAttribute("inner_radius")
+ double inner_radius = dimensions.getAttribute("rmin")
.getDoubleValue();
// module Z dimension, corresponding to Z of subdetector
@@ -202,7 +202,7 @@
}
double nsides = subdetector.getElement().getChild("dimensions")
- .getAttribute("nsides").getDoubleValue();
+ .getAttribute("numsides").getDoubleValue();
Rotation irot = lcdd.getDefine().getRotation("identity_rot");
GeomConverter/test/org/lcsim/geometry/subdetector
diff -u -r1.5 -r1.6
--- EcalBarrelTest.xml 16 Feb 2006 00:57:14 -0000 1.5
+++ EcalBarrelTest.xml 7 Mar 2006 00:36:21 -0000 1.6
@@ -29,7 +29,7 @@
<!-- Example EcalBarrel -->
<detector id="1" name="EcalBarrelTest" type="EcalBarrel" readout="EcalBarrHits">
- <dimensions nsides="8" inner_radius="1700.0" z="546.0 * 2" />
+ <dimensions numsides="8" rmin="1700.0" z="546.0 * 2" />
<layer repeat="8">
<slice material="Lead" thickness="23.0" sensitive="yes" />
