Index: trunk/MagicSoft/Mars/mraw/MRawFileRead.cc
===================================================================
--- trunk/MagicSoft/Mars/mraw/MRawFileRead.cc	(revision 5728)
+++ trunk/MagicSoft/Mars/mraw/MRawFileRead.cc	(revision 5776)
@@ -165,5 +165,5 @@
 // This opens the next file in the list and deletes its name from the list.
 //
-Bool_t MRawFileRead::OpenNextFile()
+Int_t MRawFileRead::OpenNextFile()
 {
     //
@@ -209,10 +209,10 @@
     //
     if (!fRawRunHeader->ReadEvt(*fIn))
-        return kFALSE;
+        return kERROR;
 
     if (!(*fIn))
     {
         *fLog << err << "Error: Accessing file '" << name << "'" << endl;
-        return kFALSE;
+        return kERROR;
     }
 
@@ -242,5 +242,5 @@
     {
         *fLog << err << dbginf << "MTaskList not found... abort." << endl;
-        return kFALSE;
+        return kERROR;
     }
 
@@ -270,5 +270,5 @@
     fNumFile=0;
     fNumEvents=0;
-    return OpenNextFile();
+    return OpenNextFile()==kTRUE;
 }
 
@@ -348,6 +348,7 @@
         // If an event could not be read from file try to open new file
         //
-        if (!OpenNextFile())
-            return kFALSE;
+        const Int_t rc = OpenNextFile();
+        if (rc!=kTRUE)
+            return rc;
     }
     return kTRUE; 
Index: trunk/MagicSoft/Mars/mraw/MRawFileRead.h
===================================================================
--- trunk/MagicSoft/Mars/mraw/MRawFileRead.h	(revision 5728)
+++ trunk/MagicSoft/Mars/mraw/MRawFileRead.h	(revision 5776)
@@ -22,5 +22,5 @@
     UInt_t     fInterleave;
 
-    Bool_t OpenNextFile();
+    Int_t OpenNextFile();
 
     Int_t PreProcess(MParList *pList);
Index: trunk/MagicSoft/Mars/mraw/MRawRunHeader.cc
===================================================================
--- trunk/MagicSoft/Mars/mraw/MRawRunHeader.cc	(revision 5728)
+++ trunk/MagicSoft/Mars/mraw/MRawRunHeader.cc	(revision 5776)
@@ -83,5 +83,5 @@
 
 const UShort_t MRawRunHeader::kMagicNumber      = 0xc0c0;
-const Byte_t   MRawRunHeader::kMaxFormatVersion =      5;
+const Byte_t   MRawRunHeader::kMaxFormatVersion =      2;
 
 // --------------------------------------------------------------------------
@@ -139,5 +139,5 @@
     if (fMagicNumber != kMagicNumber && fMagicNumber != kMagicNumber+1)
     {
-        *fLog << err << "Error: Wrong Magic Number (0x" << hex << fMagicNumber << "): Not a Magic File!" << endl;
+        *fLog << err << "ERROR - Wrong Magic Number (0x" << hex << fMagicNumber << "): Not a Magic File!" << endl;
         return kFALSE;
     }
@@ -151,5 +151,5 @@
     if (fFormatVersion>kMaxFormatVersion)
     {
-        *fLog << err << "WARNING - File vormat V" << fFormatVersion << " not implemented!" << endl;
+        *fLog << err << "ERROR - File vormat V" << fFormatVersion << " not implemented!" << endl;
         return kFALSE;
     }