Changeset 8571 for trunk/MagicSoft/Mars/mraw/MRawEvtPixelIter.cc

Timestamp:

06/17/07 15:51:55 (17 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mraw/MRawEvtPixelIter.cc (modified) (5 diffs)

trunk/MagicSoft/Mars/mraw/MRawEvtPixelIter.cc

@@ -63 +63 @@
 MRawEvtPixelIter::MRawEvtPixelIter(MRawEvtData *dat) : fABFlags(0), fData(dat)
 {
-    fNumHiGainSamples = dat->GetNumHiGainSamples();
-    fNumLoGainSamples = dat->GetNumLoGainSamples();
+    fNumBytesHiGain  = dat->GetNumHiGainSamples()*dat->GetNumBytesPerSample();
+    fNumBytesLoGain  = dat->GetNumLoGainSamples()*dat->GetNumBytesPerSample();
 
     Reset();
@@ -91 +91 @@
         fNumHiGainEntry++;
         fHiGainId++;
-        fHiGainPos += fNumHiGainSamples;
+        fHiGainPos += fNumBytesHiGain;
 
         fNumLoGainEntry++;
         fLoGainId++;
-        fLoGainPos += fNumLoGainSamples;
+        fLoGainPos += fNumBytesLoGain;
     }
     else
@@ -102 +102 @@
         fLoGainId       = ++fHiGainId;
 
-        fHiGainPos     += fNumHiGainSamples+fNumLoGainSamples;
-        fLoGainPos      = fHiGainPos + fNumHiGainSamples;
+        fHiGainPos     += fNumBytesHiGain+fNumBytesLoGain;
+        fLoGainPos      = fHiGainPos + fNumBytesHiGain;
     }
 
@@ -137 +137 @@
     {
         fLoGainId  = fData->fLoGainPixId->GetArray();
-        fHiGainPos = fData->fHiGainFadcSamples->GetArray()-fNumHiGainSamples;
-        fLoGainPos = fData->fLoGainFadcSamples->GetArray()-fNumLoGainSamples;
+        fHiGainPos = fData->fHiGainFadcSamples->GetArray()-fNumBytesHiGain;
+        fLoGainPos = fData->fLoGainFadcSamples->GetArray()-fNumBytesLoGain;
     }
     else
     {
         fLoGainId  = fHiGainId;
-        fLoGainPos = fHiGainPos+fNumHiGainSamples;
-        fHiGainPos = fData->fHiGainFadcSamples->GetArray()-(fNumHiGainSamples+fNumLoGainSamples);
+        fLoGainPos = fHiGainPos+fNumBytesHiGain;
+        fHiGainPos = fData->fHiGainFadcSamples->GetArray()-(fNumBytesHiGain+fNumBytesLoGain);
     }
 
@@ -163 +163 @@
     fData->Draw(Form("%s%d", t, *fHiGainId));
 }
