Changeset 4642


Ignore:
Timestamp:
08/17/04 10:29:02 (20 years ago)
Author:
tbretz
Message:
*** empty log message ***
Location:
trunk/MagicSoft/Mars
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/MagicSoft/Mars/Changelog

    r4640 r4642  
    2828     - made sure that code which in not needed is not executed in
    2929       this case
     30
     31   * mbadpixels/MBadPixelsCam.cc:
     32     - unrolled if-else statements in GetPixelContent
     33
     34   * mcalib/MHCalibrationChargeBlindPix.cc:
     35     - commented out unsused variable
     36
     37   * mjobs/MJCalibration.cc:
     38     - some more output when writing the file
     39
     40   * mjobs/MJPedestal.[h,cc]:
     41     - added more resources
     42     - added fMaxEvents
     43
     44   * mraw/MRawEvtPixelIter.[h,cc]:
     45     - fixed behaviour or fABFlags in case the array is empty
    3046
    3147
  • trunk/MagicSoft/Mars/mraw/MRawEvtPixelIter.cc

    r3950 r4642  
    6161using namespace std;
    6262
    63 MRawEvtPixelIter::MRawEvtPixelIter(MRawEvtData *dat) : fData(dat)
     63MRawEvtPixelIter::MRawEvtPixelIter(MRawEvtData *dat) : fData(dat), fABFlags(0)
    6464{
    6565    fNumHiGainSamples = dat->GetNumHiGainSamples();
     
    131131    fHiGainPos  = fData->fHiGainFadcSamples->GetArray()-fNumHiGainSamples;
    132132    fLoGainPos  = fData->fLoGainFadcSamples->GetArray()-fNumLoGainSamples;
    133     fABFlags    = fData->fABFlags->GetArray();
     133    fABFlags    = fData->fABFlags->GetSize()==0 ? 0 : fData->fABFlags->GetArray();
    134134
    135135    //
  • trunk/MagicSoft/Mars/mraw/MRawEvtPixelIter.h

    r3495 r4642  
    1717{
    1818private:
    19     UShort_t fNumHiGainEntry;   //! actual number of entry in fHiGainPixId
    20     UShort_t fNumLoGainEntry;   //! actual number of entry in fLoGainPixId
     19    UShort_t  fNumHiGainEntry;  //! actual number of entry in fHiGainPixId
     20    UShort_t  fNumLoGainEntry;  //! actual number of entry in fLoGainPixId
    2121
    2222    UShort_t *fHiGainId;        //! actual entry of fHiGainPixId
     
    2626    Byte_t   *fLoGainPos;       //! pointer to lo-gain samples of actual pixel
    2727
    28     Char_t   *fABFlags;         //! pointer to AB flags
     28    Byte_t   *fABFlags;         //! pointer to AB flags
    2929
    30     UShort_t fNumEntry;
     30    UShort_t  fNumEntry;
    3131
    3232    Byte_t fNumHiGainSamples;   //!
     
    7777    }
    7878
    79     Byte_t  GetNumHiGainSamples() const    { return fNumHiGainSamples ; }
    80     Byte_t  GetNumLoGainSamples() const    { return fNumLoGainSamples ; }
     79    Byte_t  GetNumHiGainSamples() const { return fNumHiGainSamples ; }
     80    Byte_t  GetNumLoGainSamples() const { return fNumLoGainSamples ; }
    8181
    8282    ULong_t GetSumHiGainSamples() const;
     
    102102        // return kTRUE  the lo gains exist for the actual pixel, else return kFALSE
    103103        //
    104         return TESTBIT(fABFlags[GetPixelId()/8], GetPixelId()%8);
     104        return fABFlags ? TESTBIT(fABFlags[GetPixelId()/8], GetPixelId()%8) : 0;
    105105    }
    106106    Byte_t GetABFlag() const
     
    109109        // return kTRUE  the lo gains exist for the actual pixel, else return kFALSE
    110110        //
    111         return (Byte_t)fABFlags[GetPixelId()/8];
     111        return fABFlags ? fABFlags[GetPixelId()/8] : 0;
    112112    }
    113113
Note: See TracChangeset for help on using the changeset viewer.