Changeset 4642 for trunk

Timestamp:

08/17/04 10:29:02 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mraw/MRawEvtPixelIter.cc (modified) (2 diffs)
• mraw/MRawEvtPixelIter.h (modified) (5 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -28 +28 @@
      - made sure that code which in not needed is not executed in
        this case
+
+   * mbadpixels/MBadPixelsCam.cc:
+     - unrolled if-else statements in GetPixelContent
+
+   * mcalib/MHCalibrationChargeBlindPix.cc:
+     - commented out unsused variable
+
+   * mjobs/MJCalibration.cc:
+     - some more output when writing the file
+
+   * mjobs/MJPedestal.[h,cc]:
+     - added more resources
+     - added fMaxEvents
+
+   * mraw/MRawEvtPixelIter.[h,cc]:
+     - fixed behaviour or fABFlags in case the array is empty
 
 

trunk/MagicSoft/Mars/mraw/MRawEvtPixelIter.cc

@@ -61 +61 @@
 using namespace std;
 
-MRawEvtPixelIter::MRawEvtPixelIter(MRawEvtData *dat) : fData(dat)
+MRawEvtPixelIter::MRawEvtPixelIter(MRawEvtData *dat) : fData(dat), fABFlags(0)
 {
     fNumHiGainSamples = dat->GetNumHiGainSamples();
@@ -131 +131 @@
     fHiGainPos  = fData->fHiGainFadcSamples->GetArray()-fNumHiGainSamples;
     fLoGainPos  = fData->fLoGainFadcSamples->GetArray()-fNumLoGainSamples;
-    fABFlags    = fData->fABFlags->GetArray();
+    fABFlags    = fData->fABFlags->GetSize()==0 ? 0 : fData->fABFlags->GetArray();
 
     //

trunk/MagicSoft/Mars/mraw/MRawEvtPixelIter.h

@@ -17 +17 @@
 {
 private:
-    UShort_t fNumHiGainEntry;   //! actual number of entry in fHiGainPixId
-    UShort_t fNumLoGainEntry;   //! actual number of entry in fLoGainPixId
+    UShort_t  fNumHiGainEntry;  //! actual number of entry in fHiGainPixId
+    UShort_t  fNumLoGainEntry;  //! actual number of entry in fLoGainPixId
 
     UShort_t *fHiGainId;        //! actual entry of fHiGainPixId
@@ -26 +26 @@
     Byte_t   *fLoGainPos;       //! pointer to lo-gain samples of actual pixel
 
-    Char_t   *fABFlags;         //! pointer to AB flags
+    Byte_t   *fABFlags;         //! pointer to AB flags
 
-    UShort_t fNumEntry;
+    UShort_t  fNumEntry;
 
     Byte_t fNumHiGainSamples;   //!
@@ -77 +77 @@
     }
 
-    Byte_t  GetNumHiGainSamples() const    { return fNumHiGainSamples ; }
-    Byte_t  GetNumLoGainSamples() const    { return fNumLoGainSamples ; }
+    Byte_t  GetNumHiGainSamples() const { return fNumHiGainSamples ; }
+    Byte_t  GetNumLoGainSamples() const { return fNumLoGainSamples ; }
 
     ULong_t GetSumHiGainSamples() const;
@@ -102 +102 @@
         // return kTRUE  the lo gains exist for the actual pixel, else return kFALSE
         //
-        return TESTBIT(fABFlags[GetPixelId()/8], GetPixelId()%8);
+        return fABFlags ? TESTBIT(fABFlags[GetPixelId()/8], GetPixelId()%8) : 0;
     }
     Byte_t GetABFlag() const
@@ -109 +109 @@
         // return kTRUE  the lo gains exist for the actual pixel, else return kFALSE
         //
-        return (Byte_t)fABFlags[GetPixelId()/8];
+        return fABFlags ? fABFlags[GetPixelId()/8] : 0;
     }