Changeset 1745 for trunk/MagicSoft/Mars/mfileio/MCT1ReadPreProc.cc

Timestamp:

02/06/03 11:59:10 (22 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mfileio/MCT1ReadPreProc.cc (modified) (3 diffs)

trunk/MagicSoft/Mars/mfileio/MCT1ReadPreProc.cc

@@ -431 +431 @@
     fIn->read((Byte_t*)&outpars, sizeof(struct outputpars));
 
+<<<<<<< MCT1ReadPreProc.cc
+    return ProcessRunHeader(outpars);
+=======
     ProcessRunHeader(outpars);
 
@@ -438 +441 @@
 
     return kTRUE;
+>>>>>>> 1.13
 }
 
@@ -908 +912 @@
         *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;
     }
 }