Changeset 4041

Timestamp:

05/10/04 18:41:20 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mraw/MRawEvtHeader.cc (modified) (3 diffs)

trunk/MagicSoft/Mars/mraw/MRawEvtHeader.cc

@@ -317 +317 @@
 Int_t MRawEvtHeader::ReadEvt(istream &fin, UShort_t ver)
 {
+    Bool_t rc = kTRUE;
+
     fin.read((char*)&fDAQEvtNumber, 4);  // Total=4
 
@@ -324 +326 @@
     if (ver>2)
         if (!DecodeTime(abstime))
-        {
-            // Skip the rest of the header in case of merpps force-mode
-            fin.seekg(GetNumBytes()-12, ios::cur);
-            return kCONTINUE;
-        }
+            rc = kCONTINUE;
 
     Byte_t dummy[4];
@@ -346 +344 @@
     fin.read((char*)&dummy, 4);
 
-    return !fin.eof();
+    return fin.eof() ? kFALSE : rc;
 }