lcsim/src/org/lcsim/contrib/Partridge/TrackingTest

diff -u -r1.2 -r1.3
--- VSExampleDriver.java	13 Oct 2008 01:25:10 -0000	1.2
+++ VSExampleDriver.java	6 Dec 2008 21:53:22 -0000	1.3
@@ -13,25 +13,25 @@

 import hep.physics.vec.Hep3Vector;
 import hep.physics.vec.VecOp;
 

-import org.lcsim.contrib.onoprien.tracking.clustering.ClusteringDriver;
-import org.lcsim.contrib.onoprien.tracking.clustering.clusterers.NearestNeighborClusterer;
-import org.lcsim.contrib.onoprien.tracking.digitization.SimToDigiDriver;
-import org.lcsim.contrib.onoprien.tracking.digitization.SimToDigiConverter;
-import org.lcsim.contrib.onoprien.tracking.digitization.algorithms.ConverterSimple;
-import org.lcsim.contrib.onoprien.tracking.geom.SegmentationManager;
-import org.lcsim.contrib.onoprien.tracking.geom.Segmenter;
-import org.lcsim.contrib.onoprien.tracking.geom.Sensor;
-import org.lcsim.contrib.onoprien.tracking.geom.SensorType;
-import org.lcsim.contrib.onoprien.tracking.hit.DigiTrackerHit;
-import org.lcsim.contrib.onoprien.tracking.hit.TrackerCluster;
-import org.lcsim.contrib.onoprien.tracking.hit.TrackerHit;
-import org.lcsim.contrib.onoprien.tracking.hitmaking.HitMakingDriver;
-import org.lcsim.contrib.onoprien.tracking.hitmaking.TrackerHitConverter;
-import org.lcsim.contrib.onoprien.tracking.hitmaking.TrackerHitMaker;
-import org.lcsim.contrib.onoprien.tracking.hitmaking.hitmakers.TrackerHitMakerBasic;
-import org.lcsim.contrib.onoprien.tracking.mctruth.MCTruth;
-import org.lcsim.contrib.onoprien.tracking.mctruth.MCTruthDriver;
-import org.lcsim.contrib.onoprien.tracking.mctruth.SimGroup;

