Print

Print


Commit in GeomConverter/src/org/lcsim/units/clhep on MAIN
PhysicalConstants.java+33-331.3 -> 1.4
SystemOfUnits.java+127-1271.1 -> 1.2
+160-160
2 modified files
JM: Normalize variable modifiers to 'public static final'.

GeomConverter/src/org/lcsim/units/clhep
PhysicalConstants.java 1.3 -> 1.4
diff -u -r1.3 -r1.4
--- PhysicalConstants.java	23 Feb 2007 02:43:30 -0000	1.3
+++ PhysicalConstants.java	23 Feb 2007 02:48:48 -0000	1.4
@@ -1,4 +1,4 @@
-//$Id: PhysicalConstants.java,v 1.3 2007/02/23 02:43:30 jeremy Exp $
+//$Id: PhysicalConstants.java,v 1.4 2007/02/23 02:48:48 jeremy Exp $
 package org.lcsim.units.clhep;
 
 import static org.lcsim.units.clhep.SystemOfUnits.MeV;
@@ -18,86 +18,86 @@
  * containing common physical constants from the PDG guide.
  * 
  * @author Jeremy McCormick <[log in to unmask]>
- * @version $Id: PhysicalConstants.java,v 1.3 2007/02/23 02:43:30 jeremy Exp $
+ * @version $Id: PhysicalConstants.java,v 1.4 2007/02/23 02:48:48 jeremy Exp $
  */
 
 public final class PhysicalConstants 
 {
-	public static double     pi  = 3.14159265358979323846;
-	public static double  twopi  = 2*pi;
-	public static double halfpi  = pi/2;
-	public static double     pi2 = pi*pi;
+	public static final double     pi  = 3.14159265358979323846;
+	public static final double  twopi  = 2*pi;
+	public static final double halfpi  = pi/2;
+	public static final double     pi2 = pi*pi;
 
 	//
 	//
 	//
-	public static double Avogadro = 6.0221367e+23/mole;
+	public static final double Avogadro = 6.0221367e+23/mole;
 
 	//
 	//	 c   = 299.792458 mm/ns
 	//	c^2 = 898.7404 (mm/ns)^2
 	//
-	public static double c_light   = 2.99792458e+8 * m/s;
-	public static double c_squared = c_light * c_light;
+	public static final double c_light   = 2.99792458e+8 * m/s;
+	public static final double c_squared = c_light * c_light;
 
 	//
 	//	h     = 4.13566e-12 MeV*ns
 	//	hbar  = 6.58212e-13 MeV*ns
 	//	hbarc = 197.32705e-12 MeV*mm
 	//
-	public static double h_Planck      = 6.6260755e-34 * joule*s;
-	public static double hbar_Planck   = h_Planck/twopi;
-	public static double hbarc         = hbar_Planck * c_light;
-	public static double hbarc_squared = hbarc * hbarc;
+	public static final double h_Planck      = 6.6260755e-34 * joule*s;
+	public static final double hbar_Planck   = h_Planck/twopi;
+	public static final double hbarc         = hbar_Planck * c_light;
+	public static final double hbarc_squared = hbarc * hbarc;
 
 	//
 	//
 	//
-	public static double electron_charge = - eplus; // see SystemOfUnits.h
-	public static double e_squared = eplus * eplus;
+	public static final double electron_charge = - eplus; // see SystemOfUnits.h
+	public static final double e_squared = eplus * eplus;
 
 	//
 	//	 amu_c2 - atomic equivalent mass unit
 	//	 amu    - atomic mass unit
 	//
-	public static double electron_mass_c2 = 0.51099906 * MeV;
-	public static double   proton_mass_c2 = 938.27231 * MeV;
-	public static double  neutron_mass_c2 = 939.56563 * MeV;
-	public static double           amu_c2 = 931.49432 * MeV;
-	public static double              amu = amu_c2/c_squared;
+	public static final double electron_mass_c2 = 0.51099906 * MeV;
+	public static final double   proton_mass_c2 = 938.27231 * MeV;
+	public static final double  neutron_mass_c2 = 939.56563 * MeV;
+	public static final double           amu_c2 = 931.49432 * MeV;
+	public static final double              amu = amu_c2/c_squared;
 
 	//
 	//	 permeability of free space mu0    = 2.01334e-16 Mev*(ns*eplus)^2/mm
 	//	 permittivity of free space epsil0 = 5.52636e+10 eplus^2/(MeV*mm)
 	//
-	public static double mu0      = 4*pi*1.e-7 * henry/m;
-	public static double epsilon0 = 1./(c_squared*mu0);
+	public static final double mu0      = 4*pi*1.e-7 * henry/m;
+	public static final double epsilon0 = 1./(c_squared*mu0);
 
 	//
 	//	 electromagnetic coupling = 1.43996e-12 MeV*mm/(eplus^2)
 	//
-	public static double elm_coupling           = e_squared/(4*pi*epsilon0);
-	public static double fine_structure_const   = elm_coupling/hbarc;
-	public static double classic_electr_radius  = elm_coupling/electron_mass_c2;
-	public static double electron_Compton_length = hbarc/electron_mass_c2;
-	public static double Bohr_radius = electron_Compton_length/fine_structure_const;
+	public static final double elm_coupling           = e_squared/(4*pi*epsilon0);
+	public static final double fine_structure_const   = elm_coupling/hbarc;
+	public static final double classic_electr_radius  = elm_coupling/electron_mass_c2;
+	public static final double electron_Compton_length = hbarc/electron_mass_c2;
+	public static final double Bohr_radius = electron_Compton_length/fine_structure_const;
 
-	public static double alpha_rcl2 = fine_structure_const
+	public static final double alpha_rcl2 = fine_structure_const
 	*classic_electr_radius
 	*classic_electr_radius;
 
-	public static double twopi_mc2_rcl2 = twopi*electron_mass_c2
+	public static final double twopi_mc2_rcl2 = twopi*electron_mass_c2
 	*classic_electr_radius
 	*classic_electr_radius;
 	//
 	//
 	//
-	public static double k_Boltzmann = 8.617385e-11 * MeV/kelvin;
+	public static final double k_Boltzmann = 8.617385e-11 * MeV/kelvin;
 
 	//
 	//
 	//
-	public static double STP_Temperature = 273.15*kelvin;
-	public static double STP_Pressure    = 1.*atmosphere;
-	public static double kGasThreshold   = 10.*mg/cm3;
+	public static final double STP_Temperature = 273.15*kelvin;
+	public static final double STP_Pressure    = 1.*atmosphere;
+	public static final double kGasThreshold   = 10.*mg/cm3;
 }

