Commit in GeomConverter/src/org/lcsim/material on MAIN
Material.java+11.8 -> 1.9
MaterialCalculator.java+2-21.1 -> 1.2
MaterialElement.java+4-31.5 -> 1.6
+7-5
3 modified files
RL looks in the ballpark compared with Geant4.  NIL still needs check.
GeomConverter/src/org/lcsim/material
Material.java 1.8 -> 1.9
diff -u -r1.8 -r1.9
--- Material.java	1 Jul 2005 22:36:00 -0000	1.8
+++ Material.java	1 Jul 2005 22:54:07 -0000	1.9
@@ -402,6 +402,7 @@

         return rlinv;
     }
     

+    /* These are from Geant4 and kind of overkill for us right now.*/

     /*
     public void computeNAtomsPerVolume()
     {
GeomConverter/src/org/lcsim/material
MaterialCalculator.java 1.1 -> 1.2
diff -u -r1.1 -r1.2
--- MaterialCalculator.java	1 Jul 2005 22:36:00 -0000	1.1
+++ MaterialCalculator.java	1 Jul 2005 22:54:07 -0000	1.2
@@ -71,8 +71,8 @@

     }    
     
     public static double computeNuclearInteractionLengthEstimate(double A)

-    {
-        return ( 35.0 * pow(A, (1/3)) );

+    {        
+        return ( Material.LAMBDA0 * pow(A, 0.33333));

     }
     
     public static double computeRadiationLengthEstimate(double A, double Z)
GeomConverter/src/org/lcsim/material
MaterialElement.java 1.5 -> 1.6
diff -u -r1.5 -r1.6
--- MaterialElement.java	1 Jul 2005 22:36:00 -0000	1.5
+++ MaterialElement.java	1 Jul 2005 22:54:07 -0000	1.6
@@ -159,8 +159,9 @@

     
     public String toString()
     {

-        return "Element=" + name() + "; Z=" + _Z + "; A=" + _A + "; N=" + _N + "; density=" + _density + "\n"
-                + "MP=" + _meltingPoint + "; BP=" + _boilingPoint + "; IonPoten=" + _ionizationPotential + "\n"
-                + "coulomb=" + _coulombCorrection + "; tsai=" + _tsai;                

+        return "Element=" + name() + "; Z=" + _Z + "; A=" + _A + "; N=" + _N + "; density=" + _density + "\n" +
+                "MP=" + _meltingPoint + "; BP=" + _boilingPoint + "; IonPoten=" + _ionizationPotential + "\n" +
+                "NILest=" + _nuclearInteractionLength + "; RLest=" + _radiationLength + "; coulomb=" + _coulombCorrection 
+                + "; tsai=" + _tsai;                

     }
 }

\ No newline at end of file
CVSspam 0.2.8