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

diff -u -r1.29 -r1.30
--- TrackerReconDriver.java	22 Nov 2012 02:48:54 -0000	1.29
+++ TrackerReconDriver.java	25 Nov 2012 21:55:12 -0000	1.30
@@ -3,6 +3,7 @@

 import hep.physics.vec.BasicHep3Vector;
 
 import java.util.ArrayList;

+import java.util.Arrays;

 import java.util.List;
 
 import org.lcsim.event.EventHeader;

@@ -46,51 +47,12 @@

     private String trackCollectionName = "MatchedTracks";
     // HelicalTrackHit input collection.
     private String stInputCollectionName = "RotatedHelicalTrackHits";

-    HPSHelicalTrackHitDriver hthdriver = new HPSHelicalTrackHitDriver();
-    private boolean runHelicalTrackHitDriver = true;
-

+    

     public TrackerReconDriver() {
     }
 
     public void setDebug(boolean debug) {
         this.debug = debug;

-        hthdriver.setDebug(debug);
-    }
-
-    public void setRunHelicalTrackHitDriver(boolean runHelicalTrackHitDriver) {
-        this.runHelicalTrackHitDriver = runHelicalTrackHitDriver;
-    }
-
-    public void setSubdetectorName(String subdetectorName) {
-        hthdriver.setSubdetectorName(subdetectorName);
-    }
-
-    public void setStripHitsCollectionName(String stripHitsCollectionName) {
-        hthdriver.HitRelationName(stripHitsCollectionName);
-    }
-
-    public void setHelicalTrackHitRelationsCollectionName(String helicalTrackHitRelationsCollectionName) {
-        hthdriver.HitRelationName(helicalTrackHitRelationsCollectionName);
-    }
-
-    public void setHelicalTrackMCRelationsCollectionName(String helicalTrackMCRelationsCollectionName) {
-        hthdriver.MCRelationName(helicalTrackMCRelationsCollectionName);
-    }
-
-    public void setOutputHitCollectionName(String outputHitCollectionName) {
-        hthdriver.setOutputCollectionName(outputHitCollectionName);
-    }
-
-    public void setStripMaxSeparation(double stripMaxSeparation) {
-        hthdriver.setMaxSeperation(stripMaxSeparation);
-    }
-
-    public void setStripTolerance(double stripTolerance) {
-        hthdriver.setTolerance(stripTolerance);
-    }
-    
-    public void setLayerGeometryType(String geomType) {
-        hthdriver.setLayerGeometryType(geomType);

     }
 
     /**

@@ -111,16 +73,7 @@

         this.trackCollectionName = trackCollectionName;
     }
 

-    /**
-     * Set the SimTrackerHit collection to be used for tracking.
-     *
-     * @param simTrackerHitCollectionName The name of the SimTrackerHit
-     * collection in the event.
-     */
-    public void setSimTrackerHitCollectionName(String simTrackerHitCollectionName) {
-        hthdriver.setCollection(simTrackerHitCollectionName);
-    }
-

+   

     /**
      * This is used to setup the Drivers after XML config.
      */

@@ -133,7 +86,7 @@

         // FIXME Is this always right?
         this.bfield = Math.abs((detector.getFieldMap().getField(new BasicHep3Vector(0, 0, 0)).y()));
         if (debug) {

-            System.out.println("Set B-field to " + this.bfield);

+            System.out.printf("%s: Set B-field to %.3f",this.getClass().getSimpleName(),this.bfield);

         }
 
         initialize();

@@ -145,17 +98,9 @@

      * Setup all the child Drivers necessary for track reconstruction.
      */
     private void initialize() {

-        //
-        // 1) Driver to create HelicalTrackHits expected by Seedtracker.
-        //
-        // TODO Make this step its own separate Driver??? (Matt)
-
-        if (runHelicalTrackHitDriver) {
-            add(hthdriver);
-        }

 
         //

-        // 2) Driver to run Seed Tracker.

+        // 1) Driver to run Seed Tracker.

         //
 
         if (!strategyResource.startsWith("/")) {

@@ -174,11 +119,9 @@

         add(stFinal);
 
         //

-        // 3) Cleanup the readouts for next event.

+        // 2) Cleanup the readouts for next event.

         //

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

+        add(new ReadoutCleanupDriver(Arrays.asList(this.trackerReadoutName)));

     }
 
     /**