Changeset 7438 for trunk/MagicSoft/Mars/mraw

Timestamp:

12/01/05 16:43:46 (19 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mraw

Files:

• MRawFileRead.cc (modified) (5 diffs)
• MRawFileRead.h (modified) (2 diffs)

trunk/MagicSoft/Mars/mraw/MRawFileRead.cc

@@ -44 +44 @@
 
 #include <errno.h>
-#include <fstream>
 
 #include <TSystem.h>
@@ -51 +50 @@
 #include "MLogManip.h"
 
+#include "MZlib.h"
 #include "MTime.h"
 #include "MParList.h"
@@ -127 +127 @@
 Byte_t MRawFileRead::IsFileValid(const char *name)
 {
-    ifstream fin(name);
+    MZlib fin(name);
     if (!fin)
         return 0;
@@ -188 +188 @@
 
     const char *expname = gSystem->ExpandPathName(name);
-    fIn = new ifstream(expname);
+    fIn = new MZlib(expname);
 
     const Bool_t noexist = !(*fIn);
@@ -194 +194 @@
     {
         *fLog << err << "Cannot open file " << expname << ": ";
-        *fLog << strerror(errno) << endl;
+        *fLog << (errno==0?strerror(errno):"Insufficient memory for decompression") << endl;
     }
     else

trunk/MagicSoft/Mars/mraw/MRawFileRead.h

@@ -7 +7 @@
 
 class TList;
+class MZlib;
 class MTaskList;
 
@@ -12 +13 @@
 {
 private:
-    TList     *fFileNames;      // list of file names
-    UInt_t     fNumFile;        //! number of next file
-    UInt_t     fNumEvents;      //! input stream (file to read from)
-    UInt_t     fNumTotalEvents; //! total number of events in all files
+    TList    *fFileNames;      // list of file names
+    UInt_t    fNumFile;        //! number of next file
+    UInt_t    fNumEvents;      //! input stream (file to read from)
+    UInt_t    fNumTotalEvents; //! total number of events in all files
 
-    ifstream  *fIn;             //! input stream (file to read from)
+    MZlib    *fIn;             //! input stream (file to read from)
 
-    MParList  *fParList;        //! tasklist to call ReInit from
+    MParList *fParList;        //! tasklist to call ReInit from
 
-    UInt_t     fInterleave;
+    UInt_t    fInterleave;
 
     Int_t  OpenNextFile(Bool_t print=kTRUE);