lcsim/src/org/lcsim/recon/tracking/trfdca
diff -u -r1.3 -r1.4
--- SurfDCA.java 31 Aug 2005 07:39:19 -0000 1.3
+++ SurfDCA.java 25 Jul 2007 17:19:28 -0000 1.4
@@ -4,13 +4,13 @@
import org.lcsim.recon.tracking.trfutil.Assert;
import org.lcsim.recon.tracking.trfutil.TRFMath;
-import org.lcsim.spacegeom.CylindricalPointVector;
-import org.lcsim.spacegeom.SpacePoint;
-import org.lcsim.spacegeom.SpacePath;
-import org.lcsim.spacegeom.CartesianPoint;
-import org.lcsim.spacegeom.CartesianPath;
-import org.lcsim.spacegeom.CylindricalPath;
-import org.lcsim.spacegeom.SpacePointVector;
+import org.lcsim.recon.tracking.spacegeom.CylindricalPointVector;
+import org.lcsim.recon.tracking.spacegeom.SpacePoint;
+import org.lcsim.recon.tracking.spacegeom.SpacePath;
+import org.lcsim.recon.tracking.spacegeom.CartesianPoint;
+import org.lcsim.recon.tracking.spacegeom.CartesianPath;
+import org.lcsim.recon.tracking.spacegeom.CylindricalPath;
+import org.lcsim.recon.tracking.spacegeom.SpacePointVector;
import org.lcsim.recon.tracking.trfbase.Surface;
import org.lcsim.recon.tracking.trfbase.PureStat;
@@ -344,9 +344,9 @@
double r_dphi_ds = clam*salf;
double dz_ds = slam;
SpacePointVector sp = new CylindricalPointVector(r, phi, z, dr_ds, r_dphi_ds, dz_ds);
- double x = sp.getStartPoint().x() + _x + _dxdz*z;
- double y = sp.getStartPoint().y() + _y + _dydz*z;
- return new CartesianPath(x, y, sp.getStartPoint().z(), sp.getDirection().x(), sp.getDirection().y(), sp.getDirection().z());
+ double x = sp.x() + _x + _dxdz*z;
+ double y = sp.y() + _y + _dydz*z;
+ return new CartesianPath(x, y, sp.z(), sp.x(), sp.y(), sp.z());
}