GeomConverter/src/META-INF/services

diff -u -r1.1 -r1.2
--- org.lcsim.geometry.compact.converter.Converter	27 Jun 2005 21:57:34 -0000	1.1
+++ org.lcsim.geometry.compact.converter.Converter	23 Jul 2005 01:12:55 -0000	1.2
@@ -1,2 +1,3 @@

 org.lcsim.geometry.compact.converter.heprep.Main

-org.lcsim.geometry.compact.converter.lcdd.Main

\ No newline at end of file

+org.lcsim.geometry.compact.converter.lcdd.Main
+org.lcsim.geometry.compact.converter.GODL.Main

\ No newline at end of file

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

diff -u -r1.1 -r1.2
--- Main.java	23 Jul 2005 00:43:46 -0000	1.1
+++ Main.java	23 Jul 2005 01:12:56 -0000	1.2
@@ -580,7 +580,11 @@

                 String name     = m.getName();
                 int sysid       = m.getSystemID();
                 boolean reflect = m.getReflect();

-                String rname    = m.getReadout().getName();

+                String rname = null;
+                if ( m.getReadout() != null )
+                {
+                    rname = m.getReadout().getName();
+                }

                 double[] innerR = m.getInnerR();
                 double[] outerR = m.getOuterR();
                 double[] innerZ = m.getInnerZ();

@@ -627,7 +631,11 @@

                 MultiLayerTracker m = (MultiLayerTracker) s;
                 String name     = m.getName();
                 int sysid       = m.getSystemID();

-                String rname    = m.getReadout().getName();

+                String rname = null;
+                if ( m.getReadout() != null )
+                {
+                    rname    = m.getReadout().getName();
+                }

                 double[] innerR = m.getInnerR();
                 double[] outerZ = m.getOuterZ();
                 LayerStack ls   = m.getLayering().getLayerStack();

GeomConverter/test/org/lcsim/geometry/compact/converter

diff -u -r1.1 -r1.2
--- MainTest.java	27 Jun 2005 21:57:35 -0000	1.1
+++ MainTest.java	23 Jul 2005 01:12:56 -0000	1.2
@@ -61,7 +61,7 @@

    public void testGetConverters()
    {
       List<Converter> converters = Main.getConverters();

-      assertEquals(2,converters.size());

+      assertEquals(3,converters.size());

       for (Converter c : converters)
       {
          assertTrue(c instanceof Converter);

GeomConverter/test/org/lcsim/geometry/compact/converter/GODL

diff -N ConvertTest.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ ConvertTest.java	23 Jul 2005 01:12:56 -0000	1.1
@@ -0,0 +1,30 @@

+package org.lcsim.geometry.compact.converter.GODL;
+import junit.framework.*;
+import java.io.InputStream;
+
+
+/**
+ *
+ * @author jeremym
+ */
+public class ConvertTest extends TestCase
+{
+   public ConvertTest(String testName)
+   {
+      super(testName);
+   }
+   
+   public static TestSuite suite()
+   {
+      return new TestSuite(ConvertTest.class);
+   }
+   
+   /**
+    * Test of main method, of class org.lcsim.geometry.compact.converter.lcdd.Main.
+    */
+   public void testMain() throws Exception
+   {
+      InputStream in = ConvertTest.class.getResourceAsStream("/org/lcsim/geometry/compact/sdjan03_compact.xml");
+      new Main(true).convert("sdjan03",in,null);
+   }
+}

\ No newline at end of file