Commit in lcsim/src/org/lcsim/recon/tracking/seedtracker/diagnostic on MAIN
FindableTracks.java+5-61.3 -> 1.4
SeedTrackerDiagnostics.java+3-41.3 -> 1.4
+8-10
2 modified files
Fix conflict with other versions of the diagnostics

lcsim/src/org/lcsim/recon/tracking/seedtracker/diagnostic
FindableTracks.java 1.3 -> 1.4
diff -u -r1.3 -r1.4
--- FindableTracks.java	9 Oct 2008 17:49:07 -0000	1.3
+++ FindableTracks.java	9 Oct 2008 18:18:51 -0000	1.4
@@ -38,12 +38,11 @@
     
     private Hep3Vector ip = new BasicHep3Vector(0,0,0);
     
-    public FindableTracks(List<SeedStrategy> strategies, HitManager hm){
-//  Need to fix this code    
-//        goodMCs = determineGoodMCs(strategy, hm);
-//        minPt = strategy.getMinPT();
-//        maxDCA = strategy.getMaxDCA();
-//        maxZ0 = strategy.getMaxZ0();
+    public FindableTracks(SeedStrategy strategy, HitManager hm){
+        goodMCs = determineGoodMCs(strategy, hm);
+        minPt = strategy.getMinPT();
+        maxDCA = strategy.getMaxDCA();
+        maxZ0 = strategy.getMaxZ0();
     }
     /**
      * Checks whether the given MCParticle is findable according

lcsim/src/org/lcsim/recon/tracking/seedtracker/diagnostic
SeedTrackerDiagnostics.java 1.3 -> 1.4
diff -u -r1.3 -r1.4
--- SeedTrackerDiagnostics.java	9 Oct 2008 17:49:07 -0000	1.3
+++ SeedTrackerDiagnostics.java	9 Oct 2008 18:18:51 -0000	1.4
@@ -50,8 +50,7 @@
         Map<SeedCandidate,SeedValidator> vmap = generateValidators(seedlist);
         makePurityPlots(vmap);        
         Set<MCParticle> likelyMCs = generateLikelyMCSet(vmap);
-        //  Need to fix this!!!
-//        makeEfficiencyPlots(likelyMCs, strategylist);
+        makeEfficiencyPlots(likelyMCs, currentStrategy);
     }
     
    /**
@@ -187,9 +186,9 @@
         }
     }
     
-    private void makeEfficiencyPlots(Set<MCParticle> likelyMCs, List<SeedStrategy> strategies){
+    private void makeEfficiencyPlots(Set<MCParticle> likelyMCs, SeedStrategy strategy){
         
-        FindableTracks findable = new FindableTracks(strategies, hitManager);
+        FindableTracks findable = new FindableTracks(strategy, hitManager);
         findable.setBField(bField);
         
         List<MCParticle> MCs = new ArrayList<MCParticle>(); 
CVSspam 0.2.8