Changeset 1528 for trunk/MagicSoft/Mars/mbase

Timestamp:

09/17/02 11:50:21 (22 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mbase

Files:

• MEvtLoop.cc (modified) (2 diffs)
• MParList.cc (modified) (1 diff)
• Makefile (modified) (1 diff)

trunk/MagicSoft/Mars/mbase/MEvtLoop.cc

@@ -84 +84 @@
 #include "MParList.h"
 #include "MTaskList.h"
+#ifdef __MARS__
+#include "MReadTree.h"       // for setting progress bar
+#endif
 
 ClassImp(MEvtLoop);
@@ -190 +193 @@
     *fLog << " events)..." << flush;
 
-    if (fProgress && maxcnt>0)
-        fProgress->SetRange(0, maxcnt);
+    if (fProgress)
+    {
+        if (maxcnt>0)
+            fProgress->SetRange(0, maxcnt);
+#ifdef __MARS__
+        else
+        {
+            MReadTree *read = (MReadTree*)fTaskList->FindObject("MReadTree");
+            if (!read)
+                read = (MReadTree*)fTaskList->FindObject("MReadMarsFile");
+            if (read)
+                fProgress->SetRange(0, read->GetEntries());
+        }
+#endif
+    }
 
     Int_t dummy = maxcnt<0 ? 0 : maxcnt;

trunk/MagicSoft/Mars/mbase/MParList.cc

@@ -530 +530 @@
 {
     fContainer->ForEach(MParContainer, Reset)();
- }
+}
 
 // --------------------------------------------------------------------------

trunk/MagicSoft/Mars/mbase/Makefile

@@ -20 +20 @@
 # @endcode 
 
-INCLUDES = -I. -I../mraw -I../MRawFormat -I../mmc
+INCLUDES = -I. -I../mraw -I../MRawFormat -I../mmc -I../mfileio
 
 # @code