lcsim/src/org/lcsim/fit/helicaltrack

diff -u -r1.12 -r1.13
--- HelicalTrackFitter.java	11 Dec 2007 20:35:04 -0000	1.12
+++ HelicalTrackFitter.java	11 Dec 2007 20:51:25 -0000	1.13
@@ -4,7 +4,7 @@

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

- * $Id: HelicalTrackFitter.java,v 1.12 2007/12/11 20:35:04 partridge Exp $

+ * $Id: HelicalTrackFitter.java,v 1.13 2007/12/11 20:51:25 partridge Exp $

  */
 
 import hep.physics.matrix.SymmetricMatrix;

@@ -120,7 +120,7 @@

             x[i] = hit.x();
             y[i] = hit.y();
             double drphi_ms = 0.;

-            if (msmap.containsKey(hit)) drphi_ms = msmap.get(hit).drphi(); 

+            if (msmap.containsKey(hit)) drphi_ms = msmap.get(hit).bendMS(); 

             wrphi[i] = 1. / (Math.pow(hit.drphi(),2) + Math.pow(drphi_ms,2));
             System.out.println(" Circle fit - x: "+x[i]+" y "+y[i]+" w "+wrphi[i]);
         }

@@ -160,7 +160,7 @@

                 HelicalTrack3DHit hit = (HelicalTrack3DHit) pixel_hits.get(i);
                 z[i] = hit.z();
                 double dz_ms = 0.;

-                if (msmap.containsKey(hit)) dz_ms = msmap.get(hit).dz();

+                if (msmap.containsKey(hit)) dz_ms = msmap.get(hit).straightMS();

                 dz[i] = Math.sqrt(Math.pow(hit.dz(),2)+Math.pow(dz_ms,2));
                 s[i] = smap.get(hit);
                 System.out.println("Line fit - z: "+z[i]+" s "+s[i]+" dz "+dz[i]);

@@ -190,7 +190,7 @@

             if (npix == 1) {
                 HelicalTrack3DHit hit = (HelicalTrack3DHit) pixel_hits.get(0);
                 double dz_ms = 0.;

-                if (msmap.containsKey(hit)) dz_ms = msmap.get(hit).dz();

+                if (msmap.containsKey(hit)) dz_ms = msmap.get(hit).straightMS();

                 double dz = Math.sqrt(Math.pow(hit.dz(),2)+Math.pow(dz_ms,2));
                 double zmin = hit.z() - dz;
                 double zmax = hit.z() + dz;