Removing TArrayOfArray (M.Ivanov)

diff --git a/CONTAINERS/CONTAINERSLinkDef.h b/CONTAINERS/CONTAINERSLinkDef.h
index 56640e20d015a7690d346321551b40042908ccd1..a971fdc6019e1a0e4fc92e147286d8dd94a830b0 100644 (file)
--- a/CONTAINERS/CONTAINERSLinkDef.h
+++ b/CONTAINERS/CONTAINERSLinkDef.h
@@ -10,10 +10,10 @@
 
 #pragma link C++ class AliMemArray+;
 #pragma link C++ class AliObjectArray-;
-#pragma link C++ class TArrayOfArray+;
+//#pragma link C++ class TArrayOfArray+;
 
-#pragma link C++ class TArrayOfArrayVStack+;
-#pragma link C++ class TArrayOfArrayVList+;
+//#pragma link C++ class TArrayOfArrayVStack+;
+//#pragma link C++ class TArrayOfArrayVList+;
 
 
 #pragma link C++ class AliArraySubBranch+;

diff --git a/CONTAINERS/TArrayOfArray.cxx b/CONTAINERS/TArrayOfArray.cxx
deleted file mode 100644 (file)
index f76d2bf..0000000
--- a/CONTAINERS/TArrayOfArray.cxx
+++ /dev/null
@@ -1,134 +0,0 @@
-/**************************************************************************
- * Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. *
- *                                                                        *
- * Author: The ALICE Off-line Project.                                    *
- * Contributors are mentioned in the code where appropriate.              *
- *                                                                        *
- * Permission to use, copy, modify and distribute this software and its   *
- * documentation strictly for non-commercial purposes is hereby granted   *
- * without fee, provided that the above copyright notice appears in all   *
- * copies and that both the copyright notice and this permission notice   *
- * appear in the supporting documentation. The authors make no claims     *
- * about the suitability of this software for any purpose. It is          *
- * provided "as is" without express or implied warranty.                  *
- **************************************************************************/
-
-/* $Id$ */
-
-#include "TArrayOfArray.h"
-#include "Riostream.h"
-
-
-
-
-ClassImp(TArrayOfArray)
-ClassImp(TArrayOfArrayVStack)
-ClassImp(TArrayOfArrayVList)
- 
-
-TArrayOfArrayVStack::TArrayOfArrayVStack()
-{ 
-  fIndex = 0;
-  fArray = 0;
-}     
-  
-TArrayOfArrayVStack::TArrayOfArrayVStack(const char *classname)
-{
-  fIndex = 0;
-  fArray = 0;
-  SetClass(classname);
-} 
-
-  
-TArrayOfArrayVStack::~TArrayOfArrayVStack()  
-{
-  if (fIndex) delete fIndex;
-  if (fArray) delete fArray;
-} 
-
-Bool_t TArrayOfArrayVStack::SetClass(const char * classname)
-{
-  //
-  //set class
-  if (fIndex==0) fIndex = new AliObjectArray("Int_t");
-  if (fArray==0) fArray = new AliObjectArray;
-  else fArray->Delete();
-  return fArray->SetClass(classname);
-}
-
-
-void  TArrayOfArrayVStack::Clear(Option_t *)
-{
-  //
-  // clear contents
-  if (fIndex) fIndex->Clear();
-  if (fArray) fArray->Clear();
-  //if (fIndex) fIndex->Resize(0);
-  //if (fArray) fArray->Resize(0);
-  
-}
-
-void * TArrayOfArrayVStack::At(UInt_t index0, UInt_t index1)
-{
-  //get pointer to the object
-  if ( (fIndex!=0) && (index0+1<fIndex->GetSize()) 
-       && ((*((UInt_t*)(fIndex->Unchecked1DAt(index0+1)))
-           >(*((UInt_t*)(fIndex->Unchecked1DAt(index0)))+index1)) ) )
-    return Unchecked1DAt(index0,index1);
-  else 
-    return 0;
-}
-void  TArrayOfArrayVStack::Dump(UInt_t index0, UInt_t index1)
-{
-  void * p = At(index0,index1);
-  if ( (p) && fArray->GetClassInfo()) fArray->GetClassInfo()->ObjectDump(p); 
-  else{    
-    printf("Index %d,%d out of range\n",index0,index1);
-    cout<<flush;
-  }
-  
-}
-
-Int_t TArrayOfArrayVStack::Resize(Int_t index, UInt_t newsize)
-{ 
-  //expand array with index index to newsize
-  if (index<0) index = fIndex->GetSize()-2;
-  if  ((UInt_t)index==(fIndex->GetSize()-2)){
-    Int_t arrindex = *((Int_t*)(fIndex->At(index)));
-    fArray->Resize(arrindex+newsize);
-    *(Int_t*)(fIndex->At(index+1)) = arrindex+newsize;        
-  }
-  else{
-    cout<<"out\n"; 
-  }
-  return 0;
-}
-
-UInt_t TArrayOfArrayVStack::Push(UInt_t size)
-{
-  //make new array with size  - return starting index
-  if ( (fIndex==0) || (fArray==0)) return 0;
-  UInt_t index1 = fIndex->GetSize(); 
-  UInt_t indexa = fArray->GetSize();
-  fArray->Resize(indexa+size);
-  if (index1==0) { 
-    fIndex->Resize(2);
-    (*(Int_t*)fIndex->Unchecked1DAt(0))=0;
-    (*(Int_t*)fIndex->Unchecked1DAt(1))=size;
-    return 0;
-  }
-  else{
-    fIndex->Resize(index1+1);
-    (*(Int_t*)fIndex->Unchecked1DAt(index1))=indexa+size;
-  }
-  return index1-1;
-}
-
-Int_t TArrayOfArrayVStack::ArraySize(UInt_t index)
-{
-  //size if subarray with index index
-  if ( (fIndex) && fIndex->GetSize()>index+1) 
-    return (*(Int_t*)fIndex->Unchecked1DAt(index+1))-(*(Int_t*)fIndex->Unchecked1DAt(index));
-  else 
-    return 0;
-}

