lcsim/src/org/lcsim/fit/helicaltrack

diff -u -r1.11 -r1.12
--- HelicalTrackFit.java	23 May 2008 15:46:08 -0000	1.11
+++ HelicalTrackFit.java	23 May 2008 16:10:09 -0000	1.12
@@ -3,7 +3,7 @@

  *
  * Created on March 25, 2006, 6:11 PM
  *

- * $Id: HelicalTrackFit.java,v 1.11 2008/05/23 15:46:08 partridge Exp $

+ * $Id: HelicalTrackFit.java,v 1.12 2008/05/23 16:10:09 partridge Exp $

  */
 
 package org.lcsim.fit.helicaltrack;

@@ -35,18 +35,19 @@

     
     /** Creates a new instance of HelicalTrackFit */
     public HelicalTrackFit(double[] pars, SymmetricMatrix cov, double[] chisq, int[] ndf) {

-        this(pars, cov, chisq, ndf, new HashMap<HelicalTrackHit, Double>());

+        this(pars, cov, chisq, ndf, new HashMap<HelicalTrackHit, Double>(), 
+                new HashMap<HelicalTrackHit, MultipleScatter>());

     }
     
     public HelicalTrackFit(double[]pars, SymmetricMatrix cov, double[] chisq, int[] ndf,

-            Map<HelicalTrackHit, Double> smap) {

+            Map<HelicalTrackHit, Double> smap, Map<HelicalTrackHit, MultipleScatter> msmap) {

         _parameters = pars;
         _covmatrix = cov;
         _chisq = chisq;
         _nhchisq = 0.;
         _ndf = ndf;
         _smap = smap;

-        _msmap = new HashMap<HelicalTrackHit, MultipleScatter>();

+        _msmap = msmap;

     }
     
     public double[] parameters() {

@@ -98,10 +99,6 @@

         return _ndf;
     }
     

-    public Map<HelicalTrackHit, Double> pathmap() {
-        return _smap;
-    }
-    

     public double cth() {
         return _parameters[4] / Math.sqrt(1 + Math.pow(slope(), 2));
     }

lcsim/src/org/lcsim/fit/helicaltrack

diff -u -r1.19 -r1.20
--- HelicalTrackFitter.java	4 Apr 2008 23:39:30 -0000	1.19
+++ HelicalTrackFitter.java	23 May 2008 16:10:09 -0000	1.20
@@ -4,7 +4,7 @@

  *
  * Created on March 25, 2006, 6:11 PM
  *

- * $Id: HelicalTrackFitter.java,v 1.19 2008/04/04 23:39:30 partridge Exp $

+ * $Id: HelicalTrackFitter.java,v 1.20 2008/05/23 16:10:09 partridge Exp $

  */
 
 import hep.physics.matrix.SymmetricMatrix;

@@ -252,7 +252,7 @@

         }
         
         //  Create the HelicalTrackFit for this helix and exit

-        _fit = new HelicalTrackFit(par, cov, chisq, ndof, smap);

+        _fit = new HelicalTrackFit(par, cov, chisq, ndof, smap, msmap);

         return FitStatus.Success;
     }