Changeset 1283 for trunk/MagicSoft/Mars/mbase

Timestamp:

04/22/02 11:28:38 (22 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mbase

Files:

• MFilterList.cc (modified) (4 diffs)
• MParContainer.cc (modified) (1 diff)
• MParContainer.h (modified) (2 diffs)
• MParList.cc (modified) (5 diffs)
• MReadTree.cc (modified) (4 diffs)
• MTaskList.cc (modified) (3 diffs)
• MTaskList.h (modified) (1 diff)

trunk/MagicSoft/Mars/mbase/MFilterList.cc

@@ -59 +59 @@
     TString str(type);
 
-    if (str.CompareTo("OR", TString::kIgnoreCase)  || str.CompareTo("|"))
+    if (!str.CompareTo("OR", TString::kIgnoreCase)  || !str.CompareTo("|"))
         fFilterType = kEOr;
-    if (str.CompareTo("XOR", TString::kIgnoreCase) || str.CompareTo("^"))
+    if (!str.CompareTo("XOR", TString::kIgnoreCase) || !str.CompareTo("^"))
         fFilterType = kEXor;
-    if (str.CompareTo("LAND", TString::kIgnoreCase) || str.CompareTo("&&"))
+    if (!str.CompareTo("LAND", TString::kIgnoreCase) || !str.CompareTo("&&"))
         fFilterType = kELAnd;
-    if (str.CompareTo("LOR", TString::kIgnoreCase) || str.CompareTo("||"))
+    if (!str.CompareTo("LOR", TString::kIgnoreCase) || !str.CompareTo("||"))
         fFilterType = kELOr;
 }
@@ -180 +180 @@
     while ((filter=(MFilter*)Next()))
         if (!filter->PreProcess(pList))
+        {
+            *fLog << err << "Error - Preprocessing Filter ";
+            *fLog << filter->GetName() << " in " << fName << endl;
             return kFALSE;
+        }
 
     return kTRUE;
@@ -235 +239 @@
     const Bool_t verbose = str.Contains("V", TString::kIgnoreCase);
 
+    //*fLog << all << "(" << GetName() << "=" << (int)fFilterType << ")";
+
     *fLog << all << "(";
 
@@ -250 +256 @@
     }
 
-    do
+    filter->Print();
+
+    while ((filter=(MFilter*)Next()))
     {
         switch (fFilterType)
         {
         case kEAnd:
-            *fLog << (verbose?" and ":"&");
+            *fLog << (verbose?" and ":" & ");
             break;
 
         case kEOr:
-            *fLog << (verbose?" or ":"|");
+            *fLog << (verbose?" or ":" | ");
             break;
 
         case kEXor:
-            *fLog << (verbose?" xor ":"^");
+            *fLog << (verbose?" xor ":" ^ ");
             break;
 
         case kELAnd:
-            *fLog << (verbose?" land ":"&&");
+            *fLog << (verbose?" land ":" && ");
             break;
 
         case kELOr:
-            *fLog << (verbose?" lor ":"||");
+            *fLog << (verbose?" lor ":" || ");
             break;
         }
 
         filter->Print();
-    } while ((filter=(MFilter*)Next()));
+    }
 
     *fLog << ")" << flush;
 }
+

trunk/MagicSoft/Mars/mbase/MParContainer.cc

@@ -319 +319 @@
     return rc;
 }
+
+TMethodCall *MParContainer::GetterMethod(const char *name) const
+{
+    TClass *cls = IsA()->GetBaseDataMember(name);
+    if (!cls)
+    {
+        *fLog << err << "No (base) class containing '" << name << "'." << endl;
+        return NULL;
+    }
+
+    TDataMember *member = cls->GetDataMember(name);
+    if (!member)
+    {
+        *fLog << err << "Datamember '" << name << "' not in " << GetDescriptor() << endl;
+        return NULL;
+    }
+
+    TMethodCall *call = member->GetterMethod();
+    if (!call)
+    {
+        *fLog << err << "Sorry, no getter method found for " << name << endl;
+        return NULL;
+    }
+
+    return call;
+}

trunk/MagicSoft/Mars/mbase/MParContainer.h

@@ -24 +24 @@
 
 class TDataMember;
+class TMethodCall;
 
 class MParContainer : public TObject
@@ -66 +67 @@
     virtual void   SetReadyToSave(Bool_t flag=kTRUE) { fReadyToSave=flag; }
 
+    TMethodCall *GetterMethod(const char *name) const;
+
     Bool_t WriteDataMember(ostream &out, const char *member, Double_t scale=1) const;
     Bool_t WriteDataMember(ostream &out, const TDataMember *member, Double_t scale=1) const;

trunk/MagicSoft/Mars/mbase/MParList.cc

@@ -380 +380 @@
     //
     TClass *cls = gROOT->GetClass(cname);
