Changeset 2216 for trunk/MagicSoft/Mars/mhist

Timestamp:

06/23/03 14:33:49 (22 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mhist

Files:

• MHCamera.cc (modified) (7 diffs)
• MHCamera.h (modified) (2 diffs)

trunk/MagicSoft/Mars/mhist/MHCamera.cc

@@ -167 +167 @@
 //   -*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*
 
+#if ROOT_VERSION_CODE > ROOT_VERSION(3,05,00)
    if (fBuffer) return BufferFill(x,1);
-
+#endif
    const Int_t bin = (Int_t)x+1;
    AddBinContent(bin);
@@ -199 +200 @@
 //   -*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*
 
+#if ROOT_VERSION_CODE > ROOT_VERSION(3,05,00)
    if (fBuffer) return BufferFill(x,w);
-
+#endif
    const Int_t bin = (Int_t)x+1;
    AddBinContent(bin, w);
@@ -403 +405 @@
     // box with the histogram title
     ptitle->SetTextColor(gStyle->GetTitleTextColor());
+#if ROOT_VERSION_CODE > ROOT_VERSION(3,05,00)
     ptitle->SetTextFont(gStyle->GetTitleFont(""));
+#endif
     ptitle->Paint();
 }
@@ -412 +416 @@
 //                       ========================
    //if (Hoption.Same) return;
+#if ROOT_VERSION_CODE > ROOT_VERSION(3,05,00)
     if (TestBit(kNoTitle))
         return;
+#endif
 
     const Int_t nt = strlen(GetTitle());
@@ -460 +466 @@
 
     // box with the histogram title
+#if ROOT_VERSION_CODE > ROOT_VERSION(3,05,00)
     ptitle->SetFillColor(gStyle->GetTitleFillColor());
+    ptitle->SetTextFont(gStyle->GetTitleFont(""));
+    if (gStyle->GetTitleFont("")%10 > 2)
+        ptitle->SetTextSize(gStyle->GetTitleFontSize());
+#endif
     ptitle->SetFillStyle(gStyle->GetTitleStyle());
     ptitle->SetName("title");
     ptitle->SetBorderSize(gStyle->GetTitleBorderSize());
     ptitle->SetTextColor(gStyle->GetTitleTextColor());
-    ptitle->SetTextFont(gStyle->GetTitleFont(""));
-    if (gStyle->GetTitleFont("")%10 > 2)
-        ptitle->SetTextSize(gStyle->GetTitleFontSize());
     ptitle->AddText(GetTitle());
     ptitle->SetBit(kCanDelete);
@@ -654 +662 @@
     for (Int_t idx=0; idx<fNcells-2; idx++)
     {
-        Fill(idx, event[idx]); // FIXME: Slow!
+        Fill(idx, const_cast<TArrayD&>(event)[idx]); // FIXME: Slow!
         //fArray[idx+1]+=val;
 
@@ -690 +698 @@
     for (Int_t idx=0; idx<fNcells-2; idx++)
     {
-        if (event[idx]>threshold)
+        if (const_cast<TArrayD&>(event)[idx]>threshold)
             Fill(idx);
 

trunk/MagicSoft/Mars/mhist/MHCamera.h

@@ -68 +68 @@
     };
 
-    Bool_t IsUsed(Int_t idx) const { return TESTBIT(fUsed[idx], kIsUsed); }
+    Bool_t IsUsed(Int_t idx) const { return TESTBIT(const_cast<TArrayC&>(fUsed)[idx], kIsUsed); }
     void   SetUsed(Int_t idx)      { SETBIT(fUsed[idx], kIsUsed); }
     void   ResetUsed(Int_t idx)    { CLRBIT(fUsed[idx], kIsUsed); }
@@ -91 +91 @@
 
     // This is a trick to remove TH1 entries from the context menu
-    void Add(TF1 *h1, Double_t c1=1) { TH1::Add(h1, c1); }
-    void Add(const TH1 *h1, Double_t c1=1) { TH1::Add(h1, c1); }
-    void Add(const TH1 *h1, const TH1 *h2, Double_t c1=1, Double_t c2=1) { TH1::Add(h1, h2, c1, c2); }
-    void Divide(TF1 *f1, Double_t c1=1) { TH1::Divide(f1, c1); }
-    void Divide(const TH1 *h1) { TH1::Divide(h1); }
-    void Divide(const TH1 *h1, const TH1 *h2, Double_t c1=1, Double_t c2=1, Option_t *option="") { TH1::Divide(h1, h2, c1, c2, option); }
-    void Multiply(TF1 *h1, Double_t c1=1) { TH1::Multiply(h1, c1); }
-    void Multiply(const TH1 *h1) { TH1::Multiply(h1); }
-    void Multiply(const TH1 *h1, const TH1 *h2, Double_t c1=1, Double_t c2=1, Option_t *option="") { TH1::Multiply(h1, h2, c1, c2, option); }
+    /*
+     void Add(const TH1 *h1, const TH1 *h2, Double_t c1=1, Double_t c2=1) { TH1::Add(h1, h2, c1, c2); }
+     void Add(TF1 *h1, Double_t c1=1) { TH1::Add(h1, c1); }
+     void Add(const TH1 *h1, Double_t c1=1) { TH1::Add(h1, c1); }
+     void Divide(TF1 *f1, Double_t c1=1) { TH1::Divide(f1, c1); }
+     void Divide(const TH1 *h1) { TH1::Divide(h1); }
+     void Divide(const TH1 *h1, const TH1 *h2, Double_t c1=1, Double_t c2=1, Option_t *option="") { TH1::Divide(h1, h2, c1, c2, option); }
+     void Multiply(TF1 *h1, Double_t c1=1) { TH1::Multiply(h1, c1); }
+     void Multiply(const TH1 *h1) { TH1::Multiply(h1); }
+     void Multiply(const TH1 *h1, const TH1 *h2, Double_t c1=1, Double_t c2=1, Option_t *option="") { TH1::Multiply(h1, h2, c1, c2, option); }
+     */
+
     void FitPanel() { TH1::FitPanel(); }