Changeset 9552 for trunk/MagicSoft/Mars/mbase

Timestamp:

02/23/10 10:43:20 (15 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mbase

Files:

• MAGIC.cc (modified) (1 diff)
• MGMap.cc (modified) (5 diffs)
• MObjLookup.cc (modified) (1 diff)

trunk/MagicSoft/Mars/mbase/MAGIC.cc

@@ -40 +40 @@
 bool MARS::CheckRootVer()
 {
-    if (strcmp(gROOT->GetVersion(), "5.22/00")>0)
+    if (strcmp(gROOT->GetVersion(), "5.22/00")>0 && strcmp(gROOT->GetVersion(), "5.26/00")<0)
     {
         cout << "WARNING - Especially root 5.24/00 has a severe bug in projection 2D histograms" << endl;

trunk/MagicSoft/Mars/mbase/MGMap.cc

@@ -158 +158 @@
 void MGMap::Delete(Option_t *)
 {
+#if ROOT_VERSION_CODE < ROOT_VERSION(5,26,00)
     Long_t key, val;
+#else
+    Long64_t key, val;
+#endif
+
     TExMapIter map(this);
     while (map.Next(key, val))
@@ -424 +429 @@
 void MGMap::Paint(Option_t *)
 {
+#if ROOT_VERSION_CODE < ROOT_VERSION(5,26,00)
     Long_t key, val;
+#else
+    Long64_t key, val;
+#endif
+
     TExMapIter map(this);
     while (map.Next(key, val))
@@ -441 +451 @@
     scale /= TMath::Hypot((float)w, (float)h)/2;
 
+#if ROOT_VERSION_CODE < ROOT_VERSION(5,26,00)
     Long_t key, val;
+#else
+    Long64_t key, val;
+#endif
+
     TExMapIter map(this);
     while (map.Next(key, val))
@@ -458 +473 @@
 TObject *MGMap::PickObject(Int_t px, Int_t py, TString &str) const
 {
+#if ROOT_VERSION_CODE < ROOT_VERSION(5,26,00)
     Long_t key, val;
+#else
+    Long64_t key, val;
+#endif
+
     TExMapIter map(this);
     while (map.Next(key, val))
@@ -500 +520 @@
     Int_t min = INT_MAX;
 
+#if ROOT_VERSION_CODE < ROOT_VERSION(5,26,00)
     Long_t key, val;
+#else
+    Long64_t key, val;
+#endif
+
     TExMapIter map(this);
     while (map.Next(key, val))

trunk/MagicSoft/Mars/mbase/MObjLookup.cc

@@ -44 +44 @@
     TExMapIter iter(&fMap);
 
-    Long_t key;
-    Long_t value;
+#if ROOT_VERSION_CODE < ROOT_VERSION(5,26,00)
+    Long_t key, value;
+#else
+    Long64_t key, value;
+#endif
 
     while (iter.Next(key, value))