X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=MUON%2FAliMUON1DArray.cxx;h=6a24605f2c9e5ce4914973e5fbd95a94f669ed97;hb=75eff6de2d7200ef8cd1a53bb2f14934ae346818;hp=a5b2ee496aca19573b31c8e5587a20585d544995;hpb=5398f94668e02dcbf8366fd69a3a87777c1476d2;p=u%2Fmrichter%2FAliRoot.git

diff --git a/MUON/AliMUON1DArray.cxx b/MUON/AliMUON1DArray.cxx
index a5b2ee496ac..6a24605f2c9 100644
--- a/MUON/AliMUON1DArray.cxx
+++ b/MUON/AliMUON1DArray.cxx
@@ -18,15 +18,18 @@
 #include "AliMUON1DArray.h"
 
 #include "AliLog.h"
-#include "TObjArray.h"
+#include <TClass.h>
+#include <TObjArray.h>
+#include <Riostream.h>
 
-///
+//-----------------------------------------------------------------------------
 /// \class AliMUON1DArray
 /// This class is simply a wrapper to a TObjArray, offering in addition a
 /// control over the replacement policy when you add
 /// something to it.
 ///
 /// \author Laurent Aphecetche
+//-----------------------------------------------------------------------------
 
 /// \cond CLASSIMP
 ClassImp(AliMUON1DArray)
@@ -34,24 +37,25 @@ ClassImp(AliMUON1DArray)
 
 //_____________________________________________________________________________
 AliMUON1DArray::AliMUON1DArray(Int_t theSize)
-: AliMUONV1DStore(),
+: AliMUONVStore(),
   fArray(0x0)
 {
-/// Default ctor
+    /// Default ctor
 
-  if ( theSize ) 
-  {
-    fArray = new TObjArray(theSize);
-  }
+  if (theSize<=0) theSize=16;
+        
+  fArray = new TObjArray(theSize);
+  fArray->SetOwner(kTRUE);
 }
 
 //_____________________________________________________________________________
 AliMUON1DArray::AliMUON1DArray(const AliMUON1DArray& other)
-: AliMUONV1DStore(),
+: AliMUONVStore(),
   fArray(0x0)
 {
 /// Copy constructor
 
+    AliDebug(1,Form("this=%p copy ctor",this));
   other.CopyTo(*this);
 }
 
@@ -68,11 +72,38 @@ AliMUON1DArray::operator=(const AliMUON1DArray& other)
 //_____________________________________________________________________________
 AliMUON1DArray::~AliMUON1DArray()
 {
-/// dtor, we're the owner of our internal array.
+  /// dtor, we're the owner of our internal array.
 
+  AliDebug(1,Form("this=%p",this));
   delete fArray;
 }
 
+//_____________________________________________________________________________
+Bool_t
+AliMUON1DArray::Add(TObject* object)
+{
+  /// Add an object to this, if its uniqueID is below maxsize
+  if (!object) return kFALSE;
+  
+  Int_t i = (Int_t)object->GetUniqueID();
+  if ( i >= fArray->GetSize() ) 
+  {
+    AliError(Form("Index out of bounds %u (max is %u)",i,fArray->GetSize()));
+    return kFALSE;
+  }
+
+  Set(object->GetUniqueID(),object,kFALSE);
+  return kTRUE;
+}
+
+//_____________________________________________________________________________
+void
+AliMUON1DArray::Clear(Option_t* opt)
+{
+  /// Reset
+  fArray->Clear(opt);
+}
+
 //_____________________________________________________________________________
 void
 AliMUON1DArray::CopyTo(AliMUON1DArray& dest) const
@@ -80,7 +111,8 @@ AliMUON1DArray::CopyTo(AliMUON1DArray& dest) const
 /// Make a deep copy
 
   delete dest.fArray;
-  dest.fArray = new TObjArray;
+  dest.fArray = 0;
+  dest.fArray = new TObjArray(fArray->GetSize());
   dest.fArray->SetOwner(kTRUE);
   for ( Int_t i = 0; i < fArray->GetLast(); ++i )
   {
@@ -88,13 +120,21 @@ AliMUON1DArray::CopyTo(AliMUON1DArray& dest) const
   }
 }
 
+//_____________________________________________________________________________
+AliMUON1DArray* 
+AliMUON1DArray::Create() const 
+{
+  /// Create an empty clone of this
+  return new AliMUON1DArray(fArray->GetSize());
+}
+
 //_____________________________________________________________________________
 TObject* 
-AliMUON1DArray::Get(Int_t i) const
+AliMUON1DArray::FindObject(UInt_t i) const
 {
-/// Get the object located at index i, if it exists, and if i is correct.
+  /// Get the object located at index i, if it exists, and if i is correct.
 
-  if ( i >= 0 && i < fArray->GetSize() )
+  if ( (Int_t)(i) < fArray->GetSize() )
   {
     return fArray->At(i);
   }
@@ -102,6 +142,14 @@ AliMUON1DArray::Get(Int_t i) const
   return 0x0;
 }
 
+//_____________________________________________________________________________
+TIterator* 
+AliMUON1DArray::CreateIterator() const
+{
+  /// Return an iterator on this
+  return fArray->MakeIterator();
+}
+
 //_____________________________________________________________________________
 Bool_t 
 AliMUON1DArray::Set(Int_t i, TObject* object, Bool_t replace)
@@ -112,13 +160,20 @@ AliMUON1DArray::Set(Int_t i, TObject* object, Bool_t replace)
 
   if ( i >= 0 && i < fArray->GetSize() )
   {
-    TObject* o = Get(i);
+    if (((Int_t)(object->GetUniqueID()))!=i)
+    {
+      AliError(Form("object's UniqueID is %d, which is different from the expected %d",
+                    object->GetUniqueID(),i));
+      return kFALSE;
+    }
+    
+    TObject* o = FindObject(i);
     if ( o && !replace )
     {
       AliError(Form("Object %p is already there for i=%d",o,i));
       return kFALSE;
     }
-    if ( replace ) 
+    if ( o && replace ) 
     {
       delete o;
     }
@@ -129,5 +184,10 @@ AliMUON1DArray::Set(Int_t i, TObject* object, Bool_t replace)
   return kFALSE;
 }
 
-
-
+//_____________________________________________________________________________
+Int_t 
+AliMUON1DArray::GetSize() const
+{
+  /// Return the number of object we hold
+  return fArray->GetEntries();
+}