diff -u -r1.2 -r1.3
--- MultiTrackReco.java	26 Aug 2010 19:55:51 -0000	1.2
+++ MultiTrackReco.java	23 Sep 2010 16:06:37 -0000	1.3
@@ -24,7 +24,7 @@

 public class MultiTrackReco extends Driver {
 
     private AIDA aida = AIDA.defaultInstance();

-    

+

     public MultiTrackReco(double referenceX, double referenceY, double BField, String sFinalfile, String sLongLived, List<int[]> stereoPairs, List<Integer> passLayers) {
         String strategyPrefix = "/nfs/sulky21/g.ec.u12/users/mgraham/AtlasUpgrade/hps-java/src/main/resources/";
 

@@ -50,7 +50,7 @@

         //  4)  run track finding with the remaining points
 
 

-      

+

 
         DarkForcesHitDriver hthdriver = new DarkForcesHitDriver();
         hthdriver.addCollection(((TrackerHitDriver_DarkPhoton) thd).getStripHits1DName());

@@ -67,34 +67,32 @@

 
         add(hthdriver);
 

-       
-        //       List<SeedStrategy> sFinallist = StrategyXMLUtils.getStrategyListFromResource(sFinalfile);

+

         List<SeedStrategy> sFinallist = StrategyXMLUtils.getStrategyListFromFile(new File(strategyPrefix + sFinalfile));

-//        List<SeedStrategy> sFinallist = StrategyXMLUtils.

         SeedTracker stFinal = null;

+
+
+        stFinal = new SeedTracker(sFinallist);
+        stFinal.setInputCollectionName("HelicalTrackHits");
+        stFinal.setTrackCollectionName("MatchedTracks");
+        stFinal.setBField(BField);
+        stFinal.setTimingPlots(true);
+

-//            stFinal = new SeedTracker(sFinallist, "HelicalTrackHits", "MatchedTracks");
-//        stFinal.setBField(BField);
-//        stFinal.setTimingPlots(true);
-//        stFinal.setDiagnostics(new SeedTrackerDiagnostics());
-//        stFinal.setTrackCheck(new CheckDPTrack());
-//        stFinal.setReferencePoint(referenceX, referenceY);
-//        stFinal.setSectorParams(false);
-//        add(stFinal);

 
         StripHitsOnTrack shot = new StripHitsOnTrack();
         add(shot);
 
         List<SeedStrategy> sLLlist = StrategyXMLUtils.getStrategyListFromFile(new File(strategyPrefix + sLongLived));

-        
-//        SeedTracker stLL = new SeedTracker(sLLlist, "RemainingHits", "LLTracks");

-//        stLL.setBField(BField);
-//        stLL.setTimingPlots(true);
-//        stFinal.setDiagnostics(new SeedTrackerDiagnostics());
-//        stLL.setTrackCheck(new CheckLLTrack());
-//        stLL.setReferencePoint(referenceX, referenceY);
-//        stLL.setSectorParams(false);
-//        add(stLL);

+
+        SeedTracker stLL = new SeedTracker(sLLlist);
+        stLL.setInputCollectionName("RemainingHits");
+        stLL.setTrackCollectionName("LLTracks");
+        stLL.setBField(BField);
+        stLL.setTimingPlots(true);
+
+
+       add(stLL);

     }
 }

