Changeset 1852 for trunk/MagicSoft/Mars/mhist

Timestamp:

03/21/03 11:10:36 (22 years ago)

Author:

moralejo

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mhist

Files:

• MHMatrix.cc (modified) (3 diffs)
• MHMatrix.h (modified) (2 diffs)
• Makefile (modified) (1 diff)

trunk/MagicSoft/Mars/mhist/MHMatrix.cc

@@ -68 +68 @@
 #include "MData.h"
 #include "MDataArray.h"
+#include "MF.h"
+
 
 ClassImp(MHMatrix);
@@ -600 +602 @@
 // --------------------------------------------------------------------------
 //
-Bool_t MHMatrix::Fill(MParList *plist, MTask *read)
+Bool_t MHMatrix::Fill(MParList *plist, MTask *read, MF *filter)
 {
     //
@@ -614 +616 @@
 
     tlist.AddToList(read);
+
+
+    if (filter)
+      {
+        tlist.AddToList(filter);
+        fillh.SetFilter(filter);
+      }
+
     tlist.AddToList(&fillh);
+
 
     MEvtLoop evtloop;

trunk/MagicSoft/Mars/mhist/MHMatrix.h

@@ -22 +22 @@
 class MParList;
 class MDataArray;
+class MF;
 
 class MHMatrix : public MH
@@ -92 +93 @@
     Double_t operator[](Int_t col) { return fM(fRow, col); }
 
-    Bool_t Fill(MParList *plist, MTask *read);
+    Bool_t Fill(MParList *plist, MTask *read, MF *filter=0);
 
     TString GetDataMember() const;

trunk/MagicSoft/Mars/mhist/Makefile

@@ -23 +23 @@
 #
 INCLUDES = -I. -I../mbase -I../mraw -I../manalysis -I../mmc \
-           -I../mgui -I../mgeom -I../mdata
+           -I../mgui -I../mgeom -I../mdata -I../mfilter
 
 #------------------------------------------------------------------------------