Changeset 8957 for trunk/MagicSoft/Mars/mbase

Timestamp:

06/14/08 16:55:58 (16 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mbase

Files:

• MLog.cc (modified) (2 diffs)
• MMath.cc (modified) (3 diffs)
• MParContainer.cc (modified) (1 diff)

trunk/MagicSoft/Mars/mbase/MLog.cc

@@ -1 +1 @@
 /* ======================================================================== *\
-! $Name: not supported by cvs2svn $:$Id: MLog.cc,v 1.59 2008-01-11 10:37:01 tbretz Exp $
+! $Name: not supported by cvs2svn $:$Id: MLog.cc,v 1.60 2008-06-14 15:55:50 tbretz Exp $
 ! --------------------------------------------------------------------------
 !
@@ -663 +663 @@
 {
     // gcc 3.2:
-    char *txt = (char*)"logXXXXXX";
+    const char *txt = "logXXXXXX";
 
     TString n(fname ? fname : txt);

trunk/MagicSoft/Mars/mbase/MMath.cc

@@ -1 +1 @@
 /* ======================================================================== *\
-! $Name: not supported by cvs2svn $:$Id: MMath.cc,v 1.37 2007-08-17 10:53:48 tbretz Exp $
+! $Name: not supported by cvs2svn $:$Id: MMath.cc,v 1.38 2008-06-14 15:55:50 tbretz Exp $
 ! --------------------------------------------------------------------------
 !
@@ -128 +128 @@
 }
 
+/*
+Double_t MMath::SignificanceLiMaErr(Double_t s, Double_t b, Double_t alpha)
+{
+    Double_t S = SignificanceLiMa(s, b, alpha);
+    if (S<0)
+        return -1;
+
+    const Double_t sum = s+b;
+
+
+    Double_t l = TMath::Log(s/sum*(alpha+1)/alpha)/TMath::Sqrt(2*S);
+    Double_t m = TMath::Log(s/sum*(alpha+1)/alpha)/TMath::Sqrt(2*S);
+
+
+    const Double_t sum = s+b;
+
+    if (s<0 || b<0 || alpha<=0)
+        return -1;
+
+    const Double_t l = s==0 ? 0 : s*TMath::Log(s/sum*(alpha+1)/alpha);
+    const Double_t m = b==0 ? 0 : b*TMath::Log(b/sum*(alpha+1)      );
+
+    return l+m<0 ? -1 : TMath::Sqrt((l+m)*2);
+}
+*/
+
 // --------------------------------------------------------------------------
 //
@@ -752 +778 @@
         static const Double_t sqrt3 = TMath::Sqrt(3.);
 
-        const Double_t s = TMath::Sin(t)*sqrt3;
-        const Double_t c = TMath::Cos(t);
-
-        x1 = 2*sqrtq *      c  - a/3;
-        x2 =  -sqrtq * (s + c) - a/3;
-        x3 =   sqrtq * (s - c) - a/3;
+        const Double_t sn = TMath::Sin(t)*sqrt3;
+        const Double_t cs = TMath::Cos(t);
+
+        x1 = 2*sqrtq *       cs  - a/3;
+        x2 =  -sqrtq * (sn + cs) - a/3;
+        x3 =   sqrtq * (sn - cs) - a/3;
 
         /* --- Easier to understand but slower ---

trunk/MagicSoft/Mars/mbase/MParContainer.cc

@@ -359 +359 @@
         return kFALSE;
 
-    /*const*/ TMethodCall *call = ((TDataMember*)member)->GetterMethod(); //FIXME: Root
+    /*const*/ TMethodCall *call = const_cast<TDataMember*>(member)->GetterMethod(); //FIXME: Root
     if (!call)
     {