GeomConverter/src/org/lcsim/geometry/compact

diff -u -r1.41 -r1.42
--- CompactReader.java	14 Jan 2009 20:14:39 -0000	1.41
+++ CompactReader.java	15 Jan 2009 22:49:49 -0000	1.42
@@ -28,7 +28,7 @@

  * org.lcsim.geometry.GeometryReader class, which extends this.
  *
  * @author tonyj

- * @version $Id: CompactReader.java,v 1.41 2009/01/14 20:14:39 jeremy Exp $

+ * @version $Id: CompactReader.java,v 1.42 2009/01/15 22:49:49 jeremy Exp $

  *
  */
 public class CompactReader

@@ -211,8 +211,6 @@

             }
             
             det.addSubdetector(sub);

-            
-            //setupScalingVariables(expr, sub);

         }
     }
     

@@ -264,7 +262,7 @@

         }
     }
     

-    private static void registerCLHEPConstants(JDOMExpressionFactory f)

+    protected static void registerCLHEPConstants(JDOMExpressionFactory f)

     {    
     	Constants constants = Constants.getInstance();
     	for (Entry<String,Double> unit : constants.entrySet())

@@ -307,4 +305,4 @@

             }
         }
     }   

-}

\ No newline at end of file

+}

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

diff -u -r1.1 -r1.2
--- Main.java	27 Jun 2005 21:57:34 -0000	1.1
+++ Main.java	15 Jan 2009 22:49:49 -0000	1.2
@@ -79,7 +79,7 @@

          if (converter == null) throw new InvalidArgumentException("Sorry, could not find converter for output file");
       }
    }

-   public static void main(String[] args) throws Exception

+   public static void main(String[] args)

    {
       Main main = new Main();
       try

@@ -98,7 +98,14 @@

       }
       else if (main.converter != null)
       {

-         main.run();

+          try {
+              main.run();
+          }
+          catch (Exception x)
+          {
+              // Print only the simple message.  
+              System.err.println(x.getMessage());
+          }

       }
    }
    private void run() throws Exception