hps-java/src/main/java/org/lcsim/hps/users/phansson
diff -u -r1.7 -r1.8
--- AlignmentUtils.java 28 Sep 2012 22:08:39 -0000 1.7
+++ AlignmentUtils.java 23 Oct 2012 01:52:23 -0000 1.8
@@ -25,7 +25,7 @@
public void setDebug(boolean debug) {
_debug = debug;
}
- public BasicMatrix calculateLocalHelixDerivatives(HelicalTrackFit trk, HelicalTrackStrip strip, double smax, int _nlc) {
+ public BasicMatrix calculateLocalHelixDerivatives(HelicalTrackFit trk, double xint) {
// Calculate the derivative w.r.t. to the track parameters (in order/index):
// d0, z0, slope, phi0, R
@@ -39,14 +39,13 @@
// The return object is a 3-by-5 matrix with the derivatives.
//
// Input:
- double xint = strip.origin().x(); // the position along the beam axis (x-axis) for the strip.
double xr = 0.0; // reference position - typically set top PCA i.e. (x0,y0)
double yr = 0.0; // reference position - typically set top PCA i.e. (x0,y0)
double d0 = trk.dca();
double phi0 = trk.phi0();
double R = trk.R();
double slope = trk.slope();
- double s = HelixUtils.PathToXPlane(trk, xint, smax, _nlc).get(0);
+ double s = HelixUtils.PathToXPlane(trk, xint, 0, 0).get(0);
double phi = -s/R + phi0;
BasicMatrix dfdq = new BasicMatrix(3,5); //3-dim,ntrackparams