GeomConverter/src/org/lcsim/units

diff -u -r1.1 -r1.2
--- SystemOfUnits.java	26 Aug 2009 23:32:42 -0000	1.1
+++ SystemOfUnits.java	8 Oct 2009 22:12:17 -0000	1.2
@@ -1,6 +1,5 @@

 package org.lcsim.units;
 

-// TODO: Add energy constants.  Need to use GeV=1 (instead of MeV=1 in CLHEP).

 public final class SystemOfUnits 
 {	
 	//

@@ -121,4 +120,62 @@

 	//
 	public static final double becquerel = 1./second ;
 	public static final double curie = 3.7e+10 * becquerel;

+	
+	//
+    // Energy [E]
+    //
+	public static final double gigaelectronvolt = 1.;
+	public static final double megaelectronvolt = 1.e-3*gigaelectronvolt;
+	public static final double kiloelectronvolt = 1.e-6*megaelectronvolt;
+    public static final double     electronvolt = 1.e-9*gigaelectronvolt;            
+    public static final double teraelectronvolt = 1.e+3*gigaelectronvolt;
+    public static final double petaelectronvolt = 1.e+6*gigaelectronvolt;
+    
+    public static final double joule = electronvolt/e_SI;// joule = 6.24150 e+12 * MeV
+    
+    // symbols
+    public static final double MeV = megaelectronvolt;
+    public static final double  eV = electronvolt;
+    public static final double keV = kiloelectronvolt;
+    public static final double GeV = gigaelectronvolt;
+    public static final double TeV = teraelectronvolt;
+    public static final double PeV = petaelectronvolt;
+    
+    //
+    // Electric potential [E][Q^-1]
+    //
+    public static final double megavolt = megaelectronvolt/eplus;
+    public static final double kilovolt = 1.e-3*megavolt;
+    public static final double     volt = 1.e-6*megavolt;
+    
+    //
+    // Electric resistance [E][T][Q^-2]
+    //
+    public static final double ohm = volt/ampere;// ohm = 1.60217e-16*(MeV/eplus)/(eplus/ns)
+
+    //
+    // Electric capacitance [Q^2][E^-1]
+    //
+    public static final double farad = coulomb/volt;// farad = 6.24150e+24 * eplus/Megavolt
+    public static final double millifarad = 1.e-3*farad;
+    public static final double microfarad = 1.e-6*farad;
+    public static final double  nanofarad = 1.e-9*farad;
+    public static final double  picofarad = 1.e-12*farad;
+
+    //
+    // Magnetic Flux [T][E][Q^-1]
+    //
+    public static final double weber = volt*second;// weber = 1000*megavolt*ns
+
+    //
+    // Magnetic Field [T][E][Q^-1][L^-2]
+    //
+    public static final double tesla     = volt*second/meter2;// tesla =0.001*megavolt*ns/mm2
+    public static final double gauss     = 1.e-4*tesla;
+    public static final double kilogauss = 1.e-1*tesla;
+
+    //
+    // Inductance [T^2][E][Q^-2]
+    //
+    public static final double henry = weber/ampere;// henry = 1.60217e-7*MeV*(ns/eplus)**2

 }