diff -u -r1.3 -r1.4
--- LayerSlice.java	21 Jun 2005 04:12:48 -0000	1.3
+++ LayerSlice.java	1 Jul 2005 00:14:06 -0000	1.4
@@ -6,6 +6,9 @@

 
 package org.lcsim.geometry.layer;
 

+import org.lcsim.material.Material;
+import org.lcsim.material.MaterialManager;
+

 /**
  *
  * @author jeremym

@@ -14,26 +17,44 @@

 {
     
     private boolean sensitive;

-    private String materialName;

+    private Material material;

     private double thickness;
     
     public LayerSlice()
     {

-        materialName = null;

+        material = null;

         thickness = 0.0;
         sensitive = false;
     }
     

-    public LayerSlice(String m, double w, boolean sens)

+    public LayerSlice(Material m, double w, boolean sens)

     {

-        materialName = m;

+        material = m;

         thickness = w;
         sensitive = sens;
     }
     

-    public String getMaterialName()

+    public LayerSlice(String matName, double w, boolean sens)
+    {    
+        Material material = MaterialManager.getMaterial( matName );
+        
+        if ( material == null )
+        {
+            throw new RuntimeException("LayerSlice ctor - material not found: " + matName);
+        }
+        
+        if ( material == null ) 
+        {
+           System.out.println("LayerSlice ctor - material not found: " + matName);           
+        }
+        
+        thickness = w;
+        sensitive = sens;
+    }
+    
+    public Material getMaterial()

     {

-        return materialName;

+        return material;

     }
     
     public double getThickness()

@@ -46,9 +67,9 @@

         return sensitive;
     }
     

-    public void setMaterialName(String m)

+    public void setMaterial(Material m)

     {

-        materialName = m;

+        material = m;

     }
     
     public void setThickness(double t)