Print

Print


Commit in GeomConverter/src/org/lcsim/material on MAIN
MaterialCalculator.java+3-51.12 -> 1.13
JM: Change M_e and r_e back to static vars.

GeomConverter/src/org/lcsim/material
MaterialCalculator.java 1.12 -> 1.13
diff -u -r1.12 -r1.13
--- MaterialCalculator.java	21 Jan 2006 19:27:50 -0000	1.12
+++ MaterialCalculator.java	21 Jan 2006 23:44:03 -0000	1.13
@@ -103,14 +103,14 @@
     /* Avogadro's number */
     public static final double N_A = 6.0221415e23;
     
-    /* classical electron radius in centimeters */
-    public static final double r_e = 2.817940325e-13;
+    /* classical electron radius in cm */
+    public static final double r_e = 2.81794032528e-13;
     
     //public static final double clight = 2.99792458e08; // m/s
     
     /*
      * @param material org.lcsim.material.Material to be used for A, Z, density, etc.
-     * @param pT particle momentum -CarolineMilstene- !!! UNITS!!! we use GeV, it should be in MeV
+     * @param p particle momentum -CarolineMilstene- !!! UNITS!!! we use GeV, it should be in MeV
      * @param mass particle mass (MeV/c)
      * @param charge particle charge
      * @param distance path length in cm to scale the dEdx result
@@ -123,8 +123,6 @@
         double zeff   = material.getZeff();
         double aeff   = material.getAeff();
         double ZoverA = zeff / aeff;
-	double M_e    = 0.510998918 ;// in (MeV) -CarolineMilstene (Ja nuary 06)-Jeremy I did not find it elswhere !!!
-	double r_e    = 2.81794032528E-13; // in (cm) - CarolinneMilstene (January 06)
 	        
         /* K matches PDG, pg. 238 --> 0.307075 in MeV g-1 cm2 */
         double K = ( (4*PI) * N_A * (r_e * r_e) * M_e );  
CVSspam 0.2.8