Changeset 867 for trunk/MagicSoft/Mars/mbase

Timestamp:

07/13/01 18:13:06 (23 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mbase

Files:

• MEvtLoop.cc (modified) (3 diffs)
• MEvtLoop.h (modified) (1 diff)
• MParList.cc (modified) (5 diffs)
• MReadTree.cc (modified) (1 diff)
• MTask.h (modified) (2 diffs)
• MTaskList.cc (modified) (2 diffs)

trunk/MagicSoft/Mars/mbase/MEvtLoop.cc

@@ -105 +105 @@
 
     if (fLog != &gLog)
-    {
         fParList ->SetLogStream(fLog);
-        fTaskList->SetLogStream(fLog);
-    }
 
     //
@@ -180 +177 @@
         << " --> " << (maxcnt<0?dummy:maxcnt)/clock.CpuTime() << " Events/s"
         << endl << endl;
-
 }
 
@@ -188 +184 @@
 //  for developers use only!
 //
-void MEvtLoop::PostProcess() const
+Bool_t MEvtLoop::PostProcess() const
 {
     //
     //  execute the post process of all tasks
     //
-    fTaskList->PostProcess();
-}
-
-// --------------------------------------------------------------------------
-//
-// See class description above.
-//
-void MEvtLoop::Eventloop(Int_t maxcnt, const char *tlist)
-{
-    if (!PreProcess(tlist))
-        return;
-
-    Process(maxcnt);
-
-    PostProcess();
-}
-
+    return fTaskList->PostProcess();
+}
+
+// --------------------------------------------------------------------------
+//
+//  See class description above.
+//
+Bool_t MEvtLoop::Eventloop(Int_t maxcnt, const char *tlist)
+{
+    Bool_t rc = PreProcess();
+
+    if (rc)
+        Process(maxcnt);
+
+    if (!PostProcess())
+        return kFALSE;
+
+    return rc;
+}
+

trunk/MagicSoft/Mars/mbase/MEvtLoop.h

@@ -35 +35 @@
     Bool_t PreProcess(const char *tlist="MTaskList");
     void   Process(Int_t maxcnt) const;
-    void   PostProcess() const;
+    Bool_t PostProcess() const;
 
-    void Eventloop(Int_t maxcnt=-1, const char *tlist="MTaskList");
+    Bool_t Eventloop(Int_t maxcnt=-1, const char *tlist="MTaskList");
 
     ClassDef(MEvtLoop, 0) // Class to execute the tasks in a tasklist

trunk/MagicSoft/Mars/mbase/MParList.cc

@@ -199 +199 @@
 //  after the last appearance of a semicolon is stripped to get the
 //  Name of the Class. Normally this is used to number your objects.
-//  "Name;1", "Name;2", ...
+//  "Name;1", "Name;2", ... If a semicolon is detected leading dots
+//  are stripped from the object-name (eg. "name;5.")
 //
 MParContainer *MParList::FindCreateObj(const char *classname, const char *objname)
@@ -223 +224 @@
     const char *semicolon = strrchr(cname, ';');
 
+    TString oname(objname);
+
     if (semicolon)
+    {
         cname.Remove(semicolon-cname);
+
+        //
+        // Remove leading dots from objectname (eg. "MMcTrig;5.")
+        //
+        Int_t sz = oname.Sizeof()-2;
+
+        while (sz>=0 && oname[sz]=='.')
+            oname.Remove(sz--);
+    }
 
     //
@@ -230 +243 @@
     // in the List. If we can find one we are done.
     //
-    MParContainer *pcont = (MParContainer*)FindObject(objname);
+    MParContainer *pcont = (MParContainer*)FindObject(oname);
 
     if (pcont)
@@ -238 +251 @@
     // if object is not existing in the list try to create one
     //
-    *fLog << dbginf << "Object '" << objname << "' of type '" << cname << "' not found... creating." << endl;
+    *fLog << dbginf << "Object '" << oname << "' of type '" << cname << "' not found... creating." << endl;
 
     //
@@ -263 +276 @@
     // set the new object name of the object
     //
-    pcont->SetName(objname);
+    pcont->SetName(oname);
 
     //

trunk/MagicSoft/Mars/mbase/MReadTree.cc

@@ -173 +173 @@
             // we cannot proceed reading this branch
             //
-            *fLog << "MReadTree::PreProcess - Warning: Class '" << name << "' not existing in dictionary. Branch skipped." << endl;
+            *fLog << dbginf << "Warning: Class '" << name << "' not existing in dictionary. Branch skipped." << endl;
             continue;
         }

trunk/MagicSoft/Mars/mbase/MTask.h

@@ -22 +22 @@
     const MFilter *fFilter;
 
+    Bool_t fIsPreprocessed; // Indicates the success of the PreProcessing (set by MTaskList)
+
 public:
-    MTask() : fFilter(NULL) {}
+    MTask() : fFilter(NULL), fIsPreprocessed(kFALSE) {}
     ~MTask()
     {
@@ -30 +32 @@
     const MFilter *GetFilter() const { return fFilter; }
     void SetFilter(const MFilter *filter) { fFilter=filter; }
+
+    Bool_t IsPreprocessed() const { return fIsPreprocessed; }
+    void SetIsPreprocessed(Bool_t state=kTRUE) { fIsPreprocessed = state; }
 
     virtual Bool_t PreProcess(MParList *pList);

trunk/MagicSoft/Mars/mbase/MTaskList.cc

@@ -193 +193 @@
         if (!task->PreProcess(fParList))
             return kFALSE;
+
+        task->SetIsPreprocessed();
     }
 
@@ -307 +309 @@
     while ( (task=(MTask*)Next()) )
     {
+        if (!task->IsPreprocessed())
+            continue;
+
         *fLog << task->GetName() << "... " << flush;