X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=FMD%2FAliFMDRawReader.cxx;h=75392f6c13a71efb0762a3ccc1e067c5e4858bbb;hb=98dff241d22478e053fc4ff1db265f36931375c5;hp=227af2b65e9e507ba3efaf054c7ef2c64fe7a418;hpb=625d7886ba7f7956c558b80792c2a9da4acb0b5d;p=u%2Fmrichter%2FAliRoot.git

diff --git a/FMD/AliFMDRawReader.cxx b/FMD/AliFMDRawReader.cxx
index 227af2b65e9..75392f6c13a 100644
--- a/FMD/AliFMDRawReader.cxx
+++ b/FMD/AliFMDRawReader.cxx
@@ -90,7 +90,7 @@ AliFMDRawReader::Exec(Option_t*)
   ReadAdcs(array);
   Int_t nWrite = fTree->Fill();
   AliFMDDebug(1, ("Got a grand total of %d digits, wrote %d bytes to tree", 
-		   array->GetEntries(), nWrite));
+		   array->GetEntriesFast(), nWrite));
 }
 
 
@@ -111,8 +111,7 @@ AliFMDRawReader::ReadAdcs(TClonesArray* array)
   // Get sample rate 
   AliFMDParameters* pars = AliFMDParameters::Instance();
   AliFMDRawStream input(fReader);
-  AliFMDDebug(5, ("Setting old RCU format and 7 word headers"));
-  input.SetOldRCUFormat(!pars->HasRcuTrailer());
+  AliFMDDebug(5, ("Setting 7 word headers"));
   input.SetShortDataHeader(!pars->HasCompleteHeader());
 
   UShort_t stripMin = 0;
@@ -129,6 +128,7 @@ AliFMDRawReader::ReadAdcs(TClonesArray* array)
   Bool_t isGood = kTRUE;
   while (isGood) {
     isGood = input.ReadChannel(ddl, hwaddr, last, data);
+    if (!isGood) break;
 
     AliFMDDebug(5, ("Read channel 0x%x of size %d", hwaddr, last));
     UShort_t det, sec, str;