Changeset 6253 for trunk/MagicSoft/Mars/mraw

Timestamp:

02/04/05 13:31:19 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mraw

Files:

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

trunk/MagicSoft/Mars/mraw/MRawEvtData.cc

@@ -376 +376 @@
     fLoGainFadcSamples = new MArrayB(numconnected*numlo);
 
-    fABFlags           = new MArrayB(maxid/8+1);
+    fABFlags           = new MArrayB(maxid==0 ? 0 : maxid/8+1);
 
     fConnectedPixels   = 0;

trunk/MagicSoft/Mars/mraw/MRawEvtPixelIter.cc

@@ -73 +73 @@
 // return kTRUE  the lo gains exist for the actual pixel, else return kFALSE
 //
-#include <iostream>
 Bool_t MRawEvtPixelIter::HasLoGain() const
 {
@@ -85 +84 @@
         return kTRUE;
 
-//    cout << fNumLoGainEntry << " " << flush;
-//    cout << fData->fLoGainPixId->GetSize() << " " << flush;
-
     if (fNumLoGainEntry>fData->fLoGainPixId->GetSize())
         return kFALSE;
 
-/*
-    cout << fNumLoGainEntry << " " << flush;
-    cout << fData->fLoGainPixId->GetSize() << " " << flush;
-    cout << fData->fLoGainPixId->GetArray() << " " << flush;
-    cout << fLoGainId << endl;
-    */
-//    cout << (int)(fLoGainId-fData->fLoGainPixId->GetArray()) << " " << flush;
-//    cout << (int)(fHiGainId-fData->fHiGainPixId->GetArray()) << " " << flush;
-
     Bool_t rc = *fHiGainId!=*fLoGainId;
-
-//    cout << "done." << endl;
-
 
     if (rc)
         return kFALSE;
-    /*
-    // We have no lo-gain at all
-    if (!fLoGainId)
-        return kFALSE;
-
-    // This is to make the first call of this function in Next()
-    // work properly! NEVER call this function before Next()
-    if (fNumLoGainEntry==0)
-        return kTRUE;
-
-    // Make sure, that we don't exceed the last entry in the array!
-    if (fNumLoGainEntry==fData->fLoGainPixId->GetSize())
-        return kFALSE;
-
-    // Check whether the current position in lo-gain fits the hi-gain
-    return *fHiGainId!=*fLoGainId;
-     */
+
     return kTRUE;
 }

trunk/MagicSoft/Mars/mraw/MRawEvtPixelIter.h

@@ -97 +97 @@
         // return kTRUE  the lo gains exist for the actual pixel, else return kFALSE
         //
-        return fABFlags ? TESTBIT(fABFlags[GetPixelId()/8], GetPixelId()%8) : 0;
+        return TESTBIT(GetABFlag(), GetPixelId()%8);
     }
     Byte_t GetABFlag() const