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

Timestamp:

11/07/03 18:50:44 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

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

trunk/MagicSoft/Mars/mraw/MRawEvtPixelIter.cc

@@ -57 +57 @@
 ClassImp(MRawEvtPixelIter);
 
+using namespace std;
+
 MRawEvtPixelIter::MRawEvtPixelIter(MRawEvtData *dat) : fData(dat)
 {
@@ -92 +94 @@
     //
     if (fNumLoGainEntry != fData->fLoGainPixId->GetSize())
-        if (*fHiGainId == *fLoGainId)
+        if (HasLoGain())
         {
             //
@@ -133 +135 @@
     //
     fHiGainId   = fData->fHiGainPixId->GetArray()-1;
-    fLoGainId   = fData->fLoGainPixId->GetArray()-1;
+    fLoGainId   = fData->fLoGainPixId->GetArray();
     fHiGainPos  = fData->fHiGainFadcSamples->GetArray()-fNumHiGainSamples;
     fLoGainPos  = fData->fLoGainFadcSamples->GetArray()-fNumLoGainSamples;
+
+    //
+    // In case fLoGainPixId.GetSize()=0 some root versions seems to
+    // initialize the array with NULL. This makes both cases work.
+    //
+    if (fLoGainId)
+        fLoGainId -= 1;
 }