GeomConverter/src/org/lcsim/detector/converter/compact

diff -u -r1.30 -r1.31
--- DetectorConverter.java	7 Nov 2007 00:32:53 -0000	1.30
+++ DetectorConverter.java	7 Nov 2007 22:10:43 -0000	1.31
@@ -56,6 +56,11 @@

 
     public IPhysicalVolume convert(Detector detector, Document doc)  throws JDOMException, IOException
     {

+        // Convert materials.
+        convertMaterials("/org/lcsim/material/elements.xml");
+        convertMaterials("/org/lcsim/material/materials.xml");
+        convertMaterials(doc);
+        

         // Construct the world volume.
         IPhysicalVolume pvWorld = buildWorldVolume(detector);
 

@@ -73,11 +78,6 @@

         // Set the world volume.
         detector.setWorldVolume(pvWorld);
 

-        // Convert materials.
-        convertMaterials("/org/lcsim/material/elements.xml");
-        convertMaterials("/org/lcsim/material/materials.xml");
-        convertMaterials(doc);
-

         // Convert Subdetectors including creation of IdentifierHelpers.
         convertSubdetectors(detector);