Changeset 9552 for trunk/MagicSoft/Mars

Timestamp:

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

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mbase/MAGIC.cc (modified) (1 diff)
• mbase/MGMap.cc (modified) (5 diffs)
• mbase/MObjLookup.cc (modified) (1 diff)
• mdata/MDataPhrase.cc (modified) (1 diff)
• mhflux/MMcSpectrumWeight.cc (modified) (1 diff)
• mjobs/MJob.cc (modified) (1 diff)
• mjtrain/MJTrainDisp.cc (modified) (2 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -18 +18 @@
 
                                                  -*-*- END OF LINE -*-*-
+
+ 2010/02/23 Thomas Bretz
+
+   * mbase/MAGIC.cc:
+     - projections are supposed to work again in root 5.26 
+       (not tested yet)
+
+   * mbase/MGMap.cc, mbase/MObjLookup.cc:
+     - key and val are Long64 in newer root versions
+
+   * mdata/MDataPhrase.cc:
+     - need inclusion of TFormulaPrimitive in root 5.26
+
+   * mhflux/MMcSpectrumWeight.cc:
+     - root 5.26 has a different calling convention for TH1::Intgeral
+
+   * mjobs/MJob.cc:
+     - added a suggested parenthesis
+
+   * mjtrain/MJTrainDisp.cc:
+     - cast the MH3 histogram correctly to a TH2
+
+
 
  2010/02/22 Daniela Dorner

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))

trunk/MagicSoft/Mars/mdata/MDataPhrase.cc

@@ -115 +115 @@
 #include <TPRegexp.h>
 #include <TFormula.h>
+#if ROOT_VERSION_CODE >= ROOT_VERSION(5,26,00)
+#include <TFormulaPrimitive.h>
+#endif
 
 #include "MLog.h"

trunk/MagicSoft/Mars/mhflux/MMcSpectrumWeight.cc

@@ -489 +489 @@
         // Ratio between the number of events in the zenith angle
         // bin corresponding to x and the new spectrum.
+#if ROOT_VERSION_CODE < ROOT_VERSION(5,26,00)
         const Double_t f = h.Integral(x, x, -1, 9999)/norm;
+#else
+        const Double_t f = h.Integral(x, x)/norm;
+#endif
 
         // Fill histogram with the "new spectrum" between

trunk/MagicSoft/Mars/mjobs/MJob.cc

@@ -414 +414 @@
         }
 
-        if (flags&2==0)
+        if ((flags&2)==0)
         {
             *fLog << err << "ERROR - " << dirname << " is not a directory." << endl;

trunk/MagicSoft/Mars/mjtrain/MJTrainDisp.cc

@@ -60 +60 @@
 #include "MJTrainDisp.h"
 
+#include <TH2.h>
 #include <TLine.h>
 #include <TCanvas.h>
@@ -113 +114 @@
     MH::SetPalette("pretty");
 
-    TH1 &hist = *(TH1*)mh3.GetHist().Clone();
+    TH2 &hist = *static_cast<TH2*>(mh3.GetHist().Clone());
     hist.SetBit(TH1::kNoStats);
     hist.SetDirectory(0);