9 modified files
GeomConverter/src/org/lcsim/detector/converter/compact
diff -u -r1.1 -r1.2
--- PolyhedraBarrelCalorimeterConverter.java 15 Feb 2008 02:14:51 -0000 1.1
+++ PolyhedraBarrelCalorimeterConverter.java 2 Jun 2008 20:37:00 -0000 1.2
@@ -87,7 +87,7 @@
int repeat;
try {
- repeat = layer_element.getAttribute("repeat").getIntValue();
+ repeat = (int)layer_element.getAttribute("repeat").getDoubleValue();
}
catch (Exception x)
{
GeomConverter/src/org/lcsim/detector/converter/compact
diff -u -r1.1 -r1.2
--- PolyhedraEndcapCalorimeterConverter.java 29 Feb 2008 01:09:08 -0000 1.1
+++ PolyhedraEndcapCalorimeterConverter.java 2 Jun 2008 20:37:00 -0000 1.2
@@ -87,7 +87,7 @@
int repeat;
try {
- repeat = layer_element.getAttribute("repeat").getIntValue();
+ repeat = (int)layer_element.getAttribute("repeat").getDoubleValue();
}
catch (Exception x)
{
GeomConverter/src/org/lcsim/geometry/compact/converter/lcdd
diff -u -r1.8 -r1.9
--- CylindricalBarrelCalorimeter.java 12 Sep 2006 01:20:53 -0000 1.8
+++ CylindricalBarrelCalorimeter.java 2 Jun 2008 20:37:00 -0000 1.9
@@ -52,7 +52,7 @@
for (Iterator i = node.getChildren("layer").iterator(); i.hasNext();)
{
Element layer = (Element) i.next();
- int repeat = layer.getAttribute("repeat").getIntValue();
+ int repeat = (int)layer.getAttribute("repeat").getDoubleValue();
for (int ll=0; ll<repeat; ll++)
{
double rlayer = r;
GeomConverter/src/org/lcsim/geometry/compact/converter/lcdd
diff -u -r1.14 -r1.15
--- CylindricalEndcapCalorimeter.java 12 Sep 2006 01:20:53 -0000 1.14
+++ CylindricalEndcapCalorimeter.java 2 Jun 2008 20:37:00 -0000 1.15
@@ -56,7 +56,7 @@
for (Iterator i = node.getChildren("layer").iterator(); i.hasNext();)
{
Element layer = (Element) i.next();
- int repeat = layer.getAttribute("repeat").getIntValue();
+ int repeat = (int)layer.getAttribute("repeat").getDoubleValue();
double layerWidth = 0;
for (Iterator j = layer.getChildren("slice").iterator(); j.hasNext();)
GeomConverter/src/org/lcsim/geometry/compact/converter/lcdd
diff -u -r1.16 -r1.17
--- EcalBarrel.java 24 Feb 2007 00:45:41 -0000 1.16
+++ EcalBarrel.java 2 Jun 2008 20:37:00 -0000 1.17
@@ -35,7 +35,7 @@
* that is similar to the "ecal02" subdetector in the Mokka database.
*
* @author Jeremy McCormick <[log in to unmask]>
- * @version $Id: EcalBarrel.java,v 1.16 2007/02/24 00:45:41 jeremy Exp $
+ * @version $Id: EcalBarrel.java,v 1.17 2008/06/02 20:37:00 jeremy Exp $
*/
public class EcalBarrel extends LCDDSubdetector
{
@@ -325,7 +325,7 @@
.iterator(); i.hasNext();)
{
Element layer_element = (Element) i.next();
- int repeat = layer_element.getAttribute("repeat").getIntValue();
+ int repeat = (int)layer_element.getAttribute("repeat").getDoubleValue();
// Loop over number of repeats for this layer.
for (int j=0; j<repeat; j++)
GeomConverter/src/org/lcsim/geometry/compact/converter/lcdd
diff -u -r1.15 -r1.16
--- PolyhedraBarrelCalorimeter.java 18 Dec 2007 22:14:50 -0000 1.15
+++ PolyhedraBarrelCalorimeter.java 2 Jun 2008 20:37:00 -0000 1.16
@@ -96,7 +96,7 @@
for (Iterator i = node.getChildren("layer").iterator(); i.hasNext();)
{
Element layer_element = (Element) i.next();
- int repeat = layer_element.getAttribute("repeat").getIntValue();
+ int repeat = (int)layer_element.getAttribute("repeat").getDoubleValue();
total_repeat += repeat;
total_slices += (layer_element.getChildren("slice").size() * total_repeat);
}
@@ -184,7 +184,7 @@
Layer layer = layering.getLayer(layer_number);
// Get number of times to repeat this layer.
- int repeat = layer_element.getAttribute("repeat").getIntValue();
+ int repeat = (int)layer_element.getAttribute("repeat").getDoubleValue();
// Loop over repeats for this layer.
for (int j = 0; j < repeat; j++)
GeomConverter/src/org/lcsim/geometry/compact/converter/lcdd
diff -u -r1.17 -r1.18
--- PolyhedraEndcapCalorimeter.java 23 Feb 2007 09:47:23 -0000 1.17
+++ PolyhedraEndcapCalorimeter.java 2 Jun 2008 20:37:00 -0000 1.18
@@ -148,7 +148,7 @@
{
Element layer_element = (Element) i.next();
- int repeat = layer_element.getAttribute("repeat").getIntValue();
+ int repeat = (int)layer_element.getAttribute("repeat").getDoubleValue();
for ( int j=0; j<repeat; j++)
{
GeomConverter/src/org/lcsim/geometry/compact/converter/lcdd
diff -u -r1.4 -r1.5
--- TPC.java 12 Sep 2006 01:20:56 -0000 1.4
+++ TPC.java 2 Jun 2008 20:37:00 -0000 1.5
@@ -50,7 +50,7 @@
for (Iterator i = node.getChildren("layer").iterator(); i.hasNext();)
{
Element layer = (Element) i.next();
- int repeat = layer.getAttribute("repeat").getIntValue();
+ int repeat = (int)layer.getAttribute("repeat").getDoubleValue();
for (int ll=0; ll<repeat; ll++)
{
double rlayer = r;
GeomConverter/src/org/lcsim/geometry/layer
diff -u -r1.7 -r1.8
--- LayerFromCompactCnv.java 26 Apr 2007 21:43:07 -0000 1.7
+++ LayerFromCompactCnv.java 2 Jun 2008 20:37:00 -0000 1.8
@@ -143,7 +143,7 @@
for (Iterator i = node.getChildren("layer").iterator(); i.hasNext();)
{
Element layer = (Element) i.next();
- int repeat = layer.getAttribute("repeat").getIntValue();
+ int repeat = (int)layer.getAttribute("repeat").getDoubleValue();
for ( int j=0; j<repeat; j++)
{
for ( Iterator k = layer.getChildren("slice").iterator(); k.hasNext();)
CVSspam 0.2.8