hps-java/src/main/java/org/lcsim/hps/recon/tracking
diff -u -r1.3 -r1.4
--- EcalTrackMatch.java 29 Aug 2012 20:49:23 -0000 1.3
+++ EcalTrackMatch.java 4 Sep 2012 23:02:00 -0000 1.4
@@ -18,21 +18,21 @@
// private String trackCollectionName = "MatchedTracks";
Cluster cluster;
Track matchedTrack;
- ExtendTrack extrapolator;
+ SvtTrackExtrapolator extrapolator;
//SvtTrackExtrapolator extrapolator;
private boolean debug = false;
public EcalTrackMatch() {
cluster = null;
matchedTrack = null;
- extrapolator = new ExtendTrack();
+ extrapolator = new SvtTrackExtrapolator();
//extrapolator = new SvtTrackExtrapolator();
}
public EcalTrackMatch(boolean deb) {
cluster = null;
matchedTrack = null;
- extrapolator = new ExtendTrack();
+ extrapolator = new SvtTrackExtrapolator();
//extrapolator = new SvtTrackExtrapolator();
debug = deb;
@@ -63,12 +63,12 @@
extrapolator.setTrack(track);
//extend.setTrack(stEle);
//Hep3Vector posAtEcal = extend.positionAtEcal();
- Hep3Vector trk_pos = extrapolator.positionAtEcal();
+ Hep3Vector trk_pos = extrapolator.getTrackPositionAtEcal();
double dx;
if (dir == 0) {
- dx = cluster.getPosition()[0] - trk_pos.y();
+ dx = cluster.getPosition()[0] - trk_pos.x();
} else {
- dx = cluster.getPosition()[1] - trk_pos.z();
+ dx = cluster.getPosition()[1] - trk_pos.y();
}
if (debug) {
System.out.println("dist = " + dx + " from cluster to track in " + (dir == 0 ? "X" : "Y") + " to track at " + trk_pos.x() + "," + trk_pos.y() + "," + trk_pos.z());
@@ -81,7 +81,7 @@
extrapolator.setTrack(track);
//extend.setTrack(stEle);
//Hep3Vector posAtEcal = extend.positionAtEcal();
- Hep3Vector trk_pos = extrapolator.positionAtEcal();
+ Hep3Vector trk_pos = extrapolator.getTrackPositionAtEcal();
double dx = dX(track);
double dy = dY(track);
double dr = Math.sqrt(dx * dx + dy * dy);