gcc 4.3 warnings fixed

[u/mrichter/AliRoot.git] / TRD / AliTRDsegmentArray.h

diff --git a/TRD/AliTRDsegmentArray.h b/TRD/AliTRDsegmentArray.h
index 51c11cd46297b403562167a4ae8c7092ed01f540..21ddfbd796787bc7f11a50d35a2813c5e9170e66 100644 (file)
--- a/TRD/AliTRDsegmentArray.h
+++ b/TRD/AliTRDsegmentArray.h
@@ -5,19 +5,23 @@
 
 /* $Id$ */
 
-#include "AliTRDsegmentArrayBase.h"
-
 ////////////////////////////////////////////////////////////////////////////
 //                                                                        //
 //  Array for TRD detector segments containing digits                     //
 //                                                                        //
 ////////////////////////////////////////////////////////////////////////////
 
+#include <TNamed.h>
+
 class TTree;
+class TBranch;
+class TObjArray;
 
+class AliTRDarrayI;
 class AliTRDdataArray;
+class AliTRDsegmentID;
 
-class AliTRDsegmentArray : public AliTRDsegmentArrayBase {
+class AliTRDsegmentArray : public TNamed {
 
  public:
 
@@ -25,11 +29,33 @@ class AliTRDsegmentArray : public AliTRDsegmentArrayBase {
   AliTRDsegmentArray(const char *classname, Int_t n);
   AliTRDsegmentArray(AliTRDsegmentArray &a);
   virtual ~AliTRDsegmentArray();
+  AliTRDsegmentArray &operator=(const AliTRDsegmentArray &a);
+
+  const   AliTRDsegmentID *At(Int_t i) const; 
+  const   AliTRDsegmentID *operator[](Int_t i) const; 
 
+          Bool_t           AddSegment(AliTRDsegmentID *segment);
+          AliTRDsegmentID *AddSegment(Int_t index);  
+  virtual AliTRDsegmentID *NewSegment(); 
+  virtual AliTRDsegmentID *LoadSegment(Int_t index);
+  virtual AliTRDsegmentID *LoadEntry(Int_t index); 
+  virtual void             StoreSegment(Int_t index);
+          void             ClearSegment(Int_t index);
+ 
   virtual void             Copy(TObject &a) const;
+  virtual Bool_t           ConnectTree(const char *treeName);
   virtual void             Delete();
   virtual void             Delete(const char *) { Delete(); };
 
+          Bool_t           MakeArray(Int_t n);    
+  virtual void             MakeTree(char *file = 0);           
+          Bool_t           MakeDictionary(Int_t size);
+
+          Bool_t           SetClass(const char *classname);
+ 
+          TClass          *GetClass() const { return fClass; };
+          TTree           *GetTree() const  { return fTree;  };   
+
   virtual Bool_t           LoadArray(const Char_t *branchname, TTree *tree = 0);
   virtual Bool_t           StoreArray(const Char_t *branchname, TTree *tree = 0);
 
@@ -38,7 +64,14 @@ class AliTRDsegmentArray : public AliTRDsegmentArrayBase {
 
  protected:
 
-  ClassDef(AliTRDsegmentArray,1)        // TRD detector segment array 
+  TObjArray    *fSegment;            //! Pointer to an array of pointers to a segment
+  AliTRDarrayI *fTreeIndex;          //! Pointers(index) table
+  Int_t         fNSegment;           //  Number of segments 
+  TTree        *fTree;               //! Tree with segment objects
+  TBranch      *fBranch;             //! Branchaddress
+  TClass       *fClass;              //! Class type of included objects 
+
+  ClassDef(AliTRDsegmentArray,2)     //  TRD detector segment array 
 
 };