Changeset 5776 for trunk/MagicSoft/Mars/mraw

Timestamp:

01/10/05 17:55:11 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mraw

Files:

• MRawFileRead.cc (modified) (5 diffs)
• MRawFileRead.h (modified) (1 diff)
• MRawRunHeader.cc (modified) (3 diffs)

trunk/MagicSoft/Mars/mraw/MRawFileRead.cc

@@ -165 +165 @@
 // This opens the next file in the list and deletes its name from the list.
 //
-Bool_t MRawFileRead::OpenNextFile()
+Int_t MRawFileRead::OpenNextFile()
 {
     //
@@ -209 +209 @@
     //
     if (!fRawRunHeader->ReadEvt(*fIn))
-        return kFALSE;
+        return kERROR;
 
     if (!(*fIn))
     {
         *fLog << err << "Error: Accessing file '" << name << "'" << endl;
-        return kFALSE;
+        return kERROR;
     }
 
@@ -242 +242 @@
     {
         *fLog << err << dbginf << "MTaskList not found... abort." << endl;
-        return kFALSE;
+        return kERROR;
     }
 
@@ -270 +270 @@
     fNumFile=0;
     fNumEvents=0;
-    return OpenNextFile();
+    return OpenNextFile()==kTRUE;
 }
 
@@ -348 +348 @@
         // 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; 

trunk/MagicSoft/Mars/mraw/MRawFileRead.h

@@ -22 +22 @@
     UInt_t     fInterleave;
 
-    Bool_t OpenNextFile();
+    Int_t OpenNextFile();
 
     Int_t PreProcess(MParList *pList);

trunk/MagicSoft/Mars/mraw/MRawRunHeader.cc

@@ -83 +83 @@
 
 const UShort_t MRawRunHeader::kMagicNumber      = 0xc0c0;
-const Byte_t   MRawRunHeader::kMaxFormatVersion =      5;
+const Byte_t   MRawRunHeader::kMaxFormatVersion =      2;
 
 // --------------------------------------------------------------------------
@@ -139 +139 @@
     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 +151 @@
     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;
     }