Changeset 4178 for trunk/MagicSoft/Mars/mraw

Timestamp:

05/25/04 14:23:17 (20 years ago)

Author:

reyes

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mraw/MRawFileRead.cc (modified) (3 diffs)

trunk/MagicSoft/Mars/mraw/MRawFileRead.cc

@@ -278 +278 @@
     // Now open next (first) file
     //
-    if (!Rewind())
-        return kFALSE;
+//      if (!Rewind())
+//          return kFALSE;
+
+
+    fNumFile=0;
+    fNumEvents=0; 
 
     return kTRUE;
@@ -296 +300 @@
     while (1)
     {
-        //
-        // skip events if requested
-        //
-        if (fInterleave>1 && GetNumExecutions()%fInterleave>0 && fIn->peek()!=EOF)
+        if (fIn)
         {
-            SkipEvent(*fIn);
-            return kCONTINUE;
+            //
+            // skip events if requested
+            //
+            if (fInterleave>1 && GetNumExecutions()%fInterleave>0 && fIn->peek()!=EOF)
+            {
+                SkipEvent(*fIn);
+                return kCONTINUE;
+            }
+
+            //
+            // Read a single event from file
+            //
+            const Bool_t rc = ReadEvent(*fIn);
+            if (rc!=kFALSE)
+                return rc;
         }
-
-        //
-        // Read a single event from file
-        //
-        const Bool_t rc = ReadEvent(*fIn);
-        if (rc!=kFALSE)
-            return rc;
 
         //
@@ -318 +325 @@
             return kFALSE;
     }
-    return kTRUE;
+    return kTRUE; 
 }