diff -u -r1.4 -r1.5
--- TrackReconstructionDriver.java	26 Aug 2010 19:55:52 -0000	1.4
+++ TrackReconstructionDriver.java	23 Sep 2010 16:06:37 -0000	1.5
@@ -25,89 +25,14 @@

     private AIDA aida = AIDA.defaultInstance();
 
     public TrackReconstructionDriver() {

-        double referenceX=150.0;

+        double referenceX = 150.0;

 //         double referenceX=0.0;

-        double referenceY=0.0;
-        double BField=1.0;

+        double referenceY = 0.0;
+        double BField = 1.0;

 
         //  Digitization and hit making driver for planar sensors
         TrackerHitDriver_DarkPhoton thd = new TrackerHitDriver_DarkPhoton();
         add(thd);
 

-        //  Driver to make HelicalTrackHits for tracking
-//        HelicalTrackHitDriver hitdriver = new HelicalTrackHitDriver();
-//        hitdriver.addCollection(((TrackerHitDriver_DarkPhoton) thd).getStripHits1DName(), HitType.Digitized);
-//        hitdriver.addCollection(((TrackerHitDriver_sATLAS) thd).getPixelHitsName(), HitType.Digitized);
-//        hitdriver.OutputCollection("HelicalTrackHits");
-//        add(hitdriver);
-
-        DarkForcesHitDriver hitdriver = new DarkForcesHitDriver();
-        hitdriver.addCollection(((TrackerHitDriver_DarkPhoton) thd).getStripHits1DName());
-//        hitdriver.OutputCollection("HelicalTrackHits");
-         hitdriver.OutputCollection("AxialTrackHits");
-          hitdriver.HitRelationName("AxialTrackHitRelations");
-           hitdriver.MCRelationName("AxialTrackMCRelations");
-
-        /*
-        hitdriver.setStereoPair("Tracker",1,2);
-        hitdriver.setStereoPair("Tracker",3,4);
-        hitdriver.setStereoPair("Tracker",6,7);
-        hitdriver.setMaxSeperation(50.);
-         */
-        add(hitdriver);
-        //  Tracking code
-//        String sfile = StrategyXMLUtils.getDefaultStrategiesPrefix() + "sATLASFull-JeffMarch26.xml";
-//        String sfile = StrategyXMLUtils.getDefaultStrategiesPrefix() + "sATLASFull-Simple.xml";
-
-        String sfile = StrategyXMLUtils.getDefaultStrategiesPrefix() + "DarkPhoton-Test.xml";
-        List<SeedStrategy> slist = StrategyXMLUtils.getStrategyListFromResource(sfile);
-
-//        SeedTracker st = new SeedTracker(slist,"AxialTrackHits","AxialTracks");
-//        st.setBField(BField);
-//        st.setTimingPlots(true);
-//        st.setDiagnostics(new SeedTrackerDiagnostics());
-//        st.setTrackCheck(new CheckAxialTrack());
-//        st.setReferencePoint(referenceX, referenceY);
-//        st.setSectorParams(false);
-//        add(st);
-
-
-          
-
-
-        DarkForcesHitDriver hthdriver = new DarkForcesHitDriver();
-        hthdriver.addCollection(((TrackerHitDriver_DarkPhoton) thd).getStripHits1DName());
-        hthdriver.OutputCollection("HelicalTrackHits");
-        hthdriver.HitRelationName("HelicalTrackHitRelations");
-        hthdriver.MCRelationName("HelicalTrackMCRelations");
-
-
-        hthdriver.setStereoPair("Tracker", 1, 2);
-        hthdriver.setStereoPair("Tracker", 3, 4);
-        hthdriver.setStereoPair("Tracker", 6, 7);
-        hthdriver.setMaxSeperation(50.);
-        hthdriver.setTolerance(0.);
-
-        //hthdriver.setMaxSeperation(10.);
-        //hthdriver.setTolerance(0.1);
-
-        add(hthdriver);
-
-        
-        ReReconstructionDriver rrd=new ReReconstructionDriver();
-        add(rrd);
-
-       String sFinalfile = StrategyXMLUtils.getDefaultStrategiesPrefix() + "DarkPhoton-Final.xml";
-        List<SeedStrategy> sFinallist = StrategyXMLUtils.getStrategyListFromResource(sFinalfile);
-
-//        SeedTracker stFinal = new SeedTracker(sFinallist,"MatchedHTHits","MatchedTracks");
-//        stFinal.setBField(BField);
-//        stFinal.setTimingPlots(true);
-//        stFinal.setDiagnostics(new SeedTrackerDiagnostics());
-//        stFinal.setTrackCheck(new CheckDPTrack());
-//        stFinal.setReferencePoint(referenceX, referenceY);
-//        stFinal.setSectorParams(false);
-//        add(stFinal);
-

     }
 }