-
-/*
-// --------------------------------------------------------------------------
-//
-// Returns the index of the FADC slice the maximum signal in. If the highest
-// slices have the same value the first one is returned.
-//
-Byte_t MRawEvtPixelIter::GetIdxMaxHiGainSample(const Byte_t hifirst, const Byte_t hilast) const
-{
-    const Int_t l = hilast>fNumHiGainSamples  ? fNumHiGainSamples : hilast+1;
-
-    Byte_t *beg = fHiGainPos+hifirst;
-
-    Byte_t *ptr = beg+1;
-    Byte_t *max = beg;
-    const Byte_t *end = fHiGainPos + l;
-
-    do if (*ptr>*max) max = ptr;
-    while (++ptr != end);
-
-    return max-fHiGainPos;
-}
-
-// --------------------------------------------------------------------------
-//
-// Returns the index of the FADC slice the maximum signal in. If no lo-gains
-// are available -1 is returned. If the highest slices have the same value
-// the first one is returned.
-//
-Short_t MRawEvtPixelIter::GetIdxMaxLoGainSample(const Byte_t lofirst, const Byte_t lolast) const
-{
-    if (!HasLoGain())
-        return -1; // means: not found
-
-    const Int_t l = lolast>fNumLoGainSamples  ? fNumLoGainSamples : lolast+1;
-
-    Byte_t *beg = fLoGainPos+lofirst;
-
-    Byte_t *ptr = beg+1;
-    Byte_t *max = beg;
-    const Byte_t *end = fLoGainPos + l;
-
-    do if (*ptr>*max) max = ptr;
-    while (++ptr != end);
-
-    return max-fLoGainPos;
-}
-
-// --------------------------------------------------------------------------
-//
-// Returns the maximum signal of all sliced in the hi gain samples
-//
-Byte_t MRawEvtPixelIter::GetMaxHiGainSample(const Byte_t hifirst, const Byte_t hilast) const
-{
-    Byte_t max = 0;
-
-    const Int_t f = hifirst;
-    const Int_t l = hilast>fNumHiGainSamples  ? fNumHiGainSamples : hilast+1;
-
-    for (int i=f; i<l; i++)
-        if (fHiGainPos[i]>max)
-            max = fHiGainPos[i];
-
-    return max;
-}
-
-// --------------------------------------------------------------------------
-//
-// returns the sum of all hi gain fadc samples of the actual pixel
-//
-ULong_t MRawEvtPixelIter::GetSumHiGainSamples() const
-{
-    //
-    // return the sum of the hi gain samples of the present pixel
-    //
-    Byte_t *ptr = fHiGainPos;
-    const Byte_t *end = fHiGainPos + fNumHiGainSamples;
-
-    ULong_t sum=0;
-
-    do sum += *ptr++;
-    while (ptr != end);
-
-    return sum;
-}
-
-// --------------------------------------------------------------------------
-//
-// returns the sum of squares of all hi gain fadc sample of the actual pixel
-//
-ULong_t MRawEvtPixelIter::GetSumSqrHiGainSamples() const
-{
-    //
-    // return the sum of the squares of the hi gain samples of the present pixel
-    //
-    Byte_t *ptr = fHiGainPos;
-    const Byte_t *end = fHiGainPos + fNumHiGainSamples;
-
-    ULong_t sum=0;
-
-    do sum += (*ptr)*(*ptr);
-    while (++ptr != end);
-
-    return sum;
-}
-
-// --------------------------------------------------------------------------
-//
-// Returns the variance (sigma^2) of the HiGainSamples
-//
-Float_t MRawEvtPixelIter::GetVarHiGainSamples() const
-{
-    Byte_t *ptr = fHiGainPos;
-    const Byte_t *end = fHiGainPos + fNumHiGainSamples;
-
-    ULong_t sum=0;
-    ULong_t sqsum=0;
-
-    do {
-        sum += *ptr;
-        sqsum += (*ptr)*(*ptr);
-    } while (++ptr != end);
-
-    return (sqsum-(Float_t)sum*sum/fNumHiGainSamples)/(fNumHiGainSamples-1);
-}
-
-// --------------------------------------------------------------------------
-//
-// Returns the index of the maximum FADC slice from high gain at first. If 
-// high gain is saturated it returns the low gain one.
-// If no lo-gains are existing and the hi-gains have saturating values
-// a negative value (-1) is returned.
-//
-Short_t MRawEvtPixelIter::GetIdxMaxHiLoGainSample() const
-{
-    Byte_t max  = 0;
-    Char_t maxi = 0;
-
-    for (int i=fNumHiGainSamples-1; i>=0; i--)
-        if (fHiGainPos[i]>max)
-        {
-            max  = fHiGainPos[i];
-            maxi = i;
-        }
-
-    return max<0xff ? maxi : GetIdxMaxLoGainSample();
-}
-
-// --------------------------------------------------------------------------
-//
-// Returns the maximum signal of all sliced in the hi gain samples
-//
-Byte_t MRawEvtPixelIter::GetMaxLoGainSample() const
-{
-    Byte_t max = 0;
-
-    for (int i=fNumLoGainSamples-1; i>=0; i--)
-        if (fLoGainPos[i]>max)
-            max = fLoGainPos[i];
-
-    return max;
-}
-
-// --------------------------------------------------------------------------
-//
-// returns the sum of all lo gain fadc samples of the actual pixel.
-// if no lo gain information is available 0 is returned.
-//
-ULong_t MRawEvtPixelIter::GetSumLoGainSamples() const
-{
-    //
-    // return the sum of the lo gain samples of the present pixel
-    //
-    if (!HasLoGain())
-        return 0;
-
-    Byte_t *ptr = fLoGainPos;
-    const Byte_t *end = fLoGainPos + fNumLoGainSamples;
-
-    ULong_t sum=0;
-
-    do sum += *ptr++;
-    while (ptr != end);
-
-    return sum;
-}
-
-// --------------------------------------------------------------------------
-//
-// returns the sum of squares of all hi gain fadc sample of the actual pixel
-//
-ULong_t MRawEvtPixelIter::GetSumSqrLoGainSamples() const
-{
-    //
-    // return the sum of the lo gain samples squares of the present pixel
-    //
-    if (!HasLoGain())
-        return 0;
-
-    Byte_t *ptr = fLoGainPos;
-    const Byte_t *end = fLoGainPos + fNumLoGainSamples;
-
-    ULong_t sum=0;
-
-    do sum += (*ptr)*(*ptr);
-    while (++ptr != end);
-
-    return sum;
-}
-*/