Changeset 8364 for trunk/MagicSoft/Mars/mraw

Timestamp:

03/04/07 14:01:14 (18 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mraw

Files:

• MRawEvtData.cc (modified) (3 diffs)
• MRawEvtPixelIter.cc (modified) (4 diffs)
• MRawEvtPixelIter.h (modified) (1 diff)

trunk/MagicSoft/Mars/mraw/MRawEvtData.cc

@@ -550 +550 @@
     const UShort_t nhi  = fRunHeader->GetNumSamplesHiGain();
     const UShort_t npic = fRunHeader->GetNumPixInCrate();
-
-    return (nhi+nlo)*npic;
+    const UShort_t nbps = fRunHeader->GetNumBytesPerSample();
+
+    return (nhi+nlo)*npic*nbps;
 }
 
@@ -566 +567 @@
 Bool_t MRawEvtData::GetPixelContent(Double_t &val, Int_t idx, const MGeomCam &cam, Int_t type) const
 {
+    *fLog << warn << "WARNING - The use of MRawEvtData::GetPixelContent is deprecated!" << endl;
+
+    /*
     MRawEvtPixelIter Next(const_cast<MRawEvtData*>(this));
     if (!Next.Jump(idx))
@@ -592 +596 @@
         return val >= 0;
     }
-
+*/
     return kTRUE;
 }

trunk/MagicSoft/Mars/mraw/MRawEvtPixelIter.cc

@@ -164 +164 @@
 }
 
+/*
 // --------------------------------------------------------------------------
 //
 // Returns the index of the FADC slice the maximum signal in. If the highest
-// slices have the same value the last one is returned.
+// slices have the same value the first one is returned.
 //
 Byte_t MRawEvtPixelIter::GetIdxMaxHiGainSample(const Byte_t hifirst, const Byte_t hilast) const
@@ -188 +189 @@
 //
 // 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
-// last one is returned.
+// 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
@@ -294 +295 @@
 // If no lo-gains are existing and the hi-gains have saturating values
 // a negative value (-1) is returned.
-// 
+//
 Short_t MRawEvtPixelIter::GetIdxMaxHiLoGainSample() const
 {
@@ -371 +372 @@
     return sum;
 }
+*/

trunk/MagicSoft/Mars/mraw/MRawEvtPixelIter.h

@@ -91 +91 @@
     */
 
-    Byte_t  GetNumHiGainSamples() const { return fNumHiGainSamples ; }// Use is deprecated!
-    Byte_t  GetNumLoGainSamples() const { return fNumLoGainSamples ; }// Use is deprecated!
+//    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  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;
+//    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;
+//    ULong_t GetSumHiGainSamples() const;
+//    ULong_t GetSumSqrHiGainSamples() const;
+//    Float_t GetVarHiGainSamples() const;
 
-    Byte_t  GetMaxLoGainSample() const;
-    Short_t GetIdxMaxHiLoGainSample() const;
+//    Byte_t  GetMaxLoGainSample() const;
+//    Short_t GetIdxMaxHiLoGainSample() const;
 
-    ULong_t GetSumLoGainSamples() const;
-    ULong_t GetSumSqrLoGainSamples() const;
+//    ULong_t GetSumLoGainSamples() const;
+//    ULong_t GetSumSqrLoGainSamples() const;
 
     Bool_t HasLoGain() const { return fNumLoGainSamples>0; }