3 modified files
lcsim/src/org/lcsim/fit/helicaltrack
diff -u -r1.2 -r1.3
--- HelicalTrack2DHit.java 10 Jun 2008 19:35:09 -0000 1.2
+++ HelicalTrack2DHit.java 10 Jun 2008 20:11:54 -0000 1.3
@@ -34,6 +34,12 @@
_zmin = zmin;
_zmax = zmax;
}
+
+ public HelicalTrack2DHit(double x, double y, double z, double drphi, double zmin, double zmax) {
+ super (x, y, z, drphi, Math.abs(zmax-zmin) / Math.sqrt(12));
+ _zmin = zmin;
+ _zmax = zmax;
+ }
public HelicalTrack2DHit(TrackerHit hit, Hep3Vector pos, SymmetricMatrix cov, double zmin, double zmax) {
super(hit, pos, cov);
lcsim/src/org/lcsim/fit/helicaltrack
diff -u -r1.4 -r1.5
--- HelicalTrack3DHit.java 10 Jun 2008 19:35:09 -0000 1.4
+++ HelicalTrack3DHit.java 10 Jun 2008 20:11:54 -0000 1.5
@@ -37,6 +37,11 @@
_dz = Math.sqrt(cov.e(2,2));
}
+ public HelicalTrack3DHit(double x, double y, double z, double drphi, double dz){
+ super(x, y, z, drphi, dz);
+ _dz = dz;
+ }
+
/**
* Return the uncertainty in the z coordinate
* @return uncertainty in the z coordinate
lcsim/src/org/lcsim/fit/helicaltrack
diff -u -r1.7 -r1.8
--- HelicalTrackHit.java 10 Jun 2008 19:35:09 -0000 1.7
+++ HelicalTrackHit.java 10 Jun 2008 20:11:54 -0000 1.8
@@ -50,6 +50,17 @@
this(hit, new BasicHep3Vector(hit.getPosition()), new SymmetricMatrix(3, hit.getCovMatrix(), true));
}
+ public HelicalTrackHit(double x, double y, double z, double drphi, double dz) {
+ this(null, new BasicHep3Vector(x, y, z), new SymmetricMatrix(3));
+ double phi = Math.atan2(y, x);
+ double sphi = Math.sin(phi);
+ double cphi = Math.cos(phi);
+ _cov.setElement(0, 0, sphi*sphi * drphi*drphi);
+ _cov.setElement(0, 1, -sphi * cphi * drphi*drphi);
+ _cov.setElement(1, 1, cphi*cphi * drphi*drphi);
+ _cov.setElement(2, 2, dz*dz);
+ }
+
public HelicalTrackHit(TrackerHit hit, Hep3Vector pos, SymmetricMatrix cov) {
_trackerhit = hit;
_pos = pos;
CVSspam 0.2.8