Changeset 5692 for trunk/MagicSoft/Mars/mhbase

Timestamp:

01/03/05 12:02:16 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mhbase

Files:

• MBinning.h (modified) (1 diff)
• MHMatrix.cc (modified) (1 diff)
• MHMatrix.h (modified) (1 diff)

trunk/MagicSoft/Mars/mhbase/MBinning.h

@@ -38 +38 @@
     MBinning(const char *name=NULL, const char *title=NULL);
     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); }
+
+    void Copy(TObject &named) const
+    {
+        MBinning &bins = (MBinning&)named;
+        bins.SetEdges(*this);
+    }
 
     void SetEdges(const TArrayD &arr)
     {
         fEdges = arr;
-        fType = kIsUserArray;
+        fType  = kIsUserArray;
     }
 
     void SetEdges(const TAxis &axe);
-    void SetEdges(const MBinning &bins) { SetEdges(fEdges); }
+    void SetEdges(const MBinning &bins) { SetEdges(bins.fEdges); fType = bins.fType; }
     void SetEdges(const TH1 &h, const Char_t axis='x');
     void SetEdges(const Int_t nbins, const Axis_t lo, Axis_t up);

trunk/MagicSoft/Mars/mhbase/MHMatrix.cc

@@ -160 +160 @@
     }
 
+    const Int_t idx = fData->FindRule(rule);
+    if (idx>=0)
+        return idx;
+
     fData->AddEntry(rule);
     return fData->GetNumEntries()-1;

trunk/MagicSoft/Mars/mhbase/MHMatrix.h

@@ -115 +115 @@
     void ReduceRows(UInt_t num);
 
-    ClassDef(MHMatrix, 1) // Multidimensional Matrix to store events
+    ClassDef(MHMatrix, 1) // Multidimensional Matrix (TMatrix) to store events
 };