]> git.uio.no Git - u/mrichter/AliRoot.git/commitdiff
Minor fixes following the discussion with Paolo
authorcvetan <cvetan@f7af4fe6-9843-0410-8265-dc069ae4e863>
Mon, 23 Jul 2007 10:09:52 +0000 (10:09 +0000)
committercvetan <cvetan@f7af4fe6-9843-0410-8265-dc069ae4e863>
Mon, 23 Jul 2007 10:09:52 +0000 (10:09 +0000)
HMPID/AliHMPIDRawStream.cxx

index 4504197dc4102cfb97b7ae549caf09a19b17f66f..60718aaaa6c9c03aed62f50fef1b502b0104cb6e 100644 (file)
@@ -97,8 +97,8 @@ Bool_t AliHMPIDRawStream::Next()
   // Look over rows
   for(Int_t iRow = 1; iRow < kNRows; iRow++) {
     // Read row marker
-    UInt_t rowMarker = GetNextWord();
-    if ((rowMarker != 0x1ea32a8) && (rowMarker != 0xa1ea32a8)) {
+    UInt_t rowMarker = GetNextWord() & 0x1ffffff;
+    if (rowMarker != 0x1ea32a8) {
       fRawReader->AddMajorErrorLog(kRowMarkerErr);
       AliWarning(Form("Wrong row marker %x for row %d, expected 0xx1ea32a8!",rowMarker,iRow));
       return kTRUE;
@@ -129,7 +129,7 @@ Bool_t AliHMPIDRawStream::Next()
        fCharge[row][dilogic][pad] = data & 0xfff;
       }
       // Now read the end-of-event word
-      UInt_t eOfEvent = GetNextWord();
+      UInt_t eOfEvent = GetNextWord() & 0xfffffff;
       if (!((eOfEvent >> 27) & 0x1)) {
        fRawReader->AddMajorErrorLog(kEoEFlagErr);
        AliWarning(Form("Missing end-of-event flag! (%x)",eOfEvent));