lcsim/src/org/lcsim/mc/fast/tracking
diff -u -r1.8 -r1.9
--- DocaTrackParameters.java 23 Oct 2006 19:42:28 -0000 1.8
+++ DocaTrackParameters.java 16 Oct 2007 18:16:50 -0000 1.9
@@ -9,6 +9,7 @@
import hep.physics.vec.Hep3Vector;
import hep.physics.vec.VecOp;
import org.lcsim.constants.Constants;
+import org.lcsim.event.MCParticle;
/**
@@ -16,9 +17,9 @@
* with a MC truth particle. <br>
*
* @author Tony Johnson, Wolfgang Walkowiak
- * @version $Id: DocaTrackParameters.java,v 1.8 2006/10/23 19:42:28 tonyj Exp $
+ * @version $Id: DocaTrackParameters.java,v 1.9 2007/10/16 18:16:50 cassell Exp $
*/
-class DocaTrackParameters implements TrackParameters
+public class DocaTrackParameters implements TrackParameters
{
private Hep3Vector m_pdoca_ref = null;
private Hep3Vector m_xdoca_ref = null;
@@ -36,57 +37,62 @@
// Constructors
//
//====================================================
- DocaTrackParameters(double bField)
+ public DocaTrackParameters(double bField)
{
reset();
m_Bz = bField;
}
- DocaTrackParameters(double bField, Particle p)
+ public DocaTrackParameters(MCParticle p, double bField)
+ {
+ this(bField, p.getMomentum(), p.getOrigin(), p.getCharge());
+ }
+
+ public DocaTrackParameters(double bField, Particle p)
{
this(bField, p.getMomentum(), p.getOrigin(), p.getType().getCharge());
}
- DocaTrackParameters(double bField, Hep3Vector momentum, Hep3Vector x, double q)
+ public DocaTrackParameters(double bField, Hep3Vector momentum, Hep3Vector x, double q)
{
reset();
m_Bz = bField;
calculateDoca(momentum, x, q);
}
- DocaTrackParameters(double bField, double[] momentum, double[] x, double q)
+ public DocaTrackParameters(double bField, double[] momentum, double[] x, double q)
{
reset();
m_Bz = bField;
calculateDoca(momentum, x, q);
}
- DocaTrackParameters(double bField, double[] momentum, double[] x, double q, SymmetricMatrix errorMatrix)
+ public DocaTrackParameters(double bField, double[] momentum, double[] x, double q, SymmetricMatrix errorMatrix)
{
this(bField, momentum, x, q);
this.m_err = errorMatrix;
}
- DocaTrackParameters(double bField, double[] parameters)
+ public DocaTrackParameters(double bField, double[] parameters)
{
m_Bz = bField;
m_parm = parameters;
}
- DocaTrackParameters(double bField, double[] parameters, SymmetricMatrix errorMatrix)
+ public DocaTrackParameters(double bField, double[] parameters, SymmetricMatrix errorMatrix)
{
this(bField, parameters);
this.m_err = errorMatrix;
}
- DocaTrackParameters(double bField, double[] parameters, SymmetricMatrix errorMatrix, double chi2)
+ public DocaTrackParameters(double bField, double[] parameters, SymmetricMatrix errorMatrix, double chi2)
{
this(bField, parameters);
this.m_err = errorMatrix;
setChi2(chi2);
}
- DocaTrackParameters(double bField, double[] parameters, SymmetricMatrix errorMatrix, double chi2, int ndf)
+ public DocaTrackParameters(double bField, double[] parameters, SymmetricMatrix errorMatrix, double chi2, int ndf)
{
this(bField, parameters);
this.m_err = errorMatrix;