Index: /trunk/MagicSoft/Mars/Changelog
===================================================================
--- /trunk/MagicSoft/Mars/Changelog	(revision 1835)
+++ /trunk/MagicSoft/Mars/Changelog	(revision 1836)
@@ -16,4 +16,8 @@
     * mhist/MHArray.[h,cc]:
       - added AddHistogram
+
+    * meventdisp/MGEvtDisplay.cc, mfileio/MReadTree.[h,cc],
+      meventdisp/MReadMarsFile.cc:
+      - changed MReadTree::GetEventNum to MReadTree::GetNumEntry
 
 
Index: /trunk/MagicSoft/Mars/meventdisp/MGEvtDisplay.cc
===================================================================
--- /trunk/MagicSoft/Mars/meventdisp/MGEvtDisplay.cc	(revision 1835)
+++ /trunk/MagicSoft/Mars/meventdisp/MGEvtDisplay.cc	(revision 1836)
@@ -518,5 +518,5 @@
     }
 
-    fTxtEvtNr->SetText(Form("%d", GetReader()->GetEventNum()+1));
+    fTxtEvtNr->SetText(Form("%d", GetReader()->GetNumEntry()+1));
 }
 
Index: /trunk/MagicSoft/Mars/mfileio/MReadMarsFile.cc
===================================================================
--- /trunk/MagicSoft/Mars/mfileio/MReadMarsFile.cc	(revision 1835)
+++ /trunk/MagicSoft/Mars/mfileio/MReadMarsFile.cc	(revision 1836)
@@ -137,5 +137,5 @@
     {
         *fLog << err << "ERROR - Cannot read new runheaders #" << idx;
-        *fLog << " after reading event #" << GetEventNum() << endl;
+        *fLog << " after reading event #" << GetNumEntry() << endl;
         return kFALSE;
     }
@@ -143,5 +143,5 @@
     *fLog << inf << "MReadMarsFile: Switching to #" << GetFileIndex();
     *fLog << " '" << GetFileName() << "' (before event #";
-    *fLog << GetEventNum()-1 << ")" << endl;
+    *fLog << GetNumEntry()-1 << ")" << endl;
 
     if (rawheader)
Index: /trunk/MagicSoft/Mars/mfileio/MReadTree.cc
===================================================================
--- /trunk/MagicSoft/Mars/mfileio/MReadTree.cc	(revision 1835)
+++ /trunk/MagicSoft/Mars/mfileio/MReadTree.cc	(revision 1836)
@@ -171,5 +171,5 @@
 {
     *fLog << inf << GetDescriptor() << ": Notify '" << fChain->GetName();
-    *fLog << "' (before processing event #" << GetEventNum()-1 << ")" << endl;
+    *fLog << "' (before processing event #" << GetNumEntry()-1 << ")" << endl;
 
     //fNotify->Notify();
Index: /trunk/MagicSoft/Mars/mfileio/MReadTree.h
===================================================================
--- /trunk/MagicSoft/Mars/mfileio/MReadTree.h	(revision 1835)
+++ /trunk/MagicSoft/Mars/mfileio/MReadTree.h	(revision 1836)
@@ -54,5 +54,5 @@
     Bool_t SetEventNum(UInt_t nr);    // set number of event (position in tree)
 
-    UInt_t GetEventNum() const { return fNumEntry; }
+    UInt_t GetNumEntry() const { return fNumEntry; }
     UInt_t GetEntries();