GeomConverter/src/org/lcsim/units/clhep
SystemOfUnits.java 1.1 -> 1.2
diff -u -r1.1 -r1.2
--- SystemOfUnits.java	23 Feb 2007 02:36:32 -0000	1.1
+++ SystemOfUnits.java	23 Feb 2007 02:48:48 -0000	1.2
@@ -1,4 +1,4 @@
-// $Id: SystemOfUnits.java,v 1.1 2007/02/23 02:36:32 jeremy Exp $
+// $Id: SystemOfUnits.java,v 1.2 2007/02/23 02:48:48 jeremy Exp $
 package org.lcsim.units.clhep;
 
 /**
@@ -7,243 +7,243 @@
  * time, electric charge, mass, etc.
  * 
  * @author Jeremy McCormick <[log in to unmask]>
- * @version $Id: SystemOfUnits.java,v 1.1 2007/02/23 02:36:32 jeremy Exp $
+ * @version $Id: SystemOfUnits.java,v 1.2 2007/02/23 02:48:48 jeremy Exp $
  */
 public final class SystemOfUnits 
 {	
 	//
 	// Length [L]
 	//
-	static public final double millimeter  = 1.;
-	static public final double millimeter2 = millimeter*millimeter;
-	static public final double millimeter3 = millimeter*millimeter*millimeter;
-
-	static public final double centimeter  = 10.*millimeter;
-	static public final double centimeter2 = centimeter*centimeter;
-	static public final double centimeter3 = centimeter*centimeter*centimeter;
-
-	static public final double meter  = 1000.*millimeter;
-	static public final double meter2 = meter*meter;
-	static public final double meter3 = meter*meter*meter;
-
-	static public final double kilometer = 1000.*meter;
-	static public final double kilometer2 = kilometer*kilometer;
-	static public final double kilometer3 = kilometer*kilometer*kilometer;
-
-	static public final double parsec = 3.0856775807e+16*meter;
-
-	static public final double micrometer = 1.e-6 *meter;
-	static public final double  nanometer = 1.e-9 *meter;
-	static public final double  angstrom  = 1.e-10*meter;
-	static public final double  fermi     = 1.e-15*meter;
-
-	static public final double      barn = 1.e-28*meter2;
-	static public final double millibarn = 1.e-3 *barn;
-	static public final double microbarn = 1.e-6 *barn;
-	static public final double  nanobarn = 1.e-9 *barn;
-	static public final double  picobarn = 1.e-12*barn;
+	public static final double millimeter  = 1.;
+	public static final double millimeter2 = millimeter*millimeter;
+	public static final double millimeter3 = millimeter*millimeter*millimeter;
+
+	public static final double centimeter  = 10.*millimeter;
+	public static final double centimeter2 = centimeter*centimeter;
+	public static final double centimeter3 = centimeter*centimeter*centimeter;
+
+	public static final double meter  = 1000.*millimeter;
+	public static final double meter2 = meter*meter;
+	public static final double meter3 = meter*meter*meter;
+
+	public static final double kilometer = 1000.*meter;
+	public static final double kilometer2 = kilometer*kilometer;
+	public static final double kilometer3 = kilometer*kilometer*kilometer;
+
+	public static final double parsec = 3.0856775807e+16*meter;
+
+	public static final double micrometer = 1.e-6 *meter;
+	public static final double  nanometer = 1.e-9 *meter;
+	public static final double  angstrom  = 1.e-10*meter;
+	public static final double  fermi     = 1.e-15*meter;
+
+	public static final double      barn = 1.e-28*meter2;
+	public static final double millibarn = 1.e-3 *barn;
+	public static final double microbarn = 1.e-6 *barn;
+	public static final double  nanobarn = 1.e-9 *barn;
+	public static final double  picobarn = 1.e-12*barn;
 
 	// symbols
-	static public final double nm  = nanometer;
-	static public final double um  = micrometer;
+	public static final double nm  = nanometer;
+	public static final double um  = micrometer;
 
-	static public final double mm  = millimeter;
-	static public final double mm2 = millimeter2;
-	static public final double mm3 = millimeter3;
-
-	static public final double cm  = centimeter;
-	static public final double cm2 = centimeter2;
-	static public final double cm3 = centimeter3;
-
-	static public final double m  = meter;
-	static public final double m2 = meter2;
-	static public final double m3 = meter3;
-
-	static public final double km  = kilometer;
-	static public final double km2 = kilometer2;
-	static public final double km3 = kilometer3;
+	public static final double mm  = millimeter;
+	public static final double mm2 = millimeter2;
+	public static final double mm3 = millimeter3;
+
+	public static final double cm  = centimeter;
+	public static final double cm2 = centimeter2;
+	public static final double cm3 = centimeter3;
+
+	public static final double m  = meter;
+	public static final double m2 = meter2;
+	public static final double m3 = meter3;
+
+	public static final double km  = kilometer;
+	public static final double km2 = kilometer2;
+	public static final double km3 = kilometer3;
 
-	static public final double pc = parsec;
+	public static final double pc = parsec;
 
 	//
 	// Angle
 	//
-	static public final double radian      = 1.;
-	static public final double milliradian = 1.e-3*radian;
-	static public final double degree = (3.14159265358979323846/180.0)*radian;
+	public static final double radian      = 1.;
+	public static final double milliradian = 1.e-3*radian;
+	public static final double degree = (3.14159265358979323846/180.0)*radian;
 
-	static public final double   steradian = 1.;
+	public static final double   steradian = 1.;
 
 	// symbols
-	static public final double rad  = radian;
-	static public final double mrad = milliradian;
-	static public final double sr   = steradian;
-	static public final double deg  = degree;
+	public static final double rad  = radian;
+	public static final double mrad = milliradian;
+	public static final double sr   = steradian;
+	public static final double deg  = degree;
 
 	//
 	// Time [T]
 	//
-	static public final double nanosecond  = 1.;
-	static public final double second      = 1.e+9 *nanosecond;
-	static public final double millisecond = 1.e-3 *second;
-	static public final double microsecond = 1.e-6 *second;
-	static public final double  picosecond = 1.e-12*second;
-
-	static public final double hertz = 1./second;
-	static public final double kilohertz = 1.e+3*hertz;
-	static public final double megahertz = 1.e+6*hertz;
+	public static final double nanosecond  = 1.;
+	public static final double second      = 1.e+9 *nanosecond;
+	public static final double millisecond = 1.e-3 *second;
+	public static final double microsecond = 1.e-6 *second;
+	public static final double  picosecond = 1.e-12*second;
+
+	public static final double hertz = 1./second;
+	public static final double kilohertz = 1.e+3*hertz;
+	public static final double megahertz = 1.e+6*hertz;
 
 	// symbols
-	static public final double ns = nanosecond;
-	static public final double  s = second;
-	static public final double ms = millisecond;
+	public static final double ns = nanosecond;
+	public static final double  s = second;
+	public static final double ms = millisecond;
 
 	//
 	// Electric charge [Q]
 	//
-	static public final double eplus = 1. ;// positron charge
-	static public final double e_SI  = 1.60217733e-19;// positron charge in coulomb
-	static public final double coulomb = eplus/e_SI;// coulomb = 6.24150 e+18 * eplus
+	public static final double eplus = 1. ;// positron charge
+	public static final double e_SI  = 1.60217733e-19;// positron charge in coulomb
+	public static final double coulomb = eplus/e_SI;// coulomb = 6.24150 e+18 * eplus
 
 	//
 	// Energy [E]
 	//
-	static public final double megaelectronvolt = 1. ;
-	static public final double     electronvolt = 1.e-6*megaelectronvolt;
-	static public final double kiloelectronvolt = 1.e-3*megaelectronvolt;
-	static public final double gigaelectronvolt = 1.e+3*megaelectronvolt;
-	static public final double teraelectronvolt = 1.e+6*megaelectronvolt;
-	static public final double petaelectronvolt = 1.e+9*megaelectronvolt;
+	public static final double megaelectronvolt = 1. ;
+	public static final double     electronvolt = 1.e-6*megaelectronvolt;
+	public static final double kiloelectronvolt = 1.e-3*megaelectronvolt;
+	public static final double gigaelectronvolt = 1.e+3*megaelectronvolt;
+	public static final double teraelectronvolt = 1.e+6*megaelectronvolt;
+	public static final double petaelectronvolt = 1.e+9*megaelectronvolt;
 
-	static public final double joule = electronvolt/e_SI;// joule = 6.24150 e+12 * MeV
+	public static final double joule = electronvolt/e_SI;// joule = 6.24150 e+12 * MeV
 
 	// symbols
-	static public final double MeV = megaelectronvolt;
-	static public final double  eV = electronvolt;
-	static public final double keV = kiloelectronvolt;
-	static public final double GeV = gigaelectronvolt;
-	static public final double TeV = teraelectronvolt;
-	static public final double PeV = petaelectronvolt;
+	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;
 
 	//
 	// Mass [E][T^2][L^-2]
 	//
-	static public final double  kilogram = joule*second*second/(meter*meter);
-	static public final double      gram = 1.e-3*kilogram;
-	static public final double milligram = 1.e-3*gram;
+	public static final double  kilogram = joule*second*second/(meter*meter);
+	public static final double      gram = 1.e-3*kilogram;
+	public static final double milligram = 1.e-3*gram;
 
 	// symbols
-	static public final double  kg = kilogram;
-	static public final double   g = gram;
-	static public final double  mg = milligram;
+	public static final double  kg = kilogram;
+	public static final double   g = gram;
+	public static final double  mg = milligram;
 
 	//
 	// Power [E][T^-1]
 	//
-	static public final double watt = joule/second;// watt = 6.24150 e+3 * MeV/ns
+	public static final double watt = joule/second;// watt = 6.24150 e+3 * MeV/ns
 
 	//
 	// Force [E][L^-1]
 	//
-	static public final double newton = joule/meter;// newton = 6.24150 e+9 * MeV/mm
+	public static final double newton = joule/meter;// newton = 6.24150 e+9 * MeV/mm
 
 	//
 	// Pressure [E][L^-3]
 	//
-	static public final double pascal = newton/m2;   // pascal = 6.24150 e+3 * MeV/mm3
-	static public final double bar        = 100000*pascal; // bar    = 6.24150 e+8 * MeV/mm3
-	static public final double atmosphere = 101325*pascal; // atm    = 6.32420 e+8 * MeV/mm3
+	public static final double pascal = newton/m2;   // pascal = 6.24150 e+3 * MeV/mm3
+	public static final double bar        = 100000*pascal; // bar    = 6.24150 e+8 * MeV/mm3
+	public static final double atmosphere = 101325*pascal; // atm    = 6.32420 e+8 * MeV/mm3
 
 	//
 	// Electric current [Q][T^-1]
 	//
-	static public final double      ampere = coulomb/second; // ampere = 6.24150 e+9 * eplus/ns
-	static public final double milliampere = 1.e-3*ampere;
-	static public final double microampere = 1.e-6*ampere;
-	static public final double  nanoampere = 1.e-9*ampere;
+	public static final double      ampere = coulomb/second; // ampere = 6.24150 e+9 * eplus/ns
+	public static final double milliampere = 1.e-3*ampere;
+	public static final double microampere = 1.e-6*ampere;
+	public static final double  nanoampere = 1.e-9*ampere;
 
 	//
 	// Electric potential [E][Q^-1]
 	//
-	static public final double megavolt = megaelectronvolt/eplus;
-	static public final double kilovolt = 1.e-3*megavolt;
-	static public final double     volt = 1.e-6*megavolt;
+	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]
 	//
