Fixes for reading zero-suppressed data. These should be propagated to

[u/mrichter/AliRoot.git] / FMD / AliFMDRawStream.cxx

diff --git a/FMD/AliFMDRawStream.cxx b/FMD/AliFMDRawStream.cxx
index 7502788bbb8427b06b0decb95b206c612e7b0061..f8c71c56fbfabebf9fc237591947b179a3ef0bf6 100644 (file)
--- a/FMD/AliFMDRawStream.cxx
+++ b/FMD/AliFMDRawStream.cxx
@@ -32,6 +32,7 @@
 #include "AliFMDDebug.h" // Better debug macros
 // #include <iomanip>
 // #include <iostream>
+#include "AliRawReader.h"
 
 //____________________________________________________________________
 ClassImp(AliFMDRawStream)
@@ -44,6 +45,7 @@ AliFMDRawStream::AliFMDRawStream(AliRawReader* reader)
   : AliAltroRawStream(reader)
 {
   // CTOR 
+  reader->Reset();
   fNoAltroMapping = kFALSE;
   // Select FMD DDL's 
   SelectRawData("FMD");
@@ -52,7 +54,7 @@ AliFMDRawStream::AliFMDRawStream(AliRawReader* reader)
 //_____________________________________________________________________________
 Bool_t 
 AliFMDRawStream::ReadChannel(UInt_t& ddl, UInt_t& addr, 
-                            UInt_t& len, UShort_t* data)
+                            UInt_t& len, volatile UShort_t* data)
 {
   // Read one channel and return.   Returns 0 when there's no more
   // data. 
@@ -83,10 +85,33 @@ AliFMDRawStream::ReadChannel(UInt_t& ddl, UInt_t& addr,
        break;
       }
     }
+    // Sanity check - if the total bunch length is less than 1, then
+    // read until we get the next bunch. 
+    Int_t b  = GetTimeLength();
+    if (b < 1) { 
+      AliWarning(Form("Bunch length %0d is less than 0 for "
+                     "DDL %4d address 0x%03x", 
+                     b, ddl, addr));
+      last = 0xFFFF;
+      continue;
+    }
+
+    // Sanity check - if the current time is less than 0, then read
+    // until we get a new bunch. 
     Int_t t  = GetTime();
+    if (t < 0) {
+      AliWarning(Form("Time %0d is less than 0 for DDL %4d address 0x%03x", 
+                     t, ddl, addr));
+      last = 0xFFFF;
+      continue;
+    }
     l        = TMath::Max(l, t);
     data[t]  = signal;
     last     = 0xFFFF;
+#if 0
+    AliFMDDebug(signal > 512 ? 1 : 0, ("Signal @ %d (%d) is %d", 
+                                      time, t, data[t]));
+#endif
   } while (next);
   return next;
 }