-
     if (!cls)
     {
@@ -394 +393 @@
     //
     pcont = (MParContainer*)cls->New();
+    if (!pcont)
+    {
+        *fLog << err << dbginf << "Cannot create new instance of class '" << cname << "' (Maybe no def. constructor)" << endl;
+        return NULL;
+    }
 
     //
@@ -424 +428 @@
 void MParList::Print(Option_t *t) const
 {
-    *fLog << all << GetDescriptor() << endl;
+    *fLog << all << " " << GetDescriptor() << endl;
     *fLog << setfill('-') << setw(strlen(GetDescriptor())+2) << "" << endl;
     MParContainer *obj = NULL;
@@ -572 +576 @@
     //
     TClass *cls = gROOT->GetClass(cname);
-
     if (!cls)
     {
@@ -602 +605 @@
         //
         MParContainer *pcont = (MParContainer*)cls->New();
+        if (pcont)
+        {
+            gLog << err << dbginf << "Cannot create new instance of class '" << cname << "' (Maybe no def. constructor)" << endl;
+            return list;
+        }
 
         //

trunk/MagicSoft/Mars/mbase/MReadTree.cc

@@ -458 +458 @@
         // check if object is existing in the list
         //
-        *pcont=pList->FindCreateObj(oname);
+        *pcont=pList->FindCreateObj(branch->GetClassName(), oname);
 
         if (!*pcont)
@@ -466 +466 @@
             // we cannot proceed reading this branch
             //
-            *fLog << warn << dbginf << "Warning: Class '" << oname << "' not existing in dictionary. Branch skipped." << endl;
+            *fLog << warn << dbginf << "Warning: Class '" << branch->GetClassName();
+            *fLog << "' for " << oname << " not existing in dictionary. Branch skipped." << endl;
             DisableSubBranches(branch);
             continue;
@@ -484 +485 @@
         //
         fChain->SetBranchAddress(bname, pcont);
-        *fLog << inf << "Master branch address " << bname << " setup for reading." << endl;
+
+        *fLog << inf << "Master branch address " << bname << " [";
+        *fLog << branch->GetClassName() << "] setup for reading." << endl;
 
         //*fLog << "Branch " << bname << " autodel: " << (int)branch->IsAutoDelete() << endl;
@@ -568 +571 @@
 //
 #if ROOT_VERSION_CODE < ROOT_VERSION(3,02,06)
-//#include "../mraw/MRawEvtData.h"
 #include "MRawEvtData.h"
 #endif

trunk/MagicSoft/Mars/mbase/MTaskList.cc

@@ -58 +58 @@
 
 #include <TClass.h>
+#include <TBaseClass.h>
 #include <TOrdCollection.h>
 
@@ -259 +260 @@
 // --------------------------------------------------------------------------
 //
+// Check whether this task (or one of it's base classes) overloads
+// MTask::Process. Only if this function is overloaded this task is
+// added to the fTaskProcess-List. This makes the execution of the
+// tasklist a little bit (only a little bit) faster, bacause tasks
+// doing no Processing are not Processed.
+//
+Bool_t MTaskList::CheckClassForProcess(TClass *cls)
+{
+    //
+    // Check whether the class itself overloads the Process function
+    //
+    if (cls->GetName()=="MTask")
+        return kFALSE;
+
+    if (cls->GetMethodAny("Process"))
+        return kTRUE;
+
+    //
+    // If the class itself doesn't overload it check all it's base classes
+    //
+    TBaseClass *base=NULL;
+    TIter NextBase(cls->GetListOfBases());
+    while ((base=(TBaseClass*)NextBase()))
+    {
+        if (CheckClassForProcess(base->GetClassPointer()))
+            return kTRUE;
+    }
+
+    return kFALSE;
+}
+
+// --------------------------------------------------------------------------
+//
 //  do pre processing (before eventloop) of all tasks in the task-list
 //
-#include <TMethod.h>
-#include <TBaseClass.h>
 Bool_t MTaskList::PreProcess(MParList *pList)
 { 
@@ -283 +315 @@
     while ((task=(MTask*)Next()))
     {
-        *fLog << all << task->GetName() << "... " << flush;
-
-        //
-        // Check whether this task (or one of it's base classes) overloads
-        // MTask::Process. Only if this function is overloaded this task is
-        // added to the fTaskProcess-List. This makes the execution of the
-        // tasklist a little bit (only a little bit) faster, bacause tasks
-        // doing no Processing are not Processed.
-        //
-        TBaseClass *cls=NULL;
-        TIter NextBase(task->IsA()->GetListOfBases());
-        while ((cls=(TBaseClass*)NextBase()))
-        {
-            if (cls->GetName()=="MTask")
-                break;
-
-            if (!cls->GetClassPointer()->GetMethodAny("Process"))
-                continue;
-
+        if (CheckClassForProcess(task->IsA()))
             fTasksProcess.Add(task);
-            break;
-        }
 
         //

trunk/MagicSoft/Mars/mbase/MTaskList.h

@@ -30 +30 @@
     enum { kIsOwner = BIT(14) };
 
-    void Remove(MTask *task);
+    void   Remove(MTask *task);
+    Bool_t CheckClassForProcess(TClass *cls);
 
 public: