lcsim/src/org/lcsim/recon/vertexing/zvtop4
diff -u -r1.4 -r1.5
--- ZvUtil.java 12 May 2005 23:29:08 -0000 1.4
+++ ZvUtil.java 27 Jul 2005 03:03:08 -0000 1.5
@@ -40,7 +40,13 @@
* @param jTrack
* @return the location of the maximum
*/
- public static SpacePoint twoTrackMax(Track iTrack, Track jTrack) {
+ public static SpacePoint twoTrackMax(ZvTrack iTrack, ZvTrack jTrack) {
+ // Tracks are divided into nPoints segments and the overlap is calculated
+ // only points along the tracks are considered
+ int nPoints = 2000;
+ for (int i=0; i<nPoints; ++i) {
+ iTrack.getTubeValue()
+ }
return new SpacePoint();
}
lcsim/src/org/lcsim/recon/vertexing/zvtop4
diff -u -r1.12 -r1.13
--- ZvTrack.java 26 Jul 2005 05:57:52 -0000 1.12
+++ ZvTrack.java 27 Jul 2005 03:03:08 -0000 1.13
@@ -25,7 +25,8 @@
*/
public class ZvTrack implements Track {
- // TODO ksi and kappa need to be calculated
+ // TODO ksi and kappa need to be calculated -- keep in mind the charge of the track
+
SpacePoint _referencePoint;
Hep3Vector _momentum;
ZvParameters _parameters;
@@ -37,8 +38,6 @@
boolean fitSuccess;
Track orgTrack;
- // FIXME this parameter is never set
- double z0 = 0.;
double trackRotationAngle;
// package wide constructor ensures I don't have to worry about anybody
// creating invalid ZvTracks.
@@ -298,14 +297,13 @@
return orgTrack.getType();
}
- // TODO variables !!!
- // ALL WRONG !
public double getTubeValue(SpacePoint location) {
- SpacePoint r = transformLocation(_referencePoint);
- double termA = (r.x() - _referencePoint.x() - _parameters.get(ZvParameterNames.kappa)
+ SpacePoint r = transformLocation(location);
+ SpacePoint refPrime = transformLocation(_referencePoint);
+ double termA = (r.x() - refPrime.x() - _parameters.get(ZvParameterNames.kappa)
* r.y() * r.y())
/ sigmaT;
- double termB = (r.z() - z0 - _parameters.get(ZvParameterNames.s)
+ double termB = (r.z() - refPrime.z() - _parameters.get(ZvParameterNames.s)
* r.y())
/ sigmaL;
return Math.exp(-1 / 2 * (termA * termA + termB * termB));
lcsim/src/org/lcsim/recon/vertexing/zvtop4
diff -u -r1.8 -r1.9
--- ZvTop.java 18 Jul 2005 02:34:12 -0000 1.8
+++ ZvTop.java 27 Jul 2005 03:03:08 -0000 1.9
@@ -52,8 +52,8 @@
// Number of points to check along the line from point 1 to point 2
int iterationMax = 3000;
- private double sigmaT = 0.;
- private double sigmaL = 0.;
+ private double sigmaT;
+ private double sigmaL;
void setIpWeight(double w) {
ipWeight = w;
@@ -121,8 +121,9 @@
* @param jetAxisValue
*/
public ZvTop(Hep3Vector jetAxisValue, ZvFitter f) {
- sigmaT = 0.;
- sigmaL = 0.;
+ // FIXME Using arbitrary values for the measurement errors
+ sigmaT = 0.1;
+ sigmaL = 0.5;
_jetAxis = jetAxisValue;
maximumMatrix = new ZvMaximumMatrix(new MaxComp());
isResolvedFromMap = new HashMap<ZvMaximum, Set<ZvMaximum>>();
lcsim/src/org/lcsim/recon/vertexing/zvtop4
diff -u -r1.1 -r1.2
--- ZvParameterNames.java 12 May 2005 23:29:08 -0000 1.1
+++ ZvParameterNames.java 27 Jul 2005 03:03:08 -0000 1.2
@@ -3,6 +3,6 @@
*/
package org.lcsim.recon.vertexing.zvtop4;
-enum ZvParameterNames {
+public enum ZvParameterNames {
phi, kappa, s, x, y, z
}
\ No newline at end of file
