Commit in hps-java/src/main/java/org/lcsim/hps/recon/tracking on MAIN
TestProposalTrackRecon.java+2-71.2 -> 1.3
TestProposalTrackReconSteeringDriver.java+8-181.2 -> 1.3
+10-25
2 modified files
minor cleanup to recon drivers

hps-java/src/main/java/org/lcsim/hps/recon/tracking
TestProposalTrackRecon.java 1.2 -> 1.3
diff -u -r1.2 -r1.3
--- TestProposalTrackRecon.java	27 May 2011 21:20:10 -0000	1.2
+++ TestProposalTrackRecon.java	27 May 2011 21:36:08 -0000	1.3
@@ -15,16 +15,11 @@
  * Based on simplification of MultiTrackReco from Matt Graham.
  *
  * @author Jeremy McCormick <[log in to unmask]>
- * @version $Id: TestProposalTrackRecon.java,v 1.2 2011/05/27 21:20:10 jeremy Exp $
+ * @version $Id: TestProposalTrackRecon.java,v 1.3 2011/05/27 21:36:08 jeremy Exp $
  */
 public class TestProposalTrackRecon extends Driver 
 {
-    public TestProposalTrackRecon(
-            double bField, 
-            String strategyResource, 
-            List<int[]> stereoPairs, 
-            List<Integer> passLayers
-            ) 
+    public TestProposalTrackRecon(double bField, String strategyResource, List<int[]> stereoPairs) 
     {
         // Make digi hits.
         HPSTrackerHitDriver thd = new HPSTrackerHitDriver();

hps-java/src/main/java/org/lcsim/hps/recon/tracking
TestProposalTrackReconSteeringDriver.java 1.2 -> 1.3
diff -u -r1.2 -r1.3
--- TestProposalTrackReconSteeringDriver.java	27 May 2011 21:20:10 -0000	1.2
+++ TestProposalTrackReconSteeringDriver.java	27 May 2011 21:36:08 -0000	1.3
@@ -8,54 +8,44 @@
 import org.lcsim.util.Driver;
 
 /**
- * Driver for track reconstruction and analysis of HPS Test Propsal detector.
- * Based on simplification of HeavyPhotonLLDriver from Matt Graham.
+ * Simple top level steering driver to perform tracking recon in HPS Test Proposal detector.
+ * Based on HeavyPhotonLLDriver by Matt Graham.
  *
  * @author Jeremy McCormick <[log in to unmask]>
- * @version $Id: TestProposalTrackReconSteeringDriver.java,v 1.2 2011/05/27 21:20:10 jeremy Exp $
+ * @version $Id: TestProposalTrackReconSteeringDriver.java,v 1.3 2011/05/27 21:36:08 jeremy Exp $
  */
 public final class TestProposalTrackReconSteeringDriver extends Driver 
 {    
-    // Tracking params.
-    List<int[]> pairs = new ArrayList();
-    List<Integer> passLayers = new ArrayList();
-    
     // FIXME: This should come from Detector.
     double bfield = 0.5;
 
-    // Strategy file for tracking.
+    // Strategy file for tracking that lives in hps-java resources dir.
+    // FIXME: Make the strategy settable from steering file.
     String strategyResource = "/HPS-Test-1pt3.xml";
 
     public TestProposalTrackReconSteeringDriver() 
     {
+        // Setup layer pairings.
+        List<int[]> pairs = new ArrayList();
         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);
         
-        
         // Add Driver to setup sensors.
         add(new MakeSensorsDriver());
         
-        System.out.println(this.getClass().getCanonicalName() + " ...");
-        System.out.println("  bfield="+bfield);
-        System.out.println("  strategyResource="+strategyResource);
-        System.out.println("  npairs="+pairs.size());
-        System.out.println("  npassLayers="+passLayers.size());
-        
         // Add track recon Driver.
         TestProposalTrackRecon trd = new TestProposalTrackRecon(
                 bfield,
                 strategyResource,
-                pairs, 
-                passLayers);
+                pairs);
         add(trd);
     }
     
CVSspam 0.2.8