Print

Print


Commit in lcsim/src/org/lcsim/contrib/seedtracker/digiexample on MAIN
DigiHitMaker.java+46added 1.1
DigiSeedTrackerDriver.java+3-351.1 -> 1.2
+49-35
1 added + 1 modified, total 2 files
CD - Refactor into two drivers to alow reusing of hit making

lcsim/src/org/lcsim/contrib/seedtracker/digiexample
DigiHitMaker.java added at 1.1
diff -N DigiHitMaker.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ DigiHitMaker.java	14 Jul 2008 23:26:16 -0000	1.1
@@ -0,0 +1,46 @@
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+
+package org.lcsim.contrib.seedtracker.digiexample;
+
+import java.util.ArrayList;
+import java.util.List;
+import org.lcsim.contrib.SiStripSim.TrackerHitDriver_User;
+import org.lcsim.contrib.tracking.TrackerHitCheater;
+import org.lcsim.event.EventHeader;
+import org.lcsim.event.SimTrackerHit;
+import org.lcsim.event.TrackerHit;
+import org.lcsim.fit.helicaltrack.HelicalTrackHitDriver;
+import org.lcsim.fit.helicaltrack.HelicalTrackHitDriver.HitType;
+import org.lcsim.util.Driver;
+
+/**
+ *
+ * @author cozzy
+ */
+public class DigiHitMaker extends Driver{
+
+    public DigiHitMaker(){
+            TrackerHitDriver_User thd = new TrackerHitDriver_User();
+            add(thd);
+            HelicalTrackHitDriver hitdriver = new HelicalTrackHitDriver();
+            hitdriver.addCollection(((TrackerHitDriver_User)thd).getStripHits1DName(),HitType.Digitized);
+            hitdriver.addCollection("CheatedVertexBarrelHits",HitType.Smeared); 
+            hitdriver.OutputCollection("HelicalTrackHits"); // the default, but it might change?
+            add(hitdriver);
+    }
+    
+    protected void process(EventHeader event) {
+        List<SimTrackerHit> simhits = new ArrayList<SimTrackerHit>(); 
+        simhits.addAll(event.getSimTrackerHits("SiVertexBarrel_RO")); 
+        simhits.addAll(event.getSimTrackerHits("SiVertexEndcap_RO")); 
+        TrackerHitCheater cheater = new TrackerHitCheater();
+        List<TrackerHit> smearedhits = cheater.makeTrackerHits(simhits);
+        event.put("CheatedVertexBarrelHits", smearedhits, TrackerHit.class, 0);
+        
+        super.process(event);
+        
+    }
+}

lcsim/src/org/lcsim/contrib/seedtracker/digiexample
DigiSeedTrackerDriver.java 1.1 -> 1.2
diff -u -r1.1 -r1.2
--- DigiSeedTrackerDriver.java	8 Jul 2008 19:45:19 -0000	1.1
+++ DigiSeedTrackerDriver.java	14 Jul 2008 23:26:16 -0000	1.2
@@ -5,17 +5,9 @@
 
 package org.lcsim.contrib.seedtracker.digiexample;
 
-import java.util.ArrayList;
-import java.util.List;
-import org.lcsim.contrib.SiStripSim.TrackerHitDriver_User;
 import org.lcsim.contrib.seedtracker.SeedTracker;
-import org.lcsim.contrib.tracking.TrackerHitCheater;
-import org.lcsim.event.EventHeader;
-import org.lcsim.event.SimTrackerHit;
-import org.lcsim.event.TrackerHit;
-import org.lcsim.event.TrackerHit;
-import org.lcsim.fit.helicaltrack.HelicalTrackHitDriver;
-import org.lcsim.fit.helicaltrack.HelicalTrackHitDriver.HitType;
+import org.lcsim.contrib.seedtracker.diagnostic.SeedTrackerDiagnostics;
+import org.lcsim.contrib.seedtracker.example.AnalysisDriver;
 import org.lcsim.util.Driver;
 
 /* SeedTracker driver using digitized hits. Because pixel hits are not yet available, 
@@ -26,34 +18,10 @@
 public class DigiSeedTrackerDriver extends Driver{
 
     public DigiSeedTrackerDriver() {
-        TrackerHitDriver_User driver = new TrackerHitDriver_User();         
-        add(driver);
-        HelicalTrackHitDriver hitdriver = new HelicalTrackHitDriver();
-        hitdriver.addCollection(((TrackerHitDriver_User)driver).getStripHits1DName(),HitType.Digitized);
-        hitdriver.addCollection("CheatedVertexBarrelHits",HitType.Smeared); 
-        add(hitdriver);
+        add(new DigiHitMaker()); 
         SeedTracker st = new SeedTracker(new BetterPlanarStrategy().getStrategies());
 //        st.setDiagnostics(new SeedTrackerDiagnostics());
         add(st);
 //        add(new AnalysisDriver());
     }
-    
-    @Override
-    /**
-     * Process the current event
-     * @param event EventHeader for this event
-     */
-    public void process(EventHeader event)
-    {
-        List<SimTrackerHit> simhits = new ArrayList<SimTrackerHit>(); 
-        simhits.addAll(event.getSimTrackerHits("SiVertexBarrel_RO")); 
-        simhits.addAll(event.getSimTrackerHits("SiVertexEndcap_RO")); 
-        TrackerHitCheater cheater = new TrackerHitCheater();
-        List<TrackerHit> smearedhits = cheater.makeTrackerHits(simhits);
-        event.put("CheatedVertexBarrelHits", smearedhits, TrackerHit.class, 0);
-        super.process(event);
-        return;     
-    }    
-
-    
 }
CVSspam 0.2.8