Commit in lcsim/src/org/lcsim/fit/helicaltrack on MAIN | |||
HelixUtils.java | +9 | -13 | 1.15 -> 1.16 |
reverting change from Pelle in order maintain DBD version of tracking
diff -u -r1.15 -r1.16 --- HelixUtils.java 18 Oct 2012 15:22:43 -0000 1.15 +++ HelixUtils.java 18 Oct 2012 18:23:13 -0000 1.16 @@ -7,13 +7,15 @@
package org.lcsim.fit.helicaltrack;
+import hep.physics.vec.BasicHep3Vector; +import hep.physics.vec.Hep3Vector;
import hep.physics.matrix.BasicMatrix; import hep.physics.matrix.Matrix;
+
import hep.physics.matrix.SymmetricMatrix;
-import hep.physics.vec.BasicHep3Vector; -import hep.physics.vec.Hep3Vector;
import java.util.ArrayList; import java.util.List;
+
import org.lcsim.fit.circle.CircleFit; /**
@@ -68,7 +70,7 @@
return PathCalc(xc(cfit), yc(cfit), RC(cfit), x0(cfit), y0(cfit), pos.x(), pos.y()); }
- /**
+ /**
* Return the x-y path length from the DCA to a HelicalTrackHit. * @param helix HelicalTrackFit to be used in calculating the path length * @param hit hit to be used for the path length calculation
@@ -531,25 +533,19 @@
} private static double xc(CircleFit cfit) {
- //Note that DCA for circle fit has opposite sign w.r.t. the standard L3 definition - return cfit.xref() + (RC(cfit) - (-1*cfit.dca())) * Math.sin(cfit.phi()); -
+ return cfit.xref() + (RC(cfit) - cfit.dca()) * Math.sin(cfit.phi());
} private static double yc(CircleFit cfit) {
- //Note that DCA for circle fit has opposite sign w.r.t. the standard L3 definition - return cfit.yref() - (RC(cfit) - (-1*cfit.dca())) * Math.cos(cfit.phi()); -
+ return cfit.yref() - (RC(cfit) - cfit.dca()) * Math.cos(cfit.phi());
} private static double x0(CircleFit cfit) {
- //Note that DCA for circle fit has opposite sign w.r.t. the standard L3 definition - return cfit.xref() - (-1*cfit.dca()) * Math.sin(cfit.phi());
+ return cfit.xref() - cfit.dca() * Math.sin(cfit.phi());
} private static double y0(CircleFit cfit) {
- //Note that DCA for circle fit has opposite sign w.r.t. the standard L3 definition - return cfit.yref() + (-1*cfit.dca()) * Math.cos(cfit.phi());
+ return cfit.yref() + cfit.dca() * Math.cos(cfit.phi());
} }
\ No newline at end of file
Use REPLY-ALL to reply to list
To unsubscribe from the LCD-CVS list, click the following link:
https://listserv.slac.stanford.edu/cgi-bin/wa?SUBED1=LCD-CVS&A=1