lcsim/src/org/lcsim/contrib/SODTracker
diff -u -r1.4 -r1.5
--- SODTrack.java 13 Dec 2006 22:47:32 -0000 1.4
+++ SODTrack.java 14 Feb 2007 20:54:30 -0000 1.5
@@ -3,6 +3,13 @@
/* SODTrack.java
*/
+// Hans Wenzel: made changes so that it complies with new Track class
+// ( use of SymmetricMatrix instead of double[][]
+//
+import hep.physics.matrix.SymmetricMatrix;
+import hep.physics.vec.BasicHep3Vector;
+import hep.physics.vec.Hep3Vector;
+
import org.lcsim.event.Track;
import org.lcsim.event.SimTrackerHit;
@@ -26,7 +33,7 @@
double chi2 = 0.;
- SODTrack(int ch, double pX, double pY, double pZ, double dzero, double phizero, double omeg, double zzero, double spar)
+ public SODTrack(int ch, double pX, double pY, double pZ, double dzero, double phizero, double omeg, double zzero, double spar)
{
//System.out.print("SOD params (SOD units): ");
@@ -83,23 +90,24 @@
public double getTrackParameter(int i) { return parameters[i]; }
public double[] getTrackParameters() { return parameters; }
- private double[][] ematrix;
+ private SymmetricMatrix ematrix;
public void add_ematrix(double[][] emat)
{
- ematrix = new double[5][5];
- double[] conv = new double[] {10.,1.,-0.1,10.,1.};
- for(int i=0; i<5; i++) {
- for(int j=0; j<5; j++) {
- ematrix[i][j] = conv[i]*conv[j]*emat[i][j];
- }
- }
+ ematrix = new SymmetricMatrix(5);
+ double[] conv = new double[] {10.,1.,-0.1,10.,1.};
+ for(int i=0; i<5; i++) {
+ for(int j=0; j<5; j++) {
+ ematrix.setElement(i,j,conv[i]*conv[j]*emat[i][j]);
+ }
+ }
+ }
+ public double getErrorMatrixElement(int i, int j) { return ematrix.e(i,j); }
+ public SymmetricMatrix getErrorMatrix() {
+ return ematrix;
}
- public double getErrorMatrixElement(int i, int j) { return ematrix[i][j]; }
- public double[][] getErrorMatrix() { return ematrix; }
public void setChiSqr(double c) { chi2 = c; }
public double getChi2() { return chi2; }
public int getNDF() { return 1; }
-
public double getdEdx() { return 0.; }
public double getdEdxError() { return 0.; }
public double getRadiusOfInnermostHit() { return 0.; }