Changeset 2728 for trunk/MagicSoft/Mars/mmain

Timestamp:

12/20/03 13:46:17 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mmain

Files:

• MEventDisplay.cc (modified) (5 diffs)
• MEventDisplay.h (modified) (1 diff)

trunk/MagicSoft/Mars/mmain/MEventDisplay.cc

@@ -128 +128 @@
 // --------------------------------------------------------------------------
 //
-//  Return reading task
-//
-MReadTree *MEventDisplay::GetReader() const
-{
-    MParList  *plist  = (MParList*)fEvtLoop->GetParList();
-    MTaskList *tlist  = (MTaskList*)plist->FindObject("MTaskList");
-    MReadTree *reader = (MReadTree*)tlist->FindObject("MRead");
-    return reader;
-}
-
-// --------------------------------------------------------------------------
-//
 //  Setup Task and parameter list for hillas calculation,
 //  preprocess tasks and read in first event (process)
@@ -389 +377 @@
 void MEventDisplay::ReadinEvent(Int_t dir)
 {
-    MParList    *plist = (MParList*)fEvtLoop->GetParList();
-    MGeomCam    *geom  = (MGeomCam*) plist->FindObject("MGeomCam");
-    MTaskList   *tlist = (MTaskList*)plist->FindObject("MTaskList");
-    MRawEvtData *raw = (MRawEvtData*)plist->FindObject("MRawEvtData");
+    MParList    *plist = (MParList*)   fEvtLoop->GetParList();
+    MTaskList   *tlist = (MTaskList*)  fEvtLoop->GetTaskList();
+    MGeomCam    *geom  = (MGeomCam*)   plist->FindObject("MGeomCam");
+    MRawEvtData *raw   = (MRawEvtData*)plist->FindObject("MRawEvtData");
     if (!raw)
         return;
@@ -399 +387 @@
     // Read first event.
     //
-    MReadTree *reader = GetReader();
+    MReadTree *reader = (MReadTree*)fEvtLoop->FindTask("MRead");
 
     const Int_t num = reader->GetNumEntry();
@@ -472 +460 @@
     ReadinEvent();
 
-    TGString *txt = new TGString(Form("of %d", GetReader()->GetEntries()));
+    MReadTree *reader = (MReadTree*)fEvtLoop->FindTask("MRead");
+    TGString *txt = new TGString(Form("of %d", reader->GetEntries()));
     fNumOfEvts->SetText(txt);
 
@@ -540 +529 @@
                 {
                     TGTextEntry *entry = (TGTextEntry*)fList->FindWidget(kEvtNumber);
-                    if (GetReader()->SetEventNum(atoi(entry->GetText())-1))
+                    MReadTree *reader  = (MReadTree*)fEvtLoop->FindTask("MRead");
+                    if (reader->SetEventNum(atoi(entry->GetText())-1))
                         ReadinEvent();
                 }

trunk/MagicSoft/Mars/mmain/MEventDisplay.h

@@ -43 +43 @@
     void ReadinEvent(Int_t dir=0);
 
-    MReadTree *GetReader() const;
-
     Bool_t ProcessMessage(Long_t msg, Long_t parm1, Long_t parm2);