Index: trunk/MagicSoft/Mars/mfileio/MCT1ReadPreProc.cc
===================================================================
--- trunk/MagicSoft/Mars/mfileio/MCT1ReadPreProc.cc	(revision 1736)
+++ trunk/MagicSoft/Mars/mfileio/MCT1ReadPreProc.cc	(revision 1745)
@@ -431,4 +431,7 @@
     fIn->read((Byte_t*)&outpars, sizeof(struct outputpars));
 
+<<<<<<< MCT1ReadPreProc.cc
+    return ProcessRunHeader(outpars);
+=======
     ProcessRunHeader(outpars);
 
@@ -438,4 +441,5 @@
 
     return kTRUE;
+>>>>>>> 1.13
 }
 
@@ -908,16 +912,10 @@
         *fLog << "-----------------------------------------------------------------------" << endl;
 
-	switch (ReadRunHeader())
-	  {
-	  case kTRUE:
-	    return kTRUE;
-	    break;
-	  case -1:
-	    *fLog << warn << "ReInit of Tasklist didn't succeed." << endl;
-	    return kFALSE;
-	    break;
-          default:
-            return kTRUE;
-	  }
+        if (ReadRunHeader() < 0)
+        {
+            *fLog << warn << "ReInit of Tasklist didn't succeed." << endl;
+            return kFALSE;
+        }
+        return kTRUE;
     }
 }