Changeset 5803 for trunk/MagicSoft/Mars/manalysis

Timestamp:

01/11/05 16:46:58 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/manalysis

Files:

• MMatrixLoop.cc (modified) (1 diff)
• MMatrixLoop.h (modified) (1 diff)

trunk/MagicSoft/Mars/manalysis/MMatrixLoop.cc

@@ -54 +54 @@
 // --------------------------------------------------------------------------
 //
+// Return the number of events (rows) in the matrix
+//
+UInt_t MMatrixLoop::GetEntries()
+{
+    return fMatrix ? fMatrix->GetNumRows() : 0;
+}
+
+// --------------------------------------------------------------------------
+//
+// Return name of MHMatrix, <n/a> if not available
+//
+TString MMatrixLoop::GetFileName() const
+{
+    return fMatrix ? fMatrix->GetName() : "<n/a>";
+}
+
+// --------------------------------------------------------------------------
+//
 Int_t MMatrixLoop::PreProcess(MParList *plist)
 {

trunk/MagicSoft/Mars/manalysis/MMatrixLoop.h

@@ -2 +2 @@
 #define MARS_MMatrixLoop
 
-#ifndef MARS_MTask
-#include "MTask.h"
+#ifndef MARS_MRead
+#include "MRead.h"
 #endif
-
 
 class MHMatrix;
 
-class MMatrixLoop : public MTask
+class MMatrixLoop : public MRead
 {
 private:
+    // MMatrixLoop
     static const TString gsDefName;
     static const TString gsDefTitle;
 
-protected:
     MHMatrix *fMatrix;
     Int_t     fNumRow;    //! Number of dimensions of histogram
 
+    // MRead
+    UInt_t  GetEntries();
+    TString GetFileName() const;
+    Bool_t  Rewind() { fNumRow=0; return kTRUE; }
+
+    virtual Int_t AddFile(const char *fname, Int_t entries=-1) { return 0; }
+    Int_t AddFiles(MDirIter &dir) { return 0; }
+
+    // MTask
+    Int_t PreProcess(MParList *plist);
+    Int_t Process();
+
 public:
     MMatrixLoop(MHMatrix *mat, const char *name=NULL, const char *title=NULL);
-
-    Int_t PreProcess(MParList *plist);
-    Int_t Process();
 
     ClassDef(MMatrixLoop, 0) // Task 'reading' events from a MHMatrix