Changeset 3583

Timestamp:

03/23/04 09:11:11 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mbase/MContinue.cc (modified) (1 diff)
• mhbase/MH.cc (modified) (1 diff)
• mhist/MHFalseSource.cc (modified) (5 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -18 +18 @@
 
                                                  -*-*- END OF LINE -*-*-
+
+ 2004/03/23: Thomas Bretz
+
+   * mbase/MContinue.cc, mhbase/MH.cc:
+     - changed a warning message to an inf-message
+
+
 
  2004/03/22: Markus Gaug

trunk/MagicSoft/Mars/mbase/MContinue.cc

@@ -129 +129 @@
     if (fTaskList->FindObject(GetFilter()))
     {
-        *fLog << warn << dbginf << "WARNING - The filter is already in the tasklist..." << endl;
+        *fLog << inf << dbginf << "The filter is already in the tasklist..." << endl;
         return kTRUE;
     }

trunk/MagicSoft/Mars/mhbase/MH.cc

@@ -494 +494 @@
     if (!bins)
     {
-        gLog << warn << "Object 'Binning" << name << "' [MBinning] not found... no binning applied." << endl;
+        gLog << inf << "Object 'Binning" << name << "' [MBinning] not found... no binning applied." << endl;
         return kFALSE;
     }

trunk/MagicSoft/Mars/mhist/MHFalseSource.cc

@@ -119 +119 @@
 #include "MAstroSky2Local.h"
 #include "MStatusDisplay.h"
+#include "MMath.h"
 
 #include "MBinning.h"
@@ -248 +249 @@
 Double_t MHFalseSource::Significance(Double_t s, Double_t b)
 {
-    const Double_t k = b==0 ? 0 : s/b;
-    const Double_t f = s+k*k*b;
-
-    return f==0 ? 0 : (s-b)/TMath::Sqrt(f);
+    return MMath::Significance(s, b);
 }
 
@@ -265 +263 @@
 Double_t MHFalseSource::SignificanceLiMa(Double_t s, Double_t b, Double_t alpha)
 {
-    const Double_t sum = s+b;
-
-    if (sum<=0 || alpha<=0)
-        return 0;
-
-    const Double_t l = s*TMath::Log(s/sum*(alpha+1)/alpha);
-    const Double_t m = b*TMath::Log(b/sum*(alpha+1)      );
-
-    return TMath::Sqrt((l+m)*2);
+    return MMath::SignificanceLiMa(s, b);
 }
 
@@ -712 +702 @@
     const Int_t nx = fHist.GetXaxis()->GetNbins();
     const Int_t ny = fHist.GetYaxis()->GetNbins();
+    const Int_t nr = nx*nx+ny*ny;
 
     Double_t maxalpha0=0;
@@ -825 +816 @@
                 h6.Fill(sig);
 
-            if (sig>maxs)
+            if (sig>maxs && ix*ix+iy*iy<nr*nr/9)
             {
                 maxs = sig;