lcsim/src/org/lcsim/contrib/onoprien/tracking/hit

diff -u -r1.2 -r1.3
--- TrackerCluster.java	31 May 2007 09:38:54 -0000	1.2
+++ TrackerCluster.java	31 May 2007 09:47:43 -0000	1.3
@@ -2,7 +2,7 @@

 
 import java.util.List;
 

-import org.lcsim.contrib.onoprien.tracking.track.OldTrackPoint;

+import org.lcsim.contrib.onoprien.tracking.track.TrackPoint;

 import org.lcsim.contrib.onoprien.tracking.geom.Sensor;
 
 /**

@@ -12,7 +12,7 @@

  * contribute to one cluster.
  *
  * @author D. Onoprienko

- * @version $Id: TrackerCluster.java,v 1.2 2007/05/31 09:38:54 onoprien Exp $

+ * @version $Id: TrackerCluster.java,v 1.3 2007/05/31 09:47:43 onoprien Exp $

  */
 public interface TrackerCluster extends TrackerClusterData {
   

@@ -34,7 +34,7 @@

    *
    * @param trackPoint Trajectory to be used in producing the hit. Can be <tt>null</tt>. 
    */

-  public TrackerHit makeTrackerHit(OldTrackPoint trackPoint);

+  public TrackerHit makeTrackerHit(TrackPoint trackPoint);

   
   /**
    * Updates an existing <tt>TrackerHit</tt> without using any trajectory information.

@@ -51,6 +51,6 @@

    * @param hit        TrackerHit previously produced from this cluster that needs to 
    *                   be updated using the trajectory information. Can be <tt>null</tt>.
    */

-  public TrackerHit makeTrackerHit(OldTrackPoint trackPoint, TrackerHit hit);

+  public TrackerHit makeTrackerHit(TrackPoint trackPoint, TrackerHit hit);

   
 }

lcsim/src/org/lcsim/contrib/onoprien/tracking/hit

diff -u -r1.2 -r1.3
--- TrackerHitMaker.java	31 May 2007 09:38:55 -0000	1.2
+++ TrackerHitMaker.java	31 May 2007 09:47:43 -0000	1.3
@@ -1,11 +1,11 @@

 package org.lcsim.contrib.onoprien.tracking.hit;
 

-import org.lcsim.contrib.onoprien.tracking.track.OldTrackPoint;

+import org.lcsim.contrib.onoprien.tracking.track.TrackPoint;

 
 /**
  *
  * @author D.Onoprienko

- * @version $Id: TrackerHitMaker.java,v 1.2 2007/05/31 09:38:55 onoprien Exp $

+ * @version $Id: TrackerHitMaker.java,v 1.3 2007/05/31 09:47:43 onoprien Exp $

  */
 public interface TrackerHitMaker {
   

@@ -17,6 +17,6 @@

    * @param hit     TrackerHit previously produced from this cluster that needs to 
    *                be updated using the trajectory information. Can be <tt>null</tt>.
    */

-  public TrackerHit makeTrackerHit(TrackerClusterData cluster, OldTrackPoint trackPoint, TrackerHit hit);

+  public TrackerHit makeTrackerHit(TrackerClusterData cluster, TrackPoint trackPoint, TrackerHit hit);

   
 }

lcsim/src/org/lcsim/contrib/onoprien/tracking/hit/base

diff -u -r1.2 -r1.3
--- TrackerClusterBasic.java	31 May 2007 09:38:55 -0000	1.2
+++ TrackerClusterBasic.java	31 May 2007 09:47:43 -0000	1.3
@@ -9,12 +9,12 @@

 import org.lcsim.contrib.onoprien.tracking.hit.DigiTrackerHit;
 import org.lcsim.contrib.onoprien.tracking.hit.TrackerHitMaker;
 import org.lcsim.contrib.onoprien.tracking.geom.Sensor;

-import org.lcsim.contrib.onoprien.tracking.track.OldTrackPoint;

+import org.lcsim.contrib.onoprien.tracking.track.TrackPoint;

 
 /**
  *
  * @author D.Onoprienko

- * @version $Id: TrackerClusterBasic.java,v 1.2 2007/05/31 09:38:55 onoprien Exp $

+ * @version $Id: TrackerClusterBasic.java,v 1.3 2007/05/31 09:47:43 onoprien Exp $

  */
 public class TrackerClusterBasic implements TrackerCluster {
   

@@ -60,7 +60,7 @@

    *
    * @param trackPoint Trajectory to be used in producing the hit. Can be <tt>null</tt>. 
    */

-  public TrackerHit makeTrackerHit(OldTrackPoint trackPoint) {return makeTrackerHit(trackPoint, null);}

+  public TrackerHit makeTrackerHit(TrackPoint trackPoint) {return makeTrackerHit(trackPoint, null);}

   
   /**
    * Updates an existing <tt>TrackerHit</tt> without using any trajectory information.

@@ -77,7 +77,7 @@

    * @param hit        TrackerHit previously produced from this cluster that needs to 
    *                   be updated using the trajectory information. Can be <tt>null</tt>.
    */

-  public TrackerHit makeTrackerHit(OldTrackPoint trackPoint, TrackerHit hit) {

+  public TrackerHit makeTrackerHit(TrackPoint trackPoint, TrackerHit hit) {

     TrackerHit newHit = _hitMaker.makeTrackerHit(this, trackPoint, hit);
     if (hit == null) {
       _hitList.add(newHit);