Removing extra namespace (alpha)

[u/mrichter/AliRoot.git] / CONTAINERS / AliArrayBranch.cxx

diff --git a/CONTAINERS/AliArrayBranch.cxx b/CONTAINERS/AliArrayBranch.cxx
index a9af699e0166f1e57f2483acab51a6e5c905f488..e37dcf58e7a8d0c0d80d66407c643201bbb359dd 100644 (file)
--- a/CONTAINERS/AliArrayBranch.cxx
+++ b/CONTAINERS/AliArrayBranch.cxx
@@ -15,6 +15,12 @@
 
 /* $Id$ */
 
+//-----------------------------------------------------
+// A Branch for the case of an array of clone objects. 
+//-----------------------------------------------------
+// Author M.Ivanov
+//*KEND.
+
 #include "TROOT.h"
 #include "AliArrayBranch.h"
 #include "TFile.h"
@@ -39,11 +45,6 @@
 #include "AliObjectArray.h"
 #include "AliDataType.h"
 
-//-----------------------------------------------------
-// A Branch for the case of an array of clone objects. 
-//-----------------------------------------------------
-
-//*KEND.
 
 R__EXTERN TTree *gTree;
 
@@ -431,7 +432,7 @@ Int_t AliArrayBranch::Fill()
 }
 
 //______________________________________________________________________________
-Int_t AliArrayBranch::GetEntry(Int_t entry, Int_t getall)
+Int_t AliArrayBranch::GetEntry(Long64_t entry, Int_t getall)
 {
 //*-*-*-*-*Read all branches of a BranchClones and return total number of bytes
 //*-*      ====================================================================
@@ -657,6 +658,9 @@ void AliArrayBranch::Streamer(TBuffer &b)
 
 void AliArrayBranch::Import(TLeaf * leaf, Int_t n)
 {
+  //
+  // Import leaf n from the branch
+  //
 
   const Int_t kIntUndefined = -9999;
   Int_t j = 0;
@@ -726,9 +730,17 @@ AliObjectBranch::AliObjectBranch(const Text_t *name, const Text_t *classname, vo
    fBasketSize     = basketsize;
    fAddress        = (char*)addobj;
    fClassName      = classname;
+#if ROOT_VERSION_CODE >= 262401
+   fBasketEntry    = new Long64_t[fMaxBaskets];
+#else
    fBasketEntry    = new Int_t[fMaxBaskets];
+#endif
    fBasketBytes    = new Int_t[fMaxBaskets];
+#if ROOT_VERSION_CODE >= 262146
+   fBasketSeek     = new Long64_t[fMaxBaskets];
+#else
    fBasketSeek     = new Seek_t[fMaxBaskets];
+#endif
    fOldObject      = 0;
 
    fBasketEntry[0] = fEntryNumber;
@@ -988,6 +1000,9 @@ AliTree::AliTree(const char *name,const char *title, Int_t maxvirtualsize):
 TBranch * AliTree::AliBranch(const char *name, void *clonesaddress, Int_t bufsize, Int_t splitlevel,
                             Int_t compres)
 {
+  //
+  // Create an AliBranch and returns a reference to the TBranch
+  //
   if (clonesaddress == 0) return 0;
   char *cpointer =(char*)clonesaddress;
   char **ppointer =(char**)cpointer;
@@ -1008,6 +1023,9 @@ TBranch * AliTree::AliBranch(const char *name, void *clonesaddress, Int_t bufsiz
 TBranch* AliTree::AliBranch(const char *name, const char *classname, void *addobj, 
                     Int_t bufsize, Int_t splitlevel)
 {
+  //
+  // Create an AliBranch and returns a reference to the TBranch
+  //
   gTree = this;
   TClass *cl = gROOT->GetClass(classname);
   if (!cl) {