lcsim/sandbox/RobKutschke/TRFTests/v1

diff -u -r1.3 -r1.4
--- RKSurf.java	18 Sep 2007 16:33:19 -0000	1.3
+++ RKSurf.java	11 Oct 2007 14:52:08 -0000	1.4
@@ -36,9 +36,9 @@

  *
  *
  *@author $Author: kutschke $

- *@version $Id: RKSurf.java,v 1.3 2007/09/18 16:33:19 kutschke Exp $

+ *@version $Id: RKSurf.java,v 1.4 2007/10/11 14:52:08 kutschke Exp $

  *

- * Date $Date: 2007/09/18 16:33:19 $

+ * Date $Date: 2007/10/11 14:52:08 $

  *
  */
 

@@ -91,6 +91,9 @@

     // Thickness in units of radiation length.
     public double thick_radl = 0.;
 

+    // Density.
+    public double density = 0.0;
+

     // Tolerance for comparing floating point numbers.
     private double tolerance = 1.e-4;
 

@@ -251,7 +254,7 @@

 
     public void Print(){
 	if ( type == type_tube ){

-	    System.out.printf ( "%-40s %1d %3d %10.2f %10.2f %10.2f %10.2f %-20s %10.2f %10.6f\n",

+	    System.out.printf ( "%-40s %1d %3d %10.2f %10.2f %10.2f %10.2f %-20s %10.2f %10.6f %10.6f\n",

 				name,
 				rodim, 
 				ixy,

@@ -261,10 +264,11 @@

 				zmax,
 				matname,
 				radl,

-				thick_radl

+				thick_radl,
+				density

 				);
 	} else {

-	    System.out.printf ( "%-40s %1d %3d %10.2f %10.2f %10.2f %10.2f %-20s %10.2f %10.6f\n",

+	    System.out.printf ( "%-40s %1d %3d %10.2f %10.2f %10.2f %10.2f %-20s %10.2f %10.6f %10.6f\n",

 				name,
 				rodim, 
 				ixy,

@@ -274,7 +278,8 @@

 				rmax,
 				matname,
 				radl,

-				thick_radl

+				thick_radl,
+				density

 				);
 	}
     }

@@ -335,7 +340,8 @@

 	    System.exit(-1);
 	}
 	matname = mat.getName();

-	radl = mat.getRadiationLength();

+	radl    = mat.getRadiationLength();
+	density = mat.getDensity();

 
 	thick_radl = thick/radl;
 

@@ -372,6 +378,7 @@

 	material = pc.getMaterial();
 
 	radl = material.getRadiationLength();

+	density = material.getDensity();

 
     }