Print

Print


Commit in lcsim/src/org/lcsim/util/step on MAIN
DeDx.java+8-61.3 -> 1.4
 CM+GL:Comment setting/adding new materiel 

lcsim/src/org/lcsim/util/step
DeDx.java 1.3 -> 1.4
diff -u -r1.3 -r1.4
--- DeDx.java	2 Nov 2005 00:08:41 -0000	1.3
+++ DeDx.java	6 Dec 2005 16:28:47 -0000	1.4
@@ -7,11 +7,10 @@
 *  This class provides access to min ionising particle energy loss table for different materials.
 *  Its data is copied from PDG "Review of Particle Physics", 1998
 *
+*
 */
-
-
 public class DeDx extends Hashtable
-{
+ {
     public static DeDx instance() { return _me; }
     /**
      *  Initialize table
@@ -20,6 +19,7 @@
       this(64);
       this.put("air",new Double(0.0021871));
       this.put("al",new Double(4.3605));
+      this.put("aluminum",new Double(4.3605));
       this.put("be",new Double(2.94571));
       this.put("carbon",new Double(4.0317));
       this.put("cu",new Double(12.57088));
@@ -31,7 +31,6 @@
       this.put("g10",new Double(3.179));
       this.put("pb",new Double(12.74605));
       this.put("polystyrene",new Double(1.997952));
-      this.put("polystyrenefoam",new Double(.15));
       this.put("si",new Double(3.87712));
       this.put("silicon",new Double(3.87712));
       this.put("w",new Double(22.0985));
@@ -61,6 +60,7 @@
       this.put("silica",new Double(0.36)); // aerogel with density 0.2 g/cm**3
 
       // FIXME: these numbers need to be checked!!
+      this.put("polystyrenefoam",new Double(.15));
       this.put("pyrexglass",new Double(2.276));
       this.put("rpcgasdefault",new Double(0.0021871));
     }
@@ -74,8 +74,10 @@
      * @param material - name of material
      */
     public double getDeDx(String material) {
-	String lkey = material.toLowerCase();
-	return 0.001 * ((Double)this.get(lkey)).doubleValue(); // values stored in units of MeV
+          System.out.println("I am here");
+	  String lkey = material.toLowerCase();
+	  System.out.println(" In getDeDx lkey="+lkey);
+	 return 0.001 * ((Double)this.get(lkey)).doubleValue(); // values stored in units of MeV
     }
 
     private static DeDx _me = new DeDx();
CVSspam 0.2.8