X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=TPC%2FAliTPCCalPadRegion.cxx;h=01e93153464216eba6054038cd6ce60b89bb9f93;hb=1e55299159b8d71a70f464bf87bc3e74780a64fd;hp=33dc3ea34d7b5499f75b331f21f06314853541e4;hpb=84e0a1114674b1d41b4e4b92f1e95c077ee7c23c;p=u%2Fmrichter%2FAliRoot.git

diff --git a/TPC/AliTPCCalPadRegion.cxx b/TPC/AliTPCCalPadRegion.cxx
index 33dc3ea34d7..01e93153464 100644
--- a/TPC/AliTPCCalPadRegion.cxx
+++ b/TPC/AliTPCCalPadRegion.cxx
@@ -84,13 +84,33 @@ AliTPCCalPadRegion& AliTPCCalPadRegion::operator=(const AliTPCCalPadRegion& rhs)
 
 
 void       AliTPCCalPadRegion::SetObject(TObject* obj, UInt_t segment, UInt_t padType)
-{ 
+{
+  //
+  // Set the object for given segment
+  //
+  if (!fObjects) {
+    fObjects = new TObjArray(fgkNSegments * fgkNPadTypes);
+    fObjects->SetOwner(kTRUE);
+  }
+  if (fObjects->GetEntriesFast()<Int_t(fgkNSegments * fgkNPadTypes)){
+    fObjects->Expand(fgkNSegments * fgkNPadTypes);
+  }
   if (BoundsOk("SetObject", segment, padType)){ 
-    if (segment+fgkNSegments*padType>fObjects->GetEntriesFast()) fObjects->Expand(2*(segment+fgkNSegments*padType));
+    if (segment+fgkNSegments*padType>static_cast<UInt_t>(fObjects->GetEntriesFast())) fObjects->Expand(fgkNSegments * fgkNPadTypes);
     fObjects->AddAt(obj, segment+fgkNSegments*padType); 
   }
 }
 
+TObject*   AliTPCCalPadRegion::GetObject(UInt_t segment, UInt_t padType){  
+  //
+  //
+  //
+  if (fObjects->GetEntriesFast()<Int_t(fgkNSegments * fgkNPadTypes)){
+    fObjects->Expand(fgkNSegments * fgkNPadTypes);
+  }
+  return fObjects->At(segment+fgkNSegments*padType); 
+}
+
 
 
 void AliTPCCalPadRegion::GetPadRegionCenterLocal(UInt_t padType, Double_t* xy) {