diff -u -r1.3 -r1.4
--- DefaultStrategy.java	11 Aug 2007 00:17:32 -0000	1.3
+++ DefaultStrategy.java	11 Aug 2007 01:27:14 -0000	1.4
@@ -20,40 +20,40 @@

  * @version 1.0
  */
 public class DefaultStrategy {

-    private List<SeedStrategy> StrategyList;

+    private List<SeedStrategy> _strategylist;

     
     /** Creates a new instance of DefaultStrategy */
     public DefaultStrategy() {

-        StrategyList = new ArrayList();

+        _strategylist = new ArrayList();

         // Barrel only strategies

-        List<SeedLayer> TB012Layers = new ArrayList();
-        TB012Layers.add(new SeedLayer("TrackerBarrel", 0, BarrelEndcapFlag.BARREL, SeedType.Seed));
-        TB012Layers.add(new SeedLayer("TrackerBarrel", 1, BarrelEndcapFlag.BARREL, SeedType.Seed));
-        TB012Layers.add(new SeedLayer("TrackerBarrel", 2, BarrelEndcapFlag.BARREL, SeedType.Seed));
-        StrategyList.add(new SeedStrategy("TB012",TB012Layers));

+        List<SeedLayer> tb012layers = new ArrayList();
+        tb012layers.add(new SeedLayer("TrackerBarrel", 0, BarrelEndcapFlag.BARREL, SeedType.Seed));
+        tb012layers.add(new SeedLayer("TrackerBarrel", 1, BarrelEndcapFlag.BARREL, SeedType.Seed));
+        tb012layers.add(new SeedLayer("TrackerBarrel", 2, BarrelEndcapFlag.BARREL, SeedType.Seed));
+        _strategylist.add(new SeedStrategy("TB012",tb012layers));

         
         List<BarrelEndcapFlag> belist = new ArrayList();
         belist.add(BarrelEndcapFlag.ENDCAP_NORTH);
         belist.add(BarrelEndcapFlag.ENDCAP_SOUTH);
         
         for (BarrelEndcapFlag beflag : belist) {

-            List<SeedLayer> TD012Layers = new ArrayList();
-            TD012Layers.add(new SeedLayer("TrackerEndcap", 0, beflag, SeedType.Seed));
-            TD012Layers.add(new SeedLayer("TrackerEndcap", 2, beflag, SeedType.Seed));
-            TD012Layers.add(new SeedLayer("TrackerEndcap", 4, beflag, SeedType.Seed));
-            StrategyList.add(new SeedStrategy("TD012"+beflag.toString(),TD012Layers));

+            List<SeedLayer> td012layers = new ArrayList();
+            td012layers.add(new SeedLayer("TrackerEndcap", 0, beflag, SeedType.Seed));
+            td012layers.add(new SeedLayer("TrackerEndcap", 2, beflag, SeedType.Seed));
+            td012layers.add(new SeedLayer("TrackerEndcap", 4, beflag, SeedType.Seed));
+            _strategylist.add(new SeedStrategy("TD012"+beflag.toString(),td012layers));

-            List<SeedLayer> TCALayers = new ArrayList();
-            TCALayers.add(new SeedLayer("TrackerBarrel", 0, BarrelEndcapFlag.BARREL, SeedType.Seed));
-            TCALayers.add(new SeedLayer("TrackerBarrel", 1, BarrelEndcapFlag.BARREL, SeedType.Seed));
-            TCALayers.add(new SeedLayer("TrackerEndcap", 4, beflag, SeedType.Seed));
-            StrategyList.add(new SeedStrategy("TCA"+beflag.toString(),TCALayers));

+            List<SeedLayer> tca = new ArrayList();
+            tca.add(new SeedLayer("TrackerBarrel", 0, BarrelEndcapFlag.BARREL, SeedType.Seed));
+            tca.add(new SeedLayer("TrackerBarrel", 1, BarrelEndcapFlag.BARREL, SeedType.Seed));
+            tca.add(new SeedLayer("TrackerEndcap", 4, beflag, SeedType.Seed));
+            _strategylist.add(new SeedStrategy("TCA"+beflag.toString(),tca));

-            List<SeedLayer> TCBLayers = new ArrayList();
-            TCBLayers.add(new SeedLayer("TrackerBarrel", 0, BarrelEndcapFlag.BARREL, SeedType.Seed));
-            TCBLayers.add(new SeedLayer("TrackerEndcap", 2, beflag, SeedType.Seed));
-            TCBLayers.add(new SeedLayer("TrackerEndcap", 4, beflag, SeedType.Seed));
-            StrategyList.add(new SeedStrategy("TCB"+beflag.toString(),TCBLayers));

+            List<SeedLayer> tcb = new ArrayList();
+            tcb.add(new SeedLayer("TrackerBarrel", 0, BarrelEndcapFlag.BARREL, SeedType.Seed));
+            tcb.add(new SeedLayer("TrackerEndcap", 2, beflag, SeedType.Seed));
+            tcb.add(new SeedLayer("TrackerEndcap", 4, beflag, SeedType.Seed));
+            _strategylist.add(new SeedStrategy("TCB"+beflag.toString(),tcb));

         }        
     }
     

@@ -62,6 +62,6 @@

      * @return List of strategies to be used by SeedTracker
      */
     public List<SeedStrategy> getStrategyList() {

-        return StrategyList;

+        return _strategylist;

     }
 }

diff -u -r1.4 -r1.5
--- SeedTracker.java	11 Aug 2007 00:17:32 -0000	1.4
+++ SeedTracker.java	11 Aug 2007 01:27:15 -0000	1.5
@@ -150,17 +150,20 @@

     
     private boolean HelixCuts(SeedStrategy strategy, HelicalTrackFit helix) {
         double[] params = helix.parameters();

-        if (helix.chisq()[0]+helix.chisq()[1] > strategy.getMaxChisq()) return false;

         double pT = 0.0003 * _BField / Math.abs(params[2]);

-        if (pT < strategy.getMinPT()) return false;
-        if (params[0] > strategy.getMaxDCA()) return false;
-        if (params[3] > strategy.getMaxZ0()) return false;

+        double chisq = helix.chisq()[0]+helix.chisq()[1];
+        System.out.println(" chisq "+chisq);

         System.out.println(" d0 "+params[0]);
         System.out.println(" phi0 "+params[1]);
         System.out.println(" curvatures "+params[2]);
         System.out.println(" z0 "+params[3]);
         System.out.println(" slope "+params[4]);
         System.out.println(" pT "+pT);

+        if (chisq > strategy.getMaxChisq()*(1.+50./pT)) return false;
+        if (pT < strategy.getMinPT()) return false;
+        if (params[0] > strategy.getMaxDCA()) return false;
+        if (params[3] > strategy.getMaxZ0()) return false;
+        System.out.println(" Good track found");

         return true;
     }