Changeset 1052 for trunk/MagicSoft/Mars/mraw

Timestamp:

11/08/01 10:57:01 (23 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mraw

Files:

• MRawEvtPixelIter.cc (modified) (8 diffs)
• MRawEvtPixelIter.h (modified) (5 diffs)
• Makefile (modified) (1 diff)

trunk/MagicSoft/Mars/mraw/MRawEvtPixelIter.cc

@@ -56 +56 @@
 ClassImp(MRawEvtPixelIter);
 
+MRawEvtPixelIter::MRawEvtPixelIter(MRawEvtData *dat) : fData(dat)
+{
+    fNumHiGainSamples = dat->GetNumHiGainSamples();
+    fNumLoGainSamples = dat->GetNumLoGainSamples();
+
+    Reset();
+}
+
 // --------------------------------------------------------------------------
 //
@@ -92 +100 @@
             fNumLoGainEntry++;
             fLoGainId++;
-            fLoGainPos += fData->GetNumLoGainSamples();
+            fLoGainPos += fNumLoGainSamples;
         }
 
@@ -100 +108 @@
     fNumHiGainEntry++;
     fHiGainId++;
-    fHiGainPos += fData->GetNumHiGainSamples();
+    fHiGainPos += fNumHiGainSamples;
 
     //
@@ -125 +133 @@
     fHiGainId   = fData->fHiGainPixId->GetArray()-1;
     fLoGainId   = fData->fLoGainPixId->GetArray()-1;
-    fHiGainPos  = fData->fHiGainFadcSamples->GetArray()-fData->GetNumHiGainSamples();
-    fLoGainPos  = fData->fLoGainFadcSamples->GetArray()-fData->GetNumLoGainSamples();
+    fHiGainPos  = fData->fHiGainFadcSamples->GetArray()-fNumHiGainSamples;
+    fLoGainPos  = fData->fLoGainFadcSamples->GetArray()-fNumLoGainSamples;
 }
 
@@ -145 +153 @@
 // returns the sum of all hi gain fadc samples of the actual pixel
 //
-ULong_t MRawEvtPixelIter::GetSumHiGainFadcSamples() const
+ULong_t MRawEvtPixelIter::GetSumHiGainSamples() const
 {
     //
@@ -151 +159 @@
     //
     Byte_t *ptr = fHiGainPos;
-    const Byte_t *end = ptr + fData->GetNumHiGainSamples();
+    const Byte_t *end = ptr + fNumHiGainSamples;
 
     ULong_t sum=0;
@@ -166 +174 @@
 // if no lo gain information is available 0 is returned.
 //
-ULong_t MRawEvtPixelIter::GetSumLoGainFadcSamples() const
+ULong_t MRawEvtPixelIter::GetSumLoGainSamples() const
 {
     //
@@ -175 +183 @@
 
     Byte_t *ptr = fLoGainPos;
-    const Byte_t *end = ptr + fData->GetNumLoGainSamples();
+    const Byte_t *end = ptr + fNumLoGainSamples;
 
     ULong_t sum=0;

trunk/MagicSoft/Mars/mraw/MRawEvtPixelIter.h

@@ -28 +28 @@
     UShort_t fNumEntry;
 
+    Byte_t fNumHiGainSamples;   //!
+    Byte_t fNumLoGainSamples;   //!
+
     MRawEvtData *fData;         //! pointer to object which we are iterating
 
 public:
-    MRawEvtPixelIter(MRawEvtData *dat) : fData(dat)
-    {
-        Reset();
-    }
+    MRawEvtPixelIter(MRawEvtData *dat);
 
     MRawEvtData *Next();
@@ -66 +66 @@
     Byte_t GetNumPixels() const;
 
-    Byte_t *GetHiGainFadcSamples() const
+    Byte_t *GetHiGainSamples() const
     {
         //
@@ -77 +77 @@
     }
 
-    ULong_t GetSumHiGainFadcSamples() const;
+    ULong_t GetSumHiGainSamples() const;
 
     Bool_t HasLoGain() const
@@ -87 +87 @@
     }
 
-    Byte_t *GetLoGainFadcSamples() const
+    Byte_t *GetLoGainSamples() const
     {
         //
@@ -96 +96 @@
     }
 
-    ULong_t GetSumLoGainFadcSamples() const;
+    ULong_t GetSumLoGainSamples() const;
+
 
     void Reset();

trunk/MagicSoft/Mars/mraw/Makefile

@@ -47 +47 @@
 include ../Makefile.rules
 
-clean:  rmlib rmcint rmobjs rmcore rmbin
+clean:  rmcint rmobjs rmcore rmlib
 
 mrproper:       clean rmbak