Index: trunk/MagicSoft/Mars/Changelog
===================================================================
--- trunk/MagicSoft/Mars/Changelog	(revision 6999)
+++ trunk/MagicSoft/Mars/Changelog	(revision 7000)
@@ -21,4 +21,18 @@
 
                                                  -*-*- END OF LINE -*-*-
+
+ 2005/05/06 Thomas Bretz
+
+   * mbase/MStatusDisplay.cc:
+     - fixed constructor to work with newer root versions
+       (gClient!=NULL)
+
+   * mfileio/MWriteRootFile.h:
+     - added a comment about BITs used by root
+
+   * mhflux/MHEffectiveOnTime.cc:
+     - use 1e-10 instead of 0 in TPad::Divide
+
+
 
  2005/05/06 Daniela Dorner
Index: trunk/MagicSoft/Mars/mbase/MStatusDisplay.cc
===================================================================
--- trunk/MagicSoft/Mars/mbase/MStatusDisplay.cc	(revision 6999)
+++ trunk/MagicSoft/Mars/mbase/MStatusDisplay.cc	(revision 7000)
@@ -680,12 +680,13 @@
     // Add Widgets (from top to bottom)
     //
-    if (gClient) // BATCH MODE
-    {
-        AddMenuBar();
-        AddUserFrame();
-        AddTabs();
-        AddProgressBar();
-        AddStatusBar();
-    }
+    // In newer root versions gClient!=NULL in batch mode!
+    if (!gClient || !gClient->GetRoot() || gROOT->IsBatch()) // BATCH MODE
+        return;
+
+    AddMenuBar();
+    AddUserFrame();
+    AddTabs();
+    AddProgressBar();
+    AddStatusBar();
 
     //
Index: trunk/MagicSoft/Mars/mfileio/MWriteRootFile.h
===================================================================
--- trunk/MagicSoft/Mars/mfileio/MWriteRootFile.h	(revision 6999)
+++ trunk/MagicSoft/Mars/mfileio/MWriteRootFile.h	(revision 7000)
@@ -88,4 +88,5 @@
         // TBranch::kAutoDelete = BIT(15)
         // TBranchElement::kDeleteObject = BIT(16)
+        // TTree::kFriendLock = BIT(17)
         kIsNewTree  = BIT(17)
     };
Index: trunk/MagicSoft/Mars/mhflux/MHEffectiveOnTime.cc
===================================================================
--- trunk/MagicSoft/Mars/mhflux/MHEffectiveOnTime.cc	(revision 6999)
+++ trunk/MagicSoft/Mars/mhflux/MHEffectiveOnTime.cc	(revision 7000)
@@ -764,5 +764,5 @@
     AppendPad("fit");
 
-    pad->Divide(2, 1, 0, 0);
+    pad->Divide(2, 1, 1e-10, 1e-10);
 
     TH1 *h;
@@ -770,5 +770,5 @@
     pad->cd(1);
     gPad->SetBorderMode(0);
-    gPad->Divide(1, 3, 0, 0);
+    gPad->Divide(1, 3, 1e-10, 1e-10);
     pad->GetPad(1)->cd(1);
     gPad->SetBorderMode(0);
@@ -799,5 +799,5 @@
     pad->cd(2);
     gPad->SetBorderMode(0);
-    gPad->Divide(1, 3, 0, 0);
+    gPad->Divide(1, 3, 1e-10, 1e-10);
 
     pad->GetPad(2)->cd(1);