Changeset 11431 for trunk/Mars/mraw

Timestamp:

07/18/11 09:27:48 (13 years ago)

Author:

tbretz

Message:

Outsourced OpenFile and ReadRunHeader to their own funtions.

Location:

trunk/Mars/mraw

Files:

• MRawFileRead.cc (modified) (3 diffs)
• MRawFileRead.h (modified) (3 diffs)

trunk/Mars/mraw/MRawFileRead.cc

@@ -162 +162 @@
 }
 
+istream *MRawFileRead::OpenFile(const char *filename)
+{
+    return new MZlib(filename);
+}
+
+Bool_t MRawFileRead::ReadRunHeader(istream &fin)
+{
+    //
+    // Read RUN HEADER (see specification) from input stream
+    //
+    if (!fRawRunHeader->ReadEvt(fin))
+        if (!fForce)
+            return kFALSE;
+
+    return kTRUE;
+}
+
 // --------------------------------------------------------------------------
 //
@@ -188 +205 @@
 
     const char *expname = gSystem->ExpandPathName(name);
-    fIn = new MZlib(expname);
+    fIn = OpenFile(expname);
 
     const Bool_t noexist = !(*fIn);
@@ -220 +237 @@
     MRawRunHeader h(*fRawRunHeader);
 
-    //
-    // Read RUN HEADER (see specification) from input stream
-    //
-    if (!fRawRunHeader->ReadEvt(*fIn))
-        if (!fForce)
-            return kERROR;
+    if (!ReadRunHeader(*fIn))
+        return kERROR;
 
     if (!(*fIn))
     {
         *fLog << err << "Error: Accessing file '" << name << "'" << endl;
-        return kERROR;
+        return kFALSE;
     }
 

trunk/Mars/mraw/MRawFileRead.h

@@ -7 +7 @@
 
 class TList;
-class MZlib;
 class MTaskList;
 
@@ -18 +17 @@
     UInt_t    fNumTotalEvents; //! total number of events in all files
 
-    MZlib    *fIn;             //! input stream (file to read from)
+    istream  *fIn;             //! input stream (file to read from)
 
     MParList *fParList;        //! tasklist to call ReInit from
@@ -25 +24 @@
 
     Bool_t    fForce;
+
+    virtual istream *OpenFile(const char *filename);
+    virtual Bool_t   ReadRunHeader(istream &fin);
 
     Int_t  OpenNextFile(Bool_t print=kTRUE);