Changeset 3151 for trunk

Timestamp:

02/14/04 17:43:35 (21 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mhbase/MH.cc (modified) (2 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -12 +12 @@
    * mhbase/MH.cc
      - included call to FindGoodLimits(..) in CutEdges()
-
+     - axe from pointer to reference
+ 
 
  2004/02/14: Thomas Bretz

trunk/MagicSoft/Mars/mhbase/MH.cc

@@ -894 +894 @@
 Int_t MH::CutEdges(TH1 *h, Int_t nbins)
 {
-    TAxis* axe = h->GetXaxis();
-
-    const Int_t min1   = axe->GetFirst();
-    const Int_t max1   = axe->GetLast();
+    TAxis &axe = *h->GetXaxis();
+
+    const Int_t min1   = axe.GetFirst();
+    const Int_t max1   = axe.GetLast();
     const Int_t range1 = max1-min1;
 
@@ -929 +929 @@
 
     //
-    // Check for rebinning
-    //
-    if (nbins < 1)
-    {
-        axe->SetRange(min2,max2);
-        return axe->GetLast()-axe->GetFirst();
-    }
-
-    //
     // Appying TAxis->SetRange before ReBin does not work ...
     // But this workaround helps quite fine
     //
-    const Axis_t min = h->GetBinLowEdge(min2);
-    const Axis_t max = h->GetBinLowEdge(max2)+h->GetBinWidth(max2);
-
-    const Int_t ngroup = (int)((max2-min2)*h->GetNbinsX()/nbins/(max1-min1));
-
-    if (ngroup > 1)
-        h->Rebin(ngroup);
-
-    axe->SetRangeUser(min,max);
-
-    return axe->GetLast()-axe->GetFirst();
+    Axis_t min = h->GetBinLowEdge(min2);
+    Axis_t max = h->GetBinLowEdge(max2)+h->GetBinWidth(max2);
+
+    Int_t nbins2 = max2-min2;
+    //
+    // Check for rebinning
+    //
+    if (nbins > 0)
+      {
+        const Int_t ngroup = (int)(nbins2*h->GetNbinsX()/nbins/(max1-min1));
+        if (ngroup > 1)
+          {
+            h->Rebin(ngroup);
+            nbins2 /= ngroup;
+          }
+      }
+    
+    Int_t newbins = 0;
+    FindGoodLimits(nbins2, newbins, min, max, kFALSE);
+    axe.SetRangeUser(min,max);
+    return axe.GetLast()-axe.GetFirst();
 }