Changeset 2299 for trunk/MagicSoft/Mars/mbase

Timestamp:

08/01/03 16:28:20 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mbase

Files:

• MEvtLoop.cc (modified) (4 diffs)
• MEvtLoop.h (modified) (1 diff)

trunk/MagicSoft/Mars/mbase/MEvtLoop.cc

@@ -267 +267 @@
 }
 
-Bool_t MEvtLoop::ProcessGuiEvents(Int_t num)
+Bool_t MEvtLoop::ProcessGuiEvents(Int_t num, Int_t entries)
 {
     if (!fProgress || gROOT->IsBatch())
@@ -320 +320 @@
             txt += " (";
             txt += speed;
-            txt += "Evts/s)";
+            txt += "Evts/s, est: ";
+            txt += (int)((long int)(t0-t2)*entries/(60000.*(num-start)));
+            txt += "m";
+            //txt += (int)fmod(entries/(1000.*(num-start)/(long int)(t0-t2)), 60);
+            //txt += "s";
+            txt += ")";
         }
         fDisplay->SetStatusLine1(txt);
@@ -416 +421 @@
         {
             numcnts++;
-            if (!ProcessGuiEvents(++dummy))
+            if (!ProcessGuiEvents(++dummy, entries))
                 break;
         }
@@ -424 +429 @@
         {
             numcnts++;
-            if (!ProcessGuiEvents(maxcnt - dummy))
+            if (!ProcessGuiEvents(maxcnt - dummy, entries))
                 break;
         }

trunk/MagicSoft/Mars/mbase/MEvtLoop.h

@@ -37 +37 @@
     void StreamPrimitive(ofstream &out) const;
 
-    Bool_t ProcessGuiEvents(Int_t num);
+    Bool_t ProcessGuiEvents(Int_t num, Int_t entries);
 
 public: