GeomConverter/src/org/lcsim/geometry/compact/converter/lcdd

diff -u -r1.20 -r1.21
--- DiskTracker.java	22 Feb 2009 00:19:12 -0000	1.20
+++ DiskTracker.java	7 Dec 2009 23:01:00 -0000	1.21
@@ -27,7 +27,9 @@

 
     public void addToLCDD(LCDD lcdd, SensitiveDetector sens) throws JDOMException
     {

-        int id = node.getAttribute("id").getIntValue();

+        int id = -1;
+        if (node.getAttribute("id") != null)
+            id = node.getAttribute("id").getIntValue();

         String detectorName = node.getAttributeValue("name");
         boolean reflect = node.getAttribute("reflect").getBooleanValue();
 

GeomConverter/src/org/lcsim/geometry/compact/converter/lcdd

diff -u -r1.10 -r1.11
--- ForwardDetector.java	12 Sep 2006 01:20:54 -0000	1.10
+++ ForwardDetector.java	7 Dec 2009 23:01:00 -0000	1.11
@@ -39,8 +39,10 @@

     /** FIXME: This method is horrible spaghetti code.  --JM */
     public void addToLCDD(LCDD lcdd, SensitiveDetector sens) throws JDOMException
     {

-        String detectorName = node.getAttributeValue("name");
-        int id = node.getAttribute("id").getIntValue();

+        int id = -1;
+        if (node.getAttribute("id") != null)
+            id = node.getAttribute("id").getIntValue();
+        String detectorName = node.getAttributeValue("name");        

         
         Material air = lcdd.getMaterial("Air");
         Solids solids = lcdd.getSolids();

GeomConverter/src/org/lcsim/geometry/compact/converter/lcdd

diff -u -r1.19 -r1.20
--- MultiLayerTracker.java	22 Feb 2009 00:19:12 -0000	1.19
+++ MultiLayerTracker.java	7 Dec 2009 23:01:00 -0000	1.20
@@ -26,7 +26,9 @@

 
     public void addToLCDD(LCDD lcdd, SensitiveDetector sens) throws JDOMException
     {

-        int id = node.getAttribute("id").getIntValue();

+        int id = -1;
+        if (node.getAttribute("id") != null)
+            id = node.getAttribute("id").getIntValue();

         String detectorName = node.getAttributeValue("name");
 
         Material air = lcdd.getMaterial("Air");      

GeomConverter/src/org/lcsim/geometry/compact/converter/lcdd

diff -u -r1.2 -r1.3
--- TubeSegment.java	30 Oct 2007 18:29:23 -0000	1.2
+++ TubeSegment.java	7 Dec 2009 23:01:00 -0000	1.3
@@ -15,7 +15,7 @@

  * LCDD implementation of a TubeSegment for beampipe elements.
  *
  * @author Jeremy McCormick

- * @version $Id: TubeSegment.java,v 1.2 2007/10/30 18:29:23 jeremy Exp $

+ * @version $Id: TubeSegment.java,v 1.3 2009/12/07 23:01:00 jeremy Exp $

  */
 public class TubeSegment
 extends LCDDSubdetector

@@ -42,7 +42,9 @@

         String name = node.getAttributeValue("name");
         
         // Id

-        int id = node.getAttribute("id").getIntValue();

+        int id = -1;
+        if (node.getAttribute("id") != null)
+            id = node.getAttribute("id").getIntValue();

         
         // Material
         Material material = lcdd.getMaterial(node.getChild("material").getAttributeValue("name"));