GeomConverter/src/org/lcsim/material

diff -u -r1.9 -r1.10
--- MaterialCalculator.java	18 Jan 2006 23:24:37 -0000	1.9
+++ MaterialCalculator.java	21 Jan 2006 18:24:45 -0000	1.10
@@ -110,29 +110,37 @@

     
     /*
      * @param material org.lcsim.material.Material to be used for A, Z, density, etc.

-     * @param pT particle momentum

+     * @param pT 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
      * @return computed dEdx (MeV/cm) 
      */

-    public static double computeBetheBloch(Material material, double[] pT, double mass, double charge, double distance)

+    public static double computeBetheBloch(Material material, double[] p, double mass, double charge, double distance)

     {

-        assert( pT.length == 3);

+        assert( p.length == 3);

-        double zeff = material.getZeff();
-        double aeff = material.getAeff();

+        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-08 // 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 );         
                 
         double z2 = charge * charge;

+	/* CarolineMilstene- Convert p(GeV) used in the package to p(MeV) for Bethe-Block Calculations */
+	double [] pmev= new double[3]
+	for(int i=0;i<3;i++)
+	{
+	 pmev[i]=p[i]*1e+3   
+	}

         
         double mag2 =

-                pT[0] * pT[0] +
-                pT[1] * pT[1] +
-                pT[2] * pT[2];

+                pmev[0] * pmev[0] +
+                pmev[1] * pmev[1] +
+                pmev[2] * pmev[2];

         
         double beta2 =
                 mag2 / (mass * mass + mag2);

@@ -317,4 +325,4 @@

 //public static final double[] COULOMB_CORRECTIONS = { 0.0083, 0.20206, 0.0020, 0.0369 };
 /* Tsai constants from G4Element::ComputeLradTsaiFactor() via Phys Rev. D50 3-1 (1994) page 1254 */
 //public static final double[] TSAI_LRAD_LIGHT = { 5.31, 4.79, 4.74, 4.71 };

-//public static final double[] TSAI_LPRAD_LIGHT = { 6.144, 5.621, 5.805, 5.924 };

\ No newline at end of file

+//public static final double[] TSAI_LPRAD_LIGHT = { 6.144, 5.621, 5.805, 5.924 };