Print

Print


Commit in lcsim/src/org/lcsim/contrib/seedtracker/example on MAIN
MyTrackerDriver.java+1-11.1 -> 1.2
VSExampleDriver.java+17-91.1 -> 1.2
+18-10
2 modified files
Some updates to example code

lcsim/src/org/lcsim/contrib/seedtracker/example
MyTrackerDriver.java 1.1 -> 1.2
diff -u -r1.1 -r1.2
--- MyTrackerDriver.java	17 Jun 2008 00:39:16 -0000	1.1
+++ MyTrackerDriver.java	2 Jul 2008 23:55:36 -0000	1.2
@@ -29,7 +29,7 @@
         
         //  Add a driver to create HelicalTrackHits from the digitized hits
         HelicalTrackHitDriver hitdriver = new HelicalTrackHitDriver();
-        hitdriver.addCollection("StandardTrackerHits",HitType.VirtualSegmentation);
+        hitdriver.addCollection("NewTrackerHits",HitType.VirtualSegmentation);
         add(hitdriver);
         
         //  Create a list of strategies to be used in track finding

lcsim/src/org/lcsim/contrib/seedtracker/example
VSExampleDriver.java 1.1 -> 1.2
diff -u -r1.1 -r1.2
--- VSExampleDriver.java	17 Jun 2008 00:39:16 -0000	1.1
+++ VSExampleDriver.java	2 Jul 2008 23:55:36 -0000	1.2
@@ -42,7 +42,7 @@
  * 
  * 
  * @author D. Onoprienko
- * @version $Id: VSExampleDriver.java,v 1.1 2008/06/17 00:39:16 partridge Exp $
+ * @version $Id: VSExampleDriver.java,v 1.2 2008/07/02 23:55:36 partridge Exp $
  */
 public class VSExampleDriver extends Driver {
   
@@ -78,12 +78,20 @@
     clusteringDriver.set("OUTPUT_MAP_NAME","TrackerClusters");
     add(clusteringDriver);
     
+    // Hit making :
+    
+    TrackerHitMaker hitMaker = new TrackerHitMakerBasic();
+    HitMakingDriver hitMakingDriver = new HitMakingDriver(hitMaker);
+    hitMakingDriver.set("INPUT_MAP_NAME","TrackerClusters");
+    hitMakingDriver.set("OUTPUT_MAP_NAME","NewTrackerHits");
+    add(hitMakingDriver);
+     
     // Conversion to "standard" org.lcsim.event.TrackerHit :  ------------------
     
-    TrackerHitConverter hitConverter = new TrackerHitConverter();
-    hitConverter.set("INPUT_CLUSTER_MAP_NAME", "TrackerClusters");
-    hitConverter.set("OUTPUT_HIT_LIST_NAME", "StandardTrackerHits");
-    add(hitConverter);
+//    TrackerHitConverter hitConverter = new TrackerHitConverter();
+//    hitConverter.set("INPUT_CLUSTER_MAP_NAME", "TrackerClusters");
+//    hitConverter.set("OUTPUT_HIT_LIST_NAME", "StandardTrackerHits");
+//    add(hitConverter);
   }
   
   
@@ -104,16 +112,16 @@
     HashMap<Sensor, List<DigiTrackerHit>> digiMap = 
             (HashMap<Sensor, List<DigiTrackerHit>>) event.get("DigiTrackerHits");
     for (List<DigiTrackerHit> digiList : digiMap.values()) n += digiList.size();
-//    System.out.println("Created " + n + " DigiTrackerHits on " + digiMap.keySet().size() + " sensors");
+    System.out.println("Created " + n + " DigiTrackerHits on " + digiMap.keySet().size() + " sensors");
     
     n = 0;
     HashMap<Sensor, List<TrackerCluster>> clusterMap = 
             (HashMap<Sensor, List<TrackerCluster>>) event.get("TrackerClusters");
     for (List<TrackerCluster> clusterList : clusterMap.values()) n += clusterList.size();
-//    System.out.println("Created " + n + " TrackerClusters on " + clusterMap.keySet().size() + " sensors");
+    System.out.println("Created " + n + " TrackerClusters on " + clusterMap.keySet().size() + " sensors");
     
-    n = 0;
-    List<org.lcsim.event.TrackerHit> oldHitList = (List<org.lcsim.event.TrackerHit>) event.get("StandardTrackerHits");
+//    n = 0;
+//    List<org.lcsim.event.TrackerHit> oldHitList = (List<org.lcsim.event.TrackerHit>) event.get("StandardTrackerHits");
 //    System.out.println("Created " + oldHitList.size() + " org.lcsim.event.TrackerHits");
   }
 
CVSspam 0.2.8