Changeset 9195 for trunk/MagicSoft/Mars/mbase

Timestamp:

12/21/08 18:09:49 (16 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mbase

Files:

• MAGIC.cc (modified) (1 diff)
• MGMap.cc (modified) (1 diff)
• MMath.cc (modified) (2 diffs)
• MProgressBar.cc (modified) (1 diff)
• MSearch.cc (modified) (1 diff)
• MStatusDisplay.cc (modified) (4 diffs)
• MZlib.cc (modified) (1 diff)

trunk/MagicSoft/Mars/mbase/MAGIC.cc

@@ -30 +30 @@
 #include "MAGIC.h"
 
+#include <stdlib.h> // getenv (Ubuntu 8.10)
+
 #include <iostream>
 

trunk/MagicSoft/Mars/mbase/MGMap.cc

@@ -39 +39 @@
 #include "MGMap.h"
 
-//#include <limits.h>  // INT_MAX
+#include <climits>  // INT_MAX (Ubuntu 8.10)
 
 #include <TMath.h>

trunk/MagicSoft/Mars/mbase/MMath.cc

@@ -1 +1 @@
 /* ======================================================================== *\
-! $Name: not supported by cvs2svn $:$Id: MMath.cc,v 1.41 2008-07-01 14:03:58 tbretz Exp $
+! $Name: not supported by cvs2svn $:$Id: MMath.cc,v 1.42 2008-12-21 18:09:49 tbretz Exp $
 ! --------------------------------------------------------------------------
 !
@@ -34 +34 @@
 #include "MMath.h"
 
+#include <stdlib.h> // atof (Ubuntu 8.10)
+
 #ifndef ROOT_TVector2
 #include <TVector2.h>

trunk/MagicSoft/Mars/mbase/MProgressBar.cc

@@ -30 +30 @@
 //
 /////////////////////////////////////////////////////////////////////////////
+#include "MProgressBar.h"
 
-#include "MProgressBar.h"
+#include <stdlib.h>         // rand (Ubuntu 8.10)
 
 #include <TSystem.h>        // gSystem

trunk/MagicSoft/Mars/mbase/MSearch.cc

@@ -40 +40 @@
 /////////////////////////////////////////////////////////////////////////////
 #include "MSearch.h"
+
+#include <stdlib.h>         // rand (Ubuntu 8.10)
 
 #include <TSystem.h>      // gSystem

trunk/MagicSoft/Mars/mbase/MStatusDisplay.cc

@@ -62 +62 @@
 
 #include <errno.h>
+#include <stdlib.h>               // mktemp (Ubunto 8.10)
 
 #include <fstream>                // fstream
@@ -110 +111 @@
 #include "MParContainer.h"        // MParContainer::GetDescriptor
 #include "MStatusArray.h"         // MStatusArray
+
+#if ROOT_VERSION_CODE <= ROOT_VERSION(5,22,00)
+#include "../mhbase/MH.h"
+#endif
 
 #undef DEBUG
@@ -1040 +1045 @@
 
     if (gPad)
+    {
+        // Find the object which will get picked by the GetObjectInfo
+        // due to buffer overflows in many root-versions
+        // in TH1 and TProfile we have to work around and implement
+        // our own GetObjectInfo which make everything a bit more
+        // complicated.
+#if ROOT_VERSION_CODE > ROOT_VERSION(5,22,00)
         SetStatusLine2(selected->GetObjectInfo(px,py));
+#else
+        TObjLink *link=0;
+        static_cast<TPad*>(gPad)->Pick(px, py, link);
+
+        const TObject *o = link ? link->GetObject() : 0;
+        if (o)
+            SetStatusLine2(MH::GetObjectInfo(px, py, *o));
+#endif
+    }
 
     gPad=save;
@@ -1119 +1140 @@
     c.Connect("ProcessedEvent(Int_t,Int_t,Int_t,TObject*)",
               "MStatusDisplay", this, "EventInfo(Int_t,Int_t,Int_t,TObject*)");
+
+    // Make sure that root itself doesn't try to call GetObjectInfo
+    // This is now handled from EventsInfo. This is necessary
+    // due to the buffer overflow bug in GetObjectInfo of
+    // TProfile and TH1
+    c.ResetBit(TCanvas::kShowEventStatus);
 
     // Remove the canvas from the global list to make sure it is

trunk/MagicSoft/Mars/mbase/MZlib.cc

@@ -35 +35 @@
 //////////////////////////////////////////////////////////////////////////////
 #include "MZlib.h"
+
+#include <string.h> // memcpy (UBuntu 8.10)
 
 ClassImp(MZlib);