Changeset 1333 for trunk/MagicSoft/Mars/mbase

Timestamp:

05/13/02 12:17:49 (23 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mbase/MReadTree.cc (modified) (2 diffs)

trunk/MagicSoft/Mars/mbase/MReadTree.cc

@@ -83 +83 @@
     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
+    Int_t LoadTree(Int_t entry)
+    {
+        //
+        // This is the code from TChain::LoadTree 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.
+        // has not been successfull -15 is returned.
+        // This is to support return values from Notify()/Reinit()
         //
         TObject *notify = GetNotify();
@@ -96 +96 @@
         SetNotify(this);
 
-        Int_t rc = 0;
-
-        if (LoadTree(entry) >= 0)
-            if (!fNotified || (notify && notify->Notify()))
-                rc = fTree->GetEntry(fReadEntry, getall);
+        Int_t rc = TChain::LoadTree(entry);
+
+        if (rc >= 0 && fNotified && notify)
+            if (!notify->Notify())
+                rc = -15;
 
         SetNotify(notify);