Changeset 1524 for trunk/MagicSoft/Mars/mhist/MHMatrix.h

Timestamp:

09/16/02 10:10:17 (22 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mhist/MHMatrix.h (modified) (7 diffs)

trunk/MagicSoft/Mars/mhist/MHMatrix.h

@@ -1 +1 @@
 #ifndef MARS_MHMatrix
 #define MARS_MHMatrix
+
+#ifdef MARS_MLogManip
+#error Please make ensure that MLogManip.h are included _after_ MHMatrix.h
+#endif
 
 #ifndef ROOT_TMatrix
@@ -10 +14 @@
 
 class TArrayI;
+
+class MTask;
+class MParList;
 class MDataArray;
 
 class MHMatrix : public MH
 {
-protected:
+private:
+    static const TString gsDefName;  //! Default Name
+    static const TString gsDefTitle; //! Default Title
+
     Int_t   fNumRow;    //! Number of dimensions of histogram
+    Int_t   fRow;       //! Present row
     TMatrix fM;         // Matrix to be filled
 
@@ -23 +34 @@
 
     enum {
-        kIsOwner = BIT(14)
+        kIsOwner  = BIT(14),
+        kIsLocked = BIT(16)
     };
 
@@ -39 +51 @@
     ~MHMatrix();
 
-    void AddColumn(const char *name);
+    void Lock()   { SetBit(kIsLocked); }
+    void Unlock() { ResetBit(kIsLocked); }
+
+    Int_t AddColumn(const char *name);
     void AddColumns(MDataArray *mat);
 
@@ -45 +60 @@
 
     const TMatrix &GetM() const { return fM; }
+
+    Bool_t IsValid() const { return fM.IsValid(); }
+    Int_t  GetNumRows() const { return fNumRow; }
 
     //void Draw(Option_t *opt=NULL);
@@ -56 +74 @@
     Double_t CalcDist(const TVector &v, Int_t num = 25);
 
-    void SetIOwner(Bool_t b=kTRUE) { b ? SetBit(kIsOwner) : ResetBit(kIsOwner); }
+    void SetOwner(Bool_t b=kTRUE) { b ? SetBit(kIsOwner) : ResetBit(kIsOwner); }
 
     void Reassign();
@@ -63 +81 @@
     void SortMatrixByColumn(Int_t ncol=0, Bool_t desc=kTRUE);
 
+    Bool_t SetNumRow(Int_t row) { if (row>=fNumRow || row<0) return kFALSE; fRow = row; return kTRUE; }
+    Int_t GetNumRow() const { return fRow; };
+    Double_t operator[](Int_t col) { return fM(fRow, col); }
+
+    Bool_t Fill(MParList *plist, MTask *read);
+
     ClassDef(MHMatrix, 1) // Multidimensional Matrix to store events
 };