Changeset 1668 for trunk/MagicSoft/Mars/mbase

Timestamp:

11/25/02 09:12:47 (23 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mbase

Files:

• MEvtLoop.cc (modified) (1 diff)
• MFilter.h (modified) (1 diff)

trunk/MagicSoft/Mars/mbase/MEvtLoop.cc

@@ -208 +208 @@
     if (fProgress)
     {
+        fProgress->Reset();
+
+        Int_t entries = INT_MAX;
+
+#ifdef __MARS__
+        // limits.h
+        MRead *read = (MRead*)fTaskList->FindObject("MRead");
+        if (read && read->GetEntries()>0)
+            entries = read->GetEntries();
+#endif
+
         if (maxcnt>0)
-            fProgress->SetRange(0, maxcnt);
-#ifdef __MARS__
+            fProgress->SetRange(0, TMath::Min(maxcnt, entries));
         else
-        {
-            MRead *read = (MRead*)fTaskList->FindObject("MRead");
-            if (read && read->GetEntries()>0)
-                fProgress->SetRange(0, read->GetEntries());
-        }
-#endif
+            if (entries!=INT_MAX)
+                fProgress->SetRange(0, entries);
     }
 

trunk/MagicSoft/Mars/mbase/MFilter.h

@@ -10 +10 @@
 class MFilter : public MTask
 {
+private:
+    virtual Bool_t PreProcess(MParList *pList);
+    virtual Bool_t Process();
+    virtual Bool_t PostProcess();
+
 public:
     MFilter(const char *name=NULL, const char *title=NULL);
 
     virtual Bool_t IsExpressionTrue() const = 0;
-
-    virtual Bool_t PreProcess(MParList *pList);
-    virtual Bool_t Process();
-    virtual Bool_t PostProcess();
-
     virtual TString GetRule() const;