Index: trunk/MagicSoft/Mars/mraw/MRawEvtData.cc
===================================================================
--- trunk/MagicSoft/Mars/mraw/MRawEvtData.cc	(revision 4753)
+++ trunk/MagicSoft/Mars/mraw/MRawEvtData.cc	(revision 4754)
@@ -368,8 +368,11 @@
 void MRawEvtData::InitArrays(UShort_t numconnected, UShort_t maxid)
 {
+    const Int_t numlo = fRunHeader ? fRunHeader->GetNumSamplesHiGain() : 0;
+    const Int_t numhi = fRunHeader ? fRunHeader->GetNumSamplesHiGain() : 0;
+
     fHiGainPixId       = new MArrayS(numconnected);
     fLoGainPixId       = new MArrayS(numconnected);
-    fHiGainFadcSamples = new MArrayB(numconnected*fRunHeader->GetNumSamplesHiGain());
-    fLoGainFadcSamples = new MArrayB(numconnected*fRunHeader->GetNumSamplesLoGain());
+    fHiGainFadcSamples = new MArrayB(numconnected*numhi);
+    fLoGainFadcSamples = new MArrayB(numconnected*numlo);
 
     fABFlags           = new MArrayB(maxid/8+1);