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

diff -u -r1.5 -r1.6
--- AnalysisDriver.java	13 Oct 2008 01:29:11 -0000	1.5
+++ AnalysisDriver.java	16 Oct 2008 22:15:56 -0000	1.6
@@ -42,7 +42,7 @@

     
     /** Creates a new instance of AnalysisDriver */
     public AnalysisDriver() {

-        h1 = aida.histogramFactory().createHistogram1D("pT Efficiency", "", 100, 0., 50., "type=efficiency");

+        h1 = aida.histogramFactory().createHistogram1D("pT Efficiency", "", 100, 0., 5., "type=efficiency");

         h2 = aida.histogramFactory().createHistogram1D("theta Efficiency", "", 360, 0., 180., "type=efficiency");
         
     }

@@ -59,6 +59,15 @@

         }
         List<Track> tracklist = event.getTracks();
         Map<MCParticle, Track> trkmap = new HashMap<MCParticle, Track>();

+        List<LCRelation> mcrelations = event.get(LCRelation.class, "HelicalTrackMCRelations");
+//        System.out.println("MC Relations: "+mcrelations.size());
+        for (LCRelation relation : mcrelations) {
+            HelicalTrackHit hit = (HelicalTrackHit) relation.getFrom();
+            MCParticle mcp = (MCParticle) relation.getTo();
+            if (!hit.getMCParticles().contains(mcp)) System.out.println("Relation error");
+//           if (mcp.getMass() > 0.9) System.out.println(mcp.toString()+hit.getMCParticles().get(0).toString());
+        }
+        

 //        List<LCRelation> hitrelations = event.get(LCRelation.class, "HelicalTrackHitRelations");
         for (Track track : tracklist) {
 //            List<TrackerHit> hitlist = track.getTrackerHits();

@@ -128,6 +137,7 @@

         List<MCParticle> mclist = event.getMCParticles();
         for (MCParticle mcp : mclist) {
             if (mcp.getCharge() == 0) continue;

+            if (mcp.getOrigin().magnitude() > 10.) continue;

             if (mcp.getGeneratorStatus() != mcp.FINAL_STATE) continue;
             double px = mcp.getPX();
             double py = mcp.getPY();

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

diff -u -r1.4 -r1.5
--- MyTrackerDriver.java	13 Oct 2008 01:25:10 -0000	1.4
+++ MyTrackerDriver.java	16 Oct 2008 22:15:56 -0000	1.5
@@ -41,13 +41,15 @@

         // it is necessary to recompile when modifying a saved resource.
         // StrategyXMLUtils.getDefaultStrategiesPrefix() will provide the correct
         // prefix in the resource tree (i.e. "/org/lcsim/contrib/seedtracker/strategybuilder/strategies/")

-//        List<SeedStrategy> stratlist = StrategyXMLUtils.getStrategyListFromResource(StrategyXMLUtils.getDefaultStrategiesPrefix()+"autogen_zpole_sid01.xml");

+        List<SeedStrategy> stratlist = 
+                StrategyXMLUtils.getStrategyListFromResource(
+                StrategyXMLUtils.getDefaultStrategiesPrefix()+"autogen_ttbar_sid02.xml");

 
         // For development / modifications, one may choose to load a strategy 
         // list from a local file instead of a resource. The line below shows
         // an example of how to do this
         

-        List<SeedStrategy> stratlist = StrategyXMLUtils.getStrategyListFromFile(new File("c:/strategies.xml")); 

+//        List<SeedStrategy> stratlist = StrategyXMLUtils.getStrategyListFromFile(new File("c:/strategies.xml")); 

                 
         //  Add a driver to do the track finding
         SeedTracker st = new SeedTracker(stratlist);

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

diff -u -r1.1 -r1.2
--- VSExampleSegmenter.java	4 Sep 2008 22:47:29 -0000	1.1
+++ VSExampleSegmenter.java	16 Oct 2008 22:15:56 -0000	1.2
@@ -13,7 +13,7 @@

  * 
  * 
  * @author D. Onoprienko

- * @version $Id: VSExampleSegmenter.java,v 1.1 2008/09/04 22:47:29 partridge Exp $

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

  */
 public class VSExampleSegmenter extends SubdetectorBasedSegmenter {
   

@@ -21,40 +21,40 @@

   
   public VSExampleSegmenter() {
     

-    // 25 um pixels in VTX Barrel

+    // 20 um pixels in VTX Barrel

     
     CylindricalBarrelSegmenter vtxBarrelSegmenter = new CylindricalBarrelSegmenter("VertexBarrel");

-    vtxBarrelSegmenter.setStripLength(25.*SystemOfUnits.micrometer);
-    vtxBarrelSegmenter.setStripWidth(25.*SystemOfUnits.micrometer);

+    vtxBarrelSegmenter.setStripLength(20.*SystemOfUnits.micrometer);
+    vtxBarrelSegmenter.setStripWidth(20.*SystemOfUnits.micrometer);

     setSegmenter("VertexBarrel", vtxBarrelSegmenter);
     

-    // 10 cm x 25 um strips in outer Tracker Barrel

+    // 9.15 cm x 25 um strips in outer Tracker Barrel

     
     CylindricalBarrelSegmenter trackerBarrelSegmenter = new CylindricalBarrelSegmenter("TrackerBarrel");

-    trackerBarrelSegmenter.setStripLength(10.*SystemOfUnits.cm);

+    trackerBarrelSegmenter.setStripLength(9.15*SystemOfUnits.cm);

     trackerBarrelSegmenter.setStripWidth(25.*SystemOfUnits.micrometer);
     setSegmenter("TrackerBarrel", trackerBarrelSegmenter);
     

-    // 25 um pixels in VTX Endcap

+    // 20 um pixels in VTX Endcap

     
     DiskTrackerToRingsSegmenter vtxEndcapSegmenter = new DiskTrackerToRingsSegmenter("VertexEndcap");

-    vtxEndcapSegmenter.setStripLength(25.*SystemOfUnits.micrometer);
-    vtxEndcapSegmenter.setStripWidth(25.*SystemOfUnits.micrometer);

+    vtxEndcapSegmenter.setStripLength(20.*SystemOfUnits.micrometer);
+    vtxEndcapSegmenter.setStripWidth(20.*SystemOfUnits.micrometer);

     setSegmenter("VertexEndcap", vtxEndcapSegmenter);
     

-    // 25 um pixels in Forward Tracker

+    // 20 um pixels in Forward Tracker

     
     DiskTrackerToRingsSegmenter trackerForwardSegmenter = new DiskTrackerToRingsSegmenter("TrackerForward");

-    trackerForwardSegmenter.setStripLength(25.*SystemOfUnits.micrometer);
-    trackerForwardSegmenter.setStripWidth(25.*SystemOfUnits.micrometer);

+    trackerForwardSegmenter.setStripLength(20.*SystemOfUnits.micrometer);
+    trackerForwardSegmenter.setStripWidth(20.*SystemOfUnits.micrometer);

     setSegmenter("TrackerForward", trackerForwardSegmenter);
     

-    // 15 degrees stereo wedges in outer Tracker Endcap

+    // 12 degrees stereo wedges in outer Tracker Endcap

     
     DiskTrackerToWedgesSegmenter trackerEndcapSegmenter = new DiskTrackerToWedgesSegmenter("TrackerEndcap");

-    trackerEndcapSegmenter.setNumberOfRadialSlices(new int[]{3,5,8,10});

+    trackerEndcapSegmenter.setNumberOfRadialSlices(new int[]{3,6,9,12});

     trackerEndcapSegmenter.setStripWidth(25.*SystemOfUnits.micrometer);

-    trackerEndcapSegmenter.setNumberOfPhiSlices(24);

+    trackerEndcapSegmenter.setNumberOfPhiSlices(30);

     setSegmenter("TrackerEndcap", trackerEndcapSegmenter);
   }