Changeset 6938 for trunk/MagicSoft/Mars/mhbase

Timestamp:

04/13/05 17:30:51 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mhbase

Files:

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

trunk/MagicSoft/Mars/mhbase/MBinning.cc

@@ -91 +91 @@
 // --------------------------------------------------------------------------
 //
+// Initialize Binning from an axis of a TH1. If no title given,
+// a title combined from the axis titles and the TH1 title is
+// used.
+//
+MBinning::MBinning(const TH1 &h, const Char_t axis, const char *name, const char *title)
+{
+    fName  = name  ? name : gsDefName.Data();
+    fTitle = title ? Form("%s;%s;%s;%s", h.GetTitle(),
+                          h.GetXaxis()->GetTitle(),
+                          h.GetYaxis()->GetTitle(),
+                          h.GetZaxis()->GetTitle()) : gsDefTitle.Data();
+
+    SetEdges(h, axis);
+}
+
+// --------------------------------------------------------------------------
+//
+// Initialize Binning from TAxis.
+//
+MBinning::MBinning(const TAxis &axis, const char *name, const char *title)
+{
+    fName  = name  ? name : gsDefName.Data();
+    fTitle = title ? title : gsDefTitle.Data();
+
+    SetEdges(axis);
+}
+
+// --------------------------------------------------------------------------
+//
 // Search in the parameter list for the binning with name "name". If found,
 // set the edges and title accordingly. Default is name of object.
@@ -412 +441 @@
     *fLog << all;
     *fLog << GetDescriptor() << ": nbins=" << GetNumBins() << " [";
-    *fLog << GetEdgeLo() << ", " << GetEdgeHi() << "] ";
+    *fLog << GetEdgeLo() << ", " << GetEdgeHi() << "] <";
     switch (fType)
     {
-    case kIsDefault:     *fLog << "deafult"; break;
+    case kIsDefault:     *fLog << "default"; break;
     case kIsLinear:      *fLog << "linear"; break;
     case kIsLogarithmic: *fLog << "logarithmic"; break;

trunk/MagicSoft/Mars/mhbase/MBinning.h

@@ -41 +41 @@
     MBinning(Int_t nbins, Axis_t lo, Axis_t hi, const char *name=0, const char *opt="", const char *title=NULL);
     MBinning(const MBinning &bins) { SetEdges(bins); }
+    MBinning(const TH1 &h, const Char_t axis='x', const char *name=0, const char *title=0);
+    MBinning(const TAxis &a, const char *name=0, const char *title=0);
 
     void Copy(TObject &named) const