+import org.lcsim.recon.tracking.vsegment.clustering.ClusteringDriver;
+import org.lcsim.recon.tracking.vsegment.clustering.clusterers.NearestNeighborClusterer;
+import org.lcsim.recon.tracking.vsegment.digitization.SimToDigiDriver;
+import org.lcsim.recon.tracking.vsegment.digitization.SimToDigiConverter;
+import org.lcsim.recon.tracking.vsegment.digitization.algorithms.ConverterSimple;
+import org.lcsim.recon.tracking.vsegment.geom.SegmentationManager;
+import org.lcsim.recon.tracking.vsegment.geom.Segmenter;
+import org.lcsim.recon.tracking.vsegment.geom.Sensor;
+import org.lcsim.recon.tracking.vsegment.geom.SensorType;
+import org.lcsim.recon.tracking.vsegment.hit.DigiTrackerHit;
+import org.lcsim.recon.tracking.vsegment.hit.TrackerCluster;
+import org.lcsim.recon.tracking.vsegment.hit.TrackerHit;
+import org.lcsim.recon.tracking.vsegment.hitmaking.HitMakingDriver;
+import org.lcsim.recon.tracking.vsegment.hitmaking.TrackerHitConverter;
+import org.lcsim.recon.tracking.vsegment.hitmaking.TrackerHitMaker;
+import org.lcsim.recon.tracking.vsegment.hitmaking.hitmakers.TrackerHitMakerBasic;
+import org.lcsim.recon.tracking.vsegment.mctruth.MCTruth;
+import org.lcsim.recon.tracking.vsegment.mctruth.MCTruthDriver;
+import org.lcsim.recon.tracking.vsegment.mctruth.SimGroup;

 
 /**
  * An Example of how to define virtual segmentation of the tracker, 

@@ -42,7 +42,7 @@

  * 
  * 
  * @author D. Onoprienko

- * @version $Id: VSExampleDriver.java,v 1.2 2008/10/13 01:25:10 partridge Exp $

+ * @version $Id: VSExampleDriver.java,v 1.3 2008/12/06 21:53:22 onoprien Exp $

  */
 public class VSExampleDriver extends Driver {
   

lcsim/src/org/lcsim/contrib/Partridge/TrackingTest

diff -u -r1.2 -r1.3
--- VSExampleSegmenter.java	16 Oct 2008 22:15:56 -0000	1.2
+++ VSExampleSegmenter.java	6 Dec 2008 21:53:22 -0000	1.3
@@ -2,10 +2,10 @@

 
 import org.lcsim.units.clhep.SystemOfUnits;
 

-import org.lcsim.contrib.onoprien.tracking.geom.segmenters.CylindricalBarrelSegmenter;
-import org.lcsim.contrib.onoprien.tracking.geom.segmenters.DiskTrackerToWedgesSegmenter;
-import org.lcsim.contrib.onoprien.tracking.geom.segmenters.DiskTrackerToRingsSegmenter;
-import org.lcsim.contrib.onoprien.tracking.geom.segmenters.SubdetectorBasedSegmenter;

+import org.lcsim.recon.tracking.vsegment.geom.segmenters.CylindricalBarrelSegmenter;
+import org.lcsim.recon.tracking.vsegment.geom.segmenters.DiskTrackerToWedgesSegmenter;
+import org.lcsim.recon.tracking.vsegment.geom.segmenters.DiskTrackerToRingsSegmenter;
+import org.lcsim.recon.tracking.vsegment.geom.segmenters.SubdetectorBasedSegmenter;

 
 /**
  * 

@@ -13,7 +13,7 @@

  * 
  * 
  * @author D. Onoprienko

- * @version $Id: VSExampleSegmenter.java,v 1.2 2008/10/16 22:15:56 partridge Exp $

+ * @version $Id: VSExampleSegmenter.java,v 1.3 2008/12/06 21:53:22 onoprien Exp $

  */
 public class VSExampleSegmenter extends SubdetectorBasedSegmenter {
   

lcsim/src/org/lcsim/contrib/Partridge

diff -u -r1.1 -r1.2
--- VSExampleSegmenter.java	3 Jul 2008 21:59:32 -0000	1.1
+++ VSExampleSegmenter.java	6 Dec 2008 21:53:23 -0000	1.2
@@ -2,10 +2,10 @@

 
 import org.lcsim.units.clhep.SystemOfUnits;
 

-import org.lcsim.contrib.onoprien.tracking.geom.segmenters.CylindricalBarrelSegmenter;
-import org.lcsim.contrib.onoprien.tracking.geom.segmenters.DiskTrackerToWedgesSegmenter;
-import org.lcsim.contrib.onoprien.tracking.geom.segmenters.DiskTrackerToRingsSegmenter;
-import org.lcsim.contrib.onoprien.tracking.geom.segmenters.SubdetectorBasedSegmenter;

+import org.lcsim.recon.tracking.vsegment.geom.segmenters.CylindricalBarrelSegmenter;
+import org.lcsim.recon.tracking.vsegment.geom.segmenters.DiskTrackerToWedgesSegmenter;
+import org.lcsim.recon.tracking.vsegment.geom.segmenters.DiskTrackerToRingsSegmenter;
+import org.lcsim.recon.tracking.vsegment.geom.segmenters.SubdetectorBasedSegmenter;

 
 /**
  * 

@@ -13,7 +13,7 @@

  * 
  * 
  * @author D. Onoprienko

- * @version $Id: VSExampleSegmenter.java,v 1.1 2008/07/03 21:59:32 partridge Exp $

+ * @version $Id: VSExampleSegmenter.java,v 1.2 2008/12/06 21:53:23 onoprien Exp $

  */
 public class VSExampleSegmenter extends SubdetectorBasedSegmenter {
   

lcsim/src/org/lcsim/contrib/Partridge

diff -u -r1.2 -r1.3
--- VSTest.java	3 Jul 2008 22:41:39 -0000	1.2
+++ VSTest.java	6 Dec 2008 21:53:23 -0000	1.3
@@ -13,20 +13,20 @@

 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;

-import org.lcsim.contrib.onoprien.tracking.geom.SegmentationManager;
-import org.lcsim.contrib.onoprien.tracking.digitization.algorithms.ConverterSimple;
-import org.lcsim.contrib.onoprien.tracking.digitization.SimToDigiConverter;
-import org.lcsim.contrib.onoprien.tracking.clustering.ClusteringDriver;
-import org.lcsim.contrib.onoprien.tracking.clustering.clusterers.NearestNeighborClusterer;
-import org.lcsim.contrib.onoprien.tracking.digitization.SimToDigiDriver;
-import org.lcsim.contrib.onoprien.tracking.geom.SegmentationManager;
-import org.lcsim.contrib.onoprien.tracking.geom.Segmenter;
-import org.lcsim.contrib.onoprien.tracking.geom.Sensor;
-import org.lcsim.contrib.onoprien.tracking.hit.DigiTrackerHit;
-import org.lcsim.contrib.onoprien.tracking.hit.TrackerCluster;
-import org.lcsim.contrib.onoprien.tracking.hitmaking.HitMakingDriver;
-import org.lcsim.contrib.onoprien.tracking.hitmaking.TrackerHitMaker;
-import org.lcsim.contrib.onoprien.tracking.hitmaking.hitmakers.TrackerHitMakerBasic;

+import org.lcsim.recon.tracking.vsegment.geom.SegmentationManager;
+import org.lcsim.recon.tracking.vsegment.digitization.algorithms.ConverterSimple;
+import org.lcsim.recon.tracking.vsegment.digitization.SimToDigiConverter;
+import org.lcsim.recon.tracking.vsegment.clustering.ClusteringDriver;
+import org.lcsim.recon.tracking.vsegment.clustering.clusterers.NearestNeighborClusterer;
+import org.lcsim.recon.tracking.vsegment.digitization.SimToDigiDriver;
+import org.lcsim.recon.tracking.vsegment.geom.SegmentationManager;
+import org.lcsim.recon.tracking.vsegment.geom.Segmenter;
+import org.lcsim.recon.tracking.vsegment.geom.Sensor;
+import org.lcsim.recon.tracking.vsegment.hit.DigiTrackerHit;
+import org.lcsim.recon.tracking.vsegment.hit.TrackerCluster;
+import org.lcsim.recon.tracking.vsegment.hitmaking.HitMakingDriver;
+import org.lcsim.recon.tracking.vsegment.hitmaking.TrackerHitMaker;
+import org.lcsim.recon.tracking.vsegment.hitmaking.hitmakers.TrackerHitMakerBasic;

 import org.lcsim.detector.IDetectorElement;
 import org.lcsim.event.EventHeader;
 import org.lcsim.fit.helicaltrack.HelicalTrack2DHit;

@@ -105,14 +105,14 @@

         SegmentationManager segman = (SegmentationManager) event.get("SegmentationManager");
         
         //  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("NewTrackerHits");

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

         
         //  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) {

                 //  Check if we have a strip or pixel hit
                 if (sensor.getType().getHitDimension() == 1) {
                     //  Strip hit - now check if this hit is part of a stereo pair

@@ -126,7 +126,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();

@@ -138,11 +138,13 @@

         return axialhit;
     }
     

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

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

         Sensor s = hit.getSensor();
         System.out.println("Global position: "+hit.getPosition().toString());
         Hep3Vector org = s.localToGlobal(_orgloc);
         System.out.println("Origin position: "+org.toString());

+      Hep3Vector d = s.localToGlobal(_uloc);
+      System.out.println("d: "+d.toString()+ " uloc "+ _uloc);

         Hep3Vector u = VecOp.sub(s.localToGlobal(_uloc), org);
         System.out.println("u: "+u.toString());
         Hep3Vector v = VecOp.sub(s.localToGlobal(_vloc), org);