lcsim/src/org/lcsim/fit/helicaltrack
diff -u -r1.12 -r1.13
--- StereoHitMaker.java 19 Mar 2012 22:31:15 -0000 1.12
+++ StereoHitMaker.java 17 Sep 2012 20:23:00 -0000 1.13
@@ -25,7 +25,7 @@
static final boolean debug=false;
private double _tolerance;
private double _maxsep;
- private double _eps = 1.0e-4;
+ private double _eps = 1.0e-2;
/**
* Creates a new instance of StereoHitMaker with default parameters:
@@ -185,14 +185,21 @@
private boolean CheckCross(HelicalTrackStrip strip1, HelicalTrackStrip strip2) {
if(debug)
System.out.println("in CheckCross...");
+ if(debug)
+ System.out.println("Strip1 origin : "+strip1.origin().toString()+"; Strip2 origin :"+strip2.origin().toString());
+
+
// Check that the strips have the same BarrelEndcap Flag
if (strip1.BarrelEndcapFlag() != strip2.BarrelEndcapFlag()) return false;
if(debug)
System.out.println("in CheckCross...pass BarrelEndcapFlag");
// Check that the sensors planes are parallel to each other
if(debug)
- System.out.println("Strip1 : "+strip1.w().toString()+"; Strip2 "+strip2.w().toString());
- if (VecOp.cross(strip1.w(), strip2.w()).magnitude() > _eps) return false;
+ System.out.println("Strip1 w : "+strip1.w().toString()+"; Strip2 w :"+strip2.w().toString());
+ if (Math.abs(VecOp.cross(strip1.w(), strip2.w()).magnitude()) > _eps) {
+ System.out.println("Failed! Planes aren't parallel"+VecOp.cross(strip1.w(), strip2.w()).magnitude());
+ return false;
+ }
if(debug)
System.out.println("in CheckCross...planes are parallel");
// Check that the strips aren't colinear
lcsim/src/org/lcsim/fit/helicaltrack
diff -u -r1.21 -r1.22
--- HelicalTrackHit.java 19 Mar 2012 22:25:14 -0000 1.21
+++ HelicalTrackHit.java 17 Sep 2012 20:23:00 -0000 1.22
@@ -50,7 +50,7 @@
private double _drphi;
private double _dr;
private double _chisq;
- protected static final double _eps = 1e-4;
+ protected static final double _eps = 1e-2;
protected long id; // FIXME: Dummy value that needs to be set from RawTrackerHit data.
public HelicalTrackHit(Hep3Vector pos, SymmetricMatrix cov, double dEdx, double time, int type,