GeomConverter/src/org/lcsim/geometry/compact
diff -u -r1.32 -r1.33
--- CompactReader.java 15 Mar 2007 22:49:35 -0000 1.32
+++ CompactReader.java 9 Apr 2007 19:32:22 -0000 1.33
@@ -12,7 +12,7 @@
import org.jdom.JDOMException;
import org.jdom.input.SAXBuilder;
import org.lcsim.material.XMLMaterialManager;
-import org.lcsim.units.clhep.SystemOfUnitsMap;
+import org.lcsim.units.clhep.Constants;
import org.lcsim.util.cache.CachingEntityResolver;
import org.lcsim.util.xml.ElementFactory;
import org.lcsim.util.xml.JDOMExpressionFactory;
@@ -26,7 +26,7 @@
* org.lcsim.geometry.GeometryReader class, which extends this.
*
* @author tonyj
- * @version $Id: CompactReader.java,v 1.32 2007/03/15 22:49:35 jeremy Exp $
+ * @version $Id: CompactReader.java,v 1.33 2007/04/09 19:32:22 jeremy Exp $
*
*/
public class CompactReader
@@ -263,8 +263,8 @@
public static void registerCLHEPConstants(JDOMExpressionFactory f)
{
- SystemOfUnitsMap units = new SystemOfUnitsMap();
- for (Entry<String,Double> unit : units.entrySet())
+ Constants constants = Constants.getInstance();
+ for (Entry<String,Double> unit : constants.entrySet())
{
//System.out.println("adding constant " + unit.getKey() + "=" +unit.getValue());
f.addConstant(unit.getKey(),unit.getValue());