Changeset 2979


Ignore:
Timestamp:
01/30/04 10:49:33 (21 years ago)
Author:
tbretz
Message:
*** empty log message ***
Location:
trunk/MagicSoft/Mars
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/MagicSoft/Mars/Changelog

    r2974 r2979  
    44
    55                                                 -*-*- END OF LINE -*-*-
     6 2004/01/30: Thomas Bretz
     7 
     8   * mbase/MDirIter.h:
     9     - added GetNumEntries
     10
     11   * mhist/MHEvent.cc:
     12     - added a dynamic_cast from MParContainer to MCamEvent to get the
     13       correct pointer to the correct base-class.
     14
     15
     16
    617 2004/01/30: Markus Gaug
    718
     
    1223     - modified GetPixelContent
    1324
    14    * manalysis/MPedestalCam.cc
    15    * manalysis/MPedCalcPedRun.cc
     25   * manalysis/MPedestalCam.cc, manalysis/MPedCalcPedRun.cc:
    1626     - include storage of number of used FADC slices to compare later
    1727       the pedestal per slice ( and sigma per slice_
     
    3242       and displays of errors, correction for different FADC slice
    3343       number)
     44
    3445
    3546
  • trunk/MagicSoft/Mars/mbase/MDirIter.h

    r2296 r2979  
    5959
    6060    void SetFilter(const char *f="") { fFilter = f; }
     61    UInt_t GetNumEntries() const
     62    {
     63        UInt_t n = 0;
     64        MDirIter Next(*this);
     65        while (!Next().IsNull()) n++;
     66        return n;
     67    }
    6168
    6269    void Print(const Option_t *o="") const;
  • trunk/MagicSoft/Mars/mhist/MHEvent.cc

    r2826 r2979  
    170170        return kFALSE;
    171171
     172    const MCamEvent *event = dynamic_cast<const MCamEvent*>(par);
     173    if (!event)
     174    {
     175        *fLog << err << par->GetDescriptor() << " doesn't inherit from MCamEvent... abort." << endl;
     176        return kFALSE;
     177    }
     178
    172179    if (fRawEvtData)
    173180        fRawEvtData->Copy(*fClone);
     
    177184    case kEvtSignal:
    178185    case kEvtPedestal:
    179         fHist->SetCamContent(*(MCamEvent*)par, 0);
     186        fHist->SetCamContent(*event, 0);
    180187        break;
    181188    case kEvtPedestalRMS:
    182         fHist->SetCamContent(*(MCamEvent*)par, 1);
     189        fHist->SetCamContent(*event, 1);
    183190        break;
    184191    case kEvtRelativeSignal:
    185         fHist->SetCamContent(*(MCamEvent*)par, 0);
     192        fHist->SetCamContent(*event, 0);
    186193        break;
    187194    case kEvtCleaningLevels:
     
    190197            lvl[0] = fImgCleanStd->GetCleanLvl2();
    191198            lvl[1] = fImgCleanStd->GetCleanLvl1();
    192             fHist->SetCamContent(*(MCamEvent*)par, 0);
     199            fHist->SetCamContent(*event, 0);
    193200            fHist->SetLevels(lvl);
    194201        }
    195202        break;
    196203    case kEvtIdxMax:
    197         fHist->SetCamContent(*(MCamEvent*)par, 5);
     204        fHist->SetCamContent(*event, 5);
    198205        break;
    199206    case kEvtArrTime:
    200         fHist->SetCamContent(*(MCamEvent*)par, 0);
     207        fHist->SetCamContent(*event, 0);
    201208        break;
    202209    }
Note: See TracChangeset for help on using the changeset viewer.