Changeset 4920 for trunk/MagicSoft/Mars/mhbase

Timestamp:

09/10/04 14:06:46 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mhbase

Files:

• MBinning.cc (modified) (3 diffs)
• MBinning.h (modified) (1 diff)

trunk/MagicSoft/Mars/mhbase/MBinning.cc

@@ -72 +72 @@
 
 }
+
 void MBinning::SetEdges(const TAxis &axe)
 {
-    const TArrayD &arr = *((TAxis&)axe).GetXbins();
+    const TArrayD &arr = *axe.GetXbins();
     if (arr.GetSize()>0)
     {
@@ -82 +83 @@
 
     SetEdges(axe.GetNbins(), axe.GetXmin(), axe.GetXmax());
+}
+
+void MBinning::AddEdge(Axis_t up)
+{
+    const Int_t n = fEdges.GetSize();
+
+    if (up<=fEdges[n-1])
+    {
+        *fLog << warn << dbginf << "WARNING - New upper edge not greater than old upper edge... ignored." << endl;
+        return;
+    }
+
+    fEdges.Set(n+1);
+    fEdges[n] = up;
+
+    fType = kIsUserArray;
 }
 
@@ -111 +128 @@
 void MBinning::SetEdges(const Int_t nbins, const Axis_t lo, Axis_t up)
 {
-    const Double_t binsize = (up-lo)/nbins;
+    const Double_t binsize = nbins<=0 ? 0 : (up-lo)/nbins;
     fEdges.Set(nbins+1);
     for (int i=0; i<=nbins; i++)
-            fEdges[i] = binsize*i + lo;
+        fEdges[i] = binsize*i + lo;
 
     fType = kIsLinear;

trunk/MagicSoft/Mars/mhbase/MBinning.h

@@ -79 +79 @@
     Double_t *GetEdges() const { return (Double_t*)fEdges.GetArray(); }
 
+    void AddEdge(Axis_t up);
+
     Bool_t IsLinear() const { return fType==kIsLinear; }
     Bool_t IsLogarithmic() const { return fType==kIsLogarithmic; }