Changeset 8957 for trunk/MagicSoft/Mars/mhbase

Timestamp:

06/14/08 16:55:58 (16 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mhbase

Files:

• MBinning.h (modified) (1 diff)
• MH.cc (modified) (7 diffs)
• MH.h (modified) (1 diff)
• MHMatrix.cc (modified) (2 diffs)
• MHn.cc (modified) (1 diff)

trunk/MagicSoft/Mars/mhbase/MBinning.h

@@ -94 +94 @@
     Int_t GetNumBins() const   { return fEdges.GetSize()-1; }
 
-    Double_t *GetEdges() const { return (Double_t*)fEdges.GetArray(); }
+    const Double_t *GetEdges() const { return fEdges.GetArray(); }
     const TArrayD &GetEdgesD() const { return fEdges; }
 

trunk/MagicSoft/Mars/mhbase/MH.cc

@@ -1 +1 @@
 /* ======================================================================== *\
-! $Name: not supported by cvs2svn $:$Id: MH.cc,v 1.38 2008-06-02 17:21:24 tbretz Exp $
+! $Name: not supported by cvs2svn $:$Id: MH.cc,v 1.39 2008-06-14 15:55:52 tbretz Exp $
 ! --------------------------------------------------------------------------
 !
@@ -554 +554 @@
     if (h->InheritsFrom(TH3::Class()) && x->InheritsFrom(TH3::Class()))
     {
-        SetBinning((TH3*)h, ((TH1*)x)->GetXaxis(), ((TH1*)x)->GetYaxis(), ((TH1*)x)->GetZaxis());
+        SetBinning((TH3*)h, x->GetXaxis(), x->GetYaxis(), x->GetZaxis());
         return;
     }
@@ -561 +561 @@
     if (h->InheritsFrom(TH2::Class()) && x->InheritsFrom(TH2::Class()))
     {
-        SetBinning((TH2*)h, ((TH1*)x)->GetXaxis(), ((TH1*)x)->GetYaxis());
+        SetBinning((TH2*)h, x->GetXaxis(), x->GetYaxis());
         return;
     }
@@ -568 +568 @@
     if (h->InheritsFrom(TH1::Class()) && x->InheritsFrom(TH1::Class()))
     {
-        SetBinning(h, ((TH1*)x)->GetXaxis());
+        SetBinning(h, x->GetXaxis());
         return;
     }
@@ -869 +869 @@
     // Draw first histogram
     //
-    TH1 *h1 = ((TH1&)hist1).DrawCopy();
+    TH1 *h1 = hist1.DrawCopy();
     gPad->SetBorderMode(0);
     gPad->Update();
@@ -921 +921 @@
     // Draw second histogram
     //
-    TH1 *h2 = ((TH1&)hist2).DrawCopy("sames");
+    TH1 *h2 = hist2.DrawCopy("sames");
     gPad->Update();
 
@@ -1208 +1208 @@
 }
 
-void MH::ProjectionX(TH1D &dest, const TH2 &src, Int_t firstybin, Int_t lastybin)
-{
-    //*-*-*-*-*Project a 2-D histogram into a 1-D histogram along X*-*-*-*-*-*-*
-    //*-*      ====================================================
-    //
-    //   The projection dest is always of the type TH1D.
-    //   The projection is made from the channels along the Y axis
-    //   ranging from firstybin to lastybin included.
-    //   By default, bins 1 to ny are included
-    //   When all bins are included, the number of entries in the projection
-    //   is set to the number of entries of the 2-D histogram, otherwise
-    //   the number of entries is incremented by 1 for all non empty cells.
-    //
-    //   if Sumw2() was called for dest, the errors are computed.
-    //
-    TAxis &axex = *((TH2&)src).GetXaxis();
-    TAxis &axey = *((TH2&)src).GetYaxis();
-
-    const Int_t nx = axex.GetNbins();
-    const Int_t ny = axey.GetNbins();
-    if (firstybin < 0)
-        firstybin = 1;
-    if (lastybin > ny)
-        lastybin = ny;
-
-    dest.Reset();
-    SetBinning(&dest, &axex);
-
-    // Create the projection histogram
-    const Bool_t computeErrors = dest.GetSumw2N() ? 1 : 0;
-
-    // Fill the projected histogram
-    for (Int_t binx=0; binx<=nx+1; binx++)
-    {
-        Double_t err2 = 0;
-        for (Int_t biny=firstybin; biny<=lastybin; biny++)
-        {
-            const Double_t cont = src.GetCellContent(binx,biny);
-            const Double_t err1 = src.GetCellError(binx,biny);
-            err2 += err1*err1;
-            if (cont)
-                dest.Fill(axex.GetBinCenter(binx), cont);
-        }
-        if (computeErrors)
-            dest.SetBinError(binx, TMath::Sqrt(err2));
-    }
-    if (firstybin <=1 && lastybin >= ny)
-        dest.SetEntries(src.GetEntries());
-}
-
-void MH::ProjectionY(TH1D &dest, const TH2 &src, Int_t firstxbin, Int_t lastxbin)
-{
-    //*-*-*-*-*Project a 2-D histogram into a 1-D histogram along X*-*-*-*-*-*-*
-    //*-*      ====================================================
-    //
-    //   The projection dest is always of the type TH1D.
-    //   The projection is made from the channels along the Y axis
-    //   ranging from firstybin to lastybin included.
-    //   By default, bins 1 to ny are included
-    //   When all bins are included, the number of entries in the projection
-    //   is set to the number of entries of the 2-D histogram, otherwise
-    //   the number of entries is incremented by 1 for all non empty cells.
-    //
-    //   if Sumw2() was called for dest, the errors are computed.
-    //
-    TAxis &axex = *((TH2&)src).GetXaxis();
-    TAxis &axey = *((TH2&)src).GetYaxis();
-
-    const Int_t nx = axex.GetNbins();
-    const Int_t ny = axey.GetNbins();
-    if (firstxbin < 0)
-        firstxbin = 1;
-    if (lastxbin > nx)
-        lastxbin = nx;
-
-    dest.Reset();
-    SetBinning(&dest, &axey);
-
-    // Create the projection histogram
-    const Bool_t computeErrors = dest.GetSumw2N() ? 1 : 0;
-
-    // Fill the projected histogram
-    for (Int_t biny=0; biny<=ny+1; biny++)
-    {
-        Double_t err2 = 0;
-        for (Int_t binx=firstxbin; binx<=lastxbin; binx++)
-        {
-            const Double_t cont = src.GetCellContent(binx,biny);
-            const Double_t err1 = src.GetCellError(binx,biny);
-            err2 += err1*err1;
-            if (cont)
-                dest.Fill(axey.GetBinCenter(biny), cont);
-        }
-        if (computeErrors)
-            dest.SetBinError(biny, TMath::Sqrt(err2));
-    }
-    if (firstxbin <=1 && lastxbin >= nx)
-        dest.SetEntries(src.GetEntries());
-}
-
 // --------------------------------------------------------------------------
 //

trunk/MagicSoft/Mars/mhbase/MH.h

@@ -119 +119 @@
                               const char* name="ProjectArray", const char* title="Projected Array");
     
-    static void ProjectionX(TH1D &dest, const TH2 &src, Int_t firstybin=-1, Int_t lastybin=9999);
-    static void ProjectionY(TH1D &dest, const TH2 &src, Int_t firstxbin=-1, Int_t lastxbin=9999);
-
     static void GetRangeUser(const TH1 &hist, Axis_t &lo, Axis_t &hi);
     static void GetRangeUserX(const TH1 &hist, Axis_t &lo, Axis_t &hi);

trunk/MagicSoft/Mars/mhbase/MHMatrix.cc

@@ -783 +783 @@
 
     th1->cd(1);
-    ((TH1&)hth).DrawCopy();   // real histogram before
+    hth.DrawCopy();   // real histogram before
 
     th1->cd(2);
-    ((TH1&)hta).DrawCopy();   // histogram after
+    hta.DrawCopy();   // histogram after
 
     th1->cd(3);
-    ((TH1&)hthd).DrawCopy();  // correction factors
+    hthd.DrawCopy();  // correction factors
 
     th1->cd(4);
-    ((TH1&)thsh).DrawCopy();  // target
+    thsh.DrawCopy();  // target
 }
 
@@ -895 +895 @@
     SetBinning(&hthd, &thsh);
     hthd.SetDirectory(NULL);
-    hthd.Divide((TH1F*)&thsh, &hth, 1, 1);
+    hthd.Divide(&thsh, &hth, 1, 1);
 
     if (hthd.GetMaximum() <= 0)

trunk/MagicSoft/Mars/mhbase/MHn.cc

@@ -584 +584 @@
     for (int i=0; i<fNum; i++)
     {
-        TString opt(fDrawOption[i]);
+        TString dopt(fDrawOption[i]);
         if (same)
-            opt += " same";
+            dopt += " same";
 
         pad->cd(i+1);
-        fHist[i]->Draw(opt);
-    }
-}
+        fHist[i]->Draw(dopt);
+    }
+}