lcsim/src/org/lcsim/event

diff -u -r1.6 -r1.7
--- RawTrackerHit.java	3 Jul 2007 23:15:32 -0000	1.6
+++ RawTrackerHit.java	15 May 2008 21:56:39 -0000	1.7
@@ -2,17 +2,17 @@

 
 import java.util.List;
 

-import org.lcsim.detector.IDetectorElementMixin;

+import org.lcsim.detector.HasDetectorElement;

 import org.lcsim.detector.identifier.IIdentifiable;
 
 /**
  * A raw tracker hit, as expected in raw data from a real detector.
  * 
  * @author tonyj

- * @version $Id: RawTrackerHit.java,v 1.6 2007/07/03 23:15:32 jeremy Exp $

+ * @version $Id: RawTrackerHit.java,v 1.7 2008/05/15 21:56:39 jeremy Exp $

  */
 public interface RawTrackerHit

-extends IIdentifiable, IDetectorElementMixin

+extends IIdentifiable, HasDetectorElement

 {
    /**
     *  Returns a time measurement associated with the adc values.

lcsim/src/org/lcsim/event

diff -u -r1.14 -r1.15
--- SimTrackerHit.java	15 May 2008 01:14:00 -0000	1.14
+++ SimTrackerHit.java	15 May 2008 21:56:40 -0000	1.15
@@ -4,14 +4,14 @@

 import org.lcsim.geometry.IDDecoder;
 import org.lcsim.geometry.Subdetector;
 

-import org.lcsim.detector.IDetectorElementMixin;

+import org.lcsim.detector.HasDetectorElement;

 import org.lcsim.detector.identifier.IIdentifiable;
 
 /**

- * @version $Id: SimTrackerHit.java,v 1.14 2008/05/15 01:14:00 jeremy Exp $

+ * @version $Id: SimTrackerHit.java,v 1.15 2008/05/15 21:56:40 jeremy Exp $

  */
 public interface SimTrackerHit

-extends IDetectorElementMixin, IIdentifiable

+extends HasDetectorElement, IIdentifiable

 {
    /** Layer containing hit */
    public int getLayer();