Changeset 2173 for trunk/MagicSoft/Mars/meventdisp

Timestamp:

06/13/03 16:42:37 (22 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/meventdisp

Files:

• MGEvtDisplay.cc (modified) (3 diffs)
• MGEvtDisplay.h (modified) (1 diff)
• MGFadcDisp.cc (modified) (2 diffs)

trunk/MagicSoft/Mars/meventdisp/MGEvtDisplay.cc

@@ -49 +49 @@
 #include "MReadMarsFile.h"
 #include "MGeomCamMagic.h"
+#include "MRawEvtData.h"
 #include "MRawEvtHeader.h"
 
@@ -536 +537 @@
 //  and updates the display
 //
-void MGEvtDisplay::ReadinEvent()
-{
-    if (GetTaskList()->Process())
+void MGEvtDisplay::ReadinEvent(Int_t dir)
+{
+    MRawEvtData *raw = (MRawEvtData*)GetParList()->FindObject("MRawEvtData");
+    if (!raw)
+        return;
+    do
     {
+        if (dir<0 && !GetReader()->DecEventNum())
+            return;
+        if (dir>0 && !GetReader()->IncEventNum())
+            return;
+
+        if (!GetTaskList()->Process())
+            return;
+
         GetReader()->DecEventNum();
-        UpdateMcLabel();
-        UpdateDisplay();
-    }
+
+    } while (raw->GetNumPixels()<1);
+
+    UpdateMcLabel();
+    UpdateDisplay();
 
     fTxtEvtNr->SetText(Form("%d", GetReader()->GetNumEntry()+1));
@@ -645 +659 @@
             {
             case kEvtPrev:
-                if (GetReader()->DecEventNum())
-                    ReadinEvent();
+                ReadinEvent(-1);
                 return kTRUE;
 
             case kEvtNext:
-                if (GetReader()->IncEventNum())
-                    ReadinEvent();
+                ReadinEvent(+1);
                 return kTRUE;
             }

trunk/MagicSoft/Mars/meventdisp/MGEvtDisplay.h

@@ -44 +44 @@
 
     void SaveAsDialog() const;
-    void ReadinEvent();
+    void ReadinEvent(Int_t dir=0);
 
     Bool_t fInitOk;

trunk/MagicSoft/Mars/meventdisp/MGFadcDisp.cc

@@ -27 +27 @@
 #include <limits.h>               // INT_MAX
 #include <stdlib.h>               // atoi
-#include <iostream.h>             // cout for debugging
+#include <iostream>               // cout for debugging
 
 #include <TList.h>                // TList
@@ -51 +51 @@
 
 ClassImp(MGFadcDisp);
+
+using namespace std;
 
 enum MGFadcDispCommand