Changeset 8578 for trunk/MagicSoft/Mars/mbase

Timestamp:

06/18/07 15:29:32 (17 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mbase/MMath.cc (modified) (2 diffs)

trunk/MagicSoft/Mars/mbase/MMath.cc

@@ -1 +1 @@
 /* ======================================================================== *\
-! $Name: not supported by cvs2svn $:$Id: MMath.cc,v 1.33 2007-06-16 21:50:26 tbretz Exp $
+! $Name: not supported by cvs2svn $:$Id: MMath.cc,v 1.34 2007-06-18 14:29:32 tbretz Exp $
 ! --------------------------------------------------------------------------
 !
@@ -691 +691 @@
         const Double_t sqrtd = TMath::Sqrt(D);
 
-        const Double_t S = MMath::Sqrt3(R + sqrtd);
-        const Double_t T = MMath::Sqrt3(R - sqrtd);
-
-        x1 = (S+T) - a/3.;               // real root
+        const Double_t A = TMah::Sign(1., R)*MMath::Sqrt3(TMath::Abs(R)+sqrtd);
+
+        // The case A==0 cannot happen. This would imply D==0
+        // if (A==0)
+        // {
+        //     x1 = -a/3;
+        //     return 1;
+        // }
+
+        x1 = (A+Q/A)-a/3;
+
+        //const Double_t S = MMath::Sqrt3(R + sqrtd);
+        //const Double_t T = MMath::Sqrt3(R - sqrtd);
+        //x1 = (S+T) - a/3.;               // real root
 
         return 1;