diff --git a/CONTAINERS/TArrayOfArray.h b/CONTAINERS/TArrayOfArray.h
deleted file mode 100644 (file)
index c999926..0000000
--- a/CONTAINERS/TArrayOfArray.h
+++ /dev/null
@@ -1,73 +0,0 @@
-#ifndef TARRAYOFARRAY_H
-#define TARRAYOFARRAY_H
-/* Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. *
- * See cxx source for full Copyright notice                               */
-
-/* $Id$ */
-#include "TObject.h"
-#include "AliObjectArray.h"
-
-class TArrayOfArray: public TObject { 
-public:    
-  virtual void * At(UInt_t index0, UInt_t index1)=0;
-  //get pointer to the object
-  virtual void  Dump() const {TObject::Dump();}
-  virtual void  Dump(UInt_t index0, UInt_t index1)=0;
-  virtual Int_t Resize(Int_t index, UInt_t newsize)=0; 
-  //expand array with index index to newsize 
-  virtual UInt_t Push(UInt_t size)=0;
-  //make new array with size  - return starting index
-  virtual Int_t ArraySize(UInt_t index)=0;
-  virtual Int_t GetSize()=0;
-  ClassDef(TArrayOfArray,1) 
-};
-
-
-class TArrayOfArrayVStack: public TArrayOfArray{
-public:  
-  TArrayOfArrayVStack();   
-  TArrayOfArrayVStack(const char *classname);
-  ~TArrayOfArrayVStack(); 
-  Bool_t SetClass(const char * classname);
-  virtual void Clear(Option_t * opt="");
-  void * Unchecked1DArray(UInt_t index){return fIndex->Unchecked1DAt(index);}
-  void * Unchecked1DAt(UInt_t index0, UInt_t index1);
-  //
-  virtual void * At(UInt_t index0, UInt_t index1);
-  //get pointer to the object 
-  virtual void  Dump() const {TArrayOfArray::Dump();}
-  virtual void  Dump(UInt_t index0, UInt_t index1);
-  virtual Int_t Resize(Int_t index, UInt_t newsize); 
-  //expand array with index index to newsize 
-  virtual UInt_t Push(UInt_t size);
-  //make new array with size  - return starting index    
-  virtual Int_t ArraySize(UInt_t index);
-  Int_t ArraySize(){ return fArray->GetSize();}
-  virtual Int_t GetSize(){return (fIndex) ?(Int_t)fIndex->GetSize()-1:0;}
-private:
-
-  TArrayOfArrayVStack(const TArrayOfArrayVStack & taa);
-  TArrayOfArrayVStack & operator=(const TArrayOfArrayVStack & taa);
-
-  AliObjectArray * fIndex;
-  AliObjectArray * fArray;
-  ClassDef(TArrayOfArrayVStack,1) 
-};
-
-class TArrayOfArrayVList: public TArrayOfArray{
-protected:
-  AliObjectArray  fIndex;
-  AliObjectArray  fSecondaryIndexes;
-  AliObjectArray  fArray;
-  ClassDef(TArrayOfArrayVList,1) 
-};
-
-inline void * TArrayOfArrayVStack::Unchecked1DAt(UInt_t index0, UInt_t index1)
-{
-  // unchecked return
-  return fArray->Unchecked1DAt(((UInt_t*)fIndex->GetArray())[index0]+index1);
-}
-
-#endif
-  
-

diff --git a/CONTAINERS/libCONTAINERS.pkg b/CONTAINERS/libCONTAINERS.pkg
index 650f7d98282202e88293e14960413415212f6251..85e34165f6f48a023e7d8a5bcde0544b13dbf6d9 100644 (file)
--- a/CONTAINERS/libCONTAINERS.pkg
+++ b/CONTAINERS/libCONTAINERS.pkg
@@ -1,6 +1,6 @@
 
 SRCS= AliMemArray.cxx AliClassInfo.cxx  AliDataType.cxx\
-      AliObjectArray.cxx    TArrayOfArray.cxx  AliArrayBranch.cxx\
+      AliObjectArray.cxx    AliArrayBranch.cxx\
       AliSegmentID.cxx  AliSegmentArray.cxx \
       AliDigits.cxx AliArrayI.cxx AliArrayS.cxx \
       AliH2F.cxx