Changeset 8989 for trunk/MagicSoft/Mars/mbase

Timestamp:

07/01/08 15:04:01 (17 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mbase

Files:

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

trunk/MagicSoft/Mars/mbase/MMath.cc

@@ -1 +1 @@
 /* ======================================================================== *\
-! $Name: not supported by cvs2svn $:$Id: MMath.cc,v 1.40 2008-06-30 09:36:35 tbretz Exp $
+! $Name: not supported by cvs2svn $:$Id: MMath.cc,v 1.41 2008-07-01 14:03:58 tbretz Exp $
 ! --------------------------------------------------------------------------
 !
@@ -172 +172 @@
 //
 // Return Li/Ma (5) for the error of the excess, under the assumption that
-// the existance of a signal is already known.
-//
-Double_t MMath::SignificanceLiMaExc(Double_t s, Double_t b, Double_t alpha)
-{
-    Double_t Ns = s - alpha*b;
-    Double_t sN = s + alpha*alpha*b;
-
-    if (Ns<0 || sN<0)
+// the existance of a signal is already known. (basically signal/error
+// calculated by error propagation)
+//
+Double_t MMath::SignificanceExc(Double_t s, Double_t b, Double_t alpha)
+{
+    const Double_t error = ErrorExc(s, b, alpha);
+    if (error==0)
         return 0;
 
-    if (Ns==0 && sN==0)
-        return 0;
-
-    return Ns/TMath::Sqrt(sN);
+    const Double_t Ns = s - alpha*b;
+
+    return Ns/error;
+}
+
+// --------------------------------------------------------------------------
+//
+// Calculate the error of s-alpha*b by error propagation
+//
+Double_t MMath::ErrorExc(Double_t s, Double_t b, Double_t alpha)
+{
+    const Double_t sN = s + alpha*alpha*b;
+    return sN<0 ? 0 : TMath::Sqrt(sN);
 }
 

trunk/MagicSoft/Mars/mbase/MMath.h

@@ -37 +37 @@
     Double_t SignificanceLiMa(Double_t s, Double_t b, Double_t alpha=1);
     Double_t SignificanceLiMaSigned(Double_t s, Double_t b, Double_t alpha=1);
-    Double_t SignificanceLiMaExc(Double_t s, Double_t b, Double_t alpha=1);
+    Double_t SignificanceExc(Double_t s, Double_t b, Double_t alpha=1);
+    Double_t ErrorExc(Double_t s, Double_t b, Double_t alpha=1);
 
     void ReducePrecision(Float_t &val);