Changeset 5832 for trunk/MagicSoft/Mars/mfileio

Timestamp:

01/14/05 10:23:13 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mfileio

Files:

• MChain.cc (modified) (2 diffs)
• MChain.h (modified) (1 diff)
• MReadTree.cc (modified) (1 diff)

trunk/MagicSoft/Mars/mfileio/MChain.cc

@@ -36 +36 @@
 using namespace std;
 
-Int_t MChain::LoadTree(Int_t entry)
+//#if ROOT_VERSION_CODE < ROOT_VERSION(4,02,00)
+//Int_t MChain::LoadTree(Int_t entry)
+//#else
+Long64_t MChain::LoadTree(Long64_t entry)
+//#endif
 {
     //
@@ -50 +54 @@
     SetNotify(this);
 
-    Int_t rc = TChain::LoadTree(entry);
+//#if ROOT_VERSION_CODE < ROOT_VERSION(4,02,00)
+//    Int_t
+//#else
+    Long64_t
+//#endif
+        rc = TChain::LoadTree(entry);
 
     if (rc >= 0 && fNotified && notify)

trunk/MagicSoft/Mars/mfileio/MChain.h

@@ -20 +20 @@
     virtual void   SetNotify(TObject *obj) { fNotify = obj; fNotified = kFALSE; }
 
-    Int_t LoadTree(Int_t entry);
+//#if ROOT_VERSION_CODE < ROOT_VERSION(4,02,00)
+    Int_t LoadTree(Int_t entry) { return (Int_t)LoadTree((Long64_t)entry); }
+//#else
+    Long64_t LoadTree(Long64_t entry);
+//#endif
 
     ClassDef(MChain, 1) // Class derived from TChain to give access to Notify-return value

trunk/MagicSoft/Mars/mfileio/MReadTree.cc

@@ -217 +217 @@
 Bool_t MReadTree::CheckBranchSize()
 {
-    //if (!fChain) // >FIXME: fTree!=0
-    //    return kTRUE;
-
-    TArrayI entries(fChain ? fChain->GetStatus()->GetSize() : fTree->GetListOfBranches()->GetSize());
+    TArrayI entries(fTree->GetListOfBranches()->GetSize());
     Int_t num=0;
 
-    // Loop over all branches which have a corresponding container
-    /*
-    if (fChain)
-    {
-        TIter Next(fChain->GetStatus());
-
-        TChainElement *element = NULL;
-        while ((element=(TChainElement*)Next()))
-        {
-            // Get branch name and find pointer to corresponding branch
-            const TString name = element->GetName();
-            const TBranch *b = fChain->FindBranch(name);
-
-            // Skip element without corresponding branches (like "*")
-            if (!b)
-                continue;
-
-            entries[num++] = (Int_t)b->GetEntries();
-        }
-    }
-    else */
-    {
-        TIter Next(fTree->GetListOfBranches());
-
-        TBranch *element = NULL;
-        while ((element=(TBranch*)Next()))
-            entries[num++] = (Int_t)element->GetEntries();
-    }
+    TIter Next(fTree->GetListOfBranches());
+
+    TBranch *element = NULL;
+    while ((element=(TBranch*)Next()))
+        entries[num++] = (Int_t)element->GetEntries();
 
     // Check the number of entries of the branches pair-wise