lcsim/src/org/lcsim/contrib/JanStrube/tracking
diff -u -r1.8 -r1.9
--- NewFastMCTrackFactory.java 15 Aug 2006 23:49:56 -0000 1.8
+++ NewFastMCTrackFactory.java 19 Aug 2006 20:08:02 -0000 1.9
@@ -1,5 +1,5 @@
/**
- * @version $Id: NewFastMCTrackFactory.java,v 1.8 2006/08/15 23:49:56 jstrube Exp $
+ * @version $Id: NewFastMCTrackFactory.java,v 1.9 2006/08/19 20:08:02 jstrube Exp $
*/
package org.lcsim.contrib.JanStrube.tracking;
@@ -127,7 +127,7 @@
* @param shouldISmear This parameter switches smearing on/off. It should always be true except in Unit tests.
* @return A new NewTrack object with the desired properties
*/
- Track getTrack(SpacePoint momentum, SpacePoint location, SpacePoint referencePoint, int charge, Random random, boolean shouldISmear) {
+ public Track getTrack(SpacePoint momentum, SpacePoint location, SpacePoint referencePoint, int charge, Random random, boolean shouldISmear) {
_swimmer.setTrack(momentum, location, charge);
double alpha = _swimmer.getTrackLengthToPoint(referencePoint);
SpacePoint poca = _swimmer.getPointAtLength(alpha);
lcsim/src/org/lcsim/contrib/JanStrube/tracking
diff -u -r1.2 -r1.3
--- NewMCFastTrackDriver.java 15 Aug 2006 23:49:57 -0000 1.2
+++ NewMCFastTrackDriver.java 19 Aug 2006 20:08:02 -0000 1.3
@@ -1,5 +1,5 @@
/**
- * @version $Id: NewMCFastTrackDriver.java,v 1.2 2006/08/15 23:49:57 jstrube Exp $
+ * @version $Id: NewMCFastTrackDriver.java,v 1.3 2006/08/19 20:08:02 jstrube Exp $
*/
package org.lcsim.contrib.JanStrube.tracking;
@@ -13,7 +13,6 @@
import org.lcsim.conditions.ConditionsListener;
import org.lcsim.conditions.ConditionsSet;
import org.lcsim.event.EventHeader;
-import org.lcsim.mc.fast.tracking.MCFastTracking;
import org.lcsim.mc.fast.tracking.SimpleTables;
import org.lcsim.mc.fast.tracking.TrackResolutionTables;
import org.lcsim.util.Driver;
@@ -59,7 +58,7 @@
boolean hist = getHistogramLevel() > 0;
List<org.lcsim.event.Track> trackList = new ArrayList<org.lcsim.event.Track>();
- List<Track> newTrackList = new ArrayList<Track>();
+ List<Track> newTrackList = new ArrayList<Track>();
for (Particle p : event.getMCParticles()) {
// filter for FINAL_STATE
if (p.getGeneratorStatus() != Particle.FINAL_STATE) {
lcsim/src/org/lcsim/contrib/JanStrube/vtxFitter
diff -u -r1.8 -r1.9
--- Fitter.java 16 Aug 2006 06:23:44 -0000 1.8
+++ Fitter.java 19 Aug 2006 20:08:03 -0000 1.9
@@ -1,6 +1,6 @@
package org.lcsim.contrib.JanStrube.vtxFitter;
/**
- * @version $Id: Fitter.java,v 1.8 2006/08/16 06:23:44 jstrube Exp $
+ * @version $Id: Fitter.java,v 1.9 2006/08/19 20:08:03 jstrube Exp $
*/
import static java.lang.Math.atan2;
@@ -77,10 +77,10 @@
particle._tracks.clear();
chi2_prev = 0;
for (Track t : unfittedParticle.getTracks()) {
- System.out.printf("filtering: chi2=%f\n", filter(t));
+// System.out.printf("filtering: chi2=%f\n", filter(t));
}
for (Track t : particle.getTracks()) {
- System.out.printf("smoothing: %f\n", smoothe(t));
+// System.out.printf("smoothing: %f\n", smoothe(t));
}
}
return particle;
@@ -119,9 +119,9 @@
Matrix G_kB = G_k.minus((G_k.times(B_k.times(W_k.times(B_k.transpose().times(G_k))))));
// cov(x)
- System.out.printf("C_k before: %g\t%g\t%g\n", C_prev.get(0, 0), C_prev.get(1, 1), C_prev.get(2, 2));
+// System.out.printf("C_k before: %g\t%g\t%g\n", C_prev.get(0, 0), C_prev.get(1, 1), C_prev.get(2, 2));
Matrix C_k = C_prev.inverse().plus(A_k.transpose().times(G_kB.times(A_k))).inverse();
- System.out.printf("C_k after: %g\t%g\t%g\n", C_k.get(0, 0), C_k.get(1, 1), C_k.get(2, 2));
+// System.out.printf("C_k after: %g\t%g\t%g\n", C_k.get(0, 0), C_k.get(1, 1), C_k.get(2, 2));
Matrix x_k = C_k.times(C_prev.inverse().times(x_prev).plus(
A_k.transpose().times(G_kB).times(m_k.minus(c_k0))));
Matrix q_k = W_k.times(B_k.transpose().times(G_k.times(m_k.minus(c_k0.plus(A_k.times(x_k))))));
@@ -139,13 +139,13 @@
+ x_k.minus(x_prev).transpose().times(C_prev.inverse().times(x_k.minus(x_prev))).get(0, 0);
double chi2 = chi2_prev + chi2_kf;
- System.out.printf("before: %s", x_prev);
+// System.out.printf("before: %s", x_prev);
x_prev = x_k;
- System.out.printf("after: %s", x_prev);
+// System.out.printf("after: %s", x_prev);
C_prev = C_k;
particle.addTrack(t, chi2_kf);
particle._origin = new CartesianPoint(x_k.getRowPackedCopy());
- System.out.println(particle._origin);
+// System.out.println(particle._origin);
chi2_prev = chi2;
return chi2_kf;
}