hps-java/src/main/java/org/lcsim/hps/recon/tracking
diff -u -r1.6 -r1.7
--- HPSTrack.java 25 Apr 2013 22:11:14 -0000 1.6
+++ HPSTrack.java 25 Apr 2013 23:29:55 -0000 1.7
@@ -1,7 +1,3 @@
-/*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
- */
package org.lcsim.hps.recon.tracking;
import hep.physics.matrix.SymmetricMatrix;
@@ -49,7 +45,7 @@
//the position & momentum of the track at DOCA to the beam axis (z)
private Hep3Vector _pDocaZ;
private Hep3Vector _posDocaZ;
- private HPSTransformations _detToTrk;
+ private HPSTransformations _detToTrk = new HPSTransformations();
private double bField = 0.491; // make this set-able
private boolean _debug = false;
private boolean _debugForward = false;
@@ -63,7 +59,6 @@
BeamSpot beam) {
super(pars, cov, chisq, ndf, smap, msmap);
_beam = beam;
- _detToTrk = new HPSTransformations();
calculateParametersAtTarget();
calculateParametersAtDocaY();
calculateParametersAtDocaZ();
@@ -72,7 +67,6 @@
public HPSTrack(double[] pars, SymmetricMatrix cov, double[] chisq, int[] ndf,
Map<HelicalTrackHit, Double> smap, Map<HelicalTrackHit, MultipleScatter> msmap) {
super(pars, cov, chisq, ndf, smap, msmap);
- _detToTrk = new HPSTransformations();
calculateParametersAtTarget();
calculateParametersAtDocaY();
calculateParametersAtDocaZ();
@@ -81,7 +75,6 @@
public HPSTrack(HelicalTrackFit htf, BeamSpot beam) {
super(htf.parameters(), htf.covariance(), htf.chisq(), htf.ndf(), htf.PathMap(), htf.ScatterMap());
_beam = beam;
- _detToTrk = new HPSTransformations();
calculateParametersAtTarget();
calculateParametersAtDocaY();
calculateParametersAtDocaZ();
@@ -89,7 +82,6 @@
public HPSTrack(HelicalTrackFit htf) {
super(htf.parameters(), htf.covariance(), htf.chisq(), htf.ndf(), htf.PathMap(), htf.ScatterMap());
- _detToTrk = new HPSTransformations();
calculateParametersAtTarget();
calculateParametersAtDocaY();
calculateParametersAtDocaZ();
@@ -100,7 +92,7 @@
super(parameters, covariance, chiSquared, ndf, sMap, msMap);
// Set the MC particle associated with this fit
- this.setMCParticle(mcParticle);
+ this.mcParticle = mcParticle;
}
/**