-	static public final double ohm = volt/ampere;// ohm = 1.60217e-16*(MeV/eplus)/(eplus/ns)
+	public static final double ohm = volt/ampere;// ohm = 1.60217e-16*(MeV/eplus)/(eplus/ns)
 
 	//
 	// Electric capacitance [Q^2][E^-1]
 	//
-	static public final double farad = coulomb/volt;// farad = 6.24150e+24 * eplus/Megavolt
-	static public final double millifarad = 1.e-3*farad;
-	static public final double microfarad = 1.e-6*farad;
-	static public final double  nanofarad = 1.e-9*farad;
-	static public final double  picofarad = 1.e-12*farad;
+	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]
 	//
-	static public final double weber = volt*second;// weber = 1000*megavolt*ns
+	public static final double weber = volt*second;// weber = 1000*megavolt*ns
 
 	//
 	// Magnetic Field [T][E][Q^-1][L^-2]
 	//
-	static public final double tesla     = volt*second/meter2;// tesla =0.001*megavolt*ns/mm2
+	public static final double tesla     = volt*second/meter2;// tesla =0.001*megavolt*ns/mm2
 
-	static public final double gauss     = 1.e-4*tesla;
-	static public final double kilogauss = 1.e-1*tesla;
+	public static final double gauss     = 1.e-4*tesla;
+	public static final double kilogauss = 1.e-1*tesla;
 
 	//
 	// Inductance [T^2][E][Q^-2]
 	//
