Changeset 8611 for trunk/MagicSoft

Timestamp:

06/26/07 18:01:17 (17 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (2 diffs)
• mmain/MEventDisplay.cc (modified) (3 diffs)
• mmain/Makefile (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -20 +20 @@
 
 
+ 2007/06/26 Thomas Bretz
+
+   * mmain/Makefile:
+     - added inlclude path for mfilter
+
+   * mmain/MEventDisplay.cc:
+     - added MFEvtNumber to choose selected preselected events
+
+
+
  2007/06/25 Daniel Hoehne
 
@@ -27 +37 @@
 
    * datacenter/macros/fillcamera.C:
-     - bugfix: the macro doesn't giva a seg-fault anymore (thanks to Thomas)
+     - bugfix: the macro doesn't giva a seg-fault anymore
+       (thanks to Thomas)
      - arranged the structure more clearly
 

trunk/MagicSoft/Mars/mmain/MEventDisplay.cc

@@ -1 +1 @@
 /* ======================================================================== *\
-! $Name: not supported by cvs2svn $:$Id: MEventDisplay.cc,v 1.59 2007-03-04 13:49:05 tbretz Exp $
+! $Name: not supported by cvs2svn $:$Id: MEventDisplay.cc,v 1.60 2007-06-26 16:59:21 tbretz Exp $
 ! --------------------------------------------------------------------------
 !
@@ -70 +70 @@
 #include "MPedestalSubtract.h"         // MPedestalSubtract
 #include "MFDataMember.h"              // MFDataMember
+#include "MFEvtNumber.h"               // MFEvtNumber
 #include "MMcPedestalCopy.h"           // MMcPedestalCopy
 #include "MMcPedestalNSBAdd.h"         // MMcPedestalNSBAdd
@@ -204 +205 @@
     tlist->SetOwner();
 
-    MReadMarsFile *read = new MReadMarsFile(tname, fname);
-    read->DisableAutoScheme();
-    tlist->AddToList(read);
-
-    MGeomApply *apl = new MGeomApply;
-    tlist->AddToList(apl);
-
     MParList *plist = new MParList;
     plist->SetOwner();
     plist->AddToList(tlist);
     plist->AddToList(badpix);
+
+    MReadMarsFile *read = new MReadMarsFile(tname, fname);
+    read->DisableAutoScheme();
+    tlist->AddToList(read);
+
+    MFEvtNumber *evtnum = new MFEvtNumber;
+    tlist->AddToList(evtnum);
+
+    MContinue *contevt = new MContinue(evtnum);
+    contevt->SetInverted();
+    tlist->AddToList(contevt);
+
+    MGeomApply *apl = new MGeomApply;
+    tlist->AddToList(apl);
+
 
     //MArrivalTime *atime = new MArrivalTime;

trunk/MagicSoft/Mars/mmain/Makefile

@@ -23 +23 @@
            -I../mfileio -I../mimage -I../mhistmc -I../mgbase -I../mfbase  \
            -I../mdata -I../msignal -I../mcalib -I../mbadpixels            \
-           -I../mpointing -I../mpedestal -I../mmuon
+           -I../mpointing -I../mpedestal -I../mmuon -I../mfilter
 
 SRCFILES = MBrowser.cc \