lcsim/src/org/lcsim/contrib/CosminDeaconu

diff -N SiTrackerHit2DMakerDriver.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ SiTrackerHit2DMakerDriver.java	31 Jan 2008 00:47:06 -0000	1.1
@@ -0,0 +1,53 @@

+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+
+package org.lcsim.contrib.CosminDeaconu;
+
+import java.util.ArrayList;
+import java.util.List;
+import org.lcsim.contrib.SiStripSim.SiTrackerHitStrip1D;
+import org.lcsim.contrib.SiStripSim.SiTrackerHitStrip2D;
+import org.lcsim.event.EventHeader;
+import org.lcsim.util.Driver;
+import org.lcsim.contrib.SiStripSim.TrackerHit2DMaker;
+import org.lcsim.event.TrackerHit;
+
+/**
+ *
+ * @author cozzy
+ */
+
+
+
+public class SiTrackerHit2DMakerDriver extends Driver {
+
+    private static final boolean DEBUG = false; // set true to get debug output
+    
+    TrackerHit2DMaker maker = new TrackerHit2DMaker(); 
+    
+    protected void process(EventHeader event) {
+        
+        List<TrackerHit> hits1d = new ArrayList<TrackerHit>();
+        for (List<TrackerHit> l : event.get(TrackerHit.class)) hits1d.addAll(l); 
+        
+        
+        for (TrackerHit hit : hits1d) {
+               if (!(hit instanceof SiTrackerHitStrip1D)) continue;
+               SiTrackerHitStrip1D h = (SiTrackerHitStrip1D)hit; 
+               h.getSensor().getReadout().addHit(h);
+        }
+        
+        if(DEBUG) System.out.println("DEBUG: makeHits2D started");   
+        List<SiTrackerHitStrip2D> hits = maker.makeHits2D(event.getDetector().getDetectorElement());
+        if(DEBUG) System.out.println("Num hits = "+hits.size());
+        event.put("SiTrackerHitStrips2D",hits,SiTrackerHitStrip2D.class,0);
+        if(DEBUG) System.out.println("DEBUG: makeHits2D finished");
+        
+    }
+    
+    
+    
+    
+}

lcsim/src/org/lcsim/contrib/CosminDeaconu

diff -u -r1.1 -r1.2
--- StripMakerDriver.java	18 Jan 2008 06:55:18 -0000	1.1
+++ StripMakerDriver.java	31 Jan 2008 00:47:06 -0000	1.2
@@ -26,11 +26,14 @@

     private String[] raw = {"RawBarrelTrackerHits", "RawEndcapTrackerHits"};
     private String[] output = {"BarrelSiStrip1DHits", "EndcapSiStrip1DHits"};
     

+    

     public StripMakerDriver() {
         
         super.add( new SimTrackerHitIdentifierReadoutDriver( input ) );
         super.add( new TKNRawHitsDriverV1( input, raw) );
         super.add( new TKNClusterMakerDriverV1( raw, output) );

+        super.add( new SiTrackerHit2DMakerDriver());
+        

     }
     
     protected void process(EventHeader event){