-	static public final double henry = weber/ampere;// henry = 1.60217e-7*MeV*(ns/eplus)**2
+	public static final double henry = weber/ampere;// henry = 1.60217e-7*MeV*(ns/eplus)**2
 
 	//
 	// Temperature
 	//
-	static public final double kelvin = 1.;
+	public static final double kelvin = 1.;
 
 	//
 	// Amount of substance
 	//
-	static public final double mole = 1.;
+	public static final double mole = 1.;
 
 	//
 	// Activity [T^-1]
 	//
-	static public final double becquerel = 1./second ;
-	static public final double curie = 3.7e+10 * becquerel;
+	public static final double becquerel = 1./second ;
+	public static final double curie = 3.7e+10 * becquerel;
 
 	//
 	// Absorbed dose [L^2][T^-2]
 	//
-	static public final double      gray = joule/kilogram ;
-	static public final double  kilogray = 1.e+3*gray;
-	static public final double milligray = 1.e-3*gray;
-	static public final double microgray = 1.e-6*gray;
+	public static final double      gray = joule/kilogram ;
+	public static final double  kilogray = 1.e+3*gray;
+	public static final double milligray = 1.e-3*gray;
+	public static final double microgray = 1.e-6*gray;
 
 	//
 	// Luminous intensity [I]
 	//
-	static public final double candela = 1.;
+	public static final double candela = 1.;
 
 	//
 	// Luminous flux [I]
 	//
-	static public final double lumen = candela*steradian;
+	public static final double lumen = candela*steradian;
 
 	//
 	// Illuminance [I][L^-2]
 	//
-	static public final double lux = lumen/meter2;
+	public static final double lux = lumen/meter2;
 
 	//
 	// Miscellaneous
 	//
-	static public final double perCent     = 0.01 ;
-	static public final double perThousand = 0.001;
-	static public final double perMillion  = 0.000001;
+	public static final double perCent     = 0.01 ;
+	public static final double perThousand = 0.001;
+	public static final double perMillion  = 0.000001;
 }
\ No newline at end of file
CVSspam 0.2.8