diff -u -r1.3 -r1.4
--- TrackPathMaterials.java	15 Mar 2005 00:43:07 -0000	1.3
+++ TrackPathMaterials.java	10 Aug 2005 20:25:18 -0000	1.4
@@ -295,14 +295,16 @@

        nla++;
        if(nlin%ngrp == ngrp-1)
        {

-        swmr.swim(ri);

+        swmr.swim(ri,z_pl);

         double lenin = swmr.getLength();

-        swmr.swim(rout);

+        swmr.swim(rout,z_pl);

         double lenout = swmr.getLength();

-        active[npnts] = (swmr.getPlane() == swmr.PLANE_R);
-        pathco[npnts] = (lenout-lenin)/(rout-ri);

         r_cyl/=nla;
         swmr.swim(r_cyl,z_pl);

+		if(debug) System.out.println("lr "+i+"ri : "+df.format(ri)+" rout: "+df.format(rout)+
+		 " lenin: "+df.format(lenin)+" lenout: "+df.format(lenout));
+        active[npnts] = (swmr.getPlane() == swmr.PLANE_R);
+        pathco[npnts] = (lenout-lenin)/(rout-ri);

          pathlen[npnts] = swmr.getLength();
          lradii[npnts] = r_cyl;
          npnts++;

@@ -312,7 +314,7 @@

       }
      }
     }

-//	System.out.println("TrackPathMaterials: Track crossed "+npnts+" detector layers");

+	if(debug) System.out.println("TrackPathMaterials: Track crossed "+npnts+" detector layers");

    }
 
    for(int i=0; i<npnts; i++)

@@ -395,7 +397,8 @@

      Material tpmat = tpml.getMaterial(i);
      String mat = tpmat.getName();
 	 if(debug) System.out.println(mat);

-     double thk = tpmat.getThickness(); 

+     double thk = tpmat.getThickness();
+//	 System.out.println("Getting DeDx for "+mat);

      double el = thk * dedx.getDeDx(mat);
      ldedx[pnts]+=el;
      thgr+=0.5*thkp+0.5*thk;

diff -u -r1.3 -r1.4
--- TrkFindStrategy.java	11 Mar 2005 19:34:59 -0000	1.3
+++ TrkFindStrategy.java	10 Aug 2005 20:25:18 -0000	1.4
@@ -20,7 +20,7 @@

 {
  public final int nDetectors = 2;
  public final int maxLevels = 2;

- public final int maxPatterns = 3;

+ public final int maxPatterns = 13;

  public int[] nLevels = new int[nDetectors];
  public int[] nPatterns = new int[nDetectors];
  public int[][] nPtsReq = new int[nDetectors][maxLevels];

@@ -36,7 +36,10 @@

      int[] Patterns = {2,3};
      double[][] Radius = {{40.,15.},{20.,8.}};
      int[][] pnts = {{80,18},{9,5}};

-     int[][][] tri = {{{97,45,4},{25,11,3},{10,5,2}},{{9,7,3},{6,4,2},{5,3,1}}};

+     int[][][] tri = {{{97,45,4},{25,11,3},{10,5,2},{0,0,0},{0,0,0},{0,0,0},{0,0,0},
+		 {0,0,0},{0,0,0},{0,0,0},{0,0,0},{0,0,0},{0,0,0}},
+	 {{9,7,3},{6,4,2},{5,3,1},{0,0,0},{0,0,0},{6,5,1},{6,2,0},{5,1,0},
+	     {7,6,1},{7,5,0},{6,5,0},{8,7,5},{8,6,0}}};

      rTol[0] = 8.;
      rTol[1] = 0.3;
      zTol[0] = 30.;

diff -u -r1.2 -r1.3
--- TrkFitter.java	26 Mar 2002 18:28:25 -0000	1.2
+++ TrkFitter.java	10 Aug 2005 20:25:18 -0000	1.3
@@ -28,6 +28,7 @@

     public boolean fitSuccess();
     public double[][] getErrorMatrix();
     public double getChi2();

+	public double getUnfitChi2();

     public double getNDF();
 }
 

diff -u -r1.2 -r1.3
--- VXDBasedReco.java	15 Mar 2005 00:45:42 -0000	1.2
+++ VXDBasedReco.java	10 Aug 2005 20:25:18 -0000	1.3
@@ -53,30 +53,35 @@

     }
     public VXDBasedReco(boolean hist)
     {

-        this(hist,null,true,true);

+        this(hist,null,true,true,true);

     }
 	public VXDBasedReco(boolean hist,boolean doFit)
 	{

-	 this(hist,null,doFit,true);	

+	 this(hist,null,doFit,true,true);	

 	}	
 	public VXDBasedReco(boolean hist,boolean doFit,boolean incEC)
 	{

-	 this(hist,null,doFit,incEC);	

+	 this(hist,null,doFit,incEC,false);	
+	}
+	public VXDBasedReco(boolean hist,boolean doFit,boolean incEC,boolean incVEC)
+	{
+	 this(hist,null,doFit,incEC,incVEC);	

 	}
 	

-    public VXDBasedReco(boolean hist,VXDFindStrategy strat, boolean doFit,boolean inclEC)

+    public VXDBasedReco(
+	 boolean hist,VXDFindStrategy strat, boolean doFit,boolean inclEC,boolean incVXEC)

     {

-
-	if (!hist) Hstd = false;
-	dofit = doFit;
-	if (Hstd) HistogramFolder.setDefaultFolder("/Tracking");

+	 if (!hist) Hstd = false;
+	 dofit = doFit;
+//	 if (Hstd) HistogramFolder.setDefaultFolder("/Tracking");

 
 	// Add processes
 	// Finds tracks

-	tracker = new VXDReco(hist,strat);
-	tracker.setIncludeEC(inclEC);
-	vxd = tracker.getVertexDetector();
-	add(tracker);

+	 tracker = new VXDReco(hist,strat);
+	 tracker.setIncludeEC(inclEC);
+	 tracker.setIncludeVXDEC(incVXEC);
+	 vxd = tracker.getVertexDetector();
+	 add(tracker);

 	// Fit tracks
 	if(dofit)
 	{

@@ -90,6 +95,11 @@

 	 addReconTrks.useVertexDetector();
 	add(addReconTrks);
     }

+	
+	public void setTrkTrace(boolean set, int track)
+	{
+		addReconTrks.setTrace(set,track);
+	}

 
 /**/
 }