Changeset 2419 for trunk/MagicSoft

Timestamp:

10/21/03 09:31:06 (21 years ago)

Author:

wittek

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• manalysis/MMatrixLoop.cc (modified) (3 diffs)
• manalysis/MMatrixLoop.h (modified) (2 diffs)
• mhist/MHMatrix.cc (modified) (10 diffs)
• mhist/MHMatrix.h (modified) (3 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -1 +1 @@
                                                  -*-*- END OF LINE -*-*-
+  2003/10/21: Wolfgang Wittek
+
+  * manalysis/MMatrixLoop.[h,cc]
+    - member function PreProcess() put from .h to .cc
+
+  * mhist/MHMatrix.[h,cc]
+    - member function SetNumRow() put from .h to .cc
+
+
+
   2003/10/20: Thomas Bretz
 

trunk/MagicSoft/Mars/manalysis/MMatrixLoop.cc

@@ -34 +34 @@
 
 #include "MHMatrix.h"
+#include "MLog.h"
 
 ClassImp(MMatrixLoop);
@@ -53 +54 @@
 // --------------------------------------------------------------------------
 //
+
+Int_t MMatrixLoop::PreProcess(MParList *plist)
+    {
+        fNumRow = 0;
+
+        return fMatrix ? kTRUE : kFALSE;
+    }
+
+// --------------------------------------------------------------------------
+//
 // Set the present row of the Matrix, stops the loop when all rows have
 // been accessed.
@@ -61 +72 @@
 }
 
+
+
+
+
+
+
+
+
+

trunk/MagicSoft/Mars/manalysis/MMatrixLoop.h

@@ -5 +5 @@
 #include "MTask.h"
 #endif
+
 
 class MHMatrix;
@@ -21 +22 @@
     MMatrixLoop(MHMatrix *mat, const char *name=NULL, const char *title=NULL);
 
-    Int_t PreProcess(MParList *plist)
-    {
-        fNumRow = 0;
-
-        return fMatrix ? kTRUE : kFALSE;
-    }
-
+    Int_t PreProcess(MParList *plist);
     Int_t Process();
 

trunk/MagicSoft/Mars/mhist/MHMatrix.cc

@@ -83 +83 @@
 //
 MHMatrix::MHMatrix(const char *name, const char *title)
-    : fNumRow(0), fData(NULL)
+    : fNumRows(0), fData(NULL)
 {
     fName  = name  ? name  : gsDefName.Data();
@@ -94 +94 @@
 //
 MHMatrix::MHMatrix(const TMatrix &m, const char *name, const char *title)
-    : fNumRow(m.GetNrows()), fM(m), fData(NULL)
+    : fNumRows(m.GetNrows()), fM(m), fData(NULL)
 {
     fName  = name  ? name  : gsDefName.Data();
@@ -106 +106 @@
 //
 MHMatrix::MHMatrix(MDataArray *mat, const char *name, const char *title)
-    : fNumRow(0), fData(mat)
+    : fNumRows(0), fData(mat)
 {
     fName  = name  ? name  : gsDefName.Data();
@@ -122 +122 @@
         delete fData;
 }
+
+// --------------------------------------------------------------------------
+//
+Bool_t MHMatrix::SetNumRow(Int_t row) 
+    {
+      if (row>=fM.GetNrows() || row<0) return kFALSE; 
+      fRow = row; 
+      return kTRUE; 
+    }
+
 
 // --------------------------------------------------------------------------
@@ -205 +215 @@
 void MHMatrix::AddRow()
 {
-    fNumRow++;
-
-    if (fM.GetNrows() > fNumRow)
+    fNumRows++;
+
+    if (fM.GetNrows() > fNumRows)
         return;
 
@@ -237 +247 @@
 
     for (int col=0; col<fData->GetNumEntries(); col++)
-        fM(fNumRow-1, col) = (*fData)(col);
+        fM(fNumRows-1, col) = (*fData)(col);
 
     return kTRUE;
@@ -252 +262 @@
     // It's not a fatal error so we don't need to stop PostProcessing...
     //
-    if (fData->GetNumEntries()==0 || fNumRow<1)
+    if (fData->GetNumEntries()==0 || fNumRows<1)
         return kTRUE;
 
-    if (fNumRow != fM.GetNrows())
+    if (fNumRows != fM.GetNrows())
     {
         TMatrix m(fM);
-        CopyCrop(fM, m, fNumRow);
+        CopyCrop(fM, m, fNumRows);
     }
 
@@ -900 +910 @@
     //
     CopyCrop(fM, mnewtmp, evtcount1);
-    fNumRow = evtcount1;
+    fNumRows = evtcount1;
 
     if (evtcount1 < nmaxevts)
@@ -1008 +1018 @@
     //
     CopyCrop(fM, mnewtmp, evtcount1);
-    fNumRow = evtcount1;
+    fNumRows = evtcount1;
 
     if (evtcount1 < nmaxevts)
@@ -1111 +1121 @@
     TVector v(fM.GetNcols());
     TVector tmp(fM.GetNcols());
-    for (Int_t irow = 0; irow<fNumRow; irow++)
-    {
-        const Int_t jrow = rnd.Integer(fNumRow);
+    for (Int_t irow = 0; irow<fNumRows; irow++)
+    {
+        const Int_t jrow = rnd.Integer(fNumRows);
 
         v = TMatrixRow(fM, irow);

trunk/MagicSoft/Mars/mhist/MHMatrix.h

@@ -30 +30 @@
     static const TString gsDefTitle; //! Default Title
 
-    Int_t   fNumRow;    // Number of dimensions of histogram
+    Int_t   fNumRows;   //! Number of rows filled into the matrix (this is NOT the number of rows of the matrix!)
     Int_t   fRow;       //! Present row
     TMatrix fM;         // Matrix to be filled
@@ -75 +75 @@
 
     Bool_t IsValid() const { return fM.IsValid(); }
-    Int_t  GetNumRows() const { return fNumRow; }
+    Int_t  GetNumRows() const { return fM.GetNrows(); }
 
     //void Draw(Option_t *opt=NULL);
@@ -94 +94 @@
     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; }
+    Bool_t SetNumRow(Int_t row); 
+ 
     Int_t GetNumRow() const { return fRow; };
     Double_t operator[](Int_t col) { return fM(fRow, col); }