Changeset 8346 for trunk/MagicSoft/Mars/mraw/MRawEvtPixelIter.h

Timestamp:

03/01/07 21:49:15 (18 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mraw/MRawEvtPixelIter.h (modified) (2 diffs)

trunk/MagicSoft/Mars/mraw/MRawEvtPixelIter.h

@@ -74 +74 @@
         //          belong to the actual pixel
         //
+        //
+        // Use is deprecated!
+        //
         return fHiGainPos;
     }
 
-    Byte_t  GetNumHiGainSamples() const { return fNumHiGainSamples ; }
-    Byte_t  GetNumLoGainSamples() const { return fNumLoGainSamples ; }
+    Byte_t *GetSamples() const
+    {
+        //
+        // return a pointer to the fadc samples of the hi gains
+        // WARNING: Don't forget to get the number of valid entries
+        //          (GetNumSamples) to know how many entries of the array
+        //          belong to the actual pixel
+        //
+        return fHiGainPos;
+    }
 
+    Byte_t  GetNumHiGainSamples() const { return fNumHiGainSamples ; }// Use is deprecated!
+    Byte_t  GetNumLoGainSamples() const { return fNumLoGainSamples ; }// Use is deprecated!
+    Byte_t  GetNumSamples() const { return fNumHiGainSamples+fNumLoGainSamples; }
+
+    Byte_t  GetIdxMaxHiGainSample(const Byte_t hifirst=0, const Byte_t hilast=0xff) const;
+    Short_t GetIdxMaxLoGainSample(const Byte_t lofirst=0, const Byte_t lolast=0xff) const;
+
+    Byte_t  GetMaxHiGainSample(const Byte_t hifirst=0, const Byte_t hilast=0xff) const;
+/*
     ULong_t GetSumHiGainSamples() const;
     ULong_t GetSumSqrHiGainSamples() const;
     Float_t GetVarHiGainSamples() const;
 
-    Byte_t  GetMaxHiGainSample() const;
     Byte_t  GetMaxLoGainSample() const;
-    Byte_t  GetIdxMaxHiGainSample() const;
-    Short_t GetIdxMaxLoGainSample(const Byte_t lofirst=0) const;
     Short_t GetIdxMaxHiLoGainSample() const;
 
-    Bool_t HasLoGain() const;
+    ULong_t GetSumLoGainSamples() const;
+    ULong_t GetSumSqrLoGainSamples() const;
+  */
+    Bool_t HasLoGain() const { return fNumLoGainSamples>0; }
     Bool_t IsABFlagValid() const { return fABFlags ? kTRUE : kFALSE; }
     Bool_t HasABFlag() const
@@ -116 +136 @@
     }
 
-    ULong_t GetSumLoGainSamples() const;
-    ULong_t GetSumSqrLoGainSamples() const;
-
     void Reset();