Changeset 4642
- Timestamp:
- 08/17/04 10:29:02 (20 years ago)
- Location:
- trunk/MagicSoft/Mars
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/MagicSoft/Mars/Changelog
r4640 r4642 28 28 - made sure that code which in not needed is not executed in 29 29 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 30 46 31 47 -
trunk/MagicSoft/Mars/mraw/MRawEvtPixelIter.cc
r3950 r4642 61 61 using namespace std; 62 62 63 MRawEvtPixelIter::MRawEvtPixelIter(MRawEvtData *dat) : fData(dat) 63 MRawEvtPixelIter::MRawEvtPixelIter(MRawEvtData *dat) : fData(dat), fABFlags(0) 64 64 { 65 65 fNumHiGainSamples = dat->GetNumHiGainSamples(); … … 131 131 fHiGainPos = fData->fHiGainFadcSamples->GetArray()-fNumHiGainSamples; 132 132 fLoGainPos = fData->fLoGainFadcSamples->GetArray()-fNumLoGainSamples; 133 fABFlags = fData->fABFlags->Get Array();133 fABFlags = fData->fABFlags->GetSize()==0 ? 0 : fData->fABFlags->GetArray(); 134 134 135 135 // -
trunk/MagicSoft/Mars/mraw/MRawEvtPixelIter.h
r3495 r4642 17 17 { 18 18 private: 19 UShort_t fNumHiGainEntry;//! actual number of entry in fHiGainPixId20 UShort_t fNumLoGainEntry;//! actual number of entry in fLoGainPixId19 UShort_t fNumHiGainEntry; //! actual number of entry in fHiGainPixId 20 UShort_t fNumLoGainEntry; //! actual number of entry in fLoGainPixId 21 21 22 22 UShort_t *fHiGainId; //! actual entry of fHiGainPixId … … 26 26 Byte_t *fLoGainPos; //! pointer to lo-gain samples of actual pixel 27 27 28 Char_t *fABFlags; //! pointer to AB flags28 Byte_t *fABFlags; //! pointer to AB flags 29 29 30 UShort_t fNumEntry;30 UShort_t fNumEntry; 31 31 32 32 Byte_t fNumHiGainSamples; //! … … 77 77 } 78 78 79 Byte_t GetNumHiGainSamples() const 80 Byte_t GetNumLoGainSamples() const 79 Byte_t GetNumHiGainSamples() const { return fNumHiGainSamples ; } 80 Byte_t GetNumLoGainSamples() const { return fNumLoGainSamples ; } 81 81 82 82 ULong_t GetSumHiGainSamples() const; … … 102 102 // return kTRUE the lo gains exist for the actual pixel, else return kFALSE 103 103 // 104 return TESTBIT(fABFlags[GetPixelId()/8], GetPixelId()%8);104 return fABFlags ? TESTBIT(fABFlags[GetPixelId()/8], GetPixelId()%8) : 0; 105 105 } 106 106 Byte_t GetABFlag() const … … 109 109 // return kTRUE the lo gains exist for the actual pixel, else return kFALSE 110 110 // 111 return (Byte_t)fABFlags[GetPixelId()/8];111 return fABFlags ? fABFlags[GetPixelId()/8] : 0; 112 112 } 113 113
Note:
See TracChangeset
for help on using the changeset viewer.