Changeset 8673 for trunk/MagicSoft/Mars/mbase

Timestamp:

08/17/07 11:53:49 (17 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mbase

Files:

• MMath.cc (modified) (2 diffs)
• MStatusDisplay.cc (modified) (3 diffs)

trunk/MagicSoft/Mars/mbase/MMath.cc

@@ -1 +1 @@
 /* ======================================================================== *\
-! $Name: not supported by cvs2svn $:$Id: MMath.cc,v 1.36 2007-06-19 11:14:33 tbretz Exp $
+! $Name: not supported by cvs2svn $:$Id: MMath.cc,v 1.37 2007-08-17 10:53:48 tbretz Exp $
 ! --------------------------------------------------------------------------
 !
@@ -153 +153 @@
     Double_t sN = s + alpha*alpha*b;
 
-    return Ns<0 || sN<0 ? 0 : Ns/TMath::Sqrt(sN);
+    if (Ns<0 || sN<0)
+        return 0;
+
+    if (Ns==0 && sN==0)
+        return 0;
+
+    return Ns/TMath::Sqrt(sN);
 }
 

trunk/MagicSoft/Mars/mbase/MStatusDisplay.cc

@@ -1010 +1010 @@
 TCanvas &MStatusDisplay::AddTab(const char *name)
 {
+    /*
+    if (HasCanvas(name))
+    {
+        *fLog << warn;
+        *fLog << "WARNING - A canvas '" << name << "' is already existing in the Status Display." << endl;
+        *fLog << "          This can cause unexpected crahes!" << endl;
+    }*/
+
     if (gROOT->IsBatch())
     {
@@ -1017 +1025 @@
 
         TCanvas *c = new TCanvas(name, name, -cw, ch);
+
+        gROOT->GetListOfCanvases()->Remove(c);
+
         fBatch->Add(c);
         return *c;
@@ -1342 +1353 @@
     if (!c)
         return kFALSE;
+
+    // If you encounter unexpected crashes here, check if
+    // a canvas is existing twice in the list or has been
+    // deleted by accident. (Check AddTab)
 
     if (gROOT->IsBatch())