diff -u -r1.27 -r1.28
--- HelicalTrackHitDriver.java	10 Nov 2008 19:46:01 -0000	1.27
+++ HelicalTrackHitDriver.java	6 Dec 2008 21:53:34 -0000	1.28
@@ -20,13 +20,13 @@

 import org.lcsim.contrib.SiStripSim.SiTrackerHit;
 import org.lcsim.contrib.SiStripSim.SiTrackerHitStrip1D;
 import org.lcsim.contrib.SiStripSim.TrackerHitType.CoordinateSystem;

-import org.lcsim.contrib.onoprien.tracking.geom.SegmentationManager;
-import org.lcsim.contrib.onoprien.tracking.geom.Sensor;
-import org.lcsim.contrib.onoprien.tracking.geom.SensorType;
-import org.lcsim.contrib.onoprien.tracking.geom.sensortypes.Cylinder;
-import org.lcsim.contrib.onoprien.tracking.hit.DigiTrackerHit;
-import org.lcsim.contrib.onoprien.tracking.hit.TrackerCluster;
-import org.lcsim.contrib.onoprien.tracking.hitmaking.OldTrackerHit;

+import org.lcsim.recon.tracking.vsegment.geom.SegmentationManager;
+import org.lcsim.recon.tracking.vsegment.geom.Sensor;
+import org.lcsim.recon.tracking.vsegment.geom.SensorType;
+import org.lcsim.recon.tracking.vsegment.geom.sensortypes.Cylinder;
+import org.lcsim.recon.tracking.vsegment.hit.DigiTrackerHit;
+import org.lcsim.recon.tracking.vsegment.hit.TrackerCluster;
+import org.lcsim.recon.tracking.vsegment.hitmaking.OldTrackerHit;

 import org.lcsim.detector.DetectorElementStore;
 import org.lcsim.detector.IDetectorElement;
 import org.lcsim.detector.IDetectorElementContainer;

@@ -175,18 +175,18 @@

             if (_segman == null) _segman = (SegmentationManager) event.get("SegmentationManager");
             
             //  Make a mapping between the stereo strips and corresponding hits

-            Map<HelicalTrackStrip, org.lcsim.contrib.onoprien.tracking.hit.TrackerHit> stripmap =
-                    new HashMap<HelicalTrackStrip, org.lcsim.contrib.onoprien.tracking.hit.TrackerHit>();

+            Map<HelicalTrackStrip, org.lcsim.recon.tracking.vsegment.hit.TrackerHit> stripmap =
+                    new HashMap<HelicalTrackStrip, org.lcsim.recon.tracking.vsegment.hit.TrackerHit>();

             
             //  Get the hit map that gives the list of hits on a particular sensor

-            Map<Sensor, List<org.lcsim.contrib.onoprien.tracking.hit.TrackerHit>> hitmap =
-                    (Map<Sensor, List<org.lcsim.contrib.onoprien.tracking.hit.TrackerHit>>) event.get(colname);

+            Map<Sensor, List<org.lcsim.recon.tracking.vsegment.hit.TrackerHit>> hitmap =
+                    (Map<Sensor, List<org.lcsim.recon.tracking.vsegment.hit.TrackerHit>>) event.get(colname);

             
             //  Loop over sensors in the hit map
             for (Sensor sensor : hitmap.keySet()) {
                 //  Get a list of hits for this sensor and loop over the hits

-                List<org.lcsim.contrib.onoprien.tracking.hit.TrackerHit> sensorhits = hitmap.get(sensor);
-                for (org.lcsim.contrib.onoprien.tracking.hit.TrackerHit hit : sensorhits) {

+                List<org.lcsim.recon.tracking.vsegment.hit.TrackerHit> sensorhits = hitmap.get(sensor);
+                for (org.lcsim.recon.tracking.vsegment.hit.TrackerHit hit : sensorhits) {

                     //  Convert to an old tracker hit for reference
                     ArrayList<TrackerCluster> parents = new ArrayList<TrackerCluster>(1);
                     parents.add(hit.getCluster());

@@ -320,7 +320,7 @@

         return;
     }
     

-    private HelicalTrackHit MakeAxialHit(org.lcsim.contrib.onoprien.tracking.hit.TrackerHit hit) {

+    private HelicalTrackHit MakeAxialHit(org.lcsim.recon.tracking.vsegment.hit.TrackerHit hit) {

         HelicalTrackStrip strip = MakeStrip(hit);
         if (VecOp.cross(strip.v(), _zhat).magnitude() > _eps) return null;
         double zmin = VecOp.add(HitUtils.StripCenter(strip), VecOp.mult(strip.vmin(), strip.v())).z();

@@ -335,7 +335,7 @@

         return axialhit;
     }
     

-    private HelicalTrackStrip MakeStrip(org.lcsim.contrib.onoprien.tracking.hit.TrackerHit hit) {

+    private HelicalTrackStrip MakeStrip(org.lcsim.recon.tracking.vsegment.hit.TrackerHit hit) {

         Hep3Vector u;
         Hep3Vector v;
         Hep3Vector org;

@@ -382,7 +382,7 @@

         return strip;
     }
     

-    private HelicalTrackHit MakePixelHit(org.lcsim.contrib.onoprien.tracking.hit.TrackerHit hit) {

+    private HelicalTrackHit MakePixelHit(org.lcsim.recon.tracking.vsegment.hit.TrackerHit hit) {

         IDetectorElement de = hit.getSensor().getDetectorElement();
         HelicalTrackHit pixel = new HelicalTrack3DHit(hit.getPosition(), hit.getCovMatrix(), hit.getSignal(),
                 hit.getTime(), null, ID.getName(de), ID.getLayer(de), ID.getBarrelEndcapFlag(de));