Changeset 2521 for trunk/MagicSoft/Mars/mmain

Timestamp:

11/17/03 22:26:16 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mmain

Files:

• MEventDisplay.cc (modified) (3 diffs)
• Makefile (modified) (1 diff)

trunk/MagicSoft/Mars/mmain/MEventDisplay.cc

@@ -60 +60 @@
 #include "MReadMarsFile.h"       // MReadMarsFile
 #include "MGeomApply.h"          // MGeomApply
+#include "MFDataMember.h"        // MFDataMember
 #include "MMcPedestalCopy.h"     // MMcPedestalCopy
 #include "MMcPedestalNSBAdd.h"   // MMcPedestalNSBAdd
 #include "MCerPhotCalc.h"        // MCerPhotCalc
+#include "MCerPhotAnal2.h"       // MCerPhotAnal2
 #include "MImgCleanStd.h"        // MImgCleanStd
 #include "MHillasCalc.h"         // MHillasCalc
@@ -182 +184 @@
     MMcPedestalNSBAdd *pdnsb = new MMcPedestalNSBAdd;
     MCerPhotCalc      *ncalc = new MCerPhotCalc;
+    MCerPhotAnal2     *nanal = new MCerPhotAnal2;
     MFillH            *fill1 = new MFillH(evt1, "MCerPhotEvt",  "MFillH1");
     MImgCleanStd      *clean = new MImgCleanStd;
@@ -193 +196 @@
     MHillasSrcCalc    *scalc = new MHillasSrcCalc;
 
+    MFilter *f1=new MFDataMember("MRawRunHeader.fRunType", '>', 255.5);
+    MFilter *f2=new MFDataMember("MRawRunHeader.fRunType", '<', 255.5);
+
+    ncalc->SetFilter(f1);
+    nanal->SetFilter(f2);
+
+    tlist->AddToList(f1);
+    tlist->AddToList(f2);
     tlist->AddToList(pcopy);
     tlist->AddToList(pdnsb);
     tlist->AddToList(ncalc);
+    tlist->AddToList(nanal);
     tlist->AddToList(fill1);
     tlist->AddToList(clean);

trunk/MagicSoft/Mars/mmain/Makefile

@@ -24 +24 @@
 INCLUDES = -I. -I../mbase -I../manalysis -I../mdatacheck -I../mraw       \
            -I../mgui -I../mgeom -I../mhist -I../mmontecarlo -I../mfileio \
-           -I../mimage -I../mhistmc -I../mgbase
+           -I../mimage -I../mhistmc -I../mgbase -I../mfilter -I../mdata
 
 #------------------------------------------------------------------------------