Ignore:
Timestamp:
01/07/05 17:31:15 (20 years ago)
Author:
tbretz
Message:
*** empty log message ***
File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/MagicSoft/Mars/mraw/MRawEvtPixelIter.cc

    r4643 r5725  
    160160    //
    161161    Byte_t *ptr = fHiGainPos;
    162     const Byte_t *end = ptr + fNumHiGainSamples;
     162    const Byte_t *end = fHiGainPos + fNumHiGainSamples;
    163163
    164164    ULong_t sum=0;
     
    180180    //
    181181    Byte_t *ptr = fHiGainPos;
    182     const Byte_t *end = ptr + fNumHiGainSamples;
     182    const Byte_t *end = fHiGainPos + fNumHiGainSamples;
    183183
    184184    ULong_t sum=0;
     
    197197{
    198198    Byte_t *ptr = fHiGainPos;
    199     const Byte_t *end = ptr + fNumHiGainSamples;
     199    const Byte_t *end = fHiGainPos + fNumHiGainSamples;
    200200
    201201    ULong_t sum=0;
     
    219219    Byte_t *ptr = fHiGainPos+1;
    220220    Byte_t *max = fHiGainPos;
    221     const Byte_t *end = ptr + fNumHiGainSamples;
     221    const Byte_t *end = fHiGainPos + fNumHiGainSamples;
    222222
    223223    do if (*ptr>*max) max = ptr;
     
    235235Short_t MRawEvtPixelIter::GetIdxMaxLoGainSample(const Byte_t lofirst) const
    236236{
    237 
    238   if (!HasLoGain())
    239     return -1; // means: not found
    240  
    241   Byte_t *ptr = fLoGainPos+lofirst+1;
    242   Byte_t *max = fLoGainPos+lofirst;
    243   const Byte_t *end = fLoGainPos + fNumLoGainSamples;
    244        
    245   do if (*ptr>*max) max = ptr;
    246   while (++ptr != end);
    247  
    248   return max-fLoGainPos;
     237    if (!HasLoGain())
     238        return -1; // means: not found
     239
     240    Byte_t *ptr = fLoGainPos+lofirst+1;
     241    Byte_t *max = fLoGainPos+lofirst;
     242    const Byte_t *end = fLoGainPos + fNumLoGainSamples;
     243
     244    do if (*ptr>*max) max = ptr;
     245    while (++ptr != end);
     246
     247    return max-fLoGainPos;
    249248}
    250249
     
    292291Byte_t MRawEvtPixelIter::GetMaxLoGainSample() const
    293292{
    294 
    295293    Byte_t max = 0;
    296294
     
    316314
    317315    Byte_t *ptr = fLoGainPos;
    318     const Byte_t *end = ptr + fNumLoGainSamples;
     316    const Byte_t *end = fLoGainPos + fNumLoGainSamples;
    319317
    320318    ULong_t sum=0;
     
    339337
    340338    Byte_t *ptr = fLoGainPos;
    341     const Byte_t *end = ptr + fNumLoGainSamples;
     339    const Byte_t *end = fLoGainPos + fNumLoGainSamples;
    342340
    343341    ULong_t sum=0;
Note: See TracChangeset for help on using the changeset viewer.