hps-java/src/main/java/org/lcsim/hps/recon/tracking

diff -u -r1.3 -r1.4
--- TrackerReconDriver.java	19 Jan 2012 01:30:24 -0000	1.3
+++ TrackerReconDriver.java	19 Jan 2012 22:48:34 -0000	1.4
@@ -3,6 +3,7 @@

 import java.util.ArrayList;
 import java.util.List;

+import org.lcsim.detector.tracker.silicon.SiTrackerModule;

 import org.lcsim.event.EventHeader;
 import org.lcsim.event.Track;
 import org.lcsim.event.TrackerHit;

@@ -20,43 +21,50 @@

  * It is intended to work with the {@link TrackerDigiDriver} digitization Driver.
  * 
  * @author jeremym

- * @version $Id: TrackerReconDriver.java,v 1.3 2012/01/19 01:30:24 jeremy Exp $

+ * @version $Id: TrackerReconDriver.java,v 1.4 2012/01/19 22:48:34 jeremy Exp $

  */
 public final class TrackerReconDriver extends Driver 
 {
 	// Debug flag
 	private final static boolean DEBUG = true;

+	// Tracks found across all events.
+	int ntracks = 0;
+	
+	// Number of events processed.
+	int nevents = 0;
+	
+	// Cache detector object.
+	Detector detector = null;
+

     // FIXME Hard-coded B-field value.  Get this from the Detector?
     private double bfield = 0.5;
     
     // Name of the SVT subdetector.
     private String subdetectorName = "Tracker";

-    // SimTrackerHit input collection.

+    // SimTrackerHit input collection for readout cleanup.

     private String simTrackerHitCollectionName = "TrackerHits";

-    // Tracking strategy path.

+    // Tracking strategies resource path.

     private String strategyResource = "HPS-Test-1pt3.xml";

-    // Seedtracker's output track collection.

+    // Output track collection.

     private String trackCollectionName = "MatchedTracks";

-    // Seedtracker's HelicalTrackHit input collection.

+    // HelicalTrackHit input collection.

     private String stInputCollectionName = "RotatedHelicalTrackHits";

-    // HelicalTrackHitDriver's output hit collection.

+    // Output hit collection for HelicalTrackHits.

     private String hthOutputCollectionName = "HelicalTrackHits";

-    // Name of strip hits collection.
-    // FIXME This currently depends on name of strip clusterer from in another Driver.  
-    //       Can we change to something generic like "SiStripHits" instead?

+    // Input strip hits collection from digi.

     private String stripHitsCollectionName = "StripClusterer_SiTrackerHitStrip1D";

-    // Hit relations.

+    // Hit relations output collection.

 	private String helicalTrackHitRelationsCollectionName = "HelicalTrackHitRelations";

-	// Track to MC relations.

+	// Track to MC relations output collection.

 	private String helicalTrackMCRelationsCollectionName = "HelicalTrackMCRelations";
 	
     public TrackerReconDriver()

@@ -126,31 +134,37 @@

      */
     public void detectorChanged(Detector detector)
     {

-        setup();

+    	this.detector = detector;
+    	//System.out.println("detector bfield @ 0,0,0 = " + detector.getFieldMap().getField(new BasicHep3Vector(0,0,0)));
+        initialize();

         super.detectorChanged(detector);        
     }
         
     /** 
      * Setup all the child Drivers necessary for track reconstruction.
      */

-    private void setup()

+    private void initialize()

+    	//

         // 1) Driver to create HelicalTrackHits expected by Seedtracker.

+    	//
+    	// TODO Make this its own separate Driver??? (Matt)
+        
+        // Setup default stereo pairings which should work for even number of modules.
+    	List<SiTrackerModule> modules = detector.getDetectorElement().findDescendants(SiTrackerModule.class);
+    	if (modules.size() == 0)
+    		throw new RuntimeException("No SiTrackerModules found in detector.");
+    	int nmodules = modules.size();
+    	if (nmodules % 2 != 0)
+    		throw new RuntimeException("Don't know how to do stereo pairing for odd number of modules.");        
+    	List<int[]> pairs = new ArrayList<int[]>();
+        for (int i=1; i<=(nmodules/2)-1; i+=2)
+        {
+        	int[] pair = {i, i+1};
+        	System.out.println("Adding stereo pair: " + pair[0] + ", " + pair[1]);
+        	pairs.add(pair);
+        }

-        // Setup adjacent layer pairings.
-    	// TODO Provide a default implementation here that is smart enough to pair adjacent modules by number.
-        List<int[]> pairs = new ArrayList<int[]>();
-        int[] p1 = {1, 2};
-        int[] p2 = {3, 4};
-        int[] p3 = {5, 6};
-        int[] p4 = {7, 8};
-        int[] p5 = {9, 10};
-        pairs.add(p1);
-        pairs.add(p2);
-        pairs.add(p3);
-        pairs.add(p4);
-        pairs.add(p5);
-

         // Create the Driver.
         HPSHelicalTrackHitDriver hthdriver = new HPSHelicalTrackHitDriver();
         hthdriver.addCollection(stripHitsCollectionName);

@@ -161,12 +175,14 @@

         {
             hthdriver.setStereoPair(subdetectorName, pair[0], pair[1]);
         }

-        hthdriver.setMaxSeperation(10.01);  
-        hthdriver.setTolerance(0.01);

+        hthdriver.setMaxSeperation(10.01); // user parameter?
+        hthdriver.setTolerance(0.01); // user parameter?

         hthdriver.setTransformToTracking(true);
         add(hthdriver);

-        // 2) Driver to run Seedtracker.

+        //
+        // 2) Driver to run Seed Tracker.
+        //

 
         if (!strategyResource.startsWith("/"))
             strategyResource = "/" + strategyResource;

@@ -181,9 +197,9 @@

         stFinal.setSectorParams(false);
         add(stFinal);

+        //

         // 3) Cleanup the readouts for next event.

-        // TODO Check if this driver is duplicated elsewhere (in digi?).
-

+        //

         List<String> readoutCleanup = new ArrayList<String>();
         readoutCleanup.add(this.simTrackerHitCollectionName);
         add(new ReadoutCleanupDriver(readoutCleanup));

@@ -201,49 +217,38 @@

      * This method is used to run the reconstruction and print debug information.
      */
     public void process(EventHeader event)

-    {
-        // This runs the track reconstruction using the sub-Drivers.

+    {    	
+        // This call runs the track reconstruction using the sub-Drivers.

         super.process(event);

-        
-        // Check for digi hits and print debug output.

+                
+        // Debug prints.

         if (DEBUG)
         {

-        	List<TrackerHit> digi = event.get(TrackerHit.class, "TrackerHits");
-        	if (digi.size() == 0)
-        	{
-        		System.out.println("WARNING: The sisim TrackerHit collection is empty!");
-        	}
-        	else
-        	{
-        		System.out.println("The sisim TrackerHit collection has " + digi.size() + " hits.");
-        	}
-

         	// Check for HelicalTrackHits.
         	List<TrackerHit> hth = event.get(TrackerHit.class, hthOutputCollectionName);

-        	if (hth.size() == 0)
-        	{
-        		System.out.println("WARNING: The HelicalTrackHit collection " + hthOutputCollectionName + " is empty!");
-        	}
-        	else
-        	{
-        		System.out.println("The HelicalTrackHit collection " + hthOutputCollectionName + " has " + hth.size() + " hits.");
-        	}       
-

+        	System.out.println("The HelicalTrackHit collection " + hthOutputCollectionName + " has " + hth.size() + " hits.");
+

         	// Check for Tracks.
         	List<Track> tracks = event.get(Track.class, trackCollectionName);

-        	if (tracks.size() == 0)
-        	{
-        		System.out.println("WARNING: The Track collection " + trackCollectionName + " is empty!");
-        	}
-        	else
-        	{
-        		System.out.println("The Track collection " + trackCollectionName + " has " + tracks.size() + " tracks.");
-        	}

+        	System.out.println("The Track collection " + trackCollectionName + " has " + tracks.size() + " tracks.");
+

         	// Print out track info.
         	for (Track track : tracks)
         	{
         		System.out.println(track.toString());
         	}
         }

+        
+    	// Increment number of events.
+    	++nevents;
+        
+        // Add to tracks found.
+        ntracks += event.get(Track.class, trackCollectionName).size();

+    
+    public void endOfData()
+    {
+    	System.out.println("-------------------------------------------");
+    	System.out.println(this.getName() + " found " + ntracks + " tracks in " + nevents + " events which is " + ((double)ntracks/(double)nevents) + " efficiency.");
+    }

\ No newline at end of file

- - // Collections required by digi algo. - private List<String> readouts = new ArrayList<String>(); - private List<String> processPaths = new ArrayList<String>(); - private List<IDetectorElement> processDEs = new ArrayList<IDetectorElement>(); - private Set<SiSensor> processSensors = new HashSet<SiSensor>(); - private Set<SiTrackerModule> processModules = new HashSet<SiTrackerModule>(); - - // Digi class objects. - private SiDigitizer stripDigitizer; - private StripHitMaker stripClusterer; - private String digitizerName; - - // Collection name parameter.

+ // Name of RawTrackerHit output collection. + private String rawTrackerHitOutputCollectionName = "RawTrackerHitMaker_RawTrackerHits"; + + // Name of StripHit1D output collection. + private String stripHitOutputCollectionName = "StripClusterer_SiTrackerHitStrip1D"; +

private static final double clusterErrorMultiplier = 1.0; private double oneClusterErr = clusterErrorMultiplier / Math.sqrt(12.); private double twoClusterErr = clusterErrorMultiplier / 5.0;

+ // Various data lists required by digitization. + private List<String> readouts = new ArrayList<String>(); + private List<String> processPaths = new ArrayList<String>(); + private List<IDetectorElement> processDEs = new ArrayList<IDetectorElement>(); + private Set<SiSensor> processSensors = new HashSet<SiSensor>(); + private Set<SiTrackerModule> processModules = new HashSet<SiTrackerModule>(); + + // Digi class objects. + private SiDigitizer stripDigitizer; + private StripHitMaker stripClusterer; +

+ public void setRawTrackerHitOutputCollectionName(String rawTrackerHitOutputCollectionName) + { + this.rawTrackerHitOutputCollectionName = rawTrackerHitOutputCollectionName; + } + + public void setStripHitOutputCollectionName(String stripHitOutputCollectionName) + { + this.stripHitOutputCollectionName = stripHitOutputCollectionName; + } +

+ {} + + /** + * Initializes this Driver's objects with the job parameters. + */ + private void initialize() + { + if (DEBUG) + System.out.println(this.getClass() + " - initialize"); +

Commit in `hps-java/src/main/java/org/lcsim/hps/recon/tracking` on MAIN
`TrackerReconDriver.java`	+68	-63	1.3 -> 1.4
`TrackerDigiDriver.java`	+106	-67	1.4 -> 1.5
	+174	-130