Changeset 1020

Timestamp:

10/31/01 14:38:20 (23 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• mbase/MEvtLoop.cc (modified) (4 diffs)
• mbase/MEvtLoop.h (modified) (3 diffs)
• mbase/MFilterList.h (modified) (1 diff)
• mbase/MLogManip.h (modified) (1 diff)
• mbase/MReadTree.cc (modified) (2 diffs)
• mbase/MReadTree.h (modified) (3 diffs)
• mbase/MTask.h (modified) (1 diff)
• merpp.cc (modified) (1 diff)
• mraw/RawLinkDef.h (modified) (1 diff)

trunk/MagicSoft/Mars/mbase/MEvtLoop.cc

@@ -56 +56 @@
 #include <iostream.h>
 
+#include <TSystem.h>
 #include <TStopwatch.h>
+#include <TGProgressBar.h>
 
 #include "MLog.h"
@@ -76 +78 @@
 // default constructor - emty
 //
-MEvtLoop::MEvtLoop() : fParList(NULL)
+MEvtLoop::MEvtLoop() : fParList(NULL), fProgress(NULL)
 {
 }
@@ -166 +168 @@
     *fLog << " events)..." << flush;
 
+    if (fProgress && maxcnt>0)
+        fProgress->SetRange(0, maxcnt);
+
     Int_t dummy = maxcnt<0 ? 0 : maxcnt;
 
@@ -181 +186 @@
     if (maxcnt<0)
         // process first and increment if sucessfull
-        while (fTaskList->Process()) dummy++;
+        if (fProgress)
+            while (fTaskList->Process())
+            {
+                fProgress->SetPosition(++dummy);
+                gSystem->ProcessEvents();
+            }
+        else
+            while (fTaskList->Process()) dummy++;
     else
         // check for number and break if unsuccessfull
-        while (dummy-- && fTaskList->Process());
+        if (fProgress)
+            while (dummy-- && fTaskList->Process())
+            {
+                fProgress->SetPosition(maxcnt - dummy);
+                gSystem->ProcessEvents();
+            }
+        else
+            while (dummy-- && fTaskList->Process());
 
     //

trunk/MagicSoft/Mars/mbase/MEvtLoop.h

@@ -16 +16 @@
 class MParList;
 class MTaskList;
+class TGProgressBar;
 
 class MEvtLoop : public MParContainer
@@ -22 +23 @@
     MParList  *fParList;
     MTaskList *fTaskList;
+
+    TGProgressBar *fProgress;
 
     enum { kIsOwner = BIT(14) };
@@ -34 +37 @@
     void SetOwner(Bool_t enable=kTRUE);
 
+    void SetProgressBar(TGProgressBar *bar) { fProgress = bar; }
+
     Bool_t PreProcess(const char *tlist="MTaskList");
     void   Process(Int_t maxcnt) const;

trunk/MagicSoft/Mars/mbase/MFilterList.h

@@ -27 +27 @@
     FilterType_t fFilterType;
 
+    enum { kIsOwner = BIT(14) };
+
 public:
     MFilterList(const char *type="&&");
+    MFilterList(MFilterList &ts);
     ~MFilterList()
     {
+        if (TestBit(kIsOwner))
+            fFilters.SetOwner();
     }
-    MFilterList(MFilterList &ts);
 
     Bool_t AddToList(MFilter *filter);
+    void SetOwner(Bool_t enable=kTRUE) { enable ? SetBit(kIsOwner) : ResetBit(kIsOwner); }
 
     Bool_t IsExpressionTrue() const;

trunk/MagicSoft/Mars/mbase/MLogManip.h

@@ -53 +53 @@
 //
 #ifndef __CINT__
-#define dbginf      __FILE__ << " l." << __LINE__ << ": "
+#define dbginf      __FILE__ << " l." << dec << __LINE__ << ": "
 #endif
 //

trunk/MagicSoft/Mars/mbase/MReadTree.cc

@@ -55 +55 @@
 
 #include <TChain.h>
+#include <TGProgressBar.h>
 #include <TChainElement.h>
 #include <TOrdCollection.h>
@@ -316 +317 @@
     EnableBranches(pList);
 
+    if (fProgress)
+        fProgress->SetRange(0, fNumEntries);
+
     return kTRUE;
 }

trunk/MagicSoft/Mars/mbase/MReadTree.h

@@ -7 +7 @@
 
 class TChain;
+class TGProgressBar;
 
 class MReadTree : public MTask
@@ -21 +22 @@
     TOrdCollection *fVetoList; // List of Branches which are not allowed to get enabled
 
+    TGProgressBar *fProgress;  // Possible display of status
+
     void EnableBranches(MParList *plist);
     void EnableBranchChoosing();
@@ -30 +33 @@
     Bool_t PreProcess(MParList *pList);
     Bool_t Process();
+
+    void   SetProgressBar(TGProgressBar *bar) { fProgress = bar; }
 
     Int_t  AddFile(const char *fname);

trunk/MagicSoft/Mars/mbase/MTask.h

@@ -71 +71 @@
     virtual void PrintStatistics(const Int_t lvl=0) const;
 
+    UInt_t GetNumExecutions() { return fNumExecutions; }
+
     Bool_t CallPreProcess(MParList *plist);
     Bool_t CallProcess();

trunk/MagicSoft/Mars/merpp.cc

@@ -84 +84 @@
         }
 
+    MParContainer::Class()->IgnoreTObjectStreamer();
+
     //
     // create a (empty) list of parameters which can be used by the tasks

trunk/MagicSoft/Mars/mraw/RawLinkDef.h

@@ -9 +9 @@
 #pragma link C++ class MRawEvtHeader;
 #pragma link C++ class MRawEvtData;
-#pragma link C++ class MRawEvtPixelIter;
+#pragma link C++ class MRawEvtPixelIter+;
 
-#pragma link C++ class MRawCrateArray;
-#pragma link C++ class MRawCrateData;
+#pragma link C++ class MRawCrateArray+;
+#pragma link C++ class MRawCrateData+;
 
-#pragma link C++ class MRawFileRead;
-#pragma link C++ class MRawFileWrite;
+#pragma link C++ class MRawFileRead+;
+#pragma link C++ class MRawFileWrite+;
 
 #endif