Changeset 5399

Timestamp:

11/12/04 13:52:41 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mraw/MRawEvtData.cc (modified) (4 diffs)
• mraw/MRawEvtData.h (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -22 +22 @@
  2004/11/12: Thomas Bretz
 
-   * mraw/MRawEvtData.cc:
+   * mraw/MRawEvtData.[h,cc]:
      - fixed a bug in the initialisation of the arrays (in both
        cases - hi- and lo-gain - the number of hi gain samples were
        used
      - do not try to read lo gains if poslo==NULL
+     - changed return type of GetNum[Hi,Lo]GainSamples from
+       Byte_t to UShort_t to support up to 65535 samples
 
    * mraw/MRawRunHeader.cc:

trunk/MagicSoft/Mars/mraw/MRawEvtData.cc

@@ -139 +139 @@
 // return the number of hi gain samples per pixel
 //
-Byte_t MRawEvtData::GetNumHiGainSamples() const
+UShort_t MRawEvtData::GetNumHiGainSamples() const
 {
     return fHiGainPixId->GetSize() ? fHiGainFadcSamples->GetSize()/fHiGainPixId->GetSize() : 0;
@@ -148 +148 @@
 // return the number of lo gain samples per pixel
 //
-Byte_t MRawEvtData::GetNumLoGainSamples() const
+UShort_t MRawEvtData::GetNumLoGainSamples() const
 {
     return fLoGainPixId->GetSize() ? fLoGainFadcSamples->GetSize()/fLoGainPixId->GetSize() : 0;
@@ -177 +177 @@
     // - DEC: Print values decimal instead of hexadecimal (default)
     //
-    const Byte_t nHiSamp = GetNumHiGainSamples();
-    const Byte_t nLoSamp = GetNumLoGainSamples();
+    const UShort_t nHiSamp = GetNumHiGainSamples();
+    const UShort_t nLoSamp = GetNumLoGainSamples();
 
     const UShort_t nHiPix = fHiGainPixId->GetSize();;
@@ -427 +427 @@
     // if there are no samples already stored: this is the new number of samples
     //
-    const Byte_t ns    = data->GetSize();
-    const Byte_t nSamp = lflag ? GetNumLoGainSamples() : GetNumHiGainSamples();
+    const UShort_t ns    = data->GetSize();
+    const UShort_t nSamp = lflag ? GetNumLoGainSamples() : GetNumHiGainSamples();
     if (nSamp && ns!=nSamp)
     {

trunk/MagicSoft/Mars/mraw/MRawEvtData.h

@@ -63 +63 @@
     void AddPixel(UShort_t nOfPixel, TArrayC *data, Bool_t lflag=kFALSE);
 
-    Byte_t   GetNumHiGainSamples() const;
-    Byte_t   GetNumLoGainSamples() const;
+    UShort_t GetNumHiGainSamples() const;
+    UShort_t GetNumLoGainSamples() const;
     UShort_t GetNumPixels() const;