Changeset 1836 for trunk/MagicSoft/Mars


Ignore:
Timestamp:
03/19/03 12:39:27 (22 years ago)
Author:
tbretz
Message:
*** empty log message ***
Location:
trunk/MagicSoft/Mars
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/MagicSoft/Mars/Changelog

    r1835 r1836  
    1616    * mhist/MHArray.[h,cc]:
    1717      - added AddHistogram
     18
     19    * meventdisp/MGEvtDisplay.cc, mfileio/MReadTree.[h,cc],
     20      meventdisp/MReadMarsFile.cc:
     21      - changed MReadTree::GetEventNum to MReadTree::GetNumEntry
    1822
    1923
  • trunk/MagicSoft/Mars/meventdisp/MGEvtDisplay.cc

    r1668 r1836  
    518518    }
    519519
    520     fTxtEvtNr->SetText(Form("%d", GetReader()->GetEventNum()+1));
     520    fTxtEvtNr->SetText(Form("%d", GetReader()->GetNumEntry()+1));
    521521}
    522522
  • trunk/MagicSoft/Mars/mfileio/MReadMarsFile.cc

    r1668 r1836  
    137137    {
    138138        *fLog << err << "ERROR - Cannot read new runheaders #" << idx;
    139         *fLog << " after reading event #" << GetEventNum() << endl;
     139        *fLog << " after reading event #" << GetNumEntry() << endl;
    140140        return kFALSE;
    141141    }
     
    143143    *fLog << inf << "MReadMarsFile: Switching to #" << GetFileIndex();
    144144    *fLog << " '" << GetFileName() << "' (before event #";
    145     *fLog << GetEventNum()-1 << ")" << endl;
     145    *fLog << GetNumEntry()-1 << ")" << endl;
    146146
    147147    if (rawheader)
  • trunk/MagicSoft/Mars/mfileio/MReadTree.cc

    r1825 r1836  
    171171{
    172172    *fLog << inf << GetDescriptor() << ": Notify '" << fChain->GetName();
    173     *fLog << "' (before processing event #" << GetEventNum()-1 << ")" << endl;
     173    *fLog << "' (before processing event #" << GetNumEntry()-1 << ")" << endl;
    174174
    175175    //fNotify->Notify();
  • trunk/MagicSoft/Mars/mfileio/MReadTree.h

    r1668 r1836  
    5454    Bool_t SetEventNum(UInt_t nr);    // set number of event (position in tree)
    5555
    56     UInt_t GetEventNum() const { return fNumEntry; }
     56    UInt_t GetNumEntry() const { return fNumEntry; }
    5757    UInt_t GetEntries();
    5858
Note: See TracChangeset for help on using the changeset viewer.