Changeset 17161 for trunk

Timestamp:

09/09/13 16:56:16 (11 years ago)

Author:

tbretz

Message:

Added a version of GetIntersectionPoint which allows to check for success.

Location:

trunk/Mars/mbase

Files:

• MMath.cc (modified) (3 diffs)
• MMath.h (modified) (1 diff)

trunk/Mars/mbase/MMath.cc

@@ -619 +619 @@
 // Formula from: http://mathworld.wolfram.com/Line-LineIntersection.html
 //
-TVector2 MMath::GetIntersectionPoint(const TVector2 &x1, const TVector2 &y1, const TVector2 &x2, const TVector2 &y2)
+TVector2 MMath::GetIntersectionPoint(const TVector2 &x1, const TVector2 &y1, const TVector2 &x2, const TVector2 &y2, Bool_t &rc)
 {
     TMatrix d(2,2);
@@ -629 +629 @@
     const Double_t denom = d.Determinant();
     if (denom==0)
+    {
+        rc = false;
         return TVector2();
+    }
+
+    rc = true;
 
     TMatrix l1(2,2);
@@ -658 +663 @@
 
     return TVector2(X, Y);
+}
+
+TVector2 MMath::GetIntersectionPoint(const TVector2 &x1, const TVector2 &y1, const TVector2 &x2, const TVector2 &y2)
+{
+    Bool_t rc;
+    return GetIntersectionPoint(x1, y1, x2, y2, rc);
 }
 

trunk/Mars/mbase/MMath.h

@@ -55 +55 @@
     Double_t InterpolParabCos(const TVector3 &vx, const TVector3 &vy, Double_t x);
 
+    TVector2 GetIntersectionPoint(const TVector2 &x1, const TVector2 &y1, const TVector2 &x2, const TVector2 &y2, Bool_t &rc);
     TVector2 GetIntersectionPoint(const TVector2 &x1, const TVector2 &y1, const TVector2 &x2, const TVector2 &y2);