Changeset 2180

Timestamp:

06/16/03 15:13:21 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• manalysis/MCurrents.h (modified) (1 diff)
• manalysis/MPedestalCam.cc (modified) (1 diff)
• mbase/MDirIter.cc (modified) (1 diff)
• mbase/MDirIter.h (modified) (2 diffs)
• mhist/MH.cc (modified) (2 diffs)
• mhist/MHHadronness.cc (modified) (2 diffs)
• mmain/MStatusDisplay.cc (modified) (5 diffs)
• mraw/MRawEvtData.h (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -71 +71 @@
    * mraw/Makefile:
      - added -I../mgui - PRELIMINARY
+
+   * mhist/MH.cc:
+     - fixed Draw(TH1&,TH1&) for newer root versions
+
+   * mhist/MHHadronness.cc:
+     - fixed call to fGraph->SetMaximum(1) for newer root versions
+
+   * mmain/MStatusDisplay.cc:
+     - fixed for gcc 3.* and newer root versions
+     
 
 

trunk/MagicSoft/Mars/manalysis/MCurrents.h

@@ -10 +10 @@
 #endif
 
-#include <iostream.h>
 class MCurrents : public MCamEvent
 {

trunk/MagicSoft/Mars/manalysis/MPedestalCam.cc

@@ -182 +182 @@
 }
 
-Bool_t MPedestalCam::GetPixelContent(Float_t &val, Int_t idx, Float_t ratio=1, Int_t type=0) const
+Bool_t MPedestalCam::GetPixelContent(Float_t &val, Int_t idx, Float_t ratio, Int_t type) const
 {
     val = (*this)[idx].GetMean()*ratio;

trunk/MagicSoft/Mars/mbase/MDirIter.cc

@@ -285 +285 @@
 // matching entries are printed.
 //
-void MDirIter::Print(const Option_t *o)
+void MDirIter::Print(const Option_t *o) const
 {
     TString s(o);

trunk/MagicSoft/Mars/mbase/MDirIter.h

@@ -29 +29 @@
         fList.SetOwner();
     }
-    MDirIter(MDirIter &dir) : fNext(&fList), fDirPtr(NULL)
+    MDirIter(const MDirIter &dir) : fNext(&fList), fDirPtr(NULL)
     {
         fList.SetOwner();
@@ -60 +60 @@
     void SetFilter(const char *f="") { fFilter = f; }
 
-    void Print(const Option_t *o="");
+    void Print(const Option_t *o="") const;
 
     ClassDef(MDirIter, 1) // Iterator for files in several directories (with filters)

trunk/MagicSoft/Mars/mhist/MH.cc

@@ -733 +733 @@
     // Rename first statistics box
     //
-    TPaveStats &s1 = *(TPaveStats*)gPad->FindObject("stats");
-    const Double_t x1 = s1.GetX1NDC()-0.01;
-    s1.SetName((TString)"Stat"+hist1.GetTitle());
-    s1.SetX1NDC(x1-(s1.GetX2NDC()-s1.GetX1NDC()));
-    s1.SetX2NDC(x1);
+    // Where to get the TPaveStats depends on the root version
+    TPaveStats *s1 = (TPaveStats*)gPad->FindObject("stats");
+    if (!s1)
+        s1 = (TPaveStats*)hist1.GetListOfFunctions()->FindObject("stats");
+    else
+        s1->SetName((TString)"Stat"+hist1.GetTitle());
+
+    if (s1)
+    {
+        const Double_t x1 = s1->GetX1NDC()-0.01;
+        s1->SetX1NDC(x1-(s1->GetX2NDC()-s1->GetX1NDC()));
+        s1->SetX2NDC(x1);
+    }
 
     //
@@ -748 +756 @@
     // Draw Legend
     //
-    TPaveStats &s2 = *(TPaveStats*)gPad->FindObject("stats");
-    TLegend &l = *new TLegend(s2.GetX1NDC(),
-                              s2.GetY1NDC()-0.015-(s2.GetY2NDC()-s2.GetY1NDC())/2,
-                              s2.GetX2NDC(),
-                              s2.GetY1NDC()-0.01
-                             );
-    l.AddEntry(&hist1, hist1.GetTitle());
-    l.AddEntry(&hist2, hist2.GetTitle());
-    l.SetTextSize(s2.GetTextSize());
-    l.SetTextFont(s2.GetTextFont());
-    l.SetBorderSize(s2.GetBorderSize());
-    l.SetBit(kCanDelete);
-    l.Draw();
+    // Where to get the TPaveStats depends on the root version
+    TPaveStats *s2 = (TPaveStats*)gPad->FindObject("stats");
+    if (!s2)
+        s2 = (TPaveStats*)hist2.GetListOfFunctions()->FindObject("stats");
+
+    if (s2)
+    {
+        TLegend &l = *new TLegend(s2->GetX1NDC(),
+                                  s2->GetY1NDC()-0.015-(s2->GetY2NDC()-s2->GetY1NDC())/2,
+                                  s2->GetX2NDC(),
+                                  s2->GetY1NDC()-0.01
+                                 );
+        l.AddEntry(&hist1, hist1.GetTitle());
+        l.AddEntry(&hist2, hist2.GetTitle());
+        l.SetTextSize(s2->GetTextSize());
+        l.SetTextFont(s2->GetTextFont());
+        l.SetBorderSize(s2->GetBorderSize());
+        l.SetBit(kCanDelete);
+        l.Draw();
+    }
 }
 

trunk/MagicSoft/Mars/mhist/MHHadronness.cc

@@ -93 +93 @@
     fGraph = new TGraph;
     fGraph->SetTitle("Acceptance Gammas vs. Hadrons");
-    fGraph->SetMaximum(1);
     fGraph->SetMarkerStyle(kFullDotSmall);
 
@@ -474 +473 @@
         h->SetXTitle("Acceptance Hadrons");
         h->SetYTitle("Acceptance Gammas");
+        fGraph->SetMaximum(1);
         fGraph->Draw("P");
         gPad->Modified();

trunk/MagicSoft/Mars/mmain/MStatusDisplay.cc

@@ -675 +675 @@
 
     // layout and map new tab
-#if ROOT_VERSION_CODE < ROOT_VERSION(3,03,00)
+//#if ROOT_VERSION_CODE < ROOT_VERSION(3,03,00)
     MapSubwindows();
     Layout();
-#else
-    Layout();
-    MapSubwindows();
-#endif
+//#else
+//    Layout();
+//    MapSubwindows();
+//#endif
 
     // display new tab in the main frame
@@ -1435 +1435 @@
     const TString newstr("%%DocumentPaperSizes: a4\n%%Orientation: Landscape");
 
-    // gcc 3.2:
-    /*
-    fstream f(name, ios::in|ios::out|ios::nocreate);
+    /* FIXME: Does gcc 2.95 need this flag, too? |ios::nocreate */
+    fstream f(name, ios::in|ios::out);
 
     TString str;
     f >> str;
 
-    streampos p = f.tellg()+1;
+    const streampos p = f.tellg();
 
     char *c1 = new char[newstr.Length()];
@@ -1450 +1449 @@
 
     f.seekp(p);
+    f.seekp(1, ios::cur);
 
     f << newstr;
@@ -1455 +1455 @@
     while (1)
     {
-        streampos p1 = f.tellg();
+        const streampos p1 = f.tellg();
         f.read(c2, newstr.Length());
-        streampos p2 = f.tellg();
+        const streampos p2 = f.tellg();
         f.seekp(p1);
         if (f)
@@ -1474 +1474 @@
     delete c2;
     delete c1;
-    */
 }
 

trunk/MagicSoft/Mars/mraw/MRawEvtData.h

@@ -15 +15 @@
 class MArrayS;
 class MArrayB;
-
-#include <iostream.h>
 
 class MRawEvtData : public MCamEvent