Changeset 1332 for trunk/MagicSoft/Mars/mbase

Timestamp:

05/06/02 11:41:44 (23 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mbase

Files:

• MReadMarsFile.cc (modified) (1 diff)
• MReadTree.cc (modified) (1 diff)
• MTaskList.cc (modified) (2 diffs)

trunk/MagicSoft/Mars/mbase/MReadMarsFile.cc

@@ -117 +117 @@
         *fLog << "(before event #" << GetEventNum()-1 << ")" << endl;
 
-        fTaskList->ReInit();
+        if (fTaskList->ReInit())
+            return kTRUE;
+
         //MReadTree::Notify();
+
+        *fLog << err << "ERROR - ReInit of '" << fTaskList->GetName() << "' failed." << endl;
     }
     else
-        *fLog << warn << "Warning: Cannot read new runheaders after reading event #" << GetEventNum() << endl;
+        *fLog << err << "ERROR - Cannot read new runheaders after reading event #" << GetEventNum() << endl;
 
-    return kTRUE;
+    return kFALSE;
 }
 

trunk/MagicSoft/Mars/mbase/MReadTree.cc

@@ -71 +71 @@
 class MChain : public TChain
 {
+private:
+    Bool_t fNotified;
+
 public:
-    MChain() : TChain() {}
-    MChain(const char *name, const char *title="") : TChain(name, title) {}
+    MChain() : TChain(), fNotified(kFALSE) {}
+    MChain(const char *name, const char *title="") : TChain(name, title), fNotified(kFALSE) {}
 
     void ResetTree() { fTree = 0; }
+
+    virtual Bool_t Notify() { fNotified = kTRUE; return kTRUE; }
+    virtual void   SetNotify(TObject *obj) { fNotify = obj; fNotified = kFALSE; }
+
+    Int_t GetEntry(Int_t entry=0, Int_t getall=0)
+    {
+        // --------------------------------------------------------------------------
+        //
+        // This is the code from TChain::GetEntry but skips the
+        // notification in LoadTree. If LoadTree raises the notification
+        // a flag is set and the notification is done by hand. If it
+        // has not been successfull 0 is returned.
+        //
+        TObject *notify = GetNotify();
+
+        SetNotify(this);
+
+        Int_t rc = 0;
+
+        if (LoadTree(entry) >= 0)
+            if (!fNotified || (notify && notify->Notify()))
+                rc = fTree->GetEntry(fReadEntry, getall);
+
+        SetNotify(notify);
+
+        return rc;
+    }
 };
 

trunk/MagicSoft/Mars/mbase/MTaskList.cc

@@ -228 +228 @@
 
     MTask *task=NULL;
-
     //
     // loop over all tasks for preproccesing
@@ -237 +236 @@
 
         if (!task->ReInit(pList?pList:fParList))
+        {
+            *fLog << err << "ERROR - ReInit if Task " << task->GetDescriptor() << " failed." << endl;
             return kFALSE;
+        }
     }